@tarojs/router-rn 3.4.0-beta.1 → 3.4.1

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.
Files changed (4) hide show
  1. package/dist/router.js +9 -3
  2. package/dist/router.js.map +1 -1
  3. package/package.json +2 -2
  4. package/src/router.ts +10 -3
package/dist/router.js CHANGED
@@ -175,6 +175,12 @@ function createTabStack(config, parentProps) {
175
175
  const tabNode = React.createElement(Tab.Screen, Object.assign({ key: `tab${tabName}`, name: `${tabPage.name}`, options: tabItemOptions, component: tabPage.component, initialParams: initParams }, parentProps));
176
176
  tabList.push(tabNode);
177
177
  });
178
+ const borderColorMap = {
179
+ black: '#000000',
180
+ white: '#ffffff'
181
+ };
182
+ // 允许传入色值、black、white、默认 #000000
183
+ const borderTopColor = (tabBar === null || tabBar === void 0 ? void 0 : tabBar.borderStyle) ? (borderColorMap[tabBar === null || tabBar === void 0 ? void 0 : tabBar.borderStyle] || (tabBar === null || tabBar === void 0 ? void 0 : tabBar.borderStyle)) : '#000000';
178
184
  const userTabBarOptions = (rnConfig === null || rnConfig === void 0 ? void 0 : rnConfig.tabBarOptions) || {};
179
185
  // tabbarOptions
180
186
  const tabBarOptions = Object.assign({
@@ -183,10 +189,10 @@ function createTabStack(config, parentProps) {
183
189
  inactiveTintColor: (tabBar === null || tabBar === void 0 ? void 0 : tabBar.color) || '#7A7E83',
184
190
  activeBackgroundColor: (tabBar === null || tabBar === void 0 ? void 0 : tabBar.backgroundColor) || '#ffffff',
185
191
  inactiveBackgroundColor: (tabBar === null || tabBar === void 0 ? void 0 : tabBar.backgroundColor) || '#ffffff',
186
- style: (tabBar === null || tabBar === void 0 ? void 0 : tabBar.borderStyle) ? {
192
+ style: {
187
193
  backgroundColor: tabBar === null || tabBar === void 0 ? void 0 : tabBar.backgroundColor,
188
- borderTopColor: ((tabBar === null || tabBar === void 0 ? void 0 : tabBar.borderStyle) === 'black' ? '#000000' : '#ffffff')
189
- } : {}
194
+ borderTopColor
195
+ }
190
196
  }, userTabBarOptions);
191
197
  const tabNames = getTabNames(config);
192
198
  const tabProps = ((_a = config.rnConfig) === null || _a === void 0 ? void 0 : _a.tabProps) || {};
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-beta.1",
3
+ "version": "3.4.1",
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": "bd7b3674278d22f71e2658b530cc0be24bf9964e"
56
+ "gitHead": "a2437215b1966fd0b6dd09311bcb4fd894a871d0"
57
57
  }
package/src/router.ts CHANGED
@@ -253,6 +253,13 @@ function createTabStack (config: RouterConfig, parentProps: any) {
253
253
  tabList.push(tabNode)
254
254
  })
255
255
 
256
+ const borderColorMap = {
257
+ black: '#000000',
258
+ white: '#ffffff'
259
+ }
260
+ // 允许传入色值、black、white、默认 #000000
261
+ const borderTopColor = tabBar?.borderStyle ? (borderColorMap[tabBar?.borderStyle] || tabBar?.borderStyle) : '#000000'
262
+
256
263
  const userTabBarOptions = rnConfig?.tabBarOptions || {}
257
264
  // tabbarOptions
258
265
  const tabBarOptions = Object.assign({
@@ -261,10 +268,10 @@ function createTabStack (config: RouterConfig, parentProps: any) {
261
268
  inactiveTintColor: tabBar?.color || '#7A7E83',
262
269
  activeBackgroundColor: tabBar?.backgroundColor || '#ffffff',
263
270
  inactiveBackgroundColor: tabBar?.backgroundColor || '#ffffff',
264
- style: tabBar?.borderStyle ? {
271
+ style: {
265
272
  backgroundColor: tabBar?.backgroundColor,
266
- borderTopColor: (tabBar?.borderStyle === 'black' ? '#000000' : '#ffffff')
267
- } : {}
273
+ borderTopColor
274
+ }
268
275
  }, userTabBarOptions)
269
276
 
270
277
  const tabNames = getTabNames(config)