chore: refactor to check both hasTransition

nuxt · Nov 4, 2022 · ed5ef12 · ed5ef12
1 parent ca5058f
commit ed5ef12
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/nuxt/src/pages/runtime/router.options.ts b/packages/nuxt/src/pages/runtime/router.options.ts
@@ -33,8 +33,8 @@ export default <RouterConfig> {
     }
 
     // Wait for `page:transition:finish` or `page:finish` depending on if transitions are enabled or not
-    const hasTransition = defaultPageTransition || (to.meta.pageTransition && from.meta.pageTransition)
-    const hookToWait = hasTransition ? 'page:transition:finish' : 'page:finish'
+    const hasTransition = (route: RouteLocationNormalized) => !!(route.meta.pageTransition ?? defaultPageTransition)
+    const hookToWait = (hasTransition(from) && hasTransition(to)) ? 'page:transition:finish' : 'page:finish'
     return new Promise((resolve) => {
       nuxtApp.hooks.hookOnce(hookToWait, async () => {
         await nextTick()