refactor: move onBeforePageLoad inside loadPage

vuejs · Jul 2, 2023 · a3df617 · a3df617
1 parent 665f3b0
commit a3df617
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/client/app/router.ts b/src/client/app/router.ts
@@ -79,14 +79,14 @@ export function createRouter(
       history.replaceState({ scrollPosition: window.scrollY }, document.title)
       history.pushState(null, '', href)
     }
-    if ((await router.onBeforePageLoad?.(href)) === false) return
     await loadPage(href)
     await router.onAfterRouteChanged?.(href)
   }
 
   let latestPendingPath: string | null = null
 
   async function loadPage(href: string, scrollPosition = 0, isRetry = false) {
+    if ((await router.onBeforePageLoad?.(href)) === false) return
     const targetLoc = new URL(href, fakeHost)
     const pendingPath = (latestPendingPath = targetLoc.pathname)
     try {