diff --git a/common/app/Nav/LargeNav.jsx b/common/app/Nav/LargeNav.jsx index ef305f9cfe..d0925bc37d 100644 --- a/common/app/Nav/LargeNav.jsx +++ b/common/app/Nav/LargeNav.jsx @@ -13,13 +13,13 @@ function LargeNav({ clickOnLogo, clickOnMap, shouldShowMapButton, panes }) { render={ () => ( - + - + diff --git a/common/app/Nav/Nav.jsx b/common/app/Nav/Nav.jsx index 9fd70567ca..aaddb015fa 100644 --- a/common/app/Nav/Nav.jsx +++ b/common/app/Nav/Nav.jsx @@ -11,17 +11,19 @@ import { clickOnLogo, clickOnMap } from './redux'; -import { panesSelector } from '../Panes/redux'; +import { panesSelector, panesByNameSelector } from '../Panes/redux'; import propTypes from './navPropTypes'; const mapStateToProps = createSelector( panesSelector, - panes => { + panesByNameSelector, + (panes, panesByName) => { return { panes: panes.map(({ name, type }) => { return { content: name, - action: type + action: type, + isHidden: panesByName[name].isHidden }; }, {}), shouldShowMapButton: panes.length === 0 diff --git a/common/app/Nav/components/Bin-Button.jsx b/common/app/Nav/components/Bin-Button.jsx index d0ec1f35f5..3be178145a 100644 --- a/common/app/Nav/components/Bin-Button.jsx +++ b/common/app/Nav/components/Bin-Button.jsx @@ -4,13 +4,14 @@ import { Button } from 'react-bootstrap'; const propTypes = { content: PropTypes.string, + disabled: PropTypes.bool, handleClick: PropTypes.func.isRequired }; -export default function BinButton({ content, handleClick }) { +export default function BinButton({ content, handleClick, disabled }) { return (