scroll when clicking same link

vuejs · Jan 22, 2025 · dd729b4 · dd729b4
1 parent 791f937
commit dd729b4
Showing 1 changed file with 24 additions and 21 deletions.
diff --git a/src/client/app/router.ts b/src/client/app/router.ts
@@ -19,7 +19,7 @@ export interface Router {
   /**
    * Navigate to a new URL.
    */
-  go: (to?: string) => Promise<void>
+  go: (to?: string, options?: { smoothScroll?: boolean }) => Promise<void>
   /**
    * Called before the route changes. Return `false` to cancel the navigation.
    */
@@ -73,35 +73,37 @@ export function createRouter(
 
   async function go(
     href: string = inBrowser ? location.href : '/',
-    smoothScroll = false
+    { smoothScroll = false } = {}
   ) {
     href = normalizeHref(href)
     const loc = inBrowser ? normalizeHref(location.href) : null
 
     if ((await router.onBeforeRouteChange?.(href)) === false) return
 
-    if (loc !== null && href !== loc) {
+    if (loc !== null) {
       const { pathname, hash } = new URL(href, fakeHost)
       const currentLoc = new URL(loc, fakeHost)
 
-      // save scroll position before changing url
-      history.replaceState({ scrollPosition: window.scrollY }, '')
-      history.pushState({}, '', href)
-
-      if (pathname === currentLoc.pathname) {
-        if (hash !== currentLoc.hash) {
-          window.dispatchEvent(
-            new HashChangeEvent('hashchange', {
-              oldURL: currentLoc.href,
-              newURL: href
-            })
-          )
-
-          if (hash) scrollTo(hash, smoothScroll)
-          else window.scrollTo(0, 0)
-        }
+      if (href !== loc) {
+        // save scroll position before changing url
+        history.replaceState({ scrollPosition: window.scrollY }, '')
+        history.pushState({}, '', href)
+
+        if (pathname === currentLoc.pathname) {
+          if (hash !== currentLoc.hash) {
+            window.dispatchEvent(
+              new HashChangeEvent('hashchange', {
+                oldURL: currentLoc.href,
+                newURL: href
+              })
+            )
+          }
 
-        return
+          return
+        }
+      } else {
+        if (hash) scrollTo(hash, smoothScroll)
+        else window.scrollTo(0, 0)
       }
     }
 
@@ -226,10 +228,11 @@ export function createRouter(
 
         const { href, origin, pathname } = new URL(linkHref, link.baseURI)
         const currentLoc = new URL(location.href) // copy to keep old data
+
         // only intercept inbound html links
         if (origin === currentLoc.origin && treatAsHtml(pathname)) {
           e.preventDefault()
-          go(href, link.classList.contains('header-anchor'))
+          go(href, { smoothScroll: link.classList.contains('header-anchor') })
         }
       },
       { capture: true }