@mbao01/common 0.0.27 → 0.0.29

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

@@ -15,6 +15,9 @@ declare const Dialog: {
     Content: React.ForwardRefExoticComponent<Omit<DialogPrimitive.DialogContentProps & React.RefAttributes<HTMLDivElement>, "ref"> & {
         variant?: "dialog" | "sheet" | undefined;
         side?: "top" | "right" | "bottom" | "left" | undefined;
+    } & {
+        showClose?: boolean | undefined;
+        closeProps?: import("./types").DialogCloseProps | undefined;
     } & React.RefAttributes<HTMLDivElement>>;
     Footer: {
         ({ className, ...props }: DialogFooterProps): import("react/jsx-runtime").JSX.Element;

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

@@ -1,10 +1,14 @@
 /// <reference types="react" />
 import * as DialogPrimitive from "@radix-ui/react-dialog";
 import { type VariantProps } from "../../libs";
-import { getDialogContentClasses, getDialogDescriptionClasses, getDialogFooterClasses, getDialogHeaderClasses, getDialogOverlayClasses, getDialogTitleClasses } from "./constants";
+import { getDialogCloseClasses, getDialogContentClasses, getDialogDescriptionClasses, getDialogFooterClasses, getDialogHeaderClasses, getDialogOverlayClasses, getDialogTitleClasses } from "./constants";
 export type DialogProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.Root>;
 export type DialogOverlayProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay> & VariantProps<typeof getDialogOverlayClasses>;
-export type DialogContentProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & VariantProps<typeof getDialogContentClasses>;
+export type DialogCloseProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.Close> & VariantProps<typeof getDialogCloseClasses>;
+export type DialogContentProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & VariantProps<typeof getDialogContentClasses> & {
+    showClose?: boolean;
+    closeProps?: DialogCloseProps;
+};
 export type DialogHeaderProps = React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof getDialogHeaderClasses>;
 export type DialogFooterProps = React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof getDialogFooterClasses>;
 export type DialogTitleProps = React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title> & VariantProps<typeof getDialogTitleClasses>;

package/dist/types/components/Form/components/Label/Label.d.ts

@@ -2,6 +2,6 @@ import type { LabelProps, LabelTextProps } from "./types";
 declare const Label: {
     ({ className, ...props }: LabelProps): import("react/jsx-runtime").JSX.Element;
     displayName: string | undefined;
-    Text: ({ className, ...props }: LabelTextProps) => import("react/jsx-runtime").JSX.Element;
+    Text: ({ className, children, ...props }: LabelTextProps) => import("react/jsx-runtime").JSX.Element;
 };
 export { Label };

package/dist/types/components/Form/components/Label/types.d.ts

@@ -2,5 +2,6 @@
 import * as LabelPrimitive from "@radix-ui/react-label";
 import { type VariantProps } from "../../../../libs";
 import { getLabelClasses } from "./constants";
+import { Text } from "../../../Text";
 export type LabelProps = React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> & VariantProps<typeof getLabelClasses>;
-export type LabelTextProps = React.HTMLAttributes<HTMLSpanElement>;
+export type LabelTextProps = Omit<React.ComponentProps<typeof Text>, "as">;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mbao01/common",
   "private": false,
-  "version": "0.0.27",
+  "version": "0.0.29",
   "type": "module",
   "author": "Ayomide Bakare",
   "license": "MIT",
@@ -142,5 +142,5 @@
     "react-dom": "^18.2.0",
     "typescript": "^5.2.2"
   },
-  "gitHead": "011f80eb4c8b456df0a2af179f46f57000a603b5"
+  "gitHead": "1ccc8b44c98ab629a4ec708e3ee1bee6d9e13be8"
 }

package/src/components/Dialog/Dialog.tsx

@@ -42,7 +42,15 @@ const DialogContent = React.forwardRef<
   DialogContentProps
 >(
   (
-    { className, children, variant = "dialog", side = "right", ...props },
+    {
+      className,
+      children,
+      closeProps,
+      variant = "dialog",
+      showClose = true,
+      side = "right",
+      ...props
+    },
     ref
   ) => (
     <DialogPrimitive.Portal>
@@ -59,10 +67,15 @@ const DialogContent = React.forwardRef<
         {...props}
       >
         {children}
-        <DialogPrimitive.Close className={cn(getDialogCloseClasses())}>
-          <Cross2Icon className="h-4 w-4" />
-          <span className="sr-only">Close</span>
-        </DialogPrimitive.Close>
+        {showClose ? (
+          <DialogPrimitive.Close
+            {...closeProps}
+            className={cn(getDialogCloseClasses(), closeProps?.className)}
+          >
+            <Cross2Icon className="h-4 w-4" />
+            <span className="sr-only">Close</span>
+          </DialogPrimitive.Close>
+        ) : null}
       </DialogPrimitive.Content>
     </DialogPrimitive.Portal>
   )

package/src/components/Dialog/types.ts

@@ -1,6 +1,7 @@
 import * as DialogPrimitive from "@radix-ui/react-dialog";
 import { type VariantProps } from "../../libs";
 import {
+  getDialogCloseClasses,
   getDialogContentClasses,
   getDialogDescriptionClasses,
   getDialogFooterClasses,
@@ -18,10 +19,18 @@ export type DialogOverlayProps = React.ComponentPropsWithoutRef<
 > &
   VariantProps<typeof getDialogOverlayClasses>;
 
+export type DialogCloseProps = React.ComponentPropsWithoutRef<
+  typeof DialogPrimitive.Close
+> &
+  VariantProps<typeof getDialogCloseClasses>;
+
 export type DialogContentProps = React.ComponentPropsWithoutRef<
   typeof DialogPrimitive.Content
 > &
-  VariantProps<typeof getDialogContentClasses>;
+  VariantProps<typeof getDialogContentClasses> & {
+    showClose?: boolean;
+    closeProps?: DialogCloseProps;
+  };
 
 export type DialogHeaderProps = React.HTMLAttributes<HTMLDivElement> &
   VariantProps<typeof getDialogHeaderClasses>;

package/src/components/Form/components/Label/Label.tsx

@@ -1,5 +1,6 @@
 import * as LabelPrimitive from "@radix-ui/react-label";
 import type { LabelProps, LabelTextProps } from "./types";
+import { Text } from "../../../Text";
 import { cn } from "../../../../utilities";
 import { getLabelClasses } from "./constants";
 
@@ -11,10 +12,10 @@ const Label = ({ className, ...props }: LabelProps) => (
 );
 Label.displayName = LabelPrimitive.Root.displayName;
 
-const LabelText = ({ className, ...props }: LabelTextProps) => (
-  <span className={cn("label-text", className)} {...props}>
-    Pick the best fantasy franchise
-  </span>
+const LabelText = ({ className, children, ...props }: LabelTextProps) => (
+  <Text as="span" className={cn("label-text", className)} {...props}>
+    {children}
+  </Text>
 );
 
 Label.Text = LabelText;

package/src/components/Form/components/Label/types.ts

@@ -1,10 +1,11 @@
 import * as LabelPrimitive from "@radix-ui/react-label";
 import { type VariantProps } from "../../../../libs";
 import { getLabelClasses } from "./constants";
+import { Text } from "../../../Text";
 
 export type LabelProps = React.ComponentPropsWithoutRef<
   typeof LabelPrimitive.Root
 > &
   VariantProps<typeof getLabelClasses>;
 
-export type LabelTextProps = React.HTMLAttributes<HTMLSpanElement>;
+export type LabelTextProps = Omit<React.ComponentProps<typeof Text>, "as">;