@devries-cameron20 / t3code Mirror · read-only / commits / 1cefbc4051
Fork 0

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

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 07:15 UTC

fix(mobile): Duo rail tools no longer slide under the workspace tabs (#38772)

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

Julius Marminge committed Nov 18, 2026 at 14:46 UTC 1cefbc4051ba687035b4cca3fa4a59309a8918a9
3 files changed +312 -199
apps/mobile/src/components/ui/AppBar.tsx
+38 -4
@@ -20,7 +20,7 @@ import {
20 NATIVE_MAIL_SEARCH_TOOLBAR_SUPPORTED,
21 } from "../../features/layout/native-mail-search-toolbar";
22 import { useAppearancePreferences } from "../../features/settings/appearance/AppearancePreferencesProvider";
23 -import type { AppBarMenuItem, AppBarProps } from "./AppBar.types";
23 +import type { AppBarMenu, AppBarMenuItem, AppBarProps } from "./AppBar.types";
24 import type { AppSymbolName } from "./AppSymbol";
25 import { useNativeMailSearchToolbar } from "../../native/use-native-mail-search-toolbar";
26 import { useControlTheme } from "./useControlTheme";
@@ -111,7 +111,41 @@ export function AppBar(props: AppBarProps) {
111 search !== undefined &&
112 (search.compactToolbar ?? !layout.usesSplitView) &&
113 usesNativeMailSearchToolbar;
114 - const visibleMenus = compactSearch ? (menus?.slice(1) ?? []) : (menus ?? []);
114 + const trailingMenus = compactSearch ? (menus?.slice(1) ?? []) : (menus ?? []);
115 + // The Duo's vertical bar never overflows: items that don't fit slide under the workspace tabs,
116 + // and a Live Activity pushes them down further. More than one tool shares one menu there.
117 + const groupTrailing =
118 + usesNativeWorkspaceColumns &&
119 + isDuoDevice(deviceType) &&
120 + props.onClose === undefined &&
121 + (props.actions?.length ?? 0) + trailingMenus.length > 1;
122 + const actions = groupTrailing ? [] : (props.actions ?? []);
123 + const visibleMenus: ReadonlyArray<AppBarMenu> = groupTrailing
124 + ? [
125 + {
126 + title: gt("More actions"),
127 + icon: "ellipsis",
128 + items: [
129 + ...(props.actions ?? []).map((action) => ({
130 + id: action.accessibilityLabel,
131 + title: action.accessibilityLabel,
132 + icon: iosIcon(action.icon),
133 + subtitle: action.subtitle,
134 + disabled: action.disabled || action.loading,
135 + selected: action.selected,
136 + destructive: action.destructive,
137 + onPress: action.onPress,
138 + })),
139 + ...trailingMenus.map((menu) => ({
140 + id: menu.title,
141 + title: menu.title,
142 + icon: iosIcon(menu.icon),
143 + items: menu.items,
144 + })),
145 + ],
146 + },
147 + ]
148 + : trailingMenus;
149 // Where the mail toolbar isn't used, the Duo keeps search at the bottom of the pane like its
150 // workspace lists; elsewhere inline search is a button in the bar.
151 const duoBottomSearch =
@@ -221,13 +255,13 @@ export function AppBar(props: AppBarProps) {
255 ) : null}
256 </Toolbar>
257 ) : null}
224 - {props.actions?.length ||
258 + {actions.length ||
259 visibleMenus.length ||
260 props.trailing ||
261 props.confirm ||
262 closeInspector ? (
263 <Toolbar placement="right">
230 - {props.actions?.map(({ loading, ...action }) =>
264 + {actions.map(({ loading, ...action }) =>
265 loading ? (
266 <Toolbar.Custom key={action.accessibilityLabel}>
267 <View
apps/mobile/src/features/pull-requests/PullRequestControls.tsx
+80 -5
@@ -15,6 +15,8 @@ import { Button } from "../../components/ui/Button";
15 import { IconButton } from "../../components/ui/IconButton";
16 import { Toolbar } from "../../components/ui/Toolbar";
17 import { Menu } from "../../components/ui/Menu";
18 +import type { AppBarMenu, AppBarMenuItem } from "../../components/ui/AppBar.types";
19 +import { createNativeHeaderMenu } from "../../components/ui/nativeHeaderMenu.ios";
20
21 import { useNativeLayoutMetrics } from "../../native/native-layout-metrics";
22 import { type PullRequestParams } from "./usePullRequestDiff";
@@ -107,10 +109,18 @@ export function PullRequestCardRow(props: {
109 );
110 }
111
112 +/** The Duo's vertical bar, where this toolbar and the screen's bar share one column of buttons. */
113 +export function usePullRequestVerticalControls() {
114 + const nativeMetrics = useNativeLayoutMetrics();
115 + return nativeMetrics !== null && nativeMetrics.verticalBarEdge !== "none";
116 +}
117 +
118 export function PullRequestActionToolbar(props: {
119 readonly pr: PullRequestDetail | null;
120 readonly params: PullRequestParams;
121 readonly filePath?: string;
122 + /** The screen's actions menu; the vertical bar shows it here with the toolbar's tools. */
123 + readonly menu: AppBarMenu;
124 readonly onOpenFiles?: () => void;
125 readonly onHeightChange?: (height: number) => void;
126 }) {
@@ -119,8 +129,7 @@ export function PullRequestActionToolbar(props: {
129 const { draft } = usePullRequestReviewDraft(props.params);
130 const { themeVariables: colors } = useAppearancePreferences();
131 const insets = useSafeAreaInsets();
122 - const nativeMetrics = useNativeLayoutMetrics();
123 - const verticalControls = nativeMetrics !== null && nativeMetrics.verticalBarEdge !== "none";
132 + const verticalControls = usePullRequestVerticalControls();
133 const permissions = usePullRequestPermissions(props.params, props.pr);
134 const agent = usePullRequestAgentActions(props.params, props.pr, props.filePath);
135 const canReview = permissions.verdicts.length > 0;
@@ -148,7 +157,10 @@ export function PullRequestActionToolbar(props: {
157 const threadMenuItems = agent.threadActions("ask");
158 const openFiles =
159 props.onOpenFiles ?? (() => navigation.navigate("PullRequestFiles", props.params));
151 - if (!props.pr) return null;
160 + if (!props.pr)
161 + return verticalControls ? (
162 + <Toolbar placement="bottom">{createNativeHeaderMenu(props.menu)}</Toolbar>
163 + ) : null;
164 const primaryDisabled = pendingReview ? false : agent.disabled;
165 const showPrimary = pendingReview || canOpenThread;
166 if (Platform.OS === "android") {
@@ -285,12 +297,52 @@ export function PullRequestActionToolbar(props: {
297 separateBackground
298 />
299 );
300 + // The vertical bar never overflows into a menu, and with a Live Activity it fits about three
301 + // buttons above the workspace tabs: back, the primary action and one menu.
302 if (verticalControls)
303 return (
304 <Toolbar placement="bottom">
291 - {filesControl}
292 - {agentControl}
305 {primaryControl}
306 + {createNativeHeaderMenu({
307 + ...props.menu,
308 + items: [
309 + {
310 + id: "changed-files",
311 + title: gt("Changed files"),
312 + icon: "doc.text.magnifyingglass",
313 + onPress: openFiles,
314 + },
315 + ...(showAgentControls
316 + ? [
317 + {
318 + id: "ai-helpers",
319 + title: gt("AI helpers"),
320 + icon: "ellipsis.bubble",
321 + items: agentActions.map((action): AppBarMenuItem =>
322 + chooseThread && !action.disabled
323 + ? {
324 + id: action.task,
325 + title: action.title,
326 + icon: action.icon,
327 + items: appBarThreadMenuItems(
328 + agent.threadActions(action.task),
329 + agent.select,
330 + ),
331 + }
332 + : {
333 + id: action.task,
334 + title: action.title,
335 + icon: action.icon,
336 + disabled: action.disabled || agent.disabled,
337 + onPress: () => agent.start(action.task),
338 + },
339 + ),
340 + },
341 + ]
342 + : []),
343 + ...props.menu.items,
344 + ],
345 + })}
346 </Toolbar>
347 );
348 return (
@@ -304,6 +356,29 @@ export function PullRequestActionToolbar(props: {
356 );
357 }
358
359 +function appBarThreadMenuItems(
360 + items: MenuAction[],
361 + select: (id: string) => void,
362 +): ReadonlyArray<AppBarMenuItem> {
363 + return items.map((item) =>
364 + item.subactions
365 + ? {
366 + id: item.id ?? item.title,
367 + title: item.title,
368 + icon: item.image,
369 + items: appBarThreadMenuItems(item.subactions, select),
370 + }
371 + : {
372 + id: item.id ?? item.title,
373 + title: item.title,
374 + icon: item.image,
375 + subtitle: item.subtitle,
376 + disabled: item.attributes?.disabled,
377 + onPress: () => item.id && select(item.id),
378 + },
379 + );
380 +}
381 +
382 function renderThreadMenuItems(items: MenuAction[], select: (id: string) => void): ReactNode {
383 return items.map((item) =>
384 item.subactions ? (
apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx
+194 -190
@@ -71,7 +71,7 @@ import { NativeScrollView } from "../../native/NativeScrollViewMarker";
71 import { useSafeAreaInsets } from "react-native-safe-area-context";
72
73 import { AppText as Text } from "../../components/ui/AppText";
74 -import { AppBar } from "../../components/ui/AppBar";
74 +import { AppBar, type AppBarMenu } from "../../components/ui/AppBar";
75 import { useContentTopInset } from "../../components/ui/useBarInset";
76 import { useAndroidControlSizing } from "../../components/ui/useAndroidControlSizing";
77 import { useAdaptiveWorkspaceLayout } from "../layout/AdaptiveWorkspaceLayout";
@@ -102,7 +102,11 @@ import { useAppearancePreferences } from "../settings/appearance/AppearancePrefe
102 import { useAppearanceCodeSurface } from "../settings/appearance/useAppearanceCodeSurface";
103 import { useNativeReviewDiffBridge } from "../review/useNativeReviewDiffBridge";
104 import { pullRequestTimelineRows } from "./PullRequestTimeline";
105 -import { PullRequestActionToolbar, PullRequestCardGroup } from "./PullRequestControls";
105 +import {
106 + PullRequestActionToolbar,
107 + PullRequestCardGroup,
108 + usePullRequestVerticalControls,
109 +} from "./PullRequestControls";
110 import {
111 pullRequestTarget as requestTarget,
112 usePullRequestDiff,
@@ -589,6 +593,119 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
593 if (filesY.current > 0) requestAnimationFrame(jumpToFiles);
594 }
595 };
596 + const verticalControls = usePullRequestVerticalControls();
597 + const pullRequestMenu: AppBarMenu = {
598 + title: gt(
599 + "{term, select, mr {Merge request} cr {Change request} other {Pull request}} actions",
600 + { term: changeRequestTermKind(terminology) },
601 + ),
602 + icon: "ellipsis",
603 + items: [
604 + ...(permissions.verdicts.length
605 + ? [
606 + {
607 + id: "submit-review",
608 + title: gt("Submit review"),
609 + icon: "text.bubble",
610 + onPress: () =>
611 + navigation.navigate("PullRequestReview", { ...params, mode: "review" }),
612 + },
613 + ]
614 + : []),
615 + ...(permissions.canComment
616 + ? [
617 + {
618 + id: "add-comment",
619 + title: gt("Add comment"),
620 + icon: "plus.bubble",
621 + onPress: () =>
622 + navigation.navigate("PullRequestReview", { ...params, mode: "comment" }),
623 + },
624 + ]
625 + : []),
626 + ...(permissions.canEditChangeRequest
627 + ? [
628 + {
629 + id: "edit-title",
630 + title: gt("Edit title"),
631 + icon: "pencil",
632 + onPress: () => navigation.navigate("PullRequestEdit", { ...params, field: "title" }),
633 + },
634 + {
635 + id: "edit-description",
636 + title: gt("Edit description"),
637 + icon: "doc.text",
638 + disabled: description.pending,
639 + subtitle: description.pending ? gt("Saving…") : undefined,
640 + onPress: () => navigation.navigate("PullRequestEdit", { ...params, field: "body" }),
641 + },
642 + ]
643 + : []),
644 + ...(maintainerEdits.visible
645 + ? [
646 + {
647 + id: "maintainer-edits",
648 + title: gt("Allow edits from maintainers"),
649 + icon: "pencil",
650 + selected: maintainerEdits.value,
651 + disabled: maintainerEdits.saving,
652 + subtitle: maintainerEdits.subtitle,
653 + onPress: maintainerEdits.toggle,
654 + },
655 + ]
656 + : []),
657 + ...(identity
658 + ? [
659 + {
660 + id: "open-on-provider",
661 + title: openOnProviderLabel(identity.provider, messages),
662 + icon: "arrow.up.right",
663 + onPress: () => void Linking.openURL(identity.url),
664 + },
665 + {
666 + id: "copy-link",
667 + title: gt("Copy link"),
668 + icon: "link",
669 + onPress: () => copyPullRequestLink(identity),
670 + },
671 + {
672 + id: "share",
673 + title: gt("Share…"),
674 + icon: "square.and.arrow.up",
675 + onPress: () => sharePullRequestLink(identity),
676 + },
677 + ]
678 + : []),
679 + ...(stateAction
680 + ? [
681 + {
682 + id: "state",
683 + title: pullRequestActionLabel(stateAction, terminology, messages),
684 + icon: PR_ACTION_ICONS[stateAction],
685 + destructive: stateAction === "close",
686 + onPress: runStateAction,
687 + },
688 + ]
689 + : []),
690 + ...(showsDeleteBranch
691 + ? [
692 + {
693 + id: "delete-branch",
694 + title: pullRequestActionLabel("delete-branch", terminology, messages),
695 + icon: PR_ACTION_ICONS["delete-branch"],
696 + destructive: true,
697 + disabled: !action.available("delete-branch"),
698 + subtitle: action.busy
699 + ? gt("Deleting…")
700 + : connected
701 + ? pr.headBranch
702 + : gt("Reconnect to delete this branch."),
703 + onPress: confirmDeleteBranch,
704 + },
705 + ]
706 + : []),
707 + ],
708 + };
709 return (
710 <PullRequestMarkdownRepository params={params} changeRequest={pr}>
711 <View className="flex-1 android:bg-header ios:bg-screen">
@@ -600,122 +717,7 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
717 : gt("{repository} · Offline", { repository: params.repository })
718 }
719 onBack={layout.usesSplitView ? undefined : returnToList}
603 - menus={[
604 - {
605 - title: gt(
606 - "{term, select, mr {Merge request} cr {Change request} other {Pull request}} actions",
607 - { term: changeRequestTermKind(terminology) },
608 - ),
609 - icon: "ellipsis",
610 - items: [
611 - ...(permissions.verdicts.length
612 - ? [
613 - {
614 - id: "submit-review",
615 - title: gt("Submit review"),
616 - icon: "text.bubble",
617 - onPress: () =>
618 - navigation.navigate("PullRequestReview", { ...params, mode: "review" }),
619 - },
620 - ]
621 - : []),
622 - ...(permissions.canComment
623 - ? [
624 - {
625 - id: "add-comment",
626 - title: gt("Add comment"),
627 - icon: "plus.bubble",
628 - onPress: () =>
629 - navigation.navigate("PullRequestReview", { ...params, mode: "comment" }),
630 - },
631 - ]
632 - : []),
633 - ...(permissions.canEditChangeRequest
634 - ? [
635 - {
636 - id: "edit-title",
637 - title: gt("Edit title"),
638 - icon: "pencil",
639 - onPress: () =>
640 - navigation.navigate("PullRequestEdit", { ...params, field: "title" }),
641 - },
642 - {
643 - id: "edit-description",
644 - title: gt("Edit description"),
645 - icon: "doc.text",
646 - disabled: description.pending,
647 - subtitle: description.pending ? gt("Saving…") : undefined,
648 - onPress: () =>
649 - navigation.navigate("PullRequestEdit", { ...params, field: "body" }),
650 - },
651 - ]
652 - : []),
653 - ...(maintainerEdits.visible
654 - ? [
655 - {
656 - id: "maintainer-edits",
657 - title: gt("Allow edits from maintainers"),
658 - icon: "pencil",
659 - selected: maintainerEdits.value,
660 - disabled: maintainerEdits.saving,
661 - subtitle: maintainerEdits.subtitle,
662 - onPress: maintainerEdits.toggle,
663 - },
664 - ]
665 - : []),
666 - ...(identity
667 - ? [
668 - {
669 - id: "open-on-provider",
670 - title: openOnProviderLabel(identity.provider, messages),
671 - icon: "arrow.up.right",
672 - onPress: () => void Linking.openURL(identity.url),
673 - },
674 - {
675 - id: "copy-link",
676 - title: gt("Copy link"),
677 - icon: "link",
678 - onPress: () => copyPullRequestLink(identity),
679 - },
680 - {
681 - id: "share",
682 - title: gt("Share…"),
683 - icon: "square.and.arrow.up",
684 - onPress: () => sharePullRequestLink(identity),
685 - },
686 - ]
687 - : []),
688 - ...(stateAction
689 - ? [
690 - {
691 - id: "state",
692 - title: pullRequestActionLabel(stateAction, terminology, messages),
693 - icon: PR_ACTION_ICONS[stateAction],
694 - destructive: stateAction === "close",
695 - onPress: runStateAction,
696 - },
697 - ]
698 - : []),
699 - ...(showsDeleteBranch
700 - ? [
701 - {
702 - id: "delete-branch",
703 - title: pullRequestActionLabel("delete-branch", terminology, messages),
704 - icon: PR_ACTION_ICONS["delete-branch"],
705 - destructive: true,
706 - disabled: !action.available("delete-branch"),
707 - subtitle: action.busy
708 - ? gt("Deleting…")
709 - : connected
710 - ? pr.headBranch
711 - : gt("Reconnect to delete this branch."),
712 - onPress: confirmDeleteBranch,
713 - },
714 - ]
715 - : []),
716 - ],
717 - },
718 - ]}
720 + menus={verticalControls ? undefined : [pullRequestMenu]}
721 />
722 <ScreenContent onLayout={(event) => setViewportHeight(event.nativeEvent.layout.height)}>
723 {(["overview", "guide", "activity"] as const)
@@ -961,6 +963,7 @@ export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestP
963 <PullRequestActionToolbar
964 pr={pr}
965 params={params}
966 + menu={pullRequestMenu}
967 onOpenFiles={openFiles}
968 onHeightChange={setToolbarHeight}
969 />
@@ -1235,6 +1238,77 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
1238 const title = commit ? gt("Commit changes") : gt("Changes");
1239 const seekingFile = !targetFile && result.nextCursor !== null;
1240 const loadingDiff = (result.isPending && !data.rows.length) || (seekingFile && !result.error);
1241 + const verticalControls = usePullRequestVerticalControls();
1242 + const diffMenu: AppBarMenu = {
1243 + title: gt("Diff options"),
1244 + icon: "ellipsis",
1245 + items: [
1246 + ...(permissions.verdicts.length
1247 + ? [
1248 + {
1249 + id: "submit-review",
1250 + title: gt("Submit review"),
1251 + icon: "text.bubble",
1252 + onPress: () =>
1253 + navigation.navigate("PullRequestReview", {
1254 + ...route.params,
1255 + mode: "review",
1256 + }),
1257 + },
1258 + ]
1259 + : []),
1260 + ...(permissions.canComment
1261 + ? [
1262 + {
1263 + id: "comment-on-pr",
1264 + title: gt("Add comment"),
1265 + icon: "plus.bubble",
1266 + onPress: () =>
1267 + navigation.navigate("PullRequestReview", {
1268 + ...route.params,
1269 + mode: "comment",
1270 + }),
1271 + },
1272 + ]
1273 + : []),
1274 + {
1275 + id: "word-wrap",
1276 + title: gt("Word wrap"),
1277 + icon: "text.alignleft",
1278 + selected: appearance.codeWordBreak,
1279 + onPress: () => setCodeWordBreak(!appearance.codeWordBreak),
1280 + },
1281 + {
1282 + id: "hide-tests",
1283 + title: gt("Hide test files"),
1284 + icon: "line.3.horizontal.decrease",
1285 + selected: filter.hideTestFiles,
1286 + onPress: toggleTestFiles,
1287 + },
1288 + ...(selectedRow && selectedFile && canCommentOnDiff
1289 + ? [
1290 + {
1291 + id: "comment",
1292 + title: route.params.replacingDraftId
1293 + ? gt("Move draft to this line")
1294 + : gt("Add review comment"),
1295 + icon: "bubble.left",
1296 + onPress: () => commentOnLine(),
1297 + },
1298 + ]
1299 + : []),
1300 + ...(selectedRow && selectedFile
1301 + ? [
1302 + {
1303 + id: "copy",
1304 + title: gt("Copy line"),
1305 + icon: "document.on.document",
1306 + onPress: () => void Clipboard.setStringAsync(selectedRow.content ?? ""),
1307 + },
1308 + ]
1309 + : []),
1310 + ],
1311 + };
1312 return (
1313 <View className="flex-1 android:bg-header ios:bg-screen">
1314 <AppBar
@@ -1250,78 +1324,7 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
1324 : ""
1325 }`}
1326 onBack={() => navigation.goBack()}
1253 - menus={[
1254 - {
1255 - title: gt("Diff options"),
1256 - icon: "ellipsis",
1257 - items: [
1258 - ...(permissions.verdicts.length
1259 - ? [
1260 - {
1261 - id: "submit-review",
1262 - title: gt("Submit review"),
1263 - icon: "text.bubble",
1264 - onPress: () =>
1265 - navigation.navigate("PullRequestReview", {
1266 - ...route.params,
1267 - mode: "review",
1268 - }),
1269 - },
1270 - ]
1271 - : []),
1272 - ...(permissions.canComment
1273 - ? [
1274 - {
1275 - id: "comment-on-pr",
1276 - title: gt("Add comment"),
1277 - icon: "plus.bubble",
1278 - onPress: () =>
1279 - navigation.navigate("PullRequestReview", {
1280 - ...route.params,
1281 - mode: "comment",
1282 - }),
1283 - },
1284 - ]
1285 - : []),
1286 - {
1287 - id: "word-wrap",
1288 - title: gt("Word wrap"),
1289 - icon: "text.alignleft",
1290 - selected: appearance.codeWordBreak,
1291 - onPress: () => setCodeWordBreak(!appearance.codeWordBreak),
1292 - },
1293 - {
1294 - id: "hide-tests",
1295 - title: gt("Hide test files"),
1296 - icon: "line.3.horizontal.decrease",
1297 - selected: filter.hideTestFiles,
1298 - onPress: toggleTestFiles,
1299 - },
1300 - ...(selectedRow && selectedFile && canCommentOnDiff
1301 - ? [
1302 - {
1303 - id: "comment",
1304 - title: route.params.replacingDraftId
1305 - ? gt("Move draft to this line")
1306 - : gt("Add review comment"),
1307 - icon: "bubble.left",
1308 - onPress: () => commentOnLine(),
1309 - },
1310 - ]
1311 - : []),
1312 - ...(selectedRow && selectedFile
1313 - ? [
1314 - {
1315 - id: "copy",
1316 - title: gt("Copy line"),
1317 - icon: "document.on.document",
1318 - onPress: () => void Clipboard.setStringAsync(selectedRow.content ?? ""),
1319 - },
1320 - ]
1321 - : []),
1322 - ],
1323 - },
1324 - ]}
1327 + menus={verticalControls ? undefined : [diffMenu]}
1328 />
1329 {route.params.replacingDraftId ? (
1330 <Text className="px-4 py-2 text-xs text-foreground-muted">
@@ -1483,6 +1486,7 @@ function PullRequestFileRouteContent({ route }: PullRequestFileRouteProps) {
1486 pr={detail.data}
1487 params={route.params}
1488 filePath={visibleFile?.path}
1489 + menu={diffMenu}
1490 onOpenFiles={() => navigation.navigate("PullRequestFiles", route.params)}
1491 onHeightChange={setToolbarHeight}
1492 />