@tarojs/router-rn 3.3.9 → 3.3.13
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 +3 -3
- package/package.json +3 -3
- package/src/provider.ts +3 -3
package/dist/provider.js
CHANGED
|
@@ -47,12 +47,12 @@ export class PageProvider extends React.Component {
|
|
|
47
47
|
const color = pageConfig.navigationBarTextStyle || headerTintColor || (winOptions === null || winOptions === void 0 ? void 0 : winOptions.navigationBarTextStyle) || 'white';
|
|
48
48
|
const bgColor = pageConfig.navigationBarBackgroundColor || (headerStyle === null || headerStyle === void 0 ? void 0 : headerStyle.backgroundColor) || (winOptions === null || winOptions === void 0 ? void 0 : winOptions.navigationBarBackgroundColor) || '#000000';
|
|
49
49
|
let showHeader = headerShown;
|
|
50
|
-
if (pageConfig.navigationStyle) {
|
|
51
|
-
showHeader = pageConfig.navigationStyle !== 'custom';
|
|
52
|
-
}
|
|
53
50
|
if (winOptions.navigationStyle) {
|
|
54
51
|
showHeader = winOptions.navigationStyle !== 'custom';
|
|
55
52
|
}
|
|
53
|
+
if (pageConfig.navigationStyle) {
|
|
54
|
+
showHeader = pageConfig.navigationStyle !== 'custom';
|
|
55
|
+
}
|
|
56
56
|
const rnConfig = (pageConfig === null || pageConfig === void 0 ? void 0 : pageConfig.rn) || {};
|
|
57
57
|
const screenOptions = rnConfig.screenOptions || {};
|
|
58
58
|
const screenHeaderStyle = (screenOptions === null || screenOptions === void 0 ? void 0 : screenOptions.headerStyle) || {};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tarojs/router-rn",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.13",
|
|
4
4
|
"description": "Taro-router-rn",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "src/index.ts",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@types/node": "^14.14.41"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
|
-
"@types/react-native": "0.
|
|
54
|
+
"@types/react-native": "0.65.1"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "d84177a97cc27c01ca63c9dd07e5ab5bbaa91d8a"
|
|
57
57
|
}
|
package/src/provider.ts
CHANGED
|
@@ -58,12 +58,12 @@ export class PageProvider extends React.Component<any> {
|
|
|
58
58
|
const color = pageConfig.navigationBarTextStyle || headerTintColor || winOptions?.navigationBarTextStyle || 'white'
|
|
59
59
|
const bgColor = pageConfig.navigationBarBackgroundColor || headerStyle?.backgroundColor || winOptions?.navigationBarBackgroundColor || '#000000'
|
|
60
60
|
let showHeader = headerShown
|
|
61
|
-
if (pageConfig.navigationStyle) {
|
|
62
|
-
showHeader = pageConfig.navigationStyle !== 'custom'
|
|
63
|
-
}
|
|
64
61
|
if (winOptions.navigationStyle) {
|
|
65
62
|
showHeader = winOptions.navigationStyle !== 'custom'
|
|
66
63
|
}
|
|
64
|
+
if (pageConfig.navigationStyle) {
|
|
65
|
+
showHeader = pageConfig.navigationStyle !== 'custom'
|
|
66
|
+
}
|
|
67
67
|
|
|
68
68
|
const rnConfig = pageConfig?.rn || {}
|
|
69
69
|
const screenOptions = rnConfig.screenOptions || {}
|