diff --git a/packages/spindle-ui/src/Modal/AppealModal.tsx b/packages/spindle-ui/src/Modal/AppealModal.tsx index 082db6b8d..58b20ac50 100644 --- a/packages/spindle-ui/src/Modal/AppealModal.tsx +++ b/packages/spindle-ui/src/Modal/AppealModal.tsx @@ -42,10 +42,13 @@ const Frame = forwardRef( onClose && onClose(event); }; - const handleDialogClick = (event: React.MouseEvent) => { - // Detect backdrop click + const handleDialogClose = ( + event: React.SyntheticEvent, + ) => { + // Detect backdrop click and EscKey type if (event.target === dialogEl.current) { onClose && onClose(event); + setClosing(false); } }; @@ -105,8 +108,8 @@ const Frame = forwardRef( .join(' ') .trim()} ref={mergeRefs([dialogEl, ref])} - onClick={handleDialogClick} - onClose={() => setClosing(false)} + onClick={handleDialogClose} + onClose={handleDialogClose} {...rest} >