Skip to content
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

fix: sidebar groups are not opened when directly navigating to these pages (fix #2564) #2565

Merged
merged 2 commits into from
Feb 18, 2021
Merged

fix: sidebar groups are not opened when directly navigating to these pages (fix #2564) #2565

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
223eda6
Fix sidebar expansion for subheading groups
jlchen-jw Aug 10, 2020
c2436f0
Add variable names to clarify code
jlchen-jw Feb 18, 2021
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
5 changes: 4 additions & 1 deletion packages/@vuepress/theme-default/components/SidebarLinks.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,16 @@ function resolveOpenGroupIndex (route, items) {

function descendantIsActive (route, item) {
if (item.type === 'group') {
return item.children.some(child => {
const childIsActive = item.path && isActive(route, item.path)
const grandChildIsActive = item.children.some(child => {
if (child.type === 'group') {
return descendantIsActive(route, child)
} else {
return child.type === 'page' && isActive(route, child.path)
}
})

return childIsActive || grandChildIsActive
}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the very late review. Thanks for the PR, and the functionality looks good to me.

Only a small suggestion, there're too many conditions without comments and variable names for others to understand. Would you like to try the code below

function descendantIsActive (route, item) {
  if (item.type === 'group') {
    const childIsActive = item.path && isActive(route, item.path)
    const grandChildIsActive = item.children.some(child => {
      if (child.type === 'group') {
        return descendantIsActive(route, child)
      } else {
        return child.type === 'page' && isActive(route, child.path)
      }
    })

    return childIsActive || grandChildIsActive
  }
  return false
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I think that's much clearer. I've implemented your suggestion.

return false
}
Expand Down