fix(spindle-ui): fix close handler to reopen dialog

openameba · Dec 2, 2022 · d71099a · d71099a
1 parent debe75a
commit d71099a
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/packages/spindle-ui/src/Modal/AppealModal.tsx b/packages/spindle-ui/src/Modal/AppealModal.tsx
@@ -42,10 +42,13 @@ const Frame = forwardRef<DialogHTMLElement, AppealModalProps>(
       onClose && onClose(event);
     };
 
-    const handleDialogClick = (event: React.MouseEvent<DialogHTMLElement>) => {
-      // Detect backdrop click
+    const handleDialogClose = (
+      event: React.SyntheticEvent<DialogHTMLElement>,
+    ) => {
+      // Detect backdrop click and EscKey type
       if (event.target === dialogEl.current) {
         onClose && onClose(event);
+        setClosing(false);
       }
     };
 
@@ -57,7 +60,6 @@ const Frame = forwardRef<DialogHTMLElement, AppealModalProps>(
           !event.pseudoElement // To exclude ::backdrop
         ) {
           dialogEl.current.close && dialogEl.current.close();
-          setClosing(false);
         }
       },
       [dialogEl],
@@ -106,7 +108,8 @@ const Frame = forwardRef<DialogHTMLElement, AppealModalProps>(
           .join(' ')
           .trim()}
         ref={mergeRefs([dialogEl, ref])}
-        onClick={handleDialogClick}
+        onClick={handleDialogClose}
+        onClose={handleDialogClose}
         {...rest}
       >
         <form