Restore complete tab state after canceled pre-insert

Restore the full saved tab navigator route after the RHP has already been
dismissed. This removes both same-tab and cross-tab state mutations instead of
only correcting the currently focused screen.

Author: abzokhattab

src/libs/Navigation/Navigation.ts

@@ -1198,39 +1198,22 @@ function removePreInsertedFullscreenIfNeeded() {
         return;
     }
 
-    // RHP already dismissed. For the tab-switch path, jump back to the original tab.
-    // For the push path, pop the pre-inserted route directly.
+    // RHP already dismissed. Restore the entire TAB_NAVIGATOR route from the snapshot so both the focused tab
+    // and every tab's nested state are put back. A bare jumpTo only restores focus, while resetting the active
+    // nested tab router can discard the inactive tabs that were also present in the snapshot.
     const originalTabRoute = getPreInsertedOriginalTabRoute();
     if (originalTabRoute) {
         clearPreInsertedOriginalTabRoute();
-        const originalTabState = originalTabRoute.state;
-        const originalFocusedTabIndex = originalTabState?.index ?? 0;
-        const originalTabName = originalTabState?.routes?.[originalFocusedTabIndex]?.name;
-        if (originalTabName) {
-            requestAnimationFrame(() => {
-                const currentState = navigationRef.getRootState();
-                const tabNavRoute = currentState?.routes.findLast((r) => r.name === NAVIGATORS.TAB_NAVIGATOR);
-                if (!tabNavRoute?.state?.key) {
-                    return;
-                }
-                // A same-tab pre-insert (e.g. a report pre-inserted while another report of the same split navigator was
-                // visible) rewrote the focused tab's inner state in place, so jumping to the tab name would be a no-op
-                // that leaves the pre-inserted screen visible. Reset the tab navigator to the saved original route state
-                // so the screen the user started on comes back.
-                const focusedTabName = tabNavRoute.state.routes?.at(tabNavRoute.state.index ?? 0)?.name;
-                if (focusedTabName === originalTabName && originalTabState) {
-                    navigationRef.current?.dispatch({
-                        ...CommonActions.reset(originalTabState),
-                        target: tabNavRoute.state.key,
-                    });
-                    return;
-                }
-                navigationRef.current?.dispatch({
-                    ...TabActions.jumpTo(originalTabName),
-                    target: tabNavRoute.state.key,
-                });
-            });
-        }
+        requestAnimationFrame(() => {
+            const currentState = navigationRef.getRootState();
+            const tabNavIndex = currentState?.routes.findLastIndex((r) => r.name === NAVIGATORS.TAB_NAVIGATOR) ?? -1;
+            if (!currentState || tabNavIndex < 0) {
+                return;
+            }
+            const newRoutes = [...currentState.routes.slice(0, tabNavIndex), originalTabRoute, ...currentState.routes.slice(tabNavIndex + 1)];
+            const clampedIndex = currentState.index >= newRoutes.length ? newRoutes.length - 1 : currentState.index;
+            navigationRef.resetRoot({...currentState, routes: newRoutes, index: clampedIndex});
+        });
         return;
     }
 

tests/navigation/RemovePreInsertedFullscreenAfterRHPDismissTests.tsx

@@ -95,6 +95,11 @@ function getCentralPaneReportID() {
     return (topmostReport?.params as {reportID?: string} | undefined)?.reportID;
 }
 
+function getReportsTabState() {
+    const tabState = navigationRef.current?.getRootState().routes.find((route) => route.name === NAVIGATORS.TAB_NAVIGATOR)?.state;
+    return tabState?.routes.find((route) => route.name === NAVIGATORS.REPORTS_SPLIT_NAVIGATOR)?.state;
+}
+
 function isRHPOnTop() {
     return navigationRef.current?.getRootState().routes.at(-1)?.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR;
 }
@@ -145,14 +150,16 @@ describe('removePreInsertedFullscreenIfNeeded after the RHP was dismissed by the
         expect(getFocusedTabName()).toBe(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR);
     });
 
-    it('still jumps back to the original tab when the pre-insert switched tabs', async () => {
+    it('restores the original focus and nested state when the pre-insert switched tabs', async () => {
         // Given the RHP opened from the Search tab, with a report pre-inserted under it (switches to the Reports tab)
         render(<TestNavigationContainer initialState={buildInitialState(SEARCH_TAB_INDEX)} />);
+        const originalReportsTabState = getReportsTabState();
         act(() => {
             Navigation.preInsertFullscreenUnderRHP(ROUTES.REPORT_WITH_ID.getRoute(WORKSPACE_CHAT_REPORT_ID));
         });
         expect(Navigation.getIsFullscreenPreInsertedUnderRHP()).toBe(true);
         expect(getFocusedTabName()).toBe(NAVIGATORS.REPORTS_SPLIT_NAVIGATOR);
+        expect(getCentralPaneReportID()).toBe(WORKSPACE_CHAT_REPORT_ID);
 
         // When the device back button pops the RHP and the unmount cleanup runs afterwards
         act(() => {
@@ -163,8 +170,9 @@ describe('removePreInsertedFullscreenIfNeeded after the RHP was dismissed by the
         });
         await flushAnimationFrame();
 
-        // Then the user is back on the tab the flow started from
+        // Then the user is back on the tab the flow started from and the destination tab was fully restored
         expect(getFocusedTabName()).toBe(NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR);
+        expect(getReportsTabState()).toEqual(originalReportsTabState);
     });
 
     it('restores the origin report through the router action when the RHP is still on top', () => {