@mbao01/common 0.0.5 → 0.0.6

package/README.md

@@ -23,8 +23,7 @@ export default {
     ...
   ],
   "plugins": [
-    require("@mbao01/common/plugin"), // -> import the library plugin
-    ...
+    ...require("@mbao01/common/plugin"), // -> import the library plugin
   ]
 }
 ```

package/dist/types/components/Badge/Badge.d.ts

@@ -1,2 +1,2 @@
 import { type BadgeProps } from "./types";
-export declare const Badge: ({ size, outline, variant, children, className, ...props }: BadgeProps) => import("react/jsx-runtime").JSX.Element;
+export declare const Badge: ({ size, outline, variant, className, ...props }: BadgeProps) => import("react/jsx-runtime").JSX.Element;

package/dist/types/components/Badge/constants.d.ts

@@ -1,5 +1,5 @@
-import type { BadgeSize, BadgeVariant } from "./types";
-export declare const getBadgeClasses: ({ size, variant, }: {
-    size?: BadgeSize | undefined;
-    variant?: BadgeVariant | undefined;
-}) => string;
+export declare const getBadgeClasses: (props?: ({
+    variant?: "accent" | "error" | "ghost" | "info" | "neutral" | "primary" | "secondary" | "success" | "warning" | null | undefined;
+    outline?: boolean | null | undefined;
+    size?: "xs" | "sm" | "md" | "lg" | null | undefined;
+} & import("class-variance-authority/types").ClassProp) | undefined) => string;

package/dist/types/components/Badge/types.d.ts

@@ -1,7 +1,3 @@
-export type BadgeSize = "xs" | "sm" | "md" | "lg";
-export type BadgeVariant = "neutral" | "primary" | "secondary" | "accent" | "ghost" | "info" | "success" | "warning" | "error";
-export type BadgeProps = React.HTMLAttributes<HTMLSpanElement> & {
-    size?: BadgeSize;
-    outline?: boolean;
-    variant?: BadgeVariant;
-};
+import { type VariantProps } from "../../libs";
+import { getBadgeClasses } from "./constants";
+export type BadgeProps = React.HTMLAttributes<HTMLSpanElement> & VariantProps<typeof getBadgeClasses>;

package/dist/types/components/Breadcrumbs/Breadcrumbs.d.ts

@@ -0,0 +1,3 @@
+import type { BreadcrumbProps, BreadcrumbsProps } from "./types";
+export declare const Breadcrumbs: (props: BreadcrumbsProps) => import("react/jsx-runtime").JSX.Element;
+export declare const Breadcrumb: (props: BreadcrumbProps) => import("react/jsx-runtime").JSX.Element;

package/dist/types/components/Breadcrumbs/index.d.ts

@@ -0,0 +1 @@
+export { Breadcrumbs } from "./Breadcrumbs";

package/dist/types/components/Breadcrumbs/types.d.ts

@@ -0,0 +1,2 @@
+export type BreadcrumbProps = React.HTMLAttributes<HTMLLIElement>;
+export type BreadcrumbsProps = React.HTMLAttributes<HTMLUListElement>;

package/dist/types/components/Button/Button.d.ts

@@ -1,2 +1,11 @@
-import { type ButtonProps } from "./types";
-export declare const Button: (props: ButtonProps) => import("react/jsx-runtime").JSX.Element;
+import React from "react";
+declare const Button: React.ForwardRefExoticComponent<React.ButtonHTMLAttributes<HTMLButtonElement> & import("class-variance-authority").VariantProps<(props?: ({
+    variant?: "accent" | "default" | "error" | "ghost" | "info" | "link" | "neutral" | "primary" | "secondary" | "success" | "warning" | null | undefined;
+    outline?: boolean | null | undefined;
+    wide?: boolean | null | undefined;
+    size?: "xs" | "sm" | "md" | "lg" | null | undefined;
+    isLoading?: boolean | null | undefined;
+} & import("class-variance-authority/types").ClassProp) | undefined) => string> & {
+    as?: "a" | "span" | "p" | undefined;
+} & React.RefAttributes<HTMLButtonElement>>;
+export { Button };

package/dist/types/components/Button/constants.d.ts

@@ -1,8 +1,7 @@
-import type { ButtonSize, ButtonVariant } from './types';
-export declare const getButtonClasses: ({ size, wide, loading, outline, variant, }: {
-    size?: ButtonSize | undefined;
-    wide?: boolean | undefined;
-    loading?: boolean | undefined;
-    outline?: boolean | undefined;
-    variant?: ButtonVariant | undefined;
-}) => string;
+export declare const getButtonClasses: (props?: ({
+    variant?: "accent" | "default" | "error" | "ghost" | "info" | "link" | "neutral" | "primary" | "secondary" | "success" | "warning" | null | undefined;
+    outline?: boolean | null | undefined;
+    wide?: boolean | null | undefined;
+    size?: "xs" | "sm" | "md" | "lg" | null | undefined;
+    isLoading?: boolean | null | undefined;
+} & import("class-variance-authority/types").ClassProp) | undefined) => string;

package/dist/types/components/Button/types.d.ts

@@ -1,12 +1,6 @@
-import type { ButtonHTMLAttributes, ReactNode } from 'react';
-export type ButtonSize = 'xs' | 'sm' | 'md' | 'lg';
-export type ButtonVariant = 'default' | 'neutral' | 'primary' | 'secondary' | 'accent' | 'ghost' | 'link' | 'info' | 'success' | 'warning' | 'error';
-export type ButtonProps = {
-    size?: ButtonSize;
-    wide?: boolean;
-    label: ReactNode;
-    loading?: boolean;
-    outline?: boolean;
-    variant?: ButtonVariant;
-    disabled?: boolean;
-} & ButtonHTMLAttributes<HTMLButtonElement>;
+import { type VariantProps } from "../../libs";
+import { type ButtonHTMLAttributes } from "react";
+import { getButtonClasses } from "./constants";
+export type ButtonProps = ButtonHTMLAttributes<HTMLButtonElement> & VariantProps<typeof getButtonClasses> & {
+    as?: keyof Pick<JSX.IntrinsicElements, "a" | "span" | "p">;
+};

package/dist/types/components/Card/Card.d.ts

@@ -1,4 +1,4 @@
-import { CardContentProps, CardDescriptionProps, CardFooterProps, CardHeaderProps, CardImageProps, CardProps } from "./types";
+import type { CardContentProps, CardDescriptionProps, CardFooterProps, CardHeaderProps, CardImageProps, CardProps } from "./types";
 declare const Card: {
     ({ compact, bordered, horizontal, overlay, className, ...props }: CardProps): import("react/jsx-runtime").JSX.Element;
     Header: ({ className, ...props }: CardHeaderProps) => import("react/jsx-runtime").JSX.Element;

package/dist/types/components/Card/constants.d.ts

@@ -0,0 +1,6 @@
+export declare const getCardClasses: (props?: ({
+    bordered?: boolean | null | undefined;
+    compact?: boolean | null | undefined;
+    horizontal?: boolean | null | undefined;
+    overlay?: boolean | null | undefined;
+} & import("class-variance-authority/types").ClassProp) | undefined) => string;

package/dist/types/components/Card/types.d.ts

@@ -1,22 +1,7 @@
 import React from "react";
-export type CardProps = {
-    /**
-     * applies smaller padding to the card.
-     */
-    compact?: boolean;
-    /**
-     * applies border to the card.
-     */
-    bordered?: boolean;
-    /**
-     * shows the card horizontally with image to the right or left of it.
-     */
-    horizontal?: boolean;
-    /**
-     * overlay is used to make the image full width with the content on top.
-     */
-    overlay?: boolean;
-} & React.HTMLAttributes<HTMLDivElement>;
+import { type VariantProps } from "../../libs";
+import { getCardClasses } from "./constants";
+export type CardProps = React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof getCardClasses>;
 export type CardContentProps = React.HTMLAttributes<HTMLDivElement>;
 export type CardImageProps = React.ImgHTMLAttributes<HTMLImageElement>;
 export type CardHeaderProps = React.HTMLAttributes<HTMLDivElement>;

package/dist/types/components/Description/Description.d.ts

@@ -1,7 +1,7 @@
 import type { DescriptionProps, DescriptionTermProps, DescriptionDetailProps } from "./types";
 declare const Description: {
     (props: DescriptionProps): import("react/jsx-runtime").JSX.Element;
-    Term: (props: DescriptionTermProps) => import("react/jsx-runtime").JSX.Element;
-    Detail: (props: DescriptionDetailProps) => import("react/jsx-runtime").JSX.Element;
+    Term: ({ className, ...props }: DescriptionTermProps) => import("react/jsx-runtime").JSX.Element;
+    Detail: ({ className, ...props }: DescriptionDetailProps) => import("react/jsx-runtime").JSX.Element;
 };
 export { Description };

package/dist/types/components/Loading/Loading.d.ts

@@ -0,0 +1,2 @@
+import { type LoadingProps } from "./types";
+export declare const Loading: ({ size, intent, variant, className, ...props }: LoadingProps) => import("react/jsx-runtime").JSX.Element;

package/dist/types/components/Loading/constants.d.ts

@@ -0,0 +1,5 @@
+export declare const getLoadingClasses: (props?: ({
+    variant?: "spinner" | "dots" | "ring" | "ball" | "bars" | "infinity" | null | undefined;
+    intent?: "accent" | "error" | "info" | "neutral" | "primary" | "secondary" | "success" | "warning" | null | undefined;
+    size?: "xs" | "sm" | "md" | "lg" | null | undefined;
+} & import("class-variance-authority/types").ClassProp) | undefined) => string;

package/dist/types/components/Loading/index.d.ts

@@ -0,0 +1 @@
+export { Loading } from "./Loading";

package/dist/types/components/Loading/types.d.ts

@@ -0,0 +1,3 @@
+import { type VariantProps } from "../../libs";
+import { getLoadingClasses } from "./constants";
+export type LoadingProps = React.HTMLAttributes<HTMLSpanElement> & VariantProps<typeof getLoadingClasses>;

package/dist/types/components/Skeleton/Skeleton.d.ts

@@ -1,2 +1,2 @@
 import { type SkeletonProps } from "./types";
-export declare const Skeleton: ({ className, round, width, height, ...props }: SkeletonProps) => import("react/jsx-runtime").JSX.Element;
+export declare const Skeleton: ({ round, width, height, variant, className, ...props }: SkeletonProps) => import("react/jsx-runtime").JSX.Element;

package/dist/types/components/Skeleton/constants.d.ts

@@ -1,5 +1,6 @@
-import { Size } from "./types";
-export declare const getSkeletonSize: ({ width, height, }: {
-    width?: Size | undefined;
-    height?: Size | undefined;
-}) => string;
+export declare const getSkeletonClasses: (props?: ({
+    variant?: "pulse" | null | undefined;
+    width?: "full" | 4 | 2 | 8 | 12 | 16 | 24 | 32 | 48 | 64 | null | undefined;
+    height?: "full" | 4 | 2 | 8 | 12 | 16 | 24 | 32 | 48 | 64 | null | undefined;
+    round?: boolean | null | undefined;
+} & import("class-variance-authority/types").ClassProp) | undefined) => string;

package/dist/types/components/Skeleton/types.d.ts

@@ -1,7 +1,3 @@
-export type Size = 2 | 4 | 8 | 12 | 16 | 24 | 32 | 48 | 64 | "full";
-export type SkeletonProps = React.HTMLAttributes<HTMLDivElement> & {
-    width?: Size;
-    height?: Size;
-    round?: boolean;
-    className?: string;
-};
+import { type VariantProps } from "../../libs";
+import { getSkeletonClasses } from "./constants";
+export type SkeletonProps = React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof getSkeletonClasses>;

package/dist/types/components/Text/Text.d.ts

@@ -1,4 +1,2 @@
-import { type TextProps } from './types';
-export declare const Text: ({ as, size, variant, children, className }: TextProps) => import("react").DetailedReactHTMLElement<{
-    className: string;
-}, HTMLElement>;
+import { type TextProps } from "./types";
+export declare const Text: ({ as, size, variant, children, className, ...props }: TextProps) => import("react/jsx-runtime").JSX.Element;

package/dist/types/components/Text/constants.d.ts

@@ -1,5 +1,4 @@
-import type { TextSize, TextVariant } from './types';
-export declare const getTextClasses: ({ size, variant }: {
-    size?: TextSize | undefined;
-    variant?: TextVariant | undefined;
-}) => string;
+export declare const getTextClasses: (props?: ({
+    variant?: "accent" | "error" | "info" | "neutral" | "primary" | "secondary" | "success" | "warning" | null | undefined;
+    size?: "xs" | "sm" | "lg" | "base" | "xl" | "2xl" | "3xl" | "4xl" | "5xl" | null | undefined;
+} & import("class-variance-authority/types").ClassProp) | undefined) => string;

package/dist/types/components/Text/types.d.ts

@@ -1,10 +1,5 @@
-export type TextSize = 'xs' | 'sm' | 'base' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl' | '5xl';
-export type TextTag = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'p' | 'span';
-export type TextVariant = 'info' | 'error' | 'success' | 'warning' | 'primary' | 'secondary' | 'accent' | 'neutral';
-export type TextProps = {
-    as?: TextTag;
-    size?: TextSize;
-    variant?: TextVariant;
-    children: React.ReactNode;
-    className?: string;
+import { type VariantProps } from "../../libs";
+import { getTextClasses } from "./constants";
+export type TextProps = React.HTMLAttributes<HTMLSpanElement> & VariantProps<typeof getTextClasses> & {
+    as?: keyof Pick<JSX.IntrinsicElements, "h1" | "h2" | "h3" | "h4" | "h5" | "p">;
 };

package/dist/types/components/Tooltip/Tooltip.d.ts

@@ -1,2 +1,14 @@
-import { type TooltipProps } from './types';
-export declare const Tooltip: ({ content, children, variant, position, className, ...props }: TooltipProps) => import("react/jsx-runtime").JSX.Element;
+import React from "react";
+import * as TooltipPrimitive from "@radix-ui/react-tooltip";
+import type { TooltipArrowProps } from "./types";
+declare const Tooltip: {
+    (props: TooltipPrimitive.TooltipProps): import("react/jsx-runtime").JSX.Element;
+    Content: React.ForwardRefExoticComponent<React.HTMLAttributes<HTMLDivElement> & TooltipPrimitive.TooltipContentProps & import("class-variance-authority").VariantProps<(props?: ({
+        variant?: "accent" | "error" | "info" | "neutral" | "primary" | "secondary" | "success" | "warning" | null | undefined;
+    } & import("class-variance-authority/types").ClassProp) | undefined) => string> & React.RefAttributes<HTMLDivElement>>;
+    Arrow: ({ className, variant, ...props }: TooltipArrowProps) => import("react/jsx-runtime").JSX.Element;
+    Portal: React.FC<TooltipPrimitive.TooltipPortalProps>;
+    Provider: React.FC<TooltipPrimitive.TooltipProviderProps>;
+    Trigger: React.ForwardRefExoticComponent<TooltipPrimitive.TooltipTriggerProps & React.RefAttributes<HTMLButtonElement>>;
+};
+export { Tooltip };

package/dist/types/components/Tooltip/constants.d.ts

@@ -1,5 +1,6 @@
-import type { TooltipPosition, TooltipVariant } from "./types";
-export declare const getTooltipClasses: ({ variant, position, }: {
-    variant?: TooltipVariant | undefined;
-    position?: TooltipPosition | undefined;
-}) => string;
+export declare const getTooltipContentClasses: (props?: ({
+    variant?: "accent" | "error" | "info" | "neutral" | "primary" | "secondary" | "success" | "warning" | null | undefined;
+} & import("class-variance-authority/types").ClassProp) | undefined) => string;
+export declare const getTooltipArrowClasses: (props?: ({
+    variant?: "accent" | "error" | "info" | "neutral" | "primary" | "secondary" | "success" | "warning" | null | undefined;
+} & import("class-variance-authority/types").ClassProp) | undefined) => string;

package/dist/types/components/Tooltip/types.d.ts

@@ -1,10 +1,5 @@
-import { type ReactNode } from 'react';
-export type TooltipPosition = 'top' | 'bottom' | 'left' | 'right';
-export type TooltipVariant = 'default' | 'neutral' | 'primary' | 'secondary' | 'accent' | 'ghost' | 'link' | 'info' | 'success' | 'warning' | 'error';
-export type TooltipProps = React.HTMLAttributes<HTMLDivElement> & {
-    content: string;
-    children: ReactNode;
-    variant?: TooltipVariant;
-    position?: TooltipPosition;
-    className?: string;
-};
+import { type VariantProps } from "../../libs";
+import { getTooltipArrowClasses, getTooltipContentClasses } from "./constants";
+import * as TooltipPrimitive from "@radix-ui/react-tooltip";
+export type TooltipArrowProps = React.HTMLAttributes<React.ElementRef<typeof TooltipPrimitive.Arrow>> & TooltipPrimitive.TooltipArrowProps & VariantProps<typeof getTooltipArrowClasses>;
+export type TooltipContentProps = React.HTMLAttributes<React.ElementRef<typeof TooltipPrimitive.Content>> & TooltipPrimitive.TooltipContentProps & VariantProps<typeof getTooltipContentClasses>;

package/dist/types/index.d.ts

@@ -1,5 +1,6 @@
 /** actions */
 export * from "./components/Button";
+export * from "./components/Breadcrumbs";
 /** data display */
 export * from "./components/Badge";
 export * from "./components/Card";
@@ -7,5 +8,6 @@ export * from "./components/Description";
 export * from "./components/Text";
 /** data input */
 /** feedback */
+export * from "./components/Loading";
 export * from "./components/Skeleton";
 export * from "./components/Tooltip";

package/dist/types/libs/cva.d.ts

@@ -0,0 +1 @@
+export { cva, type VariantProps } from "class-variance-authority";

package/dist/types/libs/index.d.ts

@@ -0,0 +1 @@
+export { cva, type VariantProps } from "./cva";

package/dist/types/utilities/cn.d.ts

@@ -0,0 +1,2 @@
+import { type ClassValue } from "clsx";
+export declare function cn(...inputs: ClassValue[]): string;

package/dist/types/utilities/getSubpaths/getSubpaths.d.ts

@@ -0,0 +1,6 @@
+export declare const getSubpaths: (pathname: string, pathLabels?: Record<string, string> | undefined, includeRoot?: boolean) => {
+    href: {
+        pathname: string;
+    };
+    label: string;
+}[];

package/dist/types/utilities/getSubpaths/index.d.ts

@@ -0,0 +1 @@
+export { getSubpaths } from "./getSubpaths";

package/dist/types/utilities/index.d.ts

@@ -0,0 +1,2 @@
+export { cn } from "./cn";
+export { getSubpaths } from "./getSubpaths";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mbao01/common",
   "private": false,
-  "version": "0.0.5",
+  "version": "0.0.6",
   "type": "module",
   "author": "Ayomide Bakare",
   "license": "MIT",
@@ -20,7 +20,9 @@
         "default": "./src/index.ts"
       }
     },
+    "./libs": "./src/libs/index.ts",
     "./plugin": "./plugin.js",
+    "./utilities": "./src/utilities/index.ts",
     "./vitest/setup": "./vitest-setup.ts",
     "./vitest/config": "./vitest.config.ts",
     "./styles": "./src/stylesheets/index.css"
@@ -58,8 +60,14 @@
     "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
+    "@radix-ui/react-icons": "^1.3.0",
+    "@radix-ui/react-slot": "^1.0.2",
+    "@radix-ui/react-tooltip": "^1.0.7",
+    "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
-    "daisyui": "^4.6.2"
+    "daisyui": "^4.6.2",
+    "tailwind-merge": "^2.2.1",
+    "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {
     "@storybook/addon-essentials": "^7.6.14",
@@ -102,10 +110,9 @@
     "vitest": "^1.2.2"
   },
   "peerDependencies": {
-    "@heroicons/react": "^2.1.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.2.2"
   },
-  "gitHead": "d40fb1867ee09180de85ab18ffe74c4436e43413"
+  "gitHead": "ceb6cef48e8547b4da5c51dda329bd6edee73c0b"
 }

package/plugin.js

@@ -1,3 +1 @@
-const daisyui = require("daisyui");
-
-module.exports = daisyui;
+module.exports = [require("daisyui"), require("tailwindcss-animate")];

package/src/components/Badge/Badge.tsx

@@ -1,28 +1,18 @@
-import c from "clsx";
+import { cn } from "../../utilities";
 import { getBadgeClasses } from "./constants";
 import { type BadgeProps } from "./types";
 
 export const Badge = ({
   size,
   outline,
-  variant = "ghost",
-  children,
+  variant,
   className,
   ...props
 }: BadgeProps) => {
   return (
     <span
+      className={cn(getBadgeClasses({ size, variant, outline }), className)}
       {...props}
-      className={c(
-        getBadgeClasses({ size, variant }),
-        {
-          "badge-outline": outline,
-          "text-base-200": !["ghost", "neutral"].includes(variant),
-        },
-        className
-      )}
-    >
-      {children}
-    </span>
+    />
   );
 };

package/src/components/Badge/constants.ts

@@ -1,31 +1,29 @@
-import c from "clsx";
-import type { BadgeSize, BadgeVariant } from "./types";
+import { cva } from "../../libs";
 
-const BADGE_SIZE = {
-  xs: c("badge-xs"),
-  sm: c("badge-sm"),
-  md: c("badge-md"),
-  lg: c("badge-lg"),
-} satisfies Record<BadgeSize, string>;
-
-const BADGE_VARIANTS = {
-  accent: c("badge-accent"),
-  error: c("badge-error"),
-  ghost: c("badge-ghost"),
-  info: c("badge-info"),
-  neutral: c("badge-neutral"),
-  primary: c("badge-primary"),
-  secondary: c("badge-secondary"),
-  success: c("badge-success"),
-  warning: c("badge-warning"),
-} satisfies Record<BadgeVariant, string>;
-
-export const getBadgeClasses = ({
-  size,
-  variant,
-}: {
-  size?: BadgeSize;
-  variant?: BadgeVariant;
-}) => {
-  return c("badge", BADGE_VARIANTS[variant!], BADGE_SIZE[size!]);
-};
+export const getBadgeClasses = cva("badge", {
+  variants: {
+    variant: {
+      accent: "badge-accent",
+      error: "badge-error",
+      ghost: "badge-ghost",
+      info: "badge-info",
+      neutral: "badge-neutral",
+      primary: "badge-primary",
+      secondary: "badge-secondary",
+      success: "badge-success",
+      warning: "badge-warning",
+    },
+    outline: {
+      true: "badge-outline",
+    },
+    size: {
+      xs: "badge-xs",
+      sm: "badge-sm",
+      md: "badge-md",
+      lg: "badge-lg",
+    },
+  },
+  defaultVariants: {
+    variant: "ghost",
+  },
+});

package/src/components/Badge/types.ts

@@ -1,18 +1,5 @@
-export type BadgeSize = "xs" | "sm" | "md" | "lg";
+import { type VariantProps } from "../../libs";
+import { getBadgeClasses } from "./constants";
 
-export type BadgeVariant =
-  | "neutral"
-  | "primary"
-  | "secondary"
-  | "accent"
-  | "ghost"
-  | "info"
-  | "success"
-  | "warning"
-  | "error";
-
-export type BadgeProps = React.HTMLAttributes<HTMLSpanElement> & {
-  size?: BadgeSize;
-  outline?: boolean;
-  variant?: BadgeVariant;
-};
+export type BadgeProps = React.HTMLAttributes<HTMLSpanElement> &
+  VariantProps<typeof getBadgeClasses>;

package/src/components/Breadcrumbs/Breadcrumbs.tsx

@@ -0,0 +1,13 @@
+import type { BreadcrumbProps, BreadcrumbsProps } from "./types";
+
+export const Breadcrumbs = (props: BreadcrumbsProps) => {
+  return (
+    <div className="breadcrumbs -ml-1 w-fit px-1 text-sm">
+      <ul {...props} />
+    </div>
+  );
+};
+
+export const Breadcrumb = (props: BreadcrumbProps) => {
+  return <li {...props} />;
+};

package/src/components/Breadcrumbs/index.ts

@@ -0,0 +1 @@
+export { Breadcrumbs } from "./Breadcrumbs";

package/src/components/Breadcrumbs/types.ts

@@ -0,0 +1,3 @@
+export type BreadcrumbProps = React.HTMLAttributes<HTMLLIElement>;
+
+export type BreadcrumbsProps = React.HTMLAttributes<HTMLUListElement>;

package/src/components/Button/Button.tsx

@@ -1,40 +1,54 @@
-import c from "clsx";
-import { getButtonClasses } from "./constants";
+import React from "react";
+import { Slot } from "@radix-ui/react-slot";
 import { type ButtonProps } from "./types";
+import { getButtonClasses } from "./constants";
+import { Loading } from "../Loading";
+import { cn } from "../../utilities";
+
+const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
+  (
+    {
+      as,
+      className,
+      outline,
+      children,
+      isLoading,
+      variant,
+      size,
+      wide,
+      ...props
+    },
+    ref
+  ) => {
+    const Comp = as ? Slot : "button";
+    const SlotChild = as ? as : React.Fragment;
+
+    return (
+      <Comp
+        ref={ref}
+        className={cn(
+          getButtonClasses({ size, wide, outline, variant, isLoading }),
+          className
+        )}
+        {...props}
+      >
+        {/* slot merges it's prop into it's immediate child */}
+        <SlotChild>
+          {children}
+          {isLoading ? (
+            <span
+              className="absolute left-0 top-0 flex h-full w-full items-center justify-center bg-[inherit]"
+              data-testid="loading"
+            >
+              <Loading />
+            </span>
+          ) : null}
+        </SlotChild>
+      </Comp>
+    );
+  }
+);
 
-export const Button = (props: ButtonProps) => {
-  const {
-    className,
-    outline,
-    label,
-    disabled,
-    onClick,
-    loading,
-    variant,
-    size,
-    wide,
-    ...rest
-  } = props;
+Button.displayName = "Button";
 
-  return (
-    <button
-      {...rest}
-      onClick={onClick}
-      disabled={disabled}
-      className={c(
-        getButtonClasses({ size, wide, outline, variant, loading }),
-        className
-      )}
-    >
-      {label}
-      {loading ? (
-        <span
-          className="absolute left-0 top-0 flex h-full w-full items-center justify-center bg-[inherit]"
-          data-testid="loading"
-        >
-          <span className="loading loading-spinner" />
-        </span>
-      ) : null}
-    </button>
-  );
-};
+export { Button };