Skip to content

Commit 91f66f8

Browse files
only21milclaudemaria-rcksshivamhwp
authored
fix(web): settings search no longer jumps or clears on an IME Enter or Escape (pingdotgg#28298)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: maria-rcks <[email protected]> Co-authored-by: shivam <[email protected]>
1 parent 7a760a9 commit 91f66f8

2 files changed

Lines changed: 47 additions & 1 deletion

File tree

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
227227
};
228228

229229
const handleSearchKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
230+
if (event.nativeEvent.isComposing || event.keyCode === 229) return;
230231
if (event.key === "Escape" && isSearching) {
231232
event.preventDefault();
232233
event.stopPropagation();
@@ -271,10 +272,11 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
271272
)}
272273
>
273274
<SearchIcon className="size-4 shrink-0 text-sidebar-muted-foreground/80" />
275+
{/* Native search inputs clear on Escape even during IME composition. */}
274276
<SidebarInput
275277
ref={searchInputRef}
276278
nativeInput
277-
type="search"
279+
type="text"
278280
value={query}
279281
onChange={(event) => {
280282
setQuery(event.currentTarget.value);

0 commit comments

Comments
 (0)