mirror/iNaturalistReactNative
1
0
Fork 0
mirror of https://github.com/inaturalist/iNaturalistReactNative.git synced 2026-04-21 07:20:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

MOB-1190: move helper logic outside component

Browse Source
This commit is contained in:
sepeterson
2026-03-10 16:23:26 -05:00
parent 2e5ada70af
commit dfec2a4cb7
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/navigation/BottomTabNavigator/CustomTabBarContainer.tsx
View File

@@ -34,6 +34,22 @@ type ScreenName =
type Props = BottomTabBarProps;
// Reset Menu and Notifications stacks when navigating away from them
const resetOnLeaveTabScreenTuples: [TabName, ScreenName][] = [
["MenuTab", SCREEN_NAME_MENU],
["NotificationsTab", SCREEN_NAME_NOTIFICATIONS],
];
const getActiveTab = ( activeTabName: TabName ): ScreenName => {
switch ( activeTabName ) {
case "MenuTab": return SCREEN_NAME_MENU;
case "ExploreTab": return SCREEN_NAME_ROOT_EXPLORE;
case "ObservationsTab": return SCREEN_NAME_OBS_LIST;
case "NotificationsTab": return SCREEN_NAME_NOTIFICATIONS;
default: return SCREEN_NAME_OBS_LIST;
}
};
const CustomTabBarContainer: React.FC<Props> = ( { navigation, state } ) => {
const { t } = useTranslation( );
const currentUser = useCurrentUser( );
@@ -43,17 +59,7 @@ const CustomTabBarContainer: React.FC<Props> = ( { navigation, state } ) => {
const userIconUri = useMemo( ( ) => User.uri( currentUser ), [currentUser] );
const getActiveTab = ( ): ScreenName => {
switch ( activeTabName ) {
case "MenuTab": return SCREEN_NAME_MENU;
case "ExploreTab": return SCREEN_NAME_ROOT_EXPLORE;
case "ObservationsTab": return SCREEN_NAME_OBS_LIST;
case "NotificationsTab": return SCREEN_NAME_NOTIFICATIONS;
default: return SCREEN_NAME_OBS_LIST;
}
};
const activeTab = getActiveTab( );
const activeTab = getActiveTab( activeTabName );
const handleTabPress = useCallback( (
targetTabName: TabName,
@@ -64,13 +70,7 @@ const CustomTabBarContainer: React.FC<Props> = ( { navigation, state } ) => {
= navState.routes.slice();
let needsReset = false;
// Reset Menu and Notifications stacks when navigating away from them
const resetOnLeave: [TabName, ScreenName][] = [
["MenuTab", SCREEN_NAME_MENU],
["NotificationsTab", SCREEN_NAME_NOTIFICATIONS],
];
for ( const [tabName, screenName] of resetOnLeave ) {
for ( const [tabName, screenName] of resetOnLeaveTabScreenTuples ) {
if ( activeTabName === tabName && targetTabName !== tabName ) {
const idx = newStacks.findIndex( r => r.name === activeTabName );
newStacks.splice( idx, 1, {