@mbao01/next 0.0.30 → 0.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mbao01/next",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "private": false,
   "type": "module",
   "author": "Ayomide Bakare",
@@ -42,7 +42,7 @@
     "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@mbao01/common": "^0.0.29",
+    "@mbao01/common": "^0.0.31",
     "@radix-ui/react-icons": "^1.3.0",
     "clsx": "^2.1.0"
   },
@@ -93,5 +93,5 @@
   "peerDependencies": {
     "next": "^14.1.0"
   },
-  "gitHead": "1ccc8b44c98ab629a4ec708e3ee1bee6d9e13be8"
+  "gitHead": "06b3dabcfcd2694bf8d0701a392f6b7f01101e7a"
 }

package/src/components/Link/Link.tsx

@@ -1,5 +1,6 @@
 import NextLink from "next/link";
 import { ExternalLinkIcon } from "@radix-ui/react-icons";
+import { Anchor } from "@mbao01/common";
 import { cn } from "@mbao01/common/utilities";
 import { type LinkProps } from "./types";
 import { getLinkClasses } from "./constant";
@@ -12,12 +13,30 @@ export const Link = <T,>({
   children,
   className,
   underline = false,
+  isExternal = false,
+  isInternal = true,
   ...props
 }: LinkProps<T>) => {
-  const isExternal = target === "_blank";
+  if (isInternal === false) {
+    return (
+      <Anchor
+        href={href as string}
+        target={target}
+        hover={hover}
+        variant={variant}
+        className={className}
+        underline={underline}
+        isExternal={isExternal}
+        {...props}
+      >
+        {children}
+      </Anchor>
+    );
+  }
+
   return (
     <NextLink
-      href={href}
+      href={href as Omit<LinkProps<T>["href"], string>}
       target={target}
       className={cn(getLinkClasses({ hover, variant, underline }), className)}
       {...props}

package/src/components/Link/types.ts

@@ -1,12 +1,32 @@
 import { type UrlObject } from "url";
-import type { LinkRestProps } from "next/link";
+import { type LinkRestProps } from "next/link";
 import { type VariantProps } from "@mbao01/common/libs";
 import { getLinkClasses } from "./constant";
 
-export type LinkProps<T> = LinkRestProps & {
-  /**
-   * The path or URL to navigate to. This is the only required prop. It can also be an object.
-   * @see https://nextjs.org/docs/api-reference/next/link
-   */
-  href: __next_route_internal_types__.RouteImpl<T> | UrlObject;
-} & VariantProps<typeof getLinkClasses>;
+// export type LinkProps<
+//   T,
+//   I = boolean,
+//   H = I extends true
+//     ? /**
+//        * The path or URL to navigate to. This is the only required prop. It can also be an object.
+//        * @see https://nextjs.org/docs/api-reference/next/link
+//        */
+//       __next_route_internal_types__.RouteImpl<T> | UrlObject
+//     : string,
+// > = LinkRestProps & {
+//   href: H;
+//   isInternal?: I;
+//   isExternal?: boolean;
+// } & VariantProps<typeof getLinkClasses>;
+
+export type LinkProps<T> = LinkRestProps & { isExternal?: boolean } & (
+    | {
+        href: __next_route_internal_types__.RouteImpl<T> | UrlObject;
+        isInternal?: true;
+      }
+    | {
+        href: string;
+        isInternal?: false;
+      }
+  ) &
+  VariantProps<typeof getLinkClasses>;