The best way to control Claude Code, Codex and more from any computer or phone
fix(mobile): align the iPad composer with workspace navigation (#24942)
Co-authored-by: maria-rcks <maria@kuuro.net>
Alex committed
Oct 26, 2026 at 22:48 UTC
5522180329c70c7050852ae0d948400d845f55da
2 files changed
+21
-15
apps/mobile/src/features/threads/ThreadComposer.tsx
+14
-13
@@ -562,7 +562,8 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
562
const isVoiceInputPresented = voicePresentation.statusLabel !== null;
563
const isExpanded = isFocused || settingsSheetPresentation.keepsComposerExpanded;
564
const { setComposerEditing } = useAdaptiveWorkspaceLayout();
565
- const hasSidebarTabBar = useSidebarWorkspaceTabs() === "picker";
565
+ const usesLargeControls =
566
+ useSidebarWorkspaceTabs() === "picker" || (Platform.OS === "ios" && Platform.isPad);
567
const [compactRowWidth, setCompactRowWidth] = useState(0);
568
const compactAttachmentLimit = compactRowWidth >= 500 ? 3 : 1;
569
const compactEditor = useCompactComposerEditor(bodyText, draftMessage);
@@ -768,7 +769,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
769
const modelControl = (
770
<View className="min-w-0 shrink">
771
<ComposerModelControl
771
- size={hasSidebarTabBar ? "large" : "regular"}
772
+ size={usesLargeControls ? "large" : "regular"}
773
modelOption={currentModelOption}
774
selection={currentModelSelection}
775
provider={selectedProviderStatus?.driver}
@@ -852,10 +853,10 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
853
<ComposerSurface
854
animateLayout={false}
855
style={{
855
- borderRadius: hasSidebarTabBar ? 31 : 27,
856
+ borderRadius: usesLargeControls ? 31 : 27,
857
borderCurve: "circular",
858
overflow: "hidden",
858
- paddingVertical: hasSidebarTabBar ? 9 : 2,
859
+ paddingVertical: usesLargeControls ? 9 : 2,
860
}}
861
>
862
{isExpanded ? editingAttachments : null}
@@ -871,7 +872,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
872
hidden={showsCompactDictation}
873
>
874
<ComposerAttachmentButton
874
- size={hasSidebarTabBar ? "large" : "regular"}
875
+ size={usesLargeControls ? "large" : "regular"}
876
disabled={isSubmissionLocked}
877
supportsFiles={Boolean(
878
props.serverConfig?.environment.capabilities.fileAttachments,
@@ -924,7 +925,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
925
>
926
{modelControl}
927
<ComposerDictationStartAction
927
- size={hasSidebarTabBar ? "large" : "regular"}
928
+ size={usesLargeControls ? "large" : "regular"}
929
state={voiceInput.state}
930
isAvailable={voiceInput.isAvailable}
931
disabled={isSubmissionLocked}
@@ -933,7 +934,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
934
/>
935
{showStopAction ? (
936
<ComposerActionButton
936
- size={hasSidebarTabBar ? "large" : "regular"}
937
+ size={usesLargeControls ? "large" : "regular"}
938
accessibilityLabel="Stop agent"
939
icon="stop.fill"
940
variant="danger"
@@ -942,7 +943,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
943
/>
944
) : showResumeAction ? (
945
<ComposerActionButton
945
- size={hasSidebarTabBar ? "large" : "regular"}
946
+ size={usesLargeControls ? "large" : "regular"}
947
accessibilityLabel="Resume queue"
948
icon="play"
949
disabled={!props.canOperateThread || resumingQueue}
@@ -950,7 +951,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
951
/>
952
) : (
953
<SendActionButton
953
- size={hasSidebarTabBar ? "large" : "regular"}
954
+ size={usesLargeControls ? "large" : "regular"}
955
accessibilityLabel={sendBlockedReason ?? sendLabel}
956
presentation={sendPresentation}
957
disabled={!canSend}
@@ -1106,7 +1107,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
1107
collapsable={false}
1108
importantForAccessibility={isToolbarVisible ? "auto" : "no-hide-descendants"}
1109
pointerEvents={isToolbarVisible ? "auto" : "none"}
1109
- style={{ position: "absolute", bottom: hasSidebarTabBar ? 9 : 2, left: 0, right: 0 }}
1110
+ style={{ position: "absolute", bottom: usesLargeControls ? 9 : 2, left: 0, right: 0 }}
1111
>
1112
<ComposerDictationToolbar
1113
showsDictation={isVoiceInputPresented}
@@ -1119,7 +1120,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
1120
style={{ gap: 0 }}
1121
>
1122
<ComposerDictationCancelAction
1122
- size={hasSidebarTabBar ? "large" : "regular"}
1123
+ size={usesLargeControls ? "large" : "regular"}
1124
presentation={voicePresentation}
1125
onCancel={voiceInput.cancel}
1126
/>
@@ -1134,7 +1135,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
1135
) : (
1136
<View className="min-w-0 flex-1 flex-row items-center justify-between">
1137
<ComposerAttachmentButton
1137
- size={hasSidebarTabBar ? "large" : "regular"}
1138
+ size={usesLargeControls ? "large" : "regular"}
1139
disabled={isSubmissionLocked}
1140
supportsFiles={Boolean(
1141
props.serverConfig?.environment.capabilities.fileAttachments,
@@ -1147,7 +1148,7 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
1148
)}
1149
<View className="shrink-0 flex-row items-center">
1150
<ComposerDictationPrimaryAction
1150
- size={hasSidebarTabBar ? "large" : "regular"}
1151
+ size={usesLargeControls ? "large" : "regular"}
1152
state={voiceInput.state}
1153
presentation={voicePresentation}
1154
isAvailable={voiceInput.isAvailable}
apps/mobile/src/features/threads/ThreadDetailScreen.tsx
+7
-2
@@ -112,6 +112,7 @@ import Animated, {
112
} from "react-native-reanimated";
113
import { useSafeAreaInsets } from "react-native-safe-area-context";
114
import { useWorkspaceContentWidth } from "../layout/workspace-content-width";
115
+import { useAdaptiveWorkspaceLayout } from "../layout/adaptive-workspace-context";
116
import { useNativeWorkspaceColumnsSupported } from "../../native/NativeWorkspaceColumns";
117
import {
118
useDeviceType,
@@ -352,6 +353,7 @@ export function ThreadDetailScreen(props: ThreadDetailScreenProps) {
353
354
function ThreadDetailBody(props: ThreadDetailScreenProps) {
355
const usesNativeWorkspaceColumns = useNativeWorkspaceColumnsSupported();
356
+ const { layout } = useAdaptiveWorkspaceLayout();
357
const deviceType = useDeviceType();
358
const workspace = useWorkspaceTabs();
359
const sidebarSearchActive =
@@ -492,7 +494,7 @@ function ThreadDetailBody(props: ThreadDetailScreenProps) {
494
const alignedBottomInset =
495
bottomBarInset ??
496
(Platform.OS === "ios" && Platform.isPad
495
- ? Math.max(bottomSafeArea, 12) - (hasSidebarTabBar ? 5 : 0)
497
+ ? Math.max(bottomSafeArea, 12) - (layout.usesSplitView ? 5 : 0)
498
: undefined);
499
// The Duo's floating sidebar pill ends three points below the composer's usual gutter.
500
const composerBottomInset = Math.max(
@@ -769,7 +771,10 @@ function ThreadDetailBody(props: ThreadDetailScreenProps) {
771
(props.historyControls?.hasMoreHistory === true &&
772
props.selectedThread.latestUserMessageAt !== null);
773
const composerOverlapHeight =
772
- composerHeight ?? COMPOSER_COLLAPSED_CHROME + (hasSidebarTabBar ? 14 : 0) + composerBottomInset;
774
+ composerHeight ??
775
+ COMPOSER_COLLAPSED_CHROME +
776
+ (!isProviderSubagent && (deviceType === "pad" || hasSidebarTabBar) ? 14 : 0) +
777
+ composerBottomInset;
778
// The last collapse toggle; it only applies to the request it was made on.
779
const [userInputToggle, setUserInputToggle] = useState<{
780
readonly requestId: RuntimeRequestId;