@devries-cameron20 / t3code-1 / commits / 29db71bf25
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

refactor(mobile): a pane's bar draws its own sidebar toggle (#27086)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Julius Marminge committed Nov 3, 2026 at 16:53 UTC 29db71bf25b018c178f17d77ee2508f6f1b08017
49 files changed +239 -267
apps/mobile/src/components/ui/AppBar.android.test.tsx
+2 -4
@@ -27,9 +27,7 @@ vi.mock("./useToolbarLayout", () => ({
27 useToolbarLayout: () => ({ height: 48, paddingTop: 0, paddingBottom: 0 }),
28 }));
29 vi.mock("../../native/StackHeader", () => ({ NativeStackScreenOptions: () => null }));
30 -vi.mock("../../features/layout/workspace-sidebar-toolbar", () => ({
31 - AndroidWorkspaceSidebarButton: () => null,
32 -}));
30 +vi.mock("../../features/layout/useSidebarToggle", () => ({ useSidebarToggle: () => null }));
31 vi.mock("../../features/settings/appearance/AppearancePreferencesProvider", () => ({
32 useAppearancePreferences: () => ({ themeVariables: {} }),
33 }));
@@ -50,7 +48,7 @@ it("renders a sheet bar without search outside a navigation container", () => {
48 const root = createRoot(container);
49 roots.push(root);
50
53 - act(() => root.render(<AppBar sheet sidebar={false} title="Arrange threads" />));
51 + act(() => root.render(<AppBar sheet title="Arrange threads" />));
52
53 expect(container.textContent).toBe("Arrange threads");
54 });
apps/mobile/src/components/ui/AppBar.android.tsx
+12 -3
@@ -3,9 +3,9 @@ import { Keyboard, type TextInputInstance, View } from "react-native";
3 import { useHardwareBack } from "../../lib/backHandler";
4 import { useToolbarLayout } from "./useToolbarLayout";
5 import { NativeStackScreenOptions } from "../../native/StackHeader";
6 -import { AndroidWorkspaceSidebarButton } from "../../features/layout/workspace-sidebar-toolbar";
6 +import { useSidebarToggle } from "../../features/layout/useSidebarToggle";
7 import { useAppearancePreferences } from "../../features/settings/appearance/AppearancePreferencesProvider";
8 -import { AndroidScreenHeader } from "./AndroidScreenHeader";
8 +import { AndroidHeaderIconButton, AndroidScreenHeader } from "./AndroidScreenHeader";
9 import { ScreenHeaderButton } from "./ScreenHeaderButton.android";
10 import { Menu } from "./Menu";
11 import { SearchField } from "./SearchField";
@@ -68,6 +68,7 @@ function AppBarView(props: AppBarProps & { readonly searchState?: SearchState })
68 const { paddingTop, paddingBottom } = useToolbarLayout(props.sheet);
69 const { themeVariables } = useAppearancePreferences();
70 const inWorkspace = useHasWorkspaceAppBar();
71 + const sidebarToggle = useSidebarToggle();
72 const inline = search?.mode === "inline";
73 const searching = searchState?.searching === true;
74 const openSearch = () => searchState?.open();
@@ -155,7 +156,15 @@ function AppBarView(props: AppBarProps & { readonly searchState?: SearchState })
156 subtitle={props.subtitle}
157 onBack={props.onBack}
158 leading={
158 - props.leading ?? (props.sidebar !== false ? <AndroidWorkspaceSidebarButton /> : undefined)
159 + props.leading ??
160 + // Only a real button: any leading content takes the bar's navigation slot.
161 + (sidebarToggle && !props.sheet ? (
162 + <AndroidHeaderIconButton
163 + accessibilityLabel={sidebarToggle.accessibilityLabel}
164 + icon={sidebarToggle.icon}
165 + onPress={sidebarToggle.onPress}
166 + />
167 + ) : undefined)
168 }
169 embedded={props.sheet}
170 hideBottomBorder={props.hideBottomBorder}
apps/mobile/src/components/ui/AppBar.tsx
+21 -26
@@ -9,6 +9,7 @@ import { NativeStackScreenOptions } from "../../native/StackHeader";
9 import { useNativeWorkspaceColumnsSupported } from "../../native/NativeWorkspaceColumns";
10 import { useDeviceType } from "../../native/native-layout-metrics";
11 import { useAdaptiveWorkspaceLayout } from "../../features/layout/AdaptiveWorkspaceLayout";
12 +import { useSidebarToggle } from "../../features/layout/useSidebarToggle";
13 import {
14 createNativeMailSearchToolbarItem,
15 NATIVE_MAIL_SEARCH_TOOLBAR_SUPPORTED,
@@ -41,7 +42,17 @@ export function AppBar(props: AppBarProps) {
42 const usesNativeWorkspaceColumns = useNativeWorkspaceColumnsSupported();
43 const deviceType = useDeviceType();
44 const headerId = useId();
44 - const { layout, panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout();
45 + const { layout } = useAdaptiveWorkspaceLayout();
46 + const sidebarToggle = useSidebarToggle();
47 + // The Duo's native columns show their own sidebar button while the sidebar is open.
48 + const showsSidebarToggle =
49 + sidebarToggle !== null &&
50 + (!usesNativeWorkspaceColumns || deviceType === "pad" || !sidebarToggle.visible);
51 + const splitBackPress = props.backInSplitView?.onPress ?? props.onBack;
52 + const splitBack =
53 + layout.usesSplitView && props.backInSplitView && splitBackPress
54 + ? { ...props.backInSplitView, onPress: splitBackPress }
55 + : null;
56 const { themeVariables } = useAppearancePreferences();
57 const usesNativeMailSearchToolbar = useNativeMailSearchToolbar();
58 const { search, menus } = props;
@@ -63,10 +74,7 @@ export function AppBar(props: AppBarProps) {
74 ]}
75 options={{
76 headerShown: true,
66 - headerBackVisible:
67 - !layout.usesSplitView ||
68 - !props.backInSplitView ||
69 - !(props.backInSplitView.onPress || props.onBack),
77 + headerBackVisible: splitBack === null,
78 title: props.title,
79 unstable_headerSubtitle: props.subtitle || undefined,
80 ...(props.matchSearchSurface
@@ -117,30 +125,17 @@ export function AppBar(props: AppBarProps) {
125 ...props.options,
126 }}
127 />
120 - {layout.usesSplitView && (props.sidebar !== false || props.backInSplitView) ? (
128 + {(splitBack || showsSidebarToggle) &&
129 + props.options?.unstable_headerLeftItems === undefined ? (
130 <Toolbar placement="left">
122 - {props.backInSplitView && (props.backInSplitView.onPress || props.onBack) ? (
123 - <ScreenHeaderButton
124 - {...props.backInSplitView}
125 - onPress={props.backInSplitView.onPress ?? props.onBack}
126 - />
127 - ) : null}
128 - {props.sidebar !== false &&
129 - (!usesNativeWorkspaceColumns || deviceType === "pad" || !panes.primarySidebarVisible) ? (
131 + {splitBack ? <ScreenHeaderButton {...splitBack} /> : null}
132 + {showsSidebarToggle ? (
133 <ScreenHeaderButton
134 axisBehavior={usesNativeWorkspaceColumns ? "horizontalOnly" : undefined}
132 - accessibilityLabel={
133 - panes.primarySidebarVisible
134 - ? `Maximize ${props.title.toLowerCase()}`
135 - : "Show threads"
136 - }
137 - icon={
138 - panes.primarySidebarVisible ? "arrow.up.left.and.arrow.down.right" : "sidebar.left"
139 - }
140 - onPress={togglePrimarySidebar}
141 - separateBackground={
142 - props.backInSplitView ? props.backInSplitView.separateBackground : true
143 - }
135 + accessibilityLabel={sidebarToggle.accessibilityLabel}
136 + icon={sidebarToggle.icon}
137 + onPress={sidebarToggle.onPress}
138 + separateBackground={splitBack ? splitBack.separateBackground : true}
139 />
140 ) : null}
141 </Toolbar>
apps/mobile/src/components/ui/AppBar.types.ts
-1
@@ -75,7 +75,6 @@ export interface AppBarProps {
75 readonly menus?: ReadonlyArray<AppBarMenu>;
76 readonly search?: AppBarSearch;
77 readonly onBack?: () => void;
78 - readonly sidebar?: boolean;
78 /** Android: replaces the sidebar button at the start of the bar. */
79 readonly leading?: ReactNode;
80 /** Leaves route options to the screen: in-screen bars, and screens that set their own. iOS draws nothing. */
apps/mobile/src/components/ui/Pane.tsx new
+10
@@ -0,0 +1,10 @@
1 +import { createContext, use } from "react";
2 +
3 +/** Which workspace column a screen renders in. Sheets and full-screen overlays are in none. */
4 +export type PaneRole = "sidebar" | "content" | "inspector";
5 +
6 +export const PaneContext = createContext<PaneRole | null>(null);
7 +
8 +export function usePaneRole() {
9 + return use(PaneContext);
10 +}
apps/mobile/src/components/ui/Sheet.android.tsx
+1 -7
@@ -24,13 +24,7 @@ export function Sheet(props: SheetProps) {
24 {/* Android FormSheet does not bound flex children. Material drags target the first scroll view, so place content before the header. */}
25 <View collapsable={false} className="absolute inset-0 flex-col-reverse bg-header">
26 <ScreenContent>{props.children}</ScreenContent>
27 - <AppBar
28 - sheet
29 - sidebar={false}
30 - title={props.title}
31 - onBack={() => setIsOpen(false)}
32 - hideBottomBorder
33 - />
27 + <AppBar sheet title={props.title} onBack={() => setIsOpen(false)} hideBottomBorder />
28 <View
29 pointerEvents="none"
30 className="absolute top-1 h-1 w-8 self-center rounded-full bg-header-foreground/40"
apps/mobile/src/components/ui/SheetHeader.android.tsx
-1
@@ -39,7 +39,6 @@ export function SheetHeader(props: SheetHeaderProps) {
39 <AppBar
40 embedded
41 sheet={props.presentation === "inline"}
42 - sidebar={false}
42 title={props.title}
43 subtitle={props.subtitle}
44 leading={
apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
-1
@@ -53,7 +53,6 @@ function ArchivedThreadsHeader(props: {
53 return (
54 <AppBar
55 title="Archived threads"
56 - sidebar={false}
56 onBack={() => navigation.goBack()}
57 search={{
58 value: props.searchQuery,
apps/mobile/src/features/browser/BrowserPreviewRouteScreen.tsx
-1
@@ -113,7 +113,6 @@ function BrowserPreviewScreen({
113 <View className="flex-1 bg-sheet" style={{ paddingBottom: insets.bottom }}>
114 <AppBar
115 title={tab ? browserTabTitle(tab) : "Browser"}
116 - sidebar={false}
116 onBack={onClose}
117 options={{ headerBackVisible: false }}
118 actions={
apps/mobile/src/features/connection/ConnectionsRouteScreen.tsx
-1
@@ -33,7 +33,6 @@ export function ConnectionsRouteScreen() {
33 {Platform.OS === "android" ? (
34 <AppBar
35 embedded
36 - sidebar={false}
36 title="Environments"
37 onBack={() => navigation.goBack()}
38 actions={[
apps/mobile/src/features/development/ComponentCatalogScreen.tsx
+1 -1
@@ -59,7 +59,7 @@ export function ComponentCatalogScreen() {
59 };
60 return (
61 <View className="flex-1 bg-screen">
62 - <AppBar title="UI components" onBack={() => navigation.goBack()} sidebar={false} />
62 + <AppBar title="UI components" onBack={() => navigation.goBack()} />
63 <ScreenScrollView
64 contentInsetAdjustmentBehavior="automatic"
65 contentContainerStyle={{ padding: 16, gap: 20, paddingBottom: 40 }}
apps/mobile/src/features/files/AttachmentFileScreen.tsx
-1
@@ -241,7 +241,6 @@ export function AttachmentFileScreen(props: AttachmentFileScreenProps) {
241 {isAndroid ? (
242 <AppBar
243 embedded
244 - sidebar={false}
244 title={params.name}
245 subtitle={subtitle}
246 onBack={handleBack}
apps/mobile/src/features/files/FilesHeader.tsx
-1
@@ -43,7 +43,6 @@ export function FilesHeader(props: {
43 >
44 <AppBar
45 embedded
46 - sidebar={false}
46 title="Files"
47 subtitle={props.projectName}
48 hideBottomBorder
apps/mobile/src/features/files/ZipArchiveView.tsx
-2
@@ -308,7 +308,6 @@ function ZipArchiveHeader(props: {
308 {isAndroid ? (
309 <AppBar
310 embedded
311 - sidebar={false}
311 title={props.name}
312 subtitle={props.subtitle}
313 onBack={() => {
@@ -760,7 +759,6 @@ function ZipEntryView(props: {
759 {isAndroid ? (
760 <AppBar
761 embedded
763 - sidebar={false}
762 title={entry.name}
763 subtitle={subtitle}
764 onBack={props.onBack}
apps/mobile/src/features/home/HomeRouteScreen.tsx
+1 -1
@@ -185,7 +185,7 @@ export function HomeRouteScreen() {
185 />
186 </Toolbar>
187 ) : null}
188 - {Platform.OS === "android" ? <AppBar embedded sidebar={false} title="Threads" /> : null}
188 + {Platform.OS === "android" ? <AppBar embedded title="Threads" /> : null}
189 <WorkspaceEmptyDetail
190 onAddConnection={
191 Platform.OS === "android" && !catalogState.hasConnections
apps/mobile/src/features/home/ThreadListToolbar.android.tsx
-1
@@ -62,7 +62,6 @@ export function ThreadListToolbar(props: ThreadListToolbarProps) {
62 onOpenEnvironments={props.onOpenEnvironments}
63 />
64 }
65 - sidebar={false}
65 search={{
66 value: props.searchQuery,
67 onChangeText: onSearchQueryChange,
apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
+52 -44
@@ -81,6 +81,7 @@ import { usePendingTaskListActions } from "../home/usePendingTaskListActions";
81 import { ThreadNavigationSidebar } from "../threads/ThreadNavigationSidebar";
82 import { useOpenThreadPullRequests } from "../threads/use-open-thread-pull-requests";
83 import { RenderErrorBoundary, RenderFailureView } from "../../components/RenderErrorBoundary";
84 +import { PaneContext } from "../../components/ui/Pane";
85 import { WORKSPACE_PANE_TIMING } from "./workspace-pane-animation";
86 import { WorkspaceInspectorPane } from "./workspace-inspector-pane";
87 import {
@@ -811,6 +812,7 @@ function AdaptiveWorkspaceLayoutContent(
812 setPrimarySidebarSearchQuery,
813 showInspector,
814 toggleAuxiliaryPane,
815 + sidebarToggleable: layout.usesSplitView && !primarySidebarPinned && !workspacePage,
816 togglePrimarySidebar,
817 setPrimarySidebarVisible,
818 openWorkspaceTab,
@@ -863,42 +865,44 @@ function AdaptiveWorkspaceLayoutContent(
865 ]}
866 >
867 <Animated.View className="flex-1" style={listPaneAnimatedStyle}>
866 - <RenderErrorBoundary
867 - renderFallback={(fallback) => (
868 - <RenderFailureView
869 - {...fallback}
870 - title="The sidebar couldn't be displayed"
871 - exit={{ label: "Open settings", onPress: handleOpenSettings }}
872 - />
873 - )}
874 - >
875 - <AndroidWorkspaceSidebar
876 - onRequestVisibility={revealPrimarySidebar}
877 - selectedPullRequestKey={props.selectedPullRequestKey ?? null}
868 + <PaneContext value="sidebar">
869 + <RenderErrorBoundary
870 + renderFallback={(fallback) => (
871 + <RenderFailureView
872 + {...fallback}
873 + title="The sidebar couldn't be displayed"
874 + exit={{ label: "Open settings", onPress: handleOpenSettings }}
875 + />
876 + )}
877 >
879 - <AndroidHomeFabLayout
880 - sidebar
881 - disabled={workspacePage}
882 - onStartNewTask={handleStartNewTask}
878 + <AndroidWorkspaceSidebar
879 + onRequestVisibility={revealPrimarySidebar}
880 + selectedPullRequestKey={props.selectedPullRequestKey ?? null}
881 >
884 - <ThreadNavigationSidebar
885 - width={layout.listPaneWidth}
886 - visible={panes.primarySidebarVisible}
887 - onRequestVisibility={revealPrimarySidebar}
888 - selectedThreadKey={selectedThreadKey}
889 - onOpenSettings={handleOpenSettings}
890 - onOpenEnvironmentSettings={handleOpenEnvironmentSettings}
891 - onNewThreadInProject={handleNewThreadInProject}
892 - onNewThreadOnBranch={handleNewThreadOnBranch}
893 - onOpenPendingTask={handleOpenPendingTask}
894 - onSelectThread={handleSelectThread}
895 - onOpenThreadPullRequests={handleOpenThreadPullRequests}
896 - onSearchQueryChange={setPrimarySidebarSearchQuery}
897 - searchQuery={primarySidebarSearchQuery}
898 - />
899 - </AndroidHomeFabLayout>
900 - </AndroidWorkspaceSidebar>
901 - </RenderErrorBoundary>
882 + <AndroidHomeFabLayout
883 + sidebar
884 + disabled={workspacePage}
885 + onStartNewTask={handleStartNewTask}
886 + >
887 + <ThreadNavigationSidebar
888 + width={layout.listPaneWidth}
889 + visible={panes.primarySidebarVisible}
890 + onRequestVisibility={revealPrimarySidebar}
891 + selectedThreadKey={selectedThreadKey}
892 + onOpenSettings={handleOpenSettings}
893 + onOpenEnvironmentSettings={handleOpenEnvironmentSettings}
894 + onNewThreadInProject={handleNewThreadInProject}
895 + onNewThreadOnBranch={handleNewThreadOnBranch}
896 + onOpenPendingTask={handleOpenPendingTask}
897 + onSelectThread={handleSelectThread}
898 + onOpenThreadPullRequests={handleOpenThreadPullRequests}
899 + onSearchQueryChange={setPrimarySidebarSearchQuery}
900 + searchQuery={primarySidebarSearchQuery}
901 + />
902 + </AndroidHomeFabLayout>
903 + </AndroidWorkspaceSidebar>
904 + </RenderErrorBoundary>
905 + </PaneContext>
906 {/* Keep the pill under the content throughout the sidebar's clipping animation. */}
907 {floatingTabsEnabled && !workspacePage ? (
908 <FloatingWorkspaceTabs
@@ -959,7 +963,9 @@ function AdaptiveWorkspaceLayoutContent(
963 }
964 >
965 <View className="flex-1">
962 - <SettingsWorkspaceLayout>{children}</SettingsWorkspaceLayout>
966 + <PaneContext value="content">
967 + <SettingsWorkspaceLayout>{children}</SettingsWorkspaceLayout>
968 + </PaneContext>
969 </View>
970 </SafeAreaInsetsContext>
971 {floatingTabsEnabled &&
@@ -976,15 +982,17 @@ function AdaptiveWorkspaceLayoutContent(
982 </WorkspaceContentWidthContext>
983 </Animated.View>
984 </Animated.View>
979 - <WorkspaceInspectorPane
980 - pathname={props.pathname}
981 - renderedInspectorWidth={renderedInspectorWidth}
982 - active={workspaceInspector?.active ?? false}
983 - panes={panes}
984 - renderInspector={workspaceInspector?.render}
985 - setAuxiliaryPaneWidth={setFileInspectorPreferredWidth}
986 - onClosed={handleWorkspaceInspectorClosed}
987 - />
985 + <PaneContext value="inspector">
986 + <WorkspaceInspectorPane
987 + pathname={props.pathname}
988 + renderedInspectorWidth={renderedInspectorWidth}
989 + active={workspaceInspector?.active ?? false}
990 + panes={panes}
991 + renderInspector={workspaceInspector?.render}
992 + setAuxiliaryPaneWidth={setFileInspectorPreferredWidth}
993 + onClosed={handleWorkspaceInspectorClosed}
994 + />
995 + </PaneContext>
996 {shouldRenderNavigationRail && navigationRailWidth > 0 ? (
997 // Its trailing inset clips the old rail as soon as Android fits the workspace to a cover display.
998 <View
apps/mobile/src/features/layout/adaptive-workspace-context.ts
+6
@@ -28,6 +28,11 @@ interface AdaptiveWorkspaceContextValue {
28 readonly setPrimarySidebarSearchQuery: (query: string) => void;
29 readonly showInspector: () => void;
30 readonly toggleAuxiliaryPane: () => void;
31 + /**
32 + * Whether the content pane offers a sidebar button: false without columns, on a list that keeps
33 + * its sidebar, and on a workspace page (Android Settings, Usage) that covers it.
34 + */
35 + readonly sidebarToggleable: boolean;
36 readonly togglePrimarySidebar: () => void;
37 readonly setPrimarySidebarVisible: (visible: boolean) => void;
38 /** Opens a workspace tab with its list and, with columns, the page it last showed. */
@@ -71,6 +76,7 @@ export const AdaptiveWorkspaceContext = createContext<AdaptiveWorkspaceContextVa
76 setPrimarySidebarSearchQuery: () => undefined,
77 showInspector: () => undefined,
78 toggleAuxiliaryPane: () => undefined,
79 + sidebarToggleable: false,
80 togglePrimarySidebar: () => undefined,
81 setPrimarySidebarVisible: () => undefined,
82 openWorkspaceTab: () => undefined,
apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx
+63 -55
@@ -48,6 +48,8 @@ import {
48 useNativeWorkspaceColumnsSupported,
49 } from "../../native/NativeWorkspaceColumns";
50 import { V5StackHeader } from "../../native/V5StackHeader.ios";
51 +import { PaneContext } from "../../components/ui/Pane";
52 +import { useWorkspaceSidebarHeaderItem } from "./useWorkspaceSidebarHeaderItem";
53 import type { AppNativeStackNavigationOptions } from "../../native/StackHeader";
54 import {
55 collapsedSplitTransition,
@@ -130,44 +132,61 @@ function ColumnScreen(props: {
132 props.navigation.emit({ type: "transitionEnd", target: key, data: { closing: true } })
133 }
134 >
133 - <NavigationContext value={descriptor.navigation}>
134 - <NavigationRouteContext value={descriptor.route}>
135 - <V5StackHeader
136 - options={options}
137 - canGoBack={!props.primary}
138 - column={props.primary ? "primary" : "detail"}
139 - onCompose={
140 - descriptor.route.params &&
141 - "draft" in descriptor.route.params &&
142 - descriptor.route.params.draft
143 - ? undefined
144 - : props.onCompose
145 - }
146 - />
147 - <ColumnContent
148 - primary={props.primary}
149 - insetHorizontally={
150 - (options as AppNativeStackNavigationOptions).nativeContentInsetHorizontally
151 - }
152 - >
153 - <NativePrimaryColumnContext value={primaryColumn}>
154 - {/* The Settings slot swaps pages here; its column keeps its measured insets. */}
155 - <Fragment key={key}>{descriptor.render()}</Fragment>
156 - </NativePrimaryColumnContext>
157 - </ColumnContent>
158 - </NavigationRouteContext>
159 - </NavigationContext>
135 + <PaneContext value={props.primary ? "sidebar" : "content"}>
136 + <NavigationContext value={descriptor.navigation}>
137 + <NavigationRouteContext value={descriptor.route}>
138 + <V5StackHeader
139 + options={options}
140 + canGoBack={!props.primary}
141 + column={props.primary ? "primary" : "detail"}
142 + onCompose={
143 + descriptor.route.params &&
144 + "draft" in descriptor.route.params &&
145 + descriptor.route.params.draft
146 + ? undefined
147 + : props.onCompose
148 + }
149 + />
150 + <ColumnContent
151 + primary={props.primary}
152 + insetHorizontally={
153 + (options as AppNativeStackNavigationOptions).nativeContentInsetHorizontally
154 + }
155 + >
156 + <NativePrimaryColumnContext value={primaryColumn}>
157 + {/* The Settings slot swaps pages here; its column keeps its measured insets. */}
158 + <Fragment key={key}>{descriptor.render()}</Fragment>
159 + </NativePrimaryColumnContext>
160 + </ColumnContent>
161 + </NavigationRouteContext>
162 + </NavigationContext>
163 + </PaneContext>
164 </Split.Screen>
165 );
166 }
167
168 +function EmptyDetailHeader(props: { readonly onCompose: (() => void) | undefined }) {
169 + const sidebarItem = useWorkspaceSidebarHeaderItem();
170 + return (
171 + <V5StackHeader
172 + options={{
173 + headerShown: true,
174 + title: "",
175 + unstable_headerLeftItems: () => (sidebarItem ? [sidebarItem] : []),
176 + }}
177 + canGoBack={false}
178 + column="detail"
179 + onCompose={props.onCompose}
180 + />
181 + );
182 +}
183 +
184 function WorkspaceColumns(
185 props: ViewProps & { readonly primary: Route; readonly detail: Route[] },
186 ) {
187 const {
188 layout,
189 panes,
170 - togglePrimarySidebar,
190 setPrimarySidebarVisible,
191 toggleAuxiliaryPane,
192 startNewTask,
@@ -383,23 +402,9 @@ function WorkspaceColumns(
402 screenKey="workspace-empty"
403 activityMode={layout.usesSplitView && !activeDetailKey ? "attached" : "detached"}
404 >
386 - <V5StackHeader
387 - options={{
388 - headerShown: true,
389 - title: "",
390 - unstable_headerLeftItems: () => [
391 - {
392 - type: "button",
393 - label: "",
394 - icon: { type: "sfSymbol", name: "sidebar.left" },
395 - onPress: togglePrimarySidebar,
396 - },
397 - ],
398 - }}
399 - canGoBack={false}
400 - column="detail"
401 - onCompose={detailCompose}
402 - />
405 + <PaneContext value="content">
406 + <EmptyDetailHeader onCompose={detailCompose} />
407 + </PaneContext>
408 <ColumnContent>
409 <WorkspaceEmptyDetail
410 tab={settingsOpen ? "settings" : selectedTab}
@@ -435,7 +440,7 @@ function WorkspaceColumns(
440 vertical bar wherever they sit, so each pane insets its own content instead. */}
441 <ColumnContent insetHorizontally={false}>
442 <View className="flex-1 bg-screen">
438 - {inspector.render?.()}
443 + <PaneContext value="inspector">{inspector.render?.()}</PaneContext>
444 {inspector.visible ? (
445 <GestureHandlerRootView
446 style={[StyleSheet.absoluteFill, { zIndex: 100 }]}
@@ -569,16 +574,19 @@ function WorkspaceStackView(props: ViewProps & { readonly nativeColumns: boolean
574 navigation: props.descriptors[visibleRoute.key]!.navigation,
575 route: visibleRoute,
576 options: modalEnvelopeOptions(descriptor.options),
577 + // Before iOS 26 the JS columns wrap this whole navigator in the content pane.
578 render: () => (
573 - <V5CardStackView
574 - {...props}
575 - state={{
576 - ...props.state,
577 - routes: group,
578 - index: group.length - 1,
579 - preloadedRoutes: [],
580 - }}
581 - />
579 + <PaneContext value={null}>
580 + <V5CardStackView
581 + {...props}
582 + state={{
583 + ...props.state,
584 + routes: group,
585 + index: group.length - 1,
586 + preloadedRoutes: [],
587 + }}
588 + />
589 + </PaneContext>
590 ),
591 },
592 ];
apps/mobile/src/features/layout/useSidebarToggle.ts new
+20
@@ -0,0 +1,20 @@
1 +import { usePaneRole } from "../../components/ui/Pane";
2 +import { useAdaptiveWorkspaceLayout } from "./adaptive-workspace-context";
3 +
4 +/** The content pane's sidebar button, or null where there's no sidebar beside it to toggle. */
5 +export function useSidebarToggle() {
6 + const role = usePaneRole();
7 + const { layout, panes, sidebarToggleable, togglePrimarySidebar } = useAdaptiveWorkspaceLayout();
8 + if (role !== "content" || !sidebarToggleable) return null;
9 + const maximizes = panes.primarySidebarVisible && !layout.primarySidebarOverlaysContent;
10 + return {
11 + visible: panes.primarySidebarVisible,
12 + accessibilityLabel: panes.primarySidebarVisible
13 + ? maximizes
14 + ? "Maximize content"
15 + : "Hide sidebar"
16 + : "Show sidebar",
17 + icon: maximizes ? "arrow.up.left.and.arrow.down.right" : "sidebar.left",
18 + onPress: togglePrimarySidebar,
19 + } as const;
20 +}
apps/mobile/src/features/layout/useWorkspaceSidebarHeaderItem.ts
+8 -17
@@ -1,28 +1,19 @@
1 import { useNativeWorkspaceColumnsSupported } from "../../native/NativeWorkspaceColumns";
2 -import { useAdaptiveWorkspaceLayout } from "./AdaptiveWorkspaceLayout";
2 import { withNativeGlassHeaderItem } from "./native-glass-header-items";
3 +import { useSidebarToggle } from "./useSidebarToggle";
4
5 +/** `useSidebarToggle` as a native header item. */
6 export function useWorkspaceSidebarHeaderItem() {
7 const usesNativeWorkspaceColumns = useNativeWorkspaceColumnsSupported();
7 - const { layout, panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout();
8 - const label = panes.primarySidebarVisible
9 - ? layout.primarySidebarOverlaysContent
10 - ? "Hide thread sidebar"
11 - : "Maximize content"
12 - : "Show thread sidebar";
8 + const toggle = useSidebarToggle();
9 + if (!toggle) return null;
10 return withNativeGlassHeaderItem({
11 axisBehavior: usesNativeWorkspaceColumns ? "horizontalOnly" : undefined,
15 - accessibilityLabel: label,
16 - icon: {
17 - name:
18 - panes.primarySidebarVisible && !layout.primarySidebarOverlaysContent
19 - ? "arrow.up.left.and.arrow.down.right"
20 - : "sidebar.left",
21 - type: "sfSymbol" as const,
22 - },
12 + accessibilityLabel: toggle.accessibilityLabel,
13 + icon: { name: toggle.icon, type: "sfSymbol" as const },
14 identifier: "thread-left-sidebar",
24 - label,
25 - onPress: togglePrimarySidebar,
15 + label: toggle.accessibilityLabel,
16 + onPress: toggle.onPress,
17 type: "button" as const,
18 });
19 }
apps/mobile/src/features/layout/workspace-sidebar-toolbar.tsx deleted
-18
@@ -1,18 +0,0 @@
1 -import { Platform } from "react-native";
2 -
3 -import { AndroidHeaderIconButton } from "../../components/ui/AndroidScreenHeader";
4 -
5 -import { useAdaptiveWorkspaceLayout } from "./adaptive-workspace-context";
6 -
7 -export function AndroidWorkspaceSidebarButton() {
8 - const { layout, panes, togglePrimarySidebar } = useAdaptiveWorkspaceLayout();
9 - if (Platform.OS !== "android" || !layout.usesSplitView) return null;
10 -
11 - return (
12 - <AndroidHeaderIconButton
13 - accessibilityLabel={panes.primarySidebarVisible ? "Maximize content" : "Show sidebar"}
14 - icon={panes.primarySidebarVisible ? "arrow.up.left.and.arrow.down.right" : "sidebar.left"}
15 - onPress={togglePrimarySidebar}
16 - />
17 - );
18 -}
apps/mobile/src/features/pull-requests/PullRequestDiscussionScreen.tsx
-1
@@ -142,7 +142,6 @@ function Discussion({ params }: { params: PullRequestParams & { readonly discuss
142 {Platform.OS === "android" ? (
143 <AppBar
144 embedded
145 - sidebar={false}
145 title="Discussion"
146 subtitle={`#${params.number}`}
147 onBack={() => navigation.goBack()}
apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx
+3 -7
@@ -68,7 +68,6 @@ import { AppText as Text } from "../../components/ui/AppText";
68 import { AppBar } from "../../components/ui/AppBar";
69 import { useAndroidControlSizing } from "../../components/ui/useAndroidControlSizing";
70 import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
71 -import { AndroidWorkspaceSidebarButton } from "../layout/workspace-sidebar-toolbar";
71 import { useWorkspaceSidebarHeaderItem } from "../layout/useWorkspaceSidebarHeaderItem";
72 import { useAndroidWorkspaceBack } from "../workspace/useAndroidWorkspaceNavigation";
73 import { EmptyState } from "../../components/ui/EmptyState";
@@ -481,18 +480,16 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
480 unstable_headerSubtitle: connected
481 ? params.repository
482 : `${params.repository} · Offline`,
484 - unstable_headerLeftItems: layout.usesSplitView ? () => [sidebarHeaderItem] : undefined,
483 + unstable_headerLeftItems: sidebarHeaderItem ? () => [sidebarHeaderItem] : undefined,
484 }}
486 - optionsVersion={[layout.usesSplitView, sidebarHeaderItem]}
485 + optionsVersion={[sidebarHeaderItem]}
486 />
487 {Platform.OS === "android" ? (
488 <AppBar
489 embedded
491 - sidebar={false}
490 title={`#${params.number}${connected ? "" : " · Offline"}`}
491 subtitle={params.repository}
492 onBack={layout.usesSplitView ? undefined : returnToList}
495 - leading={layout.usesSplitView ? <AndroidWorkspaceSidebarButton /> : undefined}
493 actions={[
494 ...(permissions.verdicts.length
495 ? [
@@ -959,7 +956,7 @@ export function PullRequestFileRouteScreen(props: PullRequestFileRouteProps) {
956 <View className="flex-1 bg-screen">
957 <NativeStackScreenOptions options={{ title, headerTitle: title }} />
958 {Platform.OS === "android" ? (
962 - <AppBar embedded sidebar={false} title={title} onBack={() => navigation.goBack()} />
959 + <AppBar embedded title={title} onBack={() => navigation.goBack()} />
960 ) : null}
961 <View className="flex-1 items-center justify-center">
962 <AppActivityIndicator accessibilityLabel="Loading changes" />
@@ -1158,7 +1155,6 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
1155 {Platform.OS === "android" ? (
1156 <AppBar
1157 embedded
1161 - sidebar={false}
1158 title={title}
1159 onBack={() => navigation.goBack()}
1160 trailing={
apps/mobile/src/features/pull-requests/PullRequestSearchSheet.tsx
+1 -7
@@ -37,13 +37,7 @@ export function PullRequestSearchSheet(props: {
37 if (Platform.OS === "android") {
38 return (
39 <View className="flex-1 bg-sheet" collapsable={false}>
40 - <AppBar
41 - embedded
42 - sidebar={false}
43 - title={props.title}
44 - hideBottomBorder
45 - onBack={() => navigation.goBack()}
46 - />
40 + <AppBar embedded title={props.title} hideBottomBorder onBack={() => navigation.goBack()} />
41 <View className="bg-header px-4 pb-3 pt-1">
42 <SearchField
43 inputRef={searchRef}
apps/mobile/src/features/pull-requests/PullRequestToolbar.android.tsx
-1
@@ -61,7 +61,6 @@ export function PullRequestToolbar(props: {
61 onOpenEnvironments={() => openSettings(navigation, "SettingsEnvironments")}
62 />
63 }
64 - sidebar={false}
64 search={{
65 value: tab.query,
66 onChangeText: (query) => dispatch({ type: "query", tab: "pullRequests", query }),
apps/mobile/src/features/pull-requests/guide/PullRequestGuideScreen.tsx
-1
@@ -141,7 +141,6 @@ export function PullRequestGuideStopScreen({ route }: StaticScreenProps<GuideSto
141 {Platform.OS === "android" ? (
142 <AppBar
143 embedded
144 - sidebar={false}
144 title={`Stop ${route.params.position + 1}`}
145 onBack={() => navigation.goBack()}
146 trailing={
apps/mobile/src/features/review/ReviewSheet.tsx
-1
@@ -395,7 +395,6 @@ function ReviewFileNavigator({
395 {Platform.OS === "android" ? (
396 <AppBar
397 embedded
398 - sidebar={false}
398 title="Changed files"
399 subtitle={`${files.length} ${files.length === 1 ? "file" : "files"}`}
400 hideBottomBorder
apps/mobile/src/features/settings/SettingsKeyboardRouteScreen.tsx
+1 -1
@@ -48,7 +48,7 @@ export function SettingsKeyboardRouteScreen() {
48 {Platform.OS === "android" ? (
49 <>
50 <NativeStackScreenOptions options={{ headerShown: false }} />
51 - <AppBar embedded sidebar={false} title="Keyboard" onBack={() => navigation.goBack()} />
51 + <AppBar embedded title="Keyboard" onBack={() => navigation.goBack()} />
52 </>
53 ) : null}
54 <ScrollView
apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx
+21 -20
@@ -57,7 +57,6 @@ import { webhookAddress } from "@t3tools/client-runtime/webhook-address";
57 import { tryCopyTextWithHaptic } from "../../lib/copyTextWithHaptic";
58 import { usePreparedConnection } from "../../state/session";
59 import { buildModelOptions } from "../../lib/modelOptions";
60 -import { NativeStackScreenOptions } from "../../native/StackHeader";
60 import { useProjects, useEnvironmentServerConfig } from "../../state/entities";
61 import { useEnvironmentQuery } from "../../state/query";
62 import { serverEnvironment } from "../../state/server";
@@ -565,25 +564,27 @@ function SettingsScheduledTaskEditorScreen({ title }: { readonly title: string }
564 ]);
565 });
566 return (
568 - <SettingsScreen title={title}>
569 - {Platform.OS === "ios" ? (
570 - <NativeStackScreenOptions
571 - options={{
572 - headerBackVisible: false,
573 - gestureEnabled: !preventRemove,
574 - // Native Back pops before removal guards; a bar action lets the guard run first.
575 - unstable_headerLeftItems: () => [
576 - withNativeGlassHeaderItem({
577 - type: "button",
578 - label: "",
579 - accessibilityLabel: "Back",
580 - icon: { type: "sfSymbol", name: "chevron.backward" },
581 - onPress: () => navigation.goBack(),
582 - }),
583 - ],
584 - }}
585 - />
586 - ) : null}
567 + <SettingsScreen
568 + title={title}
569 + // Native Back pops before removal guards; a bar action lets the guard run first.
570 + options={
571 + Platform.OS === "ios"
572 + ? {
573 + headerBackVisible: false,
574 + gestureEnabled: !preventRemove,
575 + unstable_headerLeftItems: () => [
576 + withNativeGlassHeaderItem({
577 + type: "button",
578 + label: "",
579 + accessibilityLabel: "Back",
580 + icon: { type: "sfSymbol", name: "chevron.backward" },
581 + onPress: () => navigation.goBack(),
582 + }),
583 + ],
584 + }
585 + : undefined
586 + }
587 + >
588 <ScrollView
589 keyboardShouldPersistTaps="handled"
590 keyboardDismissMode="on-drag"
apps/mobile/src/features/settings/SettingsWorkspaceLayout.android.tsx
+6 -3
@@ -3,6 +3,7 @@ import { Activity, useState, type ReactNode } from "react";
3 import { View } from "react-native";
4
5 import { AppText } from "../../components/ui/AppText";
6 +import { PaneContext } from "../../components/ui/Pane";
7 import { useAdaptiveWorkspaceLayout } from "../layout/adaptive-workspace-context";
8 import { useAndroidWorkspaceRoot } from "../workspace/AndroidWorkspaceTabsProvider";
9 import { SettingsListScreen } from "./SettingsRouteScreen";
@@ -24,9 +25,11 @@ export function SettingsWorkspaceLayout(props: { readonly children: ReactNode })
25 {visited ? (
26 <Activity mode={split ? "visible" : "hidden"}>
27 <View style={{ width: layout.listPaneWidth ?? 0, marginRight: layout.listPaneGap ?? 0 }}>
27 - <NavigationRouteContext value={route}>
28 - <SettingsListScreen sidebar selected={root?.settingsPage ?? null} />
29 - </NavigationRouteContext>
28 + <PaneContext value="sidebar">
29 + <NavigationRouteContext value={route}>
30 + <SettingsListScreen sidebar selected={root?.settingsPage ?? null} />
31 + </NavigationRouteContext>
32 + </PaneContext>
33 </View>
34 </Activity>
35 ) : null}
apps/mobile/src/features/settings/components/SettingsScreen.tsx
+2 -2
@@ -18,7 +18,7 @@ import {
18 export { SettingsScreenContent };
19
20 export function SettingsScreen(
21 - props: Pick<AppBarProps, "title" | "actions" | "trailing" | "search" | "menus"> & {
21 + props: Pick<AppBarProps, "title" | "actions" | "trailing" | "search" | "menus" | "options"> & {
22 readonly children: ReactNode;
23 readonly formSheet?: boolean;
24 readonly workspaceRoot?: boolean;
@@ -51,9 +51,9 @@ export function SettingsScreen(
51 // iOS screens put their filter menus in native header items themselves.
52 menus={Platform.OS === "android" ? props.menus : undefined}
53 sheet={Platform.OS === "android" && props.formSheet}
54 - sidebar={false}
54 onBack={workspaceRoot ? undefined : () => navigation.goBack()}
55 hideBottomBorder={!props.formSheet || Platform.OS === "android"}
56 + options={props.options}
57 />
58 <ScreenScrollViewBottomInset value={deviceType === "pad" || compactTabs ? 80 : 0}>
59 <ScreenScrollViewSurface value={surfaceClassName}>
apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx
+2 -14
@@ -195,13 +195,7 @@ export function NewTaskEnvironmentPickerRouteScreen() {
195 }}
196 />
197 {Platform.OS === "android" ? (
198 - <AppBar
199 - embedded
200 - sidebar={false}
201 - title="Environment"
202 - hideBottomBorder
203 - onBack={() => navigation.goBack()}
204 - />
198 + <AppBar embedded title="Environment" hideBottomBorder onBack={() => navigation.goBack()} />
199 ) : null}
200 <ScreenContent>
201 <ScrollView
@@ -487,13 +481,7 @@ export function BranchPickerScreen(props: {
481 return (
482 <View className="flex-1 bg-sheet" collapsable={false}>
483 <NativeStackScreenOptions options={{ headerShown: false }} />
490 - <AppBar
491 - embedded
492 - sidebar={false}
493 - title={props.title}
494 - hideBottomBorder
495 - onBack={() => navigation.goBack()}
496 - />
484 + <AppBar embedded title={props.title} hideBottomBorder onBack={() => navigation.goBack()} />
485 <View className="bg-header px-4 pb-3 pt-1">
486 <SearchField
487 inputRef={searchRef}
apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
-1
@@ -855,7 +855,6 @@ export function NewTaskDraftScreen(props: {
855 header={
856 <AppBar
857 title="New thread"
858 - sidebar={false}
858 onBack={goBack}
859 options={{
860 ...threadHeaderAppearance(NATIVE_LIQUID_GLASS_SUPPORTED),
apps/mobile/src/features/threads/NewTaskRouteScreen.tsx
-1
@@ -127,7 +127,6 @@ function NewTaskHeader(props: {
127 <AppBar
128 title={props.title}
129 subtitle={props.subtitle ?? undefined}
130 - sidebar={false}
130 options={{ headerBackVisible: true }}
131 hideBottomBorder
132 onBack={goBack}
apps/mobile/src/features/threads/ThreadAgentsSheet.tsx
+1 -1
@@ -166,7 +166,7 @@ export function ThreadAgentsSheet({ route }: StaticScreenProps<AgentsTarget>) {
166 return (
167 <View collapsable={false} className="flex-1 bg-sheet">
168 <NativeStackScreenOptions options={{ sheetCornerRadius: 28 }} />
169 - <AppBar sheet sidebar={false} title="Agents" onBack={() => navigation.goBack()} />
169 + <AppBar sheet title="Agents" onBack={() => navigation.goBack()} />
170 <ScreenContent insetHorizontal={layout.usesSplitView}>{content}</ScreenContent>
171 </View>
172 );
apps/mobile/src/features/threads/ThreadBackgroundWorkSheet.tsx
+1 -1
@@ -97,7 +97,7 @@ export function ThreadBackgroundWorkSheet({ route }: StaticScreenProps<Backgroun
97 return (
98 <View collapsable={false} className="flex-1 bg-sheet">
99 <NativeStackScreenOptions options={{ sheetCornerRadius: 28 }} />
100 - <AppBar sheet sidebar={false} title="Background work" onBack={() => navigation.goBack()} />
100 + <AppBar sheet title="Background work" onBack={() => navigation.goBack()} />
101 <ScreenContent insetHorizontal={layout.usesSplitView}>{content}</ScreenContent>
102 </View>
103 );
apps/mobile/src/features/threads/ThreadHeader.tsx
-1
@@ -81,7 +81,6 @@ export function ThreadHeader(
81 <AppBar
82 title={props.title}
83 subtitle={props.subtitle}
84 - sidebar={native.sidebar}
84 options={native.options}
85 optionsVersion={native.optionsVersion}
86 trailing={
apps/mobile/src/features/threads/ThreadPullRequestsSheet.tsx
-1
@@ -113,7 +113,6 @@ export function ThreadPullRequestsSheet(
113 <NativeStackScreenOptions options={{ sheetCornerRadius: 28 }} />
114 <AppBar
115 sheet
116 - sidebar={false}
116 title={title}
117 hideBottomBorder
118 onBack={() => navigation.goBack()}
apps/mobile/src/features/threads/ThreadQueueControl.tsx
+1 -1
@@ -395,7 +395,7 @@ export function ThreadQueueSheet({ route }: StaticScreenProps<QueueTarget>) {
395 <GestureHandlerRootView style={{ flex: 1 }}>
396 <View collapsable={false} className="flex-1 bg-sheet">
397 <NativeStackScreenOptions options={{ sheetCornerRadius: 28 }} />
398 - <AppBar sheet sidebar={false} title="Queued" onBack={() => navigation.goBack()} />
398 + <AppBar sheet title="Queued" onBack={() => navigation.goBack()} />
399 <ScreenContent insetHorizontal={layout.usesSplitView}>{content}</ScreenContent>
400 </View>
401 </GestureHandlerRootView>
apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
-1
@@ -1435,7 +1435,6 @@ function ThreadSettingsChoiceScreen() {
1435 {Platform.OS === "android" ? (
1436 <AppBar
1437 embedded
1438 - sidebar={false}
1438 title={route.params.title}
1439 onBack={() => navigation.goBack()}
1440 hideBottomBorder
apps/mobile/src/features/threads/git/GitBranchesSheet.tsx
-1
@@ -80,7 +80,6 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
80 {Platform.OS === "android" ? (
81 <AppBar
82 sheet
83 - sidebar={false}
83 title="Branches & worktrees"
84 onBack={() => navigation.goBack()}
85 hideBottomBorder
apps/mobile/src/features/threads/git/GitConfirmSheet.tsx
+1 -7
@@ -130,13 +130,7 @@ export function GitConfirmSheet(props: GitConfirmSheetProps) {
130 />
131 ) : null}
132 {Platform.OS === "android" ? (
133 - <AppBar
134 - sheet
135 - sidebar={false}
136 - title="Confirm action"
137 - onBack={() => navigation.goBack()}
138 - hideBottomBorder
139 - />
133 + <AppBar sheet title="Confirm action" onBack={() => navigation.goBack()} hideBottomBorder />
134 ) : (
135 <View className="min-h-4 pt-2" />
136 )}
apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
-1
@@ -467,7 +467,6 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
467 ) : (
468 <AppBar
469 sheet
470 - sidebar={false}
470 title={currentBranchLabel}
471 hideBottomBorder={Platform.OS === "android"}
472 subtitle={currentStatusSummary}
apps/mobile/src/features/threads/useThreadHeaderOptions.android.ts
-1
@@ -8,7 +8,6 @@ export function useThreadHeaderOptions(
8 options: { contentStyle: { backgroundColor: props.headerColor } },
9 // Android renders header actions as children, not native item factories.
10 optionsVersion: [],
11 - sidebar: true,
11 fallback: null,
12 };
13 }
apps/mobile/src/features/threads/useThreadHeaderOptions.tsx
+1 -2
@@ -52,7 +52,7 @@ export function useThreadHeaderOptions(props: {
52 }),
53 ]
54 : []),
55 - sidebarHeaderItem,
55 + ...(sidebarHeaderItem ? [sidebarHeaderItem] : []),
56 ...(!usesDuoHeader && !props.draft
57 ? [
58 withNativeGlassHeaderItem({
@@ -109,7 +109,6 @@ export function useThreadHeaderOptions(props: {
109 gitStatus?.refName,
110 gitStatus?.pr?.url,
111 ],
112 - sidebar: false,
112 fallback:
113 !layout.usesSplitView && !props.usesNativeHeaderGlass ? (
114 <ThreadGitControls {...props.gitControls} showActionControls />
apps/mobile/src/features/threads/worktree-setup-sheet.android.tsx
-1
@@ -26,7 +26,6 @@ export function WorktreeSetupSheet({ children, height, onClose }: WorktreeSetupS
26 >
27 <AppBar
28 sheet
29 - sidebar={false}
29 title="Worktree setup"
30 actions={[
31 { accessibilityLabel: "Close setup details", icon: "xmark", onPress: onClose },
apps/mobile/src/features/workspace/WorkspaceRootScreen.android.tsx
+1 -1
@@ -78,7 +78,7 @@ export function WorkspaceRootScreen() {
78 ) : layout.usesSplitView ? (
79 <>
80 <NativeStackScreenOptions options={{ headerShown: false }} />
81 - <AppBar embedded sidebar={false} title="Pull requests" />
81 + <AppBar embedded title="Pull requests" />
82 <View className="flex-1 items-center justify-center px-10">
83 <EmptyState
84 title="Select a pull request"
apps/mobile/src/features/workspace/WorkspaceRootScreen.tsx
-1
@@ -166,7 +166,6 @@ function WorkspaceRootContent() {
166 ) : (
167 <AppBar
168 embedded
169 - sidebar={false}
169 title="T3 Code"
170 titleContent={renderHeaderTitle()}
171 actions={[