fix(theme): show progress bar after delay (#1278)

vuejs · Sep 3, 2022 · 496bd34 · 496bd34
1 parent ee37eaa
commit 496bd34
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/client/theme-default/index.ts b/src/client/theme-default/index.ts
@@ -28,11 +28,24 @@ const theme: Theme = {
   NotFound,
   enhanceApp: ({ router }) => {
     if (inBrowser) {
+      let timeoutId: NodeJS.Timeout
+      let called = false
+
       router.onBeforeRouteChange = () => {
-        nprogress.start()
+        timeoutId = setTimeout(() => {
+          nprogress.start()
+          called = true
+        }, 500)
       }
+
       router.onAfterRouteChanged = () => {
-        nprogress.done(true)
+        if (timeoutId) {
+          clearTimeout(timeoutId)
+        }
+        if (called) {
+          nprogress.done(true)
+          called = false
+        }
       }
     }
   }

diff --git a/src/client/theme-default/support/utils.ts b/src/client/theme-default/support/utils.ts
@@ -13,12 +13,12 @@ export function isExternal(path: string): boolean {
 }
 
 export function throttleAndDebounce(fn: () => void, delay: number): () => void {
-  let timeout: any
+  let timeoutId: NodeJS.Timeout
   let called = false
 
   return () => {
-    if (timeout) {
-      clearTimeout(timeout)
+    if (timeoutId) {
+      clearTimeout(timeoutId)
     }
 
     if (!called) {
@@ -28,7 +28,7 @@ export function throttleAndDebounce(fn: () => void, delay: number): () => void {
         called = false
       }, delay)
     } else {
-      timeout = setTimeout(fn, delay)
+      timeoutId = setTimeout(fn, delay)
     }
   }
 }