Merge branch 'master' of github.com:mantinedev/mantine

Author: rtivital

packages/@mantine/core/src/components/AppShell/AppShell.module.css

@@ -61,7 +61,8 @@
   }
 
   :where([data-mode='static'][data-layout='alt']) & {
-    grid-row: var(--app-shell-navbar-grid-row-alt, var(--app-shell-navbar-grid-row, auto));
+    grid-row: 1 / -1;
+    height: 100%;
   }
 }
 
@@ -107,6 +108,10 @@
     border-inline-start: 1px solid var(--app-shell-border-color);
   }
 
+  :where([data-mode='static'][data-layout='alt']) & {
+    grid-row: 1 / -1;
+  }
+
   :where([data-scroll-locked]) & {
     visibility: var(--app-shell-aside-scroll-locked-visibility);
   }
@@ -149,6 +154,7 @@
   }
 
   :where([data-mode='static'][data-layout='alt']) & {
+    grid-column: var(--app-shell-main-column-start, 1) / var(--app-shell-main-column-end, -1);
     margin-inline-start: 0rem;
     margin-inline-end: 0rem;
   }
@@ -183,6 +189,10 @@
     grid-row: var(--app-shell-footer-grid-row, auto);
   }
 
+  :where([data-mode='static'][data-layout='alt']) & {
+    grid-column: var(--app-shell-main-column-start, 1) / var(--app-shell-main-column-end, -1);
+  }
+
   &:where([data-with-border]) {
     border-top: 1px solid var(--app-shell-border-color);
   }

packages/@mantine/modals/src/ModalsProvider.tsx

@@ -12,7 +12,7 @@ import {
   OpenContextModal,
 } from './context';
 import { useModalsEvents } from './events';
-import { modalsReducer } from './reducer';
+import { handleCloseModal, modalsReducer } from './reducer';
 
 export interface ModalsProviderProps {
   /** Your app */
@@ -74,6 +74,12 @@ export function ModalsProvider({ children, modalProps, labels, modals }: ModalsP
 
   const closeAll = useCallback(
     (canceled?: boolean) => {
+      stateRef.current.modals
+        .concat()
+        .reverse()
+        .forEach((modal) => {
+          handleCloseModal(modal, canceled);
+        });
       dispatch({ type: 'CLOSE_ALL', canceled });
     },
     [stateRef, dispatch]
@@ -131,6 +137,10 @@ export function ModalsProvider({ children, modalProps, labels, modals }: ModalsP
 
   const closeModal = useCallback(
     (id: string, canceled?: boolean) => {
+      const modal = stateRef.current.modals.find((m) => m.id === id);
+      if (modal) {
+        handleCloseModal(modal, canceled);
+      }
       dispatch({ type: 'CLOSE', modalId: id, canceled });
     },
     [stateRef, dispatch]

packages/@mantine/modals/src/reducer.ts

@@ -32,7 +32,7 @@ interface UpdateAction {
   newProps: Partial<ModalSettings>;
 }
 
-function handleCloseModal(modal: ModalState, canceled?: boolean) {
+export function handleCloseModal(modal: ModalState, canceled?: boolean) {
   if (canceled && modal.type === 'confirm') {
     modal.props.onCancel?.();
   }
@@ -57,8 +57,6 @@ export function modalsReducer(
         return state;
       }
 
-      handleCloseModal(modal, action.canceled);
-
       const remainingModals = state.modals.filter((m) => m.id !== action.modalId);
 
       return {
@@ -71,14 +69,6 @@ export function modalsReducer(
         return state;
       }
 
-      // Resolve modal stack from top to bottom
-      state.modals
-        .concat()
-        .reverse()
-        .forEach((modal) => {
-          handleCloseModal(modal, action.canceled);
-        });
-
       return {
         current: state.current,
         modals: [],