浏览代码

feat(mobile/navigation) - updated to native stack navigators

master
Calin Chitu 3 年前
父节点
当前提交
fc725c07e9

+ 44
- 0
package-lock.json 查看文件

@@ -49,6 +49,7 @@
49 49
         "@react-navigation/elements": "1.2.1",
50 50
         "@react-navigation/material-top-tabs": "6.0.6",
51 51
         "@react-navigation/native": "6.0.6",
52
+        "@react-navigation/native-stack": "6.6.2",
52 53
         "@react-navigation/stack": "6.0.11",
53 54
         "@svgr/webpack": "4.3.2",
54 55
         "@tensorflow/tfjs-backend-wasm": "3.13.0",
@@ -5021,6 +5022,33 @@
5021 5022
         "react-native": "*"
5022 5023
       }
5023 5024
     },
5025
+    "node_modules/@react-navigation/native-stack": {
5026
+      "version": "6.6.2",
5027
+      "resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.6.2.tgz",
5028
+      "integrity": "sha512-pFMuzhxbPml5MBvJVAzHWoaUkQaefAOKpuUnAs/AxNQuHQwwnxRmDit1PQLuIPo7g7DlfwFXagDHE1R0tbnS8Q==",
5029
+      "dependencies": {
5030
+        "@react-navigation/elements": "^1.3.3",
5031
+        "warn-once": "^0.1.0"
5032
+      },
5033
+      "peerDependencies": {
5034
+        "@react-navigation/native": "^6.0.0",
5035
+        "react": "*",
5036
+        "react-native": "*",
5037
+        "react-native-safe-area-context": ">= 3.0.0",
5038
+        "react-native-screens": ">= 3.0.0"
5039
+      }
5040
+    },
5041
+    "node_modules/@react-navigation/native-stack/node_modules/@react-navigation/elements": {
5042
+      "version": "1.3.3",
5043
+      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.3.tgz",
5044
+      "integrity": "sha512-Lv2lR7si5gNME8dRsqz57d54m4FJtrwHRjNQLOyQO546ZxO+g864cSvoLC6hQedQU0+IJnPTsZiEI2hHqfpEpw==",
5045
+      "peerDependencies": {
5046
+        "@react-navigation/native": "^6.0.0",
5047
+        "react": "*",
5048
+        "react-native": "*",
5049
+        "react-native-safe-area-context": ">= 3.0.0"
5050
+      }
5051
+    },
5024 5052
     "node_modules/@react-navigation/routers": {
5025 5053
       "version": "6.1.0",
5026 5054
       "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.0.tgz",
@@ -23713,6 +23741,22 @@
23713 23741
         "nanoid": "^3.1.23"
23714 23742
       }
23715 23743
     },
23744
+    "@react-navigation/native-stack": {
23745
+      "version": "6.6.2",
23746
+      "resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.6.2.tgz",
23747
+      "integrity": "sha512-pFMuzhxbPml5MBvJVAzHWoaUkQaefAOKpuUnAs/AxNQuHQwwnxRmDit1PQLuIPo7g7DlfwFXagDHE1R0tbnS8Q==",
23748
+      "requires": {
23749
+        "@react-navigation/elements": "^1.3.3",
23750
+        "warn-once": "^0.1.0"
23751
+      },
23752
+      "dependencies": {
23753
+        "@react-navigation/elements": {
23754
+          "version": "1.3.3",
23755
+          "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.3.tgz",
23756
+          "integrity": "sha512-Lv2lR7si5gNME8dRsqz57d54m4FJtrwHRjNQLOyQO546ZxO+g864cSvoLC6hQedQU0+IJnPTsZiEI2hHqfpEpw=="
23757
+        }
23758
+      }
23759
+    },
23716 23760
     "@react-navigation/routers": {
23717 23761
       "version": "6.1.0",
23718 23762
       "resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.0.tgz",

+ 1
- 0
package.json 查看文件

@@ -54,6 +54,7 @@
54 54
     "@react-navigation/elements": "1.2.1",
55 55
     "@react-navigation/material-top-tabs": "6.0.6",
56 56
     "@react-navigation/native": "6.0.6",
57
+    "@react-navigation/native-stack": "6.6.2",
57 58
     "@react-navigation/stack": "6.0.11",
58 59
     "@svgr/webpack": "4.3.2",
59 60
     "@tensorflow/tfjs-backend-wasm": "3.13.0",

+ 2
- 2
react/features/mobile/navigation/components/RootNavigationContainer.js 查看文件

@@ -1,5 +1,5 @@
1 1
 import { NavigationContainer } from '@react-navigation/native';
2
-import { createStackNavigator } from '@react-navigation/stack';
2
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
3 3
 import React, { useCallback } from 'react';
4 4
 
5 5
 import { connect } from '../../../base/redux';
@@ -19,7 +19,7 @@ import ConferenceNavigationContainer
19 19
 import WelcomePageNavigationContainer from './welcome/components/WelcomePageNavigationContainer';
20 20
 import { isWelcomePageAppEnabled } from './welcome/functions';
21 21
 
22
-const RootStack = createStackNavigator();
22
+const RootStack = createNativeStackNavigator();
23 23
 
24 24
 
25 25
 type Props = {

+ 3
- 3
react/features/mobile/navigation/components/conference/components/ConferenceNavigationContainer.tsx 查看文件

@@ -1,5 +1,5 @@
1 1
 import { NavigationContainer } from '@react-navigation/native';
2
-import { createStackNavigator } from '@react-navigation/stack';
2
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
3 3
 import React from 'react';
4 4
 import { useTranslation } from 'react-i18next';
5 5
 import { useSelector } from 'react-redux';
@@ -45,7 +45,7 @@ import {
45 45
     conferenceNavigationRef
46 46
 } from '../ConferenceNavigationContainerRef';
47 47
 
48
-const ConferenceStack = createStackNavigator();
48
+const ConferenceStack = createNativeStackNavigator();
49 49
 
50 50
 const ConferenceNavigationContainer = () => {
51 51
     const isPollsDisabled = useSelector(getDisablePolls);
@@ -164,4 +164,4 @@ const ConferenceNavigationContainer = () => {
164 164
     );
165 165
 };
166 166
 
167
-export default ConferenceNavigationContainer;
167
+export default ConferenceNavigationContainer;

+ 2
- 2
react/features/mobile/navigation/components/lobby/components/LobbyNavigationContainer.js 查看文件

@@ -1,5 +1,5 @@
1 1
 import { NavigationContainer } from '@react-navigation/native';
2
-import { createStackNavigator } from '@react-navigation/stack';
2
+import { createNativeStackNavigator } from '@react-navigation/native-stack';
3 3
 import React from 'react';
4 4
 import { useSelector } from 'react-redux';
5 5
 
@@ -12,7 +12,7 @@ import {
12 12
 } from '../../../screenOptions';
13 13
 import { lobbyNavigationContainerRef } from '../LobbyNavigationContainerRef';
14 14
 
15
-const LobbyStack = createStackNavigator();
15
+const LobbyStack = createNativeStackNavigator();
16 16
 
17 17
 
18 18
 const LobbyNavigationContainer = () => {

正在加载...
取消
保存