Remove BOTTOM_TAB, cleanup code related to SplitNavigators

src/NAVIGATORS.ts

@@ -4,7 +4,6 @@
  * */
 export default {
     CENTRAL_PANE_NAVIGATOR: 'CentralPaneNavigator',
-    BOTTOM_TAB_NAVIGATOR: 'BottomTabNavigator',
     LEFT_MODAL_NAVIGATOR: 'LeftModalNavigator',
     RIGHT_MODAL_NAVIGATOR: 'RightModalNavigator',
     ONBOARDING_MODAL_NAVIGATOR: 'OnboardingModalNavigator',

src/SCREENS.ts

@@ -49,7 +49,6 @@ const SCREENS = {
         SAVED_SEARCH_RENAME_RHP: 'Search_Saved_Search_Rename_RHP',
         ADVANCED_FILTERS_IN_RHP: 'Search_Advanced_Filters_In_RHP',
         TRANSACTION_HOLD_REASON_RHP: 'Search_Transaction_Hold_Reason_RHP',
-        BOTTOM_TAB: 'Search_Bottom_Tab',
     },
     SETTINGS: {
         ROOT: 'Settings_Root',

src/components/FocusTrap/FocusTrapForScreen/index.web.tsx

@@ -1,11 +1,11 @@
 import {useIsFocused, useRoute} from '@react-navigation/native';
 import FocusTrap from 'focus-trap-react';
 import React, {useMemo} from 'react';
-import BOTTOM_TAB_SCREENS from '@components/FocusTrap/BOTTOM_TAB_SCREENS';
 import sharedTrapStack from '@components/FocusTrap/sharedTrapStack';
 import TOP_TAB_SCREENS from '@components/FocusTrap/TOP_TAB_SCREENS';
 import WIDE_LAYOUT_INACTIVE_SCREENS from '@components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import {isSidebarScreenName} from '@libs/NavigationUtils';
 import CONST from '@src/CONST';
 import type FocusTrapProps from './FocusTrapProps';
 
@@ -19,7 +19,7 @@ function FocusTrapForScreen({children, focusTrapSettings}: FocusTrapProps) {
             return focusTrapSettings.active;
         }
         // Focus trap can't be active on bottom tab screens because it would block access to the tab bar.
-        if (BOTTOM_TAB_SCREENS.find((screen) => screen === route.name)) {
+        if (isSidebarScreenName(route.name)) {
             return false;
         }
 

src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts

@@ -1,12 +1,10 @@
-import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 
 /**
  * Screens displayed in the BottomTab and CentralPane displayed side by side that should not have active
  * focus trap when rendered on a wide screen to allow navigation between them using the keyboard
  */
 const WIDE_LAYOUT_INACTIVE_SCREENS: string[] = [
-    NAVIGATORS.BOTTOM_TAB_NAVIGATOR,
     SCREENS.HOME,
     SCREENS.SETTINGS.ROOT,
     SCREENS.REPORT,

src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/index.tsx

@@ -10,14 +10,12 @@ import Text from '@components/Text';
 import useCurrentReportID from '@hooks/useCurrentReportID';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import getTopmostCentralPaneRoute from '@libs/Navigation/getTopmostCentralPaneRoute';
-import type {RootStackParamList, State} from '@libs/Navigation/types';
-import Navigation, {navigationRef} from '@navigation/Navigation';
+import isSearchTopmostFullScreenRoute from '@libs/Navigation/isSearchTopmostFullScreenRoute';
+import Navigation from '@navigation/Navigation';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
-import SCREENS from '@src/SCREENS';
+import ROUTES from '@src/ROUTES';
 import type {Report} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import MentionReportContext from './MentionReportContext';
@@ -74,9 +72,8 @@ function MentionReportRenderer({style, tnode, TDefaultRenderer, ...defaultRender
     const {reportID, mentionDisplayText} = mentionDetails;
 
     let navigationRoute: Route | undefined = reportID ? ROUTES.REPORT_WITH_ID.getRoute(reportID) : undefined;
-    const topmostCentralPaneRoute = getTopmostCentralPaneRoute(navigationRef.getRootState() as State<RootStackParamList>);
     const backTo = Navigation.getActiveRoute();
-    if (topmostCentralPaneRoute?.name === SCREENS.SEARCH.CENTRAL_PANE) {
+    if (isSearchTopmostFullScreenRoute()) {
         navigationRoute = reportID ? ROUTES.SEARCH_REPORT.getRoute({reportID, backTo}) : undefined;
     }
     const isCurrentRoomMention = reportID === currentReportIDValue;

src/components/PromotedActionsBar.tsx

@@ -5,15 +5,13 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as HeaderUtils from '@libs/HeaderUtils';
 import * as Localize from '@libs/Localize';
-import getTopmostCentralPaneRoute from '@libs/Navigation/getTopmostCentralPaneRoute';
-import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
-import type {RootStackParamList, State} from '@libs/Navigation/types';
+import isSearchTopmostFullScreenRoute from '@libs/Navigation/isSearchTopmostFullScreenRoute';
+import Navigation from '@libs/Navigation/Navigation';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as ReportActions from '@userActions/Report';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
-import SCREENS from '@src/SCREENS';
 import type {ReportAction} from '@src/types/onyx';
 import type OnyxReport from '@src/types/onyx/Report';
 import Button from './Button';
@@ -93,9 +91,8 @@ const PromotedActions = {
                 Navigation.goBack();
             }
             const targetedReportID = reportID ?? reportAction?.childReportID ?? '';
-            const topmostCentralPaneRoute = getTopmostCentralPaneRoute(navigationRef.getRootState() as State<RootStackParamList>);
 
-            if (topmostCentralPaneRoute?.name !== SCREENS.SEARCH.CENTRAL_PANE && isTextHold) {
+            if (isSearchTopmostFullScreenRoute() && isTextHold) {
                 ReportUtils.changeMoneyRequestHoldStatus(reportAction, ROUTES.REPORT_WITH_ID.getRoute(targetedReportID));
                 return;
             }

src/components/ScrollOffsetContextProvider.tsx

@@ -3,7 +3,7 @@ import React, {createContext, useCallback, useEffect, useMemo, useRef} from 'rea
 import {withOnyx} from 'react-native-onyx';
 import usePrevious from '@hooks/usePrevious';
 import type {NavigationPartialRoute, State} from '@libs/Navigation/types';
-import NAVIGATORS from '@src/NAVIGATORS';
+import {isSidebarScreenName} from '@libs/NavigationUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 import type {PriorityMode} from '@src/types/onyx';
@@ -74,14 +74,11 @@ function ScrollOffsetContextProvider({children, priorityMode}: ScrollOffsetConte
     }, []);
 
     const cleanStaleScrollOffsets: ScrollOffsetContextValue['cleanStaleScrollOffsets'] = useCallback((state) => {
-        const bottomTabNavigator = state.routes.find((route) => route.name === NAVIGATORS.BOTTOM_TAB_NAVIGATOR);
-        if (bottomTabNavigator?.state && 'routes' in bottomTabNavigator.state) {
-            const bottomTabNavigatorRoutes = bottomTabNavigator.state.routes;
-            const scrollOffsetkeysOfExistingScreens = bottomTabNavigatorRoutes.map((route) => getKey(route));
-            for (const key of Object.keys(scrollOffsetsRef.current)) {
-                if (!scrollOffsetkeysOfExistingScreens.includes(key)) {
-                    delete scrollOffsetsRef.current[key];
-                }
+        const sidebarRoutes = state.routes.filter((route) => isSidebarScreenName(route.name));
+        const scrollOffsetkeysOfExistingScreens = sidebarRoutes.map((route) => getKey(route));
+        for (const key of Object.keys(scrollOffsetsRef.current)) {
+            if (!scrollOffsetkeysOfExistingScreens.includes(key)) {
+                delete scrollOffsetsRef.current[key];
             }
         }
     }, []);

src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx

@@ -92,7 +92,7 @@ function BottomTabBar({selectedTab}: BottomTabBarProps) {
     }, [selectedTab]);
 
     const navigateToSearch = useCallback(() => {
-        if (selectedTab === SCREENS.SEARCH.BOTTOM_TAB) {
+        if (selectedTab === SCREENS.SEARCH.CENTRAL_PANE) {
             return;
         }
         interceptAnonymousUser(() => {