@ionic/core 8.7.18-nightly.20260212 → 8.7.18-nightly.20260216

package/components/modal.js

@@ -1471,9 +1471,170 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
     };
 };
 
-const modalIosCss = ":host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--overflow:hidden;--border-radius:0;--border-width:0;--border-style:none;--border-color:transparent;--background:var(--ion-background-color, #fff);--box-shadow:none;--backdrop-opacity:0;left:0;right:0;top:0;bottom:0;display:-ms-flexbox;display:flex;position:absolute;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;outline:none;color:var(--ion-text-color, #000);contain:strict}.modal-wrapper,ion-backdrop{pointer-events:auto}:host(.overlay-hidden){display:none}.modal-wrapper,.modal-shadow{border-radius:var(--border-radius);width:var(--width);min-width:var(--min-width);max-width:var(--max-width);height:var(--height);min-height:var(--min-height);max-height:var(--max-height);border-width:var(--border-width);border-style:var(--border-style);border-color:var(--border-color);background:var(--background);-webkit-box-shadow:var(--box-shadow);box-shadow:var(--box-shadow);overflow:var(--overflow);z-index:10}.modal-shadow{position:absolute;background:transparent}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--width:600px;--height:500px;--ion-safe-area-top:0px;--ion-safe-area-bottom:0px;--ion-safe-area-right:0px;--ion-safe-area-left:0px}}@media only screen and (min-width: 768px) and (min-height: 768px){:host{--width:600px;--height:600px}}.modal-handle{left:0px;right:0px;top:5px;border-radius:8px;-webkit-margin-start:auto;margin-inline-start:auto;-webkit-margin-end:auto;margin-inline-end:auto;position:absolute;width:36px;height:5px;-webkit-transform:translateZ(0);transform:translateZ(0);border:0;background:var(--ion-color-step-350, var(--ion-background-color-step-350, #c0c0be));cursor:pointer;z-index:11}.modal-handle::before{-webkit-padding-start:4px;padding-inline-start:4px;-webkit-padding-end:4px;padding-inline-end:4px;padding-top:4px;padding-bottom:4px;position:absolute;width:36px;height:5px;-webkit-transform:translate(-50%, -50%);transform:translate(-50%, -50%);content:\"\"}:host(.modal-sheet){--height:calc(100% - (var(--ion-safe-area-top) + 10px))}:host(.modal-sheet) .modal-wrapper,:host(.modal-sheet) .modal-shadow{position:absolute;bottom:0}:host(.modal-sheet.modal-no-expand-scroll) ion-footer{position:absolute;bottom:0;width:var(--width)}:host{--backdrop-opacity:var(--ion-backdrop-opacity, 0.4)}:host(.modal-card),:host(.modal-sheet){--border-radius:10px}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--border-radius:10px}}.modal-wrapper{-webkit-transform:translate3d(0,  100%,  0);transform:translate3d(0,  100%,  0)}@media screen and (max-width: 767px){@supports (width: max(0px, 1px)){:host(.modal-card){--height:calc(100% - max(30px, var(--ion-safe-area-top)) - 10px)}}@supports not (width: max(0px, 1px)){:host(.modal-card){--height:calc(100% - 40px)}}:host(.modal-card) .modal-wrapper{border-start-start-radius:var(--border-radius);border-start-end-radius:var(--border-radius);border-end-end-radius:0;border-end-start-radius:0}:host(.modal-card){--backdrop-opacity:0;--width:100%;-ms-flex-align:end;align-items:flex-end}:host(.modal-card) .modal-shadow{display:none}:host(.modal-card) ion-backdrop{pointer-events:none}}@media screen and (min-width: 768px){:host(.modal-card){--width:calc(100% - 120px);--height:calc(100% - (120px + var(--ion-safe-area-top) + var(--ion-safe-area-bottom)));--max-width:720px;--max-height:1000px;--backdrop-opacity:0;--box-shadow:0px 0px 30px 10px rgba(0, 0, 0, 0.1);-webkit-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out}:host(.modal-card) .modal-wrapper{-webkit-box-shadow:none;box-shadow:none}:host(.modal-card) .modal-shadow{-webkit-box-shadow:var(--box-shadow);box-shadow:var(--box-shadow)}}:host(.modal-sheet) .modal-wrapper{border-start-start-radius:var(--border-radius);border-start-end-radius:var(--border-radius);border-end-end-radius:0;border-end-start-radius:0}";
+/**
+ * These thresholds match the SCSS media query breakpoints in modal.vars.scss
+ * that trigger the centered dialog layout (non-fullscreen modal).
+ *
+ * SCSS defines two height breakpoints: $modal-inset-min-height-small (600px)
+ * and $modal-inset-min-height-large (768px). We use the smaller one because
+ * that's the threshold where the modal transitions from fullscreen to centered
+ * dialog — the larger breakpoint only increases the dialog's height.
+ */
+const MODAL_INSET_MIN_WIDTH = 768;
+const MODAL_INSET_MIN_HEIGHT = 600;
+const EDGE_THRESHOLD = 5;
+/**
+ * Cache for resolved root safe-area-top value, invalidated once per frame.
+ */
+let cachedRootSafeAreaTop = null;
+let cacheInvalidationScheduled = false;
+/**
+ * Determines if the current viewport meets the CSS media query conditions
+ * that cause regular modals to render as centered dialogs instead of fullscreen.
+ * Matches: @media (min-width: 768px) and (min-height: 600px)
+ */
+const isCenteredDialogViewport = () => {
+    if (!win)
+        return false;
+    return win.matchMedia(`(min-width: ${MODAL_INSET_MIN_WIDTH}px) and (min-height: ${MODAL_INSET_MIN_HEIGHT}px)`)
+        .matches;
+};
+/**
+ * Resolves the current root --ion-safe-area-top value to pixels.
+ * Uses a temporary element because getComputedStyle on :root returns
+ * the declared value of custom properties (e.g. "env(safe-area-inset-top)")
+ * rather than a resolved number.
+ *
+ * Results are cached for the current frame to avoid repeated reflows.
+ */
+const getRootSafeAreaTop = () => {
+    if (cachedRootSafeAreaTop !== null) {
+        return cachedRootSafeAreaTop;
+    }
+    const doc = win === null || win === void 0 ? void 0 : win.document;
+    if (!(doc === null || doc === void 0 ? void 0 : doc.body)) {
+        return 0;
+    }
+    const el = doc.createElement('div');
+    el.style.cssText =
+        'position:fixed;visibility:hidden;pointer-events:none;top:0;left:0;' + 'padding-top:var(--ion-safe-area-top,0px);';
+    doc.body.appendChild(el);
+    const value = parseFloat(getComputedStyle(el).paddingTop) || 0;
+    el.remove();
+    cachedRootSafeAreaTop = value;
+    if (!cacheInvalidationScheduled) {
+        cacheInvalidationScheduled = true;
+        raf(() => {
+            cachedRootSafeAreaTop = null;
+            cacheInvalidationScheduled = false;
+        });
+    }
+    return value;
+};
+/**
+ * Returns the initial safe-area configuration based on modal type.
+ * This is called before animation starts and uses configuration-based prediction.
+ *
+ * @param context - Modal context information
+ * @returns SafeAreaConfig with initial safe-area values
+ */
+const getInitialSafeAreaConfig = (context) => {
+    const { isSheetModal, isCardModal } = context;
+    // Sheet modals always zero top safe-area. The sheet height offset from the
+    // top edge is handled by --ion-modal-offset-top (set in modal.tsx) using
+    // the resolved root value, so --ion-safe-area-top is never needed for
+    // height calculation. Keeping it at 0px prevents header content from
+    // getting double-offset padding.
+    if (isSheetModal) {
+        return {
+            top: '0px',
+            bottom: 'inherit',
+            left: '0px',
+            right: '0px',
+        };
+    }
+    // Card modals need safe-area for height calculation.
+    // Note: isCardModal is already gated on mode === 'ios' by the caller.
+    if (isCardModal) {
+        return {
+            top: 'inherit',
+            bottom: 'inherit',
+            left: '0px',
+            right: '0px',
+        };
+    }
+    // On viewports that meet the centered dialog media query breakpoints,
+    // regular modals render as centered dialogs (not fullscreen), so they
+    // don't touch any screen edges and don't need safe-area insets.
+    if (isCenteredDialogViewport()) {
+        return {
+            top: '0px',
+            bottom: '0px',
+            left: '0px',
+            right: '0px',
+        };
+    }
+    // Fullscreen modals on phone - inherit all safe areas
+    return {
+        top: 'inherit',
+        bottom: 'inherit',
+        left: 'inherit',
+        right: 'inherit',
+    };
+};
+/**
+ * Returns safe-area configuration based on actual modal position.
+ * Detects which edges the modal overlaps with and only applies safe-area to those edges.
+ *
+ * Note: On Android edge-to-edge (API 36+), getBoundingClientRect() may report
+ * inconsistent values. Sheet and card modals avoid this by using configuration-based
+ * prediction instead. Regular modals use coordinate detection which works reliably
+ * on web and iOS; Android edge-to-edge may need a configuration-based fallback
+ * once a reliable detection mechanism is available.
+ *
+ * @param wrapperEl - The modal wrapper element to measure
+ * @returns SafeAreaConfig based on position
+ */
+const getPositionBasedSafeAreaConfig = (wrapperEl) => {
+    var _a, _b;
+    const rect = wrapperEl.getBoundingClientRect();
+    const vh = (_a = win === null || win === void 0 ? void 0 : win.innerHeight) !== null && _a !== void 0 ? _a : 0;
+    const vw = (_b = win === null || win === void 0 ? void 0 : win.innerWidth) !== null && _b !== void 0 ? _b : 0;
+    // Only apply safe-area to sides where modal overlaps with screen edge
+    return {
+        top: rect.top <= EDGE_THRESHOLD ? 'inherit' : '0px',
+        bottom: rect.bottom >= vh - EDGE_THRESHOLD ? 'inherit' : '0px',
+        left: rect.left <= EDGE_THRESHOLD ? 'inherit' : '0px',
+        right: rect.right >= vw - EDGE_THRESHOLD ? 'inherit' : '0px',
+    };
+};
+/**
+ * Applies safe-area CSS custom property overrides to the modal host element.
+ *
+ * @param hostEl - The modal host element (ion-modal)
+ * @param config - Safe-area configuration to apply
+ */
+const applySafeAreaOverrides = (hostEl, config) => {
+    hostEl.style.setProperty('--ion-safe-area-top', config.top);
+    hostEl.style.setProperty('--ion-safe-area-bottom', config.bottom);
+    hostEl.style.setProperty('--ion-safe-area-left', config.left);
+    hostEl.style.setProperty('--ion-safe-area-right', config.right);
+};
+/**
+ * Clears safe-area CSS custom property overrides from the modal host element.
+ *
+ * @param hostEl - The modal host element (ion-modal)
+ */
+const clearSafeAreaOverrides = (hostEl) => {
+    hostEl.style.removeProperty('--ion-safe-area-top');
+    hostEl.style.removeProperty('--ion-safe-area-bottom');
+    hostEl.style.removeProperty('--ion-safe-area-left');
+    hostEl.style.removeProperty('--ion-safe-area-right');
+};
+
+const modalIosCss = ":host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--overflow:hidden;--border-radius:0;--border-width:0;--border-style:none;--border-color:transparent;--background:var(--ion-background-color, #fff);--box-shadow:none;--backdrop-opacity:0;left:0;right:0;top:0;bottom:0;display:-ms-flexbox;display:flex;position:absolute;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;outline:none;color:var(--ion-text-color, #000);contain:strict}.modal-wrapper,ion-backdrop{pointer-events:auto}:host(.overlay-hidden){display:none}.modal-wrapper,.modal-shadow{border-radius:var(--border-radius);width:var(--width);min-width:var(--min-width);max-width:var(--max-width);height:var(--height);min-height:var(--min-height);max-height:var(--max-height);border-width:var(--border-width);border-style:var(--border-style);border-color:var(--border-color);background:var(--background);-webkit-box-shadow:var(--box-shadow);box-shadow:var(--box-shadow);overflow:var(--overflow);z-index:10}.modal-shadow{position:absolute;background:transparent}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--width:600px;--height:500px}}@media only screen and (min-width: 768px) and (min-height: 768px){:host{--width:600px;--height:600px}}.modal-handle{left:0px;right:0px;top:5px;border-radius:8px;-webkit-margin-start:auto;margin-inline-start:auto;-webkit-margin-end:auto;margin-inline-end:auto;position:absolute;width:36px;height:5px;-webkit-transform:translateZ(0);transform:translateZ(0);border:0;background:var(--ion-color-step-350, var(--ion-background-color-step-350, #c0c0be));cursor:pointer;z-index:11}.modal-handle::before{-webkit-padding-start:4px;padding-inline-start:4px;-webkit-padding-end:4px;padding-inline-end:4px;padding-top:4px;padding-bottom:4px;position:absolute;width:36px;height:5px;-webkit-transform:translate(-50%, -50%);transform:translate(-50%, -50%);content:\"\"}:host(.modal-sheet){--height:calc(100% - (var(--ion-modal-offset-top, 0px) + 10px))}:host(.modal-sheet) .modal-wrapper,:host(.modal-sheet) .modal-shadow{position:absolute;bottom:0}:host(.modal-sheet.modal-no-expand-scroll) ion-footer{position:absolute;bottom:0;width:var(--width)}:host{--backdrop-opacity:var(--ion-backdrop-opacity, 0.4)}:host(.modal-card),:host(.modal-sheet){--border-radius:10px}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--border-radius:10px}}.modal-wrapper{-webkit-transform:translate3d(0,  100%,  0);transform:translate3d(0,  100%,  0)}@media screen and (max-width: 767px){@supports (width: max(0px, 1px)){:host(.modal-card){--height:calc(100% - max(30px, var(--ion-safe-area-top)) - 10px)}}@supports not (width: max(0px, 1px)){:host(.modal-card){--height:calc(100% - 40px)}}:host(.modal-card) .modal-wrapper{border-start-start-radius:var(--border-radius);border-start-end-radius:var(--border-radius);border-end-end-radius:0;border-end-start-radius:0}:host(.modal-card){--backdrop-opacity:0;--width:100%;-ms-flex-align:end;align-items:flex-end}:host(.modal-card) .modal-shadow{display:none}:host(.modal-card) ion-backdrop{pointer-events:none}}@media screen and (min-width: 768px){:host(.modal-card){--width:calc(100% - 120px);--height:calc(100% - (120px + var(--ion-safe-area-top) + var(--ion-safe-area-bottom)));--max-width:720px;--max-height:1000px;--backdrop-opacity:0;--box-shadow:0px 0px 30px 10px rgba(0, 0, 0, 0.1);-webkit-transition:all 0.5s ease-in-out;transition:all 0.5s ease-in-out}:host(.modal-card) .modal-wrapper{-webkit-box-shadow:none;box-shadow:none}:host(.modal-card) .modal-shadow{-webkit-box-shadow:var(--box-shadow);box-shadow:var(--box-shadow)}}:host(.modal-sheet) .modal-wrapper{border-start-start-radius:var(--border-radius);border-start-end-radius:var(--border-radius);border-end-end-radius:0;border-end-start-radius:0}";
 
