Patched colouring in TreeNav

mianalysis · Dec 2, 2024 · 899020c · 899020c
1 parent 7469ac2
commit 899020c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/components/TreeNav.tsx b/src/components/TreeNav.tsx
@@ -36,7 +36,7 @@ function InternalNode({
   currentPath: string;
   depth: number;
 }) {
-  const relatesToCurrentPath = currentPath.includes(node.path);
+  const relatesToCurrentPath = currentPath.startsWith(node.path);
 
   const [expanded, setExpanded] = useState(relatesToCurrentPath);
 

diff --git a/src/components/layout/NavLink.astro b/src/components/layout/NavLink.astro
@@ -5,9 +5,10 @@ interface Props {
 
 const { href } = Astro.props;
 
-const currentPath = Astro.url.pathname;
+// Remove trailing slash
+const currentPath = Astro.url.pathname.replace(/\/$/, '');
 
-const active = currentPath.includes(href);
+const active = currentPath.endsWith(href);
 ---
 
 <li

diff --git a/src/layouts/GuideLayout.astro b/src/layouts/GuideLayout.astro
@@ -3,7 +3,8 @@ import TreeNav from '@/components/TreeNav';
 import type { TreeNavNode } from '@/types';
 import RootLayout from './RootLayout.astro';
 
-const currentPath = Astro.url.pathname;
+// Remove trailing slash
+const currentPath = Astro.url.pathname.replace(/\/$/, '');
 
 const rootNode: TreeNavNode = {
   name: 'Guides',

diff --git a/src/layouts/ModuleLayout.astro b/src/layouts/ModuleLayout.astro
@@ -4,7 +4,8 @@ import modules from '@/assets/modules.json';
 import { moduleCategoryToNode } from '@/lib/modules';
 import RootLayout from '@/layouts/RootLayout.astro';
 
-const currentPath = Astro.url.pathname;
+// Remove trailing slash
+const currentPath = Astro.url.pathname.replace(/\/$/, '');
 
 const rootNode = moduleCategoryToNode(modules);
 ---