Bug iseec 3967 revert (#70)

* Revert "fix: ssr for header" This reverts commit 0b88bc9. * chore: finish revert
boomerang-io · Jul 7, 2022 · b71a0a5 · b71a0a5
1 parent 0b88bc9
commit b71a0a5
Show file tree

Hide file tree

Showing 4 changed files with 212 additions and 234 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@boomerang-io/carbon-addons-boomerang-react",
   "description": "Carbon Addons for Boomerang apps",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "author": {
     "name": "Tim Bula",
     "email": "timrbula@gmail.com"

diff --git a/src/components/Header/Header.js b/src/components/Header/Header.js
@@ -13,7 +13,6 @@ import {
 import { settings } from 'carbon-components';
 import FocusTrap from 'focus-trap-react';
 import { SkipToContent } from 'carbon-components-react';
-import window from 'window-or-global';
 import PlatformNotificationsContainer from '../PlatformNotifications';
 import HeaderMenu from '../HeaderMenu';
 import NotificationsContainer from '../Notifications/NotificationsContainer';
@@ -308,16 +307,13 @@ class Header extends React.Component {
             <nav aria-label="Main navigation menu">
               <HeaderList className={`${prefix}--bmrg-header-list--link`}>
                 {Array.isArray(navLinks) &&
-                  navLinks.map((link, i) => {
-                    const isCurrentNavLink = window.location?.href?.startsWith(link.url);
-                    return (
-                      <li key={`${link.url}-${i}`}>
-                        <HeaderListItem aria-label={`link for ${link.name}`} href={link.url} isCurrentNavLink={isCurrentNavLink}>
-                          {link.name}
-                        </HeaderListItem>
-                      </li>
-                    )
-                  })}
+                  navLinks.map((link, i) => (
+                    <li key={`${link.url}-${i}`}>
+                      <HeaderListItem aria-label={`link for ${link.name}`} href={link.url}>
+                        {link.name}
+                      </HeaderListItem>
+                    </li>
+                  ))}
               </HeaderList>
             </nav>
             <div ref={this.mobileNavRef}>

diff --git a/src/components/Header/HeaderListItem.js b/src/components/Header/HeaderListItem.js
@@ -1,14 +1,13 @@
-import React from 'react';
 import PropTypes from 'prop-types';
-import { Link } from 'react-router-dom';
+import React from 'react';
 import cx from 'classnames';
 import { settings } from 'carbon-components';
 import window from 'window-or-global';
 
 const { prefix } = settings;
 
 const HeaderListItem = (props) => {
-  const { children, className, href, isIcon, ariaExpanded, newNotifications, id, isCurrentNavLink, ...other } = props;
+  const { children, className, href, isIcon, ariaExpanded, newNotifications, id, ...other } = props;
 
   const headerListItemClasses = cx(`${prefix}--bmrg-header-list__item`, className);
 
@@ -25,14 +24,6 @@ const HeaderListItem = (props) => {
         >
           {children}
         </div>
-      ) : isCurrentNavLink ? (
-        <Link
-          className={cx(`${prefix}--bmrg-header-list__link`, '--is-active')}
-          to="/"
-          tabIndex="0"
-        >
-          {children}
-        </Link>
       ) : (
         <a
           className={cx(`${prefix}--bmrg-header-list__link`, {
@@ -59,7 +50,6 @@ HeaderListItem.propTypes = {
   className: PropTypes.string,
   href: PropTypes.string,
   id: PropTypes.string,
-  isCurrentNavLink: PropTypes.bool,
   isIcon: PropTypes.bool,
   newNotifications: PropTypes.bool,
 };