@tarojs/router-rn 3.5.0-beta.7 → 3.5.0-beta.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.
Files changed (4) hide show
  1. package/dist/router.js +13 -8
  2. package/dist/router.js.map +1 -1
  3. package/package.json +2 -1
  4. package/src/router.tsx +10 -6
package/dist/router.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
2
2
  import { NavigationContainer } from '@react-navigation/native';
3
+ import { createNativeStackNavigator } from '@react-navigation/native-stack';
3
4
  import { CardStyleInterpolators, createStackNavigator } from '@react-navigation/stack';
4
5
  import { camelCase } from 'lodash';
5
6
  import React from 'react';
@@ -233,14 +234,16 @@ function getLinkingConfig(config) {
233
234
  };
234
235
  }
235
236
  function createTabNavigate(config) {
236
- var _a;
237
- const Stack = createStackNavigator();
237
+ var _a, _b;
238
+ const Stack = ((_a = config.rnConfig) === null || _a === void 0 ? void 0 : _a.useNativeStack) ? createNativeStackNavigator() : createStackNavigator();
238
239
  const pageList = getPageList(config);
239
240
  const linking = getLinkingConfig(config);
240
- const stackProps = (_a = config.rnConfig) === null || _a === void 0 ? void 0 : _a.stackProps;
241
+ const stackProps = (_b = config.rnConfig) === null || _b === void 0 ? void 0 : _b.stackProps;
241
242
  const screenOptions = getStackOptions(config);
242
243
  return React.createElement(NavigationContainer, { ref: navigationRef, linking: linking },
243
- React.createElement(Stack.Navigator, Object.assign({ detachInactiveScreens: false }, stackProps, { screenOptions: screenOptions, initialRouteName: getInitRouteName(config) }),
244
+ React.createElement(Stack.Navigator, Object.assign({ detachInactiveScreens: false }, stackProps, {
245
+ // @ts-ignore
246
+ screenOptions: screenOptions, initialRouteName: getInitRouteName(config) }),
244
247
  React.createElement(Stack.Screen, { name: 'tabNav', key: 'tabScreen', options: {
245
248
  headerShown: false
246
249
  } }, (props) => createTabStack(config, props, screenOptions)),
@@ -250,15 +253,17 @@ function createTabNavigate(config) {
250
253
  })));
251
254
  }
