@ionic/core 9.0.6-dev.11790615145.1d8c56a2 → 9.0.6-dev.11790776272.1d27d1bd

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

@@ -3,23 +3,25 @@
  */
 'use strict';
 
-var index$2 = require('./index-SAR1xwtW.js');
-var index = require('./index-BAM4223M.js');
-var frameworkDelegate = require('./framework-delegate-DTLbqaaO.js');
-var helpers = require('./helpers-Crluoxqu.js');
+var index$3 = require('./index-sCX9078m.js');
+var index$1 = require('./index-DKcBQZY9.js');
+var frameworkDelegate = require('./framework-delegate-Dc-OOm7D.js');
+var helpers = require('./helpers-CLJM7hT0.js');
 var lockController = require('./lock-controller-aDB9wrEf.js');
-var capacitor = require('./capacitor-BMzmHhwe.js');
-var hardwareBackButton = require('./overlays-C68wNDWY.js');
-var theme = require('./theme-Bw0rpaNN.js');
-var index$3 = require('./index-CgXTRA_-.js');
-var ionicGlobal = require('./ionic-global-C1h8Yi_K.js');
-var keyboard = require('./keyboard-Cv-LNReK.js');
-var animation = require('./animation-BFKyYY11.js');
+var capacitor = require('./capacitor-DmA66EwP.js');
+var overlays = require('./overlays-Ch6nAoha.js');
+var theme = require('./theme-Cy4joHPt.js');
+var index$4 = require('./index-DHE2MAbY.js');
+var ionicGlobal = require('./ionic-global-BKBeko9D.js');
+var keyboard = require('./keyboard-Cix5TVkD.js');
+var animation = require('./animation-DGhvrwaP.js');
+var index = require('./index-DkNv4J_i.js');
 var cubicBezier = require('./cubic-bezier-DAjy1V-e.js');
-var index$1 = require('./index-DRPqwSvU.js');
+var index$2 = require('./index-DRPqwSvU.js');
+require('./focus-visible-DGPRKkcx.js');
 require('./dir-zwDPRE5K.js');
 require('./gesture-controller-CeJslptU.js');