-const modalMdCss = ":host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--overflow:hidden;--border-radius:0;--border-width:0;--border-style:none;--border-color:transparent;--background:var(--ion-background-color, #fff);--box-shadow:none;--backdrop-opacity:0;left:0;right:0;top:0;bottom:0;display:-ms-flexbox;display:flex;position:absolute;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;outline:none;color:var(--ion-text-color, #000);contain:strict}.modal-wrapper,ion-backdrop{pointer-events:auto}:host(.overlay-hidden){display:none}.modal-wrapper,.modal-shadow{border-radius:var(--border-radius);width:var(--width);min-width:var(--min-width);max-width:var(--max-width);height:var(--height);min-height:var(--min-height);max-height:var(--max-height);border-width:var(--border-width);border-style:var(--border-style);border-color:var(--border-color);background:var(--background);-webkit-box-shadow:var(--box-shadow);box-shadow:var(--box-shadow);overflow:var(--overflow);z-index:10}.modal-shadow{position:absolute;background:transparent}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--width:600px;--height:500px;--ion-safe-area-top:0px;--ion-safe-area-bottom:0px;--ion-safe-area-right:0px;--ion-safe-area-left:0px}}@media only screen and (min-width: 768px) and (min-height: 768px){:host{--width:600px;--height:600px}}.modal-handle{left:0px;right:0px;top:5px;border-radius:8px;-webkit-margin-start:auto;margin-inline-start:auto;-webkit-margin-end:auto;margin-inline-end:auto;position:absolute;width:36px;height:5px;-webkit-transform:translateZ(0);transform:translateZ(0);border:0;background:var(--ion-color-step-350, var(--ion-background-color-step-350, #c0c0be));cursor:pointer;z-index:11}.modal-handle::before{-webkit-padding-start:4px;padding-inline-start:4px;-webkit-padding-end:4px;padding-inline-end:4px;padding-top:4px;padding-bottom:4px;position:absolute;width:36px;height:5px;-webkit-transform:translate(-50%, -50%);transform:translate(-50%, -50%);content:\"\"}:host(.modal-sheet){--height:calc(100% - (var(--ion-safe-area-top) + 10px))}:host(.modal-sheet) .modal-wrapper,:host(.modal-sheet) .modal-shadow{position:absolute;bottom:0}:host(.modal-sheet.modal-no-expand-scroll) ion-footer{position:absolute;bottom:0;width:var(--width)}:host{--backdrop-opacity:var(--ion-backdrop-opacity, 0.32)}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--border-radius:2px;--box-shadow:0 28px 48px rgba(0, 0, 0, 0.4)}}.modal-wrapper{-webkit-transform:translate3d(0,  40px,  0);transform:translate3d(0,  40px,  0);opacity:0.01}";
+const modalMdCss = ":host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--overflow:hidden;--border-radius:0;--border-width:0;--border-style:none;--border-color:transparent;--background:var(--ion-background-color, #fff);--box-shadow:none;--backdrop-opacity:0;left:0;right:0;top:0;bottom:0;display:-ms-flexbox;display:flex;position:absolute;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;outline:none;color:var(--ion-text-color, #000);contain:strict}.modal-wrapper,ion-backdrop{pointer-events:auto}:host(.overlay-hidden){display:none}.modal-wrapper,.modal-shadow{border-radius:var(--border-radius);width:var(--width);min-width:var(--min-width);max-width:var(--max-width);height:var(--height);min-height:var(--min-height);max-height:var(--max-height);border-width:var(--border-width);border-style:var(--border-style);border-color:var(--border-color);background:var(--background);-webkit-box-shadow:var(--box-shadow);box-shadow:var(--box-shadow);overflow:var(--overflow);z-index:10}.modal-shadow{position:absolute;background:transparent}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--width:600px;--height:500px}}@media only screen and (min-width: 768px) and (min-height: 768px){:host{--width:600px;--height:600px}}.modal-handle{left:0px;right:0px;top:5px;border-radius:8px;-webkit-margin-start:auto;margin-inline-start:auto;-webkit-margin-end:auto;margin-inline-end:auto;position:absolute;width:36px;height:5px;-webkit-transform:translateZ(0);transform:translateZ(0);border:0;background:var(--ion-color-step-350, var(--ion-background-color-step-350, #c0c0be));cursor:pointer;z-index:11}.modal-handle::before{-webkit-padding-start:4px;padding-inline-start:4px;-webkit-padding-end:4px;padding-inline-end:4px;padding-top:4px;padding-bottom:4px;position:absolute;width:36px;height:5px;-webkit-transform:translate(-50%, -50%);transform:translate(-50%, -50%);content:\"\"}:host(.modal-sheet){--height:calc(100% - (var(--ion-modal-offset-top, 0px) + 10px))}:host(.modal-sheet) .modal-wrapper,:host(.modal-sheet) .modal-shadow{position:absolute;bottom:0}:host(.modal-sheet.modal-no-expand-scroll) ion-footer{position:absolute;bottom:0;width:var(--width)}:host{--backdrop-opacity:var(--ion-backdrop-opacity, 0.32)}@media only screen and (min-width: 768px) and (min-height: 600px){:host{--border-radius:2px;--box-shadow:0 28px 48px rgba(0, 0, 0, 0.4)}}.modal-wrapper{-webkit-transform:translate3d(0,  40px,  0);transform:translate3d(0,  40px,  0);opacity:0.01}";
 
 const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
     constructor(registerHost) {
@@ -1690,13 +1851,31 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
         }
     }
     onWindowResize() {
-        // Only handle resize for iOS card modals when no custom animations are provided
-        if (getIonMode(this) !== 'ios' || !this.presentingElement || this.enterAnimation || this.leaveAnimation) {
+        if (!this.presented)
             return;
-        }
         clearTimeout(this.resizeTimeout);
         this.resizeTimeout = setTimeout(() => {
-            this.handleViewTransition();
+            const context = this.getSafeAreaContext();
+            // iOS card modals: handle portrait/landscape view transitions
+            if (context.isCardModal && !this.enterAnimation && !this.leaveAnimation) {
+                this.handleViewTransition();
+            }
+            // Sheet modals: re-compute the internal offset property since safe-area
+            // values may change on device rotation (e.g., portrait notch vs landscape).
+            if (context.isSheetModal) {
+                this.updateSheetOffsetTop();
+            }
+            // Regular (non-sheet, non-card) modals: update safe-area overrides
+            // since the viewport may have crossed the centered-dialog breakpoint.
+            if (!context.isSheetModal && !context.isCardModal) {
+                this.updateSafeAreaOverrides();
+                // Re-evaluate fullscreen safe-area padding: clear first, then re-apply
+                if (this.wrapperEl) {
+                    this.wrapperEl.style.removeProperty('height');
+                    this.wrapperEl.style.removeProperty('padding-bottom');
+                }
+                this.applyFullscreenSafeArea();
+            }
         }, 50); // Debounce to avoid excessive calls during active resizing
     }
     breakpointsChanged(breakpoints) {
@@ -1713,6 +1892,9 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
         this.triggerController.removeClickListener();
         this.cleanupViewTransitionListener();
         this.cleanupParentRemovalObserver();
+        // Also called in dismiss() — intentional dual cleanup covers both
+        // dismiss-then-remove and direct DOM removal without dismiss.
+        this.cleanupSafeAreaOverrides();
     }
     componentWillLoad() {
         var _a;
@@ -1873,6 +2055,11 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
             await waitForMount();
         }
         writeTask(() => this.el.classList.add('show-modal'));
