From 2b9e92b4e3a31c6fdf3c068c4d35537d9429a986 Mon Sep 17 00:00:00 2001 From: zasbu <136494048+zasbu@users.noreply.github.com> Date: Thu, 12 Nov 2026 20:46:33 +1100 Subject: [PATCH] Restore the polished mobile navigation and community links --- web/e2e/mobile-header.e2e.ts | 53 +++++++ web/src/features/site/MobileSiteNav.tsx | 144 ++++++++++++++++++++ web/src/features/site/SiteHeader.module.css | 61 +-------- web/src/features/site/SiteHeader.tsx | 12 +- web/src/features/site/SiteNav.tsx | 8 +- 5 files changed, 208 insertions(+), 70 deletions(-) create mode 100644 web/e2e/mobile-header.e2e.ts create mode 100644 web/src/features/site/MobileSiteNav.tsx diff --git a/web/e2e/mobile-header.e2e.ts b/web/e2e/mobile-header.e2e.ts new file mode 100644 index 0000000..af28cd1 --- /dev/null +++ b/web/e2e/mobile-header.e2e.ts @@ -0,0 +1,53 @@ +// The recovered mobile menu keeps rich section rows and native keyboard/dismissal behavior. +import { expect, test } from "@playwright/test"; + +for (const width of [320, 390, 768, 900]) { + test(`mobile sections at ${width}px`, async ({ page }) => { + await page.setViewportSize({ width, height: 740 }); + await page.goto("/dev/ui"); + const trigger = page.getByRole("button", { name: "Sections", exact: true }); + const menu = page.getByRole("menu"); + await trigger.click(); + await expect(menu).toBeVisible(); + await expect( + menu.getByText("Every map, with its tier and world record"), + ).toBeVisible(); + await expect(menu.getByRole("menuitem")).toHaveCount(11); + await expect( + menu.getByRole("menuitem", { name: "Discord", exact: true }), + ).toHaveAttribute("href", "https://discord.gg/RYP5G4tuwX"); + const headerBox = (await page.getByRole("banner").boundingBox())!; + expect((await menu.boundingBox())!.y).toBe(headerBox.y + headerBox.height); + expect( + await menu.evaluate( + (element) => element.scrollWidth <= element.clientWidth, + ), + ).toBe(true); + await page.keyboard.press("End"); + await expect( + menu.getByRole("menuitem", { name: "Instagram", exact: true }), + ).toBeFocused(); + await page.keyboard.press("Escape"); + await expect(menu).toBeHidden(); + await expect(trigger).toBeFocused(); + await trigger.click(); + await menu.getByRole("menuitem", { name: "Ruleset", exact: true }).click(); + await expect(page).toHaveURL(/\/ruleset$/); + await expect(menu).toBeHidden(); + await trigger.click(); + await page.mouse.click(width - 5, 730); + await expect(menu).toBeHidden(); + }); +} + +test("desktop keeps the current header", async ({ page }) => { + await page.goto("/dev/ui"); + await expect( + page.getByRole("button", { name: "Sections", exact: true }), + ).toBeHidden(); + await expect( + page + .getByRole("navigation", { name: "Main", exact: true }) + .getByRole("link", { name: "Records", exact: true }), + ).toBeVisible(); +}); diff --git a/web/src/features/site/MobileSiteNav.tsx b/web/src/features/site/MobileSiteNav.tsx new file mode 100644 index 0000000..868c693 --- /dev/null +++ b/web/src/features/site/MobileSiteNav.tsx @@ -0,0 +1,144 @@ +"use client"; +// Header navigation: section links on wide screens; on narrow ones, a menu that opens as a panel under the header, +// each section with what's in it, and the ruleset and community at its foot. Marks the current section. +import { + Activity, + type LucideIcon, + Map as MapIcon, + Menu as MenuIcon, + ScrollText, + Server, + Trophy, + Users, + X, +} from "lucide-react"; +import type { CSSProperties } from "react"; +import { Link } from "@/ui/Link"; +import { BrandIcon } from "@/ui/BrandIcon"; +import { classNames } from "@/ui/classNames"; +import { Menu } from "@/ui/Menu"; +import { communityLinks, isCurrent, sections } from "./navigation"; + +const icons: Record<(typeof sections)[number]["href"], LucideIcon> = { + "/leaderboards": Trophy, + "/maps": MapIcon, + "/players": Users, + "/activity": Activity, + "/servers": Server, +}; + +import styles from "./SiteHeader.module.css"; + +// Recovered from the navigation before the desktop header redesign. +export function MobileSiteNav({ pathname }: { pathname: string | null }) { + return ( +