Merge pull request #107 from yoution/issue_101

 #101 fixed bug for "more" tab swapping position

Author: luizrrodrigues

src/components/TopNav/index.js

@@ -43,6 +43,17 @@ const initMenuId = (menu, profileHandle, loggedIn) => {
           : (profileHandle ? `/members/${profileHandle}` : '/')
       }))
     }))
+
+  let cacheMenu = JSON.parse(window.localStorage.getItem('__top_nav_bar_state'))
+  if (cacheMenu && cacheMenu.date + 16000 > (new Date()).getTime()) {
+    let menuItem = _.find(menu, (m) => {
+      return m.id === cacheMenu.id
+    })
+    if (menuItem) {
+      menuItem.subMenu = cacheMenu.subMenu
+    }
+  }
+
   return menu
 }
 
@@ -104,6 +115,27 @@ const TopNav = ({
     return menu1 && menu1.subMenu && menu1.subMenu.find(level2 => level2.id === level2Id)
   }
 
+  // if click level2 menu from 'more', exchange to the first place
+  const reArrangeLevel2Menu = (level1Id, menuId) => {
+    var menu1 = findLevel1Menu(level1Id)
+    if (menu1 && menu1.subMenu) {
+      let subMenu = menu1.subMenu
+      let pos = _.findIndex(subMenu, (level2) => {
+        return level2.id === menuId
+      })
+      let t = subMenu[0]
+      subMenu[0] = subMenu[pos]
+      subMenu[pos] = t
+
+      pos = _.findIndex(moreMenu, (level2) => {
+        return level2.id === menuId
+      })
+      moreMenu[pos] = t
+      window.localStorage.setItem('__top_nav_bar_state', JSON.stringify(_.assign({}, menu1)))
+      setMoreMenu(moreMenu)
+      setChosenArrowPos(menuId)
+    }
+  }
   const activeMenu1 = findLevel1Menu(activeLevel1Id)
   const activeMenu2 = findLevel2Menu(activeLevel1Id, activeLevel2Id)
 
@@ -208,6 +240,11 @@ const TopNav = ({
   const createHandleClickLevel3 = menuId => () => {
     setActiveLevel3Id(menuId)
     setIconSelectPos(menuId)
+
+    let cacheMenu = JSON.parse(window.localStorage.getItem('__top_nav_bar_state'))
+    if (cacheMenu) {
+      window.localStorage.setItem('__top_nav_bar_state', JSON.stringify(_.assign({}, cacheMenu, { date: (new Date().getTime()) })))
+    }
   }
 
   const handleClickMore = () => setOpenMore(x => !x)
@@ -224,9 +261,9 @@ const TopNav = ({
     setActiveLevel2Id(menuId)
     setShowLevel3(true)
     setforceHideLevel3(false)
-    setChosenArrowPos(moreId)
     // let the level 3 menu mounted first for sliding indicator to work
     setTimeout(() => {
+      reArrangeLevel2Menu(activeLevel1Id, menuId)
       const menu = findLevel2Menu(activeLevel1Id, menuId)
       if (menu && menu.subMenu) {
         // this requires the item element to be mounted first