Skip to content

Fix navigation active issues #349

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

Open
wants to merge 1 commit into
base: 2023-main
Choose a base branch
from
Open

Fix navigation active issues #349

Show file tree
Hide file tree
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
29 changes: 13 additions & 16 deletions src/components/About/Nav/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@ const AboutNav = ({ items, aboutPath }) => (
...item,
className: 'about-content-nav-item',
activeLinkClassName: 'about-content-nav-item-is-active',
isActiveHandler: () => {
return (
item.href === getLocationPathname() ||
(getLocationPathname() === aboutPath &&
item.href === '/about/topic-tables')
)
},
isActiveHandler: () =>
item.href === getLocationPathname() ||
(getLocationPathname() === aboutPath &&
item.href === '/about/topic-tables/'),
}))}
/>
</div>
Expand All @@ -26,34 +23,34 @@ AboutNav.defaultProps = {
items: [
{
text: 'Topic Tables',
href: '/about/topic-tables',
href: '/about/topic-tables/',
},
{
// text: 'Ask React Team',
// href: '/about/ask-react-team'
// href: '/about/ask-react-team/'
// }, {
// text: 'Unconference',
// href: '/about/unconference'
// href: '/about/unconference/'
// }, {
text: 'Venue and Hotel',
href: '/about/venue-and-hotel',
href: '/about/venue-and-hotel/',
},
{
text: 'Jobs',
href: '/about/jobs',
href: '/about/jobs/',
// }, {
// text: 'City Guide',
// href: '/about/city-guide'
// href: '/about/city-guide/'
// }, {
// text: 'Diversity & Safety',
// href: '/about#diversity-and-safety'
// href: '/about#diversity-and-safety/'
},
{
text: 'FAQ',
href: '/about/faq',
href: '/about/faq/',
},
],
aboutPath: '/about',
aboutPath: '/about/',
}

export default AboutNav
4 changes: 2 additions & 2 deletions src/components/LeftNav/menu-items.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ const menuItems = [
},
{
name: 'About',
page: '/about',
page: '/about/',
},
{
name: 'Speakers',
page: '/speakers',
},
{
name: 'Schedule',
page: '/schedule/day-1',
page: '/schedule/',
},
{
name: 'Workshops',
Expand Down
13 changes: 7 additions & 6 deletions src/components/Schedule/Nav/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ const ScheduleNav = ({ items }) => (
...item,
className: 'schedule-content-nav-item',
activeLinkClassName: 'schedule-content-nav-item-is-active',
isActiveHandler: () => {
return item.href === `${getLocationPathname()}${getLocationHash()}`
},
isActiveHandler: () =>
(item.id === 'day1' &&
`${getLocationPathname()}${getLocationHash()}` === '/schedule/') ||
item.href === `${getLocationPathname()}${getLocationHash()}`,
}))}
showDivider={true}
dividerClassName="schedule-content-nav-divider"
Expand All @@ -25,17 +26,17 @@ ScheduleNav.defaultProps = {
{
id: 'day1',
text: 'May 2',
href: '/schedule/day-1',
href: '/schedule/day-1/',
},
{
id: 'day2',
text: 'May 3',
href: '/schedule/day-2',
href: '/schedule/day-2/',
},
// {
// id: 'day3',
// text: 'May 4',
// href: '/schedule/day-3',
// href: '/schedule/day-3/',
// },
],
}
Expand Down
2 changes: 1 addition & 1 deletion src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export const NATIVE_BREAKPOINT = '480' // 480px
export const WIDE_BREAKPOINT = '799' // 799px;
export const ROUTES = {
home: '/',
about: '/about',
about: '/about/',
speakers: '/speakers',
workshops: '/workshops',
schedule: '/schedule/day-1',
Expand Down