react-pure-modal 2.2.6 → 2.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-pure-modal",
-  "version": "2.2.6",
+  "version": "2.2.8",
   "description": "React modal",
   "main": "dist/react-pure-modal.min.js",
   "types": "dist/react-pure-modal.d.ts",
@@ -67,7 +67,7 @@
     "yargs": "15.4.1"
   },
   "peerDependencies": {
-    "react": "^15.3.0 || ^16.0 || ^17.0 || ^18.0",
-    "react-dom": "^15.3.0 || ^16.0 || ^17.0 || ^18.0"
+    "react": "^15.3.0 || ^16.0 || ^17.0 || ^18.0 || ^19.0",
+    "react-dom": "^15.3.0 || ^16.0 || ^17.0 || ^18.0 || ^19.0"
   }
 }

package/src/react-pure-modal.tsx

@@ -78,15 +78,25 @@ function PureModal(props: Props) {
     };
   }, [isOpen]);
 
-  const handleEsc = useCallback(event => {
-    const allModals = document.querySelectorAll('.pure-modal');
+  const handleEsc = useCallback(
+    event => {
+      const allModals = document.querySelectorAll('.pure-modal');
+      const isManyModalsOpen = allModals.length > 1; // open modal in modal
+      const firstModalData = allModals[allModals.length - 1];
+
+      if (isManyModalsOpen && !firstModalData.className.includes(hash)) {
+        return false; // closing only current modal
+      }
 
-    if (allModals.length && allModals[allModals.length - 1].classList.contains(hash)) return false;
+      if (event.key === 'Escape' && document.activeElement) {
+        close(event);
+        return true;
+      }
 
-    if (event.key === 'Escape' && document.activeElement) {
-      close(event);
-    }
-  }, []);
+      return false;
+    },
+    [close, hash],
+  );
 
   if (!isOpen) {
     return null;