A feed card cost ~10 Tab stops, so the tenth card sat ~135 Tabs from the top of the page, and the only keyboard focus ring (a 60% accent outline on the thumbnail) all but vanished on the dark glass. First slice of the E11 keyboard layer (S4a); Home, Plex and the tables follow in S4b/S4c. - `lib/listNav`: one window listener over every registered list, walked in document order. `j`/`k` step item to item (on into the next list — owner decision D4), the arrows move around a grid, Enter clicks the item's own `data-nav-open` element, so it opens exactly like a click. An item root is never a Tab stop: it gets `tabindex=-1` only while the keyboard is on it, and keeps it until the next item takes it, so the player's focus restore lands back on the card. The first `j` takes the first card you can see, not the top of the list. - `VirtualGrid` takes part with `keyboardNav` (column count + scrolling an unmounted row in); `VirtualFeed` turns it on, so the feed, the library and the channel page all have it. - Keymap: two-step sequences (`g h`) whose pending step belongs to the scope that started it; the page-level scopes (`page`, `search`, `list`) are quiet while a layer that owns the keyboard is open, enforced in `dispatch`. A test pins the owner's rule that none of them needs a modifier on the Hungarian layout. - `g h/f/c/p/x/n/m/d/s/,` jump to a module this account can reach; `s` focuses the header search box and selects the old query; Escape in it hands the keyboard back to the page (Plex's typeahead spends its first Escape on its panel). - Hover popovers are passive layers: an open tooltip still takes Escape first but no longer silences the page keys. - Focus ring (owner decision D2 = B): solid 2px accent around the whole item; the app-wide button/ link/row ring goes from 60% to solid too. The item keeps a transparent resting outline because the video card transitions `all` — without it every `j` flashed a 3px white ring (measured in Chrome). - Help sheet: the new keys, in a fixed order after the surface's own; a `g` chord only for a reachable module; opened over a player or dialog it leaves out the page-level keys and the context-menu key, which nothing can reach there (the latter pre-existing since E10). - CLAUDE.md: a canonical-patterns row for list/grid keys (`useListNav` + `navItemAttrs` + `data-nav-open`, not a private arrow-key handler).
120 lines
4.2 KiB
TypeScript
120 lines
4.2 KiB
TypeScript
// @vitest-environment jsdom
|
|
//
|
|
// E11 S4: `s` puts the caret in the module's search box from anywhere on the page, and Escape hands
|
|
// the keyboard back to the page — the way in needs a way out, or `j`/`k` end up typed into the query.
|
|
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
import { act, cleanup, render, screen } from "@testing-library/react";
|
|
import SearchBar from "./SearchBar";
|
|
import KeyboardHelp from "./ui/KeyboardHelp";
|
|
import { closeKeyboardHelp, toggleKeyboardHelp } from "../lib/keymap";
|
|
import { pushLayer, removeLayer } from "../lib/layerStack";
|
|
|
|
vi.mock("react-i18next", async (importOriginal) => {
|
|
const actual = await importOriginal<typeof import("react-i18next")>();
|
|
return { ...actual, useTranslation: () => ({ t: (key: string) => key }) };
|
|
});
|
|
|
|
afterEach(() => {
|
|
cleanup();
|
|
closeKeyboardHelp();
|
|
});
|
|
|
|
function press(init: KeyboardEventInit, on?: Element | null): KeyboardEvent {
|
|
const e = new KeyboardEvent("keydown", { bubbles: true, cancelable: true, ...init });
|
|
act(() => {
|
|
(on ?? document.activeElement ?? document.body).dispatchEvent(e);
|
|
});
|
|
return e;
|
|
}
|
|
|
|
const field = () => screen.getByPlaceholderText("Search…") as HTMLInputElement;
|
|
|
|
describe("SearchBar keys", () => {
|
|
it("focuses the box on s, selects the old query, and keeps the s out of it", () => {
|
|
render(<SearchBar value="old query" onChange={() => {}} placeholder="Search…" />);
|
|
const e = press({ key: "s" });
|
|
expect(document.activeElement).toBe(field());
|
|
expect(e.defaultPrevented).toBe(true); // the `s` is not typed into the box it just focused
|
|
expect([field().selectionStart, field().selectionEnd]).toEqual([0, "old query".length]);
|
|
});
|
|
|
|
it("leaves an s typed into another field alone", () => {
|
|
render(
|
|
<>
|
|
<input data-testid="other" />
|
|
<SearchBar value="" onChange={() => {}} placeholder="Search…" />
|
|
</>,
|
|
);
|
|
const other = screen.getByTestId("other");
|
|
act(() => other.focus());
|
|
expect(press({ key: "s" }).defaultPrevented).toBe(false);
|
|
expect(document.activeElement).toBe(other);
|
|
});
|
|
|
|
it("stays quiet under a dialog", () => {
|
|
render(<SearchBar value="" onChange={() => {}} placeholder="Search…" />);
|
|
const id = pushLayer();
|
|
press({ key: "s" });
|
|
removeLayer(id);
|
|
expect(document.activeElement).not.toBe(field());
|
|
});
|
|
|
|
it("gives the keyboard back to the page on Escape", () => {
|
|
render(<SearchBar value="abc" onChange={() => {}} placeholder="Search…" />);
|
|
press({ key: "s" });
|
|
press({ key: "Escape" });
|
|
expect(document.activeElement).toBe(document.body);
|
|
});
|
|
|
|
// Plex's typeahead uses its first Escape to close the result panel; the field keeps focus for that.
|
|
it("lets a caller keep its own Escape", () => {
|
|
render(
|
|
<SearchBar
|
|
value="abc"
|
|
onChange={() => {}}
|
|
placeholder="Search…"
|
|
onKeyDown={(e) => e.key === "Escape" && e.preventDefault()}
|
|
/>,
|
|
);
|
|
press({ key: "s" });
|
|
press({ key: "Escape" });
|
|
expect(document.activeElement).toBe(field());
|
|
});
|
|
|
|
// Through the real hook: the sheet offers `s` only where a search box is mounted.
|
|
it("is listed in the help sheet while a search box is mounted", () => {
|
|
const { unmount } = render(
|
|
<>
|
|
<SearchBar value="" onChange={() => {}} placeholder="Search…" />
|
|
<KeyboardHelp />
|
|
</>,
|
|
);
|
|
act(() => toggleKeyboardHelp());
|
|
expect(screen.getAllByRole("definition").map((d) => d.textContent)).toContain("keys.search");
|
|
unmount();
|
|
closeKeyboardHelp();
|
|
|
|
render(<KeyboardHelp />);
|
|
act(() => toggleKeyboardHelp());
|
|
expect(screen.getAllByRole("definition").map((d) => d.textContent)).not.toContain(
|
|
"keys.search",
|
|
);
|
|
});
|
|
|
|
// Opened over a player, the page keys are quiet — the sheet must not list them there.
|
|
it("is left off a sheet opened over a keyboard-owning layer", () => {
|
|
render(
|
|
<>
|
|
<SearchBar value="" onChange={() => {}} placeholder="Search…" />
|
|
<KeyboardHelp />
|
|
</>,
|
|
);
|
|
const id = pushLayer();
|
|
act(() => toggleKeyboardHelp());
|
|
expect(screen.queryAllByRole("definition").map((d) => d.textContent)).not.toContain(
|
|
"keys.search",
|
|
);
|
|
removeLayer(id);
|
|
});
|
|
});
|