From 09deb091c513e07292dcb31bf418c9824d94b215 Mon Sep 17 00:00:00 2001 From: "opencode-agent[bot]" <219766164+opencode-agent[bot]@users.noreply.github.com> Date: Mon, 9 Nov 2026 15:51:36 -0600 Subject: [PATCH] fix(site): keep open menus under the pinned header (#62968) --- .../site/src/component/language-picker.tsx | 11 ++- .../site/src/component/site/place-menu.ts | 13 ++-- .../site/src/component/site/under-header.ts | 70 +++++++++++++++++++ 3 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 services/site/src/component/site/under-header.ts diff --git a/services/site/src/component/language-picker.tsx b/services/site/src/component/language-picker.tsx index b58fb61e53e..e3d6f5aabb6 100644 --- a/services/site/src/component/language-picker.tsx +++ b/services/site/src/component/language-picker.tsx @@ -4,6 +4,7 @@ import { IconChevron } from "~/component/icon" import { openLanguageSheet } from "~/component/language-sheet" import { onCloseMenus } from "~/component/site/menu-open" import { prefersSheet } from "~/component/site/sheet" +import { keepUnderHeader } from "~/component/site/under-header" import { useI18n } from "~/context/i18n" import { useLanguage } from "~/context/language" import { loadLanguage } from "~/i18n/content" @@ -13,9 +14,10 @@ import "./language-picker.css" /** * The language control. Pointers get a dropdown: a popover anchored to the trigger that flips and - * shrinks to stay on screen (CSS anchor positioning, no script). Touch phones get the site's bottom - * sheet (language-sheet.tsx). Every row is a link to the page in that language, so both work - * without JavaScript and tell search engines about the other languages. + * shrinks to stay on screen (CSS anchor positioning) and scrolls under the pinned header + * (under-header.ts). Touch phones get the site's bottom sheet (language-sheet.tsx). Every row is a + * link to the page in that language, so both work without JavaScript and tell search engines about + * the other languages. */ export function LanguagePicker(props: { align?: "left" | "right" } = {}) { const language = useLanguage() @@ -28,6 +30,7 @@ export function LanguagePicker(props: { align?: "left" | "right" } = {}) { const [open, setOpen] = createSignal(false) const href = (locale: Locale) => `${route(locale, strip(location.pathname))}${location.search}${location.hash}` let menu!: HTMLDivElement + let trigger!: HTMLButtonElement onCloseMenus(() => { if (menu.matches(":popover-open")) menu.hidePopover() }) @@ -36,6 +39,7 @@ export function LanguagePicker(props: { align?: "left" | "right" } = {}) { const toggle = (event: Event) => { if (!(event instanceof ToggleEvent)) return setOpen(event.newState === "open") + if (event.newState === "open") keepUnderHeader(menu, trigger) // Opened from the keyboard: focus moves to the current language. if (event.newState === "open" && menu.previousElementSibling?.matches(":focus-visible")) menu.querySelector('[aria-current="true"]')?.focus() @@ -48,6 +52,7 @@ export function LanguagePicker(props: { align?: "left" | "right" } = {}) {