The panel was one open block of everything in two columns. That reads fine at four games and stops working at eighteen: the game list alone is eighteen rows of four controls each, and it sat above the checkbox somebody had scrolled down here to tick. Nothing was findable and everything was in the way. Collapsing it into groups is only half an answer, though — a group showing nothing but its name turns "what is my region set to?" into a click, which trades one kind of friction for another. So each summary carries its group's current state: "Europe · Dark", "17 of 18 on · A–Z", "plus finished, not started". Closed, the panel is a five-line report of how the app is configured; opening one is for changing an answer rather than reading it. The states are derived from `prefs` at render, never stored, so they cannot drift from the controls they describe. Native `<details>`, for the reason the reorder arrows are ordinary buttons: keyboard and screen reader reach it with no second implementation. `summary` is not an `a`, `button` or `[tabindex]`, so it needed its own focus-visible rule — the shared one does not reach it. Two things fell out along the way. The region and appearance rows had no accessible name at all, so a screen reader read six unlabelled buttons in a row; they and the board's split pills are one `PillGroup` now, with the `role="group"` the board's own controls already carry. And the empty states that point at "Show events that haven't started" now name the group holding it, which is what makes shipping the groups closed safe. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]>
233 lines
9.3 KiB
TypeScript
233 lines
9.3 KiB
TypeScript
import { describe, expect, test } from "bun:test";
|
||
import { renderToStaticMarkup } from "react-dom/server";
|
||
import { Controls } from "../src/client/components/Controls.tsx";
|
||
import { GameMetaProvider } from "../src/client/state/gameMeta.tsx";
|
||
import { metaFor } from "../src/shared/games.ts";
|
||
import type { Prefs } from "../src/client/state/usePrefs.ts";
|
||
|
||
/**
|
||
* The settings panel: its view filters, its group summaries, its game order.
|
||
*
|
||
* Three rows answer the same question — *what am I allowed to look at?* — and
|
||
* they are the only place two of them can be reached from, so what they are
|
||
* bound to is worth pinning. A checkbox wired to the wrong preference is
|
||
* invisible in a diff and obvious only to the reader it happens to.
|
||
*
|
||
* The summaries are pinned for a related reason. The groups ship closed, so
|
||
* those lines are the only account a reader gets of how the app is set up
|
||
* without opening anything, and a line that drifts from the control inside it
|
||
* is worse than no line at all.
|
||
*/
|
||
|
||
const PREFS: Prefs = {
|
||
region: "europe",
|
||
hiddenGames: [],
|
||
focusGame: null,
|
||
sort: "ending",
|
||
view: "soon",
|
||
timelineDayWidth: 32,
|
||
timelineGroup: "game",
|
||
showUpcoming: false,
|
||
timelineSplitUpcoming: true,
|
||
detectDaily: false,
|
||
showCompleted: true,
|
||
showIgnored: false,
|
||
theme: "dark",
|
||
regionConfirmed: true,
|
||
onboarded: true,
|
||
};
|
||
|
||
function render(prefs: Prefs, ignoredCount = 0): string {
|
||
return renderToStaticMarkup(
|
||
<GameMetaProvider value={(id) => metaFor(id, {})}>
|
||
<Controls
|
||
games={["genshin", "hsr"]}
|
||
prefs={prefs}
|
||
onToggleGame={() => {}}
|
||
onUpdate={() => {}}
|
||
ignoredCount={ignoredCount}
|
||
onExport={() => {}}
|
||
onImport={() => {}}
|
||
own={{
|
||
games: {},
|
||
events: {},
|
||
lanes: ["genshin", "hsr"],
|
||
onAddGame: () => {},
|
||
onEditGame: () => {},
|
||
onRemoveGame: () => ({ removed: true, blockedBy: 0 }),
|
||
onAddEvent: () => {},
|
||
}}
|
||
/>
|
||
</GameMetaProvider>,
|
||
);
|
||
}
|
||
|
||
/** The nth checkbox's `checked` attribute, in document order. */
|
||
function checkboxes(html: string): boolean[] {
|
||
return [...html.matchAll(/<input type="checkbox"[^>]*>/g)].map((m) =>
|
||
m[0].includes('checked=""'),
|
||
);
|
||
}
|
||
|
||
describe("Controls: what am I allowed to look at", () => {
|
||
test("the unstarted-events switch is here, in the reader's words", () => {
|
||
// It used to be a pill in the board's own header, next to the stacking and
|
||
// scale controls. Those two reshape what is already on the board; this one
|
||
// decides what is on it at all, which is the question the two rows beside
|
||
// it answer.
|
||
const html = render(PREFS);
|
||
expect(html).toContain("Show events that haven't started");
|
||
expect(html).toContain("Show events I've finished");
|
||
});
|
||
|
||
test("it names both views, because it reaches both", () => {
|
||
// It began as the board's alone. Sitting between two app-wide filters, a
|
||
// row that still said "on the timeline" would understate what a tick does.
|
||
const html = render(PREFS);
|
||
expect(html).toContain("Not started yet");
|
||
expect(html).toContain("timeline");
|
||
});
|
||
|
||
test("the split pills say they are the board's alone", () => {
|
||
// Unlike the row above them, these really are one view — the checklist
|
||
// splits unstarted events into a section of their own either way.
|
||
const html = render({ ...PREFS, showUpcoming: true });
|
||
expect(html).toContain("On the timeline.");
|
||
});
|
||
|
||
test("it reads its own preference and not a neighbour's", () => {
|
||
// Both neighbours are on and this one is off, so a checkbox bound to the
|
||
// wrong key shows up as the wrong count of ticks.
|
||
const off = checkboxes(render(PREFS));
|
||
const on = checkboxes(render({ ...PREFS, showUpcoming: true }));
|
||
expect(off.filter(Boolean)).toHaveLength(1);
|
||
expect(on.filter(Boolean)).toHaveLength(2);
|
||
});
|
||
|
||
test("how unstarted events sit on the board is offered only when they are", () => {
|
||
// A choice about arranging them is unanswerable with none on the board,
|
||
// and a control that changes nothing visible is worse than none.
|
||
expect(render(PREFS)).not.toContain("Mixed in");
|
||
const on = render({ ...PREFS, showUpcoming: true });
|
||
expect(on).toContain("In their own group");
|
||
expect(on).toContain("Mixed in");
|
||
});
|
||
|
||
test("it is a pair of answers, not one answer and its absence", () => {
|
||
// "Mixed in" is a different order, not a heading switched off, so both
|
||
// states name themselves and the panel says which is on.
|
||
const split = render({ ...PREFS, showUpcoming: true });
|
||
const mixed = render({
|
||
...PREFS,
|
||
showUpcoming: true,
|
||
timelineSplitUpcoming: false,
|
||
});
|
||
const pressed = (html: string) =>
|
||
[...html.matchAll(/aria-pressed="true"[^>]*>([^<]+)</g)].map((m) => m[1]);
|
||
expect(pressed(split)).toContain("In their own group");
|
||
expect(pressed(mixed)).toContain("Mixed in");
|
||
// And the line under them describes the answer that is actually on.
|
||
expect(mixed).toContain("One deadline order");
|
||
expect(split).not.toContain("One deadline order");
|
||
});
|
||
|
||
test("the ignored row appears only once something is ignored", () => {
|
||
// Nothing to restore means nothing to offer — the row would be a filter
|
||
// over an empty set.
|
||
expect(render(PREFS)).not.toContain("I'm ignoring");
|
||
expect(render(PREFS, 3)).toContain("Show the 3 events I'm");
|
||
});
|
||
});
|
||
|
||
describe("Controls: what a closed group says", () => {
|
||
/**
|
||
* The summaries are the whole reason collapsing the panel is not a regression.
|
||
* A group that shows only its name turns "what is my region set to?" into a
|
||
* click, so each one has to answer its own question from `prefs` — and being
|
||
* derived rather than stored is what stops them disagreeing with the controls
|
||
* inside.
|
||
*/
|
||
const summaries = (html: string): string[] =>
|
||
[...html.matchAll(/<summary[^>]*>(.*?)<\/summary>/g)].map((m) =>
|
||
(m[1] ?? "").replace(/<[^>]+>/g, " ").replace(/\s+/g, " ").trim(),
|
||
);
|
||
|
||
test("every group is named, and states where it stands", () => {
|
||
const lines = summaries(render(PREFS));
|
||
expect(lines).toHaveLength(5);
|
||
expect(lines[0]).toBe("Games 2 of 2 on · A–Z");
|
||
expect(lines[1]).toBe("Reading Europe · Dark");
|
||
expect(lines[3]).toBe("Your own games and events none yet");
|
||
});
|
||
|
||
test("the games line counts what is on, and whose order it is in", () => {
|
||
const some = render({ ...PREFS, hiddenGames: ["hsr"], gameOrder: ["hsr", "genshin"] });
|
||
expect(summaries(some)[0]).toBe("Games 1 of 2 on · your order");
|
||
});
|
||
|
||
test("the visibility line names the additions, not the switches", () => {
|
||
// The app's answer is what expires next; each of these puts something else
|
||
// alongside it, so that is how the line reads.
|
||
expect(summaries(render({ ...PREFS, showCompleted: false }))[2]).toBe(
|
||
"What you see live deadlines only",
|
||
);
|
||
expect(
|
||
summaries(render({ ...PREFS, showUpcoming: true }))[2],
|
||
).toBe("What you see plus finished, not started");
|
||
});
|
||
|
||
test("ignored counts in the line only once it is actually revealed", () => {
|
||
// `showIgnored` with nothing ignored is a filter over an empty set, and the
|
||
// row itself is not even offered — so the summary must not claim it either.
|
||
expect(summaries(render({ ...PREFS, showIgnored: true }, 0))[2]).toBe(
|
||
"What you see plus finished",
|
||
);
|
||
expect(summaries(render({ ...PREFS, showIgnored: true }, 3))[2]).toBe(
|
||
"What you see plus finished, ignored",
|
||
);
|
||
});
|
||
|
||
test("the panel has a heading of its own", () => {
|
||
// It used to begin with an unannounced wall of controls, which reads as more
|
||
// of the page rather than as the place settings live.
|
||
expect(render(PREFS)).toContain("Settings");
|
||
});
|
||
});
|
||
|
||
describe("Controls: the game order editor", () => {
|
||
const html = () => render(PREFS);
|
||
|
||
test("both affordances ship, because touch fires no drag events", () => {
|
||
// The arrows are the mechanism and the handle is the pointer fast path. A
|
||
// drag-only list is unreachable on a phone and by keyboard alike.
|
||
expect(html()).toContain("draggable");
|
||
expect(html()).toContain('aria-label="Move Genshin Impact up (1 of 2)"');
|
||
expect(html()).toContain('aria-label="Move Honkai: Star Rail down (2 of 2)"');
|
||
});
|
||
|
||
test("an arrow at the end is disabled, not missing", () => {
|
||
// A control that disappears on the first row slides the other one under the
|
||
// finger aiming at it.
|
||
const markup = html();
|
||
// The whole tag: `disabled` is serialised before `aria-label`.
|
||
const tag = (label: string) =>
|
||
new RegExp(`<button[^>]*aria-label="${label}"[^>]*>`).exec(markup)?.[0] ?? "";
|
||
expect(tag("Move Genshin Impact up \\(1 of 2\\)")).toContain("disabled");
|
||
expect(tag("Move Genshin Impact down \\(1 of 2\\)")).not.toContain("disabled");
|
||
expect(tag("Move Honkai: Star Rail down \\(2 of 2\\)")).toContain("disabled");
|
||
});
|
||
|
||
test("the row names the game in full, and still toggles it", () => {
|
||
// Rows have room for the real name where the chips only had `short`.
|
||
expect(html()).toContain("Honkai: Star Rail");
|
||
expect(html()).toContain('aria-pressed="true"');
|
||
});
|
||
|
||
test("reset appears only once the reader has an order to reset", () => {
|
||
expect(html()).not.toContain("Reset to A–Z");
|
||
expect(render({ ...PREFS, gameOrder: ["hsr", "genshin"] })).toContain(
|
||
"Reset to A–Z",
|
||
);
|
||
});
|
||
});
|