[@mantine/modals] Fix incorrect close modal logic (#3300)

mantinedev · Jan 17, 2023 · a5ee0a4 · a5ee0a4
1 parent 86b3733
commit a5ee0a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/mantine-modals/src/ModalsProvider.tsx b/src/mantine-modals/src/ModalsProvider.tsx
@@ -122,11 +122,6 @@ 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,9 +31,10 @@ export function modalsReducer(
       };
     }
     case 'CLOSE': {
+      const modals = state.modals.filter((m) => m.id !== action.payload);
       return {
-        current: state.modals[state.modals.length - 2] || null,
-        modals: state.modals.filter((m) => m.id !== action.payload),
+        current: modals[modals.length - 1],
+        modals,
       };
     }
     case 'CLOSE_ALL': {