@common-stack/client-react 0.5.31 → 0.5.34
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/__tests__/integrated-routes.test.js +6 -6
- package/lib/__tests__/integrated-routes.test.js.map +1 -1
- package/lib/__tests__/router-render.test.js +5 -4
- package/lib/__tests__/router-render.test.js.map +1 -1
- package/lib/connector/connector.d.ts +2 -3
- package/lib/connector/connector.js +1 -1
- package/lib/connector/connector.js.map +1 -1
- package/lib/connector/connector.test.js +1 -1
- package/lib/connector/connector.test.js.map +1 -1
- package/lib/interfaces/new-router.d.ts +3 -9
- package/lib/route/get-routes.js +2 -2
- package/lib/route/get-routes.js.map +1 -1
- package/lib/route/get-routes.test.js +2 -2
- package/lib/route/get-routes.test.js.map +1 -1
- package/lib/route/index.native.d.ts +1 -1
- package/lib/route/index.native.js +1 -1
- package/lib/route/old/get-routes-notused.js +1 -1
- package/lib/route/old/get-routes-notused.js.map +1 -1
- package/lib/route/old/render.d.ts +1 -1
- package/lib/route/old/render.js +3 -6
- package/lib/route/old/render.js.map +1 -1
- package/lib/route/react-navigation/get-navigation-utils.d.ts +0 -8
- package/lib/route/react-navigation/get-navigation-utils.js.map +1 -1
- package/lib/route/react-navigation/get-navigation-utils.test.js +1 -1
- package/lib/route/react-navigation/get-navigation-utils.test.js.map +1 -1
- package/lib/route/render-routes.d.ts +2 -1
- package/lib/route/render-routes.js +18 -109
- package/lib/route/render-routes.js.map +1 -1
- package/lib/route/render-routes.native.d.ts +4 -0
- package/lib/route/{render-routes-native.js → render-routes.native.js} +19 -16
- package/lib/route/render-routes.native.js.map +1 -0
- package/lib/route/render-routes.test.js +22 -226
- package/lib/route/render-routes.test.js.map +1 -1
- package/lib/router-factory/index.js +2 -2
- package/lib/router-factory/index.js.map +1 -1
- package/lib/router-factory/index.native.js +2 -2
- package/lib/utils/sort-keys.d.ts +0 -1
- package/lib/utils/sort-keys.js +0 -11
- package/lib/utils/sort-keys.js.map +1 -1
- package/lib/utils/sort-keys.test.js +5 -33
- package/lib/utils/sort-keys.test.js.map +1 -1
- package/package.json +5 -5
- package/lib/route/render-routes-native.d.ts +0 -3
- package/lib/route/render-routes-native.js.map +0 -1
- package/lib/route/test-routes.d.ts +0 -411
- package/lib/route/test-routes.js +0 -578
- package/lib/route/test-routes.js.map +0 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import * as ReactDOMServer from 'react-dom/server';
|
|
3
|
-
import
|
|
4
|
-
import {
|
|
3
|
+
import StaticRouter from 'react-router/StaticRouter';
|
|
4
|
+
import { renderRoutes, matchRoutes } from 'react-router-config';
|
|
5
5
|
import { Feature } from '../connector';
|
|
6
6
|
import { ConsoleLogger } from '@cdm-logger/server';
|
|
7
7
|
const logger = ConsoleLogger.create('test', { level: 'trace' });
|
|
@@ -9,7 +9,7 @@ import 'jest';
|
|
|
9
9
|
describe('integration', () => {
|
|
10
10
|
it('generates the same matches in renderRoutes and matchRoutes', () => {
|
|
11
11
|
const rendered = [];
|
|
12
|
-
const Comp = ({ match, route: { routes } }) => (rendered.push(match),
|
|
12
|
+
const Comp = ({ match, route: { routes } }) => (rendered.push(match), renderRoutes(routes));
|
|
13
13
|
const genRoutes = [
|
|
14
14
|
{
|
|
15
15
|
['/ghost']: { component: Comp },
|
|
@@ -48,12 +48,12 @@ describe('integration', () => {
|
|
|
48
48
|
expect(connectorRoutes).toMatchObject(result);
|
|
49
49
|
const pathname = '/pepper/jalepeno';
|
|
50
50
|
const branch = matchRoutes(connectorRoutes, pathname);
|
|
51
|
-
ReactDOMServer.renderToString(React.createElement(StaticRouter, { location: pathname },
|
|
51
|
+
ReactDOMServer.renderToString(React.createElement(StaticRouter, { location: pathname, context: {} }, renderRoutes(connectorRoutes)));
|
|
52
52
|
expect(branch).toMatchSnapshot();
|
|
53
53
|
expect(branch.length).toEqual(2);
|
|
54
54
|
expect(rendered.length).toEqual(2);
|
|
55
|
-
expect(branch[0].
|
|
56
|
-
expect(branch[1].
|
|
55
|
+
expect(branch[0].match).toEqual(rendered[0]);
|
|
56
|
+
expect(branch[1].match).toEqual(rendered[1]);
|
|
57
57
|
});
|
|
58
58
|
});
|
|
59
59
|
//# sourceMappingURL=integrated-routes.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"integrated-routes.test.js","sourceRoot":"","sources":["../../src/__tests__/integrated-routes.test.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAC;AACnD,OAAO,
|
|
1
|
+
{"version":3,"file":"integrated-routes.test.js","sourceRoot":"","sources":["../../src/__tests__/integrated-routes.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
2
|
import * as ReactDOMServer from 'react-dom/server';
|
|
3
|
-
import
|
|
4
|
-
import {
|
|
3
|
+
import Router from 'react-router';
|
|
4
|
+
import { renderRoutes } from 'react-router-config';
|
|
5
5
|
import { Feature } from '../connector';
|
|
6
6
|
import { ConsoleLogger } from '@cdm-logger/server';
|
|
7
7
|
import 'jest';
|
|
8
8
|
export const logger = ConsoleLogger.create('test', { level: 'trace' });
|
|
9
|
+
const { StaticRouter } = Router;
|
|
9
10
|
describe('renderRoutes', () => {
|
|
10
11
|
let renderedRoutes;
|
|
11
12
|
let renderedExtraProps;
|
|
12
13
|
const Comp = ({ route, route: { routes }, ...extraProps }) => (renderedRoutes.push(route),
|
|
13
14
|
renderedExtraProps.push(extraProps),
|
|
14
|
-
|
|
15
|
+
renderRoutes(routes));
|
|
15
16
|
beforeEach(() => {
|
|
16
17
|
renderedRoutes = [];
|
|
17
18
|
renderedExtraProps = [];
|
|
@@ -27,7 +28,7 @@ describe('renderRoutes', () => {
|
|
|
27
28
|
];
|
|
28
29
|
const routes = [routeToMatch];
|
|
29
30
|
const connector = new Feature({ routeConfig: genRoutes });
|
|
30
|
-
ReactDOMServer.renderToString(React.createElement(StaticRouter, { location: "/path" },
|
|
31
|
+
ReactDOMServer.renderToString(React.createElement(StaticRouter, { location: "/path", context: {} }, renderRoutes(routes)));
|
|
31
32
|
expect(renderedRoutes.length).toEqual(1);
|
|
32
33
|
expect(renderedRoutes[0]).toEqual(routeToMatch);
|
|
33
34
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-render.test.js","sourceRoot":"","sources":["../../src/__tests__/router-render.test.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAC;AACnD,OAAO,
|
|
1
|
+
{"version":3,"file":"router-render.test.js","sourceRoot":"","sources":["../../src/__tests__/router-render.test.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,cAAc,MAAM,kBAAkB,CAAC;AACnD,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,YAAY,EAAe,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,aAAa,EAA0B,MAAM,oBAAoB,CAAC;AAE3E,OAAO,MAAM,CAAC;AAEd,MAAM,CAAC,MAAM,MAAM,GAAsB,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;AAC1F,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;AAEhC,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAI,cAAc,CAAC;IACnB,IAAI,kBAAkB,CAAC;IACvB,MAAM,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE,CAAC,CAC5D,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC;QAC1B,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC;QACnC,YAAY,CAAC,MAAM,CAAC,CACrB,CAAC;IAEF,UAAU,CAAC,GAAG,EAAE;QACd,cAAc,GAAG,EAAE,CAAC;QACpB,kBAAkB,GAAG,EAAE,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,MAAM,YAAY,GAAG;YACnB,SAAS,EAAE,IAAI;SAChB,CAAC;QACF,MAAM,SAAS,GAAG;YAChB;gBACE,CAAC,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;aAC/B;SACF,CAAC;QACF,MAAM,MAAM,GAAG,CAAC,YAAY,CAAC,CAAC;QAE9B,MAAM,SAAS,GAAG,IAAI,OAAO,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;QAE1D,cAAc,CAAC,cAAc,CAC3B,oBAAC,YAAY,IAAC,QAAQ,EAAC,OAAO,EAAC,OAAO,EAAE,EAAE,IACvC,YAAY,CAAC,MAAa,CAAC,CACf,CAChB,CAAC;QACF,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,gFAAgF;IAChF,6BAA6B;IAC7B,2BAA2B;IAC3B,SAAS;IACT,qCAAqC;IACrC,8DAA8D;IAE9D,qCAAqC;IACrC,uDAAuD;IACvD,iDAAiD;IACjD,2BAA2B;IAC3B,SAAS;IACT,oDAAoD;IACpD,6EAA6E;IAC7E,MAAM;AACR,CAAC,CAAC,CAAC"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import { IReactFeature } from '../interfaces';
|
|
3
3
|
import { BaseFeature } from './base-connector';
|
|
4
|
-
import { renderRoutes2 } from '../route/render-routes';
|
|
5
4
|
export declare class Feature extends BaseFeature implements IReactFeature {
|
|
6
|
-
protected renderRoutes: (routes: any, solidRoutes: any, extraProps?: {}) => import("react").JSX.Element;
|
|
7
|
-
protected renderRoutes2:
|
|
5
|
+
protected renderRoutes: (routes: any, solidRoutes: any, extraProps?: {}, switchProps?: {}) => import("react").JSX.Element;
|
|
6
|
+
protected renderRoutes2: (args: any) => import("react").JSX.Element;
|
|
8
7
|
protected getSortedRoutes: (path: string, routeData: import("../interfaces").IRouteData, authWrapper?: (ele: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>, props: Record<string, any>) => void) => any;
|
|
9
8
|
protected getSortedRoutes2: (path: string, routeData: import("../interfaces").IRouteData, authWrapper?: (ele: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>, props: Record<string, any>) => void) => any;
|
|
10
9
|
}
|
|
@@ -6,7 +6,7 @@ export class Feature extends BaseFeature {
|
|
|
6
6
|
constructor() {
|
|
7
7
|
super(...arguments);
|
|
8
8
|
this.renderRoutes = renderRoutes;
|
|
9
|
-
this.renderRoutes2 = renderRoutes2;
|
|
9
|
+
this.renderRoutes2 = (args) => renderRoutes2({ routes: args });
|
|
10
10
|
this.getSortedRoutes = getSortedRoutes;
|
|
11
11
|
this.getSortedRoutes2 = getSortedRoutes;
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/connector/connector.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,OAAO,OAAQ,SAAQ,WAAW;IAAxC;;QACc,iBAAY,GAAG,YAAY,CAAC;QAC5B,kBAAa,GAAG,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"connector.js","sourceRoot":"","sources":["../../src/connector/connector.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,OAAO,OAAQ,SAAQ,WAAW;IAAxC;;QACc,iBAAY,GAAG,YAAY,CAAC;QAC5B,kBAAa,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,oBAAe,GAAG,eAAe,CAAC;QAClC,qBAAgB,GAAG,eAAe,CAAC;IAEjD,CAAC;CAAA"}
|
|
@@ -4,7 +4,7 @@ import { Route } from 'react-router-dom';
|
|
|
4
4
|
import 'jest';
|
|
5
5
|
describe('Test Feature', () => {
|
|
6
6
|
it('test Connector with router', () => {
|
|
7
|
-
const feature = new Feature({ route: React.createElement(Route, { path: "/",
|
|
7
|
+
const feature = new Feature({ route: React.createElement(Route, { exact: true, path: "/", component: () => React.createElement("div", null, "test") }) });
|
|
8
8
|
console.log(feature);
|
|
9
9
|
});
|
|
10
10
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connector.test.js","sourceRoot":"","sources":["../../src/connector/connector.test.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,OAAO,MAAM,CAAC;AAEd,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAE1B,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAClC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,KAAK,EAAE,oBAAC,KAAK,IAAC,IAAI,EAAC,GAAG,EAAC,
|
|
1
|
+
{"version":3,"file":"connector.test.js","sourceRoot":"","sources":["../../src/connector/connector.test.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,OAAO,MAAM,CAAC;AAEd,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAE1B,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAClC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,KAAK,EAAE,oBAAC,KAAK,IAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAC,GAAG,EAAC,SAAS,EAAE,GAAG,EAAE,CAAC,wCAAe,GAAI,EAAE,CAAC,CAAC;QAC1G,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { FunctionComponent } from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { match } from 'react-router';
|
|
3
3
|
export interface IComponent extends FunctionComponent {
|
|
4
4
|
getInitialProps?: Function;
|
|
5
5
|
preload?: () => Promise<any>;
|
|
@@ -14,10 +14,7 @@ export interface IRouterRederOptions {
|
|
|
14
14
|
ssrProps?: object;
|
|
15
15
|
rootRoutes?: IRoute[];
|
|
16
16
|
auth?: boolean;
|
|
17
|
-
key?: any;
|
|
18
17
|
authWrapper?: () => void;
|
|
19
|
-
withRoutesElement?: boolean;
|
|
20
|
-
loaderArgs?: any;
|
|
21
18
|
}
|
|
22
19
|
export interface IGetRouteElementOpts {
|
|
23
20
|
route: IRoute;
|
|
@@ -29,17 +26,14 @@ export interface IRouteMap<T = unknown> {
|
|
|
29
26
|
}
|
|
30
27
|
export interface IRoute {
|
|
31
28
|
path?: string;
|
|
32
|
-
index?: boolean;
|
|
33
29
|
exact?: boolean;
|
|
34
30
|
redirect?: string;
|
|
35
|
-
component?: IComponent
|
|
31
|
+
component?: IComponent;
|
|
36
32
|
routes?: IRoute[];
|
|
37
33
|
key?: any;
|
|
38
34
|
strict?: boolean;
|
|
39
35
|
sensitive?: boolean;
|
|
40
36
|
wrappers?: any[];
|
|
41
|
-
loader?: (any: any) => any;
|
|
42
|
-
action?: ActionFunction;
|
|
43
37
|
[k: string]: any;
|
|
44
38
|
}
|
|
45
39
|
export interface IRouteComponentProps<Params extends {
|
|
@@ -51,5 +45,5 @@ export interface IRouteComponentProps<Params extends {
|
|
|
51
45
|
location: any /** Location & { query: Query }; **/;
|
|
52
46
|
route: IRoute;
|
|
53
47
|
history: any /** History;**/;
|
|
54
|
-
match:
|
|
48
|
+
match: match<Params>;
|
|
55
49
|
}
|
package/lib/route/get-routes.js
CHANGED
|
@@ -50,8 +50,8 @@ export function getRoutes(path, routeData, authWrapper = null) {
|
|
|
50
50
|
break;
|
|
51
51
|
}
|
|
52
52
|
lastNode = lastNode.routes[lastIndex];
|
|
53
|
-
|
|
54
|
-
|
|
53
|
+
const lastNodePath = `${lastNode._pathPrefix}${lastNode.path}`;
|
|
54
|
+
lastNode.exact = routeData[lastNodePath].hasOwnProperty('exact') ? routeData[lastNodePath].exact : false;
|
|
55
55
|
}
|
|
56
56
|
if (!lastNode.routes) {
|
|
57
57
|
lastNode.routes = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-routes.js","sourceRoot":"","sources":["../../src/route/get-routes.tsx"],"names":[],"mappings":"AACA,OAAO,EAAc,aAAa,EAAe,MAAM,eAAe,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEjD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,SAAqB,EAAE,cAGzD,IAAI,EAAE,EAAE;IAChB,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IACzC,OAAO,SAAS,CAAC,IAAI,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,UAAU,SAAS,CAAC,IAAY,EAAE,SAAqB,EAAE,cAAoC,IAAI;IACnG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;KAClC;IACD,IAAI,UAAU,GAAG,IAAI,CAAC;IACtB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,EAAE;QACjC,UAAU,GAAG,IAAI,GAAG,GAAG,CAAC;KACzB;IACD,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QACtD,OAAO,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,QAAQ,KAAK,IAAI,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAuB,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QAC7D,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,aAAa,CAAC,MAAM;YAC9B,GAAG,SAAS,CAAC,KAAK,CAAC;SACpB,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,GAAkC;QAC1C,wCAAwC;QACxC,6DAA6D;QAC7D,IAAI,EAAE,MAAM;QACZ,QAAQ,EAAE,aAAa,CAAC,IAAI;KACtB,CAAC;IACT,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAClC,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,QAAQ,CAAC,KAAK,EAAE,CAAC;QAEjB,gDAAgD;QAChD,IAAI,SAAS,CAAC,IAAI,KAAK,GAAG,EAAE;YAC1B,QAAQ,CAAC,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACpB;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC9B,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE;YAC9B,MAAM,SAAS,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;gBACzD,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;gBAEpD,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;oBACzC,8DAA8D;oBAC9D,OAAO,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,GAAG,IAAI,SAAS,CAAC,SAAS,CAAC,EAAE,KAAK,KAAK,KAAK,CAAC;iBAC3F;YACH,CAAC,CAAC,CAAC;YACH,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE;gBACpB,MAAM;aACP;YACD,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACtC,
|
|
1
|
+
{"version":3,"file":"get-routes.js","sourceRoot":"","sources":["../../src/route/get-routes.tsx"],"names":[],"mappings":"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"}
|
|
@@ -167,11 +167,11 @@ describe('getRoutes utility with basic routes', () => {
|
|
|
167
167
|
// expect(routes).toMatchSnapshot();
|
|
168
168
|
// make sure the /a/p/1 is not nested under /a/p instead in should be nested under /a
|
|
169
169
|
});
|
|
170
|
-
|
|
170
|
+
xtest('more url testing', () => {
|
|
171
171
|
const routes = getSortedRoutes('/', orgRoutes);
|
|
172
172
|
expect(routes).toMatchSnapshot();
|
|
173
173
|
});
|
|
174
|
-
|
|
174
|
+
xtest('layout routes', () => {
|
|
175
175
|
const routes = getSortedRoutes('/', layoutRoutes);
|
|
176
176
|
expect(routes).toMatchSnapshot();
|
|
177
177
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-routes.test.js","sourceRoot":"","sources":["../../src/route/get-routes.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"get-routes.test.js","sourceRoot":"","sources":["../../src/route/get-routes.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export * from './render-routes
|
|
1
|
+
export * from './render-routes.native';
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export * from './render-routes
|
|
1
|
+
export * from './render-routes.native';
|
|
2
2
|
//# sourceMappingURL=index.native.js.map
|
|
@@ -44,7 +44,7 @@ export function getRoutes2(path, routerData) {
|
|
|
44
44
|
}
|
|
45
45
|
lastNode = lastNode.routes[lastIndex];
|
|
46
46
|
// do not overwrite the route's exact value
|
|
47
|
-
|
|
47
|
+
lastNode.exact = routerData[lastNode.path].hasOwnProperty('exact') ? routerData[lastNode.path].exact : false;
|
|
48
48
|
}
|
|
49
49
|
if (!lastNode.routes) {
|
|
50
50
|
lastNode.routes = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-routes-notused.js","sourceRoot":"","sources":["../../../src/route/old/get-routes-notused.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,gCAAgC;AAChC,MAAM,GAAG,GAAG,+JAA+J,CAAC;AAE5K,MAAM,UAAU,KAAK,CAAC,IAAI;IACxB,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC;AACD;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,UAAsB;IAC7D,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QACxD,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,MAAM,YAAY,GAAuB,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QAC1D,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,GAAG,UAAU,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,GAAkC,EAC3C,CAAC;IACF,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC/B,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,QAAQ,CAAC,KAAK,EAAE,CAAC;QAEjB,gDAAgD;QAChD,IAAI,SAAS,CAAC,KAAK,KAAK,GAAG,EAAE;YAC3B,QAAQ,CAAC,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACpB;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC9B,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,EAAE,EAAE;YAC/B,MAAM,SAAS,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;gBACzD,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACzC,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC;iBAClD;YACH,CAAC,CAAC,CAAC;YACH,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE;gBACpB,MAAM;aACP;YACD,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACtC,2CAA2C;YAC3C,
|
|
1
|
+
{"version":3,"file":"get-routes-notused.js","sourceRoot":"","sources":["../../../src/route/old/get-routes-notused.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,gCAAgC;AAChC,MAAM,GAAG,GAAG,+JAA+J,CAAC;AAE5K,MAAM,UAAU,KAAK,CAAC,IAAI;IACxB,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC;AACD;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,UAAsB;IAC7D,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QACxD,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,MAAM,YAAY,GAAuB,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;QAC1D,OAAO;YACL,KAAK,EAAE,KAAK;YACZ,GAAG,UAAU,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,MAAM,IAAI,GAAkC,EAC3C,CAAC;IACF,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QAC/B,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC5C,QAAQ,CAAC,KAAK,EAAE,CAAC;QAEjB,gDAAgD;QAChD,IAAI,SAAS,CAAC,KAAK,KAAK,GAAG,EAAE;YAC3B,QAAQ,CAAC,KAAK,EAAE,CAAC;YACjB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACpB;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC9B,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,EAAE,EAAE;YAC/B,MAAM,SAAS,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;gBACzD,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBACzC,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC;iBAClD;YACH,CAAC,CAAC,CAAC;YACH,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE;gBACpB,MAAM;aACP;YACD,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACtC,2CAA2C;YAC3C,QAAQ,CAAC,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAc,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAc,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;SAClI;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;YACpB,QAAQ,CAAC,MAAM,GAAG,EAAE,CAAC;SACtB;QACD,MAAM,YAAY,GAAG,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAClD,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YACnB,GAAG,SAAS;YACZ,uBAAuB;YACvB,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;YACrG,SAAS,EAAE,SAAS,CAAC,SAAS;SAC/B,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC,MAAM,CAAC;AACrB,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
-
export declare const renderRoutes: (routes: any, solidRoutes: any, extraProps?: {}) => React.JSX.Element;
|
|
2
|
+
export declare const renderRoutes: (routes: any, solidRoutes: any, extraProps?: {}, switchProps?: {}) => React.JSX.Element;
|
package/lib/route/old/render.js
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
-
import { Route
|
|
3
|
-
export const renderRoutes = (routes, solidRoutes, extraProps = {}) => routes ? (React.createElement(
|
|
4
|
-
...solidRoutes,
|
|
5
|
-
...routes.map((route, i) => (React.createElement(Route, { key: route.key || i, path: route.path, element: route.render
|
|
6
|
-
? React.createElement(route.render, { ...extraProps, route: route })
|
|
7
|
-
: React.createElement(route.component, { ...extraProps, route: route }) }))),
|
|
2
|
+
import { Route } from 'react-router-dom';
|
|
3
|
+
export const renderRoutes = (routes, solidRoutes, extraProps = {}, switchProps = {}) => routes ? (React.createElement(React.Fragment, null, [
|
|
4
|
+
...solidRoutes, ...routes.map((route, i) => (React.createElement(Route, { key: route.key || i, path: route.path, exact: route.exact, strict: route.strict, render: props => route.render ? (route.render({ ...props, ...extraProps, route: route })) : (React.createElement(route.component, { ...props, ...extraProps, route: route })) }))),
|
|
8
5
|
])) : null;
|
|
9
6
|
//# sourceMappingURL=render.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/route/old/render.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/route/old/render.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,GAAG,EAAE,EAAE,WAAW,GAAG,EAAE,EAAE,EAAE,CACvF,MAAM,CAAC,CAAC,CAAC,CACP,0CACG;IACC,GAAG,WAAW,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAC1C,oBAAC,KAAK,IACJ,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,CAAC,EACnB,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,MAAM,EAAE,KAAK,CAAC,EAAE,CACd,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CACb,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,GAAG,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CACxD,CAAC,CAAC,CAAC,CACF,oBAAC,KAAK,CAAC,SAAS,OAAK,KAAK,KAAM,UAAU,EAAE,KAAK,EAAE,KAAK,GAAI,CAC7D,GAEH,CACH,CAAC;CACH,CACA,CACJ,CAAC,CAAC,CAAC,IAAI,CAAC"}
|
|
@@ -1,12 +1,4 @@
|
|
|
1
1
|
import { ReactElement } from 'react';
|
|
2
2
|
import { IRouteData } from '../../interfaces';
|
|
3
|
-
export interface RouteProps {
|
|
4
|
-
caseSensitive?: boolean;
|
|
5
|
-
children?: React.ReactNode;
|
|
6
|
-
element?: React.ReactNode | null;
|
|
7
|
-
index?: boolean;
|
|
8
|
-
path?: string;
|
|
9
|
-
exact?: boolean;
|
|
10
|
-
}
|
|
11
3
|
export declare const getSortedNavigations: (path: string, routeData: IRouteData, authWrapper?: (component: React.FC) => ReactElement) => any;
|
|
12
4
|
export declare function getNavigation(path: string, routeData: any, authWrapper?: ((component: React.FC, unauthenticatedComponent: React.FC) => ReactElement)): any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-navigation-utils.js","sourceRoot":"","sources":["../../../src/route/react-navigation/get-navigation-utils.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"get-navigation-utils.js","sourceRoot":"","sources":["../../../src/route/react-navigation/get-navigation-utils.tsx"],"names":[],"mappings":"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"}
|
|
@@ -165,7 +165,7 @@ describe('getRoutes utility with basic routes', () => {
|
|
|
165
165
|
const feature = new Feature({ routeConfig: routerConfig1 });
|
|
166
166
|
const Navigation = feature.getConfiguredRoutes2('/');
|
|
167
167
|
expect(Navigation).toMatchSnapshot();
|
|
168
|
-
const Render = feature.getRoutes2();
|
|
168
|
+
const Render = feature.getRoutes2('/', 'MainStack');
|
|
169
169
|
expect(Render).toMatchSnapshot();
|
|
170
170
|
});
|
|
171
171
|
xit('Add routeParams parameter', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-navigation-utils.test.js","sourceRoot":"","sources":["../../../src/route/react-navigation/get-navigation-utils.test.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAE3D,MAAM,WAAW,GAAG,GAAG,EAAE,GAAG,CAAC,CAAA;AAC7B,QAAQ,CAAC,qCAAqC,EAAE,GAAG,EAAE;IAEjD,MAAM,aAAa,GAAe;QAC9B,CAAC,GAAG,CAAC,EAAE;YACH,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,oBAAoB,EAAE;YACjC,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE;gBACH,gBAAgB,EAAE,OAAO;gBACzB,aAAa,EAAE;oBACX,WAAW,EAAE,KAAK;iBACrB;aACJ;SACJ;QACD,CAAC,SAAS,CAAC,EAAE;YACT,SAAS,EAAE,wBAAwB,EAAE;YACrC,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,gBAAgB,EAAE,MAAM;gBACxB,aAAa,EAAE;oBACX,WAAW,EAAE,KAAK;oBAClB,WAAW,EAAE,OAAO;oBACpB,iFAAiF;iBACpF;aACJ;SACJ;QACD,CAAC,cAAc,CAAC,EAAE;YACd,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE;gBACH,aAAa,EAAE,EAAE;gBACjB,SAAS,EAAE,WAAW;gBACtB,OAAO,EAAE;oBACL,WAAW,EAAE,IAAI;oBACjB,WAAW,EAAE,MAAM;oBACnB,WAAW,EAAE,MAAM;oBACnB,+EAA+E;iBAClF;aACJ;SACJ;QACD,CAAC,eAAe,CAAC,EAAE;YACf,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,oBAAoB,EAAE;YACjC,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,gBAAgB,EAAE,OAAO;aAC5B;SACJ;QACD,CAAC,qBAAqB,CAAC,EAAE;YACrB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,aAAa,EAAE,EAAE;gBACjB,SAAS,EAAE,WAAW;gBACtB,OAAO,EAAE;oBACL,WAAW,EAAE,OAAO;iBACvB;aACJ;SACJ;QACD,CAAC,4BAA4B,CAAC,EAAE;YAC5B,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE;gBACH,aAAa,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;gBAC/B,SAAS,EAAE,WAAW;gBACtB,OAAO,EAAE;oBACL,WAAW,EAAE,eAAe;iBAC/B;aACJ;SACJ;QACD,CAAC,WAAW,CAAC,EAAE;YACX,IAAI,EAAE,SAAS;YACf,KAAK,EAAE;gBACH,aAAa,EAAE,EAAE;gBACjB,SAAS,EAAE,WAAW;gBACtB,OAAO,EAAE;oBACL,WAAW,EAAE,IAAI;oBACjB,WAAW,EAAE,UAAU;oBACvB,eAAe,EAAE,MAAM;iBAC1B;aACJ;YACD,KAAK,EAAE,KAAK;SACf;KACJ,CAAC;IAEF,MAAM,aAAa,GAAe;QAC9B,CAAC,GAAG,CAAC,EAAE;YACH,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,oBAAoB,EAAE;YACjC,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE;gBACH,gBAAgB,EAAE,OAAO,EAAE,aAAa,EAAE;oBACtC,WAAW,EAAE,KAAK;iBACrB;aACJ;SACJ;QACD,CAAC,IAAI,CAAC,EAAE;YACJ,SAAS,EAAE,wBAAwB,EAAE;YACrC,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE;gBACH,gBAAgB,EAAE,OAAO;gBACzB,aAAa,EAAE;oBACX,WAAW,EAAE,KAAK;oBAClB,iFAAiF;iBACpF;aACJ;SACJ;QACD,CAAC,WAAW,CAAC,EAAE;YACX,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,gBAAgB,EAAE,MAAM;gBACxB,aAAa,EAAE;oBACX,WAAW,EAAE,KAAK;oBAClB,WAAW,EAAE,OAAO;oBACpB,iFAAiF;iBACpF;aACJ;SACJ;QACD,CAAC,gBAAgB,CAAC,EAAE;YAChB,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE;gBACH,SAAS,EAAE,WAAW;gBACtB,OAAO,EAAE;oBACL,WAAW,EAAE,IAAI;oBACjB,WAAW,EAAE,MAAM;oBACnB,WAAW,EAAE,MAAM;oBACnB,+EAA+E;iBAClF;aACJ;SACJ;QACD,CAAC,uBAAuB,CAAC,EAAE;YACvB,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,oBAAoB,EAAE;YACjC,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,gBAAgB,EAAE,OAAO;aAC5B;SACJ;QACD,CAAC,4BAA4B,CAAC,EAAE;YAC5B,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE;gBACH,aAAa,EAAE,EAAE;gBACjB,SAAS,EAAE,WAAW;gBACtB,OAAO,EAAE;oBACL,WAAW,EAAE,MAAM;iBACtB;aACJ;SACJ;KAEJ,CAAC;IAEF,MAAM,aAAa,GAAe,EAEjC,CAAC;IAEF,GAAG,CAAC,gBAAgB,EAAE,GAAG,EAAE;QACvB,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QACrD,MAAM,CAAC,UAAU,CAAC,CAAC,eAAe,EAAE,CAAC;IACzC,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC7C,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAC5D,MAAM,CAAC,UAAU,CAAC,CAAC,eAAe,EAAE,CAAC;IACzC,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;IAEhB,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,cAAc,EAAE,GAAG,EAAE;QACrB,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,WAAW,EAAE,aAAa,EAAE,CAAC,CAAC;QAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,CAAC,UAAU,CAAC,CAAC,eAAe,EAAE,CAAC;QAErC,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"get-navigation-utils.test.js","sourceRoot":"","sources":["../../../src/route/react-navigation/get-navigation-utils.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as React from 'react';
|
|
1
2
|
import { IRouterRederOptions } from '../interfaces/new-router';
|
|
2
|
-
declare function renderRoutes(
|
|
3
|
+
declare function renderRoutes(opts: IRouterRederOptions): React.JSX.Element;
|
|
3
4
|
export { renderRoutes as renderRoutes2 };
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
-
import { useEffect, useState, createElement
|
|
3
|
-
|
|
4
|
-
import { Routes, Route, Navigate, useLocation } from 'react-router-dom';
|
|
5
|
-
import { sortByPaths } from '../utils';
|
|
2
|
+
import { useEffect, useState, createElement } from 'react';
|
|
3
|
+
import { Switch, Route, Redirect } from 'react-router';
|
|
6
4
|
function wrapInitialPropsFetch(route, opts) {
|
|
7
5
|
const { component, ...restRouteParams } = route;
|
|
8
6
|
let Component = route.component;
|
|
@@ -62,7 +60,7 @@ function render({ route, opts, props, }) {
|
|
|
62
60
|
routes: route.routes || [],
|
|
63
61
|
rootRoutes: opts.rootRoutes,
|
|
64
62
|
});
|
|
65
|
-
|
|
63
|
+
let { component: Component, wrappers } = route;
|
|
66
64
|
if (Component) {
|
|
67
65
|
const defaultPageInitialProps = opts.isServer
|
|
68
66
|
? {}
|
|
@@ -99,7 +97,7 @@ function getRouteElement({ route, index, opts }) {
|
|
|
99
97
|
path: route.path,
|
|
100
98
|
};
|
|
101
99
|
if (route.redirect) {
|
|
102
|
-
return React.createElement(
|
|
100
|
+
return React.createElement(Redirect, { ...routeProps, from: route.path, to: route.redirect });
|
|
103
101
|
}
|
|
104
102
|
else {
|
|
105
103
|
// avoid mount and unmount with url hash change
|
|
@@ -115,112 +113,23 @@ function getRouteElement({ route, index, opts }) {
|
|
|
115
113
|
// // client Render for enable ssr, but not sure SSR success
|
|
116
114
|
// route.component = wrapInitialPropsFetch(route, opts);
|
|
117
115
|
// }
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
caseSensitive: route.sensitive,
|
|
122
|
-
};
|
|
123
|
-
const renderComponent = (props) => {
|
|
124
|
-
return render({ route, opts, props });
|
|
125
|
-
};
|
|
126
|
-
return (React.createElement(Route, { ...routeProps, element: createElement(renderComponent) }));
|
|
116
|
+
return (React.createElement(Route, { ...routeProps, render: (props) => {
|
|
117
|
+
return render({ route, opts, props });
|
|
118
|
+
} }));
|
|
127
119
|
}
|
|
128
120
|
}
|
|
129
|
-
function
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
function ComponentWithRoute(innerProps) {
|
|
139
|
-
const [initialProps, setInitialProps] = useState({});
|
|
140
|
-
const location = useLocation();
|
|
141
|
-
useEffect(() => {
|
|
142
|
-
handleInitialProps(routeProps);
|
|
143
|
-
}, []);
|
|
144
|
-
const handleInitialProps = async (param) => {
|
|
145
|
-
if (typeof Component.getInitialProps === "function") {
|
|
146
|
-
const initialProps = await Component.getInitialProps(param);
|
|
147
|
-
setInitialProps(initialProps);
|
|
148
|
-
}
|
|
149
|
-
};
|
|
150
|
-
const cloneChild = (ui, props) => {
|
|
151
|
-
if (ui) {
|
|
152
|
-
return cloneElement(ui, props);
|
|
153
|
-
}
|
|
154
|
-
else {
|
|
155
|
-
return createElement(React.Fragment, props);
|
|
156
|
-
}
|
|
157
|
-
};
|
|
158
|
-
if (isServer) {
|
|
159
|
-
// Since React.useEffect will not run in server side,
|
|
160
|
-
// this function will be called manually.
|
|
161
|
-
handleInitialProps(routeProps);
|
|
162
|
-
}
|
|
163
|
-
let childrenElement = null;
|
|
164
|
-
if (children) {
|
|
165
|
-
childrenElement = !!withRoutesElement ?
|
|
166
|
-
React.Children.map(children, (child, key) => cloneChild(child.props.element, { key })) :
|
|
167
|
-
children.map((child, key) => cloneChild(child.element, { key }));
|
|
168
|
-
}
|
|
169
|
-
return (React.createElement(Component, { ...routeProps, ...initialProps, ...innerProps, location: location }, childrenElement));
|
|
170
|
-
}
|
|
171
|
-
let routeElement = React.createElement(ComponentWithRoute, null);
|
|
172
|
-
const wrappers = route.wrappers || [];
|
|
173
|
-
let len = wrappers.length - 1;
|
|
174
|
-
while (len >= 0) {
|
|
175
|
-
const Wrapper = wrappers[len];
|
|
176
|
-
routeElement = React.createElement(Wrapper, { ...routeProps }, routeElement);
|
|
177
|
-
len -= 1;
|
|
178
|
-
}
|
|
179
|
-
return routeElement;
|
|
180
|
-
}
|
|
181
|
-
function getRoute({ key, options, route, }) {
|
|
182
|
-
const { index, path, sensitive, routes, ...routeOptions } = route;
|
|
183
|
-
const routeObject = {
|
|
184
|
-
path: !!index ? null : path,
|
|
185
|
-
index: !!index,
|
|
186
|
-
caseSensitive: !!sensitive,
|
|
187
|
-
children: getRoutes({ options, routes: routes }),
|
|
188
|
-
...routeOptions,
|
|
189
|
-
};
|
|
190
|
-
if (routeOptions?.loader) {
|
|
191
|
-
routeObject.loader = (loaderContext) => { return routeOptions?.loader({ ...loaderContext, ...options.loaderArgs }); };
|
|
192
|
-
}
|
|
193
|
-
routeObject.element = createRouteElement(route, { ...options, key }, routeObject.children);
|
|
194
|
-
return routeObject;
|
|
195
|
-
}
|
|
196
|
-
function renderRoute(params) {
|
|
197
|
-
const routeObject = getRoute(params);
|
|
198
|
-
return !!params.options.withRoutesElement ?
|
|
199
|
-
React.createElement(Route, { key: params.key, ...routeObject }) : routeObject;
|
|
200
|
-
}
|
|
201
|
-
function getRoutes({ routes, options }) {
|
|
202
|
-
if (routes) {
|
|
203
|
-
const sortedRoutes = sortByPaths(routes);
|
|
204
|
-
return (sortedRoutes.map((route, key) => {
|
|
205
|
-
return renderRoute({
|
|
206
|
-
key,
|
|
207
|
-
options,
|
|
208
|
-
route,
|
|
209
|
-
});
|
|
210
|
-
}));
|
|
211
|
-
}
|
|
212
|
-
return null;
|
|
213
|
-
}
|
|
214
|
-
function renderRoutes(options) {
|
|
215
|
-
if (options.routes) {
|
|
216
|
-
const routes = getRoutes({
|
|
217
|
-
options,
|
|
218
|
-
routes: options.routes,
|
|
121
|
+
function renderRoutes(opts) {
|
|
122
|
+
return opts.routes ? (React.createElement(Switch, null, opts.routes.map((route, index) => {
|
|
123
|
+
const renderedR = getRouteElement({
|
|
124
|
+
route,
|
|
125
|
+
index,
|
|
126
|
+
opts: {
|
|
127
|
+
...opts,
|
|
128
|
+
rootRoutes: opts.rootRoutes || opts.routes,
|
|
129
|
+
},
|
|
219
130
|
});
|
|
220
|
-
return
|
|
221
|
-
|
|
222
|
-
}
|
|
223
|
-
return null;
|
|
131
|
+
return renderedR;
|
|
132
|
+
}))) : null;
|
|
224
133
|
}
|
|
225
134
|
export { renderRoutes as renderRoutes2 };
|
|
226
135
|
//# sourceMappingURL=render-routes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-routes.js","sourceRoot":"","sources":["../../src/route/render-routes.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"render-routes.js","sourceRoot":"","sources":["../../src/route/render-routes.tsx"],"names":[],"mappings":"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"}
|