[@mantine/modals] Fix modals closing issues #3300

This reverts commit a5ee0a4.
mantinedev · Jan 25, 2023 · 02a5053 · 02a5053
1 parent 5a92ed5
commit 02a5053
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/mantine-modals/src/ModalsProvider.tsx b/src/mantine-modals/src/ModalsProvider.tsx
@@ -122,6 +122,11 @@ export function ModalsProvider({ children, modalProps, labels, modals }: ModalsP
   };
 
   const closeModal = (id: string, canceled?: boolean) => {
+    if (state.modals.length <= 1) {
+      closeAll(canceled);
+      return;
+    }
+
     const modal = state.modals.find((item) => item.id === id);
     if (modal?.type === 'confirm' && canceled) {
       modal.props?.onCancel?.();

diff --git a/src/mantine-modals/src/reducer.ts b/src/mantine-modals/src/reducer.ts
@@ -31,10 +31,9 @@ export function modalsReducer(
       };
     }
     case 'CLOSE': {
-      const modals = state.modals.filter((m) => m.id !== action.payload);
       return {
-        current: modals[modals.length - 1],
-        modals,
+        current: state.modals[state.modals.length - 2] || null,
+        modals: state.modals.filter((m) => m.id !== action.payload),
       };
     }
     case 'CLOSE_ALL': {