+        // Recalculate isSheetModal before safe-area setup because framework
+        // bindings (e.g., Angular) may not have been applied when componentWillLoad ran.
+        this.isSheetModal = this.breakpoints !== undefined && this.initialBreakpoint !== undefined;
+        // Set initial safe-area overrides before animation
+        this.setInitialSafeAreaOverrides();
         const hasCardModal = presentingElement !== undefined;
         /**
          * We need to change the status bar at the
@@ -1890,6 +2077,10 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
             backdropBreakpoint: this.backdropBreakpoint,
             expandToScroll: this.expandToScroll,
         });
+        // Update safe-area based on actual position after animation
+        this.updateSafeAreaOverrides();
+        // Apply fullscreen safe-area padding if needed
+        this.applyFullscreenSafeArea();
         /* tslint:disable-next-line */
         if (typeof window !== 'undefined') {
             /**
@@ -1921,13 +2112,7 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
             };
             window.addEventListener(KEYBOARD_DID_OPEN, this.keyboardOpenCallback);
         }
-        /**
-         * Recalculate isSheetModal because framework bindings (e.g., Angular)
-         * may not have been applied when componentWillLoad ran.
-         */
-        const isSheetModal = this.breakpoints !== undefined && this.initialBreakpoint !== undefined;
-        this.isSheetModal = isSheetModal;
-        if (isSheetModal) {
+        if (this.isSheetModal) {
             this.initSheetGesture();
         }
         else if (hasCardModal) {
@@ -2117,6 +2302,9 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
         if (this.gestureAnimationDismissing && role !== GESTURE) {
             return false;
         }
+        // Cancel any pending resize timeout to prevent stale updates during dismiss
+        clearTimeout(this.resizeTimeout);
+        this.resizeTimeout = undefined;
         /**
          * Because the canDismiss check below is async,
          * we need to claim a lock before the check happens,
@@ -2171,6 +2359,7 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
             }
             this.cleanupViewTransitionListener();
             this.cleanupParentRemovalObserver();
+            this.cleanupSafeAreaOverrides();
             this.cleanupChildRoutePassthrough();
         }
         this.currentBreakpoint = undefined;
@@ -2291,6 +2480,9 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
         this.viewTransitionAnimation = transitionAnimation;
         transitionAnimation.play().then(() => {
             this.viewTransitionAnimation = undefined;
+            // Wait for a layout pass after the transition so getBoundingClientRect()
+            // in getPositionBasedSafeAreaConfig() reflects the new dimensions.
+            raf(() => this.updateSafeAreaOverrides());
             // After orientation transition, recreate the swipe-to-close gesture
             // with updated animation that reflects the new presenting element state
             this.reinitSwipeToClose();
@@ -2417,6 +2609,123 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
         (_a = this.parentRemovalObserver) === null || _a === void 0 ? void 0 : _a.disconnect();
         this.parentRemovalObserver = undefined;
     }
+    /**
+     * Creates the context object for safe-area utilities.
+     */
+    getSafeAreaContext() {
+        return {
+            isSheetModal: this.isSheetModal,
+            isCardModal: this.presentingElement !== undefined && getIonMode(this) === 'ios',
+            presentingElement: this.presentingElement,
+            breakpoints: this.breakpoints,
+            currentBreakpoint: this.currentBreakpoint,
+        };
+    }
+    /**
+     * Sets initial safe-area overrides before modal animation.
+     * Called in present() before animation starts.
+     *
+     * For sheet modals, the SCSS --height formula uses --ion-modal-offset-top
+     * (an internal property) instead of --ion-safe-area-top. We resolve the
+     * root safe-area-top to pixels and set --ion-modal-offset-top, decoupling
+     * the height calculation from --ion-safe-area-top (which is zeroed for
+     * sheets to prevent header content from getting double-offset padding).
+     */
+    setInitialSafeAreaOverrides() {
+        const context = this.getSafeAreaContext();
+        const safeAreaConfig = getInitialSafeAreaConfig(context);
+        applySafeAreaOverrides(this.el, safeAreaConfig);
+        // Set the internal offset property with the resolved root safe-area-top value
+        if (context.isSheetModal) {
+            this.updateSheetOffsetTop();
+        }
+    }
+    /**
+     * Resolves the current root --ion-safe-area-top value and sets the
+     * internal --ion-modal-offset-top property on the host element.
+     * Called on present and on resize (e.g., device rotation changes safe-area).
+     */
+    updateSheetOffsetTop() {
+        const safeAreaTop = getRootSafeAreaTop();
+        this.el.style.setProperty('--ion-modal-offset-top', `${safeAreaTop}px`);
+    }
+    /**
+     * Updates safe-area overrides during dynamic state changes.
+     * Called after animations, during gestures, and on orientation changes.
+     */
+    updateSafeAreaOverrides() {
+        const { wrapperEl, el } = this;
+        const context = this.getSafeAreaContext();
+        // Sheet modals: safe-area is fully determined at presentation time
+        // (top is always 0px, height is frozen). Nothing to update.
+        if (context.isSheetModal)
+            return;
+        // Card modals have fixed safe-area requirements set by initial prediction.
+        if (context.isCardModal)
+            return;
+        // wrapperEl is required for position-based detection below
+        if (!wrapperEl)
+            return;
+        // Regular modals: use position-based detection to correctly handle both
+        // fullscreen modals and centered dialogs with custom dimensions.
+        const safeAreaConfig = getPositionBasedSafeAreaConfig(wrapperEl);
+        applySafeAreaOverrides(el, safeAreaConfig);
+    }
+    /**
+     * Applies padding-bottom to fullscreen modal wrapper to prevent
+     * content from overlapping system navigation bar.
+     */
+    applyFullscreenSafeArea() {
+        const { wrapperEl, el } = this;
+        if (!wrapperEl)
+            return;
+        const context = this.getSafeAreaContext();
+        if (context.isSheetModal || context.isCardModal)
+            return;
+        // Check for standard Ionic layout children (ion-content, ion-footer),
+        // searching one level deep for wrapped components (e.g.,
+        // <app-footer><ion-footer>...</ion-footer></app-footer>).
+        // Note: uses a manual loop instead of querySelector(':scope > ...') because
+        // Stencil's mock-doc (used in spec tests) does not support :scope.
+        let hasContent = false;
+        let hasFooter = false;
+        for (const child of Array.from(el.children)) {
+            if (child.tagName === 'ION-CONTENT')
+                hasContent = true;
+            if (child.tagName === 'ION-FOOTER')
+                hasFooter = true;
+            for (const grandchild of Array.from(child.children)) {
+                if (grandchild.tagName === 'ION-CONTENT')
+                    hasContent = true;
+                if (grandchild.tagName === 'ION-FOOTER')
+                    hasFooter = true;
+            }
+        }
+        // Only apply wrapper padding for standard Ionic layouts (has ion-content
+        // but no ion-footer). Custom modals with raw HTML are fully
+        // developer-controlled and should not be modified.
+        if (!hasContent || hasFooter)
+            return;
+        // Reduce wrapper height by safe-area and add equivalent padding so the
+        // total visual size stays the same but the flex content area shrinks.
+        // Using height + padding instead of box-sizing: border-box avoids
+        // breaking custom modals that set --border-width (border-box would
+        // include the border inside the height, changing the layout).
+        wrapperEl.style.setProperty('height', 'calc(var(--height) - var(--ion-safe-area-bottom, 0px))');
+        wrapperEl.style.setProperty('padding-bottom', 'var(--ion-safe-area-bottom, 0px)');
+    }
+    /**
+     * Clears all safe-area overrides and padding from wrapper.
+     */
+    cleanupSafeAreaOverrides() {
+        clearSafeAreaOverrides(this.el);
+        // Remove internal sheet offset property
+        this.el.style.removeProperty('--ion-modal-offset-top');
+        if (this.wrapperEl) {
+            this.wrapperEl.style.removeProperty('height');
+            this.wrapperEl.style.removeProperty('padding-bottom');
+        }
+    }
     render() {
         const { handle, isSheetModal, presentingElement, htmlAttributes, handleBehavior, inheritedAttributes, focusTrap, expandToScroll, } = this;
         const showHandle = handle !== false && isSheetModal;
@@ -2424,20 +2733,20 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
         const isCardModal = presentingElement !== undefined && mode === 'ios';
         const isHandleCycle = handleBehavior === 'cycle';
         const isSheetModalWithHandle = isSheetModal && showHandle;
-        return (h(Host, Object.assign({ key: '87328006ea6c75ebc518ace300438492a567223e', "no-router": true,
+        return (h(Host, Object.assign({ key: '038ae26c2cb040043c7d0c217a4de6a7ae909235', "no-router": true,
             // Allow the modal to be navigable when the handle is focusable
             tabIndex: isHandleCycle && isSheetModalWithHandle ? 0 : -1 }, htmlAttributes, { style: {
                 zIndex: `${20000 + this.overlayIndex}`,
-            }, class: Object.assign({ [mode]: true, ['modal-default']: !isCardModal && !isSheetModal, [`modal-card`]: isCardModal, [`modal-sheet`]: isSheetModal, [`modal-no-expand-scroll`]: isSheetModal && !expandToScroll, 'overlay-hidden': true, [FOCUS_TRAP_DISABLE_CLASS]: focusTrap === false }, getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }), h("ion-backdrop", { key: 'ee94ff8e09b691dd4ad4e4db1720f06bc3c5a469', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: 'bffd69b4635c22d9f249725bd952c1e93d5615c7', class: "modal-shadow" }), h("div", Object.assign({ key: '1d394d3c68916e464ff1fbf5242419f4a3d3cca1',
+            }, class: Object.assign({ [mode]: true, ['modal-default']: !isCardModal && !isSheetModal, [`modal-card`]: isCardModal, [`modal-sheet`]: isSheetModal, [`modal-no-expand-scroll`]: isSheetModal && !expandToScroll, 'overlay-hidden': true, [FOCUS_TRAP_DISABLE_CLASS]: focusTrap === false }, getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }), h("ion-backdrop", { key: '6bab796467b370e79b24ce17c5a3d51adb07ee8c', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: 'b9a19e86a2c7f079c88ef7a914c7c890aa601887', class: "modal-shadow" }), h("div", Object.assign({ key: 'f4315c34aa78be4e3540361755964be2ddf43265',
             /*
               role and aria-modal must be used on the
               same element. They must also be set inside the
               shadow DOM otherwise ion-button will not be highlighted
               when using VoiceOver: https://bugs.webkit.org/show_bug.cgi?id=247134
             */
-            role: "dialog" }, inheritedAttributes, { "aria-modal": "true", class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }), showHandle && (h("button", { key: '2dcf58792018e557e0c323baad2d672bc99c0bb1', class: "modal-handle",
+            role: "dialog" }, inheritedAttributes, { "aria-modal": "true", class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }), showHandle && (h("button", { key: '3f7792bd65e0f8634e62bf27f9edcb636a03030a', class: "modal-handle",
             // Prevents the handle from receiving keyboard focus when it does not cycle
-            tabIndex: !isHandleCycle ? -1 : 0, "aria-label": "Activate to adjust the size of the dialog overlaying the screen", onClick: isHandleCycle ? this.onHandleClick : undefined, part: "handle", ref: (el) => (this.dragHandleEl = el) })), h("slot", { key: '44164b1e8710c3895400ad9f44ecd99873874ad5', onSlotchange: this.onSlotChange }))));
+            tabIndex: !isHandleCycle ? -1 : 0, "aria-label": "Activate to adjust the size of the dialog overlaying the screen", onClick: isHandleCycle ? this.onHandleClick : undefined, part: "handle", ref: (el) => (this.dragHandleEl = el) })), h("slot", { key: '001e5b01831e240bd98f75ff62446b90b64d8394', onSlotchange: this.onSlotChange }))));
     }
     get el() { return this; }
     static get watchers() { return {