From d5cf7080417deacdc17dbd62eb12b532fb8be45e Mon Sep 17 00:00:00 2001 From: Peter Buglavecz Date: Sun, 15 Sep 2024 16:45:03 +0200 Subject: [PATCH] fix(nuxt): hook called twice during navigation --- packages/nuxt/src/pages/runtime/page.ts | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/packages/nuxt/src/pages/runtime/page.ts b/packages/nuxt/src/pages/runtime/page.ts index 5ba304cd23..f9284173a2 100644 --- a/packages/nuxt/src/pages/runtime/page.ts +++ b/packages/nuxt/src/pages/runtime/page.ts @@ -41,7 +41,6 @@ export default defineComponent({ const nuxtApp = useNuxtApp() const pageRef = ref() const forkRoute = inject(PageRouteSymbol, null) - let previousPageKey: string | undefined | false expose({ pageRef }) @@ -97,10 +96,6 @@ export default defineComponent({ } const key = generateRouteKey(routeProps, props.pageKey) - if (!nuxtApp.isHydrating && !hasChildrenRoutes(forkRoute, routeProps.route, routeProps.Component) && previousPageKey === key) { - nuxtApp.callHook('page:loading:end') - } - previousPageKey = key const hasTransition = !!(props.transition ?? routeProps.route.meta.pageTransition ?? defaultPageTransition) const transitionProps = hasTransition && _mergeTransitionProps([ @@ -161,10 +156,3 @@ function haveParentRoutesRendered (fork: RouteLocationNormalizedLoaded | null, n (c, i) => c.components?.default !== fork.matched[i]?.components?.default) || (Component && generateRouteKey({ route: newRoute, Component }) !== generateRouteKey({ route: fork, Component })) } - -function hasChildrenRoutes (fork: RouteLocationNormalizedLoaded | null, newRoute: RouteLocationNormalizedLoaded, Component?: VNode) { - if (!fork) { return false } - - const index = newRoute.matched.findIndex(m => m.components?.default === Component?.type) - return index < newRoute.matched.length - 1 -}