Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
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
24 changes: 23 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,8 @@
"composition",
"vuex",
"vue-router"
]
],
"dependencies": {
"@vueuse/core": "^7.1.2"
}
}
37 changes: 12 additions & 25 deletions src/vue-router.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Vue from 'vue'
import { computed, ComputedRef, getCurrentInstance, reactive, shallowRef } from '@vue/composition-api'
import { computed, getCurrentInstance } from '@vue/composition-api'
import VueRouter, { NavigationGuard, Route, RouterOptions } from 'vue-router'
import { toReactive } from '@vueuse/core';
import { OUT_OF_SCOPE, warn } from './utils'


Expand Down Expand Up @@ -56,32 +57,18 @@ export function useRouter(): Router {
}


let currentRoute: RouteLocationNormalizedLoaded

export function useRoute() {
const router = useRouter()
if (!currentRoute) {
const routeRef = shallowRef({
path: '/',
name: undefined,
params: {},
query: {},
hash: '',
fullPath: '/',
matched: [],
meta: {},
redirectedFrom: undefined,
} as Route);
const computedRoute = {} as {
[key in keyof Route]: ComputedRef<Route[key]>
}
for (const key of Object.keys(routeRef.value) as (keyof Route)[]) {
computedRoute[key] = computed<any>(() => routeRef.value[key])
}
router.afterEach(to => routeRef.value = to)
currentRoute = reactive(computedRoute)
const inst = getCurrentInstance()

if (inst) {
return toReactive(
computed(() => inst.proxy.$route),
);
}
return currentRoute

warn(OUT_OF_SCOPE)

return undefined as any
}


Expand Down