feat(mobile/navigation) - updated to native stack navigators
This commit is contained in:
parent
d49c86bd5f
commit
fc725c07e9
|
@ -49,6 +49,7 @@
|
||||||
"@react-navigation/elements": "1.2.1",
|
"@react-navigation/elements": "1.2.1",
|
||||||
"@react-navigation/material-top-tabs": "6.0.6",
|
"@react-navigation/material-top-tabs": "6.0.6",
|
||||||
"@react-navigation/native": "6.0.6",
|
"@react-navigation/native": "6.0.6",
|
||||||
|
"@react-navigation/native-stack": "6.6.2",
|
||||||
"@react-navigation/stack": "6.0.11",
|
"@react-navigation/stack": "6.0.11",
|
||||||
"@svgr/webpack": "4.3.2",
|
"@svgr/webpack": "4.3.2",
|
||||||
"@tensorflow/tfjs-backend-wasm": "3.13.0",
|
"@tensorflow/tfjs-backend-wasm": "3.13.0",
|
||||||
|
@ -5021,6 +5022,33 @@
|
||||||
"react-native": "*"
|
"react-native": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@react-navigation/native-stack": {
|
||||||
|
"version": "6.6.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.6.2.tgz",
|
||||||
|
"integrity": "sha512-pFMuzhxbPml5MBvJVAzHWoaUkQaefAOKpuUnAs/AxNQuHQwwnxRmDit1PQLuIPo7g7DlfwFXagDHE1R0tbnS8Q==",
|
||||||
|
"dependencies": {
|
||||||
|
"@react-navigation/elements": "^1.3.3",
|
||||||
|
"warn-once": "^0.1.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"@react-navigation/native": "^6.0.0",
|
||||||
|
"react": "*",
|
||||||
|
"react-native": "*",
|
||||||
|
"react-native-safe-area-context": ">= 3.0.0",
|
||||||
|
"react-native-screens": ">= 3.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@react-navigation/native-stack/node_modules/@react-navigation/elements": {
|
||||||
|
"version": "1.3.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.3.tgz",
|
||||||
|
"integrity": "sha512-Lv2lR7si5gNME8dRsqz57d54m4FJtrwHRjNQLOyQO546ZxO+g864cSvoLC6hQedQU0+IJnPTsZiEI2hHqfpEpw==",
|
||||||
|
"peerDependencies": {
|
||||||
|
"@react-navigation/native": "^6.0.0",
|
||||||
|
"react": "*",
|
||||||
|
"react-native": "*",
|
||||||
|
"react-native-safe-area-context": ">= 3.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@react-navigation/routers": {
|
"node_modules/@react-navigation/routers": {
|
||||||
"version": "6.1.0",
|
"version": "6.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.0.tgz",
|
||||||
|
@ -23713,6 +23741,22 @@
|
||||||
"nanoid": "^3.1.23"
|
"nanoid": "^3.1.23"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"@react-navigation/native-stack": {
|
||||||
|
"version": "6.6.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@react-navigation/native-stack/-/native-stack-6.6.2.tgz",
|
||||||
|
"integrity": "sha512-pFMuzhxbPml5MBvJVAzHWoaUkQaefAOKpuUnAs/AxNQuHQwwnxRmDit1PQLuIPo7g7DlfwFXagDHE1R0tbnS8Q==",
|
||||||
|
"requires": {
|
||||||
|
"@react-navigation/elements": "^1.3.3",
|
||||||
|
"warn-once": "^0.1.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"@react-navigation/elements": {
|
||||||
|
"version": "1.3.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.3.tgz",
|
||||||
|
"integrity": "sha512-Lv2lR7si5gNME8dRsqz57d54m4FJtrwHRjNQLOyQO546ZxO+g864cSvoLC6hQedQU0+IJnPTsZiEI2hHqfpEpw=="
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"@react-navigation/routers": {
|
"@react-navigation/routers": {
|
||||||
"version": "6.1.0",
|
"version": "6.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/@react-navigation/routers/-/routers-6.1.0.tgz",
|
||||||
|
|
|
@ -54,6 +54,7 @@
|
||||||
"@react-navigation/elements": "1.2.1",
|
"@react-navigation/elements": "1.2.1",
|
||||||
"@react-navigation/material-top-tabs": "6.0.6",
|
"@react-navigation/material-top-tabs": "6.0.6",
|
||||||
"@react-navigation/native": "6.0.6",
|
"@react-navigation/native": "6.0.6",
|
||||||
|
"@react-navigation/native-stack": "6.6.2",
|
||||||
"@react-navigation/stack": "6.0.11",
|
"@react-navigation/stack": "6.0.11",
|
||||||
"@svgr/webpack": "4.3.2",
|
"@svgr/webpack": "4.3.2",
|
||||||
"@tensorflow/tfjs-backend-wasm": "3.13.0",
|
"@tensorflow/tfjs-backend-wasm": "3.13.0",
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { NavigationContainer } from '@react-navigation/native';
|
import { NavigationContainer } from '@react-navigation/native';
|
||||||
import { createStackNavigator } from '@react-navigation/stack';
|
import { createNativeStackNavigator } from '@react-navigation/native-stack';
|
||||||
import React, { useCallback } from 'react';
|
import React, { useCallback } from 'react';
|
||||||
|
|
||||||
import { connect } from '../../../base/redux';
|
import { connect } from '../../../base/redux';
|
||||||
|
@ -19,7 +19,7 @@ import ConferenceNavigationContainer
|
||||||
import WelcomePageNavigationContainer from './welcome/components/WelcomePageNavigationContainer';
|
import WelcomePageNavigationContainer from './welcome/components/WelcomePageNavigationContainer';
|
||||||
import { isWelcomePageAppEnabled } from './welcome/functions';
|
import { isWelcomePageAppEnabled } from './welcome/functions';
|
||||||
|
|
||||||
const RootStack = createStackNavigator();
|
const RootStack = createNativeStackNavigator();
|
||||||
|
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { NavigationContainer } from '@react-navigation/native';
|
import { NavigationContainer } from '@react-navigation/native';
|
||||||
import { createStackNavigator } from '@react-navigation/stack';
|
import { createNativeStackNavigator } from '@react-navigation/native-stack';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { useSelector } from 'react-redux';
|
import { useSelector } from 'react-redux';
|
||||||
|
@ -45,7 +45,7 @@ import {
|
||||||
conferenceNavigationRef
|
conferenceNavigationRef
|
||||||
} from '../ConferenceNavigationContainerRef';
|
} from '../ConferenceNavigationContainerRef';
|
||||||
|
|
||||||
const ConferenceStack = createStackNavigator();
|
const ConferenceStack = createNativeStackNavigator();
|
||||||
|
|
||||||
const ConferenceNavigationContainer = () => {
|
const ConferenceNavigationContainer = () => {
|
||||||
const isPollsDisabled = useSelector(getDisablePolls);
|
const isPollsDisabled = useSelector(getDisablePolls);
|
||||||
|
@ -164,4 +164,4 @@ const ConferenceNavigationContainer = () => {
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default ConferenceNavigationContainer;
|
export default ConferenceNavigationContainer;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
import { NavigationContainer } from '@react-navigation/native';
|
import { NavigationContainer } from '@react-navigation/native';
|
||||||
import { createStackNavigator } from '@react-navigation/stack';
|
import { createNativeStackNavigator } from '@react-navigation/native-stack';
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { useSelector } from 'react-redux';
|
import { useSelector } from 'react-redux';
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ import {
|
||||||
} from '../../../screenOptions';
|
} from '../../../screenOptions';
|
||||||
import { lobbyNavigationContainerRef } from '../LobbyNavigationContainerRef';
|
import { lobbyNavigationContainerRef } from '../LobbyNavigationContainerRef';
|
||||||
|
|
||||||
const LobbyStack = createStackNavigator();
|
const LobbyStack = createNativeStackNavigator();
|
||||||
|
|
||||||
|
|
||||||
const LobbyNavigationContainer = () => {
|
const LobbyNavigationContainer = () => {
|
||||||
|
|
Loading…
Reference in New Issue