@ionic/core 8.8.18-dev.11786385944.17aca7e5 → 8.8.18-dev.11786487682.1e6f798f

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

@@ -1,24 +1,23 @@
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
  */
-import { r as registerInstance, c as createEvent, f as printIonWarning, w as writeTask, e as config, h, d as Host, g as getElement } from './index-tcQvqkiX.js';
-import { i as isIonContent, f as findRefresherInContent, a as findClosestIonContent, d as disableContentScrollY, r as resetContentScrollY, b as findIonContent, p as printIonContentErrorMsg } from './index-Dw-wN0Ja.js';
-import { C as CoreDelegate, a as attachComponent, d as detachComponent } from './framework-delegate-FnPGymXL.js';
-import { g as getElementRoot, e as clamp, r as raf, b as inheritAttributes, h as hasLazyBuild } from './helpers-HEqiOzXb.js';
+import { r as registerInstance, c as createEvent, f as printIonWarning, w as writeTask, e as config, h, d as Host, g as getElement } from './index-C0EQceqV.js';
+import { f as findClosestIonContent, i as isIonContent, d as disableContentScrollY, r as resetContentScrollY, a as findIonContent, p as printIonContentErrorMsg } from './index-KxK0gcRp.js';
+import { C as CoreDelegate, a as attachComponent, d as detachComponent } from './framework-delegate-DO2QXccA.js';
+import { g as getElementRoot, e as clamp, r as raf, b as inheritAttributes, h as hasLazyBuild } from './helpers-DfF5_wJc.js';
 import { c as createLockController } from './lock-controller-B-hirT0v.js';
-import { g as getCapacitor } from './capacitor-CFERIeaU.js';
-import { G as GESTURE, O as OVERLAY_GESTURE_PRIORITY, F as FOCUS_TRAP_DISABLE_CLASS, e as createTriggerController, B as BACKDROP, j as prepareOverlay, k as setOverlayId, f as present, g as dismiss, h as eventMethod } from './overlays-Dg0q2_tJ.js';
-import { g as getClassMap } from './theme-DiVJyqlX.js';
-import { e as deepReady, w as waitForMount } from './index-B_dQk_WE.js';
-import { b as getIonMode } from './ionic-global-Cp_eT4sZ.js';
-import { KEYBOARD_DID_OPEN } from './keyboard-ywgs5efA.js';
-import { c as createAnimation } from './animation-DLJpuoEz.js';
+import { g as getCapacitor } from './capacitor-CtQSWUU0.js';
+import { G as GESTURE, O as OVERLAY_GESTURE_PRIORITY, F as FOCUS_TRAP_DISABLE_CLASS, e as createTriggerController, B as BACKDROP, j as prepareOverlay, k as setOverlayId, f as present, g as dismiss, h as eventMethod } from './overlays-tv6nLsmk.js';
+import { g as getClassMap } from './theme-DaJxRxSQ.js';
+import { e as deepReady, w as waitForMount } from './index-BIUWGRUl.js';
+import { w as win, b as getIonMode, c as getIonTheme } from './ionic-global-BpkTponr.js';
+import { KEYBOARD_DID_OPEN } from './keyboard-WJix-wcz.js';
+import { c as createAnimation } from './animation-B2qdQ_ou.js';
 import { g as getTimeGivenProgression } from './cubic-bezier-hHmYLOfE.js';
 import { createGesture } from './index-CfgBF1SE.js';
-import { w as win } from './index-ZjP4CjeZ.js';
-import './hardware-back-button-B93Gru0Y.js';
+import './focus-visible-vXpMhGrs.js';
 import './gesture-controller-BTEOs1at.js';
