@tarojs/router-rn 3.7.0-alpha.7 → 3.7.0-alpha.8
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/provider.js +14 -12
- package/dist/provider.js.map +1 -1
- package/package.json +1 -1
- package/src/provider.ts +14 -12
package/dist/provider.js
CHANGED
|
@@ -14,18 +14,20 @@ export class PageProvider extends React.Component {
|
|
|
14
14
|
}
|
|
15
15
|
componentDidMount() {
|
|
16
16
|
const { navigation } = this.props;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
navigationRef.current
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
17
|
+
if (navigation) {
|
|
18
|
+
this.unSubscribleFocus = this.props.navigation.addListener('focus', () => {
|
|
19
|
+
if (navigationRef && (navigationRef === null || navigationRef === void 0 ? void 0 : navigationRef.current)) {
|
|
20
|
+
navigationRef.current.setOptions = navigation.setOptions;
|
|
21
|
+
}
|
|
22
|
+
// 若是tabBar页面，确保tabbar内容最新
|
|
23
|
+
if (this.isTabBarPage()) {
|
|
24
|
+
const tabBarVisible = getTabVisible();
|
|
25
|
+
navigation.setOptions({
|
|
26
|
+
tabBarVisible: tabBarVisible
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
}
|
|
29
31
|
}
|
|
30
32
|
componentWillUnmount() {
|
|
31
33
|
if (this.unSubscribleFocus) {
|
package/dist/provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAA;AAClC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,eAAe,CAAA;AAS7D,MAAM,SAAS,GAAQ,MAAM,CAAA;AAE7B,MAAM,OAAO,YAAa,SAAQ,KAAK,CAAC,SAAc;IACpD,YAAa,KAAgB;QAC3B,KAAK,CAAC,KAAK,CAAC,CAAA;QACZ,uCAAuC;QACvC,IAAI,aAAa,KAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,CAAA,EAAE;YAC3C,aAAa,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAA;SACpE;QACD,IAAI,CAAC,YAAY,EAAE,CAAA;IACrB,CAAC;IAED,iBAAiB;QACf,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,KAAK,CAAA;QACjC,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../src/provider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/provider.ts
CHANGED
|
@@ -25,18 +25,20 @@ export class PageProvider extends React.Component<any> {
|
|
|
25
25
|
|
|
26
26
|
componentDidMount (): void {
|
|
27
27
|
const { navigation } = this.props
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
navigationRef
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
28
|
+
if (navigation){
|
|
29
|
+
this.unSubscribleFocus = this.props.navigation.addListener('focus', () => {
|
|
30
|
+
if (navigationRef && navigationRef?.current) {
|
|
31
|
+
navigationRef.current.setOptions = navigation.setOptions
|
|
32
|
+
}
|
|
33
|
+
// 若是tabBar页面，确保tabbar内容最新
|
|
34
|
+
if (this.isTabBarPage()) {
|
|
35
|
+
const tabBarVisible = getTabVisible()
|
|
36
|
+
navigation.setOptions({
|
|
37
|
+
tabBarVisible: tabBarVisible
|
|
38
|
+
})
|
|
39
|
+
}
|
|
40
|
+
})
|
|
41
|
+
}
|
|
40
42
|
}
|
|
41
43
|
|
|
42
44
|
componentWillUnmount (): void {
|