Skip to content

Commit 5eeb3e1

Browse files
authored
Merge pull request Expensify#66022 from thelullabyy/fix/65416/debug-mode-tabs
Debug mode tabs not working properly
2 parents cf95c68 + 9ddaf2f commit 5eeb3e1

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/libs/Navigation/DebugTabNavigator.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type {EventMapCore, NavigationProp, NavigationState, ParamListBase} from '@react-navigation/native';
2-
import {useNavigation} from '@react-navigation/native';
2+
import {useNavigation, useRoute} from '@react-navigation/native';
33
import {createStackNavigator} from '@react-navigation/stack';
44
import React, {useEffect, useMemo, useState} from 'react';
55
import {View} from 'react-native';
@@ -53,11 +53,12 @@ type DebugTabNavigatorProps = {
5353
function DebugTabNavigator({id, routes}: DebugTabNavigatorProps) {
5454
const styles = useThemeStyles();
5555
const theme = useTheme();
56-
const navigation = useNavigation<NavigationProp<Record<string, void>>>();
56+
const navigation = useNavigation<NavigationProp<Record<string, unknown>>>();
5757
const {translate} = useLocalize();
5858
const [currentTab, setCurrentTab] = useState(routes.at(0)?.name);
5959
const defaultAffectedAnimatedTabs = useMemo(() => Array.from({length: routes.length}, (v, i) => i), [routes.length]);
6060
const [affectedAnimatedTabs, setAffectedAnimatedTabs] = useState(defaultAffectedAnimatedTabs);
61+
const routeData = useRoute();
6162

6263
useEffect(() => {
6364
// It is required to wait transition end to reset affectedAnimatedTabs because tabs style is still animating during transition.
@@ -98,7 +99,7 @@ function DebugTabNavigator({id, routes}: DebugTabNavigatorProps) {
9899
const {icon, title} = getIconAndTitle(route.name, translate);
99100

100101
const onPress = () => {
101-
navigation.navigate(route.name);
102+
navigation.navigate(routeData.name, {...routeData?.params, screen: route.name});
102103
setCurrentTab(route.name);
103104
};
104105

0 commit comments

Comments
 (0)