Merge pull request #121 from kolplattformen/fix/child-screen-links

fix: direktlänkning från knapparna i barnlistan
kolplattformen · Feb 15, 2021 · a2700c9 · a2700c9
2 parents 7b60769 + da2892c
commit a2700c9
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 9 deletions.
diff --git a/packages/app/components/child.component.js b/packages/app/components/child.component.js
@@ -117,17 +117,19 @@ const TopTabBar = ({ navigation, state }) => (
   </TabBar>
 )
 
-const TabNavigator = () => (
-  <Navigator tabBar={(props) => <TopTabBar {...props} />}>
+const TabNavigator = ({initialRouteName = 'Nyheter'}) => (
+  <Navigator
+    initialRouteName={initialRouteName}
+    tabBar={(props) => <TopTabBar {...props} />}>
     <Screen name="Nyheter" component={NewsScreen} />
     <Screen name="Notifieringar" component={NotificationsScreen} />
     <Screen name="Kalender" component={CalendarScreen} />
     <Screen name="Klassen" component={ClassmatesScreen} />
   </Navigator>
 )
 
-export const Child = ({ route, navigation }) => {
-  const { child, color } = route.params
+export const Child = ({route, navigation}) => {
+  const {child, color, initialRouteName} = route.params
 
   const BackIcon = (props) => <Icon {...props} name="arrow-back" />
 
@@ -148,7 +150,7 @@ export const Child = ({ route, navigation }) => {
           accessoryLeft={BackAction}
           style={styles.topBar}
         />
-        <TabNavigator />
+        <TabNavigator initialRouteName={initialRouteName} />
       </ChildProvider>
     </SafeAreaView>
   )

diff --git a/packages/app/components/childListItem.component.js b/packages/app/components/childListItem.component.js
@@ -76,7 +76,11 @@ export const ChildListItem = ({ navigation, child, color }) => {
         status="control"
         size="small"
         onPress={() =>
-          navigation.navigate('Child', { child, color, selectedTab: 0 })
+          navigation.navigate('Child', {
+            child,
+            color,
+            initialRouteName: 'Nyheter',
+          })
         }
         accessoryLeft={NewsIcon}>
         {`${(news || []).length}`}
@@ -86,7 +90,11 @@ export const ChildListItem = ({ navigation, child, color }) => {
         status="control"
         size="small"
         onPress={() =>
-          navigation.navigate('Child', { child, color, selectedTab: 1 })
+          navigation.navigate('Child', {
+            child,
+            color,
+            initialRouteName: 'Notifieringar',
+          })
         }
         accessoryLeft={NotificationsIcon}>
         {`${(notifications || []).length}`}
@@ -96,7 +104,11 @@ export const ChildListItem = ({ navigation, child, color }) => {
         status="control"
         size="small"
         onPress={() =>
-          navigation.navigate('Child', { child, color, selectedTab: 2 })
+          navigation.navigate('Child', {
+            child,
+            color,
+            initialRouteName: 'Kalender',
+          })
         }
         accessoryLeft={CalendarIcon}>
         {`${(notifications || []).length}`}
@@ -106,7 +118,11 @@ export const ChildListItem = ({ navigation, child, color }) => {
         status="control"
         size="small"
         onPress={() =>
-          navigation.navigate('Child', { child, color, selectedTab: 3 })
+          navigation.navigate('Child', {
+            child,
+            color,
+            initialRouteName: 'Klassen',
+          })
         }
         accessoryLeft={PeopleIcon}>
         {`${(classmates || []).length}`}