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

[full-ci] Vue3: Update vue-router #8215

Merged
merged 18 commits into from
Jan 17, 2023
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Simplify navItem activity detection
  • Loading branch information
dschmidt committed Jan 14, 2023
commit 93ed05cb26ca1f997e49297bda6d445ec91c380f
8 changes: 3 additions & 5 deletions packages/web-runtime/src/layouts/Application.vue
Original file line number Diff line number Diff line change
@@ -129,18 +129,16 @@ export default defineComponent({
return items.map((item) => {
const active = [item.route, ...(item.activeFor || [])]
.filter(Boolean)
.reduce((result, currentItem) => {
if (result) {
return true
}
.some((currentItem) => {
try {
const comparativeHref = this.$router.resolve(currentItem).href
return currentHref.startsWith(comparativeHref)
} catch (e) {
console.error(e)
return false
}
}, false)
})

const name = typeof item.name === 'function' ? item.name(this.capabilities) : item.name

return {