-import './keyboard-CUw4ekVy.js';
+import './keyboard-CyyguLDw.js';
 
 var Style;
 (function (Style) {
@@ -127,21 +126,104 @@ const setCardStatusBarDefault = (defaultStyle = Style.Default) => {
     StatusBar.setStyle({ style: defaultStyle });
 };
 
+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 = createAnimation('backdropAnimation').fromTo('opacity', 0, initialBackdrop);
+    if (shouldShowBackdrop) {
+        backdropAnimation
+            .beforeStyles({
+            'pointer-events': 'none',
+        })
+            .afterClearStyles(['pointer-events']);
+    }
+    const wrapperAnimation = 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
+        ? 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 = createAnimation('backdropAnimation').keyframes(backdropBreakpoint !== 0 ? customBackdrop : defaultBackdrop);
+    const wrapperAnimation = 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 = createAnimation()
+        .fromTo('opacity', 0.01, 'var(--backdrop-opacity)')
+        .beforeStyles({
+        'pointer-events': 'none',
+    })
+        .afterClearStyles(['pointer-events']);
+    const wrapperAnimation = createAnimation().keyframes([
+        { offset: 0, opacity: 0.01, transform: 'translateY(40px)' },
+        { offset: 1, opacity: 1, transform: `translateY(0px)` },
+    ]);
+    return { backdropAnimation, wrapperAnimation, contentAnimation: undefined };
+};
 /**
- * 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.
- *
- * Note: We cannot solve the refresher case with gesture priority as the iOS
- * native refresh gesture uses a scroll listener in addition to a gesture.
- *
- * Note: Do not use `getScrollElement` here because we need this to be a
- * synchronous operation, and `getScrollElement` is asynchronous.
+ * Ionic Modal Enter Animation
  */
-const canSwipeOnContent = (contentEl) => {
-    const scrollEl = isIonContent(contentEl) ? getElementRoot(contentEl).querySelector('.inner-scroll') : contentEl;
-    const hasRefresherInContent = !!findRefresherInContent(contentEl);
-    return !hasRefresherInContent && scrollEl.scrollTop === 0;
+const ionicEnterAnimation = (baseEl, opts) => {
+    const { currentBreakpoint, expandToScroll } = opts;
+    const root = 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 === null || contentAnimation === void 0 ? void 0 : 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 === null || contentAnimation === void 0 ? void 0 : contentAnimation.duration(400).easing('cubic-bezier(0.32, 0.68, 0, 1)');
+    const baseAnimation = createAnimation().addElement(baseEl).addAnimation([backdropAnimation, wrapperAnimation]);
+    if (contentAnimation) {
+        baseAnimation.addAnimation(contentAnimation);
+    }
+    return baseAnimation;
 };
+
 const handleCanDismiss = async (el, animation) => {
     /**
      * If canDismiss is not a function
@@ -272,6 +354,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onD
     let isOpen = false;
     let canDismissBlocksGesture = false;
     let contentEl = null;
+    let scrollEl = null;
     const canDismissMaxStep = 0.2;
     let initialScrollY = true;
     let lastStep = 0;
@@ -294,6 +377,12 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onD
             return true;
         }
         /**
+         * If we are swiping on the content,
+         * swiping should only be possible if
+         * the content is scrolled all the way
+         * to the top so that we do not interfere
+         * with scrolling.
+         *
          * We cannot assume that the `ion-content`
          * target will remain consistent between
          * swipes. For example, when using
@@ -304,7 +393,29 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onD
          */
         contentEl = findClosestIonContent(target);
         if (contentEl) {
-            return canSwipeOnContent(contentEl);
+            /**
+             * The card should never swipe to close
+             * on the content with a refresher.
+             * Note: We cannot solve this by making the
+             * swipeToClose gesture have a higher priority
+             * than the refresher gesture as the iOS native
+             * refresh gesture uses a scroll listener in
+             * addition to a gesture.
+             *
+             * Note: Do not use getScrollElement here
+             * because we need this to be a synchronous
+             * operation, and getScrollElement is
+             * asynchronous.
+             */
+            if (isIonContent(contentEl)) {
+                const root = getElementRoot(contentEl);
+                scrollEl = root.querySelector('.inner-scroll');
+            }
+            else {
+                scrollEl = contentEl;
+            }
+            const hasRefresherInContent = !!contentEl.querySelector('ion-refresher');
+            return !hasRefresherInContent && scrollEl.scrollTop === 0;
         }
         /**
          * Card should be swipeable on all
@@ -546,63 +657,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 = createAnimation('backdropAnimation').fromTo('opacity', 0, initialBackdrop);
-    if (shouldShowBackdrop) {
-        backdropAnimation
-            .beforeStyles({
-            'pointer-events': 'none',
-        })
-            .afterClearStyles(['pointer-events']);
-    }
-    const wrapperAnimation = 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
-        ? 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 = createAnimation('backdropAnimation').keyframes(backdropBreakpoint !== 0 ? customBackdrop : defaultBackdrop);
-    const wrapperAnimation = 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 = createAnimation()
         .fromTo('opacity', 0.01, 'var(--backdrop-opacity)')
@@ -993,17 +1047,16 @@ const mdLeaveAnimation = (baseEl, opts) => {
     return baseAnimation;
 };
 
-const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange, onDragStart, onDragMove, onDragEnd) => {
-    var _a;
+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: [
@@ -1017,8 +1070,6 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
         ],
     };
     const contentEl = baseEl.querySelector('ion-content');
-    // Cache the initial value so the gesture restores it instead of forcing scrolling on.
-    const initialContentScrollY = (_a = contentEl === null || contentEl === void 0 ? void 0 : contentEl.scrollY) !== null && _a !== void 0 ? _a : true;
     const height = wrapperEl.clientHeight;
     let currentBreakpoint = initialBreakpoint;
     let offset = 0;
@@ -1179,6 +1230,9 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
     }
     const canStart = (detail) => {
         /**
+         * If we are swiping on the content, swiping should only be possible if the content
+         * is scrolled all the way to the top so that we do not interfere with scrolling.
+         *
          * We cannot assume that the `ion-content` target will remain consistent between swipes.
          * 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.
@@ -1186,11 +1240,26 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
         const contentEl = findClosestIonContent(detail.event.target);
         currentBreakpoint = getCurrentBreakpoint();
         /**
-         * Upwards swipes on the content cannot move the sheet anyway, so this only
-         * blocks swiping the sheet down from the content.
+         * If `expandToScroll` is disabled, we should not allow the swipe gesture
+         * to start if the content is not scrolled to the top.
          */
-        if (contentEl && (!expandToScroll || currentBreakpoint === 1)) {
-            return canSwipeOnContent(contentEl);
+        if (!expandToScroll && contentEl) {
+            const scrollEl = isIonContent(contentEl) ? getElementRoot(contentEl).querySelector('.inner-scroll') : contentEl;
+            return scrollEl.scrollTop === 0;
+        }
+        if (currentBreakpoint === 1 && contentEl) {
+            /**
+             * The modal should never swipe to close on the content with a refresher.
+             * Note 1: We cannot solve this by making this gesture have a higher priority than
+             * the refresher gesture as the iOS native refresh gesture uses a scroll listener in
+             * addition to a gesture.
+             *
+             * Note 2: Do not use getScrollElement here because we need this to be a synchronous
+             * operation, and getScrollElement is asynchronous.
+             */
+            const scrollEl = isIonContent(contentEl) ? getElementRoot(contentEl).querySelector('.inner-scroll') : contentEl;
+            const hasRefresherInContent = !!contentEl.querySelector('ion-refresher');
+            return !hasRefresherInContent && scrollEl.scrollTop === 0;
         }
         return true;
     };
@@ -1317,7 +1386,9 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
             : step;
         offset = 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,
@@ -1328,7 +1399,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);
         const eventDetail = {
             currentY: detail.currentY,
             deltaY: detail.deltaY,
@@ -1375,6 +1448,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;
         /**
@@ -1389,11 +1470,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) {
@@ -1411,6 +1496,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.
@@ -1423,14 +1514,14 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
             onDismiss();
         }
         /**
-         * Restores the content's scroll setting immediately if the sheet is about to
-         * fully expand or if it allows scrolling at any breakpoint. Without this, there would
+         * Enables scrolling immediately if the sheet is about to fully expand
+         * or if it allows scrolling at any breakpoint. Without this, there would
          * be a ~500ms delay while the modal animation completes, causing a
          * noticeable lag. Native iOS allows scrolling as soon as the gesture is
          * released, so we align with that behavior.
          */
         if (contentEl && (snapToBreakpoint === breakpoints[breakpoints.length - 1] || !expandToScroll)) {
-            contentEl.scrollY = initialContentScrollY;
+            contentEl.scrollY = true;
         }
         /**
          * If expandToScroll is disabled and we're animating
@@ -1500,7 +1591,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);
         });
     };
     /**
@@ -1511,7 +1602,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
@@ -1531,6 +1622,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 !== null && nextBreakpoint !== void 0 ? 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.
      *
@@ -1612,20 +1747,9 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
         onMove,
         onEnd,
     });
-    /**
-     * Puts the content back the way the app declared it. A sheet can dismiss
-     * without going through moveSheetToBreakpoint, and an inline modal reuses
-     * the same element on the next present.
-     */
-    const resetContentScroll = () => {
-        if (contentEl) {
-            contentEl.scrollY = initialContentScrollY;
-        }
-    };
     return {
         gesture,
         moveSheetToBreakpoint,
-        resetContentScroll,
     };
 };
 
@@ -1815,9 +1939,11 @@ 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: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-wrapper{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: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-wrapper{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, 0px 2px 7px 0px rgba(0, 0, 0, 0.05), 0px 6px 32px 0px rgba(0, 0, 0, 0.16));--backdrop-opacity:0.7;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 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-wrapper{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: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-wrapper{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: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-wrapper{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) {
@@ -2257,11 +2383,12 @@ const Modal = class {
             this.statusBarStyle = await StatusBar.getStyle();
             setCardStatusBarDark();
         }
-        await present(this, 'modalEnter', iosEnterAnimation, mdEnterAnimation, {
+        await present(this, 'modalEnter', iosEnterAnimation, mdEnterAnimation, ionicEnterAnimation, {
             presentingEl: presentingElement,
             currentBreakpoint: this.initialBreakpoint,
             backdropBreakpoint: this.backdropBreakpoint,
             expandToScroll: this.expandToScroll,
+            staticBackdropOpacity: getIonTheme(this) === 'ionic',
         });
         // Update safe-area based on actual position after animation
         this.updateSafeAreaOverrides();
@@ -2344,17 +2471,17 @@ const Modal = class {
             currentBreakpoint: initialBreakpoint,
             backdropBreakpoint,
             expandToScroll: this.expandToScroll,
+            staticBackdropOpacity: getIonTheme(this) === 'ionic',
         }));
         ani.progressStart(true, 1);
-        const { gesture, moveSheetToBreakpoint, resetContentScroll } = 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) => {
+        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) => {
             if (this.currentBreakpoint !== breakpoint) {
                 this.currentBreakpoint = breakpoint;
                 this.ionBreakpointDidChange.emit({ breakpoint });
             }
-        }, () => this.onDragStart(), (detail) => this.onDragMove(detail), (detail) => this.onDragEnd(detail));
+        }, getIonTheme(this) === 'ionic', () => this.onDragStart(), (detail) => this.onDragMove(detail), (detail) => this.onDragEnd(detail));
         this.gesture = gesture;
         this.moveSheetToBreakpoint = moveSheetToBreakpoint;
-        this.resetSheetContentScroll = resetContentScroll;
         this.gesture.enable(true);
         /**
          * When backdrop interaction is allowed, nested router outlets from child routes
@@ -2486,7 +2613,7 @@ const Modal = class {
      * For example, `cancel` or `backdrop`.
      */
     async dismiss(data, role) {
-        var _a, _b;
+        var _a;
         if (this.gestureAnimationDismissing && role !== GESTURE) {
             return false;
         }
@@ -2545,13 +2672,6 @@ const Modal = class {
             if (this.gesture) {
                 this.gesture.destroy();
             }
-            /**
-             * The sheet gesture turns content scrolling off while the sheet sits below
-             * the top breakpoint. Inline modals reuse the same content on the next
-             * present, so hand it back before the gesture goes away.
-             */
-            (_b = this.resetSheetContentScroll) === null || _b === void 0 ? void 0 : _b.call(this);
-            this.resetSheetContentScroll = undefined;
             this.cleanupViewTransitionListener();
             this.cleanupParentRemovalObserver();
             this.cleanupSafeAreaOverrides();
@@ -2631,6 +2751,18 @@ const Modal = class {
         await this.setCurrentBreakpoint(nextBreakpoint);
         return true;
     }
+    getShape() {
+        const theme = 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 (getIonMode(this) !== 'ios' || !this.presentingElement || this.enterAnimation || this.leaveAnimation) {
@@ -2964,15 +3096,16 @@ const Modal = class {
     render() {
         const { handle, isSheetModal, presentingElement, htmlAttributes, handleBehavior, inheritedAttributes, focusTrap, expandToScroll, } = this;
         const showHandle = handle !== false && isSheetModal;
-        const mode = getIonMode(this);
-        const isCardModal = presentingElement !== undefined && mode === 'ios';
+        const theme = getIonTheme(this);
+        const isCardModal = presentingElement !== undefined && theme === 'ios';
         const isHandleCycle = handleBehavior === 'cycle';
+        const shape = this.getShape();
         const isSheetModalWithHandle = isSheetModal && showHandle;
-        return (h(Host, Object.assign({ key: '09f09a10d858e976bc2a989f30db925348a7784c', "no-router": true,
+        return (h(Host, Object.assign({ key: 'aa0c8c6926534d17df0b76ba0c3bad143f22f577', "no-router": true,
             // Allow the modal to be navigable when the handle is focusable
             tabIndex: isHandleCycle && isSheetModalWithHandle ? 0 : -1 }, htmlAttributes, { style: {
                 zIndex: `${20000 + this.overlayIndex}`,
-            }, class: Object.assign({ [mode]: true, ['modal-default']: !isCardModal && !isSheetModal, [`modal-card`]: isCardModal, [`modal-sheet`]: isSheetModal, [`modal-no-expand-scroll`]: isSheetModal && !expandToScroll, 'overlay-hidden': true, [FOCUS_TRAP_DISABLE_CLASS]: focusTrap === false }, getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }), h("ion-backdrop", { key: 'b197319bdddf0b979ccacdb63dbceccfd9bf2560', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: 'c848ff6a10e9092cdb10a6f21c9a299a72b17ca9', class: "modal-shadow" }), h("div", Object.assign({ key: 'e7c8e67807d49098aba63dce69a1bbf9647bbab6',
+            }, class: Object.assign({ [theme]: true, ['modal-default']: !isCardModal && !isSheetModal, [`modal-card`]: isCardModal, [`modal-sheet`]: isSheetModal, [`modal-${shape}`]: shape !== undefined, [`modal-no-expand-scroll`]: isSheetModal && !expandToScroll, 'overlay-hidden': true, [FOCUS_TRAP_DISABLE_CLASS]: focusTrap === false }, getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }), h("ion-backdrop", { key: '9d9421370a86dbe4bb4ff27681f22bea168d7297', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), theme === 'ios' && h("div", { key: '9a4e349ed6234bf18c07995fcd97dd0e1d65a2bd', class: "modal-shadow" }), h("div", Object.assign({ key: '3649cb4a4b63f4335f607b7fe7b6048a6742c9c4',
             /*
               role and aria-modal must be used on the
               same element. They must also be set inside the
@@ -2985,9 +3118,9 @@ 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 && (h("button", { key: '0851cc75ee7367e13d1993a9c4d8b1b4de1d3bf0', 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 && (h("button", { key: 'e12aa8cdea0657254dec4534a52d79bd00fa7351', class: "modal-handle",
             // Prevents the handle from receiving keyboard focus when it does not cycle
-            tabIndex: !isHandleCycle ? -1 : 0, "aria-label": "Activate to adjust the size of the dialog overlaying the screen", onClick: isHandleCycle ? this.onHandleClick : undefined, part: "handle", ref: (el) => (this.dragHandleEl = el) })), h("slot", { key: 'b4d9bc13dc0867e858db8e1c7277bd09b7fce44c', 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) })), h("slot", { key: '744f526d2a1111a936a517dfad4ae0b2551cf834', onSlotchange: this.onSlotChange }))));
     }
     get el() { return getElement(this); }
     static get watchers() { return {
@@ -3009,6 +3142,7 @@ const LIFECYCLE_MAP = {
     ionModalDidDismiss: 'ionViewDidLeave',
 };
 Modal.style = {
+    ionic: modalIonicCss(),
     ios: modalIosCss(),
     md: modalMdCss()
 };