From 1498944e4b63ccde0afbd50d8d8469585f0f3aff Mon Sep 17 00:00:00 2001
From: Kunwar Saluja <saluja@adobe.com>
Date: Fri, 13 Mar 2026 22:16:25 -0400
Subject: [PATCH] fixes

---
 blocks/header/header.css | 11 +++++++-
 blocks/header/header.js  | 57 +++++++++++++++++++++++++++++-----------
 2 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/blocks/header/header.css b/blocks/header/header.css
index 1ee0f93..c74e6ab 100644
--- a/blocks/header/header.css
+++ b/blocks/header/header.css
@@ -81,7 +81,7 @@ header nav[aria-expanded='true'] {
   grid-template:
     'hamburger brand tools' var(--nav-height)
     'sections sections sections' 1fr / auto 1fr auto;
-  overflow-y: auto;
+  overflow: hidden;
   min-height: 100dvh;
 }
 
@@ -240,6 +240,15 @@ header nav .nav-sections ul {
 }
 
 @media (width <= 899px) {
+  header nav .nav-sections {
+    overflow-y: auto;
+    -webkit-overflow-scrolling: touch;
+  }
+
+  header nav[aria-expanded='true'] .nav-sections {
+    max-height: calc(var(--nav-open-height, 100dvh) - var(--nav-height));
+  }
+
   header nav .nav-sections ul,
   header nav .nav-sections .default-content-wrapper > ul > li,
   header nav .nav-sections .default-content-wrapper > ul > li > ul {
diff --git a/blocks/header/header.js b/blocks/header/header.js
index 5cd1d82..641dfcf 100644
--- a/blocks/header/header.js
+++ b/blocks/header/header.js
@@ -315,19 +315,24 @@ async function initAuth(nav, tools) {
   }
   if (mobileLink && !mobileLink.classList.contains('button')) mobileLink.classList.add('button');
 
-  const authState = await resolveAuthState();
-  const loggedIn = authState.authenticated;
-  const loginHref = getLoginUrl();
-  const logoutHref = getLogoutUrl();
-  const targetHref = loggedIn ? logoutHref : loginHref;
-  const label = loggedIn ? logoutLabel : loginLabel;
-
-  [desktopLink, mobileLink].filter(Boolean).forEach((link) => {
-    link.setAttribute('href', targetHref);
-    link.textContent = label;
-    link.setAttribute('aria-label', label);
-    setAuthUserInfo(link, loggedIn ? authState.email : '');
-  });
+  const applyAuthState = async () => {
+    const authState = await resolveAuthState();
+    const loggedIn = authState.authenticated;
+    const loginHref = getLoginUrl();
+    const logoutHref = getLogoutUrl();
+    const targetHref = loggedIn ? logoutHref : loginHref;
+    const label = loggedIn ? logoutLabel : loginLabel;
+
+    [desktopLink, mobileLink].filter(Boolean).forEach((link) => {
+      link.setAttribute('href', targetHref);
+      link.textContent = label;
+      link.setAttribute('aria-label', label);
+      setAuthUserInfo(link, loggedIn ? authState.email : '');
+    });
+  };
+
+  await applyAuthState();
+  return applyAuthState;
 }
 
 function ensureGoogleTranslateScript() {
@@ -454,6 +459,14 @@ function toggleMobile(nav, open, body) {
   nav.querySelectorAll('.nav-drop').forEach((d) => d.setAttribute('tabindex', DESKTOP.matches ? '0' : '-1'));
 }
 
+function syncMobileNavHeight(nav) {
+  if (DESKTOP.matches) {
+    nav.style.removeProperty('--nav-open-height');
+    return;
+  }
+  nav.style.setProperty('--nav-open-height', `${window.innerHeight}px`);
+}
+
 const NAV_ITEMS = '.default-content-wrapper > ul > li';
 
 export default async function decorate(block) {
@@ -507,7 +520,11 @@ export default async function decorate(block) {
   const hamburger = document.createElement('div');
   hamburger.className = 'nav-hamburger';
   hamburger.innerHTML = '<button type="button" aria-controls="nav" aria-label="Open navigation"><span class="nav-hamburger-icon"></span></button>';
-  hamburger.onclick = () => toggleMobile(nav, undefined, body);
+  let refreshAuthState = null;
+  hamburger.onclick = async () => {
+    toggleMobile(nav, undefined, body);
+    if (nav.getAttribute('aria-expanded') === 'true') await refreshAuthState?.();
+  };
 
   eventRoot.addEventListener('click', (e) => {
     if (!DESKTOP.matches && nav.getAttribute('aria-expanded') === 'true' && !nav.contains(e.target)) {
@@ -530,13 +547,23 @@ export default async function decorate(block) {
   block.append(wrapper);
 
   toggleMobile(nav, false, body);
+  syncMobileNavHeight(nav);
   collapseAll(nav);
   DESKTOP.addEventListener('change', () => toggleMobile(nav, false, body));
+  window.addEventListener('resize', () => {
+    syncMobileNavHeight(nav);
+  });
 
   if (tools) {
     initTheme(tools);
     initSearch(tools);
-    await initAuth(nav, tools);
+    refreshAuthState = await initAuth(nav, tools);
+    window.addEventListener('pageshow', () => { refreshAuthState?.(); });
+    if (eventRoot === document) {
+      document.addEventListener('visibilitychange', () => {
+        if (!document.hidden) refreshAuthState?.();
+      });
+    }
     initLanguage(tools, eventRoot);
     hydrateTranslateFromCookie();
   }