fix(mobile): preserve navigation history during native dismissals

Author: juliusmarminge

apps/mobile/src/features/files/FileTreeBrowser.tsx

@@ -253,6 +253,7 @@ export function FileTreeBrowser(props: {
   // list as direct screen content so automatic inset adjustment can find it.
   return (
     <LegendList
+      contentInsetStartAdjustment={headerInset}
       alwaysBounceVertical
       className="flex-1"
       data={visibleNodes}

apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx

@@ -2,7 +2,6 @@ import {
   createNavigatorFactory,
   NavigationContext,
   NavigationRouteContext,
-  StackActions,
   StackRouter,
   useNavigationBuilder,
   type NavigatorTypeBagBase,
@@ -37,7 +36,7 @@ import {
 import { NATIVE_WORKSPACE_COLUMNS_SUPPORTED } from "../../native/NativeWorkspaceColumns";
 import { V5StackHeader } from "../../native/V5StackHeader.ios";
 import {
-  nativeWorkspacePopCount,
+  nativeWorkspacePopAction,
   projectWorkspaceStack,
   partitionStackPresentations,
 } from "../../native/workspace-stack-projection";
@@ -123,9 +122,8 @@ function WorkspaceColumns(
   const handleNativeDismiss = useCallback(
     (key: string) => {
       const state = props.navigation.getState();
-      const count = nativeWorkspacePopCount(state, key);
-      if (count)
-        props.navigation.dispatch({ ...StackActions.pop(count), source: key, target: state.key });
+      const action = nativeWorkspacePopAction(state, key);
+      if (action) props.navigation.dispatch(action);
     },
     [props.navigation],
   );

apps/mobile/src/features/settings/SettingsRouteScreen.tsx

@@ -29,9 +29,11 @@ export function SettingsRouteScreen() {
 
   return (
     <>
+      {Platform.OS === "ios" ? (
+        <NativeStackScreenOptions options={{ headerBackVisible: !layout.usesSplitView }} />
+      ) : null}
       {Platform.OS === "ios" && layout.usesSplitView ? (
         <>
-          <NativeStackScreenOptions options={{ headerBackVisible: false }} />
           <NativeHeaderToolbar placement="left">
             <NativeHeaderToolbar.Button
               accessibilityLabel="Go back"

apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx

@@ -1206,7 +1206,8 @@ export function ThreadTerminalRouteScreen(props: ThreadTerminalRouteScreenProps)
                 : terminalTheme.background,
             // The v5 column extends behind UIKit chrome. Its measured top
             // reservation is zero when UIKit has already inset the body or moved the bar.
-            paddingTop: Platform.OS === "ios" ? (nativeColumnMetrics?.safeArea.top ?? 0) : 0,
+            paddingTop:
+              Platform.OS === "ios" ? (nativeColumnMetrics?.safeArea.top ?? insets.top) : 0,
             paddingBottom:
               Platform.OS === "android" && !keyboardState.isVisible ? insets.bottom : 0,
           }}

apps/mobile/src/native/V5StackHeader.ios.tsx

@@ -111,7 +111,7 @@ function convertItems(items: NativeStackHeaderItem[], prefix: string): HeaderIte
           identifier: item.identifier,
           title: item.label || item.accessibilityLabel || undefined,
           icon: convertIcon(item.icon),
-          menu: convertMenu(item.menu, `${id}:menu`),
+          menu: item.disabled ? undefined : convertMenu(item.menu, `${id}:menu`),
           hidesSharedBackground: item.hidesSharedBackground,
         };
       case "button":

apps/mobile/src/native/createV5StackNavigator.ios.tsx

@@ -2,7 +2,6 @@ import {
   createNavigatorFactory,
   NavigationContext,
   NavigationRouteContext,
-  StackActions,
   StackRouter,
   useNavigationBuilder,
   usePreventRemoveContext,
@@ -27,6 +26,7 @@ import { FormSheet, Stack } from "react-native-screens";
 import { V5StackHeader } from "./V5StackHeader.ios";
 import { NativeColumnContent } from "./NativeColumnContent.ios";
 import {
+  nativeWorkspacePopAction,
   nativeWorkspacePopCount,
   partitionStackPresentations,
   reconcileStackScreens,
@@ -108,9 +108,8 @@ export function V5CardStackView(props: V5StackViewProps) {
           descriptors,
         };
       });
-      const count = nativeWorkspacePopCount(state, key);
-      if (count)
-        props.navigation.dispatch({ ...StackActions.pop(count), source: key, target: state.key });
+      const action = nativeWorkspacePopAction(state, key);
+      if (action) props.navigation.dispatch(action);
     },
     [props.navigation, setScreens],
   );
@@ -296,7 +295,7 @@ export function V5SheetStackView(props: V5StackViewProps) {
         const descriptor = props.descriptors[first.key] ?? retained.descriptors[first.key];
         if (!descriptor) return null;
         const options = descriptor.options;
-        const attached = props.state.routes.some((route) => route.key === first.key);
+        const attached = nativeWorkspacePopCount(props.state, first.key) > 0;
         return (
           <FormSheet
             key={first.key}
@@ -318,25 +317,15 @@ export function V5SheetStackView(props: V5StackViewProps) {
               const guarded = group.findLast((route) => preventedRoutes[route.key]?.preventRemove);
               if (guarded) {
                 const state = props.navigation.getState();
-                const count = nativeWorkspacePopCount(state, first.key);
-                if (count)
-                  props.navigation.dispatch({
-                    ...StackActions.pop(count),
-                    source: first.key,
-                    target: state.key,
-                  });
+                const action = nativeWorkspacePopAction(state, first.key);
+                if (action) props.navigation.dispatch(action);
               }
             }}
             onDismiss={() => removeSheet(first.key)}
             onNativeDismiss={() => {
               const state = props.navigation.getState();
-              const count = nativeWorkspacePopCount(state, first.key);
-              if (count)
-                props.navigation.dispatch({
-                  ...StackActions.pop(count),
-                  source: first.key,
-                  target: state.key,
-                });
+              const action = nativeWorkspacePopAction(state, first.key);
+              if (action) props.navigation.dispatch(action);
               removeSheet(first.key);
             }}
           >

apps/mobile/src/native/workspace-stack-projection.test.ts

@@ -1,13 +1,23 @@
+import * as NodeModule from "node:module";
 import type { ParamListBase, StackNavigationState } from "@react-navigation/native";
 import { describe, expect, it } from "vite-plus/test";
 
 import {
+  nativeWorkspacePopAction,
   nativeWorkspacePopCount,
   projectWorkspaceStack,
   partitionStackPresentations,
   reconcileStackScreens,
 } from "./workspace-stack-projection";
 
+// Load the same router as native navigation without importing React Native into Node.
+const requireNavigation = NodeModule.createRequire(
+  NodeModule.createRequire(import.meta.url).resolve("@react-navigation/native/package.json"),
+);
+const { StackRouter } = requireNavigation("@react-navigation/routers") as {
+  StackRouter: typeof import("@react-navigation/native").StackRouter;
+};
+
 const home = { key: "home", name: "Home" };
 const thread = { key: "thread", name: "Thread", params: { threadId: "draft-thread" } };
 const files = { key: "files", name: "ThreadFiles", params: thread.params };
@@ -78,6 +88,24 @@ describe("workspace router projection", () => {
 });
 
 describe("native workspace dismissal", () => {
+  it("dismisses a sheet and its pushed pages without removing the underlying draft", () => {
+    const state = history([home, thread, settings, legal]);
+    const action = nativeWorkspacePopAction(state, settings.key)!;
+    const next = StackRouter({}).getStateForAction(state, action, {
+      routeNames: state.routeNames,
+      routeParamList: {},
+      routeGetIdList: {},
+    });
+    expect(next?.routes).toEqual([home, thread]);
+    expect(next?.routes[1]).toBe(thread);
+    expect(next?.index).toBe(1);
+  });
+
+  it("does not dismiss retained sheets beyond the active index", () => {
+    const state = { ...history([home, thread, settings, legal]), index: 1 };
+    expect(nativeWorkspacePopAction(state, settings.key)).toBeNull();
+    expect(nativeWorkspacePopAction(state, legal.key)).toBeNull();
+  });
   it("pops a native dismissed file while keeping the conversation and its draft mounted", () => {
     expect(nativeWorkspacePopCount(history([home, thread, files]), files.key)).toBe(1);
   });

apps/mobile/src/native/workspace-stack-projection.ts

@@ -28,6 +28,22 @@ export function nativeWorkspacePopCount(
   return index <= 0 || index > state.index ? 0 : state.index - index + 1;
 }
 
+/** POP counts backwards from its source, so dismiss a group from the active descendant. */
+export function nativeWorkspacePopAction(
+  state: Pick<NavigationState, "key" | "index" | "routes">,
+  dismissedKey: string,
+) {
+  const count = nativeWorkspacePopCount(state, dismissedKey);
+  return count
+    ? {
+        type: "POP" as const,
+        payload: { count },
+        source: state.routes[state.index]!.key,
+        target: state.key,
+      }
+    : null;
+}
+
 /** Group pushes with the modal that owns their native stack. */
 export function partitionStackPresentations<T>(
   routes: readonly T[],

docs/operations/mobile-screens-fork.md

@@ -1,7 +1,7 @@
 # Building the mobile Screens dependency
 
 The mobile v5 stack uses a committed tarball from the
-[T3 Screens fork](https://github.com/juliusmarminge/react-native-screens/tree/t3/main).
+[T3 Screens fork](https://github.com/juliusmarminge/react-native-screens/tree/t3-v5.0.0-t3.7).
 The fork owns the integration changes; the app does not patch this package.
 Each archive includes compiled JavaScript, declarations, native source and
 `t3-fork.json` recording its version, source commit and upstream base.