@ionic/core 8.7.16-dev.11766771281.16c74618 → 8.7.16-dev.11767018329.15d3ae73

package/dist/cjs/ion-modal.cjs.entry.js

@@ -3,23 +3,24 @@
  */
 'use strict';
 
-var index$2 = require('./index-D6Wc6v08.js');
-var index$1 = require('./index-DUoP_H1L.js');
-var frameworkDelegate = require('./framework-delegate-Bwdk9vFS.js');
-var helpers = require('./helpers-DnouLczu.js');
+var index$3 = require('./index-D6Wc6v08.js');
+var index$2 = require('./index-CO6eryBo.js');
+var frameworkDelegate = require('./framework-delegate-DMJRBuDi.js');
+var helpers = require('./helpers-DrTqNghc.js');
 var lockController = require('./lock-controller-aDB9wrEf.js');
-var capacitor = require('./capacitor-C8raJ_tU.js');
-var overlays = require('./overlays-CRSQCKrz.js');
+var capacitor = require('./capacitor-DmA66EwP.js');
+var overlays = require('./overlays-B2b-TTbl.js');
 var theme = require('./theme-CeDs6Hcv.js');
-var index$3 = require('./index-JtyffOXl.js');
-var ionicGlobal = require('./ionic-global-DpRwOXLK.js');
-var keyboard = require('./keyboard-B8HJHbg3.js');
-var animation = require('./animation-CD5nuON9.js');
+var index$4 = require('./index-094mMFB-.js');
+var ionicGlobal = require('./ionic-global-HMVqOFGO.js');
+var keyboard = require('./keyboard-hHzlEQpk.js');
+var animation = require('./animation-Bt3H9L1C.js');
 var cubicBezier = require('./cubic-bezier-DAjy1V-e.js');
-var index = require('./index-CAvQ7Tka.js');
-require('./focus-visible-BIj-I3-C.js');
+var index$1 = require('./index-CAvQ7Tka.js');
+var index = require('./index-DkNv4J_i.js');
+require('./hardware-back-button-VCK4V3mG.js');
 require('./gesture-controller-dtqlP_q4.js');
