Merge pull request #307 from newrelic/jerel/nav-expansion

Fix nav not collapsing for some pages
newrelic · Jun 29, 2020 · 0fc7dd2 · 0fc7dd2
2 parents 6c5eeb7 + 16e1d3a
commit 0fc7dd2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/gatsby/wrap-page-element.js b/gatsby/wrap-page-element.js
@@ -1,3 +1,4 @@
+/* eslint-disable react/prop-types */
 import React from 'react';
 import { BreadcrumbContext } from '../src/components/BreadcrumbContext';
 import { PageContext } from '../src/components/PageContext';

diff --git a/src/components/NavigationItems.module.scss b/src/components/NavigationItems.module.scss
@@ -86,7 +86,7 @@ button.navLink {
 }
 
 .isCurrentPage {
-  font-weight: bold;
+  font-weight: bold !important;
 }
 
 .filterOn {

diff --git a/src/utils/create-breadcrumbs.js b/src/utils/create-breadcrumbs.js
@@ -1,3 +1,5 @@
+const URL_WITH_TRAILING_SLASH = /(.+)\/$/;
+
 /**
  * Create a flat array of breadcrumbs for a given relative url given the
  * site structure (sidenav). Returns an empty array if no match found. NOTE:
@@ -20,7 +22,11 @@ const createBreadcrumbs = (url, links, result = []) => {
   }
 
   // check to see if any of the links at this level match the path
-  const match = links.find((link) => link.url === url);
+  const match = links.find(
+    (link) =>
+      link.url === url ||
+      link.url === url.replace(URL_WITH_TRAILING_SLASH, '$1')
+  );
 
   // if we have a link, return the displayName at the end of the result
   if (match) {