[feat]: handling target _black link -> not considered

ndungtse · Jul 8, 2023 · 656edac · 656edac
1 parent 5cd20f8
commit 656edac
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ import Providers from './providers';
 export default function RootLayout({ children }: { children: React.ReactNode }) {
   return (
     <html lang="en">
-      <body className={inter.className}>
+      <body>
         <Providers>{children}</Providers>
       </body>
     </html>

diff --git a/example/package.json b/example/package.json
@@ -15,7 +15,7 @@
     "eslint": "8.43.0",
     "eslint-config-next": "13.4.7",
     "next": "13.4.7",
-    "next13-progressbar": "^0.1.2",
+    "next13-progressbar": "../",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "5.1.5"

diff --git a/example/yarn.lock b/example/yarn.lock
@@ -1506,10 +1506,8 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-next13-progressbar@^0.1.2:
+next13-progressbar@../:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/next13-progressbar/-/next13-progressbar-0.1.2.tgz#4b7c846908c548dcb6948bb33120d81ef65c589c"
-  integrity sha512-6r3J/GFeTcVLkkBd615sutRUR1oLP341VLbXv+54S+7qzoB5q66pBMNq2VI5cT8hXjSKvVvHeSadUCpomFG4pw==
   dependencies:
     "@types/nprogress" "^0.2.0"
     nprogress "^0.2.0"

diff --git a/src/CLink.tsx b/src/CLink.tsx
@@ -15,6 +15,9 @@ export interface PLinkProps extends LinkProps {
 export const CLink = (props: PLinkProps) => {
   const pathname = usePathname();
   const { setShowProgressBar } = useNProgress();
+  const newProps = { ...props };
+  delete newProps.children;
+  delete newProps.onClick;
 
   const handleShowProgressBar = () => {
     if (pathname !== props.href) {
@@ -23,7 +26,7 @@ export const CLink = (props: PLinkProps) => {
   };
 
   return (
-    <Link onClick={handleShowProgressBar} {...props}>
+    <Link onClick={handleShowProgressBar} {...newProps}>
       {props.children}
     </Link>
   );

diff --git a/src/NProvider.tsx b/src/NProvider.tsx
@@ -25,7 +25,12 @@ export const NProvider = (props: NProviderProps) => {
   useEffect(() => {
     const anchors = document.querySelectorAll('a');
     anchors.forEach((anchor) => {
-      anchor.addEventListener('click', () => {
+      anchor.addEventListener('click', (e) => {
+        if(anchor.target === '_blank') return;
+        // add prev onclick
+        if (anchor.onclick) {
+          anchor.onclick(e);
+        }
         if (pathname !== anchor.href) {
           setShowProgressBar(true);
         }