-require('./keyboard-BlrG3xPK.js');
+require('./keyboard-UuAS4D_9.js');
 
 var Style;
 (function (Style) {
@@ -116,13 +117,13 @@ const getBackdropValueForSheet = (x, backdropBreakpoint) => {
  *
  */
 const setCardStatusBarDark = () => {
-    if (!ionicGlobal.win || ionicGlobal.win.innerWidth >= 768) {
+    if (!index.win || index.win.innerWidth >= 768) {
         return;
     }
     StatusBar.setStyle({ style: Style.Dark });
 };
 const setCardStatusBarDefault = (defaultStyle = Style.Default) => {
-    if (!ionicGlobal.win || ionicGlobal.win.innerWidth >= 768) {
+    if (!index.win || index.win.innerWidth >= 768) {
         return;
     }
     StatusBar.setStyle({ style: defaultStyle });
@@ -248,7 +249,7 @@ const calculateSpringStep = (t) => {
 const SwipeToCloseDefaults = {
     MIN_PRESENTING_SCALE: 0.915,
 };
-const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) => {
+const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onGestureMove) => {
     /**
      * The step value at which a card modal
      * is eligible for dismissing via gesture.
@@ -263,7 +264,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) =>
     let initialScrollY = true;
     let lastStep = 0;
     const getScrollY = () => {
-        if (contentEl && index$1.isIonContent(contentEl)) {
+        if (contentEl && index$2.isIonContent(contentEl)) {
             return contentEl.scrollY;
             /**
              * Custom scroll containers are intended to be
@@ -295,7 +296,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) =>
          * swipe again. The target content will not
          * be the same between swipes.
          */
-        contentEl = index$1.findClosestIonContent(target);
+        contentEl = index$2.findClosestIonContent(target);
         if (contentEl) {
             /**
              * The card should never swipe to close
@@ -311,7 +312,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) =>
              * operation, and getScrollElement is
              * asynchronous.
              */
-            if (index$1.isIonContent(contentEl)) {
+            if (index$2.isIonContent(contentEl)) {
                 const root = helpers.getElementRoot(contentEl);
                 scrollEl = root.querySelector('.inner-scroll');
             }
@@ -355,7 +356,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) =>
          * happen at the same time as the gesture.
          */
         if (deltaY > 0 && contentEl) {
-            index$1.disableContentScrollY(contentEl);
+            index$2.disableContentScrollY(contentEl);
         }
         animation.progressStart(true, isOpen ? 1 : 0);
     };
@@ -368,7 +369,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) =>
          * happen at the same time as the gesture.
          */
         if (deltaY > 0 && contentEl) {
-            index$1.disableContentScrollY(contentEl);
+            index$2.disableContentScrollY(contentEl);
         }
         /**
          * If we are swiping on the content
@@ -405,6 +406,8 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) =>
         const processedStep = isAttemptingDismissWithCanDismiss ? calculateSpringStep(step / maxStep) : step;
         const clampedStep = helpers.clamp(0.0001, processedStep, maxStep);
         animation.progressStep(clampedStep);
+        // Notify modal of position change for safe-area updates
+        onGestureMove === null || onGestureMove === void 0 ? void 0 : onGestureMove();
         /**
          * When swiping down half way, the status bar style
          * should be reset to its default value.
@@ -456,7 +459,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) =>
         isOpen = shouldComplete;
         gesture.enable(false);
         if (contentEl) {
-            index$1.resetContentScrollY(contentEl, initialScrollY);
+            index$2.resetContentScrollY(contentEl, initialScrollY);
         }
         animation
             .onFinish(() => {
@@ -484,7 +487,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) =>
             onDismiss();
         }
     };
-    const gesture = index.createGesture({
+    const gesture = index$1.createGesture({
         el,
         gestureName: 'modalSwipeToClose',
         gesturePriority: overlays.OVERLAY_GESTURE_PRIORITY,
@@ -502,20 +505,14 @@ const computeDuration = (remaining, velocity) => {
 };
 
 const createSheetEnterAnimation = (opts) => {
-    const { currentBreakpoint, backdropBreakpoint, expandToScroll, staticBackdropOpacity } = opts;
+    const { currentBreakpoint, backdropBreakpoint, expandToScroll } = opts;
     /**
      * If the backdropBreakpoint is undefined, then the backdrop
      * should always fade in. If the backdropBreakpoint came before the
      * current breakpoint, then the backdrop should be fading in.
      */
     const shouldShowBackdrop = backdropBreakpoint === undefined || backdropBreakpoint < currentBreakpoint;
-    let initialBackdrop = '0';
-    if (staticBackdropOpacity) {
-        initialBackdrop = 'calc(var(--backdrop-opacity)';
-    }
-    else if (shouldShowBackdrop) {
-        initialBackdrop = `calc(var(--backdrop-opacity) * ${currentBreakpoint})`;
-    }
+    const initialBackdrop = shouldShowBackdrop ? `calc(var(--backdrop-opacity) * ${currentBreakpoint})` : '0';
     const backdropAnimation = animation.createAnimation('backdropAnimation').fromTo('opacity', 0, initialBackdrop);
     if (shouldShowBackdrop) {
         backdropAnimation
@@ -954,16 +951,16 @@ const mdLeaveAnimation = (baseEl, opts) => {
     return baseAnimation;
 };
 
-const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange, staticBackdropOpacity) => {
+const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange, onGestureMove) => {
     // Defaults for the sheet swipe animation
     const defaultBackdrop = [
         { offset: 0, opacity: 'var(--backdrop-opacity)' },
-        { offset: 1, opacity: staticBackdropOpacity ? 'var(--backdrop-opacity)' : 0.01 },
+        { offset: 1, opacity: 0.01 },
     ];
     const customBackdrop = [
         { offset: 0, opacity: 'var(--backdrop-opacity)' },
-        { offset: 1 - backdropBreakpoint, opacity: staticBackdropOpacity ? 'var(--backdrop-opacity)' : 0 },
-        { offset: 1, opacity: staticBackdropOpacity ? 'var(--backdrop-opacity)' : 0 },
+        { offset: 1 - backdropBreakpoint, opacity: 0 },
+        { offset: 1, opacity: 0 },
     ];
     const SheetDefaults = {
         WRAPPER_KEYFRAMES: [
@@ -1144,14 +1141,14 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
          * For example, when using ion-nav within a modal it is possible to swipe, push a view,
          * and then swipe again. The target content will not be the same between swipes.
          */
-        const contentEl = index$1.findClosestIonContent(detail.event.target);
+        const contentEl = index$2.findClosestIonContent(detail.event.target);
         currentBreakpoint = getCurrentBreakpoint();
         /**
          * If `expandToScroll` is disabled, we should not allow the swipe gesture
          * to start if the content is not scrolled to the top.
          */
         if (!expandToScroll && contentEl) {
-            const scrollEl = index$1.isIonContent(contentEl) ? helpers.getElementRoot(contentEl).querySelector('.inner-scroll') : contentEl;
+            const scrollEl = index$2.isIonContent(contentEl) ? helpers.getElementRoot(contentEl).querySelector('.inner-scroll') : contentEl;
             return scrollEl.scrollTop === 0;
         }
         if (currentBreakpoint === 1 && contentEl) {
@@ -1164,7 +1161,7 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
              * Note 2: Do not use getScrollElement here because we need this to be a synchronous
              * operation, and getScrollElement is asynchronous.
              */
-            const scrollEl = index$1.isIonContent(contentEl) ? helpers.getElementRoot(contentEl).querySelector('.inner-scroll') : contentEl;
+            const scrollEl = index$2.isIonContent(contentEl) ? helpers.getElementRoot(contentEl).querySelector('.inner-scroll') : contentEl;
             const hasRefresherInContent = !!contentEl.querySelector('ion-refresher');
             return !hasRefresherInContent && scrollEl.scrollTop === 0;
         }
@@ -1190,9 +1187,9 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
          * which would impact performance significantly.
          */
         if (!expandToScroll) {
-            const targetEl = index$1.findClosestIonContent(detail.event.target);
+            const targetEl = index$2.findClosestIonContent(detail.event.target);
             cachedScrollEl =
-                targetEl && index$1.isIonContent(targetEl) ? helpers.getElementRoot(targetEl).querySelector('.inner-scroll') : targetEl;
+                targetEl && index$2.isIonContent(targetEl) ? helpers.getElementRoot(targetEl).querySelector('.inner-scroll') : targetEl;
         }
         /**
          * If expandToScroll is disabled, we need to swap
@@ -1285,6 +1282,8 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
             : step;
         offset = helpers.clamp(0.0001, processedStep, maxStep);
         animation.progressStep(offset);
+        // Notify modal of position change for safe-area updates
+        onGestureMove === null || onGestureMove === void 0 ? void 0 : onGestureMove();
     };
     const onEnd = (detail) => {
         /**
@@ -1348,15 +1347,11 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
             backdropAnimation.keyframes([
                 {
                     offset: 0,
-                    opacity: staticBackdropOpacity
-                        ? 'var(--backdrop-opacity)'
-                        : `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(1 - breakpointOffset, backdropBreakpoint)})`,
+                    opacity: `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(1 - breakpointOffset, backdropBreakpoint)})`,
                 },
                 {
                     offset: 1,
-                    opacity: staticBackdropOpacity
-                        ? 'var(--backdrop-opacity)'
-                        : `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(snapToBreakpoint, backdropBreakpoint)})`,
+                    opacity: `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(snapToBreakpoint, backdropBreakpoint)})`,
                 },
             ]);
             if (contentAnimation) {
@@ -1466,7 +1461,7 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
                 .progressEnd(1, 0, animated ? 500 : 0);
         });
     };
-    const gesture = index.createGesture({
+    const gesture = index$1.createGesture({
         el: wrapperEl,
         gestureName: 'modalSheet',
         gesturePriority: 40,
@@ -1483,25 +1478,23 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
     };
 };
 
-const modalIonicCss = ":host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--overflow:hidden;--border-width:0;--border-style:none;--border-color:transparent;--box-shadow:none;right:0;left: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;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}.modal-handle{-webkit-margin-start:auto;margin-inline-start:auto;-webkit-margin-end:auto;margin-inline-end:auto;position:absolute;-webkit-transform:translateZ(0);transform:translateZ(0);border:0;cursor:pointer;z-index:11}.modal-handle::before{position:absolute;-webkit-transform:translate(-50%, -50%);transform:translate(-50%, -50%);content:\"\"}: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{--background:var(--token-bg-surface-default, var(--token-primitives-base-white, #ffffff));--box-shadow:var(--token-elevation-3, 0px 2px 7px 0px rgba(0, 0, 0, 0.05), 0px 6px 32px 0px rgba(0, 0, 0, 0.16));--backdrop-opacity:1;color:var(--token-text-default, var(--token-primitives-neutral-1200, #242424))}:host(.modal-round){--border-radius:var(--token-border-radius-1000, var(--token-scale-1000, 40px))}:host(.modal-soft){--border-radius:var(--token-border-radius-400, var(--token-scale-400, 16px))}:host(.modal-rectangular){--border-radius:var(--token-border-radius-0, var(--token-scale-0, 0px))}:host(.select-modal.modal-default){--max-height:45%;--max-width:calc(100% - (var(--token-space-400, var(--token-scale-400, 16px)) * 2));--min-height:340px}.modal-handle{right:0px;left:0px;top:var(--token-space-300, var(--token-scale-300, 12px));border-radius:var(--token-border-radius-100, var(--token-scale-100, 4px));width:var(--token-scale-1100, 44px);height:var(--token-scale-100, 4px);background-color:var(--token-primitives-neutral-300, #e0e0e0)}.modal-handle::before{-webkit-padding-start:var(--token-space-100, var(--token-scale-100, 4px));padding-inline-start:var(--token-space-100, var(--token-scale-100, 4px));-webkit-padding-end:var(--token-space-100, var(--token-scale-100, 4px));padding-inline-end:var(--token-space-100, var(--token-scale-100, 4px));padding-top:var(--token-space-100, var(--token-scale-100, 4px));padding-bottom:var(--token-space-100, var(--token-scale-100, 4px))}: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}:host(.modal-sheet){--height:calc(100% - (var(--ion-safe-area-top) + var(--token-scale-250, 10px)))}";
-
-const modalIosCss = ":host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--overflow:hidden;--border-width:0;--border-style:none;--border-color:transparent;--box-shadow:none;right:0;left: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;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}.modal-handle{-webkit-margin-start:auto;margin-inline-start:auto;-webkit-margin-end:auto;margin-inline-end:auto;position:absolute;-webkit-transform:translateZ(0);transform:translateZ(0);border:0;cursor:pointer;z-index:11}.modal-handle::before{position:absolute;-webkit-transform:translate(-50%, -50%);transform:translate(-50%, -50%);content:\"\"}: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{--background:var(--ion-background-color, #fff);--border-radius:0;--backdrop-opacity:0;color:var(--ion-text-color, #000)}@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{right:0px;left:0px;top:5px;border-radius:8px;width:36px;height:5px;background:var(--ion-color-step-350, var(--ion-background-color-step-350, #c0c0be))}.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;width:36px;height:5px}:host(.modal-sheet){--height:calc(100% - (var(--ion-safe-area-top) + 10px))}: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 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-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}";
 
-const modalMdCss = ":host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:auto;--overflow:hidden;--border-width:0;--border-style:none;--border-color:transparent;--box-shadow:none;right:0;left: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;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}.modal-handle{-webkit-margin-start:auto;margin-inline-start:auto;-webkit-margin-end:auto;margin-inline-end:auto;position:absolute;-webkit-transform:translateZ(0);transform:translateZ(0);border:0;cursor:pointer;z-index:11}.modal-handle::before{position:absolute;-webkit-transform:translate(-50%, -50%);transform:translate(-50%, -50%);content:\"\"}: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{--background:var(--ion-background-color, #fff);--border-radius:0;--backdrop-opacity:0;color:var(--ion-text-color, #000)}@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{right:0px;left:0px;top:5px;border-radius:8px;width:36px;height:5px;background:var(--ion-color-step-350, var(--ion-background-color-step-350, #c0c0be))}.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;width:36px;height:5px}:host(.modal-sheet){--height:calc(100% - (var(--ion-safe-area-top) + 10px))}: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-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 Modal = class {
     constructor(hostRef) {
-        index$2.registerInstance(this, hostRef);
-        this.didPresent = index$2.createEvent(this, "ionModalDidPresent", 7);
-        this.willPresent = index$2.createEvent(this, "ionModalWillPresent", 7);
-        this.willDismiss = index$2.createEvent(this, "ionModalWillDismiss", 7);
-        this.didDismiss = index$2.createEvent(this, "ionModalDidDismiss", 7);
-        this.ionBreakpointDidChange = index$2.createEvent(this, "ionBreakpointDidChange", 7);
-        this.didPresentShorthand = index$2.createEvent(this, "didPresent", 7);
-        this.willPresentShorthand = index$2.createEvent(this, "willPresent", 7);
-        this.willDismissShorthand = index$2.createEvent(this, "willDismiss", 7);
-        this.didDismissShorthand = index$2.createEvent(this, "didDismiss", 7);
-        this.ionMount = index$2.createEvent(this, "ionMount", 7);
+        index$3.registerInstance(this, hostRef);
+        this.didPresent = index$3.createEvent(this, "ionModalDidPresent", 7);
+        this.willPresent = index$3.createEvent(this, "ionModalWillPresent", 7);
+        this.willDismiss = index$3.createEvent(this, "ionModalWillDismiss", 7);
+        this.didDismiss = index$3.createEvent(this, "ionModalDidDismiss", 7);
+        this.ionBreakpointDidChange = index$3.createEvent(this, "ionBreakpointDidChange", 7);
+        this.didPresentShorthand = index$3.createEvent(this, "didPresent", 7);
+        this.willPresentShorthand = index$3.createEvent(this, "willPresent", 7);
+        this.willDismissShorthand = index$3.createEvent(this, "willDismiss", 7);
+        this.didDismissShorthand = index$3.createEvent(this, "didDismiss", 7);
+        this.ionMount = index$3.createEvent(this, "ionMount", 7);
         this.lockController = lockController.createLockController();
         this.triggerController = overlays.createTriggerController();
         this.coreDelegate = frameworkDelegate.CoreDelegate();
@@ -1700,7 +1693,10 @@ const Modal = class {
         }
     }
     onWindowResize() {
-        // Only handle resize for iOS card modals when no custom animations are provided
+        // Update safe-area overrides for all modal types on resize
+        console.log('[onWindowResize] calling updateSafeAreaOverrides');
+        this.updateSafeAreaOverrides();
+        // Only handle view transition for iOS card modals when no custom animations are provided
         if (ionicGlobal.getIonMode(this) !== 'ios' || !this.presentingElement || this.enterAnimation || this.leaveAnimation) {
             return;
         }
@@ -1769,7 +1765,7 @@ const Modal = class {
             this.currentBreakpoint = this.initialBreakpoint;
         }
         if (breakpoints !== undefined && initialBreakpoint !== undefined && !breakpoints.includes(initialBreakpoint)) {
-            index$2.printIonWarning('[ion-modal] - Your breakpoints array must include the initialBreakpoint value.');
+            index$3.printIonWarning('[ion-modal] - Your breakpoints array must include the initialBreakpoint value.');
         }
         if (!((_a = this.htmlAttributes) === null || _a === void 0 ? void 0 : _a.id)) {
             overlays.setOverlayId(this.el);
@@ -1869,7 +1865,7 @@ const Modal = class {
          * get the transition incorrect.
          */
         if (helpers.hasLazyBuild(el)) {
-            await index$3.deepReady(this.usersElement);
+            await index$4.deepReady(this.usersElement);
             /**
              * If keepContentsMounted="true" then the
              * JS Framework has already mounted the inner
@@ -1880,9 +1876,11 @@ const Modal = class {
              */
         }
         else if (!this.keepContentsMounted) {
-            await index$3.waitForMount();
+            await index$4.waitForMount();
         }
-        index$2.writeTask(() => this.el.classList.add('show-modal'));
+        // Predict safe-area needs based on modal configuration to avoid visual snap
+        this.setInitialSafeAreaOverrides(presentingElement);
+        index$3.writeTask(() => this.el.classList.add('show-modal'));
         const hasCardModal = presentingElement !== undefined;
         /**
          * We need to change the status bar at the
@@ -1899,7 +1897,6 @@ const Modal = class {
             currentBreakpoint: this.initialBreakpoint,
             backdropBreakpoint: this.backdropBreakpoint,
             expandToScroll: this.expandToScroll,
-            staticBackdropOpacity: ionicGlobal.getIonTheme(this) === 'ionic',
         });
         /* tslint:disable-next-line */
         if (typeof window !== 'undefined') {
@@ -1944,6 +1941,9 @@ const Modal = class {
         else if (hasCardModal) {
             this.initSwipeToClose();
         }
+        // Now that animation is complete, update safe-area based on actual position
+        console.log('[present animation complete] calling updateSafeAreaOverrides');
+        this.updateSafeAreaOverrides();
         // Initialize view transition listener for iOS card modals
         this.initViewTransitionListener();
         // Initialize parent removal observer
@@ -1959,14 +1959,14 @@ const Modal = class {
         // All of the elements needed for the swipe gesture
         // should be in the DOM and referenced by now, except
         // for the presenting el
-        const animationBuilder = this.leaveAnimation || index$2.config.get('modalLeave', iosLeaveAnimation);
+        const animationBuilder = this.leaveAnimation || index$3.config.get('modalLeave', iosLeaveAnimation);
         const ani = (this.animation = animationBuilder(el, {
             presentingEl: this.presentingElement,
             expandToScroll: this.expandToScroll,
         }));
-        const contentEl = index$1.findIonContent(el);
+        const contentEl = index$2.findIonContent(el);
         if (!contentEl) {
-            index$1.printIonContentErrorMsg(el);
+            index$2.printIonContentErrorMsg(el);
             return;
         }
         const statusBarStyle = (_a = this.statusBarStyle) !== null && _a !== void 0 ? _a : Style.Default;
@@ -1995,7 +1995,7 @@ const Modal = class {
                 await this.dismiss(undefined, overlays.GESTURE);
                 this.gestureAnimationDismissing = false;
             });
-        });
+        }, () => this.updateSafeAreaOverrides());
         this.gesture.enable(true);
     }
     initSheetGesture() {
@@ -2003,13 +2003,12 @@ const Modal = class {
         if (!wrapperEl || initialBreakpoint === undefined) {
             return;
         }
-        const animationBuilder = this.enterAnimation || index$2.config.get('modalEnter', iosEnterAnimation);
+        const animationBuilder = this.enterAnimation || index$3.config.get('modalEnter', iosEnterAnimation);
         const ani = (this.animation = animationBuilder(this.el, {
             presentingEl: this.presentingElement,
             currentBreakpoint: initialBreakpoint,
             backdropBreakpoint,
             expandToScroll: this.expandToScroll,
-            staticBackdropOpacity: ionicGlobal.getIonTheme(this) === 'ionic',
         }));
         ani.progressStart(true, 1);
         const { gesture, moveSheetToBreakpoint } = createSheetGesture(this.el, this.backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, ani, this.sortedBreakpoints, this.expandToScroll, () => { var _a; return (_a = this.currentBreakpoint) !== null && _a !== void 0 ? _a : 0; }, () => this.sheetOnDismiss(), (breakpoint) => {
@@ -2017,7 +2016,8 @@ const Modal = class {
                 this.currentBreakpoint = breakpoint;
                 this.ionBreakpointDidChange.emit({ breakpoint });
             }
-        }, ionicGlobal.getIonTheme(this) === 'ionic');
+            this.updateSafeAreaOverrides();
+        }, () => this.updateSafeAreaOverrides());
         this.gesture = gesture;
         this.moveSheetToBreakpoint = moveSheetToBreakpoint;
         this.gesture.enable(true);
@@ -2095,6 +2095,119 @@ const Modal = class {
         // Clear the cached reference
         this.cachedPageParent = undefined;
     }
+    /**
+     * Sets initial safe-area overrides based on modal configuration before
+     * the modal becomes visible. This predicts whether the modal will touch
+     * screen edges to avoid a visual snap after animation completes.
+     */
+    setInitialSafeAreaOverrides(presentingElement) {
+        const style = this.el.style;
+        const isSheetModal = this.breakpoints !== undefined && this.initialBreakpoint !== undefined;
+        const isCardModal = presentingElement !== undefined;
+        const isTablet = window.innerWidth >= 768;
+        console.log('[setInitialSafeAreaOverrides] called', {
+            isSheetModal,
+            isCardModal,
+            isTablet,
+            breakpoints: this.breakpoints,
+            initialBreakpoint: this.initialBreakpoint,
+            presentingElement: !!presentingElement,
+            innerWidth: window.innerWidth,
+        });
+        // Sheet modals: always touch bottom, top depends on breakpoint
+        if (isSheetModal) {
+            console.log('[setInitialSafeAreaOverrides] Sheet modal path - setting top/left/right to 0, leaving bottom alone');
+            style.setProperty('--ion-safe-area-top', '0px');
+            // Don't override bottom - sheet always touches bottom
+            style.setProperty('--ion-safe-area-left', '0px');
+            style.setProperty('--ion-safe-area-right', '0px');
+            return;
+        }
+        // Card modals are inset from edges (rounded corners), no safe areas needed
+        if (isCardModal) {
+            console.log('[setInitialSafeAreaOverrides] Card modal path - setting all to 0');
+            style.setProperty('--ion-safe-area-top', '0px');
+            style.setProperty('--ion-safe-area-bottom', '0px');
+            style.setProperty('--ion-safe-area-left', '0px');
+            style.setProperty('--ion-safe-area-right', '0px');
+            return;
+        }
+        // Phone modals are fullscreen, need all safe areas
+        if (!isTablet) {
+            console.log('[setInitialSafeAreaOverrides] Phone modal path - not setting any overrides');
+            // Don't set any overrides - inherit from :root
+            return;
+        }
+        // Default tablet modal: centered dialog, no safe areas needed
+        // Check for fullscreen override via CSS custom properties
+        const computedStyle = getComputedStyle(this.el);
+        const width = computedStyle.getPropertyValue('--width').trim();
+        const height = computedStyle.getPropertyValue('--height').trim();
+        console.log('[setInitialSafeAreaOverrides] Tablet modal path', { width, height });
+        if (width === '100%' && height === '100%') {
+            console.log('[setInitialSafeAreaOverrides] Fullscreen tablet modal - not setting overrides');
+            // Fullscreen modal - need safe areas, don't override
+            return;
+        }
+        // Centered dialog - zero out all safe areas
+        console.log('[setInitialSafeAreaOverrides] Centered tablet dialog - setting all to 0');
+        style.setProperty('--ion-safe-area-top', '0px');
+        style.setProperty('--ion-safe-area-bottom', '0px');
+        style.setProperty('--ion-safe-area-left', '0px');
+        style.setProperty('--ion-safe-area-right', '0px');
+    }
+    /**
+     * Updates safe-area CSS variable overrides based on whether the modal
+     * is touching each edge of the viewport. This is called after animation
+     * and during gestures to handle dynamic position changes.
+     */
+    updateSafeAreaOverrides() {
+        const wrapper = this.wrapperEl;
+        if (!wrapper) {
+            console.log('[updateSafeAreaOverrides] No wrapper element, returning early');
+            return;
+        }
+        const rect = wrapper.getBoundingClientRect();
+        const threshold = 2; // Account for subpixel rendering
+        const touchingTop = rect.top <= threshold;
+        const touchingBottom = rect.bottom >= window.innerHeight - threshold;
+        const touchingLeft = rect.left <= threshold;
+        const touchingRight = rect.right >= window.innerWidth - threshold;
+        console.log('[updateSafeAreaOverrides] called', {
+            isSheetModal: this.isSheetModal,
+            rect: { top: rect.top, bottom: rect.bottom, left: rect.left, right: rect.right },
+            innerHeight: window.innerHeight,
+            innerWidth: window.innerWidth,
+            threshold,
+            touchingTop,
+            touchingBottom,
+            touchingLeft,
+            touchingRight,
+            bottomCalc: `${rect.bottom} >= ${window.innerHeight - threshold} = ${touchingBottom}`,
+        });
+        // Remove override when touching edge (allow inheritance), set to 0 when not touching
+        const style = this.el.style;
+        const actions = {
+            top: touchingTop ? 'removeProperty' : 'setProperty 0px',
+            bottom: touchingBottom ? 'removeProperty' : 'setProperty 0px',
+            left: touchingLeft ? 'removeProperty' : 'setProperty 0px',
+            right: touchingRight ? 'removeProperty' : 'setProperty 0px',
+        };
+        console.log('[updateSafeAreaOverrides] actions:', actions);
+        touchingTop ? style.removeProperty('--ion-safe-area-top') : style.setProperty('--ion-safe-area-top', '0px');
+        touchingBottom
+            ? style.removeProperty('--ion-safe-area-bottom')
+            : style.setProperty('--ion-safe-area-bottom', '0px');
+        touchingLeft ? style.removeProperty('--ion-safe-area-left') : style.setProperty('--ion-safe-area-left', '0px');
+        touchingRight ? style.removeProperty('--ion-safe-area-right') : style.setProperty('--ion-safe-area-right', '0px');
+        // Log the actual style values after setting
+        console.log('[updateSafeAreaOverrides] after setting, inline styles:', {
+            top: style.getPropertyValue('--ion-safe-area-top'),
+            bottom: style.getPropertyValue('--ion-safe-area-bottom'),
+            left: style.getPropertyValue('--ion-safe-area-left'),
+            right: style.getPropertyValue('--ion-safe-area-right'),
+        });
+    }
     sheetOnDismiss() {
         /**
          * While the gesture animation is finishing
@@ -2174,7 +2287,7 @@ const Modal = class {
         if (dismissed) {
             const { delegate } = this.getDelegate();
             await frameworkDelegate.detachComponent(delegate, this.usersElement);
-            index$2.writeTask(() => this.el.classList.remove('show-modal'));
+            index$3.writeTask(() => this.el.classList.remove('show-modal'));
             if (this.animation) {
                 this.animation.destroy();
             }
@@ -2210,11 +2323,11 @@ const Modal = class {
      */
     async setCurrentBreakpoint(breakpoint) {
         if (!this.isSheetModal) {
-            index$2.printIonWarning('[ion-modal] - setCurrentBreakpoint is only supported on sheet modals.');
+            index$3.printIonWarning('[ion-modal] - setCurrentBreakpoint is only supported on sheet modals.');
             return;
         }
         if (!this.breakpoints.includes(breakpoint)) {
-            index$2.printIonWarning(`[ion-modal] - Attempted to set invalid breakpoint value ${breakpoint}. Please double check that the breakpoint value is part of your defined breakpoints.`);
+            index$3.printIonWarning(`[ion-modal] - Attempted to set invalid breakpoint value ${breakpoint}. Please double check that the breakpoint value is part of your defined breakpoints.`);
             return;
         }
         const { currentBreakpoint, moveSheetToBreakpoint, canDismiss, breakpoints, animated } = this;
@@ -2259,18 +2372,6 @@ const Modal = class {
         await this.setCurrentBreakpoint(nextBreakpoint);
         return true;
     }
-    getShape() {
-        const theme = ionicGlobal.getIonTheme(this);
-        const { shape } = this;
-        // TODO(ROU-11167): Remove theme check when shapes are defined for all themes.
-        if (theme !== 'ionic') {
-            return undefined;
-        }
-        if (shape === undefined) {
-            return 'round';
-        }
-        return shape;
-    }
     initViewTransitionListener() {
         // Only enable for iOS card modals when no custom animations are provided
         if (ionicGlobal.getIonMode(this) !== 'ios' || !this.presentingElement || this.enterAnimation || this.leaveAnimation) {
@@ -2440,27 +2541,26 @@ const Modal = class {
     render() {
         const { handle, isSheetModal, presentingElement, htmlAttributes, handleBehavior, inheritedAttributes, focusTrap, expandToScroll, } = this;
         const showHandle = handle !== false && isSheetModal;
-        const theme$1 = ionicGlobal.getIonTheme(this);
-        const isCardModal = presentingElement !== undefined && theme$1 === 'ios';
+        const mode = ionicGlobal.getIonMode(this);
+        const isCardModal = presentingElement !== undefined && mode === 'ios';
         const isHandleCycle = handleBehavior === 'cycle';
-        const shape = this.getShape();
         const isSheetModalWithHandle = isSheetModal && showHandle;
-        return (index$2.h(index$2.Host, Object.assign({ key: '547adca39bb8f0070f2e2c17d39300eab5d66202', "no-router": true,
+        return (index$3.h(index$3.Host, Object.assign({ key: '8659056ce9de06c66d65946fe4af939e298d133c', "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({ [theme$1]: true, ['modal-default']: !isCardModal && !isSheetModal, [`modal-card`]: isCardModal, [`modal-sheet`]: isSheetModal, [`modal-${shape}`]: shape !== undefined, [`modal-no-expand-scroll`]: isSheetModal && !expandToScroll, 'overlay-hidden': true, [overlays.FOCUS_TRAP_DISABLE_CLASS]: focusTrap === false }, theme.getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }), index$2.h("ion-backdrop", { key: 'b15340363a5399cdbd015f3ba6a07ca9a057af3a', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), theme$1 === 'ios' && index$2.h("div", { key: 'd13cb2c5efe07b13e7f4a0ea358c8003944779a7', class: "modal-shadow" }), index$2.h("div", Object.assign({ key: 'd6f252655e0c11b7a76917781ad038d3eca4f1f6',
+            }, class: Object.assign({ [mode]: true, ['modal-default']: !isCardModal && !isSheetModal, [`modal-card`]: isCardModal, [`modal-sheet`]: isSheetModal, [`modal-no-expand-scroll`]: isSheetModal && !expandToScroll, 'overlay-hidden': true, [overlays.FOCUS_TRAP_DISABLE_CLASS]: focusTrap === false }, theme.getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }), index$3.h("ion-backdrop", { key: 'e4f287871798d7aa660c8aea3a81deeeb540812d', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && index$3.h("div", { key: '6f3d8d504e080093ba9e5089e5de76feaa13cf38', class: "modal-shadow" }), index$3.h("div", Object.assign({ key: '6ad0b4d97e0c0bad56689e457f08819ad857a0b4',
             /*
               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 && (index$2.h("button", { key: '8ea59f134f0a949f27c5413a406771a5fe7d1d13', class: "modal-handle",
+            role: "dialog" }, inheritedAttributes, { "aria-modal": "true", class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }), showHandle && (index$3.h("button", { key: 'e5a9d74a112e315240b307042ad16d8e6ff2c714', 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) })), index$2.h("slot", { key: 'c609a98d061e83c610c892aca9792e6784dbc02c', 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) })), index$3.h("slot", { key: '66f342587b6eaa5801397d7385ec3dc783bf8f55', onSlotchange: this.onSlotChange }))));
     }
-    get el() { return index$2.getElement(this); }
+    get el() { return index$3.getElement(this); }
     static get watchers() { return {
         "isOpen": ["onIsOpenChange"],
         "trigger": ["triggerChanged"]
@@ -2473,7 +2573,6 @@ const LIFECYCLE_MAP = {
     ionModalDidDismiss: 'ionViewDidLeave',
 };
 Modal.style = {
-    ionic: modalIonicCss,
     ios: modalIosCss,
     md: modalMdCss
 };