@common-stack/client-react 0.2.29 → 0.2.30
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.
|
@@ -16,12 +16,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
const react_1 = __importDefault(require("react"));
|
|
18
18
|
const types_1 = require("./types");
|
|
19
|
-
const childrenToRoutes = (children, parentNavigator, parentRouteName) => {
|
|
20
|
-
return children.map((child) => resolveRoute(child.name, child, parentNavigator, parentRouteName));
|
|
19
|
+
const childrenToRoutes = (children, parentNavigator, parentRouteName) => (childrenProps) => {
|
|
20
|
+
return children.map((child) => resolveRoute(child.name, child, parentNavigator, parentRouteName, childrenProps));
|
|
21
21
|
};
|
|
22
22
|
const withRouteParam = (Component, routeParams) => (args) => {
|
|
23
|
+
var _a;
|
|
24
|
+
// For nested routes we have params inside params along with screen
|
|
25
|
+
const params = ((_a = args.route.params) === null || _a === void 0 ? void 0 : _a.params) || args.route.params;
|
|
23
26
|
const notDefinedKeys = routeParams === null || routeParams === void 0 ? void 0 : routeParams.filter((p) => {
|
|
24
|
-
const found = Object.keys(
|
|
27
|
+
const found = Object.keys(params).includes(p);
|
|
25
28
|
return !found;
|
|
26
29
|
});
|
|
27
30
|
if (notDefinedKeys === null || notDefinedKeys === void 0 ? void 0 : notDefinedKeys.length) {
|
|
@@ -31,21 +34,25 @@ const withRouteParam = (Component, routeParams) => (args) => {
|
|
|
31
34
|
};
|
|
32
35
|
const resolveRoute = (routeName, route,
|
|
33
36
|
// parentNavigator: NavigatorItem,
|
|
34
|
-
parentNavigator, parentRouteName) => {
|
|
37
|
+
parentNavigator, parentRouteName, childrenProps = {}) => {
|
|
35
38
|
if ((0, types_1.isStackOrTab)(route)) {
|
|
36
39
|
const navigatorRouteName = parentRouteName + (routeName === null ? '' : '.' + routeName);
|
|
37
|
-
const navigator = (react_1.default.createElement(route.container.Navigator, Object.assign({}, route.props, { key: navigatorRouteName, children: childrenToRoutes(route.children, route, navigatorRouteName) })));
|
|
40
|
+
const navigator = (props = {}) => (react_1.default.createElement(route.container.Navigator, Object.assign({}, Object.assign({}, route.props), { key: navigatorRouteName, children: childrenToRoutes(route.children, route, navigatorRouteName)(props) })));
|
|
38
41
|
if (!parentNavigator) {
|
|
39
|
-
return navigator;
|
|
42
|
+
return navigator();
|
|
40
43
|
}
|
|
41
44
|
else {
|
|
42
|
-
return (react_1.default.createElement(parentNavigator.container.Screen, { key: navigatorRouteName, name: navigatorRouteName, children: () =>
|
|
45
|
+
return (react_1.default.createElement(parentNavigator.container.Screen, { key: navigatorRouteName, name: navigatorRouteName, children: (props) => {
|
|
46
|
+
return navigator(props);
|
|
47
|
+
} }));
|
|
43
48
|
}
|
|
44
49
|
}
|
|
45
50
|
else {
|
|
46
51
|
const _a = route.props, { component: C } = _a, rest = __rest(_a, ["component"]);
|
|
47
52
|
const screenName = parentRouteName + '.' + routeName;
|
|
48
|
-
return react_1.default.createElement(parentNavigator.container.Screen, Object.assign({}, rest, { key: screenName, name: screenName, children:
|
|
53
|
+
return react_1.default.createElement(parentNavigator.container.Screen, Object.assign({}, rest, { key: screenName, name: screenName, children: (props) => {
|
|
54
|
+
return withRouteParam(C, route.routeParams)(Object.assign(Object.assign(Object.assign({}, rest), props), childrenProps));
|
|
55
|
+
} }));
|
|
49
56
|
}
|
|
50
57
|
};
|
|
51
58
|
const resolveRootRoute = (rootRoute, rootRouteName) => resolveRoute(null, rootRoute, null, rootRouteName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"react-navigation-render.js","sourceRoot":"","sources":["../../../src/route/react-navigation/react-navigation-render.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAA0B;AAC1B,mCAAsD;AAEtD,MAAM,gBAAgB,GAAG,CACrB,QAA8C,EAC9C,eAA8B,EAC9B,eAAuB,EACzB,EAAE;
|
|
1
|
+
{"version":3,"file":"react-navigation-render.js","sourceRoot":"","sources":["../../../src/route/react-navigation/react-navigation-render.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@common-stack/client-react",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.30",
|
|
4
4
|
"description": "browser plugin for git",
|
|
5
5
|
"homepage": "https://github.com/cdmbase/fullstack-pro#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -32,8 +32,8 @@
|
|
|
32
32
|
"@types/react-dom": "^17.0.0"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@common-stack/client-core": "
|
|
36
|
-
"@common-stack/core": "
|
|
35
|
+
"@common-stack/client-core": "0.2.30",
|
|
36
|
+
"@common-stack/core": "0.2.30",
|
|
37
37
|
"@wordpress/hooks": "^2.10.0",
|
|
38
38
|
"browser-bunyan": "^1.6.3",
|
|
39
39
|
"history-with-query": "^4.10.4",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"publishConfig": {
|
|
65
65
|
"access": "public"
|
|
66
66
|
},
|
|
67
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "dc66512a9c1ed3e49ae49db8acc6b32071fdaf22",
|
|
68
68
|
"typescript": {
|
|
69
69
|
"definition": "lib/index.d.ts"
|
|
70
70
|
}
|