@common-stack/client-react 0.2.21 → 0.2.23
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/connector/connector.native.d.ts +1 -1
- package/lib/interfaces/menu.d.ts +1 -0
- package/lib/interfaces/menu.js.map +1 -1
- package/lib/interfaces/router.d.ts +11 -0
- package/lib/route/react-navigation/get-navigation-utils.d.ts +3 -2
- package/lib/route/react-navigation/get-navigation-utils.js +29 -4
- package/lib/route/react-navigation/get-navigation-utils.js.map +1 -1
- package/lib/route/react-navigation/get-navigation-utils.test.js +62 -0
- package/lib/route/react-navigation/get-navigation-utils.test.js.map +1 -1
- package/lib/route/react-navigation/react-navigation-render.js +11 -1
- package/lib/route/react-navigation/react-navigation-render.js.map +1 -1
- package/lib/route/react-navigation/react-navigation-render.test.js +8 -0
- package/lib/route/react-navigation/react-navigation-render.test.js.map +1 -1
- package/package.json +4 -4
|
@@ -5,5 +5,5 @@ export declare class Feature extends BaseFeature implements IReactFeature {
|
|
|
5
5
|
protected renderRoutes: (args: any) => JSX.Element;
|
|
6
6
|
protected renderRoutes2: (arg1: any, arg2: any) => JSX.Element;
|
|
7
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;
|
|
8
|
-
protected getSortedRoutes2: (path: string, routeData: import("../interfaces").IRouteData, authWrapper?: any) => any;
|
|
8
|
+
protected getSortedRoutes2: (path: string, routeData: import("../interfaces").IRouteData, authWrapper?: (component: import("react").FC<{}>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => any;
|
|
9
9
|
}
|
package/lib/interfaces/menu.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.js","sourceRoot":"","sources":["../../src/interfaces/menu.tsx"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"menu.js","sourceRoot":"","sources":["../../src/interfaces/menu.tsx"],"names":[],"mappings":";;;AAsGA,IAAY,aAMX;AAND,WAAY,aAAa;IACrB,8BAAa,CAAA;IACb,gCAAe,CAAA;IACf,kCAAiB,CAAA;IACjB,gCAAe,CAAA;IACf,kCAAiB,CAAA;AACrB,CAAC,EANW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAMxB"}
|
|
@@ -12,14 +12,25 @@ export interface ICoreRouteData<T> {
|
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
14
|
interface CommonMenuData {
|
|
15
|
+
/** @name hideSelf and children in menu */
|
|
15
16
|
hideInMenu?: boolean;
|
|
17
|
+
/** @name Hide child nodes in the menu */
|
|
16
18
|
hideChildrenInMenu?: boolean;
|
|
19
|
+
/** @name Internationalization key for custom menus */
|
|
17
20
|
locale?: string | false;
|
|
21
|
+
/** @name The name of the menu */
|
|
18
22
|
name?: string;
|
|
23
|
+
/** @name is used to calibrate the selected value, default is path */
|
|
19
24
|
key?: string;
|
|
25
|
+
/** @name Icon of the menu */
|
|
20
26
|
icon?: any;
|
|
27
|
+
/** @name disable menu option */
|
|
28
|
+
disabled?: boolean;
|
|
29
|
+
/** @name hides itself and elevates child nodes to its level */
|
|
30
|
+
flatMenu?: boolean;
|
|
21
31
|
}
|
|
22
32
|
export interface IMappedData extends CommonMenuData {
|
|
33
|
+
/** @name path */
|
|
23
34
|
path?: string;
|
|
24
35
|
component?: any;
|
|
25
36
|
route?: string;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ReactElement } from 'react';
|
|
1
2
|
import { IRouteData } from '../../interfaces';
|
|
2
|
-
export declare const getSortedNavigations: (path: string, routeData: IRouteData, authWrapper?:
|
|
3
|
-
export declare function getNavigation(path: string, routeData: any): any;
|
|
3
|
+
export declare const getSortedNavigations: (path: string, routeData: IRouteData, authWrapper?: (component: React.FC) => ReactElement) => any;
|
|
4
|
+
export declare function getNavigation(path: string, routeData: any, authWrapper?: ((component: React.FC, unauthenticatedComponent: React.FC) => ReactElement)): any;
|
|
@@ -12,15 +12,33 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.getNavigation = exports.getSortedNavigations = void 0;
|
|
15
|
+
const lodash_1 = require("lodash");
|
|
15
16
|
const interfaces_1 = require("../../interfaces");
|
|
16
17
|
const utils_1 = require("../../utils");
|
|
17
|
-
// TODO need to use authWrapper
|
|
18
18
|
const getSortedNavigations = (path, routeData, authWrapper) => {
|
|
19
19
|
const sortedRoutes = (0, utils_1.sortKeys)(routeData);
|
|
20
|
-
|
|
20
|
+
const result = addRouteParams(getNavigation(path, sortedRoutes, authWrapper));
|
|
21
|
+
return result;
|
|
21
22
|
};
|
|
22
23
|
exports.getSortedNavigations = getSortedNavigations;
|
|
23
|
-
|
|
24
|
+
const addRouteParams = (result, routeParams = []) => {
|
|
25
|
+
return result.map((item) => {
|
|
26
|
+
var _a;
|
|
27
|
+
let params = routeParams;
|
|
28
|
+
if (params.length && !item.container) {
|
|
29
|
+
item.routeParams = params;
|
|
30
|
+
}
|
|
31
|
+
if ((_a = item === null || item === void 0 ? void 0 : item.children) === null || _a === void 0 ? void 0 : _a.length) {
|
|
32
|
+
if (item.path !== '/' && item.path.includes(":")) {
|
|
33
|
+
const matched = item.path.match(/:([^\/]+)/g);
|
|
34
|
+
params = (0, lodash_1.uniq)(params.concat(...matched.map((item) => item.replace(':', ""))));
|
|
35
|
+
}
|
|
36
|
+
item.children = addRouteParams(item.children, (0, lodash_1.uniq)(params));
|
|
37
|
+
}
|
|
38
|
+
return item;
|
|
39
|
+
});
|
|
40
|
+
};
|
|
41
|
+
function getNavigation(path, routeData, authWrapper) {
|
|
24
42
|
if (!path.startsWith('/')) {
|
|
25
43
|
throw new Error('Invalid path!');
|
|
26
44
|
}
|
|
@@ -41,6 +59,7 @@ function getNavigation(path, routeData) {
|
|
|
41
59
|
position: interfaces_1.IMenuPosition.LOGO,
|
|
42
60
|
};
|
|
43
61
|
mappedMenuPaths.forEach(routeItem => {
|
|
62
|
+
var _a, _b, _c;
|
|
44
63
|
const children = routeItem.route.split('/');
|
|
45
64
|
children.shift();
|
|
46
65
|
// if the route is `/` then add this correction.
|
|
@@ -71,7 +90,13 @@ function getNavigation(path, routeData) {
|
|
|
71
90
|
}
|
|
72
91
|
const { route: ignore, auth } = routeItem, rest = __rest(routeItem, ["route", "auth"]);
|
|
73
92
|
const pathParams = (0, utils_1.formatSlash)(routeItem.route);
|
|
74
|
-
lastNode.children.push(Object.assign(Object.assign(Object.assign({}, rest),
|
|
93
|
+
lastNode.children.push(Object.assign(Object.assign(Object.assign(Object.assign({}, rest), (!(0, lodash_1.isEmpty)(rest.props) && {
|
|
94
|
+
props: Object.assign(Object.assign({}, rest.props), (rest.props.component
|
|
95
|
+
&& {
|
|
96
|
+
component: (auth && authWrapper) ?
|
|
97
|
+
authWrapper((_a = rest.props) === null || _a === void 0 ? void 0 : _a.component, (_b = rest.props) === null || _b === void 0 ? void 0 : _b.unauthenticatedComponent) : (_c = rest.props) === null || _c === void 0 ? void 0 : _c.component
|
|
98
|
+
}))
|
|
99
|
+
})), pathParams), { exact: routeData[routeItem.route].hasOwnProperty('exact') ? routeData[routeItem.route].exact : true }));
|
|
75
100
|
});
|
|
76
101
|
return root.children;
|
|
77
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-navigation-utils.js","sourceRoot":"","sources":["../../../src/route/react-navigation/get-navigation-utils.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"get-navigation-utils.js","sourceRoot":"","sources":["../../../src/route/react-navigation/get-navigation-utils.tsx"],"names":[],"mappings":"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"}
|
|
@@ -86,6 +86,63 @@ describe('getRoutes utility with basic routes', () => {
|
|
|
86
86
|
exact: false,
|
|
87
87
|
},
|
|
88
88
|
};
|
|
89
|
+
const routerConfig2 = {
|
|
90
|
+
['/']: {
|
|
91
|
+
exact: false,
|
|
92
|
+
container: (0, stack_1.createStackNavigator)(),
|
|
93
|
+
name: 'MainStack',
|
|
94
|
+
props: {
|
|
95
|
+
initialRouteName: 'Guest',
|
|
96
|
+
screenOptions: {
|
|
97
|
+
headerShown: false,
|
|
98
|
+
},
|
|
99
|
+
},
|
|
100
|
+
},
|
|
101
|
+
['//:guest']: {
|
|
102
|
+
container: (0, bottom_tabs_1.createBottomTabNavigator)(),
|
|
103
|
+
exact: false,
|
|
104
|
+
name: 'Guest',
|
|
105
|
+
props: {
|
|
106
|
+
initialRouteName: 'Home',
|
|
107
|
+
screenOptions: {
|
|
108
|
+
headerShown: false,
|
|
109
|
+
tabBarLabel: 'About',
|
|
110
|
+
// tabBarIcon: ({ color }) => <Ionicons name="person" size={24} color={color} />,
|
|
111
|
+
},
|
|
112
|
+
},
|
|
113
|
+
},
|
|
114
|
+
['//:guest/home']: {
|
|
115
|
+
name: 'Home',
|
|
116
|
+
props: {
|
|
117
|
+
initialParams: {},
|
|
118
|
+
component: MyComponent,
|
|
119
|
+
options: {
|
|
120
|
+
headerShown: true,
|
|
121
|
+
tabBarLabel: 'Home',
|
|
122
|
+
headerTitle: 'Home',
|
|
123
|
+
// tabBarIcon: ({ color }) => <Ionicons name="home" size={24} color={color} />,
|
|
124
|
+
},
|
|
125
|
+
},
|
|
126
|
+
},
|
|
127
|
+
['//:guest/home/:about']: {
|
|
128
|
+
exact: false,
|
|
129
|
+
container: (0, stack_1.createStackNavigator)(),
|
|
130
|
+
name: 'About',
|
|
131
|
+
props: {
|
|
132
|
+
initialRouteName: 'Hello',
|
|
133
|
+
},
|
|
134
|
+
},
|
|
135
|
+
['//:guest/home/:about/info']: {
|
|
136
|
+
name: 'Info',
|
|
137
|
+
props: {
|
|
138
|
+
initialParams: {},
|
|
139
|
+
component: MyComponent,
|
|
140
|
+
options: {
|
|
141
|
+
headerTitle: 'Info',
|
|
142
|
+
},
|
|
143
|
+
},
|
|
144
|
+
},
|
|
145
|
+
};
|
|
89
146
|
it('getNavigation ', () => {
|
|
90
147
|
const Navigation = (0, get_navigation_utils_1.getNavigation)('/', routerConfig1);
|
|
91
148
|
expect(Navigation).toMatchSnapshot();
|
|
@@ -97,5 +154,10 @@ describe('getRoutes utility with basic routes', () => {
|
|
|
97
154
|
const Render = feature.getRoutes2('/', 'MainStack');
|
|
98
155
|
expect(Render).toMatchSnapshot();
|
|
99
156
|
});
|
|
157
|
+
it('Add routeParams parameter', () => {
|
|
158
|
+
const feature = new connector_native_1.Feature({ routeConfig: routerConfig2 });
|
|
159
|
+
const Nav = feature.getConfiguredRoutes2('/');
|
|
160
|
+
expect(Nav).toMatchSnapshot();
|
|
161
|
+
});
|
|
100
162
|
});
|
|
101
163
|
//# sourceMappingURL=get-navigation-utils.test.js.map
|
|
@@ -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,iEAAuD;AACvD,mDAA+D;AAC/D,+DAAyE;AACzE,uEAA2D;AAE3D,MAAM,WAAW,GAAG,GAAG,EAAE,
|
|
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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"}
|
|
@@ -19,6 +19,16 @@ const types_1 = require("./types");
|
|
|
19
19
|
const childrenToRoutes = (children, parentNavigator, parentRouteName) => {
|
|
20
20
|
return children.map((child) => resolveRoute(child.name, child, parentNavigator, parentRouteName));
|
|
21
21
|
};
|
|
22
|
+
const withRouteParam = (Component, routeParams) => (args) => {
|
|
23
|
+
const notDefinedKeys = routeParams === null || routeParams === void 0 ? void 0 : routeParams.filter((p) => {
|
|
24
|
+
const found = Object.keys(args.route.params).includes(p);
|
|
25
|
+
return !found;
|
|
26
|
+
});
|
|
27
|
+
if (notDefinedKeys === null || notDefinedKeys === void 0 ? void 0 : notDefinedKeys.length) {
|
|
28
|
+
throw new Error(`Route params ${notDefinedKeys} are not passed via props`);
|
|
29
|
+
}
|
|
30
|
+
return react_1.default.createElement(Component, Object.assign({}, args));
|
|
31
|
+
};
|
|
22
32
|
const resolveRoute = (routeName, route,
|
|
23
33
|
// parentNavigator: NavigatorItem,
|
|
24
34
|
parentNavigator, parentRouteName) => {
|
|
@@ -35,7 +45,7 @@ parentNavigator, parentRouteName) => {
|
|
|
35
45
|
else {
|
|
36
46
|
const _a = route.props, { component: C } = _a, rest = __rest(_a, ["component"]);
|
|
37
47
|
const screenName = parentRouteName + '.' + routeName;
|
|
38
|
-
return react_1.default.createElement(parentNavigator.container.Screen, Object.assign({}, rest, { key: screenName, name: screenName, children: (
|
|
48
|
+
return react_1.default.createElement(parentNavigator.container.Screen, Object.assign({}, rest, { key: screenName, name: screenName, children: withRouteParam(C, route.routeParams) }));
|
|
39
49
|
}
|
|
40
50
|
};
|
|
41
51
|
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;IACA,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;AACtG,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CACjB,SAAwB,EACxB,KAAU;AACV,kCAAkC;AAClC,eAAoB,EACpB,eAAuB,EACzB,EAAE;IACA,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;QACrB,MAAM,kBAAkB,GAAG,eAAe,GAAG,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;QACzF,MAAM,SAAS,GAAG,CACd,8BAAC,KAAK,CAAC,SAAS,CAAC,SAAS,oBAClB,KAAK,CAAC,KAAK,IACf,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,IACvE,CACL,CAAC;QACF,IAAI,CAAC,eAAe,EAAE;YAClB,OAAO,SAAS,CAAC;SACpB;aAAM;YACH,OAAO,CACH,8BAAC,eAAe,CAAC,SAAS,CAAC,MAAM,IAC7B,GAAG,EAAE,kBAAkB,EACvB,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS,GAC3B,CACL,CAAC;SACL;KACJ;SAAM;QACH,MAAM,KAA4B,KAAK,CAAC,KAAK,EAAvC,EAAE,SAAS,EAAE,CAAC,OAAyB,EAApB,IAAI,cAAvB,aAAyB,CAAc,CAAC;QAC9C,MAAM,UAAU,GAAG,eAAe,GAAG,GAAG,GAAG,SAAS,CAAC;QACrD,OAAO,8BAAC,eAAe,CAAC,SAAS,CAAC,MAAM,oBAAK,IAAI,IAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,
|
|
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;IACA,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;AACtG,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,SAAS,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,EAAE;IACxD,MAAM,cAAc,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QAC7C,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACzD,OAAO,CAAC,KAAK,CAAC;IAClB,CAAC,CAAC,CAAA;IACF,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,gBAAgB,cAAc,2BAA2B,CAAC,CAAA;KAC7E;IACD,OAAO,8BAAC,SAAS,oBAAK,IAAI,EAAI,CAAA;AAClC,CAAC,CAAA;AAED,MAAM,YAAY,GAAG,CACjB,SAAwB,EACxB,KAAU;AACV,kCAAkC;AAClC,eAAoB,EACpB,eAAuB,EACzB,EAAE;IACA,IAAI,IAAA,oBAAY,EAAC,KAAK,CAAC,EAAE;QACrB,MAAM,kBAAkB,GAAG,eAAe,GAAG,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC;QACzF,MAAM,SAAS,GAAG,CACd,8BAAC,KAAK,CAAC,SAAS,CAAC,SAAS,oBAClB,KAAK,CAAC,KAAK,IACf,GAAG,EAAE,kBAAkB,EACvB,QAAQ,EAAE,gBAAgB,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,kBAAkB,CAAC,IACvE,CACL,CAAC;QACF,IAAI,CAAC,eAAe,EAAE;YAClB,OAAO,SAAS,CAAC;SACpB;aAAM;YACH,OAAO,CACH,8BAAC,eAAe,CAAC,SAAS,CAAC,MAAM,IAC7B,GAAG,EAAE,kBAAkB,EACvB,IAAI,EAAE,kBAAkB,EACxB,QAAQ,EAAE,GAAG,EAAE,CAAC,SAAS,GAC3B,CACL,CAAC;SACL;KACJ;SAAM;QACH,MAAM,KAA4B,KAAK,CAAC,KAAK,EAAvC,EAAE,SAAS,EAAE,CAAC,OAAyB,EAApB,IAAI,cAAvB,aAAyB,CAAc,CAAC;QAC9C,MAAM,UAAU,GAAG,eAAe,GAAG,GAAG,GAAG,SAAS,CAAC;QACrD,OAAO,8BAAC,eAAe,CAAC,SAAS,CAAC,MAAM,oBAAK,IAAI,IAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC;KAC5I;AACL,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,SAAc,EAAE,aAAqB,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,aAAa,CAAC,CAAC;AAEvH,kBAAe,gBAAgB,CAAC"}
|
|
@@ -8,6 +8,10 @@ const react_1 = __importDefault(require("react"));
|
|
|
8
8
|
const stack_1 = require("@react-navigation/stack");
|
|
9
9
|
const bottom_tabs_1 = require("@react-navigation/bottom-tabs");
|
|
10
10
|
const react_navigation_render_1 = __importDefault(require("./react-navigation-render"));
|
|
11
|
+
const enzyme_1 = require("enzyme");
|
|
12
|
+
const enzyme_adapter_react_17_1 = __importDefault(require("@wojtekmaj/enzyme-adapter-react-17"));
|
|
13
|
+
const native_1 = require("@react-navigation/native");
|
|
14
|
+
(0, enzyme_1.configure)({ adapter: new enzyme_adapter_react_17_1.default() });
|
|
11
15
|
const SampleComponent = () => react_1.default.createElement(react_1.default.Fragment, null);
|
|
12
16
|
// export const Navigation = () => {
|
|
13
17
|
describe('react-navigation ', () => {
|
|
@@ -97,5 +101,9 @@ describe('react-navigation ', () => {
|
|
|
97
101
|
it('test component', () => {
|
|
98
102
|
expect(MainStack).toMatchSnapshot();
|
|
99
103
|
});
|
|
104
|
+
it('tests that child screen component has navigation props ', () => {
|
|
105
|
+
const wrapper = (0, enzyme_1.mount)(react_1.default.createElement(native_1.NavigationContainer, null, MainStack));
|
|
106
|
+
expect(wrapper.find(SampleComponent).props()).toHaveProperty('navigation');
|
|
107
|
+
});
|
|
100
108
|
});
|
|
101
109
|
//# 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":";;;;;AAAA,kDAA0B;AAC1B,iDAAiD;AACjD,mDAA+D;AAC/D,+DAAyE;AAGzE,wFAAyD;
|
|
1
|
+
{"version":3,"file":"react-navigation-render.test.js","sourceRoot":"","sources":["../../../src/route/react-navigation/react-navigation-render.test.tsx"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,iDAAiD;AACjD,mDAA+D;AAC/D,+DAAyE;AAGzE,wFAAyD;AACzD,mCAAmD;AACnD,iGAAyD;AACzD,qDAA+D;AAE/D,IAAA,kBAAS,EAAC,EAAE,OAAO,EAAE,IAAI,iCAAO,EAAE,EAAE,CAAC,CAAC;AACtC,MAAM,eAAe,GAAG,GAAG,EAAE,CAAC,6DAAK,CAAA;AACnC,oCAAoC;AACpC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;IAC/B,MAAM,UAAU,GAAG;QACf;YACI,SAAS,EAAE,IAAA,4BAAoB,GAAE;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,IAAA,sCAAwB,GAAE;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,IAAA,4BAAoB,GAAE;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,IAAA,iCAAgB,EAAC,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;IAEF,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QAC/D,MAAM,OAAO,GAAG,IAAA,cAAK,EACjB,8BAAC,4BAAmB,QACf,SAAS,CACQ,CAAC,CAAC;QAC5B,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAA;AACN,CAAC,CAAC,CAAA"}
|
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.23",
|
|
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": "^0.2.
|
|
36
|
-
"@common-stack/core": "^0.2.
|
|
35
|
+
"@common-stack/client-core": "^0.2.23",
|
|
36
|
+
"@common-stack/core": "^0.2.23",
|
|
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": "b4bc4d41d8b4bd0fcd546a80ece0b0fe368cd9ac",
|
|
68
68
|
"typescript": {
|
|
69
69
|
"definition": "lib/index.d.ts"
|
|
70
70
|
}
|