Underline the current section in the nav bar

acteng · Aug 7, 2024 · 51ed347 · 51ed347
1 parent 23d6860
commit 51ed347
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/lib/nav/NavHeader.svelte b/src/lib/nav/NavHeader.svelte
@@ -10,9 +10,11 @@
 
 {#if navList}
   <ol>
-    {#each navList as navItem}
+    {#each navList as [path, title, currentlyHere]}
       <li>
-        <a href="{base}{navItem[0]}">{navItem[1]}</a>
+        <a href="{base}{path}" class:govuk-link--no-underline={!currentlyHere}>
+          {title}
+        </a>
       </li>
     {/each}
   </ol>

diff --git a/src/lib/nav/index.ts b/src/lib/nav/index.ts
@@ -349,20 +349,23 @@ export function getNextPage(
   return result;
 }
 
+// Returns [path, title, currently here]
 export function getNavList(
   rawPath: string,
   routeCheckType: "street" | "path" | "",
-): [string, string][] | null {
+): [string, string, boolean][] | null {
   let path = getSectionPath(rawPath);
   if (!path) {
     return null;
   }
 
   let sections = filterMainPageSections(routeCheckType);
   const toolName = path != "/" ? path.split("/")[1] : "";
-  return sections.filter((section) => {
-    return section[0] != "/" && section[0].split("/")[1] == toolName;
-  });
+  return sections
+    .filter((section) => {
+      return section[0] != "/" && section[0].split("/")[1] == toolName;
+    })
+    .map(([p, title]) => [p, title, p == path]);
 }
 
 export function canonicalizePath(path: string): string {