@tarojs/router-rn 3.5.0-canary.1 → 3.5.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/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/navigationBar.js +6 -18
- package/dist/navigationBar.js.map +1 -1
- package/dist/provider.js +3 -11
- package/dist/provider.js.map +1 -1
- package/dist/rootNavigation.js +3 -3
- package/dist/rootNavigation.js.map +1 -1
- package/dist/router.js +43 -69
- package/dist/router.js.map +1 -1
- package/dist/tabBar.js +1 -1
- package/dist/tabBar.js.map +1 -1
- package/dist/utils/index.js +0 -1
- package/dist/utils/index.js.map +1 -1
- package/dist/view/BackButton.js +1 -3
- package/dist/view/BackButton.js.map +1 -1
- package/dist/view/Badge.js +0 -3
- package/dist/view/Badge.js.map +1 -1
- package/dist/view/HeadTitle.js +2 -4
- package/dist/view/HeadTitle.js.map +1 -1
- package/dist/view/Loading.js +1 -3
- package/dist/view/Loading.js.map +1 -1
- package/dist/view/TabBar.js +12 -22
- package/dist/view/TabBar.js.map +1 -1
- package/dist/view/TabBarItem.js +3 -5
- package/dist/view/TabBarItem.js.map +1 -1
- package/package.json +23 -27
- package/src/index.ts +2 -2
- package/src/navigationBar.ts +9 -19
- package/src/provider.ts +4 -10
- package/src/rootNavigation.ts +9 -7
- package/src/{router.ts → router.tsx} +108 -123
- package/src/tabBar.ts +11 -11
- package/src/utils/index.ts +2 -2
- package/src/utils/types.ts +12 -12
- package/src/view/BackButton.tsx +1 -3
- package/src/view/Badge.tsx +5 -8
- package/src/view/HeadTitle.tsx +5 -6
- package/src/view/Loading.tsx +2 -4
- package/src/view/TabBar.tsx +34 -39
- package/src/view/TabBarItem.tsx +27 -28
package/dist/view/TabBar.js
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
// eslint-disable-next-line no-use-before-define
|
|
2
|
-
import * as React from 'react';
|
|
3
1
|
import { Link } from '@react-navigation/native';
|
|
2
|
+
import * as React from 'react';
|
|
3
|
+
import { Animated, Dimensions, Keyboard, Platform, StyleSheet, TouchableWithoutFeedback, View } from 'react-native';
|
|
4
4
|
import { withSafeAreaInsets } from 'react-native-safe-area-context';
|
|
5
|
-
import {
|
|
6
|
-
import { getTabVisible, getTabConfig, getTabItemConfig, getDefalutTabItem, isUrl } from '../utils/index';
|
|
7
|
-
import { getInitSafeAreaInsets } from './tabBarUtils';
|
|
5
|
+
import { getDefalutTabItem, getTabConfig, getTabItemConfig, getTabVisible, isUrl } from '../utils/index';
|
|
8
6
|
import TabBarItem from './TabBarItem';
|
|
7
|
+
import { getInitSafeAreaInsets } from './tabBarUtils';
|
|
9
8
|
const DEFAULT_TABBAR_HEIGHT = 55;
|
|
10
9
|
const COMPACT_TABBAR_HEIGHT = 32;
|
|
11
10
|
// const DEFAULT_MAX_TAB_ITEM_WIDTH = 125;
|
|
@@ -35,8 +34,8 @@ export class TabBar extends React.PureComponent {
|
|
|
35
34
|
constructor(props) {
|
|
36
35
|
super(props);
|
|
37
36
|
const { height = 0, width = 0 } = Dimensions.get('window');
|
|
38
|
-
const { safeAreaInsets,
|
|
39
|
-
const { tabBarVisible = true } =
|
|
37
|
+
const { safeAreaInsets, tabOptions = {} } = this.props;
|
|
38
|
+
const { tabBarVisible = true } = tabOptions;
|
|
40
39
|
const tabVisible = tabBarVisible === false ? false : getTabVisible();
|
|
41
40
|
this.state = {
|
|
42
41
|
visible: new Animated.Value(tabVisible ? 1 : 0),
|
|
@@ -53,26 +52,20 @@ export class TabBar extends React.PureComponent {
|
|
|
53
52
|
const { keyboardHidesTabBar = false } = this.props;
|
|
54
53
|
if (keyboardHidesTabBar) {
|
|
55
54
|
if (Platform.OS === 'ios') {
|
|
56
|
-
Keyboard.addListener('keyboardWillShow', () => this.handleKeyboardShow());
|
|
57
|
-
Keyboard.addListener('keyboardWillHide', () => this.handleKeyboardHide());
|
|
55
|
+
this.handleKeyboardShowEvent = Keyboard.addListener('keyboardWillShow', () => this.handleKeyboardShow());
|
|
56
|
+
this.handleKeyboardHideEvent = Keyboard.addListener('keyboardWillHide', () => this.handleKeyboardHide());
|
|
58
57
|
}
|
|
59
58
|
else {
|
|
60
|
-
Keyboard.addListener('keyboardDidShow', () => this.handleKeyboardShow());
|
|
61
|
-
Keyboard.addListener('keyboardDidHide', () => this.handleKeyboardHide());
|
|
59
|
+
this.handleKeyboardShowEvent = Keyboard.addListener('keyboardDidShow', () => this.handleKeyboardShow());
|
|
60
|
+
this.handleKeyboardHideEvent = Keyboard.addListener('keyboardDidHide', () => this.handleKeyboardHide());
|
|
62
61
|
}
|
|
63
62
|
}
|
|
64
63
|
}
|
|
65
64
|
componentWillUnmount() {
|
|
66
65
|
const { keyboardHidesTabBar = false } = this.props;
|
|
67
66
|
if (keyboardHidesTabBar) {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
Keyboard.removeListener('keyboardWillHide', () => this.handleKeyboardHide());
|
|
71
|
-
}
|
|
72
|
-
else {
|
|
73
|
-
Keyboard.removeListener('keyboardDidShow', () => this.handleKeyboardShow());
|
|
74
|
-
Keyboard.removeListener('keyboardDidHide', () => this.handleKeyboardHide());
|
|
75
|
-
}
|
|
67
|
+
this.handleKeyboardShowEvent.remove();
|
|
68
|
+
this.handleKeyboardHideEvent.remove();
|
|
76
69
|
}
|
|
77
70
|
}
|
|
78
71
|
UNSAFE_componentWillReceiveProps() {
|
|
@@ -181,7 +174,6 @@ export class TabBar extends React.PureComponent {
|
|
|
181
174
|
const path = focused ? selectedIconPath : iconPath;
|
|
182
175
|
return isUrl(path) ? { uri: path } : { uri: path };
|
|
183
176
|
}
|
|
184
|
-
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
185
177
|
renderContent() {
|
|
186
178
|
const { state, descriptors, navigation } = this.props;
|
|
187
179
|
const horizontal = true;
|
|
@@ -237,7 +229,6 @@ export class TabBar extends React.PureComponent {
|
|
|
237
229
|
}
|
|
238
230
|
}));
|
|
239
231
|
}
|
|
240
|
-
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
241
232
|
render() {
|
|
242
233
|
const { insets, visible, layout, tabVisible, isKeyboardShown } = this.state;
|
|
243
234
|
const paddingBottom = Math.max((insets === null || insets === void 0 ? void 0 : insets.bottom) - Platform.select({ ios: 4, default: 0 }), 5);
|
|
@@ -246,7 +237,6 @@ export class TabBar extends React.PureComponent {
|
|
|
246
237
|
const needAnimate = getTabConfig('needAnimate');
|
|
247
238
|
const showTabBar = tabVisible !== false && !isKeyboardShown;
|
|
248
239
|
if (!needAnimate) {
|
|
249
|
-
// eslint-disable-next-line multiline-ternary
|
|
250
240
|
return (!showTabBar ? null
|
|
251
241
|
: (React.createElement(View, { style: [
|
|
252
242
|
styles.tabBar,
|
package/dist/view/TabBar.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TabBar.js","sourceRoot":"","sources":["../../src/view/TabBar.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"TabBar.js","sourceRoot":"","sources":["../../src/view/TabBar.tsx"],"names":[],"mappings":"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"}
|
package/dist/view/TabBarItem.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
// eslint-disable-next-line no-use-before-define
|
|
2
1
|
import * as React from 'react';
|
|
3
|
-
import {
|
|
2
|
+
import { Image, StyleSheet, Text, View } from 'react-native';
|
|
4
3
|
import Badge from './Badge';
|
|
5
4
|
const styles = StyleSheet.create({
|
|
6
5
|
label: {
|
|
@@ -57,10 +56,9 @@ const styles = StyleSheet.create({
|
|
|
57
56
|
badgeVertical: {}
|
|
58
57
|
});
|
|
59
58
|
export default class TabBarItem extends React.PureComponent {
|
|
60
|
-
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
61
59
|
render() {
|
|
62
|
-
const { label, horizontal, showRedDot, badge, size = 20, labelColor, iconSource,
|
|
63
|
-
const tabBarBadgeStyle = (
|
|
60
|
+
const { label, horizontal, showRedDot, badge, size = 20, labelColor, iconSource, tabOptions, tabStyle = {}, labelStyle = {}, allowFontScaling = true, showLabel = true } = this.props;
|
|
61
|
+
const tabBarBadgeStyle = (tabOptions === null || tabOptions === void 0 ? void 0 : tabOptions.tabBarBadgeStyle) || {};
|
|
64
62
|
return (React.createElement(View, { style: [styles.tabItem, styles.itemHorizontal, tabStyle] },
|
|
65
63
|
React.createElement(View, { style: styles.icon },
|
|
66
64
|
!!iconSource && React.createElement(Image, { style: { width: size, height: size }, source: iconSource }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TabBarItem.js","sourceRoot":"","sources":["../../src/view/TabBarItem.tsx"],"names":[],"mappings":"AAAA,
|
|
1
|
+
{"version":3,"file":"TabBarItem.js","sourceRoot":"","sources":["../../src/view/TabBarItem.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EACL,KAAK,EAEL,UAAU,EACV,IAAI,EAEJ,IAAI,EAEL,MAAM,cAAc,CAAA;AAErB,OAAO,KAAK,MAAM,SAAS,CAAA;AAgC3B,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,KAAK,EAAE;QACL,SAAS,EAAE,QAAQ;QACnB,eAAe,EAAE,aAAa;KAC/B;IACD,YAAY,EAAE;QACZ,QAAQ,EAAE,EAAE;KACb;IACD,WAAW,EAAE;QACX,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,CAAC;KACb;IACD,MAAM,EAAE;QACN,OAAO,EAAE,MAAM;KAChB;IACD,IAAI,EAAE;QACJ,cAAc,EAAE,UAAU;KAC3B;IACD,OAAO,EAAE;QACP,SAAS,EAAE,QAAQ;QACnB,UAAU,EAAE,QAAQ;QACpB,cAAc,EAAE,QAAQ;QACxB,MAAM,EAAE,MAAM;QACd,KAAK,EAAE,MAAM;KACd;IACD,YAAY,EAAE;QACZ,IAAI,EAAE,CAAC;KACR;IACD,cAAc,EAAE;QACd,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,CAAC;KACb;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,UAAU;QACpB,GAAG,EAAE,CAAC,CAAC;QACP,KAAK,EAAE,CAAC,CAAC;QACT,eAAe,EAAE,SAAS;QAC1B,MAAM,EAAE,GAAG;QACX,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,CAAC;QACb,aAAa,EAAE,CAAC;QAChB,WAAW,EAAE,CAAC;QACd,YAAY,EAAE,CAAC;KAChB;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,UAAU;QACpB,GAAG,EAAE,CAAC,CAAC;QACP,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;KACT;IACD,OAAO;IACP,eAAe,EAAE,EAAE;IACnB,aAAa,EAAE,EAAE;CAClB,CAAC,CAAA;AAEF,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,KAAK,CAAC,aAA8B;IAC1E,MAAM;QACJ,MAAM,EACJ,KAAK,EACL,UAAU,EACV,UAAU,EACV,KAAK,EACL,IAAI,GAAG,EAAE,EACT,UAAU,EACV,UAAU,EACV,UAAU,EACV,QAAQ,GAAG,EAAE,EACb,UAAU,GAAG,EAAE,EACf,gBAAgB,GAAG,IAAI,EACvB,SAAS,GAAG,IAAI,EACjB,GAAG,IAAI,CAAC,KAAK,CAAA;QACd,MAAM,gBAAgB,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,gBAAgB,KAAI,EAAE,CAAA;QAC3D,OAAO,CACL,oBAAC,IAAI,IAAC,KAAK,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,cAAc,EAAE,QAAQ,CAAC;YAC5D,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,IAAI;gBACrB,CAAC,CAAC,UAAU,IAAI,oBAAC,KAAK,IAAC,KAAK,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,UAAU,GAAI;gBACnF,CAAC,CAAC,UAAU,IAAI,CAAC,KAAK,IAAI,oBAAC,IAAI,IAAC,KAAK,EAAE,MAAM,CAAC,MAAM,GAAI;gBACxD,CAAC,CAAC,KAAK,IAAI,oBAAC,KAAK,IAChB,OAAO,EAAE,KAAK,IAAI,IAAI,EACtB,KAAK,EAAE;wBACL,MAAM,CAAC,KAAK;wBACZ,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa;wBAC1D,gBAAgB;qBACjB,EACD,IAAI,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IACpB,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAS,CAE9C;YACN,SAAS,IAAI,oBAAC,IAAI,IACjB,aAAa,EAAE,CAAC,EAChB,gBAAgB,EAAE,gBAAgB,EAClC,KAAK,EAAE;oBACL,MAAM,CAAC,KAAK;oBACZ,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY;oBACrD,UAAU;oBACV,EAAE,KAAK,EAAE,UAAU,EAAE;iBACtB,IACD,KAAK,CAAQ,CACT,CACT,CAAA;IACH,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/router-rn",
|
|
3
|
-
"version": "3.5.0
|
|
3
|
+
"version": "3.5.0",
|
|
4
4
|
"description": "Taro-router-rn",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "src/index.ts",
|
|
@@ -9,14 +9,6 @@
|
|
|
9
9
|
"dist",
|
|
10
10
|
"types"
|
|
11
11
|
],
|
|
12
|
-
"scripts": {
|
|
13
|
-
"build": "tsc",
|
|
14
|
-
"dev": "tsc -w",
|
|
15
|
-
"lint": "eslint .",
|
|
16
|
-
"test": "jest",
|
|
17
|
-
"test:dev": "jest --watch",
|
|
18
|
-
"test:coverage": "jest --coverage"
|
|
19
|
-
},
|
|
20
12
|
"repository": {
|
|
21
13
|
"type": "git",
|
|
22
14
|
"url": "git+https://github.com/NervJS/taro.git"
|
|
@@ -28,30 +20,34 @@
|
|
|
28
20
|
"author": "yechunxi",
|
|
29
21
|
"license": "MIT",
|
|
30
22
|
"peerDependencies": {
|
|
31
|
-
"@react-native-
|
|
23
|
+
"@react-native-masked-view/masked-view": "~0.2.6",
|
|
32
24
|
"react-native-gesture-handler": "~1.10.3",
|
|
33
|
-
"react-native-
|
|
34
|
-
"react-native-
|
|
35
|
-
"react-native-screens": "~2.18.1"
|
|
25
|
+
"react-native-safe-area-context": "~3.4.1",
|
|
26
|
+
"react-native-screens": "^3.12.0"
|
|
36
27
|
},
|
|
37
28
|
"dependencies": {
|
|
38
|
-
"@react-native-
|
|
39
|
-
"@react-
|
|
40
|
-
"@react-navigation/
|
|
41
|
-
"@react-navigation/native": "^
|
|
42
|
-
"@react-navigation/
|
|
29
|
+
"@react-native-masked-view/masked-view": "~0.2.6",
|
|
30
|
+
"@react-navigation/bottom-tabs": "^6.2.0",
|
|
31
|
+
"@react-navigation/native": "^6.0.8",
|
|
32
|
+
"@react-navigation/native-stack": "^6.7.0",
|
|
33
|
+
"@react-navigation/routers": "^6.1.0",
|
|
34
|
+
"@react-navigation/stack": "^6.1.1",
|
|
43
35
|
"nanoid": "^3.1.12",
|
|
44
36
|
"query-string": "^6.1.0",
|
|
45
37
|
"react-native-gesture-handler": "~1.10.3",
|
|
46
|
-
"react-native-safe-area-context": "~3.
|
|
47
|
-
"react-native-screens": "
|
|
48
|
-
},
|
|
49
|
-
"resolutions": {
|
|
50
|
-
"@types/react": "17.0.11",
|
|
51
|
-
"@types/node": "^14.14.41"
|
|
38
|
+
"react-native-safe-area-context": "~3.4.1",
|
|
39
|
+
"react-native-screens": "^3.12.0"
|
|
52
40
|
},
|
|
53
41
|
"devDependencies": {
|
|
54
|
-
"@types/react
|
|
42
|
+
"@types/react": "^17.0.0",
|
|
43
|
+
"@types/react-native": "^0.67.7"
|
|
55
44
|
},
|
|
56
|
-
"
|
|
57
|
-
|
|
45
|
+
"scripts": {
|
|
46
|
+
"build": "tsc",
|
|
47
|
+
"dev": "tsc -w",
|
|
48
|
+
"lint": "eslint .",
|
|
49
|
+
"test": "jest",
|
|
50
|
+
"test:dev": "jest --watch",
|
|
51
|
+
"test:coverage": "jest --coverage"
|
|
52
|
+
}
|
|
53
|
+
}
|
package/src/index.ts
CHANGED
package/src/navigationBar.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import { navigationRef } from './rootNavigation'
|
|
2
|
+
import { errorHandler, successHandler } from './utils/index'
|
|
3
|
+
import { BaseOption, CallbackResult } from './utils/types'
|
|
4
4
|
|
|
5
5
|
interface NavigateBarTitleOption extends BaseOption {
|
|
6
6
|
title: string
|
|
7
7
|
}
|
|
8
8
|
interface NavigateBarColorOption extends BaseOption {
|
|
9
|
-
backgroundColor: string
|
|
9
|
+
backgroundColor: string
|
|
10
10
|
frontColor: string
|
|
11
11
|
}
|
|
12
12
|
|
|
@@ -15,21 +15,16 @@ function setNavigateConfig (obj) {
|
|
|
15
15
|
const params = oldParams?.navigateConfig || {}
|
|
16
16
|
navigationRef.current?.setParams({
|
|
17
17
|
navigateConfig: Object.assign({}, { ...params }, { ...obj })
|
|
18
|
-
})
|
|
18
|
+
} as never)
|
|
19
19
|
}
|
|
20
20
|
|
|
21
21
|
export function setNavigationBarTitle (option: NavigateBarTitleOption): Promise<CallbackResult> {
|
|
22
22
|
const { title, fail, success, complete } = option
|
|
23
23
|
let msg
|
|
24
24
|
try {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
} else {
|
|
29
|
-
navigationRef.current?.setOptions({
|
|
30
|
-
title: title
|
|
31
|
-
})
|
|
32
|
-
}
|
|
25
|
+
navigationRef.current?.setOptions({
|
|
26
|
+
title: title
|
|
27
|
+
})
|
|
33
28
|
} catch (error) {
|
|
34
29
|
msg = error
|
|
35
30
|
return errorHandler(fail, complete)({ errMsg: msg })
|
|
@@ -51,12 +46,7 @@ export function setNavigationBarColor (option: NavigateBarColorOption): Promise<
|
|
|
51
46
|
headerTintColor: frontColor
|
|
52
47
|
})
|
|
53
48
|
try {
|
|
54
|
-
|
|
55
|
-
if (isTabPage()) {
|
|
56
|
-
setNavigateConfig({ ...params })
|
|
57
|
-
} else {
|
|
58
|
-
navigationRef.current?.setOptions({ ...params })
|
|
59
|
-
}
|
|
49
|
+
navigationRef.current?.setOptions({ ...params })
|
|
60
50
|
} catch (error) {
|
|
61
51
|
msg = error
|
|
62
52
|
return errorHandler(fail, complete)({ errMsg: msg })
|
package/src/provider.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import * as React from 'react'
|
|
2
1
|
import { camelCase } from 'lodash'
|
|
3
|
-
import
|
|
2
|
+
import * as React from 'react'
|
|
3
|
+
|
|
4
4
|
import { navigationRef } from './rootNavigation'
|
|
5
|
+
import { getTabBarPages, getTabVisible } from './utils/index'
|
|
5
6
|
|
|
6
7
|
interface PageProps {
|
|
7
8
|
navigation: any
|
|
@@ -84,13 +85,7 @@ export class PageProvider extends React.Component<any> {
|
|
|
84
85
|
}, screenOptions)
|
|
85
86
|
// 页面的config
|
|
86
87
|
if (pageConfig) {
|
|
87
|
-
|
|
88
|
-
navigation.setParams({
|
|
89
|
-
navigateConfig: navBarParams
|
|
90
|
-
})
|
|
91
|
-
} else {
|
|
92
|
-
navigation.setOptions(navBarParams)
|
|
93
|
-
}
|
|
88
|
+
navigation.setOptions(navBarParams)
|
|
94
89
|
}
|
|
95
90
|
}
|
|
96
91
|
}
|
|
@@ -103,7 +98,6 @@ export class PageProvider extends React.Component<any> {
|
|
|
103
98
|
|
|
104
99
|
private unSubscribleFocus
|
|
105
100
|
|
|
106
|
-
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
107
101
|
render () {
|
|
108
102
|
return this.props.children
|
|
109
103
|
}
|
package/src/rootNavigation.ts
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
// RootNavigation.js
|
|
2
|
-
import
|
|
2
|
+
import { NavigationContainerRef, StackActions } from '@react-navigation/native'
|
|
3
3
|
import { camelCase } from 'lodash'
|
|
4
|
-
import
|
|
5
|
-
|
|
6
|
-
import {
|
|
4
|
+
import * as React from 'react'
|
|
5
|
+
|
|
6
|
+
import { getTabBarPages, handleUrl, setTabInitRoute } from './utils/index'
|
|
7
|
+
import { BaseOption, CallbackResult } from './utils/types'
|
|
7
8
|
// import { getOpenerEventChannel } from './getOpenerEventChannel'
|
|
8
9
|
|
|
9
10
|
type NavigateMethod = 'navigateTo' | 'redirectTo' | 'navigateBack' | 'switchTab' | 'reLaunch'
|
|
10
11
|
|
|
11
12
|
interface NavigateOption extends BaseOption {
|
|
12
|
-
url: string
|
|
13
|
+
url: string
|
|
13
14
|
events?: Record<string, any>
|
|
14
15
|
}
|
|
15
16
|
|
|
@@ -17,8 +18,9 @@ interface NavigateBackOption extends BaseOption {
|
|
|
17
18
|
delta?: number
|
|
18
19
|
}
|
|
19
20
|
|
|
20
|
-
interface NavigateRef extends NavigationContainerRef {
|
|
21
|
+
interface NavigateRef extends NavigationContainerRef<ReactNavigation.RootParamList> {
|
|
21
22
|
setOptions: (obj: any) => void
|
|
23
|
+
navigateConfig: (obj: any) => void
|
|
22
24
|
}
|
|
23
25
|
|
|
24
26
|
let routeEvtChannel
|
|
@@ -67,7 +69,7 @@ export function navigate (option: NavigateOption | NavigateBackOption, method: N
|
|
|
67
69
|
navigationRef.current?.dispatch(StackActions.replace('tabNav'))
|
|
68
70
|
setTabInitRoute(routeParam.pageName)
|
|
69
71
|
} else {
|
|
70
|
-
navigationRef.current?.navigate(routeParam.pageName, routeParam.params)
|
|
72
|
+
navigationRef.current?.navigate(routeParam.pageName as never, routeParam.params as never)
|
|
71
73
|
}
|
|
72
74
|
} else if (method === 'navigateBack') {
|
|
73
75
|
const number = (option as NavigateBackOption).delta ? (option as NavigateBackOption).delta : 1
|