@tarojs/router-rn 3.4.0-beta.0 → 3.4.0
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/dist/rootNavigation.js +17 -9
- package/dist/rootNavigation.js.map +1 -1
- package/dist/router.js +8 -1
- package/dist/router.js.map +1 -1
- package/package.json +2 -2
- package/src/rootNavigation.ts +16 -9
- package/src/router.ts +7 -1
package/dist/rootNavigation.js
CHANGED
|
@@ -37,7 +37,7 @@ export function navigate(option, method) {
|
|
|
37
37
|
else if (method === 'redirectTo') {
|
|
38
38
|
(_b = navigationRef.current) === null || _b === void 0 ? void 0 : _b.dispatch(StackActions.replace(routeParam.pageName, routeParam.params));
|
|
39
39
|
}
|
|
40
|
-
else if (method === 'switchTab') {
|
|
40
|
+
else if (method === 'switchTab' || (method === 'reLaunch' && isTabPage(path))) {
|
|
41
41
|
const states = (_c = navigationRef.current) === null || _c === void 0 ? void 0 : _c.getRootState();
|
|
42
42
|
if ((states === null || states === void 0 ? void 0 : states.routes[0].name) !== 'tabNav') {
|
|
43
43
|
states && (states === null || states === void 0 ? void 0 : states.routes.length) > 1 && ((_d = navigationRef.current) === null || _d === void 0 ? void 0 : _d.dispatch(StackActions.popToTop()));
|
|
@@ -51,17 +51,25 @@ export function navigate(option, method) {
|
|
|
51
51
|
else if (method === 'navigateBack') {
|
|
52
52
|
const number = option.delta ? option.delta : 1;
|
|
53
53
|
const states = (_g = navigationRef.current) === null || _g === void 0 ? void 0 : _g.getRootState();
|
|
54
|
-
|
|
55
|
-
|
|
54
|
+
if ((states === null || states === void 0 ? void 0 : states.index) === 0) {
|
|
55
|
+
errMsg = 'navigateBack:fail cannot navigate back at first page.';
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
const index = number && ((states && states.index < number) ? states === null || states === void 0 ? void 0 : states.index : number);
|
|
59
|
+
(_h = navigationRef.current) === null || _h === void 0 ? void 0 : _h.dispatch(StackActions.pop(index));
|
|
60
|
+
}
|
|
56
61
|
}
|
|
57
62
|
else if (method === 'reLaunch') {
|
|
58
63
|
if (isTabPage()) {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
: (_k = navigationRef.current) === null || _k === void 0 ? void 0 : _k.dispatch(StackActions.push(routeParam.pageName, routeParam.params));
|
|
64
|
+
// tabbar to stack page
|
|
65
|
+
(_j = navigationRef.current) === null || _j === void 0 ? void 0 : _j.dispatch(StackActions.replace(routeParam.pageName, routeParam.params));
|
|
62
66
|
}
|
|
63
67
|
else {
|
|
64
|
-
|
|
68
|
+
// stack to stack page
|
|
69
|
+
const states = (_k = navigationRef.current) === null || _k === void 0 ? void 0 : _k.getRootState();
|
|
70
|
+
if ((states === null || states === void 0 ? void 0 : states.index) !== 0) {
|
|
71
|
+
(_l = navigationRef.current) === null || _l === void 0 ? void 0 : _l.dispatch(StackActions.popToTop());
|
|
72
|
+
}
|
|
65
73
|
(_m = navigationRef.current) === null || _m === void 0 ? void 0 : _m.dispatch(StackActions.replace(routeParam.pageName, routeParam.params));
|
|
66
74
|
}
|
|
67
75
|
}
|
|
@@ -94,7 +102,7 @@ export function isTabPage(path = '') {
|
|
|
94
102
|
const tabPages = getTabBarPages();
|
|
95
103
|
let pageName = '';
|
|
96
104
|
if (path) {
|
|
97
|
-
pageName = camelCase(path.startsWith('/') ? path : `/${path}`);
|
|
105
|
+
pageName = camelCase((path.startsWith('/') ? path : `/${path}`).split('?')[0]);
|
|
98
106
|
}
|
|
99
107
|
else {
|
|
100
108
|
const route = ((_a = navigationRef.current) === null || _a === void 0 ? void 0 : _a.getCurrentRoute()) || {};
|
|
@@ -113,7 +121,7 @@ export function getCurrentRoute() {
|
|
|
113
121
|
if (item.name === 'tabNav') {
|
|
114
122
|
const index = (_b = (_a = item.state) === null || _a === void 0 ? void 0 : _a.index) !== null && _b !== void 0 ? _b : 0;
|
|
115
123
|
const tabRoutes = (_d = (_c = item.state) === null || _c === void 0 ? void 0 : _c.routes) !== null && _d !== void 0 ? _d : [];
|
|
116
|
-
tabRoutes && routeKeys.push(tabRoutes[index].key);
|
|
124
|
+
(tabRoutes === null || tabRoutes === void 0 ? void 0 : tabRoutes[index]) && routeKeys.push(tabRoutes[index].key);
|
|
117
125
|
}
|
|
118
126
|
else {
|
|
119
127
|
routeKeys.push(item.key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rootNavigation.js","sourceRoot":"","sources":["../src/rootNavigation.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAClC,OAAO,EAAE,YAAY,EAA0B,MAAM,0BAA0B,CAAA;AAC/E,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAmB1E,IAAI,eAAe,CAAA;AAEnB,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,CAAC,SAAS,EAAE,CAAA;AAE3C,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,CAAC,SAAS,EAAe,CAAA;AAE3D,MAAM,UAAU,UAAU,CAAE,MAAsB;IAChD,OAAO,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,UAAU,CAAE,MAAsB;IAChD,OAAO,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,YAAY,CAAE,SAA6B,EAAE;IAC3D,OAAO,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC,CAAA;AACzC,CAAC;AAED,MAAM,UAAU,SAAS,CAAE,MAAsB;IAC/C,OAAO,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;AACtC,CAAC;AAED,MAAM,UAAU,QAAQ,CAAE,MAAsB;IAC9C,OAAO,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;AACrC,CAAC;AAED,MAAM,UAAU,QAAQ,CAAE,MAA2C,EAAE,MAAsB;;IAC3F,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAA;IAC1C,IAAI,MAAM,CAAA;IACV,IAAI,UAAU,CAAA;IACd,MAAM,IAAI,GAAI,MAAyB,CAAC,GAAG,CAAA;IAC3C,IAAI,IAAI,EAAE;QACR,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;KAC7B;IACD,IAAI;QACF,IAAI,MAAM,KAAK,YAAY,EAAE;YAC3B,MAAA,aAAa,CAAC,OAAO,0CAAE,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAA;SAC3F;aAAM,IAAI,MAAM,KAAK,YAAY,EAAE;YAClC,MAAA,aAAa,CAAC,OAAO,0CAAE,QAAQ,CAAC,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAA;SAC9F;aAAM,IAAI,MAAM,KAAK,WAAW,EAAE;
|
|
1
|
+
{"version":3,"file":"rootNavigation.js","sourceRoot":"","sources":["../src/rootNavigation.ts"],"names":[],"mappings":"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"}
|
package/dist/router.js
CHANGED
|
@@ -99,8 +99,11 @@ function getTabItem(config, tabName) {
|
|
|
99
99
|
});
|
|
100
100
|
return tabItem;
|
|
101
101
|
}
|
|
102
|
+
let initRoute;
|
|
102
103
|
function getInitRouteName(config) {
|
|
103
|
-
|
|
104
|
+
var _a;
|
|
105
|
+
if (initRoute)
|
|
106
|
+
return initRoute;
|
|
104
107
|
const initPath = config.initPath || '';
|
|
105
108
|
const rn = config.rnConfig || {};
|
|
106
109
|
if (initPath) {
|
|
@@ -109,6 +112,10 @@ function getInitRouteName(config) {
|
|
|
109
112
|
else if (rn === null || rn === void 0 ? void 0 : rn.initialRouteName) {
|
|
110
113
|
initRoute = camelCase(rn.initialRouteName);
|
|
111
114
|
}
|
|
115
|
+
else if (config.entryPagePath) {
|
|
116
|
+
const entryPagePath = config.entryPagePath.startsWith('/') ? config.entryPagePath : `/${config.entryPagePath}`;
|
|
117
|
+
initRoute = (_a = config.pages.find(p => p.pagePath === entryPagePath)) === null || _a === void 0 ? void 0 : _a.name;
|
|
118
|
+
}
|
|
112
119
|
else {
|
|
113
120
|
initRoute = config.pages[0].name;
|
|
114
121
|
}
|
package/dist/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/router-rn",
|
|
3
|
-
"version": "3.4.0
|
|
3
|
+
"version": "3.4.0",
|
|
4
4
|
"description": "Taro-router-rn",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "src/index.ts",
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@types/react-native": "0.66.5"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "a0e97bc937f878cc059f54748c9a3829fa3f4664"
|
|
57
57
|
}
|
package/src/rootNavigation.ts
CHANGED
|
@@ -60,7 +60,7 @@ export function navigate (option: NavigateOption | NavigateBackOption, method: N
|
|
|
60
60
|
navigationRef.current?.dispatch(StackActions.push(routeParam.pageName, routeParam.params))
|
|
61
61
|
} else if (method === 'redirectTo') {
|
|
62
62
|
navigationRef.current?.dispatch(StackActions.replace(routeParam.pageName, routeParam.params))
|
|
63
|
-
} else if (method === 'switchTab') {
|
|
63
|
+
} else if (method === 'switchTab' || (method === 'reLaunch' && isTabPage(path))) {
|
|
64
64
|
const states = navigationRef.current?.getRootState()
|
|
65
65
|
if (states?.routes[0].name !== 'tabNav') {
|
|
66
66
|
states && states?.routes.length > 1 && navigationRef.current?.dispatch(StackActions.popToTop())
|
|
@@ -72,15 +72,22 @@ export function navigate (option: NavigateOption | NavigateBackOption, method: N
|
|
|
72
72
|
} else if (method === 'navigateBack') {
|
|
73
73
|
const number = (option as NavigateBackOption).delta ? (option as NavigateBackOption).delta : 1
|
|
74
74
|
const states = navigationRef.current?.getRootState()
|
|
75
|
-
|
|
76
|
-
|
|
75
|
+
if (states?.index === 0) {
|
|
76
|
+
errMsg = 'navigateBack:fail cannot navigate back at first page.'
|
|
77
|
+
} else {
|
|
78
|
+
const index = number && ((states && states.index < number) ? states?.index : number)
|
|
79
|
+
navigationRef.current?.dispatch(StackActions.pop(index))
|
|
80
|
+
}
|
|
77
81
|
} else if (method === 'reLaunch') {
|
|
78
82
|
if (isTabPage()) {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
: navigationRef.current?.dispatch(StackActions.push(routeParam.pageName, routeParam.params))
|
|
83
|
+
// tabbar to stack page
|
|
84
|
+
navigationRef.current?.dispatch(StackActions.replace(routeParam.pageName, routeParam.params))
|
|
82
85
|
} else {
|
|
83
|
-
|
|
86
|
+
// stack to stack page
|
|
87
|
+
const states = navigationRef.current?.getRootState()
|
|
88
|
+
if (states?.index !== 0) {
|
|
89
|
+
navigationRef.current?.dispatch(StackActions.popToTop())
|
|
90
|
+
}
|
|
84
91
|
navigationRef.current?.dispatch(StackActions.replace(routeParam.pageName, routeParam.params))
|
|
85
92
|
}
|
|
86
93
|
}
|
|
@@ -112,7 +119,7 @@ export function isTabPage (path = ''): boolean {
|
|
|
112
119
|
const tabPages = getTabBarPages()
|
|
113
120
|
let pageName = ''
|
|
114
121
|
if (path) {
|
|
115
|
-
pageName = camelCase(path.startsWith('/') ? path : `/${path}`)
|
|
122
|
+
pageName = camelCase((path.startsWith('/') ? path : `/${path}`).split('?')[0])
|
|
116
123
|
} else {
|
|
117
124
|
const route: Record<string, any> = navigationRef.current?.getCurrentRoute() || {}
|
|
118
125
|
pageName = route?.name || ''
|
|
@@ -129,7 +136,7 @@ export function getCurrentRoute () {
|
|
|
129
136
|
if (item.name === 'tabNav') {
|
|
130
137
|
const index = item.state?.index ?? 0
|
|
131
138
|
const tabRoutes: Record<string, any>[] = item.state?.routes ?? []
|
|
132
|
-
tabRoutes && routeKeys.push(tabRoutes[index].key)
|
|
139
|
+
tabRoutes?.[index] && routeKeys.push(tabRoutes[index].key)
|
|
133
140
|
} else {
|
|
134
141
|
routeKeys.push(item.key)
|
|
135
142
|
}
|
package/src/router.ts
CHANGED
|
@@ -77,6 +77,7 @@ export interface RouterConfig {
|
|
|
77
77
|
rnConfig?: RNConfig,
|
|
78
78
|
initParams?:Record<string, any>, // 原生启动传递的参数
|
|
79
79
|
initPath?: string, // 原生启动时传入的参数路径
|
|
80
|
+
entryPagePath?: string, // 默认启动路径
|
|
80
81
|
}
|
|
81
82
|
|
|
82
83
|
export function createRouter (config: RouterConfig): React.ReactNode {
|
|
@@ -171,14 +172,19 @@ function getTabItem (config: RouterConfig, tabName: string) {
|
|
|
171
172
|
return tabItem
|
|
172
173
|
}
|
|
173
174
|
|
|
175
|
+
let initRoute
|
|
176
|
+
|
|
174
177
|
function getInitRouteName (config: RouterConfig) {
|
|
175
|
-
|
|
178
|
+
if (initRoute) return initRoute
|
|
176
179
|
const initPath = config.initPath || ''
|
|
177
180
|
const rn = config.rnConfig || {}
|
|
178
181
|
if (initPath) {
|
|
179
182
|
initRoute = handleUrl(initPath).pageName
|
|
180
183
|
} else if (rn?.initialRouteName) {
|
|
181
184
|
initRoute = camelCase(rn.initialRouteName)
|
|
185
|
+
} else if (config.entryPagePath) {
|
|
186
|
+
const entryPagePath = config.entryPagePath.startsWith('/') ? config.entryPagePath : `/${config.entryPagePath}`
|
|
187
|
+
initRoute = config.pages.find(p => p.pagePath === entryPagePath)?.name
|
|
182
188
|
} else {
|
|
183
189
|
initRoute = config.pages[0].name
|
|
184
190
|
}
|