Skip to content

Commit b5b0729

Browse files
committed
topcoder-platform#101 green indicator error when switch tab from "more"
1 parent 448cc8d commit b5b0729

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

src/components/TopNav/index.js

+7-9
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const initMenuId = (menu, profileHandle, loggedIn) => {
4646
}))
4747

4848
let cacheMenu = JSON.parse(window.localStorage.getItem('__top_nav_bar_state'))
49-
if (cacheMenu && cacheMenu.date + 16000 > (new Date()).getTime()) {
49+
if (cacheMenu && cacheMenu.date + 32000 > (new Date()).getTime()) {
5050
let menuItem = _.find(menu, (m) => {
5151
return m.id === cacheMenu.id
5252
})
@@ -141,7 +141,7 @@ const TopNav = ({
141141
})
142142
moreMenu[pos] = t
143143
window.localStorage.setItem('__top_nav_bar_state', JSON.stringify(_.assign({}, menu1)))
144-
setMoreMenu(moreMenu)
144+
setMoreMenu([...moreMenu])
145145
setChosenArrowPos(menuId)
146146
}
147147
}
@@ -316,13 +316,7 @@ const TopNav = ({
316316
// let the level 3 menu mounted first for sliding indicator to work
317317
setTimeout(() => {
318318
reArrangeLevel2Menu(activeLevel1Id, menuId)
319-
const menu = findLevel2Menu(activeLevel1Id, menuId)
320-
if (menu && menu.subMenu) {
321-
// this requires the item element to be mounted first
322-
setIconSelectPos(menu.subMenu[0].id)
323-
}
324319
})
325-
!showIconSelect && setTimeout(() => setShowIconSelect(true), 300)
326320
}
327321

328322
const handleClickLeftMenu = () => setShowLeftMenu(x => !x)
@@ -412,7 +406,11 @@ const TopNav = ({
412406
break
413407
}
414408
}
415-
newMoreMenu.length && setMoreMenu(newMoreMenu)
409+
if (newMoreMenu.length) {
410+
setMoreMenu(newMoreMenu)
411+
} else {
412+
window.localStorage.removeItem('__top_nav_bar_state')
413+
}
416414
}
417415
setOverflow(true)
418416
generateMenu()

0 commit comments

Comments
 (0)