fix: fix issue #2 + v1.0.2

ndungtse · Aug 2, 2023 · 0d9c2f2 · 0d9c2f2
1 parent c957add
commit 0d9c2f2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/example/src/components/NavBar.tsx b/example/src/components/NavBar.tsx
@@ -11,7 +11,9 @@ const NavBar = () => {
       <Link href={'/'}>Home</Link>
       <Link href={'/about'}>About</Link>
       <Link href={'/contact'}>Contact</Link>
-      <button onClick={() => router.push('/button-link')}>ButtonLink</button>
+      <button onClick={() => router.push('/button-link#34')}>ButtonLink</button>
+      <Link href={'#'}>HashLink</Link>
+      <Link href={'/contact/#44'}>HashLink1</Link>
     </div>
   );
 };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next13-progressbar",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A ProgressBar for next.js 13 with app directory ",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/AppProgressBar.tsx b/src/AppProgressBar.tsx
@@ -115,11 +115,16 @@ export const Next13ProgressBar = React.memo(
         // Skip anchors with target="_blank"
         if (anchorElement.target === '_blank') return;
 
+        // Skip anchors with download attribute
+        if (anchorElement.hasAttribute('download')) return;
+
+        // target url without hash removed
         const targetUrl = new URL(anchorElement.href);
         const currentUrl = new URL(location.href);
+        const isSameUrl = targetUrl?.pathname === currentUrl?.pathname;
 
-        if (showOnShallow && targetUrl?.href === currentUrl?.href) return;
-        if (targetUrl?.href === currentUrl?.href) return;
+        if (showOnShallow && isSameUrl) return;
+        if (isSameUrl) return;
 
         startProgress();
       };
@@ -152,7 +157,8 @@ export function useRouter() {
   const pathname = usePathname();
 
   function push(href: string, options?: NavigateOptions) {
-    if (href === pathname) return Promise.resolve(true);
+    const targetUrl = new URL(href, location.href);
+    if (targetUrl.pathname === pathname) return Promise.resolve(true);
     NProgress.start();
     return router.push(href, options);
   }