Merge pull request #815 from sebgroup/develop

next release
seb-oss · Mar 31, 2023 · 057efb3 · 057efb3
2 parents ba0dc6a + d454cd7
commit 057efb3
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/src/Modal/Modal.tsx b/lib/src/Modal/Modal.tsx
@@ -46,7 +46,6 @@ export const Modal: React.FC<ModalProps> = React.memo(
                 switch (e.key) {
                     case Key.Escape: {
                         onEscape && onEscape(e as unknown as KeyboardEvent);
-                        triggerRef.current?.focus();
                         break;
                     }
                     case Key.Tab: {
@@ -79,8 +78,9 @@ export const Modal: React.FC<ModalProps> = React.memo(
             return () => {
                 document.body.classList.remove("modal-open");
                 triggerRef.current?.focus();
+                triggerRef.current = undefined;
             };
-        }, [toggle]);
+        }, [isPristine, toggle]);
 
         return !safeDocument
             ? null
@@ -109,7 +109,6 @@ export const Modal: React.FC<ModalProps> = React.memo(
 
                           if (onBackdropDismiss && target.classList.contains("rc") && target.classList.contains("modal")) {
                               onBackdropDismiss(e);
-                              triggerRef.current?.focus();
                           }
                       }}
                       onAnimationEnd={(e) => {