fix: preserve params when switching tabs. fixes #9782

react-navigation · Aug 3, 2021 · 98fa233 · 98fa233
1 parent be8532c
commit 98fa233
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/packages/bottom-tabs/src/views/BottomTabBar.tsx b/packages/bottom-tabs/src/views/BottomTabBar.tsx
@@ -299,7 +299,7 @@ export default function BottomTabBar({
 
             if (!focused && !event.defaultPrevented) {
               navigation.dispatch({
-                ...CommonActions.navigate(route.name),
+                ...CommonActions.navigate({ name: route.name, merge: true }),
                 target: state.key,
               });
             }

diff --git a/packages/drawer/src/views/DrawerItemList.tsx b/packages/drawer/src/views/DrawerItemList.tsx
@@ -63,7 +63,7 @@ export default function DrawerItemList({
           navigation.dispatch({
             ...(focused
               ? DrawerActions.closeDrawer()
-              : CommonActions.navigate(route.name)),
+              : CommonActions.navigate({ name: route.name, merge: true })),
             target: state.key,
           });
         }}

diff --git a/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx b/packages/material-bottom-tabs/src/views/MaterialBottomTabView.tsx
@@ -1,9 +1,9 @@
 import { SafeAreaProviderCompat } from '@react-navigation/elements';
 import {
+  CommonActions,
   Link,
   ParamListBase,
   Route,
-  TabActions,
   TabNavigationState,
   useLinkBuilder,
   useTheme,
@@ -106,7 +106,10 @@ function MaterialBottomTabViewInner({
       navigationState={state}
       onIndexChange={(index: number) =>
         navigation.dispatch({
-          ...TabActions.jumpTo(state.routes[index].name),
+          ...CommonActions.navigate({
+            name: state.routes[index].name,
+            merge: true,
+          }),
           target: state.key,
         })
       }

diff --git a/packages/material-top-tabs/src/views/MaterialTopTabView.tsx b/packages/material-top-tabs/src/views/MaterialTopTabView.tsx
@@ -1,7 +1,7 @@
 import {
+  CommonActions,
   ParamListBase,
   Route,
-  TabActions,
   TabNavigationState,
   useTheme,
 } from '@react-navigation/native';
@@ -48,7 +48,10 @@ export default function MaterialTopTabView({
       {...rest}
       onIndexChange={(index) =>
         navigation.dispatch({
-          ...TabActions.jumpTo(state.routes[index].name),
+          ...CommonActions.navigate({
+            name: state.routes[index].name,
+            merge: true,
+          }),
           target: state.key,
         })
       }