Merge pull request #17 from broadlume/bugfix/BL-6797-added-support-fo…

…r-modal-close [BL-6797] Modal onClose fixes
broadlume · Nov 5, 2024 · 0f78df1 · 0f78df1
2 parents 383fe0d + ef9b33e
commit 0f78df1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@broadlume/willow-ui",
   "main": "./src/index.ts",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "author": {
     "name": "dreadhalor",
     "url": "https://scotthetrick.com"

diff --git a/src/components/dialog/dialog.tsx b/src/components/dialog/dialog.tsx
@@ -40,8 +40,10 @@ DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
 
 const DialogContent = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
->(({ className, children, ...props }, ref) => (
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & {
+    onClose?: () => void;
+  }
+>(({ className, children, onClose = () => null, ...props }, ref) => (
   <DialogPortal>
     <DialogOverlay />
     <DialogPrimitive.Content
@@ -61,6 +63,7 @@ const DialogContent = React.forwardRef<
           '~ring-offset-background focus:~outline-none focus:~ring-2 focus:~ring-ring focus:~ring-offset-2',
           'data-[state=open]:~bg-accent data-[state=open]:~text-muted-foreground'
         )}
+        onClick={onClose}
       >
         <Cross2Icon className='~h-4 ~w-4' />
         <span className='~sr-only'>Close</span>