Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions surfaces/gui/src/components/Composer.skills.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,31 @@ afterEach(() => {
});

describe("Composer / skills popup", () => {
it("does not send when Enter confirms IME composition", async () => {
stubFetch();
const p = props();
render(<Composer {...p} />);
fireEvent.change(box(), { target: { value: "你好" } });

fireEvent.keyDown(box(), { key: "Enter", isComposing: true });
expect(p.onSend).not.toHaveBeenCalled();
expect((box() as HTMLTextAreaElement).value).toBe("你好");

fireEvent.keyDown(box(), { key: "Enter" });
await waitFor(() => expect(p.onSend).toHaveBeenCalledWith("你好", [], undefined));
});

it("does not send for WebKit's legacy IME key code", () => {
stubFetch();
const p = props();
render(<Composer {...p} />);
fireEvent.change(box(), { target: { value: "你好" } });

fireEvent.keyDown(box(), { key: "Enter", keyCode: 229 });
expect(p.onSend).not.toHaveBeenCalled();
expect((box() as HTMLTextAreaElement).value).toBe("你好");
});

it("opens on a leading '/' and lists only enabled skills from the effective menu", async () => {
stubFetch();
render(<Composer {...props()} />);
Expand Down
5 changes: 5 additions & 0 deletions surfaces/gui/src/components/Composer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,11 @@ export function Composer(props: Props) {
};

const onKey = (e: React.KeyboardEvent) => {
// Enter confirms the active IME candidate before it means "send". WebKit may
// report the composition keydown with the legacy 229 key code, so keep that
// fallback alongside the standards-based isComposing flag.
if (e.nativeEvent.isComposing || e.nativeEvent.keyCode === 229) return;

if (slashQuery !== null) {
if (e.key === "ArrowDown") {
e.preventDefault();
Expand Down