From 9b608142926585b88f9e2caa6910a51272b9acc6 Mon Sep 17 00:00:00 2001 From: Sosuke Suzuki Date: Tue, 10 Oct 2017 00:02:42 +0900 Subject: [PATCH] fix bug : isTrashedActive and isStarredActive are inverted --- browser/main/SideNav/index.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/browser/main/SideNav/index.js b/browser/main/SideNav/index.js index 370d05b1..05f668e4 100644 --- a/browser/main/SideNav/index.js +++ b/browser/main/SideNav/index.js @@ -51,8 +51,13 @@ class SideNav extends React.Component { router.push('/alltags') } - SideNavComponent (isFolded, isHomeActive, isStarredActive, isTrashedActive, storageList) { + SideNavComponent (isFolded, storageList) { let { location, data } = this.props + + const isHomeActive = !!location.pathname.match(/^\/home$/) + const isStarredActive = !!location.pathname.match(/^\/starred$/) + const isTrashedActive = !!location.pathname.match(/^\/trashed$/) + let component // TagsMode is not selected @@ -114,9 +119,6 @@ class SideNav extends React.Component { let { data, location, config, dispatch } = this.props let isFolded = config.isSideNavFolded - let isHomeActive = !!location.pathname.match(/^\/home$/) - let isStarredActive = !!location.pathname.match(/^\/starred$/) - let isTrashedActive = !!location.pathname.match(/^\/trashed$/) let storageList = data.storageMap.map((storage, key) => { return - {this.SideNavComponent(isFolded, isHomeActive, isTrashedActive, isStarredActive, storageList)} + {this.SideNavComponent(isFolded, storageList)} ) }