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, 03:37 UTC
fix(web): caret navigation no longer opens composer suggestions (#37122)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Wout Stiens committed
Nov 21, 2026 at 00:53 UTC
6908754f0bf9cd64cdb8df8d5d059b63b77b691e
6 files changed
+137
-29
apps/web/src/components/ComposerPromptEditorTiptap.input.browser.test.tsx
+16
@@ -305,6 +305,22 @@ it.each([
305
},
306
);
307
308
+it("distinguishes text edits from caret moves in change notifications", async () => {
309
+ const onChange = vi.fn<ComposerPromptEditorProps["onChange"]>();
310
+ await using screen = await mountEditor("", true, [], onChange);
311
+ await act(async () => {
312
+ screen.editor.commands.focus("end");
313
+ });
314
+ await vi.waitFor(() => expect(document.activeElement).toBe(screen.editor.view.dom));
315
+ await userEvent.keyboard("/mod ab");
316
+ expect(onChange.mock.lastCall?.[0]).toBe("/mod ab");
317
+ expect(onChange.mock.lastCall?.[5]).toBe(true);
318
+
319
+ await userEvent.keyboard("{ArrowLeft}");
320
+ expect(onChange.mock.lastCall?.[0]).toBe("/mod ab");
321
+ expect(onChange.mock.lastCall?.[5]).toBe(false);
322
+});
323
+
324
// The mocked server keybindings bind Command-Up and Command-Down to thread navigation.
325
it("leaves Command-arrow thread navigation bindings to the app on macOS", async () => {
326
using _platform = vi.spyOn(navigator, "platform", "get").mockReturnValue("MacIntel");
apps/web/src/components/ComposerPromptEditorTiptap.tsx
+4
@@ -199,6 +199,8 @@ export interface ComposerPromptEditorProps {
199
expandedCursor: number,
200
cursorAdjacentToMention: boolean,
201
contextIds: string[],
202
+ /** False when only the caret or selection moved. */
203
+ textChanged: boolean,
204
) => void;
205
onVisibleSelectionChange?: () => void;
206
onCommandKeyDown?: (key: string, event: KeyboardEvent, isTaskItem?: boolean) => boolean;
@@ -1092,6 +1094,7 @@ function ComposerPromptEditorTiptapInner(
1094
nextExpandedCursor,
1095
suppressTrigger,
1096
contextIds,
1097
+ previousSnapshot.value !== nextValue,
1098
);
1099
};
1100
@@ -1768,6 +1771,7 @@ function ComposerPromptEditorTiptapInner(
1771
snapshotRef.current.expandedCursor,
1772
literalText,
1773
snapshotRef.current.contextIds,
1774
+ false,
1775
);
1776
};
1777
apps/web/src/components/chat/ChatComposer.tsx
+8
-9
@@ -1008,6 +1008,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1008
const {
1009
trigger: composerTrigger,
1010
setTrigger: setComposerTrigger,
1011
+ followCaret: followComposerCaret,
1012
resolveTrigger: resolveComposerTrigger,
1013
dismissTrigger: dismissComposerTrigger,
1014
resetTrigger: resetComposerTrigger,
@@ -1053,7 +1054,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1054
const composerSurfaceRef = useRef<HTMLDivElement>(null);
1055
const providerInputRejectedRef = useRef(false);
1056
const composerSelectLockRef = useRef(false);
1056
- const composerMenuOpenRef = useRef(false);
1057
const composerMenuItemsRef = useRef<ComposerCommandItem[]>([]);
1058
const activeComposerMenuItemRef = useRef<ComposerCommandItem | null>(null);
1059
const composerBlurFrameRef = useRef<number | null>(null);
@@ -1181,7 +1181,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1181
1182
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- publishes committed composer menu state to refs read by editor key handlers
1183
useLayoutEffect(() => {
1184
- composerMenuOpenRef.current = composerMenuOpen;
1184
composerMenuItemsRef.current = composerMenuItems;
1185
activeComposerMenuItemRef.current = activeComposerMenuItem;
1186
});
@@ -1615,14 +1614,17 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1614
expandedCursor: number,
1615
cursorAdjacentToMention: boolean,
1616
contextIds: string[],
1617
+ textChanged: boolean,
1618
) => {
1619
refreshWorkspaceSnapshotOnTyping();
1620
+ const trigger = cursorAdjacentToMention
1621
+ ? null
1622
+ : detectComposerTrigger(nextPrompt, expandedCursor);
1623
+ const updateTrigger = textChanged ? setComposerTrigger : followComposerCaret;
1624
if (activePendingProgress?.activeQuestion && pendingUserInputs.length > 0) {
1625
if (activePendingProgress.activeQuestion.allowCustomAnswer === false) return;
1626
setComposerCursor(nextCursor);
1623
- setComposerTrigger(
1624
- cursorAdjacentToMention ? null : detectComposerTrigger(nextPrompt, expandedCursor),
1625
- );
1627
+ updateTrigger(trigger);
1628
onChangeActivePendingUserInputCustomAnswer(
1629
activePendingProgress.activeQuestion.id,
1630
nextPrompt,
@@ -1743,9 +1745,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
1745
addComposerDraftFiles(attachmentDraftTarget, attachmentChanges.filesToRestore);
1746
}
1747
setComposerCursor(nextCursor);
1746
- setComposerTrigger(
1747
- cursorAdjacentToMention ? null : detectComposerTrigger(nextPrompt, expandedCursor),
1748
- );
1748
+ updateTrigger(trigger);
1749
};
1750
const onPromptChangeStable = useStableCallback(onPromptChange);
1751
@@ -2407,7 +2407,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
2407
composerPreviewAnnotations,
2408
composerReviewComments,
2409
composerEditorRef,
2410
- composerMenuOpenRef,
2410
composerMenuItemsRef,
2411
activeComposerMenuItemRef,
2412
setComposerDraftPrompt,
apps/web/src/components/chat/composerCommandKey.ts
+6
-6
@@ -62,7 +62,6 @@ export function composerCommandKeyHandler(input: {
62
readonly composerPreviewAnnotations: ReadonlyArray<PreviewAnnotationPayload>;
63
readonly composerReviewComments: ReadonlyArray<ReviewCommentContext>;
64
readonly composerEditorRef: RefObject<ComposerPromptEditorHandle | null>;
65
- readonly composerMenuOpenRef: RefObject<boolean>;
65
readonly composerMenuItemsRef: RefObject<ComposerCommandItem[]>;
66
readonly activeComposerMenuItemRef: RefObject<ComposerCommandItem | null>;
67
readonly setComposerDraftPrompt: (
@@ -121,7 +120,6 @@ export function composerCommandKeyHandler(input: {
120
composerPreviewAnnotations,
121
composerReviewComments,
122
composerEditorRef,
124
- composerMenuOpenRef,
123
composerMenuItemsRef,
124
activeComposerMenuItemRef,
125
setComposerDraftPrompt,
@@ -236,8 +234,7 @@ export function composerCommandKeyHandler(input: {
234
return applyListEdit(event, listOutdentForTab);
235
}
236
const { trigger } = resolveActiveComposerTrigger();
239
- const menuIsActive =
240
- !isLiteralPendingAnswer && (composerMenuOpenRef.current || trigger !== null);
237
+ const menuIsActive = !isLiteralPendingAnswer && trigger !== null;
238
if (key === "Escape") {
239
if (event.isComposing || event.keyCode === 229) return false;
240
if (!menuIsActive && promptSuggestion !== null && promptRef.current.length === 0) {
@@ -246,10 +243,13 @@ export function composerCommandKeyHandler(input: {
243
}
244
if (!menuIsActive) return false;
245
dismissComposerTrigger(trigger);
249
- composerMenuOpenRef.current = false;
246
return true;
247
}
252
- if (menuIsActive && (submissionIntent === null || submissionIntent === "foreground")) {
248
+ if (
249
+ menuIsActive &&
250
+ !event.shiftKey &&
251
+ (submissionIntent === null || submissionIntent === "foreground")
252
+ ) {
253
const currentItems = composerMenuItemsRef.current;
254
const selectedItem = activeComposerMenuItemRef.current ?? currentItems[0];
255
if (key === "ArrowDown" && currentItems.length > 0) {
apps/web/src/components/chat/useComposerTriggerState.ts
+29
-14
@@ -2,37 +2,52 @@ import { useRef, useState } from "react";
2
3
import type { ComposerTrigger } from "../../composer-logic";
4
5
+const isSameTrigger = (a: ComposerTrigger | null, b: ComposerTrigger | null) =>
6
+ a !== null && b !== null && a.kind === b.kind && a.rangeStart === b.rangeStart;
7
+
8
+/** Edits open suggestions unless Escape dismissed the trigger; caret moves only close, resets can open. */
9
export function useComposerTriggerState(initialTrigger: () => ComposerTrigger | null) {
10
const [trigger, setActiveTrigger] = useState(initialTrigger);
11
+ // Key handlers read this before React commits the state.
12
+ const activeTriggerRef = useRef(trigger);
13
const dismissedTriggerRef = useRef<ComposerTrigger | null>(null);
14
9
- const resolveTrigger = (candidate: ComposerTrigger | null) => {
10
- const dismissed = dismissedTriggerRef.current;
11
- return candidate &&
12
- dismissed &&
13
- candidate.kind === dismissed.kind &&
14
- candidate.rangeStart === dismissed.rangeStart
15
- ? null
16
- : candidate;
15
+ const activate = (next: ComposerTrigger | null) => {
16
+ activeTriggerRef.current = next;
17
+ setActiveTrigger(next);
18
};
19
20
+ /** The trigger at the caret when its menu is the open one, otherwise null. */
21
+ const resolveTrigger = (candidate: ComposerTrigger | null) =>
22
+ isSameTrigger(activeTriggerRef.current, candidate) ? candidate : null;
23
+
24
+ /** After a text edit, with the trigger at the caret. */
25
const setTrigger = (candidate: ComposerTrigger | null) => {
20
- const activeTrigger = resolveTrigger(candidate);
21
- if (candidate === null || activeTrigger !== null) {
26
+ if (isSameTrigger(dismissedTriggerRef.current, candidate)) {
27
+ activate(null);
28
+ return;
29
+ }
30
+ dismissedTriggerRef.current = null;
31
+ activate(candidate);
32
+ };
33
+
34
+ /** After the caret moved without an edit, with the trigger at the caret. */
35
+ const followCaret = (candidate: ComposerTrigger | null) => {
36
+ if (!isSameTrigger(dismissedTriggerRef.current, candidate)) {
37
dismissedTriggerRef.current = null;
38
}
24
- setActiveTrigger(activeTrigger);
39
+ activate(resolveTrigger(candidate));
40
};
41
42
const dismissTrigger = (candidate: ComposerTrigger | null) => {
43
dismissedTriggerRef.current = candidate;
29
- setActiveTrigger(null);
44
+ activate(null);
45
};
46
47
const resetTrigger = (candidate: ComposerTrigger | null) => {
48
dismissedTriggerRef.current = null;
34
- setActiveTrigger(candidate);
49
+ activate(candidate);
50
};
51
37
- return { trigger, setTrigger, resolveTrigger, dismissTrigger, resetTrigger };
52
+ return { trigger, setTrigger, followCaret, resolveTrigger, dismissTrigger, resetTrigger };
53
}
scripts/scenarios/caret-onto-trigger-leaves-keys-with-text.e2e.ts
new
+74
@@ -0,0 +1,74 @@
1
+import { expect } from "e2e";
2
+import { test, WEB } from "./t3.ts";
3
+
4
+test(
5
+ "Moving the caret onto /mod leaves editing keys with the text",
6
+ WEB,
7
+ async ({ t3, app, screen, browser }) => {
8
+ const project = await t3.project("demo");
9
+ const thread = await t3.thread({ project, title: "Caret control", messages: ["Hello"] });
10
+ await t3.open(thread);
11
+ const composer = screen.getByRole("textbox");
12
+
13
+ await composer.pressSequentially("/mod ab");
14
+ await composer.press("ArrowLeft");
15
+ await composer.press("ArrowLeft");
16
+ await composer.press("ArrowLeft");
17
+ await app.screenshot("caret-on-command");
18
+ await composer.press("ArrowDown");
19
+ await composer.pressSequentially("!");
20
+ await expect(composer).toHaveText("/mod ab!");
21
+
22
+ await composer.press("ControlOrMeta+a");
23
+ await composer.press("Backspace");
24
+ await composer.pressSequentially("/mod ab");
25
+ await composer.press("ArrowLeft");
26
+ await composer.press("ArrowLeft");
27
+ await composer.press("ArrowLeft");
28
+ await expect(screen.getByRole("listbox")).toBeHidden();
29
+ await composer.press("Shift+Enter");
30
+ await composer.pressSequentially("next");
31
+ await app.screenshot("shift-enter-with-closed-list");
32
+ await expect(composer).toHaveText("/mod next ab");
33
+ await expect(browser.locator('[role="textbox"] > p')).toHaveCount(2);
34
+
35
+ // A typed trigger opens its list, but Shift+Enter still adds a line.
36
+ await composer.press("ControlOrMeta+a");
37
+ await composer.press("Backspace");
38
+ await composer.pressSequentially("hi @READ");
39
+ await expect(screen.getByRole("option").first()).toBeVisible();
40
+ await composer.press("Shift+Enter");
41
+ await composer.pressSequentially("next");
42
+ await app.screenshot("shift-enter-with-open-list");
43
+ await expect(composer).toHaveText("hi @READ next");
44
+ await expect(browser.locator('[role="textbox"] > p')).toHaveCount(2);
45
+
46
+ for (const key of ["Enter", "Tab"]) {
47
+ await composer.press("ControlOrMeta+a");
48
+ await composer.press("Backspace");
49
+ await composer.pressSequentially("hi @READ");
50
+ await expect(screen.getByRole("option").first()).toBeVisible();
51
+ await composer.press(key);
52
+ await expect(screen.getByRole("listbox")).toBeHidden();
53
+ await expect(composer).not.toContainText("@READ");
54
+ }
55
+
56
+ await composer.press("ControlOrMeta+a");
57
+ await composer.press("Backspace");
58
+ await composer.pressSequentially("hi /m");
59
+ await expect(screen.getByRole("option").first()).toBeVisible();
60
+ await composer.press("Escape");
61
+ await composer.pressSequentially("o");
62
+ await expect(screen.getByRole("listbox")).toBeHidden();
63
+ await composer.press("ArrowLeft");
64
+ await composer.press("ArrowRight");
65
+ await composer.pressSequentially("d");
66
+ await expect(screen.getByRole("listbox")).toBeHidden();
67
+ await composer.press("Home");
68
+ await composer.press("End");
69
+ await expect(screen.getByRole("listbox")).toBeHidden();
70
+ await composer.pressSequentially("e");
71
+ await app.screenshot("escape-leave-return-edit");
72
+ await expect(screen.getByRole("option").first()).toBeVisible();
73
+ },
74
+);