Fix #4831 mobile header menu not working

frontend/src/Router.tsx

@@ -1,15 +1,6 @@
 import { lazy, Suspense } from "react";
 import { BrowserRouter, Route, Routes } from "react-router-dom";
-import {
+import { ErrorNotFound, LoadingPage, Page, SiteContainer, SiteFooter, SiteHeader, Unhealthy } from "src/components";
-	ErrorNotFound,
-	LoadingPage,
-	Page,
-	SiteContainer,
-	SiteFooter,
-	SiteHeader,
-	SiteMenu,
-	Unhealthy,
-} from "src/components";
 import { useAuthState } from "src/context";
 import { useHealth } from "src/hooks";
 
@@ -55,7 +46,6 @@ function Router() {
 			<Page>
 				<div>
 					<SiteHeader />
-					<SiteMenu />
 				</div>
 				<SiteContainer>
 					<Suspense fallback={<LoadingPage noLogo />}>

frontend/src/components/SiteHeader.tsx

@@ -1,5 +1,7 @@
 import { IconLock, IconLogout, IconUser } from "@tabler/icons-react";
-import { LocalePicker, NavLink, ThemeSwitcher } from "src/components";
+import cs from "classnames";
+import { useState } from "react";
+import { LocalePicker, NavLink, SiteMenu, ThemeSwitcher } from "src/components";
 import { useAuthState } from "src/context";
 import { useUser } from "src/hooks";
 import { T } from "src/locale";
@@ -10,18 +12,21 @@ export function SiteHeader() {
 	const { data: currentUser } = useUser("me");
 	const isAdmin = currentUser?.roles.includes("admin");
 	const { logout } = useAuthState();
+	const [expanded, setExpanded] = useState(false);
 
 	return (
+		<>
 			<header className="navbar navbar-expand-md d-print-none">
 				<div className="container-xl">
 					<button
-					className="navbar-toggler"
+						className={cs("navbar-toggler", { collapsed: !expanded })}
 						type="button"
 						data-bs-toggle="collapse"
 						data-bs-target="#navbar-menu"
 						aria-controls="navbar-menu"
-					aria-expanded="false"
+						aria-expanded={expanded}
 						aria-label="Toggle navigation"
+						onClick={() => setExpanded(!expanded)}
 					>
 						<span className="navbar-toggler-icon" />
 					</button>
@@ -110,5 +115,7 @@ export function SiteHeader() {
 					</div>
 				</div>
 			</header>
+			<SiteMenu mobileExpanded={expanded} setMobileExpanded={setExpanded} />
+		</>
 	);
 }

frontend/src/components/SiteMenu.tsx

@@ -175,7 +175,11 @@ const getMenuDropown = (item: MenuItem, onClick?: () => void) => {
 	);
 };
 
-export function SiteMenu() {
+interface Props {
+	mobileExpanded?: boolean;
+	setMobileExpanded?: (expanded: boolean) => void;
+}
+export function SiteMenu({ mobileExpanded = false, setMobileExpanded }: Props) {
 	// This is hacky AF. But that's the price of using a non-react UI kit.
 	const closeMenus = () => {
 		const navMenus = document.querySelectorAll(".nav-item.dropdown");
@@ -185,12 +189,13 @@ export function SiteMenu() {
 			if (dropdown) {
 				dropdown.classList.remove("show");
 			}
+			setMobileExpanded?.(false);
 		});
 	};
 
 	return (
 		<header className="navbar-expand-md">
-			<div className="collapse navbar-collapse">
+			<div className={cn("collapse", "navbar-collapse", { show: mobileExpanded })} id="navbar-menu">
 				<div className="navbar">
 					<div className="container-xl">
 						<div className="row flex-column flex-md-row flex-fill align-items-center">