Skip to content

Commit 6382268

Browse files
fix(web): let paste expand a resting composer (pingdotgg#9498)
Co-authored-by: Claude Code <[email protected]>
1 parent f8a14b2 commit 6382268

1 file changed

Lines changed: 45 additions & 5 deletions

File tree

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -571,14 +571,24 @@ function eventPathContainsSelector(event: Event, selector: string): boolean {
571571
return path.some((target) => target instanceof Element && target.closest(selector));
572572
}
573573

574-
function shouldTypeToFocusComposer(event: KeyboardEvent): boolean {
575-
if (event.defaultPrevented || event.isComposing) return false;
576-
if (event.metaKey || event.ctrlKey || event.altKey) return false;
577-
if (event.key.length !== 1) return false;
578-
574+
/**
575+
* Whether input that landed outside any editable or interactive element
576+
* should be redirected into the composer. Shared by type-to-focus and
577+
* paste-to-focus so both honour the same surfaces.
578+
*/
579+
function shouldRedirectInputToComposer(event: Event): boolean {
580+
if (event.defaultPrevented) return false;
579581
if (eventPathContainsSelector(event, TYPE_TO_FOCUS_EDITABLE_SELECTOR)) return false;
580582
if (eventPathContainsSelector(event, TYPE_TO_FOCUS_INTERACTIVE_SELECTOR)) return false;
581583
if (document.querySelector(TYPE_TO_FOCUS_FLOATING_LAYER_SELECTOR)) return false;
584+
return true;
585+
}
586+
587+
function shouldTypeToFocusComposer(event: KeyboardEvent): boolean {
588+
if (event.isComposing) return false;
589+
if (event.metaKey || event.ctrlKey || event.altKey) return false;
590+
if (event.key.length !== 1) return false;
591+
if (!shouldRedirectInputToComposer(event)) return false;
582592

583593
// The right-panel surface launcher claims its shortcut letters while it is
584594
// visible (data attribute set in RightPanelTabs); those keys open surfaces
@@ -591,6 +601,17 @@ function shouldTypeToFocusComposer(event: KeyboardEvent): boolean {
591601
return true;
592602
}
593603

604+
/**
605+
* Plain text pasted with nothing editable focused, such as after the resting
606+
* composer blurred. Files are left to the composer's own paste handler.
607+
*/
608+
function pasteTextToFocusComposer(event: ClipboardEvent): string | null {
609+
if (!event.clipboardData || event.clipboardData.files.length > 0) return null;
610+
if (!shouldRedirectInputToComposer(event)) return null;
611+
const text = event.clipboardData.getData("text/plain");
612+
return text.length > 0 ? text : null;
613+
}
614+
594615
function formatOutgoingPrompt(params: {
595616
provider: ProviderDriverKind;
596617
model: string | null;
@@ -5859,6 +5880,25 @@ function ChatViewContent(props: ChatViewProps) {
58595880
composerRef,
58605881
]);
58615882

5883+
// Paste-to-focus: the resting composer blurs on a click into the timeline,
5884+
// so a paste that follows has no editable target and would be dropped.
5885+
// Route it to the composer like a typed key, which also expands it.
5886+
useEffect(() => {
5887+
const handler = (event: ClipboardEvent) => {
5888+
if (!activeThreadId || isCommandPaletteOpen()) return;
5889+
if (getTerminalFocusOwner() !== null) return;
5890+
if (composerRef.current?.isModelPickerOpen()) return;
5891+
const text = pasteTextToFocusComposer(event);
5892+
if (text === null) return;
5893+
if (composerRef.current?.insertTextAtEnd(text)) {
5894+
event.preventDefault();
5895+
event.stopPropagation();
5896+
}
5897+
};
5898+
window.addEventListener("paste", handler, true);
5899+
return () => window.removeEventListener("paste", handler, true);
5900+
}, [activeThreadId, composerRef]);
5901+
58625902
const onRevertToTurnCount = useCallback(
58635903
async (turnCount: number) => {
58645904
const localApi = readLocalApi();

0 commit comments

Comments
 (0)