Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MINOR] shared routing for subapps #1783

Merged
merged 11 commits into from
Jan 14, 2021
Merged

[MINOR] shared routing for subapps #1783

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c4ac80f
[MINOR] shared routing for subapps
Jan 12, 2021
106e0e1
[MINOR] removed router-history and changes to react-router-browser.tsx
Jan 13, 2021
432ce9f
[MINOR] fixed hasOwnProperty
Jan 13, 2021
1fb0787
[MINOR] fixed reducers for subapp2-store product call
Jan 13, 2021
b9651a3
[MINOR] updated index.ts for ReactRouterFeatureOptions
Jan 13, 2021
10d97eb
[MINOR] updated index.ts for ReactRouterFeatureOptions
Jan 13, 2021
c1891fd
[MINOR] changes to remove comments and fix description
Jan 13, 2021
5de632e
[MINOR] modified react-router-browser.tsx
Jan 13, 2021
791b6fd
[MINOR] undo launch.json
Jan 13, 2021
e6e18df
[MINOR] fixed react-router-browser.tsx with history issue
Jan 13, 2021
b8210cd
[MINOR] fixed react-router-browser.tsx with history
Jan 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions packages/xarc-react-router/src/browser/react-router-browser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { SubAppDef, SubAppFeatureFactory } from "@xarc/subapp";
import { Router, BrowserRouter } from "react-router-dom";
import { createBrowserHistory } from "history";

import RouterHistory from "./router-history"
import { ReactRouterFeatureOptions, _id, _subId } from "../common";

/**
* Implement the component wrapping support for using react router on a subapp
*/
Expand All @@ -20,10 +18,10 @@ export function reactRouterFeature(options: ReactRouterFeatureOptions): SubAppFe
let history: any;
let TheRouter: any;

if (!options.history) {
if (options.history === false) {
TheRouter = BrowserRouter;
} else {
history = options.history === true ? createBrowserHistory() : options.history;
history = options.history === true ? RouterHistory.history : (options.history instanceof Object ? options.history : RouterHistory.history);
TheRouter = Router;
}

Expand Down
4 changes: 4 additions & 0 deletions packages/xarc-react-router/src/browser/router-history.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { createBrowserHistory } from "history";
export default class RouterHistory {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a bit overkill to create a static value, and no export default

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also, this will trigger createBrowserHistory immediately when app's loaded

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

static history = createBrowserHistory();
}