The best way to control Claude Code, Codex and more from any computer or phone
fix(mobile): iPad workspace tabs live in the sidebar and leave with it (#27229)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Julius Marminge committed
Nov 3, 2026 at 16:53 UTC
e04464dd6861bdf393fc321e168ad404e3bf38e1
2 files changed
+58
-13
apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx
+27
-2
@@ -19,7 +19,15 @@ import {
19
type NativeStackNavigatorProps,
20
type NativeStackTypeBag,
21
} from "@react-navigation/native-stack";
22
-import { Fragment, use, useEffect, useRef, useState, type ComponentProps } from "react";
22
+import {
23
+ Fragment,
24
+ use,
25
+ useEffect,
26
+ useRef,
27
+ useState,
28
+ type ComponentProps,
29
+ type ReactNode,
30
+} from "react";
31
import { StyleSheet, View } from "react-native";
32
import { Split, type SplitHostCommands } from "react-native-screens";
33
import { SafeAreaView } from "react-native-safe-area-context";
@@ -27,7 +35,10 @@ import { GestureHandlerRootView } from "react-native-gesture-handler";
35
import { EnvironmentId, ThreadId } from "@t3tools/contracts";
36
import { scopedThreadKey } from "../../lib/scopedEntities";
37
import { WorkspaceTabsProvider, useWorkspaceTabs } from "../workspace/WorkspaceTabsContext";
30
-import { WorkspaceNativeTabs } from "../workspace/WorkspaceNativeTabs.ios";
38
+import {
39
+ WorkspaceNativeTabs,
40
+ WorkspaceSidebarTabsFooter,
41
+} from "../workspace/WorkspaceNativeTabs.ios";
42
import { workspaceUsesColumns } from "../workspace/workspace-tabs-state";
43
import { isSettingsRoute, settingsOpenIn } from "../settings/settings-navigation";
44
import { workspaceRoutesOf } from "./workspace-overlay-routes";
@@ -91,6 +102,7 @@ function ColumnScreen(props: {
102
readonly onAppearance: (type: "willAppear" | "didAppear" | "willDisappear", key: string) => void;
103
readonly onCompose?: () => void;
104
readonly navigation: ViewProps["navigation"];
105
+ readonly footer?: ReactNode;
106
}) {
107
const { descriptor } = props;
108
// Options a screen set inside this workspace tab slot, over its route's.
@@ -159,6 +171,7 @@ function ColumnScreen(props: {
171
<Fragment key={key}>{descriptor.render()}</Fragment>
172
</NativePrimaryColumnContext>
173
</ColumnContent>
174
+ {props.footer}
175
</NavigationRouteContext>
176
</NavigationContext>
177
</PaneContext>
@@ -385,6 +398,16 @@ function WorkspaceColumns(
398
<ColumnScreen
399
descriptor={primary}
400
primary
401
+ footer={
402
+ deviceType === "pad" ? (
403
+ <View
404
+ pointerEvents="box-none"
405
+ style={{ position: "absolute", left: 0, right: 0, bottom: 0, height: 128 }}
406
+ >
407
+ <WorkspaceSidebarTabsFooter />
408
+ </View>
409
+ ) : undefined
410
+ }
411
selectedThreadKey={selectedThreadKey}
412
selectedPullRequestKey={selectedPullRequestKey}
413
onDismiss={handleNativeDismiss}
@@ -471,6 +494,7 @@ function WorkspaceColumns(
494
495
function WorkspaceStackView(props: ViewProps & { readonly nativeColumns: boolean }) {
496
const { layout } = useAdaptiveWorkspaceLayout();
497
+ const deviceType = useDeviceType();
498
const workspace = useWorkspaceTabs()!;
499
// Native dismiss commits the route pop after the transition. Restore the dock
500
// when the primary screen starts appearing, including interactive back gestures.
@@ -504,6 +528,7 @@ function WorkspaceStackView(props: ViewProps & { readonly nativeColumns: boolean
528
options: { headerShown: false },
529
render: () => (
530
<WorkspaceNativeTabs
531
+ tabsInSidebarColumn={props.nativeColumns && !workspacePage && deviceType === "pad"}
532
hidden={
533
!workspacePage &&
534
projection.detail.length > 0 &&
apps/mobile/src/features/workspace/WorkspaceNativeTabs.ios.tsx
+31
-11
@@ -73,6 +73,8 @@ function RetainedWorkspaceTab(props: {
73
export function WorkspaceNativeTabs(props: {
74
readonly children: ReactNode;
75
readonly hidden: boolean;
76
+ /** The sidebar column draws the tabs itself, so they leave with it. */
77
+ readonly tabsInSidebarColumn?: boolean;
78
}) {
79
const workspace = useWorkspaceTabs()!;
80
const order = useEnabledNavigationTabs();
@@ -83,7 +85,13 @@ export function WorkspaceNativeTabs(props: {
85
const systemTabBar = useSystemWorkspaceTabBar();
86
const deviceType = useDeviceType();
87
const compactTabs = useCompactWorkspaceTabs();
86
- const { layout, startNewTask } = useAdaptiveWorkspaceLayout();
88
+ const { layout, panes } = useAdaptiveWorkspaceLayout();
89
+ // The tabs belong to the sidebar; over a page with the sidebar hidden they'd cover the composer.
90
+ const hiddenWithSidebar =
91
+ deviceType === "pad" &&
92
+ layout.usesSplitView &&
93
+ workspaceUsesColumns(workspace.state.selectedTab, workspace.settingsOpen) &&
94
+ !panes.primarySidebarVisible;
95
const floatingTabs = useFloatingWorkspaceTabs();
96
const { width } = useWindowDimensions();
97
const { colors } = useControlTheme();
@@ -153,7 +161,9 @@ export function WorkspaceNativeTabs(props: {
161
compactTabs ||
162
(layout.variant === "medium" &&
163
!workspaceUsesColumns(selectedTab, workspace.settingsOpen))) &&
156
- !props.hidden ? (
164
+ !props.hidden &&
165
+ !props.tabsInSidebarColumn &&
166
+ !hiddenWithSidebar ? (
167
<View
168
pointerEvents="box-none"
169
style={{
@@ -168,17 +178,27 @@ export function WorkspaceNativeTabs(props: {
178
height: 128,
179
}}
180
>
171
- <WorkspaceSidebarTabs
172
- compact={floatingTabs}
173
- reserveComposeSpace={floatingTabs}
174
- onNewTask={
175
- floatingTabs && !workspace.settingsOpen && selectedTab === "threads"
176
- ? startNewTask
177
- : undefined
178
- }
179
- />
181
+ <WorkspaceSidebarTabsFooter />
182
</View>
183
) : null}
184
</View>
185
);
186
}
187
+
188
+/** The workspace tabs at the foot of the sidebar. */
189
+export function WorkspaceSidebarTabsFooter() {
190
+ const workspace = useWorkspaceTabs()!;
191
+ const { startNewTask } = useAdaptiveWorkspaceLayout();
192
+ const compact = useFloatingWorkspaceTabs();
193
+ return (
194
+ <WorkspaceSidebarTabs
195
+ compact={compact}
196
+ reserveComposeSpace={compact}
197
+ onNewTask={
198
+ compact && !workspace.settingsOpen && workspace.state.selectedTab === "threads"
199
+ ? startNewTask
200
+ : undefined
201
+ }
202
+ />
203
+ );
204
+}