Skip to content

Commit dcd2658

Browse files
saphidcodexclaudegithub-actions[bot]juliusmarminge
authored
fix(web): scope stash shortcuts to the composer and drawer (pingdotgg#18841)
Co-authored-by: SAPHID <[email protected]> Co-authored-by: GPT-6.1 Sol <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julius Marminge <[email protected]>
1 parent daebb8b commit dcd2658

3 files changed

Lines changed: 169 additions & 3 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6639,6 +6639,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
66396639
{isStashMenuOpen && !composerMenuOpen && !isComposerApprovalState && (
66406640
<ComposerCommandMenuLayer anchor={composerMenuAnchor}>
66416641
<ComposerStashMenu
6642+
composerFormRef={composerFormRef}
66426643
entries={stashQueue}
66436644
stashShortcutLabel={shortcutLabelForCommand(keybindings, "composer.stash", {
66446645
context: {
Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
import { act, useRef, useState } from "react";
2+
import { createRoot, type Root } from "react-dom/client";
3+
import { afterEach, beforeEach, expect, it, vi } from "vite-plus/test";
4+
import { page, userEvent } from "vite-plus/test/browser";
5+
6+
import { Dialog, DialogPopup } from "../ui/dialog";
7+
import { ComposerStashMenu } from "./ComposerStashMenu";
8+
9+
function Composer({ dialog = false }: { dialog?: boolean }) {
10+
const composerFormRef = useRef<HTMLFormElement>(null);
11+
const [entries, setEntries] = useState(
12+
["first", "second"].map((id) => ({
13+
id,
14+
createdAt: "2026-10-01T00:00:00.000Z",
15+
prompt: `${id} prompt`,
16+
attachments: [],
17+
droppedImageNames: [],
18+
})),
19+
);
20+
const [draft, setDraft] = useState("Unsent draft");
21+
const [open, setOpen] = useState(true);
22+
const [dialogOpen, setDialogOpen] = useState(dialog);
23+
const [answer, setAnswer] = useState<string | null>(null);
24+
return (
25+
<>
26+
<form ref={composerFormRef}>
27+
<textarea
28+
aria-label="Message"
29+
value={draft}
30+
onChange={(event) => setDraft(event.target.value)}
31+
/>
32+
<button type="button" onClick={() => setAnswer("Continue")}>
33+
Continue
34+
</button>
35+
<p role="status">{answer ? `Selected: ${answer}` : "Choose an answer"}</p>
36+
</form>
37+
<input aria-label="Search threads" />
38+
<button onClick={() => setOpen(true)}>Open stash</button>
39+
{open && (
40+
<ComposerStashMenu
41+
composerFormRef={composerFormRef}
42+
entries={entries}
43+
stashShortcutLabel="Ctrl+S"
44+
onRestore={(entry) => {
45+
setDraft(entry.prompt);
46+
setEntries((current) => current.filter(({ id }) => id !== entry.id));
47+
setOpen(false);
48+
}}
49+
onDelete={(entry) => {
50+
setEntries((current) => current.filter(({ id }) => id !== entry.id));
51+
if (entries.length === 1) setOpen(false);
52+
}}
53+
onClose={() => setOpen(false)}
54+
/>
55+
)}
56+
<Dialog open={dialogOpen} onOpenChange={setDialogOpen}>
57+
<DialogPopup aria-label="Command palette">
58+
<input aria-label="Search commands" />
59+
</DialogPopup>
60+
</Dialog>
61+
</>
62+
);
63+
}
64+
65+
let root: Root;
66+
let container: HTMLDivElement;
67+
68+
beforeEach(() => {
69+
vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
70+
container = document.createElement("div");
71+
document.body.append(container);
72+
root = createRoot(container);
73+
});
74+
75+
afterEach(async () => {
76+
await act(async () => root.unmount());
77+
container.remove();
78+
vi.unstubAllGlobals();
79+
});
80+
81+
const editor = () => page.getByRole("textbox", { name: "Message" });
82+
const stash = () => page.getByRole("list", { name: "Stashed prompts" });
83+
const restore = (prompt: string) =>
84+
page.getByRole("button", { name: `Restore stashed prompt: ${prompt}` });
85+
const press = (keys: string) => act(async () => userEvent.keyboard(keys));
86+
const focus = (element: Element) => act(async () => (element as HTMLElement).focus());
87+
88+
it("leaves dialog, unrelated input and question button shortcuts alone while the stash is open", async () => {
89+
await act(async () => root.render(<Composer dialog />));
90+
const input = page.getByRole("textbox", { name: "Search commands" }).element();
91+
await focus(input);
92+
93+
for (const key of [
94+
{ key: "ArrowDown" },
95+
{ key: "ArrowUp" },
96+
{ key: "Enter" },
97+
{ key: "Backspace", ctrlKey: true },
98+
{ key: "Backspace", metaKey: true },
99+
]) {
100+
const event = new KeyboardEvent("keydown", { ...key, bubbles: true, cancelable: true });
101+
await act(async () => {
102+
input.dispatchEvent(event);
103+
});
104+
expect(event.defaultPrevented, key.key).toBe(false);
105+
}
106+
107+
await press("{Escape}");
108+
await expect.element(page.getByRole("dialog")).not.toBeInTheDocument();
109+
expect(stash().element().textContent).toContain("first prompt");
110+
expect(stash().element().textContent).toContain("second prompt");
111+
await expect.element(editor()).toHaveValue("Unsent draft");
112+
113+
await focus(page.getByRole("textbox", { name: "Search threads" }).element());
114+
await press("{ArrowDown}{Enter}{Control>}{Backspace}{/Control}{Meta>}{Backspace}{/Meta}{Escape}");
115+
expect(stash().element().textContent).toContain("first prompt");
116+
expect(stash().element().textContent).toContain("second prompt");
117+
await expect.element(editor()).toHaveValue("Unsent draft");
118+
119+
await focus(page.getByRole("button", { name: "Continue", exact: true }).element());
120+
await press("{Enter}");
121+
expect(page.getByRole("status").element().textContent).toBe("Selected: Continue");
122+
expect(stash().element().textContent).toContain("first prompt");
123+
expect(stash().element().textContent).toContain("second prompt");
124+
await press("{Control>}{Backspace}{/Control}{Meta>}{Backspace}{/Meta}");
125+
expect(stash().element().textContent).toContain("first prompt");
126+
expect(stash().element().textContent).toContain("second prompt");
127+
await expect.element(editor()).toHaveValue("Unsent draft");
128+
});
129+
130+
it("navigates, deletes and restores stashed prompts from the composer and drawer", async () => {
131+
await act(async () => root.render(<Composer />));
132+
await focus(restore("first prompt").element());
133+
await press("{ArrowDown}");
134+
await expect.element(restore("second prompt")).toHaveFocus();
135+
await press("{ArrowUp}");
136+
await expect.element(restore("first prompt")).toHaveFocus();
137+
138+
await press("{Control>}{Backspace}{/Control}");
139+
await expect.element(restore("first prompt")).not.toBeInTheDocument();
140+
expect(stash().element().textContent).toContain("second prompt");
141+
await expect.element(editor()).toHaveValue("Unsent draft");
142+
expect(document.activeElement).toBe(document.body);
143+
144+
await press("{Escape}");
145+
await expect.element(stash()).not.toBeInTheDocument();
146+
147+
await act(async () => userEvent.click(page.getByRole("button", { name: "Open stash" })));
148+
await expect.element(restore("first prompt")).not.toBeInTheDocument();
149+
expect(stash().element().textContent).toContain("second prompt");
150+
await focus(editor().element());
151+
await press("{ArrowDown}{Enter}");
152+
await expect.element(editor()).toHaveValue("second prompt");
153+
await expect.element(stash()).not.toBeInTheDocument();
154+
});

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

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { BookmarkIcon, FileIcon, FileTextIcon } from "lucide-react";
2-
import { memo, useEffect, useRef, useState } from "react";
2+
import { memo, useEffect, useRef, useState, type RefObject } from "react";
33
import { assistantCitationsToPlainText } from "@t3tools/shared/assistantCitations";
44

55
import { RelativeTime } from "../RelativeTime";
@@ -35,11 +35,12 @@ function stashEntrySnippet(entry: PromptStashEntry): string {
3535
export const ComposerStashMenu = memo(function ComposerStashMenu(props: {
3636
entries: ReadonlyArray<PromptStashEntry>;
3737
stashShortcutLabel: string | null;
38+
composerFormRef: RefObject<HTMLFormElement | null>;
3839
onRestore: (entry: PromptStashEntry) => void;
3940
onDelete: (entry: PromptStashEntry) => void;
4041
onClose: () => void;
4142
}) {
42-
const { entries, stashShortcutLabel, onRestore, onDelete, onClose } = props;
43+
const { entries, stashShortcutLabel, composerFormRef, onRestore, onDelete, onClose } = props;
4344
const drawerRef = useRef<HTMLDivElement>(null);
4445
const [highlightedId, setHighlightedId] = useState<string | null>(entries[0]?.id ?? null);
4546

@@ -63,6 +64,16 @@ export const ComposerStashMenu = memo(function ComposerStashMenu(props: {
6364

6465
useEffect(() => {
6566
const handler = (event: KeyboardEvent) => {
67+
const target = event.target;
68+
if (
69+
!(target instanceof Node) ||
70+
(target !== document.body &&
71+
!(target instanceof Element && target.closest('[data-prompt-stash-badge="true"]')) &&
72+
!drawerRef.current?.contains(target) &&
73+
!composerFormRef.current?.querySelector('textarea, [role="textbox"]')?.contains(target))
74+
) {
75+
return;
76+
}
6677
if (event.key === "Escape") {
6778
event.preventDefault();
6879
event.stopPropagation();
@@ -107,7 +118,7 @@ export const ComposerStashMenu = memo(function ComposerStashMenu(props: {
107118
};
108119
window.addEventListener("keydown", handler, true);
109120
return () => window.removeEventListener("keydown", handler, true);
110-
}, [entries, highlightedEntry, onClose, onDelete, onRestore]);
121+
}, [composerFormRef, entries, highlightedEntry, onClose, onDelete, onRestore]);
111122

112123
return (
113124
<ComposerBanner.Root ref={drawerRef} data-composer-stash-drawer="true">

0 commit comments

Comments
 (0)