252
255
  function createStackNavigate(config) {
253
- var _a;
254
- const Stack = createStackNavigator();
256
+ var _a, _b;
257
+ const Stack = ((_a = config.rnConfig) === null || _a === void 0 ? void 0 : _a.useNativeStack) ? createNativeStackNavigator() : createStackNavigator();
255
258
  const pageList = getPageList(config);
256
259
  if (pageList.length <= 0)
257
260
  return null;
258
261
  const linking = getLinkingConfig(config);
259
- const stackProps = (_a = config.rnConfig) === null || _a === void 0 ? void 0 : _a.stackProps;
262
+ const stackProps = (_b = config.rnConfig) === null || _b === void 0 ? void 0 : _b.stackProps;
260
263
  return React.createElement(NavigationContainer, { ref: navigationRef, linking: linking },
261
- React.createElement(Stack.Navigator, Object.assign({ detachInactiveScreens: false }, stackProps, { screenOptions: getStackOptions(config), initialRouteName: getInitRouteName(config) }), pageList.map(item => {
264
+ React.createElement(Stack.Navigator, Object.assign({ detachInactiveScreens: false }, stackProps, {
265
+ // @ts-ignore
266
+ screenOptions: getStackOptions(config), initialRouteName: getInitRouteName(config) }), pageList.map(item => {
262
267
  const initParams = getInitParams(config, item.name);
263
268
  return React.createElement(Stack.Screen, { key: item.name, name: item.name, component: item.component, initialParams: initParams });
264
269
  })));
package/dist/router.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router.js","sourceRoot":"","sources":["../src/router.tsx"],"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.5.0-beta.7",
3
+ "version": "3.5.0-beta.8",
4
4
  "description": "Taro-router-rn",
5
5
  "main": "dist/index.js",
6
6
  "typings": "src/index.ts",
@@ -29,6 +29,7 @@
29
29
  "@react-native-masked-view/masked-view": "~0.2.6",
30
30
  "@react-navigation/bottom-tabs": "^6.2.0",
31
31
  "@react-navigation/native": "^6.0.8",
32
+ "@react-navigation/native-stack": "^6.7.0",
32
33
  "@react-navigation/routers": "^6.1.0",
33
34
  "@react-navigation/stack": "^6.1.1",
34
35
  "nanoid": "^3.1.12",
package/src/router.tsx CHANGED
@@ -1,8 +1,9 @@
1
1
  import { createBottomTabNavigator } from '@react-navigation/bottom-tabs'
2
2
  import { NavigationContainer } from '@react-navigation/native'
3
+ import {createNativeStackNavigator, NativeStackNavigationOptions} from '@react-navigation/native-stack'
3
4
  import { BackBehavior } from '@react-navigation/routers/src/TabRouter'
4
- import { CardStyleInterpolators, createStackNavigator } from '@react-navigation/stack'
5
- import { StackHeaderMode, StackHeaderOptions, StackNavigationOptions } from '@react-navigation/stack/src/types'
5
+ import { CardStyleInterpolators, createStackNavigator, StackNavigationOptions } from '@react-navigation/stack'
6
+ import { StackHeaderMode, StackHeaderOptions } from '@react-navigation/stack/src/types'
6
7
  import { camelCase } from 'lodash'
7
8
  import React from 'react'
8
9
  import { StyleProp, ViewStyle } from 'react-native'
@@ -53,7 +54,7 @@ interface PageItem {
53
54
  interface RNConfig {
54
55
  initialRouteName?: string
55
56
  linking?: string[]
56
- screenOptions?: StackNavigationOptions
57
+ screenOptions?: StackNavigationOptions | NativeStackNavigationOptions
57
58
  tabOptions?: TabOptions
58
59
  tabBarOptions?: Record<string, any>
59
60
  tabProps?: {
@@ -67,6 +68,7 @@ interface RNConfig {
67
68
  headerMode?: StackHeaderMode
68
69
  detachInactiveScreens?:boolean
69
70
  }
71
+ useNativeStack?: boolean
70
72
  }
71
73
 
72
74
  export interface RouterConfig {
@@ -122,7 +124,7 @@ function getHeaderView (title: string, color: string, props: any) {
122
124
  }
123
125
 
124
126
  // screen配置的内容
125
- function getStackOptions (config: RouterConfig): StackNavigationOptions {
127
+ function getStackOptions (config: RouterConfig) {
126
128
  const windowOptions = config.window || {}
127
129
  const title = ''
128
130
  const headColor = windowOptions.navigationBarTextStyle || 'white'
@@ -326,7 +328,7 @@ function getLinkingConfig (config: RouterConfig) {
326
328
  }
327
329
 
328
330
  function createTabNavigate (config: RouterConfig) {
329
- const Stack = createStackNavigator()
331
+ const Stack = config.rnConfig?.useNativeStack ? createNativeStackNavigator() : createStackNavigator()
330
332
  const pageList = getPageList(config)
331
333
  const linking = getLinkingConfig(config)
332
334
  const stackProps = config.rnConfig?.stackProps
@@ -338,6 +340,7 @@ function createTabNavigate (config: RouterConfig) {
338
340
  <Stack.Navigator
339
341
  detachInactiveScreens={false}
340
342
  {...stackProps}
343
+ // @ts-ignore
341
344
  screenOptions={screenOptions}
342
345
  initialRouteName={getInitRouteName(config)}
343
346
  >
@@ -362,7 +365,7 @@ function createTabNavigate (config: RouterConfig) {
362
365
  }
363
366
 
364
367
  function createStackNavigate (config: RouterConfig) {
365
- const Stack = createStackNavigator()
368
+ const Stack = config.rnConfig?.useNativeStack ? createNativeStackNavigator() : createStackNavigator()
366
369
  const pageList = getPageList(config)
367
370
  if (pageList.length <= 0) return null
368
371
  const linking = getLinkingConfig(config)
@@ -374,6 +377,7 @@ function createStackNavigate (config: RouterConfig) {
374
377
  <Stack.Navigator
375
378
  detachInactiveScreens={false}
376
379
  {...stackProps}
380
+ // @ts-ignore
377
381
  screenOptions={getStackOptions(config)}
378
382
  initialRouteName={getInitRouteName(config)}
379
383
  >{pageList.map(item => {