Skip to content

Commit 183dfa8

Browse files
committed
#69 Navigation not working on some links
1 parent f284bd4 commit 183dfa8

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

src/components/TopNav/index.js

+6-8
Original file line numberDiff line numberDiff line change
@@ -223,8 +223,6 @@ const TopNav = ({
223223
setTimeout(() => {
224224
const menu = findLevel2Menu(activeLevel1Id, menuId)
225225
if (menu && menu.subMenu) {
226-
// select first level 3 item
227-
setActiveLevel3Id(menu.subMenu[0].id)
228226
// this requires the item element to be mounted first
229227
setIconSelectPos(menu.subMenu[0].id)
230228
}
@@ -344,7 +342,7 @@ const TopNav = ({
344342
let found = { m1: null, m2: null, m3: null }
345343

346344
// If haven't a path just return
347-
if(!path_) return found
345+
if (!path_) return found
348346

349347
menuWithId_.forEach(level1 => {
350348
if (level1.href && path_.indexOf(level1.href) > -1) found = { m1: level1.id, m2: null }
@@ -357,14 +355,14 @@ const TopNav = ({
357355
} else {
358356
found = { m1: level1.id, m2: level2.id, m3: level3.id }
359357
}
360-
if(!activeLevel3Id && level3.collapsed) setforceHideLevel3(true)
358+
if (!activeLevel3Id && level3.collapsed) setforceHideLevel3(true)
361359
}
362360
})
363361
})
364362
level1.secondaryMenu && level1.secondaryMenu.forEach(level3 => {
365363
if (level3.href) {
366364
// Check if path have parameters
367-
const href = level3.href.indexOf("?") > -1 ? level3.href.split("?")[0] : level3.href;
365+
const href = level3.href.indexOf('?') > -1 ? level3.href.split('?')[0] : level3.href
368366
if (path_.indexOf(href) > -1) found = { m1: level1.id, m3: level3.id }
369367
}
370368
})
@@ -390,13 +388,13 @@ const TopNav = ({
390388
forceExpand = true
391389
forceM2 = getMenuIdsFromPath(menuWithId, '/challenges').m2
392390
}
393-
} else if (path.indexOf('/my-dashboard') > -1 || path.indexOf('/members/'+profileHandle) > -1) {
391+
} else if (path.indexOf('/my-dashboard') > -1 || path.indexOf('/members/' + profileHandle) > -1) {
394392
// If My Dashboard and My Profile page
395393
setShowLevel3(true)
396394
} else if (path.indexOf('/community/learn') > -1 || path.indexOf('/thrive/tracks') > -1) {
397395
// Show 3rd level menu to Community [ Overview - How It Works ]
398-
forceM2 = getMenuIdsFromPath(menuWithId, '/community').m2;
399-
} else if(!m2) {
396+
forceM2 = getMenuIdsFromPath(menuWithId, '/community').m2
397+
} else if (!m2) {
400398
setShowLevel3(false)
401399
setforceHideLevel3(true)
402400
}

0 commit comments

Comments
 (0)