Ilia Denisov
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>
114 lines
5.0 KiB
TypeScript
114 lines
5.0 KiB
TypeScript
// Phase 29 component coverage for `lib/active-view/map-toggles.svelte`.
|
|
// The popover is a thin view of the `GameStateStore` runes —
|
|
// every checkbox fires `setMapToggle` on the store and reads the
|
|
// current state through `store.mapToggles`. F8-05 (issue #48 п.8)
|
|
// dropped the wrap-scrolling radio group from the UI; the
|
|
// `wrapMode` rune and the renderer's no-wrap path stay put for a
|
|
// future game-server-side feature flag, but no surface exposes
|
|
// the choice today.
|
|
|
|
import "@testing-library/jest-dom/vitest";
|
|
import { fireEvent, render } from "@testing-library/svelte";
|
|
import { beforeEach, describe, expect, test, vi } from "vitest";
|
|
|
|
import { i18n } from "../src/lib/i18n/index.svelte";
|
|
import MapTogglesControl from "../src/lib/active-view/map-toggles.svelte";
|
|
import {
|
|
DEFAULT_MAP_TOGGLES,
|
|
GameStateStore,
|
|
} from "../src/lib/game-state.svelte";
|
|
|
|
function buildStore(): GameStateStore {
|
|
const store = new GameStateStore();
|
|
store.status = "ready";
|
|
store.mapToggles = { ...DEFAULT_MAP_TOGGLES };
|
|
return store;
|
|
}
|
|
|
|
beforeEach(() => {
|
|
i18n.resetForTests("en");
|
|
});
|
|
|
|
describe("MapTogglesControl", () => {
|
|
test("trigger renders and the popover is closed by default", () => {
|
|
const store = buildStore();
|
|
const ui = render(MapTogglesControl, { props: { store } });
|
|
const trigger = ui.getByTestId("map-toggles-trigger");
|
|
expect(trigger).toBeInTheDocument();
|
|
expect(trigger).toHaveAttribute("aria-expanded", "false");
|
|
// The 44+ px touch-target is enforced through CSS; jsdom does
|
|
// not parse scoped Svelte styles for `getComputedStyle`, so the
|
|
// dimension is verified in the Playwright e2e where real
|
|
// browsers compute the rule.
|
|
expect(ui.queryByTestId("map-toggles-surface")).toBeNull();
|
|
});
|
|
|
|
test("clicking the trigger opens the popover with defaults applied", async () => {
|
|
const store = buildStore();
|
|
const ui = render(MapTogglesControl, { props: { store } });
|
|
await fireEvent.click(ui.getByTestId("map-toggles-trigger"));
|
|
const surface = ui.getByTestId("map-toggles-surface");
|
|
expect(surface).toBeInTheDocument();
|
|
expect(ui.getByTestId("map-toggles-hyperspace-groups")).toBeChecked();
|
|
expect(ui.getByTestId("map-toggles-incoming-groups")).toBeChecked();
|
|
expect(ui.getByTestId("map-toggles-unidentified-groups")).toBeChecked();
|
|
expect(ui.getByTestId("map-toggles-cargo-routes")).toBeChecked();
|
|
expect(ui.getByTestId("map-toggles-battle-markers")).toBeChecked();
|
|
expect(ui.getByTestId("map-toggles-bombing-markers")).toBeChecked();
|
|
expect(ui.getByTestId("map-toggles-foreign-planets")).toBeChecked();
|
|
expect(ui.getByTestId("map-toggles-uninhabited-planets")).toBeChecked();
|
|
expect(ui.getByTestId("map-toggles-unidentified-planets")).toBeChecked();
|
|
expect(ui.getByTestId("map-toggles-unreachable-planets")).toBeChecked();
|
|
expect(ui.getByTestId("map-toggles-visible-hyperspace")).toBeChecked();
|
|
expect(ui.queryByTestId("map-toggles-wrap-torus")).toBeNull();
|
|
expect(ui.queryByTestId("map-toggles-wrap-no-wrap")).toBeNull();
|
|
});
|
|
|
|
test("flipping a checkbox calls setMapToggle with the new value", async () => {
|
|
const store = buildStore();
|
|
const setMapToggle = vi
|
|
.spyOn(store, "setMapToggle")
|
|
.mockResolvedValue(undefined);
|
|
const ui = render(MapTogglesControl, { props: { store } });
|
|
await fireEvent.click(ui.getByTestId("map-toggles-trigger"));
|
|
await fireEvent.click(ui.getByTestId("map-toggles-battle-markers"));
|
|
expect(setMapToggle).toHaveBeenCalledWith("battleMarkers", false);
|
|
await fireEvent.click(ui.getByTestId("map-toggles-foreign-planets"));
|
|
expect(setMapToggle).toHaveBeenCalledWith("foreignPlanets", false);
|
|
});
|
|
|
|
test("battle and bombing toggles are independent", async () => {
|
|
const store = buildStore();
|
|
const setMapToggle = vi
|
|
.spyOn(store, "setMapToggle")
|
|
.mockResolvedValue(undefined);
|
|
const ui = render(MapTogglesControl, { props: { store } });
|
|
await fireEvent.click(ui.getByTestId("map-toggles-trigger"));
|
|
await fireEvent.click(ui.getByTestId("map-toggles-battle-markers"));
|
|
expect(setMapToggle).toHaveBeenCalledTimes(1);
|
|
expect(setMapToggle).toHaveBeenCalledWith("battleMarkers", false);
|
|
// No spillover into bombingMarkers.
|
|
expect(setMapToggle).not.toHaveBeenCalledWith("bombingMarkers", false);
|
|
});
|
|
|
|
test("Escape closes the popover", async () => {
|
|
const store = buildStore();
|
|
const ui = render(MapTogglesControl, { props: { store } });
|
|
await fireEvent.click(ui.getByTestId("map-toggles-trigger"));
|
|
expect(ui.getByTestId("map-toggles-surface")).toBeInTheDocument();
|
|
await fireEvent.keyDown(document, { key: "Escape" });
|
|
expect(ui.queryByTestId("map-toggles-surface")).toBeNull();
|
|
});
|
|
|
|
test("clicking outside the popover closes it", async () => {
|
|
const store = buildStore();
|
|
const ui = render(MapTogglesControl, { props: { store } });
|
|
await fireEvent.click(ui.getByTestId("map-toggles-trigger"));
|
|
expect(ui.getByTestId("map-toggles-surface")).toBeInTheDocument();
|
|
// Synthetic outside click — fire on document with the trigger
|
|
// removed from the click target chain.
|
|
await fireEvent.click(document.body);
|
|
expect(ui.queryByTestId("map-toggles-surface")).toBeNull();
|
|
});
|
|
});
|