@common-stack/client-react 3.0.2-alpha.0 → 3.0.2-alpha.2
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__/fill-register-test.js +6 -31
- package/lib/__tests__/fill-register-test.js.map +1 -1
- package/lib/__tests__/helpers/sample-menu.js +1 -4
- package/lib/__tests__/helpers/sample-menu.js.map +1 -1
- package/lib/__tests__/integrated-routes.test.js +12 -37
- package/lib/__tests__/integrated-routes.test.js.map +1 -1
- package/lib/__tests__/router-render.test.js +13 -53
- package/lib/__tests__/router-render.test.js.map +1 -1
- package/lib/connector/base-connector.d.ts +3 -4
- package/lib/connector/base-connector.js +19 -42
- package/lib/connector/base-connector.js.map +1 -1
- package/lib/connector/connector.js +9 -13
- package/lib/connector/connector.js.map +1 -1
- package/lib/connector/connector.native.js +10 -17
- package/lib/connector/connector.native.js.map +1 -1
- package/lib/connector/connector.test.js +5 -30
- package/lib/connector/connector.test.js.map +1 -1
- package/lib/connector/index.js +1 -17
- package/lib/connector/index.js.map +1 -1
- package/lib/index.js +10 -28
- package/lib/index.js.map +1 -1
- package/lib/index.native.js +10 -28
- package/lib/index.native.js.map +1 -1
- package/lib/interfaces/extended-feature.js +1 -2
- package/lib/interfaces/feature.d.ts +13 -0
- package/lib/interfaces/feature.js +2 -0
- package/lib/interfaces/feature.js.map +1 -0
- package/lib/interfaces/index.d.ts +1 -0
- package/lib/interfaces/index.js +5 -20
- package/lib/interfaces/index.js.map +1 -1
- package/lib/interfaces/menu.js +2 -5
- package/lib/interfaces/menu.js.map +1 -1
- package/lib/interfaces/new-router.js +1 -2
- package/lib/interfaces/router.js +1 -2
- package/lib/inversify/InversifyContext.js +6 -34
- package/lib/inversify/InversifyContext.js.map +1 -1
- package/lib/inversify/index.js +1 -17
- package/lib/inversify/index.js.map +1 -1
- package/lib/plugin-area/__tests__/higher-order-component-util.test.js +12 -37
- package/lib/plugin-area/__tests__/higher-order-component-util.test.js.map +1 -1
- package/lib/plugin-area/__tests__/plugin-api.test.js +11 -13
- package/lib/plugin-area/__tests__/plugin-api.test.js.map +1 -1
- package/lib/plugin-area/base-plugin-area.js +12 -39
- package/lib/plugin-area/base-plugin-area.js.map +1 -1
- package/lib/plugin-area/higher-order-component-util.js +3 -7
- package/lib/plugin-area/higher-order-component-util.js.map +1 -1
- package/lib/plugin-area/index.js +5 -35
- package/lib/plugin-area/index.js.map +1 -1
- package/lib/plugin-area/index.native.js +7 -37
- package/lib/plugin-area/index.native.js.map +1 -1
- package/lib/plugin-area/plugin-api.js +15 -18
- package/lib/plugin-area/plugin-api.js.map +1 -1
- package/lib/plugin-area/plugin-context.js +5 -32
- package/lib/plugin-area/plugin-context.js.map +1 -1
- package/lib/route/__tests__/admin-new-routes.test.js +11 -45
- package/lib/route/__tests__/admin-new-routes.test.js.map +1 -1
- package/lib/route/__tests__/getFlatMenus.test.js +4 -6
- package/lib/route/__tests__/getFlatMenus.test.js.map +1 -1
- package/lib/route/__tests__/render-routes-config.test.js +6 -18
- package/lib/route/__tests__/render-routes-config.test.js.map +1 -1
- package/lib/route/__tests__/route-type.test.js +1 -2
- package/lib/route/__tests__/route-type.test.js.map +1 -1
- package/lib/route/get-routes.js +22 -29
- package/lib/route/get-routes.js.map +1 -1
- package/lib/route/get-routes.test.js +6 -17
- package/lib/route/get-routes.test.js.map +1 -1
- package/lib/route/index.js +2 -18
- package/lib/route/index.js.map +1 -1
- package/lib/route/index.native.js +1 -17
- package/lib/route/index.native.js.map +1 -1
- package/lib/route/old/__tests__/config-sidebar-menu.test.js +17 -15
- package/lib/route/old/__tests__/config-sidebar-menu.test.js.map +1 -1
- package/lib/route/old/get-menus.js +14 -21
- package/lib/route/old/get-menus.js.map +1 -1
- package/lib/route/old/get-routes-notused.js +14 -12
- package/lib/route/old/get-routes-notused.js.map +1 -1
- package/lib/route/old/render.js +6 -33
- package/lib/route/old/render.js.map +1 -1
- package/lib/route/react-navigation/get-navigation-utils.js +35 -40
- package/lib/route/react-navigation/get-navigation-utils.js.map +1 -1
- package/lib/route/react-navigation/get-navigation-utils.test.js +14 -16
- package/lib/route/react-navigation/get-navigation-utils.test.js.map +1 -1
- package/lib/route/react-navigation/index.js +2 -18
- package/lib/route/react-navigation/index.js.map +1 -1
- package/lib/route/react-navigation/react-native.sample.test.js +8 -22
- package/lib/route/react-navigation/react-native.sample.test.js.map +1 -1
- package/lib/route/react-navigation/react-native.sample1.test.js +14 -48
- package/lib/route/react-navigation/react-native.sample1.test.js.map +1 -1
- package/lib/route/react-navigation/react-navigation-render.js +16 -31
- package/lib/route/react-navigation/react-navigation-render.js.map +1 -1
- package/lib/route/react-navigation/react-navigation-render.test.js +23 -37
- package/lib/route/react-navigation/react-navigation-render.test.js.map +1 -1
- package/lib/route/react-navigation/root-navigation.js +5 -9
- package/lib/route/react-navigation/root-navigation.js.map +1 -1
- package/lib/route/react-navigation/routes.js +1 -2
- package/lib/route/react-navigation/types.js +1 -5
- package/lib/route/react-navigation/types.js.map +1 -1
- package/lib/route/render-routes-native.js +32 -65
- package/lib/route/render-routes-native.js.map +1 -1
- package/lib/route/render-routes.js +54 -85
- package/lib/route/render-routes.js.map +1 -1
- package/lib/route/render-routes.test.js +189 -203
- package/lib/route/render-routes.test.js.map +1 -1
- package/lib/route/root-navigation.js +3 -7
- package/lib/route/root-navigation.js.map +1 -1
- package/lib/route/test-routes.js +1 -3
- package/lib/route/test-routes.js.map +1 -1
- package/lib/route-based-plugin-area/__tests__/higher-order-component-util.test.js +12 -37
- package/lib/route-based-plugin-area/__tests__/higher-order-component-util.test.js.map +1 -1
- package/lib/route-based-plugin-area/__tests__/plugin-api.test.js +11 -13
- package/lib/route-based-plugin-area/__tests__/plugin-api.test.js.map +1 -1
- package/lib/route-based-plugin-area/higher-order-component-util.js +3 -7
- package/lib/route-based-plugin-area/higher-order-component-util.js.map +1 -1
- package/lib/route-based-plugin-area/index.js +2 -18
- package/lib/route-based-plugin-area/index.js.map +1 -1
- package/lib/route-based-plugin-area/plugin-api.js +15 -18
- package/lib/route-based-plugin-area/plugin-api.js.map +1 -1
- package/lib/route-based-plugin-area/plugin-context.js +5 -32
- package/lib/route-based-plugin-area/plugin-context.js.map +1 -1
- package/lib/route-based-plugin-area/route-based-plugin-area.js +12 -39
- package/lib/route-based-plugin-area/route-based-plugin-area.js.map +1 -1
- package/lib/router-factory/index.js +5 -31
- package/lib/router-factory/index.js.map +1 -1
- package/lib/router-factory/index.native.js +5 -31
- package/lib/router-factory/index.native.js.map +1 -1
- package/lib/utils/before-ssr.d.ts +5 -0
- package/lib/utils/before-ssr.js +9 -0
- package/lib/utils/before-ssr.js.map +1 -0
- package/lib/utils/combine.d.ts +1 -0
- package/lib/utils/combine.js +3 -0
- package/lib/utils/combine.js.map +1 -0
- package/lib/utils/hydrate.d.ts +4 -0
- package/lib/utils/hydrate.js +14 -0
- package/lib/utils/hydrate.js.map +1 -0
- package/lib/utils/index.d.ts +3 -0
- package/lib/utils/index.js +5 -18
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/sort-keys.js +5 -13
- package/lib/utils/sort-keys.js.map +1 -1
- package/lib/utils/sort-keys.test.js +3 -5
- package/lib/utils/sort-keys.test.js.map +1 -1
- package/lib/utils/utils.js +1 -5
- package/lib/utils/utils.js.map +1 -1
- package/package.json +5 -4
|
@@ -1,19 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./react-navigation-render"), exports);
|
|
18
|
-
__exportStar(require("./get-navigation-utils"), exports);
|
|
1
|
+
export * from './react-navigation-render';
|
|
2
|
+
export * from './get-navigation-utils';
|
|
19
3
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/route/react-navigation/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/route/react-navigation/index.ts"],"names":[],"mappings":"AAAA,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC"}
|
|
@@ -1,27 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const react_1 = __importDefault(require("react"));
|
|
16
|
-
const native_1 = require("@react-navigation/native");
|
|
17
|
-
const react_test_renderer_1 = require("react-test-renderer");
|
|
18
|
-
const react_native_testing_library_1 = require("react-native-testing-library");
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { NavigationContainer } from "@react-navigation/native";
|
|
3
|
+
import { act } from 'react-test-renderer';
|
|
4
|
+
import { render } from 'react-native-testing-library';
|
|
19
5
|
// Silence the warning https://github.com/facebook/react-native/issues/11094#issuecomment-263240420
|
|
20
6
|
// jest.mock('react-native/Libraries/Animated/src/NativeAnimatedHelper');
|
|
21
7
|
describe('<NavigationContainer />', () => {
|
|
22
|
-
it('should match snapshot', () =>
|
|
23
|
-
const result =
|
|
24
|
-
|
|
25
|
-
})
|
|
8
|
+
it('should match snapshot', async () => {
|
|
9
|
+
const result = render(React.createElement(NavigationContainer, null));
|
|
10
|
+
await act(async () => { expect(result).toMatchSnapshot(); });
|
|
11
|
+
});
|
|
26
12
|
});
|
|
27
13
|
//# sourceMappingURL=react-native.sample.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-native.sample.test.js","sourceRoot":"","sources":["../../../src/route/react-navigation/react-native.sample.test.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"react-native.sample.test.js","sourceRoot":"","sources":["../../../src/route/react-navigation/react-native.sample.test.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAa,MAAM,8BAA8B,CAAC;AAEjE,mGAAmG;AACnG,yEAAyE;AAEzE,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACrC,MAAM,MAAM,GAAG,MAAM,CAAC,oBAAC,mBAAmB,OACpB,CAAC,CAAC;QACxB,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;IAC9D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,64 +1,30 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
-
});
|
|
33
|
-
};
|
|
34
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
-
const React = __importStar(require("react"));
|
|
36
|
-
const react_native_1 = require("react-native");
|
|
37
|
-
const react_native_2 = require("@testing-library/react-native");
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { Button, Text, TextInput, View } from 'react-native';
|
|
3
|
+
import { render, screen, fireEvent } from '@testing-library/react-native';
|
|
38
4
|
function Example() {
|
|
39
5
|
const [name, setUser] = React.useState('');
|
|
40
6
|
const [show, setShow] = React.useState(false);
|
|
41
|
-
return (React.createElement(
|
|
42
|
-
React.createElement(
|
|
43
|
-
React.createElement(
|
|
7
|
+
return (React.createElement(View, null,
|
|
8
|
+
React.createElement(TextInput, { value: name, onChangeText: setUser, testID: "input" }),
|
|
9
|
+
React.createElement(Button, { title: "Print Username", onPress: () => {
|
|
44
10
|
// let's pretend this is making a server request, so it's async
|
|
45
11
|
// (you'd want to mock this imaginary request in your unit tests)...
|
|
46
12
|
setTimeout(() => {
|
|
47
13
|
setShow(true);
|
|
48
14
|
}, Math.floor(Math.random() * 200));
|
|
49
15
|
} }),
|
|
50
|
-
show && React.createElement(
|
|
16
|
+
show && React.createElement(Text, { testID: "printed-username" }, name)));
|
|
51
17
|
}
|
|
52
|
-
test('examples of some things', () =>
|
|
18
|
+
test('examples of some things', async () => {
|
|
53
19
|
const expectedUsername = 'Ada Lovelace';
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
20
|
+
render(React.createElement(Example, null));
|
|
21
|
+
fireEvent.changeText(screen.getByTestId('input'), expectedUsername);
|
|
22
|
+
fireEvent.press(screen.getByText('Print Username'));
|
|
57
23
|
// Using `findBy` query to wait for asynchronous operation to finish
|
|
58
|
-
const usernameOutput =
|
|
24
|
+
const usernameOutput = await screen.findByTestId('printed-username');
|
|
59
25
|
// Using `toHaveTextContent` matcher from `@testing-library/jest-native` package.
|
|
60
26
|
//@ts-ignore
|
|
61
27
|
expect(usernameOutput).toHaveTextContent(expectedUsername);
|
|
62
|
-
expect(
|
|
63
|
-
})
|
|
28
|
+
expect(screen.toJSON()).toMatchSnapshot();
|
|
29
|
+
});
|
|
64
30
|
//# sourceMappingURL=react-native.sample1.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-native.sample1.test.js","sourceRoot":"","sources":["../../../src/route/react-navigation/react-native.sample1.test.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"react-native.sample1.test.js","sourceRoot":"","sources":["../../../src/route/react-navigation/react-native.sample1.test.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAC,MAAM,cAAc,CAAA;AAC1D,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAC,MAAM,+BAA+B,CAAA;AAEvE,SAAS,OAAO;IACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAC1C,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAE7C,OAAO,CACL,oBAAC,IAAI;QACH,oBAAC,SAAS,IAAC,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,EAAC,OAAO,GAAG;QAChE,oBAAC,MAAM,IACL,KAAK,EAAC,gBAAgB,EACtB,OAAO,EAAE,GAAG,EAAE;gBACZ,+DAA+D;gBAC/D,oEAAoE;gBACpE,UAAU,CAAC,GAAG,EAAE;oBACd,OAAO,CAAC,IAAI,CAAC,CAAA;gBACf,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,CAAC,CAAA;YACrC,CAAC,GACD;QACD,IAAI,IAAI,oBAAC,IAAI,IAAC,MAAM,EAAC,kBAAkB,IAAE,IAAI,CAAQ,CACjD,CACR,CAAA;AACH,CAAC;AAED,IAAI,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;IACzC,MAAM,gBAAgB,GAAG,cAAc,CAAA;IAEvC,MAAM,CAAC,oBAAC,OAAO,OAAG,CAAC,CAAA;IAEnB,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAA;IACnE,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAA;IAEnD,oEAAoE;IACpE,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAA;IAEpE,iFAAiF;IACjF,YAAY;IACZ,MAAM,CAAC,cAAc,CAAC,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;IAE1D,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,eAAe,EAAE,CAAA;AAC3C,CAAC,CAAC,CAAA"}
|
|
@@ -1,60 +1,45 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
var t = {};
|
|
4
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
5
|
-
t[p] = s[p];
|
|
6
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
7
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
8
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
9
|
-
t[p[i]] = s[p[i]];
|
|
10
|
-
}
|
|
11
|
-
return t;
|
|
12
|
-
};
|
|
13
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
const react_1 = __importDefault(require("react"));
|
|
18
|
-
const types_1 = require("./types");
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { isStackOrTab } from './types';
|
|
19
3
|
const childrenToRoutes = (children, parentNavigator, parentRouteName) => (childrenProps) => {
|
|
20
4
|
return children.map((child) => resolveRoute(child.name, child, parentNavigator, parentRouteName, childrenProps));
|
|
21
5
|
};
|
|
22
6
|
const withRouteParam = (Component, routeParams) => (args) => {
|
|
23
|
-
var _a, _b, _c;
|
|
24
7
|
// For nested routes we have params inside params along with screen
|
|
25
|
-
const params =
|
|
26
|
-
const notDefinedKeys = routeParams
|
|
8
|
+
const params = args?.route?.params?.params || args?.route?.params || args.initialParams || {};
|
|
9
|
+
const notDefinedKeys = routeParams?.filter((p) => {
|
|
27
10
|
const found = Object.keys(params).includes(p);
|
|
28
11
|
return !found;
|
|
29
12
|
});
|
|
30
|
-
if (notDefinedKeys
|
|
13
|
+
if (notDefinedKeys?.length) {
|
|
31
14
|
throw new Error(`Route params ${notDefinedKeys} are not passed via props`);
|
|
32
15
|
}
|
|
33
|
-
return
|
|
16
|
+
return React.createElement(Component, { ...args });
|
|
34
17
|
};
|
|
35
18
|
const resolveRoute = (routeName, route,
|
|
36
19
|
// parentNavigator: NavigatorItem,
|
|
37
20
|
parentNavigator, parentRouteName, childrenProps = {}) => {
|
|
38
|
-
if (
|
|
21
|
+
if (isStackOrTab(route)) {
|
|
39
22
|
const navigatorRouteName = parentRouteName + (routeName === null ? '' : '.' + routeName);
|
|
40
|
-
const navigator = (props = {}) => (
|
|
23
|
+
const navigator = (props = {}) => (React.createElement(route.container.Navigator, { ...{
|
|
24
|
+
...route.props,
|
|
25
|
+
}, key: navigatorRouteName, children: childrenToRoutes(route.children, route, navigatorRouteName)(props) }));
|
|
41
26
|
if (!parentNavigator) {
|
|
42
27
|
return navigator();
|
|
43
28
|
}
|
|
44
29
|
else {
|
|
45
|
-
return (
|
|
30
|
+
return (React.createElement(parentNavigator.container.Screen, { key: navigatorRouteName, name: navigatorRouteName, children: (props) => {
|
|
46
31
|
return navigator(props);
|
|
47
32
|
} }));
|
|
48
33
|
}
|
|
49
34
|
}
|
|
50
35
|
else {
|
|
51
|
-
const
|
|
36
|
+
const { component: C, ...rest } = route.props;
|
|
52
37
|
const screenName = parentRouteName + '.' + routeName;
|
|
53
|
-
return
|
|
54
|
-
return withRouteParam(C, route.routeParams)(
|
|
55
|
-
} })
|
|
38
|
+
return React.createElement(parentNavigator.container.Screen, { ...rest, key: screenName, name: screenName, children: (props) => {
|
|
39
|
+
return withRouteParam(C, route.routeParams)({ ...rest, ...props, ...childrenProps });
|
|
40
|
+
} });
|
|
56
41
|
}
|
|
57
42
|
};
|
|
58
43
|
const resolveRootRoute = (rootRoute, rootRouteName) => resolveRoute(null, rootRoute, null, rootRouteName);
|
|
59
|
-
|
|
44
|
+
export default resolveRootRoute;
|
|
60
45
|
//# sourceMappingURL=react-navigation-render.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-navigation-render.js","sourceRoot":"","sources":["../../../src/route/react-navigation/react-navigation-render.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"react-navigation-render.js","sourceRoot":"","sources":["../../../src/route/react-navigation/react-navigation-render.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,40 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const react_1 = __importDefault(require("react"));
|
|
1
|
+
import React from 'react';
|
|
16
2
|
// import { Ionicons } from '@expo/vector-icons';
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
3
|
+
import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
|
|
4
|
+
import { createStackNavigator } from '@react-navigation/stack';
|
|
5
|
+
import { render, screen } from '@testing-library/react-native';
|
|
6
|
+
import { NavigationContainer } from '@react-navigation/native';
|
|
7
|
+
import resolveRootRoute from './react-navigation-render';
|
|
8
|
+
import '@testing-library/jest-dom';
|
|
9
|
+
import { Text, View } from 'react-native';
|
|
24
10
|
function DetailsScreen(props) {
|
|
25
11
|
const item = Object.keys(props).find((item) => item === 'navigation') || "";
|
|
26
|
-
return (
|
|
27
|
-
|
|
12
|
+
return (React.createElement(View, null,
|
|
13
|
+
React.createElement(Text, null, item)));
|
|
28
14
|
}
|
|
29
15
|
function SampleComponent(props) {
|
|
30
|
-
return (
|
|
31
|
-
|
|
32
|
-
|
|
16
|
+
return (React.createElement(View, null,
|
|
17
|
+
React.createElement(Text, null, "Showing details for"),
|
|
18
|
+
React.createElement(Text, null, "the number you have chosen is")));
|
|
33
19
|
}
|
|
34
20
|
describe('react-navigation ', () => {
|
|
35
21
|
const rootRoutes = [
|
|
36
22
|
{
|
|
37
|
-
container:
|
|
23
|
+
container: createStackNavigator(),
|
|
38
24
|
name: 'MainStack',
|
|
39
25
|
props: {
|
|
40
26
|
initialRouteName: 'Guest',
|
|
@@ -45,7 +31,7 @@ describe('react-navigation ', () => {
|
|
|
45
31
|
children: [
|
|
46
32
|
{
|
|
47
33
|
name: 'Guest',
|
|
48
|
-
container:
|
|
34
|
+
container: createBottomTabNavigator(),
|
|
49
35
|
props: {
|
|
50
36
|
initialRouteName: 'Home',
|
|
51
37
|
screenOptions: {
|
|
@@ -70,7 +56,7 @@ describe('react-navigation ', () => {
|
|
|
70
56
|
},
|
|
71
57
|
{
|
|
72
58
|
name: 'About',
|
|
73
|
-
container:
|
|
59
|
+
container: createStackNavigator(),
|
|
74
60
|
props: {
|
|
75
61
|
initialRouteName: 'Hello',
|
|
76
62
|
},
|
|
@@ -114,14 +100,14 @@ describe('react-navigation ', () => {
|
|
|
114
100
|
],
|
|
115
101
|
},
|
|
116
102
|
];
|
|
117
|
-
const MainStack = (
|
|
103
|
+
const MainStack = resolveRootRoute(rootRoutes[0], 'MainStack');
|
|
118
104
|
it('test component', () => {
|
|
119
105
|
expect(MainStack).toMatchSnapshot();
|
|
120
106
|
});
|
|
121
|
-
it('tests that child screen component has navigation props ', () =>
|
|
107
|
+
it('tests that child screen component has navigation props ', async () => {
|
|
122
108
|
const sampleRoutes = [
|
|
123
109
|
{
|
|
124
|
-
container:
|
|
110
|
+
container: createStackNavigator(),
|
|
125
111
|
name: 'MainStack',
|
|
126
112
|
props: {
|
|
127
113
|
initialRouteName: 'MainStack.Setting',
|
|
@@ -145,9 +131,9 @@ describe('react-navigation ', () => {
|
|
|
145
131
|
],
|
|
146
132
|
},
|
|
147
133
|
];
|
|
148
|
-
const MainStack = (
|
|
149
|
-
|
|
150
|
-
expect(
|
|
151
|
-
})
|
|
134
|
+
const MainStack = resolveRootRoute(sampleRoutes[0], 'MainStack');
|
|
135
|
+
render(React.createElement(NavigationContainer, null, MainStack));
|
|
136
|
+
expect(await screen.findByText('navigation')).toBeOnTheScreen();
|
|
137
|
+
});
|
|
152
138
|
});
|
|
153
139
|
//# sourceMappingURL=react-navigation-render.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-navigation-render.test.js","sourceRoot":"","sources":["../../../src/route/react-navigation/react-navigation-render.test.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"react-navigation-render.test.js","sourceRoot":"","sources":["../../../src/route/react-navigation/react-navigation-render.test.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,iDAAiD;AACjD,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,gBAAgB,MAAM,2BAA2B,CAAC;AACzD,OAAO,2BAA2B,CAAA;AAClC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAE1C,SAAS,aAAa,CAAC,KAAK;IACxB,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,EAAE,CAAA;IAC3E,OAAO,CACH,oBAAC,IAAI;QACD,oBAAC,IAAI,QAAE,IAAI,CAAQ,CAChB,CACV,CAAC;AACN,CAAC;AAED,SAAS,eAAe,CAAC,KAAK;IAC1B,OAAO,CACH,oBAAC,IAAI;QACD,oBAAC,IAAI,8BAA4B;QACjC,oBAAC,IAAI,wCAAsC,CACxC,CACV,CAAC;AACN,CAAC;AAED,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,MAAM,UAAU,GAAG;QACf;YACI,SAAS,EAAE,oBAAoB,EAAE;YACjC,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE;gBACH,gBAAgB,EAAE,OAAO;gBACzB,aAAa,EAAE;oBACX,WAAW,EAAE,KAAK;iBACrB;aACJ;YACD,QAAQ,EAAE;gBACN;oBACI,IAAI,EAAE,OAAO;oBACb,SAAS,EAAE,wBAAwB,EAAE;oBACrC,KAAK,EAAE;wBACH,gBAAgB,EAAE,MAAM;wBACxB,aAAa,EAAE;4BACX,WAAW,EAAE,KAAK;4BAClB,WAAW,EAAE,OAAO;4BACpB,iFAAiF;yBACpF;qBACJ;oBACD,QAAQ,EAAE;wBACN;4BACI,IAAI,EAAE,MAAM;4BACZ,KAAK,EAAE;gCACH,aAAa,EAAE,EAAE;gCACjB,SAAS,EAAE,eAAe;gCAC1B,OAAO,EAAE;oCACL,WAAW,EAAE,IAAI;oCACjB,WAAW,EAAE,MAAM;oCACnB,WAAW,EAAE,MAAM;oCACnB,+EAA+E;iCAClF;6BACJ;yBACJ;wBACD;4BACI,IAAI,EAAE,OAAO;4BACb,SAAS,EAAE,oBAAoB,EAAE;4BACjC,KAAK,EAAE;gCACH,gBAAgB,EAAE,OAAO;6BAC5B;4BACD,QAAQ,EAAE;gCACN;oCACI,IAAI,EAAE,OAAO;oCACb,KAAK,EAAE;wCACH,aAAa,EAAE,EAAE;wCACjB,SAAS,EAAE,eAAe;wCAC1B,OAAO,EAAE;4CACL,WAAW,EAAE,OAAO;yCACvB;qCACJ;iCACJ;gCACD;oCACI,IAAI,EAAE,cAAc;oCACpB,KAAK,EAAE;wCACH,aAAa,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;wCAC/B,SAAS,EAAE,eAAe;wCAC1B,OAAO,EAAE;4CACL,WAAW,EAAE,eAAe;yCAC/B;qCACJ;iCACJ;6BACJ;yBACJ;qBACJ;iBACJ;gBACD;oBACI,IAAI,EAAE,SAAS;oBACf,KAAK,EAAE;wBACH,aAAa,EAAE,EAAE;wBACjB,SAAS,EAAE,eAAe;wBAC1B,OAAO,EAAE;4BACL,WAAW,EAAE,IAAI;4BACjB,WAAW,EAAE,UAAU;4BACvB,eAAe,EAAE,MAAM;yBAC1B;qBACJ;iBACJ;aACJ;SACJ;KACJ,CAAC;IAEF,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;IAC/D,EAAE,CAAC,gBAAgB,EAAE,GAAG,EAAE;QACtB,MAAM,CAAC,SAAS,CAAC,CAAC,eAAe,EAAE,CAAC;IACxC,CAAC,CAAC,CAAA;IAGF,EAAE,CAAC,yDAAyD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,YAAY,GAAG;YACjB;gBACI,SAAS,EAAE,oBAAoB,EAAE;gBACjC,IAAI,EAAE,WAAW;gBACjB,KAAK,EAAE;oBACH,gBAAgB,EAAE,mBAAmB;oBACrC,aAAa,EAAE;wBACX,WAAW,EAAE,KAAK;qBACrB;iBACJ;gBACD,QAAQ,EAAE;oBACN;wBACI,IAAI,EAAE,SAAS;wBACf,KAAK,EAAE;4BACH,aAAa,EAAE,EAAE;4BACjB,SAAS,EAAE,aAAa;4BACxB,OAAO,EAAE;gCACL,WAAW,EAAE,IAAI;gCACjB,WAAW,EAAE,UAAU;gCACvB,eAAe,EAAE,MAAM;6BAC1B;yBACJ;qBACJ;iBACJ;aACJ;SACJ,CAAC;QAEF,MAAM,SAAS,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;QAEjE,MAAM,CACF,oBAAC,mBAAmB,QACf,SAAS,CACQ,CACzB,CAAC;QACF,MAAM,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;IACpE,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
|
@@ -1,12 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
function navigate(name, params) {
|
|
7
|
-
if (exports.navigationRef.isReady()) {
|
|
8
|
-
exports.navigationRef.navigate(name, params);
|
|
1
|
+
import { createNavigationContainerRef } from '@react-navigation/native';
|
|
2
|
+
export const navigationRef = createNavigationContainerRef();
|
|
3
|
+
export function navigate(name, params) {
|
|
4
|
+
if (navigationRef.isReady()) {
|
|
5
|
+
navigationRef.navigate(name, params);
|
|
9
6
|
}
|
|
10
7
|
}
|
|
11
|
-
exports.navigate = navigate;
|
|
12
8
|
//# sourceMappingURL=root-navigation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"root-navigation.js","sourceRoot":"","sources":["../../../src/route/react-navigation/root-navigation.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"root-navigation.js","sourceRoot":"","sources":["../../../src/route/react-navigation/root-navigation.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAExE,MAAM,CAAC,MAAM,aAAa,GAAG,4BAA4B,EAAE,CAAA;AAE3D,MAAM,UAAU,QAAQ,CAAC,IAAY,EAAE,MAAa;IAClD,IAAI,aAAa,CAAC,OAAO,EAAE,EAAE;QAC3B,aAAa,CAAC,QAAQ,CAAC,IAAa,EAAE,MAAM,CAAC,CAAC;KAC/C;AACH,CAAC"}
|
|
@@ -1,6 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isStackOrTab = void 0;
|
|
4
|
-
const isStackOrTab = (s) => s.hasOwnProperty('children');
|
|
5
|
-
exports.isStackOrTab = isStackOrTab;
|
|
1
|
+
export const isStackOrTab = (s) => s.hasOwnProperty('children');
|
|
6
2
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/route/react-navigation/types.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/route/react-navigation/types.tsx"],"names":[],"mappings":"AA2BA,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAgB,EAAuB,EAAE,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC"}
|
|
@@ -1,68 +1,22 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
-
});
|
|
33
|
-
};
|
|
34
|
-
var __rest = (this && this.__rest) || function (s, e) {
|
|
35
|
-
var t = {};
|
|
36
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
37
|
-
t[p] = s[p];
|
|
38
|
-
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
39
|
-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
40
|
-
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
41
|
-
t[p[i]] = s[p[i]];
|
|
42
|
-
}
|
|
43
|
-
return t;
|
|
44
|
-
};
|
|
45
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
46
|
-
exports.renderRoutes = void 0;
|
|
47
|
-
const React = __importStar(require("react"));
|
|
48
|
-
const react_1 = require("react");
|
|
49
|
-
const react_router_native_1 = require("react-router-native");
|
|
1
|
+
import * as React from 'react';
|
|
2
|
+
import { useEffect, useState } from 'react';
|
|
3
|
+
import { Route, Routes, Navigate } from 'react-router-native';
|
|
50
4
|
function wrapInitialPropsFetch(route, opts) {
|
|
51
|
-
const { component
|
|
5
|
+
const { component, ...restRouteParams } = route;
|
|
52
6
|
let Component = route.component;
|
|
53
7
|
function ComponentWithInitialPropsFetch(props) {
|
|
54
|
-
const [initialProps, setInitialProps] =
|
|
55
|
-
|
|
8
|
+
const [initialProps, setInitialProps] = useState(() => window.g_initialProps);
|
|
9
|
+
useEffect(() => {
|
|
56
10
|
/**
|
|
57
11
|
* 1. 首次渲染时,此时 window.g_initialProps 变量存在,不需要再走一次 getInitialProps,这样一次 SSR 就走了 2 次 getInitialProps
|
|
58
12
|
* 2. 但是路由切换时,window.getInitialProps 会被赋为 null,这时候就走 getInitialProps 逻辑
|
|
59
13
|
* 3. 如果任何时候都走 2 次,配置 forceInitial: true,这个场景用于静态站点的首屏加载希望走最新数据
|
|
60
14
|
* 4. 开启动态加载后,会在执行 getInitialProps 前预加载下
|
|
61
15
|
*/
|
|
62
|
-
const handleGetInitialProps = () =>
|
|
16
|
+
const handleGetInitialProps = async () => {
|
|
63
17
|
// preload when enalbe dynamicImport
|
|
64
18
|
if (Component.preload) {
|
|
65
|
-
const preloadComponent =
|
|
19
|
+
const preloadComponent = await Component.preload();
|
|
66
20
|
// for test case, really use .default
|
|
67
21
|
Component = preloadComponent.default || preloadComponent;
|
|
68
22
|
}
|
|
@@ -87,13 +41,13 @@ function wrapInitialPropsFetch(route, opts) {
|
|
|
87
41
|
// );
|
|
88
42
|
// setInitialProps(initialProps);
|
|
89
43
|
// }
|
|
90
|
-
}
|
|
44
|
+
};
|
|
91
45
|
// null 时,一定会触发 getInitialProps 执行
|
|
92
46
|
if (!window.g_initialProps) {
|
|
93
47
|
handleGetInitialProps();
|
|
94
48
|
}
|
|
95
49
|
}, [window.location.pathname, window.location.search]);
|
|
96
|
-
return React.createElement(Component,
|
|
50
|
+
return React.createElement(Component, { ...props, ...initialProps });
|
|
97
51
|
}
|
|
98
52
|
// flag for having wrappered
|
|
99
53
|
ComponentWithInitialPropsFetch.wrapInitialPropsLoaded = true;
|
|
@@ -101,15 +55,25 @@ function wrapInitialPropsFetch(route, opts) {
|
|
|
101
55
|
return ComponentWithInitialPropsFetch;
|
|
102
56
|
}
|
|
103
57
|
function render({ route, opts, props }) {
|
|
104
|
-
const routes = renderRoutes(
|
|
58
|
+
const routes = renderRoutes({
|
|
59
|
+
...opts,
|
|
60
|
+
routes: route.routes || [],
|
|
61
|
+
rootRoutes: opts.rootRoutes,
|
|
62
|
+
});
|
|
105
63
|
const { component: Component, wrappers } = route;
|
|
106
64
|
if (Component) {
|
|
107
65
|
const defaultPageInitialProps = opts.isServer ? {} : window.g_initialProps;
|
|
108
|
-
const newProps =
|
|
109
|
-
|
|
66
|
+
const newProps = {
|
|
67
|
+
...props,
|
|
68
|
+
...opts.extraProps,
|
|
69
|
+
...(opts.pageInitialProps || defaultPageInitialProps),
|
|
70
|
+
route,
|
|
71
|
+
routes: opts.rootRoutes,
|
|
72
|
+
};
|
|
73
|
+
let element = React.createElement(Component, { ...newProps }, routes);
|
|
110
74
|
if (wrappers) {
|
|
111
75
|
element = wrappers.reduceRight((acc, Wrapper) => {
|
|
112
|
-
return React.createElement(Wrapper,
|
|
76
|
+
return React.createElement(Wrapper, { ...newProps }, acc);
|
|
113
77
|
}, element);
|
|
114
78
|
}
|
|
115
79
|
return element;
|
|
@@ -125,7 +89,7 @@ function getRouteElement({ route, index, opts }) {
|
|
|
125
89
|
path: route.path,
|
|
126
90
|
};
|
|
127
91
|
if (route.redirect) {
|
|
128
|
-
return React.createElement(
|
|
92
|
+
return React.createElement(Route, { key: route.key || index, path: route.path, element: React.createElement(Navigate, { to: route.redirect, replace: true }) });
|
|
129
93
|
}
|
|
130
94
|
// avoid mount and unmount with url hash change
|
|
131
95
|
// @sri not supproted yet
|
|
@@ -140,20 +104,23 @@ function getRouteElement({ route, index, opts }) {
|
|
|
140
104
|
// // client Render for enable ssr, but not sure SSR success
|
|
141
105
|
// route.component = wrapInitialPropsFetch(route, opts);
|
|
142
106
|
// }
|
|
143
|
-
return (React.createElement(
|
|
107
|
+
return (React.createElement(Route, { key: route.key || index, path: route.path, element: React.createElement(RouteElementWrapper, { route: route, render: render, opts: opts }) }));
|
|
144
108
|
}
|
|
145
109
|
function RouteElementWrapper({ route, render, opts }) {
|
|
146
110
|
const element = render({ route, opts, props: {} });
|
|
147
111
|
return React.createElement(React.Fragment, null, element);
|
|
148
112
|
}
|
|
149
113
|
function renderRoutes(opts) {
|
|
150
|
-
return opts.routes ? (React.createElement(
|
|
114
|
+
return opts.routes ? (React.createElement(Routes, null, opts.routes.map((route, index) => {
|
|
151
115
|
return getRouteElement({
|
|
152
116
|
route,
|
|
153
117
|
index,
|
|
154
|
-
opts:
|
|
118
|
+
opts: {
|
|
119
|
+
...opts,
|
|
120
|
+
rootRoutes: opts.rootRoutes || opts.routes,
|
|
121
|
+
},
|
|
155
122
|
});
|
|
156
123
|
}))) : null;
|
|
157
124
|
}
|
|
158
|
-
|
|
125
|
+
export { renderRoutes };
|
|
159
126
|
//# sourceMappingURL=render-routes-native.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-routes-native.js","sourceRoot":"","sources":["../../src/route/render-routes-native.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"render-routes-native.js","sourceRoot":"","sources":["../../src/route/render-routes-native.tsx"],"names":[],"mappings":"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"}
|