ami/tl-vikunja
1
0
Fork 0
Code Activity

feat: use ref for filters

Browse Source
This commit is contained in:
Dominik Pschenitschni
2022-10-19 16:48:26 +02:00
committed by kolaente
parent acb3ddc73f
commit 51dc123d89
4 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/composables/useRouteFilter.ts
View File

@ -1,4 +1,4 @@
import {reactive, watch, type Ref} from 'vue'
import {computed, ref, watch, type Ref} from 'vue'
import {useRouter, type RouteLocationNormalized, type RouteLocationRaw} from 'vue-router'
import cloneDeep from 'lodash.clonedeep'
@ -11,26 +11,26 @@ export function useRouteFilter<F extends Filter = Filter>(
) {
const router = useRouter()
const filters: F = reactive(routeToFilter(route.value))
const filters = ref<F>(routeToFilter(route.value))
const routeFromFiltersFullPath = computed(() => router.resolve(filterToRoute(filters.value)).fullPath)
watch(() => cloneDeep(route.value), (route, oldRoute) => {
if (route.name !== oldRoute.name) {
return
}
const filterFullPath = router.resolve(filterToRoute(filters)).fullPath
if (filterFullPath === route.fullPath) {
if (
route.name !== oldRoute.name ||
routeFromFiltersFullPath.value === route.fullPath
) {
return
}
Object.assign(filters, routeToFilter(route))
filters.value = routeToFilter(route)
})
watch(
filters,
async () => {
const newRouteFullPath = router.resolve(filterToRoute(filters)).fullPath
if (newRouteFullPath !== route.value.fullPath) {
await router.push(newRouteFullPath)
if (routeFromFiltersFullPath.value !== route.value.fullPath) {
await router.push(routeFromFiltersFullPath.value)
}
},
// only apply new route after all filters have changed in component cycle