@devries-cameron20 / t3code Mirror · read-only / commits / 91f66f88de
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 07:00 UTC

fix(web): settings search no longer jumps or clears on an IME Enter or Escape (#28298)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>

Victor committed Nov 1, 2026 at 21:50 UTC 91f66f88de342b0485e7f5a20296b4073725b984
2 files changed +47 -1
apps/web/src/components/settings/SettingsSidebarNav.composition.browser.test.tsx new
+44
@@ -0,0 +1,44 @@
1 +import { expect, it, vi } from "vite-plus/test";
2 +import { page, userEvent } from "vite-plus/test/browser";
3 +
4 +import { act, render } from "../../../test/render";
5 +import { SidebarProvider } from "../ui/sidebar";
6 +import { SettingsSidebarNav } from "./SettingsSidebarNav";
7 +
8 +vi.mock("./useAvailableSettingsSearchItems", () => ({
9 + useAvailableSettingsSearchItems: () => [
10 + { id: "theme", title: "Theme", to: "/settings/appearance" },
11 + ],
12 +}));
13 +
14 +it("ignores composing keys in the search", async () => {
15 + await using screen = await render(
16 + <SidebarProvider defaultOpen>
17 + <SettingsSidebarNav pathname="/settings/general" />
18 + </SidebarProvider>,
19 + { router: "/settings/general" },
20 + );
21 + const search = page.getByRole("combobox", { name: "Search settings" });
22 + await search.fill("theme");
23 + await expect.element(page.getByRole("option", { name: /Theme/ })).toBeVisible();
24 +
25 + for (const composition of [
26 + { key: "Enter", isComposing: true, keyCode: 13 },
27 + { key: "Enter", isComposing: false, keyCode: 229 },
28 + { key: "Escape", isComposing: true, keyCode: 27 },
29 + { key: "Escape", isComposing: false, keyCode: 229 },
30 + { key: "ArrowDown", isComposing: true, keyCode: 40 },
31 + { key: "ArrowUp", isComposing: true, keyCode: 38 },
32 + ]) {
33 + const event = new KeyboardEvent("keydown", { ...composition, bubbles: true, cancelable: true });
34 + await act(() => search.element().dispatchEvent(event));
35 + expect(event.defaultPrevented, JSON.stringify(composition)).toBe(false);
36 + expect(screen.router?.state.location.pathname).toBe("/settings/general");
37 + await expect.element(search).toHaveValue("theme");
38 + }
39 +
40 + await userEvent.keyboard("{Enter}");
41 + await vi.waitFor(() =>
42 + expect(screen.router?.state.location.pathname).toBe("/settings/appearance"),
43 + );
44 +});
apps/web/src/components/settings/SettingsSidebarNav.tsx
+3 -1
@@ -227,6 +227,7 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
227 };
228
229 const handleSearchKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
230 + if (event.nativeEvent.isComposing || event.keyCode === 229) return;
231 if (event.key === "Escape" && isSearching) {
232 event.preventDefault();
233 event.stopPropagation();
@@ -271,10 +272,11 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
272 )}
273 >
274 <SearchIcon className="size-4 shrink-0 text-sidebar-muted-foreground/80" />
275 + {/* Native search inputs clear on Escape even during IME composition. */}
276 <SidebarInput
277 ref={searchInputRef}
278 nativeInput
277 - type="search"
279 + type="text"
280 value={query}
281 onChange={(event) => {
282 setQuery(event.currentTarget.value);