Skip to content

Commit 1dfe471

Browse files
only21milclaude
andcommitted
fix(web): model jump shortcuts ignore IME composition keys
The picker's capture-phase keydown listener resolved model jump shortcuts before the search input's composition guard ran, so a composing Enter bound to modelPicker.jump.1 selected a model. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 72d5a8f commit 1dfe471

2 files changed

Lines changed: 41 additions & 4 deletions

File tree

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,13 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
753753
};
754754

755755
const onWindowKeyDown = (event: globalThis.KeyboardEvent) => {
756-
if (event.defaultPrevented || event.repeat || isCommandPaletteOpen()) {
756+
if (
757+
event.defaultPrevented ||
758+
event.repeat ||
759+
event.isComposing ||
760+
event.keyCode === 229 ||
761+
isCommandPaletteOpen()
762+
) {
757763
return;
758764
}
759765

‎apps/web/src/components/chat/ProviderModelPicker.composition.browser.test.tsx‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import { ProviderDriverKind, ProviderInstanceId } from "@t3tools/contracts";
1+
import {
2+
ProviderDriverKind,
3+
ProviderInstanceId,
4+
type ResolvedKeybindingsConfig,
5+
} from "@t3tools/contracts";
6+
import { compileResolvedKeybindingsConfig } from "@t3tools/shared/keybindings";
27
import { useState } from "react";
38
import { expect, it } from "vite-plus/test";
49
import { page, userEvent } from "vite-plus/test/browser";
@@ -9,7 +14,7 @@ import { ProviderModelPicker } from "./ProviderModelPicker";
914

1015
const instanceId = ProviderInstanceId.make("codex");
1116

12-
function Picker() {
17+
function Picker({ keybindings = [] }: { keybindings?: ResolvedKeybindingsConfig }) {
1318
const [model, setModel] = useState("original");
1419
return (
1520
<>
@@ -34,7 +39,7 @@ function Picker() {
3439
skills: [],
3540
},
3641
])}
37-
keybindings={[]}
42+
keybindings={keybindings}
3843
modelOptionsByInstance={
3944
new Map([
4045
[
@@ -87,3 +92,29 @@ it("keeps composition keys out of model selection and dismissal", async () => {
8792
await userEvent.keyboard("{Escape}");
8893
await expect.element(search).not.toBeInTheDocument();
8994
});
95+
96+
it("keeps composing keys from triggering model jump shortcuts", async () => {
97+
const keybindings = compileResolvedKeybindingsConfig([
98+
{ key: "enter", command: "modelPicker.jump.1", when: "modelPickerOpen" },
99+
]);
100+
await using screen = await render(<Picker keybindings={keybindings} />);
101+
await page.getByRole("button", { name: "Choose model" }).click();
102+
const search = page.getByPlaceholder("Search models...");
103+
await search.fill("Target");
104+
await expect.element(page.getByRole("option", { name: /Target model/ })).toBeVisible();
105+
106+
for (const nativeEvent of [{ isComposing: true }, { keyCode: 229 }]) {
107+
const event = new KeyboardEvent("keydown", {
108+
key: "Enter",
109+
...nativeEvent,
110+
bubbles: true,
111+
cancelable: true,
112+
});
113+
await act(() => search.element().dispatchEvent(event));
114+
expect(event.defaultPrevented).toBe(false);
115+
await expect.element(search).toBeVisible();
116+
await expect
117+
.element(screen.getByRole("status", { name: "Selected model" }))
118+
.toHaveTextContent("original");
119+
}
120+
});

0 commit comments

Comments
 (0)