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.

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

Conversation

echojoshchen
Copy link
Contributor

Summary

What kind of change does this PR introduce? (check at least one)

  • Bugfix
  • Feature
  • Code style update
  • Refactor
  • Docs
  • Build-related changes
  • Other, please describe:

If changing the UI of default theme, please provide the before/after screenshot:

Does this PR introduce a breaking change? (check one)

  • Yes
  • No

If yes, please describe the impact and migration path for existing applications:

The PR fulfills these requirements:

  • When resolving a specific issue, it's referenced in the PR's title (e.g. fix #xxx[,#xxx], where "xxx" is the issue number)

You have tested in the following browsers: (Providing a detailed version will be better.)

  • Chrome
  • Firefox
  • Safari
  • Edge
  • IE

If adding a new feature, the PR's description includes:

  • A convincing reason for adding this feature
  • Related documents have been updated
  • Related tests have been updated

To avoid wasting your time, it's best to open a feature request issue first and wait for approval before working on it.

Other information:

@echojoshchen echojoshchen changed the title #2564 Fix sidebar expansion for subheading groups Bug #2564 Fix sidebar expansion for subheading groups Aug 10, 2020
@echojoshchen echojoshchen changed the title Bug #2564 Fix sidebar expansion for subheading groups Fix: #2564 Fix sidebar expansion for subheading groups Aug 10, 2020
@echojoshchen
Copy link
Contributor Author

#2564

@echojoshchen echojoshchen changed the title Fix: #2564 Fix sidebar expansion for subheading groups fix: #2564 Fix sidebar expansion for subheading groups Aug 10, 2020
@billyyyyy3320 billyyyyy3320 self-requested a review October 15, 2020 17:07
@echojoshchen
Copy link
Contributor Author

@billyyyyy3320 Thanks for taking a look at this PR! Is there anything blocking this from being merged?

@echojoshchen
Copy link
Contributor Author

@billyyyyy3320 Could this PR be merged soon? It would help a lot for nested pages

@@ -96,7 +96,7 @@ function descendantIsActive (route, item) {
} else {
return child.type === 'page' && isActive(route, child.path)
}
})
}) || item.path && isActive(route, item.path)
}
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.

@billyyyyy3320 billyyyyy3320 changed the title fix: #2564 Fix sidebar expansion for subheading groups fix: sidebar groups are not opened when directly navigating to these pages (fix #2564) Feb 15, 2021
Copy link
Collaborator

@billyyyyy3320 billyyyyy3320 left a comment

Choose a reason for hiding this comment

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

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants