Skip to content

#2521 fixed bug for "more" tab swapping position #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

#2521 fixed bug for "more" tab swapping position #83

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions src/components/TopNav/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,26 @@ 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
setMoreMenu(moreMenu)
setChosenArrowPos(menuId)
}
}
const activeMenu1 = findLevel1Menu(activeLevel1Id)
const activeMenu2 = findLevel2Menu(activeLevel1Id, activeLevel2Id)

Expand Down Expand Up @@ -218,9 +238,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) {
// select first level 3 item
Expand Down Expand Up @@ -344,7 +364,7 @@ const TopNav = ({
let found = { m1: null, m2: null, m3: null }

// If haven't a path just return
if(!path_) return found
if (!path_) return found

menuWithId_.forEach(level1 => {
if (level1.href && path_.indexOf(level1.href) > -1) found = { m1: level1.id, m2: null }
Expand All @@ -357,14 +377,14 @@ const TopNav = ({
} else {
found = { m1: level1.id, m2: level2.id, m3: level3.id }
}
if(!activeLevel3Id && level3.collapsed) setforceHideLevel3(true)
if (!activeLevel3Id && level3.collapsed) setforceHideLevel3(true)
}
})
})
level1.secondaryMenu && level1.secondaryMenu.forEach(level3 => {
if (level3.href) {
// Check if path have parameters
const href = level3.href.indexOf("?") > -1 ? level3.href.split("?")[0] : level3.href;
const href = level3.href.indexOf('?') > -1 ? level3.href.split('?')[0] : level3.href
if (path_.indexOf(href) > -1) found = { m1: level1.id, m3: level3.id }
}
})
Expand All @@ -390,13 +410,13 @@ const TopNav = ({
forceExpand = true
forceM2 = getMenuIdsFromPath(menuWithId, '/challenges').m2
}
} else if (path.indexOf('/my-dashboard') > -1 || path.indexOf('/members/'+profileHandle) > -1) {
} else if (path.indexOf('/my-dashboard') > -1 || path.indexOf('/members/' + profileHandle) > -1) {
// If My Dashboard and My Profile page
setShowLevel3(true)
} else if (path.indexOf('/community/learn') > -1 || path.indexOf('/thrive/tracks') > -1) {
// Show 3rd level menu to Community [ Overview - How It Works ]
forceM2 = getMenuIdsFromPath(menuWithId, '/community').m2;
} else if(!m2) {
forceM2 = getMenuIdsFromPath(menuWithId, '/community').m2
} else if (!m2) {
setShowLevel3(false)
setforceHideLevel3(true)
}
Expand Down