-
-
Notifications
You must be signed in to change notification settings - Fork 230
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
perf: pause patching while navigating
This also fixes some data changes that happened hile navigating like: * When using search and clicking on an item, the "No results available" message would appear * When navigating to a liibrary, the transparency effects of the navdrawer or appbar would match those of the entering route. Signed-off-by: Fernando Fernández <[email protected]>
- Loading branch information
Showing
8 changed files
with
155 additions
and
82 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,103 @@ | ||
| <template> | ||
| <div | ||
| class="j-transition uno-h-full"> | ||
| <component | ||
| :is="comp"> | ||
| <slot /> | ||
| </component> | ||
| </div> | ||
| <JTransition | ||
| :name="route.meta.layout.transition.enter ?? defaultTransition" | ||
| :mode="defaultTransitionMode ?? route.meta.layout.transition.mode" | ||
| skip-pausing> | ||
| <Suspense | ||
| :suspensible="!root" | ||
| @pending="resolved = false" | ||
| @resolve=" resolved = true"> | ||
| <div | ||
| :key="root ? route.meta.layout.name ?? 'default' : route.name" | ||
| class="j-transition uno-h-full"> | ||
| <Component | ||
| :is="root ? getLayoutComponent(route.meta.layout.name) : comp"> | ||
| <JView | ||
| v-if="root" | ||
| v-bind="$props" /> | ||
| <slot v-else /> | ||
| </Component> | ||
| </div> | ||
| <template | ||
| v-if="!apploaded && root" | ||
| #fallback> | ||
| <JSplashscreen /> | ||
| </template> | ||
| </Suspense> | ||
| </JTransition> | ||
| </template> | ||
| <script setup lang="ts"> | ||
| <!-- TODO: Remove j-transition classes from this file once https://github.com/vuejs/core/issues/5148#issuecomment-2041118368 is fixed --> | ||
| <script lang="ts"> | ||
| import { onErrorCaptured, shallowRef, type Component, watch, computed, provide, useId, ref, type WatchOptions, inject } from 'vue'; | ||
| import type { RouteLocationNormalizedGeneric, RouteMeta } from 'vue-router'; | ||
| import DefaultLayout from '@/layouts/default.vue'; | ||
| import FullPageLayout from '@/layouts/fullpage.vue'; | ||
| import ServerLayout from '@/layouts/server.vue'; | ||
| import { usePausableEffect } from '@/composables/use-pausable-effect'; | ||
| import { JView_isRouting } from '@/store/keys'; | ||
| import { router } from '@/plugins/router'; | ||
| import { isNil } from '@/utils/validation'; | ||
| /** | ||
| * TODO: Remove j-transition classes from this file once https://github.com/vuejs/core/issues/5148 is fixed | ||
| * Return the appropiate layout component according to the route's meta.layout property | ||
| */ | ||
| import type { Component } from 'vue'; | ||
| function getLayoutComponent(layout: RouteMeta['layout']['name']): Component { | ||
| switch (layout) { | ||
| case 'fullpage': { | ||
| return FullPageLayout as Component; | ||
| } | ||
| case 'server': { | ||
| return ServerLayout as Component; | ||
| } | ||
| default: { | ||
| return DefaultLayout; | ||
| } | ||
| } | ||
| } | ||
| const defaultTransition = 'slide-x-reverse'; | ||
| const defaultTransitionMode = 'out-in'; | ||
| const watchOps = { flush: 'sync' } satisfies WatchOptions; | ||
| const apploaded = shallowRef(false); | ||
| const isRouting = shallowRef(false); | ||
| const _resolveStatus = ref<Record<string, boolean>>({}); | ||
| const allResolved = computed(() => Object.values(_resolveStatus.value).every(Boolean)); | ||
| const mustBePaused = computed(() => !allResolved.value || isRouting.value); | ||
| watch(() => router.currentRoute.value.name, () => isRouting.value = true, watchOps); | ||
| watch(allResolved, () => isRouting.value = false, watchOps); | ||
| </script> | ||
| const { comp } = defineProps<{ | ||
| <script setup lang="ts"> | ||
| const { comp, route } = defineProps<{ | ||
| comp: Component; | ||
| route: RouteLocationNormalizedGeneric; | ||
| }>(); | ||
| const id = useId(); | ||
| const root = isNil(inject(JView_isRouting)); | ||
| const resolved = computed({ | ||
| get() { | ||
| return _resolveStatus.value[id] ?? false; | ||
| }, | ||
| set(newVal) { | ||
| _resolveStatus.value[id] = newVal; | ||
| if (root && newVal) { | ||
| apploaded.value = true; | ||
| } | ||
| } | ||
| }); | ||
| if (root) { | ||
| provide(JView_isRouting, mustBePaused); | ||
| usePausableEffect(mustBePaused); | ||
| onErrorCaptured(() => { | ||
| resolved.value = true; | ||
| isRouting.value = false; | ||
| }); | ||
| } | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| /** | ||
| * This file contains all the symbols used with provide/inject API: | ||
| * https://vuejs.org/guide/components/provide-inject.html#working-with-symbol-keys | ||
| */ | ||
| import type { ComputedRef, InjectionKey } from 'vue'; | ||
|
|
||
| export const JView_isRouting = Symbol('JView:isRouting') as InjectionKey<ComputedRef<boolean>>; |