Get highlighting to work

gravitational · Jul 17, 2024 · 9f0596b · 9f0596b
1 parent 1c66628
commit 9f0596b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/layouts/DocsPage/Navigation.stories.tsx b/layouts/DocsPage/Navigation.stories.tsx
@@ -21,7 +21,7 @@ export const NavigationFourLevels = () => {
               slug: "/enroll-resources/machine-id/deployment/",
               entries: [
                 {
-                  title: "Deploy Machine ID on AWs",
+                  title: "Deploy Machine ID on AWS",
                   slug: "/enroll-resources/machine-id/deployment/aws/",
                 },
               ],

diff --git a/layouts/DocsPage/Navigation.tsx b/layouts/DocsPage/Navigation.tsx
@@ -35,13 +35,16 @@ const DocsNavigationItems = ({
   const docPath = currentPath.split(SCOPELESS_HREF_REGEX)[0];
   const { getVersionAgnosticRoute } = useVersionAgnosticPages();
 
+  console.log("entries:", entries);
+
   return (
     <>
       {!!entries.length &&
         entries.map((entry) => {
           const selected = entry.slug === docPath;
           const active =
-            selected || entry.entries?.some((entry) => entry.slug === docPath);
+            selected ||
+            entry.entries?.some((entry) => docPath.includes(entry.slug));
 
           return (
             <li key={entry.slug}>
@@ -152,8 +155,11 @@ const DocNavigation = ({
   data,
   section,
   currentVersion,
-  currentPathGetter = { useCurrentHref },
+  currentPathGetter,
 }: DocNavigationProps) => {
+  if (!currentPathGetter) {
+    currentPathGetter = useCurrentHref;
+  }
   const route = currentPathGetter();
 
   const [openedId, setOpenedId] = useState<number>(