diff --git a/client/src/components/Header.js b/client/src/components/Header.js index 36acf24766..db68cf480d 100644 --- a/client/src/components/Header.js +++ b/client/src/components/Header.js @@ -26,7 +26,7 @@ const Header = ({ minimalHeader, onHomeClick, toggleMenuAction }) => ( ) : ( diff --git a/client/src/components/Nav.js b/client/src/components/Nav.js index ee581578db..4eae3adbbd 100644 --- a/client/src/components/Nav.js +++ b/client/src/components/Nav.js @@ -1,4 +1,3 @@ -import { Collapse } from "@blueprintjs/core" import { clearSearchQuery, resetPages } from "actions" import AppContext from "components/AppContext" import ResponsiveLayoutContext from "components/ResponsiveLayoutContext" @@ -7,7 +6,7 @@ import { INSIGHTS, INSIGHT_DETAILS } from "pages/insights/Show" import pluralize from "pluralize" import PropTypes from "prop-types" import React, { useContext, useEffect, useMemo, useState } from "react" -import { Badge, Nav, NavDropdown } from "react-bootstrap" +import { Badge, Collapse, Nav, NavDropdown } from "react-bootstrap" import { connect } from "react-redux" import { IndexLinkContainer as Link, @@ -20,7 +19,7 @@ import Settings from "settings" import utils from "utils" export const AnchorNavItem = ({ to, disabled, children }) => { - const ScrollLinkNavItem = ScrollLink(Nav.Item) + const ScrollLinkNavItem = ScrollLink(Nav.Link) return ( {context => ( @@ -58,22 +57,25 @@ const SidebarLink = ({ id, setIsMenuLinksOpened }) => ( - { handleOnClick() setIsMenuLinksOpened && setIsMenuLinksOpened() }} > - {children} - + + + {children} + + + ) SidebarLink.propTypes = { linkTo: PropTypes.oneOfType([PropTypes.object, PropTypes.string]), children: PropTypes.node, handleOnClick: PropTypes.func, setIsMenuLinksOpened: PropTypes.func, - id: PropTypes.string + id: PropTypes.string.isRequired } const Navigation = ({ @@ -125,6 +127,7 @@ const Navigation = ({ return (