Browse Source

fix(mobile/navigation/sdk) - simplified check for sdk

master
Calin Chitu 3 years ago
parent
commit
a3c60d5943
1 changed files with 49 additions and 51 deletions
  1. 49
    51
      react/features/mobile/navigation/components/RootNavigationContainer.js

+ 49
- 51
react/features/mobile/navigation/components/RootNavigationContainer.js View File

@@ -34,57 +34,55 @@ type Props = {
34 34
 }
35 35
 
36 36
 
37
-const RootNavigationContainer = ({ isWelcomePageAvailable }: Props) => (
38
-    <SafeAreaProvider>
39
-        <NavigationContainer
40
-            independent = { true }
41
-            ref = { rootNavigationRef }
42
-            theme = { navigationContainerTheme }>
43
-            <RootStack.Navigator
44
-                initialRouteName = { screen.root }>
45
-                {
46
-                    isWelcomePageAvailable
47
-                        ? <RootStack.Screen
48
-                            component = { WelcomePageNavigationContainer }
49
-                            name = { screen.root }
50
-                            options = { drawerNavigatorScreenOptions } />
51
-                        : <RootStack.Screen
52
-                            component = { ConnectingPage }
53
-                            name = { screen.connecting }
54
-                            options = {{
55
-                                gestureEnabled: false,
56
-                                headerShown: false
57
-                            }} />
58
-                }
59
-                <RootStack.Screen
60
-                    component = { ConnectingPage }
61
-                    name = { screen.connecting }
62
-                    options = {{
63
-                        gestureEnabled: false,
64
-                        headerShown: false
65
-                    }} />
66
-                <RootStack.Screen
67
-                    component = { DialInSummary }
68
-                    name = { screen.dialInSummary }
69
-                    options = { dialInSummaryScreenOptions } />
70
-                <RootStack.Screen
71
-                    component = { ConferenceNavigationContainer }
72
-                    name = { screen.conference.root }
73
-                    options = {{
74
-                        gestureEnabled: false,
75
-                        headerShown: false
76
-                    }} />
77
-                <RootStack.Screen
78
-                    component = { EndMeetingPage }
79
-                    name = { screen.endMeeting }
80
-                    options = {{
81
-                        gestureEnabled: false,
82
-                        headerShown: false
83
-                    }} />
84
-            </RootStack.Navigator>
85
-        </NavigationContainer>
86
-    </SafeAreaProvider>
87
-);
37
+const RootNavigationContainer = ({ isWelcomePageAvailable }: Props) => {
38
+    const initialRouteName = isWelcomePageAvailable
39
+        ? screen.root : screen.connecting;
40
+
41
+    return (
42
+        <SafeAreaProvider>
43
+            <NavigationContainer
44
+                independent = { true }
45
+                ref = { rootNavigationRef }
46
+                theme = { navigationContainerTheme }>
47
+                <RootStack.Navigator
48
+                    initialRouteName = { initialRouteName }>
49
+                    {
50
+                        isWelcomePageAvailable
51
+                            && <RootStack.Screen
52
+                                component = { WelcomePageNavigationContainer }
53
+                                name = { screen.root }
54
+                                options = { drawerNavigatorScreenOptions } />
55
+                    }
56
+                    <RootStack.Screen
57
+                        component = { ConnectingPage }
58
+                        name = { screen.connecting }
59
+                        options = {{
60
+                            gestureEnabled: false,
61
+                            headerShown: false
62
+                        }} />
63
+                    <RootStack.Screen
64
+                        component = { DialInSummary }
65
+                        name = { screen.dialInSummary }
66
+                        options = { dialInSummaryScreenOptions } />
67
+                    <RootStack.Screen
68
+                        component = { ConferenceNavigationContainer }
69
+                        name = { screen.conference.root }
70
+                        options = {{
71
+                            gestureEnabled: false,
72
+                            headerShown: false
73
+                        }} />
74
+                    <RootStack.Screen
75
+                        component = { EndMeetingPage }
76
+                        name = { screen.endMeeting }
77
+                        options = {{
78
+                            gestureEnabled: false,
79
+                            headerShown: false
80
+                        }} />
81
+                </RootStack.Navigator>
82
+            </NavigationContainer>
83
+        </SafeAreaProvider>
84
+    );
85
+};
88 86
 
89 87
 /**
90 88
  * Maps part of the Redux store to the props of this component.

Loading…
Cancel
Save