Skip to content

Commit 45b33ba

Browse files
author
vikasrohit
committed
AS#109666937826878, Add logic for selected menu item in MenuBar
-- Added support for regex -- Added support for reading selected state via property
1 parent eeab780 commit 45b33ba

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

components/MenuBar/MenuBar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default class MenuBar extends Component {
3030
const itemClass = classNames({
3131
[orientation]: true,
3232
mobile: this.state.mobile,
33-
selected: window.location.href.indexOf(item.link) !== -1
33+
selected: item.selected || (item.regex && window.location.href.match(item.regex) !== null)
3434
})
3535

3636
const linkTarget = item.target || '_self'

components/MenuBar/MenuBarExamples.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require('./MenuBarExamples.scss')
66
const primaryNavigationItems = [
77
{img: '../components/MenuBar/nav-community.svg', text: 'Community', link: '/community'},
88
{img: '../components/MenuBar/nav-compete.svg', text: 'Compete', link: '/compete', selected: true},
9-
{img: '../components/MenuBar/nav-learn.svg', text: 'Learn', link: '/MenuBarExamples'}
9+
{img: '../components/MenuBar/nav-learn.svg', text: 'Learn', link: '/MenuBarExamples', regex: '/MenuBar*'}
1010
]
1111

1212
const MenuBarExample = () => (

components/Navbar/Navbar.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import HamburgerIcon from '../Icons/HamburgerIcon'
1111
import MagnifyGlassIcon from '../Icons/MagnifyGlassIcon'
1212

1313
const primaryNavigationItems = [
14-
{img: require('./nav-community.svg'), text: 'Community', link: '/community'},
15-
{img: require('./nav-compete.svg'), text: 'Compete', link: '/compete', selected: true},
16-
{img: require('./nav-learn.svg'), text: 'Learn', link: '/learn'}
14+
{img: require('./nav-community.svg'), text: 'Community', link: '/community', regex: "/community?\?"},
15+
{img: require('./nav-compete.svg'), text: 'Compete', link: '/compete', regex: "/compete?\?"},
16+
{img: require('./nav-learn.svg'), text: 'Learn', link: '/learn', regex: "/learn?\?"}
1717
]
1818

1919
// properties: username, userImage, domain, mobileMenuUrl, mobileSearchUrl, searchSuggestionsFunc

0 commit comments

Comments
 (0)