Merge pull request #793 from andrew-bierman/fix-add-item-modal-close

andrew-bierman · Apr 2, 2024 · 145b91b · 145b91b
2 parents 260185b + 1ec7325
commit 145b91b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/packages/app/components/pack/AddItemModal.tsx b/packages/app/components/pack/AddItemModal.tsx
@@ -31,11 +31,15 @@ export const AddItemModal = ({
         },
       ]}
       footerComponent={undefined}
+      isOpen={isAddItemModalOpen}
+      onOpen={() => setIsAddItemModalOpen(true)}
+      onClose={() => setIsAddItemModalOpen(false)}
     >
       <AddItem
         packId={currentPackId}
         currentPack={currentPack}
         setRefetch={setRefetch}
+        closeModalHandler={() => setIsAddItemModalOpen(false)}
       />
     </BaseModal>
   );

diff --git a/packages/ui/src/modal/BaseModal.tsx b/packages/ui/src/modal/BaseModal.tsx
@@ -15,6 +15,7 @@ export interface BaseModalProps {
   triggerComponent?: React.DetailedReactHTMLElement<any, HTMLElement>;
   footerComponent: React.DetailedReactHTMLElement<any, HTMLElement>;
   isOpen?: Boolean;
+  onOpen?: () => void;
   onClose?: () => void;
   showTrigger?: Boolean;
 }
@@ -27,8 +28,9 @@ export const BaseModal = ({
   footerComponent,
   children,
   onClose,
+  onOpen,
   isOpen,
-  showTrigger = true
+  showTrigger = true,
 }: BaseModalProps) => {
   const [isModalOpen, setIsModalOpen] = useState(false);
 
@@ -85,6 +87,7 @@ export const BaseModal = ({
       open={isModalOpen}
       onOpenChange={(open) => {
         setIsModalOpen(open);
+        if (open && onOpen) onOpen();
         if (!open && onClose) onClose();
       }}
     >