4a23c357e5
Drains six F8 polish items (parent #43) in one feature: а) Chrome cleanup - п.6 — remove the AccountMenu (settings/sessions/theme/language/logout ∼ rudimentary in-game) and replace it with a single icon-button light/dark theme toggle. The toggle flips an in-memory `theme.override`; game-shell unmount calls `theme.clearOverride()` so the lobby (and any re-entry) re-projects the persisted lobby choice. - п.8 — remove the wrap-scrolling radio from the map gear popover. The per-game `wrapMode` store and the renderer's no-wrap path stay in place for a future engine-side topology feature; only the UI surface is dropped (wrap is a server-side concept, not a per-session UI affordance). б) Inspector compact rows (single idiom: select + ✓ apply / ✗ cancel, or contextual edit/remove/add) - п.13 — planet name is now click-to-edit: clicking the name opens an inline `<input>` + ✓ confirm icon; Escape cancels; the explicit Rename action button and Cancel button are gone. - п.14 — production becomes one row: primary `<select>` picks industry/materials/research/ship, conditional secondary `<select>` picks the target (tech / science / ship class) for research and ship contexts. Apply is gated until row state differs from the planet's current effective production; auto-submit-on-click is replaced by the apply-gate. - п.16 — cargo routes collapse to one row: a single dropdown (COL/CAP/MAT/EMP plus a placeholder that absorbs the old section title) and contextual action buttons (add / edit + remove) to the right. After a successful pick or remove the dropdown stays on the type the user just acted on. - п.32 — stationed ship groups hoist the race column into a dropdown above the table. The dropdown seeds with the player's own race when local groups are stationed here, otherwise the first race alphabetically; rendered only when more than one race is in orbit. The race column is dropped in both single- and multi-race modes — the dropdown's value already names the active race. Tests: unit and Playwright e2e updated for every changed test-id and flow; new coverage added for `theme.override`, the in-game toggle, the apply-gate behaviour, and the stationed-race dropdown. i18n keys for the removed menu items, the wrap radios, the cargo title, and the explicit `rename.cancel` are dropped from both locales; new `game.shell.theme_toggle.*`, `production.main/target.*`, `production.apply/cancel`, `cargo.placeholder`, and `ship_groups.race_filter.aria` keys land. Docs synced: `docs/FUNCTIONAL.md` §6.7 + `docs/FUNCTIONAL_ru.md` mirror drop the torus / no-wrap radio mention; `ui/docs/design-system.md` documents the lobby-owned persisted picker + the in-game ephemeral override channel. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
131 lines
4.2 KiB
TypeScript
131 lines
4.2 KiB
TypeScript
import "@testing-library/jest-dom/vitest";
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
|
|
// The store is a module singleton constructed on first import: it reads
|
|
// localStorage and `matchMedia` in its constructor. Each test therefore
|
|
// stubs `matchMedia` and resets the module registry, then imports a
|
|
// freshly-constructed store via `freshStore`.
|
|
|
|
const STORAGE_KEY = "galaxy-theme";
|
|
|
|
function stubMatchMedia(prefersLight: boolean): void {
|
|
Object.defineProperty(window, "matchMedia", {
|
|
writable: true,
|
|
configurable: true,
|
|
value: (query: string) => ({
|
|
matches: query.includes("light") ? prefersLight : false,
|
|
media: query,
|
|
onchange: null,
|
|
addListener: () => {},
|
|
removeListener: () => {},
|
|
addEventListener: () => {},
|
|
removeEventListener: () => {},
|
|
dispatchEvent: () => false,
|
|
}),
|
|
});
|
|
}
|
|
|
|
async function freshStore(
|
|
prefersLight = false,
|
|
): Promise<typeof import("../src/lib/theme/theme.svelte")> {
|
|
stubMatchMedia(prefersLight);
|
|
vi.resetModules();
|
|
return import("../src/lib/theme/theme.svelte");
|
|
}
|
|
|
|
describe("theme store", () => {
|
|
beforeEach(() => {
|
|
localStorage.clear();
|
|
delete document.documentElement.dataset.theme;
|
|
});
|
|
afterEach(() => {
|
|
vi.restoreAllMocks();
|
|
});
|
|
|
|
it("defaults to system and applies the resolved theme", async () => {
|
|
const { theme } = await freshStore();
|
|
expect(theme.choice).toBe("system");
|
|
// freshStore() leaves the OS at dark (prefersLight = false).
|
|
expect(theme.resolved).toBe("dark");
|
|
expect(document.documentElement.dataset.theme).toBe("dark");
|
|
});
|
|
|
|
it("persists an explicit choice and writes data-theme", async () => {
|
|
const { theme, THEME_STORAGE_KEY } = await freshStore();
|
|
expect(THEME_STORAGE_KEY).toBe(STORAGE_KEY);
|
|
|
|
theme.setChoice("light");
|
|
expect(theme.choice).toBe("light");
|
|
expect(theme.resolved).toBe("light");
|
|
expect(document.documentElement.dataset.theme).toBe("light");
|
|
expect(localStorage.getItem(STORAGE_KEY)).toBe("light");
|
|
|
|
theme.setChoice("dark");
|
|
expect(theme.resolved).toBe("dark");
|
|
expect(document.documentElement.dataset.theme).toBe("dark");
|
|
expect(localStorage.getItem(STORAGE_KEY)).toBe("dark");
|
|
});
|
|
|
|
it("reads the stored choice on construction", async () => {
|
|
localStorage.setItem(STORAGE_KEY, "light");
|
|
const { theme } = await freshStore();
|
|
expect(theme.choice).toBe("light");
|
|
expect(theme.resolved).toBe("light");
|
|
});
|
|
|
|
it("resolves system to the OS preference", async () => {
|
|
const { theme } = await freshStore(true);
|
|
theme.setChoice("system");
|
|
expect(theme.choice).toBe("system");
|
|
expect(theme.resolved).toBe("light");
|
|
expect(document.documentElement.dataset.theme).toBe("light");
|
|
});
|
|
|
|
it("falls back to system for an unrecognised stored value", async () => {
|
|
localStorage.setItem(STORAGE_KEY, "neon");
|
|
const { theme } = await freshStore();
|
|
expect(theme.choice).toBe("system");
|
|
});
|
|
|
|
it("applies an ephemeral override without touching the persisted choice", async () => {
|
|
localStorage.setItem(STORAGE_KEY, "dark");
|
|
const { theme } = await freshStore();
|
|
expect(theme.resolved).toBe("dark");
|
|
expect(theme.override).toBeNull();
|
|
|
|
theme.setOverride("light");
|
|
expect(theme.override).toBe("light");
|
|
expect(theme.resolved).toBe("light");
|
|
expect(document.documentElement.dataset.theme).toBe("light");
|
|
// Persisted choice is untouched.
|
|
expect(theme.choice).toBe("dark");
|
|
expect(localStorage.getItem(STORAGE_KEY)).toBe("dark");
|
|
});
|
|
|
|
it("clearOverride re-projects the persisted choice", async () => {
|
|
localStorage.setItem(STORAGE_KEY, "light");
|
|
const { theme } = await freshStore();
|
|
theme.setOverride("dark");
|
|
expect(theme.resolved).toBe("dark");
|
|
|
|
theme.clearOverride();
|
|
expect(theme.override).toBeNull();
|
|
expect(theme.resolved).toBe("light");
|
|
expect(document.documentElement.dataset.theme).toBe("light");
|
|
});
|
|
|
|
it("override shadows setChoice until cleared", async () => {
|
|
const { theme } = await freshStore();
|
|
theme.setOverride("light");
|
|
theme.setChoice("dark");
|
|
// Override wins while it is non-null, but the choice is still
|
|
// persisted for the next lobby visit.
|
|
expect(theme.resolved).toBe("light");
|
|
expect(theme.choice).toBe("dark");
|
|
expect(localStorage.getItem(STORAGE_KEY)).toBe("dark");
|
|
|
|
theme.clearOverride();
|
|
expect(theme.resolved).toBe("dark");
|
|
});
|
|
});
|