Skip to content
Open
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
20 changes: 16 additions & 4 deletions src/composables/guards.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getCurrentInstance, onUnmounted } from 'vue'
import { getCurrentInstance, onUnmounted, onActivated, onDeactivated } from 'vue'
import { throwNoCurrentInstance } from './utils'
import { useRouter } from './globals'

Expand Down Expand Up @@ -56,11 +56,23 @@ function useFilteredGuard (guard, fn) {
: null

if (depth != null) {
const removeGuard = router.beforeEach((to, from, next) => {
return fn(to, from, depth) ? guard(to, from, next) : next()
})
const registerGuard = () => {
return router.beforeEach((to, from, next) => {
return fn(to, from, depth) ? guard(to, from, next) : next()
})
}

let removeGuard = registerGuard()
onUnmounted(removeGuard)

onActivated(() => {
removeGuard = removeGuard || registerGuard()
})
onDeactivated(() => {
removeGuard()
removeGuard = null // reset removeGuard
})

return removeGuard
}

Expand Down