refactor: move onBeforePageLoad inside loadPage

brc-dd · brc-dd · commit a3df6171abff · 2023-07-02T14:33:27.000+05:30
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 {

Original file line number	Diff line number	Diff line change
`@@ -79,14 +79,14 @@ export function createRouter(`
`79`	`79`	`history.replaceState({ scrollPosition: window.scrollY }, document.title)`
`80`	`80`	`history.pushState(null, '', href)`
`81`	`81`	`}`
`82`		`- if ((await router.onBeforePageLoad?.(href)) === false) return`
`83`	`82`	`await loadPage(href)`
`84`	`83`	`await router.onAfterRouteChanged?.(href)`
`85`	`84`	`}`
`86`	`85`
`87`	`86`	`let latestPendingPath: string \| null = null`
`88`	`87`
`89`	`88`	`async function loadPage(href: string, scrollPosition = 0, isRetry = false) {`
	`89`	`+ if ((await router.onBeforePageLoad?.(href)) === false) return`
`90`	`90`	`const targetLoc = new URL(href, fakeHost)`
`91`	`91`	`const pendingPath = (latestPendingPath = targetLoc.pathname)`
`92`	`92`	`try {`