-require('./keyboard-C-C7xMKk.js');
+require('./keyboard-cHxZlTyz.js');
 
 var Style;
 (function (Style) {
@@ -116,13 +118,13 @@ const getBackdropValueForSheet = (x, backdropBreakpoint) => {
  *
  */
 const setCardStatusBarDark = () => {
-    if (!helpers.win || helpers.win.innerWidth >= 768) {
+    if (!index.win || index.win.innerWidth >= 768) {
         return;
     }
     StatusBar.setStyle({ style: Style.Dark });
 };
 const setCardStatusBarDefault = (defaultStyle = Style.Default) => {
-    if (!helpers.win || helpers.win.innerWidth >= 768) {
+    if (!index.win || index.win.innerWidth >= 768) {
         return;
     }
     StatusBar.setStyle({ style: defaultStyle });
@@ -134,6 +136,104 @@ const onModalHeightChange = (hostEl, callback) => {
     return helpers.onCustomPropertyChange(hostEl, '--height', () => callback());
 };
 
+const createSheetEnterAnimation = (opts) => {
+    const { currentBreakpoint, backdropBreakpoint, expandToScroll, staticBackdropOpacity } = 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 backdropAnimation = animation.createAnimation('backdropAnimation').fromTo('opacity', 0, initialBackdrop);
+    if (shouldShowBackdrop) {
+        backdropAnimation
+            .beforeStyles({
+            'pointer-events': 'none',
+        })
+            .afterClearStyles(['pointer-events']);
+    }
+    const wrapperAnimation = animation.createAnimation('wrapperAnimation').keyframes([
+        { offset: 0, opacity: 1, transform: 'translateY(100%)' },
+        { offset: 1, opacity: 1, transform: `translateY(${100 - currentBreakpoint * 100}%)` },
+    ]);
+    /**
+     * This allows the content to be scrollable at any breakpoint.
+     */
+    const contentAnimation = !expandToScroll
+        ? animation.createAnimation('contentAnimation').keyframes([
+            { offset: 0, opacity: 1, maxHeight: `${(1 - currentBreakpoint) * 100}%` },
+            { offset: 1, opacity: 1, maxHeight: `${currentBreakpoint * 100}%` },
+        ])
+        : undefined;
+    return { wrapperAnimation, backdropAnimation, contentAnimation };
+};
+const createSheetLeaveAnimation = (opts) => {
+    const { currentBreakpoint, backdropBreakpoint } = opts;
+    /**
+     * Backdrop does not always fade in from 0 to 1 if backdropBreakpoint
+     * is defined, so we need to account for that offset by figuring out
+     * what the current backdrop value should be.
+     */
+    const backdropValue = `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(currentBreakpoint, backdropBreakpoint)})`;
+    const defaultBackdrop = [
+        { offset: 0, opacity: backdropValue },
+        { offset: 1, opacity: 0 },
+    ];
+    const customBackdrop = [
+        { offset: 0, opacity: backdropValue },
+        { offset: backdropBreakpoint, opacity: 0 },
+        { offset: 1, opacity: 0 },
+    ];
+    const backdropAnimation = animation.createAnimation('backdropAnimation').keyframes(backdropBreakpoint !== 0 ? customBackdrop : defaultBackdrop);
+    const wrapperAnimation = animation.createAnimation('wrapperAnimation').keyframes([
+        { offset: 0, opacity: 1, transform: `translateY(${100 - currentBreakpoint * 100}%)` },
+        { offset: 1, opacity: 1, transform: `translateY(100%)` },
+    ]);
+    return { wrapperAnimation, backdropAnimation };
+};
+
+const createEnterAnimation$2 = () => {
+    const backdropAnimation = animation.createAnimation()
+        .fromTo('opacity', 0.01, 'var(--backdrop-opacity)')
+        .beforeStyles({
+        'pointer-events': 'none',
+    })
+        .afterClearStyles(['pointer-events']);
+    const wrapperAnimation = animation.createAnimation().keyframes([
+        { offset: 0, opacity: 0.01, transform: 'translateY(40px)' },
+        { offset: 1, opacity: 1, transform: `translateY(0px)` },
+    ]);
+    return { backdropAnimation, wrapperAnimation, contentAnimation: undefined };
+};
+/**
+ * Ionic Modal Enter Animation
+ */
+const ionicEnterAnimation = (baseEl, opts) => {
+    const { currentBreakpoint, expandToScroll } = opts;
+    const root = helpers.getElementRoot(baseEl);
+    const { wrapperAnimation, backdropAnimation, contentAnimation } = currentBreakpoint !== undefined ? createSheetEnterAnimation(opts) : createEnterAnimation$2();
+    backdropAnimation.addElement(root.querySelector('ion-backdrop'));
+    wrapperAnimation.addElement(root.querySelector('.modal-wrapper'));
+    // The content animation is only added if scrolling is enabled for
+    // all the breakpoints.
+    !expandToScroll && contentAnimation?.addElement(baseEl.querySelector('.ion-page'));
+    backdropAnimation.duration(300).easing('ease-out');
+    wrapperAnimation.duration(400).easing('cubic-bezier(0.32, 0.68, 0, 1)');
+    contentAnimation?.duration(400).easing('cubic-bezier(0.32, 0.68, 0, 1)');
+    const baseAnimation = animation.createAnimation().addElement(baseEl).addAnimation([backdropAnimation, wrapperAnimation]);
+    if (contentAnimation) {
+        baseAnimation.addAnimation(contentAnimation);
+    }
+    return baseAnimation;
+};
+
 /**
  * Swiping is only possible when the content is scrolled to the top, so that we
  * do not interfere with scrolling, and never on content with a refresher.
@@ -145,8 +245,8 @@ const onModalHeightChange = (hostEl, callback) => {
  * synchronous operation, and `getScrollElement` is asynchronous.
  */
 const canSwipeOnContent = (contentEl) => {
-    const scrollEl = index.isIonContent(contentEl) ? helpers.getElementRoot(contentEl).querySelector('.inner-scroll') : contentEl;
-    const hasRefresherInContent = !!index.findRefresherInContent(contentEl);
+    const scrollEl = index$1.isIonContent(contentEl) ? helpers.getElementRoot(contentEl).querySelector('.inner-scroll') : contentEl;
+    const hasRefresherInContent = !!index$1.findRefresherInContent(contentEl);
     return !hasRefresherInContent && scrollEl.scrollTop === 0;
 };
 const handleCanDismiss = async (el, animation) => {
@@ -166,7 +266,7 @@ const handleCanDismiss = async (el, animation) => {
      * If the function returns `true`,
      * then we can proceed with dismiss.
      */
-    const shouldDismiss = await el.canDismiss(undefined, hardwareBackButton.GESTURE);
+    const shouldDismiss = await el.canDismiss(undefined, overlays.GESTURE);
     if (!shouldDismiss) {
         return;
     }
@@ -283,7 +383,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onD
     let initialScrollY = true;
     let lastStep = 0;
     const getScrollY = () => {
-        if (contentEl && index.isIonContent(contentEl)) {
+        if (contentEl && index$1.isIonContent(contentEl)) {
             return contentEl.scrollY;
             /**
              * Custom scroll containers are intended to be
@@ -309,7 +409,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onD
          * swipe again. The target content will not
          * be the same between swipes.
          */
-        contentEl = index.findClosestIonContent(target);
+        contentEl = index$1.findClosestIonContent(target);
         if (contentEl) {
             return canSwipeOnContent(contentEl);
         }
@@ -353,7 +453,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onD
          * happen at the same time as the gesture.
          */
         if (deltaY > 0 && contentEl) {
-            index.disableContentScrollY(contentEl);
+            index$1.disableContentScrollY(contentEl);
         }
         animation.progressStart(true, isOpen ? 1 : 0);
         onDragStart();
@@ -367,7 +467,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onD
          * happen at the same time as the gesture.
          */
         if (deltaY > 0 && contentEl) {
-            index.disableContentScrollY(contentEl);
+            index$1.disableContentScrollY(contentEl);
         }
         /**
          * If we are swiping on the content
@@ -462,7 +562,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onD
         isOpen = shouldComplete;
         gesture.enable(false);
         if (contentEl) {
-            index.resetContentScrollY(contentEl, initialScrollY);
+            index$1.resetContentScrollY(contentEl, initialScrollY);
         }
         animation
             .onFinish(() => {
@@ -510,10 +610,10 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onD
         };
         onDragEnd(eventDetail);
     };
-    const gesture = index$1.createGesture({
+    const gesture = index$2.createGesture({
         el,
         gestureName: 'modalSwipeToClose',
-        gesturePriority: hardwareBackButton.OVERLAY_GESTURE_PRIORITY,
+        gesturePriority: overlays.OVERLAY_GESTURE_PRIORITY,
         direction: 'y',
         threshold: 10,
         canStart,
@@ -565,63 +665,6 @@ const calculateProgress = (el, deltaY) => {
     return Math.max(0, Math.min(1, roundedProgress));
 };
 
-const createSheetEnterAnimation = (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;
-    const initialBackdrop = shouldShowBackdrop ? `calc(var(--backdrop-opacity) * ${currentBreakpoint})` : '0';
-    const backdropAnimation = animation.createAnimation('backdropAnimation').fromTo('opacity', 0, initialBackdrop);
-    if (shouldShowBackdrop) {
-        backdropAnimation
-            .beforeStyles({
-            'pointer-events': 'none',
-        })
-            .afterClearStyles(['pointer-events']);
-    }
-    const wrapperAnimation = animation.createAnimation('wrapperAnimation').keyframes([
-        { offset: 0, opacity: 1, transform: 'translateY(100%)' },
-        { offset: 1, opacity: 1, transform: `translateY(${100 - currentBreakpoint * 100}%)` },
-    ]);
-    /**
-     * This allows the content to be scrollable at any breakpoint.
-     */
-    const contentAnimation = !expandToScroll
-        ? animation.createAnimation('contentAnimation').keyframes([
-            { offset: 0, opacity: 1, maxHeight: `${(1 - currentBreakpoint) * 100}%` },
-            { offset: 1, opacity: 1, maxHeight: `${currentBreakpoint * 100}%` },
-        ])
-        : undefined;
-    return { wrapperAnimation, backdropAnimation, contentAnimation };
-};
-const createSheetLeaveAnimation = (opts) => {
-    const { currentBreakpoint, backdropBreakpoint } = opts;
-    /**
-     * Backdrop does not always fade in from 0 to 1 if backdropBreakpoint
-     * is defined, so we need to account for that offset by figuring out
-     * what the current backdrop value should be.
-     */
-    const backdropValue = `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(currentBreakpoint, backdropBreakpoint)})`;
-    const defaultBackdrop = [
-        { offset: 0, opacity: backdropValue },
-        { offset: 1, opacity: 0 },
-    ];
-    const customBackdrop = [
-        { offset: 0, opacity: backdropValue },
-        { offset: backdropBreakpoint, opacity: 0 },
-        { offset: 1, opacity: 0 },
-    ];
-    const backdropAnimation = animation.createAnimation('backdropAnimation').keyframes(backdropBreakpoint !== 0 ? customBackdrop : defaultBackdrop);
-    const wrapperAnimation = animation.createAnimation('wrapperAnimation').keyframes([
-        { offset: 0, opacity: 1, transform: `translateY(${100 - currentBreakpoint * 100}%)` },
-        { offset: 1, opacity: 1, transform: `translateY(100%)` },
-    ]);
-    return { wrapperAnimation, backdropAnimation };
-};
-
 const createEnterAnimation$1 = () => {
     const backdropAnimation = animation.createAnimation()
         .fromTo('opacity', 0.01, 'var(--backdrop-opacity)')
@@ -1012,16 +1055,16 @@ const mdLeaveAnimation = (baseEl, opts) => {
     return baseAnimation;
 };
 
-const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange, onDragStart, onDragMove, onDragEnd) => {
+const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange, usePhysicsBasedGesture, onDragStart, onDragMove, onDragEnd) => {
     // Defaults for the sheet swipe animation
     const defaultBackdrop = [
         { offset: 0, opacity: 'var(--backdrop-opacity)' },
-        { offset: 1, opacity: 0.01 },
+        { offset: 1, opacity: usePhysicsBasedGesture ? 'var(--backdrop-opacity)' : 0.01 },
     ];
     const customBackdrop = [
         { offset: 0, opacity: 'var(--backdrop-opacity)' },
-        { offset: 1 - backdropBreakpoint, opacity: 0 },
-        { offset: 1, opacity: 0 },
+        { offset: 1 - backdropBreakpoint, opacity: usePhysicsBasedGesture ? 'var(--backdrop-opacity)' : 0 },
+        { offset: 1, opacity: usePhysicsBasedGesture ? 'var(--backdrop-opacity)' : 0 },
     ];
     const SheetDefaults = {
         WRAPPER_KEYFRAMES: [
@@ -1065,7 +1108,7 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
          * as inputs should not be focusable outside
          * the sheet.
          */
-        baseEl.classList.remove(hardwareBackButton.FOCUS_TRAP_DISABLE_CLASS);
+        baseEl.classList.remove(overlays.FOCUS_TRAP_DISABLE_CLASS);
     };
     const disableBackdrop = () => {
         baseEl.style.setProperty('pointer-events', 'none');
@@ -1077,7 +1120,7 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
          * Adding this class disables focus trapping
          * for the sheet temporarily.
          */
-        baseEl.classList.add(hardwareBackButton.FOCUS_TRAP_DISABLE_CLASS);
+        baseEl.classList.add(overlays.FOCUS_TRAP_DISABLE_CLASS);
     };
     /**
      * Toggles the footer to an absolute position while moving to prevent
@@ -1201,7 +1244,7 @@ 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.findClosestIonContent(detail.event.target);
+        const contentEl = index$1.findClosestIonContent(detail.event.target);
         currentBreakpoint = getCurrentBreakpoint();
         /**
          * Upwards swipes on the content cannot move the sheet anyway, so this only
@@ -1238,9 +1281,9 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
          * which would impact performance significantly.
          */
         if (!expandToScroll) {
-            const targetEl = index.findClosestIonContent(detail.event.target);
+            const targetEl = index$1.findClosestIonContent(detail.event.target);
             cachedScrollEl =
-                targetEl && index.isIonContent(targetEl) ? helpers.getElementRoot(targetEl).querySelector('.inner-scroll') : targetEl;
+                targetEl && index$1.isIonContent(targetEl) ? helpers.getElementRoot(targetEl).querySelector('.inner-scroll') : targetEl;
         }
         /**
          * If expandToScroll is disabled, we need to swap
@@ -1334,7 +1377,9 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
             : step;
         offset = helpers.clamp(0.0001, processedStep, maxStep);
         animation.progressStep(offset);
-        const snapBreakpoint = calculateSnapBreakpoint(detail.deltaY);
+        const snapBreakpoint = usePhysicsBasedGesture
+            ? calculateVelocitySnapBreakpoint(detail.deltaY, detail.velocityY, detail.currentY)
+            : calculatePositionSnapBreakpoint(detail.deltaY);
         const eventDetail = {
             currentY: detail.currentY,
             deltaY: detail.deltaY,
@@ -1345,7 +1390,9 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
         onDragMove(eventDetail);
     };
     const onEnd = (detail) => {
-        const snapBreakpoint = calculateSnapBreakpoint(detail.deltaY);
+        const snapBreakpoint = usePhysicsBasedGesture
+            ? calculateVelocitySnapBreakpoint(detail.deltaY, detail.velocityY, detail.currentY)
+            : calculatePositionSnapBreakpoint(detail.deltaY);
         /**
          * `snapBreakpoint === 0` is not enough on its own. `canDismiss: false`
          * snaps to 0 but never dismisses, since `handleCanDismiss` returns early
@@ -1406,6 +1453,14 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
          */
         const shouldPreventDismiss = canDismiss && breakpoint === 0;
         const snapToBreakpoint = shouldPreventDismiss ? currentBreakpoint : breakpoint;
+        /**
+         * Detect snap-back behavior: when the snap target is the same as the current breakpoint,
+         * the user released before crossing the threshold to a new breakpoint.
+         * Apply different timing and easing for snap-back vs. snap-to-new.
+         */
+        const isSnapBack = snapToBreakpoint === currentBreakpoint;
+        const duration = usePhysicsBasedGesture ? (isSnapBack ? 300 : 400) : 500;
+        const easing = isSnapBack ? 'cubic-bezier(0.34, 1.4, 0.64, 1)' : 'cubic-bezier(0.32, 0.68, 0, 1)';
         const shouldRemainOpen = snapToBreakpoint !== 0;
         currentBreakpoint = 0;
         /**
@@ -1420,11 +1475,15 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
             backdropAnimation.keyframes([
                 {
                     offset: 0,
-                    opacity: `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(1 - breakpointOffset, backdropBreakpoint)})`,
+                    opacity: usePhysicsBasedGesture
+                        ? 'var(--backdrop-opacity)'
+                        : `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(1 - breakpointOffset, backdropBreakpoint)})`,
                 },
                 {
                     offset: 1,
-                    opacity: `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(snapToBreakpoint, backdropBreakpoint)})`,
+                    opacity: usePhysicsBasedGesture
+                        ? 'var(--backdrop-opacity)'
+                        : `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(snapToBreakpoint, backdropBreakpoint)})`,
                 },
             ]);
             if (contentAnimation) {
@@ -1442,6 +1501,12 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
             }
             animation.progressStep(0);
         }
+        /**
+         * Apply the appropriate easing curve for this snap behavior.
+         */
+        if (usePhysicsBasedGesture) {
+            animation.easing(easing);
+        }
         /**
          * Gesture should remain disabled until the
          * snapping animation completes.
@@ -1531,7 +1596,7 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
                  * be added every time onEnd runs.
                  */
             }, { oneTimeCallback: true })
-                .progressEnd(1, 0, animated ? 500 : 0);
+                .progressEnd(1, 0, animated ? duration : 0);
         });
     };
     /**
@@ -1542,7 +1607,7 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
      * @param deltaY The change in Y position since the gesture started.
      * @returns The snap breakpoint value.
      */
-    const calculateSnapBreakpoint = (deltaY) => {
+    const calculatePositionSnapBreakpoint = (deltaY) => {
         /**
          * Calculates the real-time vertical position of the modal.
          * We combine the wrapper's current bounding box position with the
@@ -1562,6 +1627,50 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
         });
         return snapBreakpoint;
     };
+    /**
+     * Calculates the snap breakpoint using velocity-based logic.
+     * This provides a more intuitive and responsive sheet behavior for the Ionic theme.
+     *
+     * Rules:
+     * 1. Fast downward flick (> 500 px/s) always dismisses, regardless of position
+     * 2. Fast upward flick (> 400 px/s) snaps to the next breakpoint above
+     * 3. If dragged 40% below current snap point without fast upward flick, dismisses
+     * 4. Otherwise, falls back to position-based snap (closest breakpoint)
+     *
+     * @param deltaY The change in Y position since gesture started
+     * @param velocityY The velocity in pixels per millisecond
+     * @param currentY The current Y position of the gesture
+     * @returns The snap breakpoint value
+     */
+    const calculateVelocitySnapBreakpoint = (deltaY, velocityY, currentY) => {
+        // Convert velocity from px/ms to px/s for easier threshold comparison
+        const velocityYPerSecond = velocityY * 1000;
+        // Calculate current progress (0 = fully closed, 1 = fully expanded)
+        const currentProgress = calculateProgress(currentY);
+        // Rule 1: Fast downward flick always dismisses
+        if (velocityYPerSecond > 500) {
+            return minBreakpoint;
+        }
+        // Rule 2: Fast upward flick moves to next breakpoint above
+        if (velocityYPerSecond < -400) {
+            // Find next breakpoint above current position
+            const nextBreakpoint = breakpoints.find((bp) => bp > currentProgress);
+            // If no breakpoint above, stay at max breakpoint
+            return nextBreakpoint ?? maxBreakpoint;
+        }
+        // Rule 3: 40% dismissal rule (only if not flicking up and 0 breakpoint exists)
+        if (minBreakpoint === 0 && currentBreakpoint > 0) {
+            // Calculate how far we've moved below the current snap point
+            const distanceBelowSnap = currentBreakpoint - currentProgress;
+            const percentageBelowSnap = distanceBelowSnap / currentBreakpoint;
+            // If dragged more than 40% below and not flicking up, dismiss
+            if (percentageBelowSnap > 0.4 && velocityYPerSecond <= 400) {
+                return 0;
+            }
+        }
+        // Rule 4: Fallback to position-based snap (existing logic)
+        return calculatePositionSnapBreakpoint(deltaY);
+    };
     /**
      * Calculates the progress of the swipe gesture.
      *
@@ -1632,7 +1741,7 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
          */
         return viewportBottom - activeHeight;
     };
-    const gesture = index$1.createGesture({
+    const gesture = index$2.createGesture({
         el: wrapperEl,
         gestureName: 'modalSheet',
         gesturePriority: 40,
@@ -1678,7 +1787,7 @@ const getRootSafeAreaTop = () => {
     if (cachedRootSafeAreaTop !== null) {
         return cachedRootSafeAreaTop;
     }
-    const doc = helpers.win?.document;
+    const doc = index.win?.document;
     if (!doc?.body) {
         return 0;
     }
@@ -1704,7 +1813,7 @@ const getRootSafeAreaTop = () => {
  * that read and the observer starting is still reported.
  */
 const onRootSafeAreaTopChange = (callback) => {
-    return helpers.onCustomPropertyChange(helpers.win?.document?.body, '--ion-safe-area-top', callback, getRootSafeAreaTop());
+    return helpers.onCustomPropertyChange(index.win?.document?.body, '--ion-safe-area-top', callback, getRootSafeAreaTop());
 };
 /**
  * Determines which viewport axes the modal spans so safe-area requirements
@@ -1721,8 +1830,8 @@ const onRootSafeAreaTopChange = (callback) => {
  */
 const getModalCoveredAxes = (hostEl) => {
     const styles = getComputedStyle(hostEl);
-    const width = hardwareBackButton.getOverlaySizeType(styles.getPropertyValue('--width'));
-    const height = hardwareBackButton.getOverlaySizeType(styles.getPropertyValue('--height'));
+    const width = overlays.getOverlaySizeType(styles.getPropertyValue('--width'));
+    const height = overlays.getOverlaySizeType(styles.getPropertyValue('--height'));
     if (width === 'fullscreen' && height === 'fullscreen') {
         return { vertical: true, horizontal: true };
     }
@@ -1742,7 +1851,7 @@ const getModalCoveredAxes = (hostEl) => {
  */
 const measureCoveredAxes = (hostEl) => {
     const wrapperEl = hostEl.shadowRoot?.querySelector('.modal-wrapper');
-    if (wrapperEl == null || helpers.win === undefined) {
+    if (wrapperEl == null || index.win === undefined) {
         return { vertical: false, horizontal: false };
     }
     const wasHidden = hostEl.classList.contains('overlay-hidden');
@@ -1754,8 +1863,8 @@ const measureCoveredAxes = (hostEl) => {
         hostEl.classList.add('overlay-hidden');
     }
     return {
-        vertical: height >= helpers.win.innerHeight - EDGE_THRESHOLD,
-        horizontal: width >= helpers.win.innerWidth - EDGE_THRESHOLD,
+        vertical: height >= index.win.innerHeight - EDGE_THRESHOLD,
+        horizontal: width >= index.win.innerWidth - EDGE_THRESHOLD,
     };
 };
 /**
@@ -1824,8 +1933,8 @@ const getInitialSafeAreaConfig = (context) => {
  */
 const getPositionBasedSafeAreaConfig = (wrapperEl) => {
     const rect = wrapperEl.getBoundingClientRect();
-    const vh = helpers.win?.innerHeight ?? 0;
-    const vw = helpers.win?.innerWidth ?? 0;
+    const vh = index.win?.innerHeight ?? 0;
+    const vw = index.win?.innerWidth ?? 0;
     // Only apply safe-area to sides where modal overlaps with screen edge
     return {
         top: rect.top <= EDGE_THRESHOLD ? 'inherit' : '0px',
@@ -1858,28 +1967,30 @@ const clearSafeAreaOverrides = (hostEl) => {
     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:100%;--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-wrapper{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;outline:none}.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 modalIonicCss = () => `:host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:100%;--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-wrapper{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;outline:none}.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, var(--token-shadow-offset-0, 0px) var(--token-shadow-offset-6, 6px) var(--token-shadow-blur-32, 32px) var(--token-shadow-spread-0, 0px) var(--token-shadow-6, rgba(0, 0, 0, 0.1607843137)), var(--token-shadow-offset-0, 0px) var(--token-shadow-offset-2, 2px) var(--token-shadow-blur-7, 7px) var(--token-shadow-spread-0, 0px) var(--token-shadow-2, rgba(0, 0, 0, 0.0509803922)));--backdrop-opacity:0.7;color:var(--token-text-default, var(--token-primitives-neutral-1200, #242528))}: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, #e6eaee)}.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 modalMdCss = () => `:host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:100%;--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-wrapper{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;outline:none}.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 modalIosCss = () => `:host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:100%;--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-wrapper{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;outline:none}.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-modal-offset-top, 0px) + 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 modalMdCss = () => `:host{--width:100%;--min-width:auto;--max-width:auto;--height:100%;--min-height:auto;--max-height:100%;--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-wrapper{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;outline:none}.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-modal-offset-top, 0px) + 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 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);
-        this.ionDragStart = index$2.createEvent(this, "ionDragStart", 7);
-        this.ionDragMove = index$2.createEvent(this, "ionDragMove", 7);
-        this.ionDragEnd = index$2.createEvent(this, "ionDragEnd", 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.ionDragStart = index$3.createEvent(this, "ionDragStart", 7);
+        this.ionDragMove = index$3.createEvent(this, "ionDragMove", 7);
+        this.ionDragEnd = index$3.createEvent(this, "ionDragEnd", 7);
         this.lockController = lockController.createLockController();
-        this.triggerController = hardwareBackButton.createTriggerController();
+        this.triggerController = overlays.createTriggerController();
         this.coreDelegate = frameworkDelegate.CoreDelegate();
         this.isSheetModal = false;
         this.inheritedAttributes = {};
@@ -2025,7 +2136,7 @@ const Modal = class {
                  */
                 return;
             }
-            this.dismiss(undefined, hardwareBackButton.BACKDROP);
+            this.dismiss(undefined, overlays.BACKDROP);
         };
         this.onLifecycle = (modalEvent) => {
             const el = this.usersElement;
@@ -2123,7 +2234,7 @@ const Modal = class {
     }
     connectedCallback() {
         const { el } = this;
-        hardwareBackButton.prepareOverlay(el);
+        overlays.prepareOverlay(el);
         this.triggerChanged();
         // A disconnect tears down state this presentation still needs and cannot
         // tell a re-insert from a removal, so put it back.
@@ -2133,7 +2244,7 @@ const Modal = class {
         // A relocation from `willPresent` reaches these before `present()` has
         // applied the lock, so they apply it instead. Both are idempotent.
         if (this.presented) {
-            hardwareBackButton.restoreRootFocusTrapAccessibility(el);
+            overlays.restoreRootFocusTrapAccessibility(el);
             this.initParentRemovalObserver();
         }
     }
@@ -2146,7 +2257,7 @@ const Modal = class {
         this.cleanupSafeAreaOverrides();
         // Clean up aria-hidden if removed without dismiss() being called
         if (this.presented) {
-            hardwareBackButton.cleanupRootFocusTrapAccessibility();
+            overlays.cleanupRootFocusTrapAccessibility();
         }
     }
     componentWillLoad() {
@@ -2196,10 +2307,10 @@ 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 (!this.htmlAttributes?.id) {
-            hardwareBackButton.setOverlayId(this.el);
+            overlays.setOverlayId(this.el);
         }
     }
     componentDidLoad() {
@@ -2296,7 +2407,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
@@ -2307,9 +2418,9 @@ const Modal = class {
              */
         }
         else if (!this.keepContentsMounted) {
-            await index$3.waitForMount();
+            await index$4.waitForMount();
         }
-        index$2.writeTask(() => this.el.classList.add('show-modal'));
+        index$3.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;
@@ -2330,11 +2441,12 @@ const Modal = class {
                 this.statusBarStyle = await StatusBar.getStyle();
                 setCardStatusBarDark();
             }
-            await hardwareBackButton.present(this, 'modalEnter', iosEnterAnimation, mdEnterAnimation, {
+            await overlays.present(this, 'modalEnter', iosEnterAnimation, mdEnterAnimation, ionicEnterAnimation, {
                 presentingEl: presentingElement,
                 currentBreakpoint: this.initialBreakpoint,
                 backdropBreakpoint: this.backdropBreakpoint,
                 expandToScroll: this.expandToScroll,
+                staticBackdropOpacity: ionicGlobal.getIonTheme(this) === 'ionic',
             });
         }
         finally {
@@ -2395,14 +2507,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.findIonContent(el);
+        const contentEl = index$1.findIonContent(el);
         if (!contentEl) {
-            index.printIonContentErrorMsg(el);
+            index$1.printIonContentErrorMsg(el);
             return;
         }
         const statusBarStyle = this.statusBarStyle ?? Style.Default;
@@ -2414,12 +2526,13 @@ 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, resetContentScroll } = createSheetGesture(this.el, this.backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, ani, this.sortedBreakpoints, this.expandToScroll, () => this.currentBreakpoint ?? 0, () => this.sheetOnDismiss(), (breakpoint) => {
@@ -2427,7 +2540,7 @@ const Modal = class {
                 this.currentBreakpoint = breakpoint;
                 this.ionBreakpointDidChange.emit({ breakpoint });
             }
-        }, () => this.onDragStart(), (detail) => this.onDragMove(detail), (detail) => this.onDragEnd(detail));
+        }, ionicGlobal.getIonTheme(this) === 'ionic', () => this.onDragStart(), (detail) => this.onDragMove(detail), (detail) => this.onDragEnd(detail));
         this.gesture = gesture;
         this.moveSheetToBreakpoint = moveSheetToBreakpoint;
         this.resetSheetContentScroll = resetContentScroll;
@@ -2517,7 +2630,7 @@ const Modal = class {
         this.animation.onFinish(async () => {
             this.currentBreakpoint = 0;
             this.ionBreakpointDidChange.emit({ breakpoint: this.currentBreakpoint });
-            await this.dismiss(undefined, hardwareBackButton.GESTURE);
+            await this.dismiss(undefined, overlays.GESTURE);
             this.gestureAnimationDismissing = false;
         });
     }
@@ -2543,7 +2656,7 @@ const Modal = class {
          */
         setCardStatusBarDefault(this.statusBarStyle);
         this.animation.onFinish(async () => {
-            await this.dismiss(undefined, hardwareBackButton.GESTURE);
+            await this.dismiss(undefined, overlays.GESTURE);
             this.gestureAnimationDismissing = false;
         });
     }
@@ -2558,7 +2671,7 @@ const Modal = class {
      * For example, `cancel` or `backdrop`.
      */
     async dismiss(data, role) {
-        if (this.gestureAnimationDismissing && role !== hardwareBackButton.GESTURE) {
+        if (this.gestureAnimationDismissing && role !== overlays.GESTURE) {
             return false;
         }
         // Cancel any pending resize timeout to prevent stale updates during dismiss
@@ -2600,7 +2713,7 @@ const Modal = class {
             window.removeEventListener(keyboard.KEYBOARD_DID_OPEN, this.keyboardOpenCallback);
             this.keyboardOpenCallback = undefined;
         }
-        const dismissed = await hardwareBackButton.dismiss(this, data, role, 'modalLeave', iosLeaveAnimation, mdLeaveAnimation, {
+        const dismissed = await overlays.dismiss(this, data, role, 'modalLeave', iosLeaveAnimation, mdLeaveAnimation, {
             presentingEl: presentingElement,
             currentBreakpoint: this.currentBreakpoint ?? this.initialBreakpoint,
             backdropBreakpoint: this.backdropBreakpoint,
@@ -2609,7 +2722,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();
             }
@@ -2637,13 +2750,13 @@ const Modal = class {
      * Returns a promise that resolves when the modal did dismiss.
      */
     onDidDismiss() {
-        return hardwareBackButton.eventMethod(this.el, 'ionModalDidDismiss');
+        return overlays.eventMethod(this.el, 'ionModalDidDismiss');
     }
     /**
      * Returns a promise that resolves when the modal will dismiss.
      */
     onWillDismiss() {
-        return hardwareBackButton.eventMethod(this.el, 'ionModalWillDismiss');
+        return overlays.eventMethod(this.el, 'ionModalWillDismiss');
     }
     /**
      * Move a sheet style modal to a specific breakpoint.
@@ -2653,11 +2766,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;
@@ -2702,6 +2815,18 @@ 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) {
@@ -3094,24 +3219,26 @@ const Modal = class {
     render() {
         const { handle, isSheetModal, presentingElement, htmlAttributes, handleBehavior, inheritedAttributes, focusTrap, expandToScroll, } = this;
         const showHandle = handle !== false && isSheetModal;
-        const mode = ionicGlobal.getIonMode(this);
-        const isCardModal = presentingElement !== undefined && mode === 'ios';
+        const theme$1 = ionicGlobal.getIonTheme(this);
+        const isCardModal = presentingElement !== undefined && theme$1 === 'ios';
         const isHandleCycle = handleBehavior === 'cycle';
+        const shape = this.getShape();
         const isSheetModalWithHandle = isSheetModal && showHandle;
-        return (index$2.h(index$2.Host, { key: '17a95bd7722bac2344bea041aff97db17f55c0cf', "no-router": true,
+        return (index$3.h(index$3.Host, { key: 'd7d9e9f103fb1ac669da34819e6f460316cffa48', "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: {
-                [mode]: true,
+                [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,
-                [hardwareBackButton.FOCUS_TRAP_DISABLE_CLASS]: focusTrap === false,
+                [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: '9dab1ef4771c0d847ba2be8672afbaa2748517f3', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && index$2.h("div", { key: '64af7ed1c5f552b61fc4b9387b926acc76c8a99a', class: "modal-shadow" }), index$2.h("div", { key: '7e76d77d5b2e8f0467bb793facf5aa86f8d01bbe',
+            }, onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }, index$3.h("ion-backdrop", { key: '030d13dadaef45a24fd694478cf6583a637b9e9e', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), theme$1 === 'ios' && index$3.h("div", { key: '111f4df167615ee37f6db3f1000f6bd1a6b25fee', class: "modal-shadow" }), index$3.h("div", { key: '2720518be4e2701a5641f31e3f13336778f2fdbb',
             /*
               role and aria-modal must be used on the
               same element. They must also be set inside the
@@ -3124,11 +3251,11 @@ const Modal = class {
               without the tabindex focus() would be a no-op and screen readers
               may not properly announce the dialog and its content when it opens.
             */
-            role: "dialog", ...inheritedAttributes, "aria-modal": "true", tabIndex: -1, class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }, showHandle && (index$2.h("button", { key: '5efc0bb0a59adcc594ac48da9fd90e57908a7ffb', class: "modal-handle",
+            role: "dialog", ...inheritedAttributes, "aria-modal": "true", tabIndex: -1, class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }, showHandle && (index$3.h("button", { key: '7b8d765349e94315383e15c59ae55bbf92b7834a', 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: '6175fcd0b39c086b4e9eb9e96c4d631c2a86774b', 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", "data-focus-order": "1", ref: (el) => (this.dragHandleEl = el) })), index$3.h("slot", { key: 'fb952f2216991352c002b796933d3dbee1397051', onSlotchange: this.onSlotChange }))));
     }
-    get el() { return index$2.getElement(this); }
+    get el() { return index$3.getElement(this); }
     static get watchers() { return {
         "isOpen": [{
                 "onIsOpenChange": 0
@@ -3148,6 +3275,7 @@ const LIFECYCLE_MAP = {
     ionModalDidDismiss: 'ionViewDidLeave',
 };
 Modal.style = {
+    ionic: modalIonicCss(),
     ios: modalIosCss(),
     md: modalMdCss()
 };