Navbar barrierearm

This commit is contained in:
egnbkts committed 2026-05-03 11:07:55 +02:00
1 parent 7b49a60dd0
commit cae17de9e1
2 files changed
+72 -9

No files matched your search

+68 -2
View File
@@ -11,6 +11,7 @@ import { useSupportsHover } from "@/hooks/useSupportsHover";
import { useToggleBodyOverflow } from "@/hooks/useToggleBodyOverflow"; import { useToggleBodyOverflow } from "@/hooks/useToggleBodyOverflow";
import styles from "./Navbar.module.css"; import styles from "./Navbar.module.css";
import { NavbarSubMenu } from "./NavbarSubMenu"; import { NavbarSubMenu } from "./NavbarSubMenu";
import { useIsDesktop } from "@/hooks/useIsDesktop";
type BasicLink = { type BasicLink = {
label: string; label: string;
@@ -21,10 +22,13 @@ export default function Navbar() {
const pathname = usePathname(); const pathname = usePathname();
const navRef = useRef<HTMLElement | null>(null); const navRef = useRef<HTMLElement | null>(null);
const supportsHover = useSupportsHover(); const supportsHover = useSupportsHover();
const isDesktop = useIsDesktop(1024);
const [instantSwitch, setInstantSwitch] = useState(false); const [instantSwitch, setInstantSwitch] = useState(false);
const raf1Ref = useRef<number | null>(null); const raf1Ref = useRef<number | null>(null);
const raf2Ref = useRef<number | null>(null); const raf2Ref = useRef<number | null>(null);
const hamburgerRef = useRef<HTMLButtonElement | null>(null);
const navLinksRef = useRef<HTMLUListElement | null>(null);
const { const {
menuOpen, menuOpen,
@@ -92,6 +96,66 @@ export default function Navbar() {
</li> </li>
); );
useEffect(() => {
if (isDesktop || !menuOpen) return;
const navEl = navRef.current;
if (!navEl) return;
const getFocusableElements = () =>
Array.from(
navEl.querySelectorAll<HTMLElement>(
'a[href], button:not([disabled]), [tabindex]:not([tabindex="-1"])',
),
).filter((el) => {
if (el.hasAttribute("inert")) return false;
if (el.closest("[inert]")) return false;
return true;
});
const firstMenuFocusable = navLinksRef.current?.querySelector<HTMLElement>(
'a[href], button:not([disabled]), [tabindex]:not([tabindex="-1"])',
);
firstMenuFocusable?.focus();
const onKeyDown = (e: KeyboardEvent) => {
if (e.key === "Escape") {
e.preventDefault();
toggleMenu();
requestAnimationFrame(() => {
hamburgerRef.current?.focus();
});
return;
}
if (e.key !== "Tab") return;
const currentFocusable = getFocusableElements();
const currentFirst = currentFocusable[0];
const currentLast = currentFocusable[currentFocusable.length - 1];
if (!currentFirst || !currentLast) return;
if (e.shiftKey) {
if (document.activeElement === currentFirst) {
e.preventDefault();
currentLast.focus();
}
} else {
if (document.activeElement === currentLast) {
e.preventDefault();
currentFirst.focus();
}
}
};
document.addEventListener("keydown", onKeyDown);
return () => {
document.removeEventListener("keydown", onKeyDown);
};
}, [isDesktop, menuOpen, toggleMenu]);
return ( return (
<nav className={styles["nav"]} ref={navRef} aria-label="Hauptnavigation"> <nav className={styles["nav"]} ref={navRef} aria-label="Hauptnavigation">
<div className={styles["nav-logo"]}> <div className={styles["nav-logo"]}>
@@ -107,20 +171,22 @@ export default function Navbar() {
</Link> </Link>
</div> </div>
<button <button
ref={hamburgerRef}
type="button" type="button"
className={`${styles["nav-hamburger"]} ${menuOpen ? styles.open : ""}`} className={`${styles["nav-hamburger"]} ${menuOpen ? styles.open : ""}`}
onClick={toggleMenu} onClick={toggleMenu}
aria-label={menuOpen ? "Menü schließen" : "Menü öffnen"} aria-label={menuOpen ? "Menü schließen" : "Menü öffnen"}
aria-expanded={menuOpen} aria-expanded={menuOpen}
aria-controls="Hauptmenü" aria-controls="main-navigation"
> >
<span></span> <span></span>
<span></span> <span></span>
<span></span> <span></span>
</button> </button>
<ul <ul
ref={navLinksRef}
id="main-navigation" id="main-navigation"
inert={!menuOpen} inert={!isDesktop && !menuOpen}
className={[ className={[
styles["nav-links"], styles["nav-links"],
menuOpen ? styles.open : "", menuOpen ? styles.open : "",
+4 -7
View File
@@ -11,14 +11,11 @@ export function useIsDesktop(breakpoint = 1024) {
const update = () => setIsDesktop(mql.matches); const update = () => setIsDesktop(mql.matches);
update(); update();
mql.addEventListener("change", update);
if (mql.addEventListener) { return () => {
mql.addEventListener("change", update); mql.removeEventListener("change", update);
return () => mql.removeEventListener("change", update); };
}
mql.addListener(update);
return () => mql.removeListener(update);
}, [breakpoint]); }, [breakpoint]);
return isDesktop; return isDesktop;