@ichaingo/link 1.3.97 → 1.3.98

package/dist/index.js

@@ -1,49 +1,78 @@
 'use client';
-import { jsx as k } from "react/jsx-runtime";
-import W from "next/link";
-import { usePathname as _ } from "@ichaingo/i18n/navigation";
-import { useLocale as v } from "next-intl";
-import { useRouter as y, useSearchParams as B } from "next/navigation";
-import { useTransition as H, useMemo as S } from "react";
-import { useProgressBar as T } from "@ichaingo/providers/TopProgressBarProvider";
-const z = ({
-  href: r,
-  isOldProject: c,
-  withLocale: m = !0,
-  baseUrl: o = "",
-  children: p,
-  target: a = "_self",
-  onClick: i,
-  prefetch: l = !1,
-  ...f
+import { jsx } from "react/jsx-runtime";
+import Link from "next/link";
+import { usePathname } from "@ichaingo/i18n/navigation";
+import { useLocale } from "next-intl";
+import { useRouter, useSearchParams } from "next/navigation";
+import { useTransition, useMemo } from "react";
+import { useProgressBar } from "@ichaingo/providers/TopProgressBarProvider";
+const LinkBar = ({
+  href,
+  isOldProject,
+  withLocale = true,
+  baseUrl = "",
+  children,
+  target = "_self",
+  onClick,
+  prefetch = false,
+  ...rest
 }) => {
-  const d = y(), g = _(), P = B(), [, $] = H(), { start: w } = T(), e = v(), n = (t) => o.includes(".ichaingo.com") || t.includes(".ichaingo.com") || o === "" && !/^(https?:\/\/|\/\/)/.test(t) ? !1 : /^(https?:\/\/|\/\/)/.test(t), x = (t) => t.replace(`/${e}`, "") === g.replace(`/${e}`, "") + P.toString(), L = (t, s) => {
-    if (i == null || i(t), t.stopPropagation(), t.preventDefault(), x(s)) {
+  const router = useRouter();
+  const pathName = usePathname();
+  const searchParams = useSearchParams();
+  const [, startTransition] = useTransition();
+  const { start } = useProgressBar();
+  const locale = useLocale();
+  const isExternalLink = (url) => {
+    if (baseUrl.includes(".ichaingo.com") || url.includes(".ichaingo.com")) return false;
+    if (baseUrl === "" && !/^(https?:\/\/|\/\/)/.test(url)) return false;
+    return /^(https?:\/\/|\/\/)/.test(url);
+  };
+  const isCurrentPage = (url) => {
+    return url.replace(`/${locale}`, "") === pathName.replace(`/${locale}`, "") + searchParams.toString();
+  };
+  const handleClick = (e, href2) => {
+    onClick == null ? void 0 : onClick(e);
+    e.stopPropagation();
+    e.preventDefault();
+    if (isCurrentPage(href2)) {
       window.location.reload();
       return;
     }
-    c || n(s) ? window.open(s, n(s) ? "_blank" : a) : (w(), $(() => {
-      d.push(s);
-    }));
-  }, u = S(() => {
-    if (n(r)) return r;
-    const t = `/${e}`;
-    return r === t || r.startsWith(`${t}/`) || !m ? o + r : r.startsWith("/") ? `${o}${t}${r}` : r;
-  }, [r, e, o]);
-  return /* @__PURE__ */ k(
-    W,
+    if (isOldProject || isExternalLink(href2)) {
+      window.open(href2, target === "_blank" || isExternalLink(href2) ? "_blank" : target);
+    } else {
+      start();
+      startTransition(() => {
+        router.push(href2);
+      });
+    }
+  };
+  const friendlyHerf = useMemo(() => {
+    if (isExternalLink(href)) return href;
+    const localePrefix = `/${locale}`;
+    if (href === localePrefix || href.startsWith(`${localePrefix}/`) || !withLocale) {
+      return baseUrl + href;
+    }
+    if (href.startsWith("/")) {
+      return `${baseUrl}${localePrefix}${href}`;
+    }
+    return href;
+  }, [href, locale, baseUrl]);
+  return /* @__PURE__ */ jsx(
+    Link,
     {
-      suppressHydrationWarning: !0,
-      prefetch: l,
-      href: u,
-      target: n(r) ? "_blank" : a,
-      onClick: (t) => L(t, u),
-      rel: n(r) ? "noopener noreferrer" : void 0,
-      ...f,
-      children: p
+      suppressHydrationWarning: true,
+      prefetch,
+      href: friendlyHerf,
+      target: isExternalLink(href) ? "_blank" : target,
+      onClick: (e) => handleClick(e, friendlyHerf),
+      rel: isExternalLink(href) ? "noopener noreferrer" : void 0,
+      ...rest,
+      children
     }
   );
 };
 export {
-  z as default
+  LinkBar as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ichaingo/link",
-  "version": "1.3.97",
+  "version": "1.3.98",
   "type": "module",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -20,8 +20,8 @@
     "next": "^15.4.5",
     "next-intl": "^4.3.4",
     "react": "^19.1.0",
-    "@ichaingo/providers": "1.3.97",
-    "@ichaingo/i18n": "1.3.97"
+    "@ichaingo/i18n": "1.3.98",
+    "@ichaingo/providers": "1.3.98"
   },
   "devDependencies": {
     "rollup-plugin-preserve-use-client": "^3.0.1"