Skip to content

fix(mobile): TalkBack reads the message field before Send #27249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maria-rcks merged 4 commits into from
Nov 1, 2026
+137 −134
Merged

fix(mobile): TalkBack reads the message field before Send #27249

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9221d8f
fix(mobile): TalkBack reads the message field before Send
Oct 29, 2026
9f44e42
chore(mobile): note why the composer editor lives inside the controls…
Oct 29, 2026
9a32d19
Merge remote-tracking branch 'origin/main' into fix/mobile-composer-t…
Oct 29, 2026
2b70791
chore(mobile): merge main into TalkBack order fix
maria-rcks Oct 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
271 changes: 137 additions & 134 deletions apps/mobile/src/features/threads/ThreadComposer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,143 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
compactEditor.isExpanded ? { flex: 0, width: 0 } : undefined,
]}
></Animated.View>
{/* TalkBack orders siblings by position; outside this row the editor reads after Send. */}
<Animated.View
style={[
compactEditor.editorStyle,
showsCompactDictation ? { display: "none" } : undefined,
]}
>
<ComposerEditor
hidden={props.hidden}
draftKey={composerDraftKey}
environmentId={props.environmentId}
onOpenMention={(path) => {
Keyboard.dismiss();
if (props.isDraft) {
navigation.navigate("NewTaskFile", {
environmentId: String(props.environmentId),
cwd: props.projectCwd ?? undefined,
path: fileRoutePathSegments(path),
});
} else {
navigation.navigate("ThreadFile", {
environmentId: String(props.environmentId),
threadId: String(props.selectedThread.id),
path: fileRoutePathSegments(path),
});
}
}}
onOpenAttachment={openDraftDocument}
chipsInert={!isExpanded}
onInertChipPress={() => inputRef.current?.focus()}
ref={inputRef}
multiline
value={draftMessage}
// The save uses a draft snapshot; further typing would be discarded on success.
readOnly={isSubmissionLocked}
skills={composerMenu.skills}
selection={composerMenu.selection}
onChangeText={(text) => {
if (!isSubmissionLocked) props.onChangeDraftMessage(text);
}}
onSelectionChange={composerMenu.onSelectionChange}
onPasteImages={(uris) => {
if (isSubmissionLocked) return;
pendingNativeImagePasteCountRef.current += 1;
void props.onNativePasteImages(uris).finally(() => {
pendingNativeImagePasteCountRef.current -= 1;
});
}}
onPasteText={(paste) => {
if (isSubmissionLocked) return;
const insertPaste = () => {
const insertion = replaceTextSelection({
value: paste.value,
selection: paste.selection,
text: paste.text,
});
const selection = { start: insertion.cursor, end: insertion.cursor };
props.onChangeDraftMessage(insertion.value);
composerMenu.onSelectionChange(selection);
};
const capabilities = props.serverConfig?.environment.capabilities;
const advertisedMax = capabilities?.fileAttachments?.maxUploadBytes;
const maxBytes =
advertisedMax === undefined
? null
: clampFileAttachmentUploadBytes(advertisedMax);
const wouldExceedInputLimit =
paste.value.length -
Math.max(0, paste.selection.end - paste.selection.start) +
paste.text.length >
PROVIDER_SEND_TURN_MAX_INPUT_CHARS;
const canAttach =
maxBytes !== null &&
countComposerDraftAttachmentsAfterSelection(composerDraftKey, {
text: paste.value,
...paste.selection,
}) < PROVIDER_SEND_TURN_MAX_ATTACHMENTS &&
new TextEncoder().encode(paste.text).byteLength <= maxBytes;
if (
pastedTextDisposition({
text: paste.text,
wouldExceedInputLimit,
canAttach: true,
}) === "attachment"
) {
if (canAttach) {
pendingPastedTextAttachmentCountRef.current += 1;
setPendingPastedTextAttachmentCount(
pendingPastedTextAttachmentCountRef.current,
);
const finishAttachment = () => {
pendingPastedTextAttachmentCountRef.current = Math.max(
0,
pendingPastedTextAttachmentCountRef.current - 1,
);
setPendingPastedTextAttachmentCount(
pendingPastedTextAttachmentCountRef.current,
);
};
void props
.onNativePasteText(paste)
.then(finishAttachment, finishAttachment);
} else if (!wouldExceedInputLimit) {
insertPaste();
} else {
Dialog.alert(
"Pasted text is too large for this message",
"Remove some text or an attachment, then paste again.",
);
}
return;
}
insertPaste();
}}
placeholder={props.placeholder}
onFocus={handleFocus}
onBlur={handleBlur}
onSubmit={(alternate) =>
void handleSend(
alternate && sendPresentation.alternate !== null
? sendPresentation.alternate
: undefined,
)
}
submitTitle={sendPresentation.label}
alternateSubmitTitle={
sendPresentation.alternate === null
? sendPresentation.label
: FOLLOW_UP_ACTION_LABEL[sendPresentation.alternate]
}
{...compactEditor.editorProps}
textStyle={{
...bodyText,
color: foregroundColor,
}}
/>
</Animated.View>
{!isExpanded && stripAttachments.length > 0 ? (
<View className="h-[44px] shrink-0 flex-row items-center gap-1 pl-1">
{stripAttachments.slice(0, compactAttachmentLimit).map((attachment) => (
Expand Down Expand Up @@ -980,140 +1117,6 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
)}
</View>
</ComposerDictationDraftContent>
<Animated.View
style={[
compactEditor.editorStyle,
showsCompactDictation ? { display: "none" } : undefined,
]}
>
<ComposerEditor
hidden={props.hidden}
draftKey={composerDraftKey}
environmentId={props.environmentId}
onOpenMention={(path) => {
Keyboard.dismiss();
if (props.isDraft) {
navigation.navigate("NewTaskFile", {
environmentId: String(props.environmentId),
cwd: props.projectCwd ?? undefined,
path: fileRoutePathSegments(path),
});
} else {
navigation.navigate("ThreadFile", {
environmentId: String(props.environmentId),
threadId: String(props.selectedThread.id),
path: fileRoutePathSegments(path),
});
}
}}
onOpenAttachment={openDraftDocument}
chipsInert={!isExpanded}
onInertChipPress={() => inputRef.current?.focus()}
ref={inputRef}
multiline
value={draftMessage}
// The save uses a draft snapshot; further typing would be discarded on success.
readOnly={isSubmissionLocked}
skills={composerMenu.skills}
selection={composerMenu.selection}
onChangeText={(text) => {
if (!isSubmissionLocked) props.onChangeDraftMessage(text);
}}
onSelectionChange={composerMenu.onSelectionChange}
onPasteImages={(uris) => {
if (isSubmissionLocked) return;
pendingNativeImagePasteCountRef.current += 1;
void props.onNativePasteImages(uris).finally(() => {
pendingNativeImagePasteCountRef.current -= 1;
});
}}
onPasteText={(paste) => {
if (isSubmissionLocked) return;
const insertPaste = () => {
const insertion = replaceTextSelection({
value: paste.value,
selection: paste.selection,
text: paste.text,
});
const selection = { start: insertion.cursor, end: insertion.cursor };
props.onChangeDraftMessage(insertion.value);
composerMenu.onSelectionChange(selection);
};
const capabilities = props.serverConfig?.environment.capabilities;
const advertisedMax = capabilities?.fileAttachments?.maxUploadBytes;
const maxBytes =
advertisedMax === undefined
? null
: clampFileAttachmentUploadBytes(advertisedMax);
const wouldExceedInputLimit =
paste.value.length -
Math.max(0, paste.selection.end - paste.selection.start) +
paste.text.length >
PROVIDER_SEND_TURN_MAX_INPUT_CHARS;
const canAttach =
maxBytes !== null &&
countComposerDraftAttachmentsAfterSelection(composerDraftKey, {
text: paste.value,
...paste.selection,
}) < PROVIDER_SEND_TURN_MAX_ATTACHMENTS &&
new TextEncoder().encode(paste.text).byteLength <= maxBytes;
if (
pastedTextDisposition({
text: paste.text,
wouldExceedInputLimit,
canAttach: true,
}) === "attachment"
) {
if (canAttach) {
pendingPastedTextAttachmentCountRef.current += 1;
setPendingPastedTextAttachmentCount(
pendingPastedTextAttachmentCountRef.current,
);
const finishAttachment = () => {
pendingPastedTextAttachmentCountRef.current = Math.max(
0,
pendingPastedTextAttachmentCountRef.current - 1,
);
setPendingPastedTextAttachmentCount(
pendingPastedTextAttachmentCountRef.current,
);
};
void props.onNativePasteText(paste).then(finishAttachment, finishAttachment);
} else if (!wouldExceedInputLimit) {
insertPaste();
} else {
Dialog.alert(
"Pasted text is too large for this message",
"Remove some text or an attachment, then paste again.",
);
}
return;
}
insertPaste();
}}
placeholder={props.placeholder}
onFocus={handleFocus}
onBlur={handleBlur}
onSubmit={(alternate) =>
void handleSend(
alternate && sendPresentation.alternate !== null
? sendPresentation.alternate
: undefined,
)
}
submitTitle={sendPresentation.label}
alternateSubmitTitle={
sendPresentation.alternate === null
? sendPresentation.label
: FOLLOW_UP_ACTION_LABEL[sendPresentation.alternate]
}
{...compactEditor.editorProps}
textStyle={{
...bodyText,
color: foregroundColor,
}}
/>
</Animated.View>
</View>
<Animated.View
accessibilityElementsHidden={!isToolbarVisible}
Expand Down
Loading