Skip to content

Commit c59c78e

Browse files
refactor(web): composer key handling lives in useComposerCommandKey
Moves the editor key handler (send shortcuts, menu navigation, prompt history, plan toggle, list continuation) out of the composer body, and the trailing-space range helper into composer-logic with a test. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 959fea3 commit c59c78e

4 files changed

Lines changed: 328 additions & 158 deletions

File tree

‎apps/web/src/components/chat/ChatComposer.tsx‎

Lines changed: 39 additions & 158 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,15 @@ import {
6464
type ComposerSubmissionIntent,
6565
collapseExpandedComposerCursor,
6666
composerRequiresModifier,
67-
composerSubmissionIntentForKey,
6867
composerStateAtPromptEnd,
6968
detectComposerTrigger,
7069
expandCollapsedComposerCursor,
7170
formatAssistantCitationForComposer,
7271
isPathSuggestionCurrent,
72+
extendReplacementRangeForTrailingSpace,
7373
replaceTextRange,
7474
} from "../../composer-logic";
7575
import { DISCONNECTED_COMPOSER_PLACEHOLDER } from "../../composerPlaceholder";
76-
import { listContinuationForEnter, listIndentForTab } from "../../composer-list-continuation";
7776
import {
7877
deriveComposerSendState,
7978
getAntigravitySendBlockReason,
@@ -259,11 +258,7 @@ import {
259258
type Thread,
260259
type ThreadShell,
261260
} from "../../types";
262-
import {
263-
buildComposerPromptHistoryEntries,
264-
stepComposerPromptHistory,
265-
type ComposerPromptHistoryPosition,
266-
} from "./composerPromptHistory";
261+
import { type ComposerPromptHistoryPosition } from "./composerPromptHistory";
267262
import type { PendingUserInputDraftAnswer } from "../../pendingUserInput";
268263
import type {
269264
LatestProposedPlanState,
@@ -296,6 +291,7 @@ import { useComposerStash } from "./useComposerStash";
296291
import { useComposerContextImport } from "./useComposerContextImport";
297292
import { useComposerAttachmentIntake } from "./useComposerAttachmentIntake";
298293
import { ComposerControlsBar } from "./ComposerControlsBar";
294+
import { useComposerCommandKey } from "./useComposerCommandKey";
299295

300296
/** Reads and disarms a paste-as-text deadline: the shortcut applies to one paste only. */
301297
function consumePasteAsTextShortcut(deadline: { current: number }): boolean {
@@ -304,17 +300,6 @@ function consumePasteAsTextShortcut(deadline: { current: number }): boolean {
304300
return armed;
305301
}
306302

307-
const extendReplacementRangeForTrailingSpace = (
308-
text: string,
309-
rangeEnd: number,
310-
replacement: string,
311-
): number => {
312-
if (!replacement.endsWith(" ")) {
313-
return rangeEnd;
314-
}
315-
return text[rangeEnd] === " " ? rangeEnd + 1 : rangeEnd;
316-
};
317-
318303
const runtimeModeOptions = runtimeModes.map((mode) => ({ mode, ...runtimeModeConfig[mode] }));
319304

320305
export interface ChatComposerHandle {
@@ -2258,148 +2243,44 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
22582243
};
22592244
const expandMobileComposerStable = useStableCallback(expandMobileComposer);
22602245

2261-
// Entries are built on the keypress, not per render: the timeline changes
2262-
// on every streamed delta and ArrowUp is rare.
2263-
const promptHistoryMessagesRef = useRef(promptHistoryMessages);
2264-
useLayoutEffect(() => {
2265-
promptHistoryMessagesRef.current = promptHistoryMessages;
2246+
const { onComposerCommandKey } = useComposerCommandKey({
2247+
keybindings,
2248+
sendShortcut: settings.sendShortcut,
2249+
routeKind,
2250+
phase,
2251+
isCompacting,
2252+
followUpBehavior,
2253+
isSoftwareKeyboardOpen,
2254+
planModeUiEnabled,
2255+
isLiteralPendingAnswer,
2256+
pendingUserInputs,
2257+
promptHistoryMessages,
2258+
promptHistoryPositionRef,
2259+
composerDraftTarget,
2260+
promptRef,
2261+
composerImagesRef,
2262+
composerFilesRef,
2263+
composerTerminalContextsRef,
2264+
composerPreviewAnnotations,
2265+
composerReviewComments,
2266+
composerEditorRef,
2267+
composerMenuOpenRef,
2268+
composerMenuItemsRef,
2269+
activeComposerMenuItemRef,
2270+
setComposerDraftPrompt,
2271+
setComposerCursor,
2272+
setComposerTrigger,
2273+
setComposerHighlightedItemId,
2274+
dismissComposerTrigger,
2275+
toggleInteractionMode,
2276+
nudgeComposerMenuHighlight,
2277+
onSelectComposerItem,
2278+
resolveActiveComposerTrigger,
2279+
readComposerSnapshot,
2280+
applyPromptReplacement,
2281+
submitComposer,
22662282
});
22672283

2268-
// The composer persists across threads. A recall from thread A must not
2269-
// be treated as active in thread B, where the text-match fallback could
2270-
// otherwise turn B's own draft into a browsing position.
2271-
const promptHistoryTargetKey = composerTargetKey(composerDraftTarget);
2272-
2273-
const replacePromptFromHistory = (nextPrompt: string) => {
2274-
promptRef.current = nextPrompt;
2275-
setComposerDraftPrompt(composerDraftTarget, nextPrompt);
2276-
setComposerCursor(collapseExpandedComposerCursor(nextPrompt, nextPrompt.length));
2277-
setComposerTrigger(null);
2278-
setComposerHighlightedItemId(null);
2279-
};
2280-
2281-
const navigatePromptHistory = (
2282-
direction: "backward" | "forward",
2283-
event: KeyboardEvent,
2284-
): boolean => {
2285-
if (event.shiftKey || event.altKey || event.metaKey || event.ctrlKey || event.isComposing) {
2286-
return false;
2287-
}
2288-
if (pendingUserInputs.length > 0) return false;
2289-
if (
2290-
composerImagesRef.current.length > 0 ||
2291-
composerFilesRef.current.length > 0 ||
2292-
composerTerminalContextsRef.current.length > 0 ||
2293-
composerPreviewAnnotations.length > 0 ||
2294-
composerReviewComments.length > 0
2295-
) {
2296-
return false;
2297-
}
2298-
const recalled = promptHistoryPositionRef.current;
2299-
const position = recalled?.targetKey === promptHistoryTargetKey ? recalled.position : null;
2300-
if (position === null && promptRef.current.length > 0) {
2301-
return false;
2302-
}
2303-
const editor = composerEditorRef.current;
2304-
if (!editor?.isCaretOnVisualEdge(direction === "backward" ? "start" : "end")) {
2305-
return false;
2306-
}
2307-
const step = stepComposerPromptHistory({
2308-
direction,
2309-
entries: buildComposerPromptHistoryEntries(promptHistoryMessagesRef.current),
2310-
position,
2311-
currentPrompt: promptRef.current,
2312-
});
2313-
if (!step) return false;
2314-
promptHistoryPositionRef.current = step.position
2315-
? { targetKey: promptHistoryTargetKey, position: step.position }
2316-
: null;
2317-
replacePromptFromHistory(step.prompt);
2318-
return true;
2319-
};
2320-
2321-
const onComposerCommandKey = (key: string, event: KeyboardEvent, isTaskItem = false) => {
2322-
const submissionIntent = composerSubmissionIntentForKey({
2323-
event,
2324-
keybindings,
2325-
isSoftwareKeyboardOpen,
2326-
isDraftThread: routeKind === "draft",
2327-
isRunning: phase === "running",
2328-
sendShortcut: settings.sendShortcut,
2329-
prompt: promptRef.current,
2330-
});
2331-
if (key === "Tab" && event.shiftKey && submissionIntent === null) {
2332-
if (!planModeUiEnabled) return false;
2333-
toggleInteractionMode();
2334-
return true;
2335-
}
2336-
const { trigger } = resolveActiveComposerTrigger();
2337-
const menuIsActive =
2338-
!isLiteralPendingAnswer && (composerMenuOpenRef.current || trigger !== null);
2339-
if (key === "Escape") {
2340-
if (!menuIsActive || event.isComposing || event.keyCode === 229) return false;
2341-
dismissComposerTrigger(trigger);
2342-
composerMenuOpenRef.current = false;
2343-
return true;
2344-
}
2345-
if (menuIsActive && (submissionIntent === null || submissionIntent === "foreground")) {
2346-
const currentItems = composerMenuItemsRef.current;
2347-
const selectedItem = activeComposerMenuItemRef.current ?? currentItems[0];
2348-
if (key === "ArrowDown" && currentItems.length > 0) {
2349-
nudgeComposerMenuHighlight("ArrowDown");
2350-
return true;
2351-
}
2352-
if (key === "ArrowUp" && currentItems.length > 0) {
2353-
nudgeComposerMenuHighlight("ArrowUp");
2354-
return true;
2355-
}
2356-
if ((key === "Enter" || key === "Tab") && selectedItem) {
2357-
onSelectComposerItem(selectedItem);
2358-
return true;
2359-
}
2360-
}
2361-
if ((key === "ArrowUp" || key === "ArrowDown") && submissionIntent === null) {
2362-
return navigatePromptHistory(key === "ArrowUp" ? "backward" : "forward", event);
2363-
}
2364-
if (submissionIntent) {
2365-
submitComposer(
2366-
undefined,
2367-
resolveComposerDispatchMode({
2368-
running: phase === "running",
2369-
alternateModifier: submissionIntent === "alternate",
2370-
activeTurnDefault: followUpBehavior,
2371-
canSteer: !isCompacting,
2372-
}),
2373-
submissionIntent,
2374-
);
2375-
return true;
2376-
}
2377-
if (key === "Enter" && isTaskItem) return false;
2378-
if (
2379-
!isLiteralPendingAnswer &&
2380-
!event.isComposing &&
2381-
(key === "Enter" || (key === "Tab" && !event.shiftKey))
2382-
) {
2383-
const selection = composerEditorRef.current?.readSelectionRange();
2384-
const snapshot = readComposerSnapshot();
2385-
if (selection && selection.start === selection.end && snapshot.value === promptRef.current) {
2386-
const edit =
2387-
key === "Enter"
2388-
? listContinuationForEnter(snapshot.value, selection.start)
2389-
: listIndentForTab(snapshot.value, selection.start, selection.end);
2390-
if (
2391-
edit &&
2392-
applyPromptReplacement(edit.start, edit.end, edit.replacement, {
2393-
expandedCursorAfterReplace: edit.cursorAfter,
2394-
})
2395-
) {
2396-
return true;
2397-
}
2398-
}
2399-
}
2400-
return false;
2401-
};
2402-
24032284
const {
24042285
stashQueue,
24052286
isStashMenuOpen,

0 commit comments

Comments
 (0)