Fix url hash breaking menu nav highlight

center-key · Aug 13, 2024 · 26b887e · 26b887e
1 parent 2483ac6
commit 26b887e
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/js/lib-x.ts b/src/js/lib-x.ts
@@ -708,16 +708,17 @@ const libXNav = {
       // Link Menu HTML example:
       //    <nav id=link-menu>
       //       <a href=.>Home</a>
+      //       <a href=support class=current>Support</a>
       //       <a href=about>About</a>
       //    </nav>
       const linkMenu = globalThis.document.getElementById('link-menu');
       const setCurrentPage = () => {
-         const pageName = globalThis.location.pathname
-            .replace(/index.[a-z]*$/, '').replace(/\/$/, '').replace(/.*\//, '');
-         const active =        linkMenu!.querySelector(`a[href$="${pageName}"]`);
-         const isDefaultPage = /(\/|index\.[a-z]*)$/.test(globalThis.location.href);
-         const onHomePage =    linkMenu!.children[0]!.getAttribute('href') === '.' && isDefaultPage;
-         const current =       onHomePage ? linkMenu!.firstElementChild : active;
+         const path =     globalThis.location.pathname;
+         const pageName = path.replace(/index.[a-z]*$/, '').replace(/\/$/, '').replace(/.*\//, '');
+         const active =   linkMenu!.querySelector(`a[href$="${pageName}"]`);
+         const isIndex =  path.endsWith('/') || /index\.[a-z]*$/.test(path);
+         const isHome =   linkMenu!.children[0]!.getAttribute('href') === '.' && isIndex;
+         const current =  isHome ? linkMenu!.firstElementChild : active;
          current?.classList.add('current');
          }
       if (linkMenu)