voyager-ionic-core 8.8.17 → 9.0.3

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

@@ -1,24 +1,25 @@
 /*!
  * (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 { f as findClosestIonContent, i as isIonContent, d as disableContentScrollY, r as resetContentScrollY, a as findIonContent, p as printIonContentErrorMsg } from './index-MEDq2S8l.js';
-import { C as CoreDelegate, a as attachComponent, d as detachComponent } from './framework-delegate-FnPGymXL.js';
-import { e as clamp, g as getElementRoot, 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-C23AVPx9.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-C1b9CLFg.js';
+import { C as CoreDelegate, a as attachComponent, d as detachComponent } from './framework-delegate-BwNhx9NR.js';
+import { g as getElementRoot, e as clamp, r as raf, b as inheritAttributes, h as hasLazyBuild } from './helpers-BSmc0nst.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 GESTURE, O as OVERLAY_GESTURE_PRIORITY, F as FOCUS_TRAP_DISABLE_CLASS, d as createTriggerController, B as BACKDROP, h as prepareOverlay, r as restoreRootFocusTrapAccessibility, j as cleanupRootFocusTrapAccessibility, k as setOverlayId, e as present, f as dismiss, g as eventMethod } from './overlays-DKE0DgvE.js';
+import { g as getClassMap } from './theme-byZM6qHV.js';
+import { e as deepReady, w as waitForMount } from './index-DnA_7Bnx.js';
+import { b as getIonMode } from './ionic-global-ZXjCXKH0.js';
+import { KEYBOARD_DID_OPEN } from './keyboard-Cj8mLJeq.js';
+import { c as createAnimation } from './animation-BFNVlYum.js';
 import { g as getTimeGivenProgression } from './cubic-bezier-hHmYLOfE.js';
-import { createGesture } from './index-CfgBF1SE.js';
+import { createGesture } from './index-BmLuEdV7.js';
 import { w as win } from './index-ZjP4CjeZ.js';
-import './hardware-back-button-B93Gru0Y.js';
-import './gesture-controller-BTEOs1at.js';
-import './keyboard-CUw4ekVy.js';
+import './dir-Dojwmvde.js';
+import './hardware-back-button-DmkiRgOT.js';
+import './gesture-controller-B_gJaBk0.js';
+import './keyboard-DAF8GNJ9.js';
 
 var Style;
 (function (Style) {
@@ -29,7 +30,7 @@ var Style;
 const StatusBar = {
     getEngine() {
         const capacitor = getCapacitor();
-        if (capacitor === null || capacitor === void 0 ? void 0 : capacitor.isPluginAvailable('StatusBar')) {
+        if (capacitor?.isPluginAvailable('StatusBar')) {
             return capacitor.Plugins.StatusBar;
         }
         return undefined;
@@ -127,6 +128,21 @@ const setCardStatusBarDefault = (defaultStyle = Style.Default) => {
     StatusBar.setStyle({ style: defaultStyle });
 };
 
+/**
+ * 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.
+ */
+const canSwipeOnContent = (contentEl) => {
+    const scrollEl = isIonContent(contentEl) ? getElementRoot(contentEl).querySelector('.inner-scroll') : contentEl;
+    const hasRefresherInContent = !!findRefresherInContent(contentEl);
+    return !hasRefresherInContent && scrollEl.scrollTop === 0;
+};
 const handleCanDismiss = async (el, animation) => {
     /**
      * If canDismiss is not a function
@@ -257,7 +273,6 @@ 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;
@@ -280,12 +295,6 @@ 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
@@ -296,29 +305,7 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onD
          */
         contentEl = findClosestIonContent(target);
         if (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;
+            return canSwipeOnContent(contentEl);
         }
         /**
          * Card should be swipeable on all
@@ -331,14 +318,13 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onD
         return false;
     };
     const onStart = (detail) => {
-        var _a;
         const { deltaY } = detail;
         /**
          * Firefox automatically selects the header text during drag
          * due to the focusable wrapper (tabindex="-1"). Remove any
          * selection that may have occurred.
          */
-        (_a = window.getSelection()) === null || _a === void 0 ? void 0 : _a.removeAllRanges();
+        window.getSelection()?.removeAllRanges();
         /**
          * Get the initial scrollY value so
          * that we can correctly reset the scrollY
@@ -491,17 +477,30 @@ const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onD
          * check canDismiss. 25% was chosen
          * to avoid accidental swipes.
          */
-        if (isAttemptingDismissWithCanDismiss && clampedStep > maxStep / 4) {
+        const isAttemptingCanDismiss = isAttemptingDismissWithCanDismiss && clampedStep > maxStep / 4;
+        if (isAttemptingCanDismiss) {
             handleCanDismiss(el, animation);
         }
         else if (shouldComplete) {
             onDismiss();
         }
+        /**
+         * `shouldComplete` is not enough on its own, since it is always `false`
+         * when canDismiss blocks the gesture. `canDismiss: false` blocks it and
+         * never dismisses, because `handleCanDismiss` returns early when
+         * canDismiss is not a function. A canDismiss function dismisses through
+         * `handleCanDismiss`, which awaits the callback, so the outcome is not
+         * known when this event is emitted.
+         */
+        const isDismissing = isAttemptingDismissWithCanDismiss
+            ? isAttemptingCanDismiss && typeof el.canDismiss === 'function'
+            : shouldComplete;
         const eventDetail = {
             currentY: detail.currentY,
             deltaY: detail.deltaY,
             velocityY: detail.velocityY,
             progress: calculateProgress(el, detail.deltaY),
+            isDismissing,
             snapBreakpoint: shouldComplete ? 0 : 1,
         };
         onDragEnd(eventDetail);
@@ -639,7 +638,7 @@ const iosEnterAnimation = (baseEl, opts) => {
     wrapperAnimation.addElement(root.querySelectorAll('.modal-wrapper, .modal-shadow')).beforeStyles({ opacity: 1 });
     // 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')));
+    !expandToScroll && contentAnimation?.addElement(baseEl.querySelector('.ion-page'));
     const baseAnimation = createAnimation('entering-base')
         .addElement(baseEl)
         .easing('cubic-bezier(0.32,0.72,0,1)')
@@ -972,7 +971,7 @@ const mdEnterAnimation = (baseEl, opts) => {
     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')));
+    !expandToScroll && contentAnimation?.addElement(baseEl.querySelector('.ion-page'));
     const baseAnimation = createAnimation()
         .addElement(baseEl)
         .easing('cubic-bezier(0.36,0.66,0.04,1)')
@@ -1031,6 +1030,8 @@ 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 = contentEl?.scrollY ?? true;
     const height = wrapperEl.clientHeight;
     let currentBreakpoint = initialBreakpoint;
     let offset = 0;
@@ -1096,9 +1097,9 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
                 cachedFooterEl.style.removeProperty('height');
                 cachedFooterEl.style.removeProperty('top');
                 cachedFooterEl.style.removeProperty('left');
-                page === null || page === void 0 ? void 0 : page.style.removeProperty('padding-bottom');
+                page?.style.removeProperty('padding-bottom');
                 // Move to page
-                page === null || page === void 0 ? void 0 : page.appendChild(cachedFooterEl);
+                page?.appendChild(cachedFooterEl);
             });
         }
         else {
@@ -1142,7 +1143,7 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
                 // when the footer is positioned absolutely. This has to be done before we
                 // make the footer absolutely positioned or we may accidentally cause the
                 // sheet to scroll.
-                page === null || page === void 0 ? void 0 : page.style.setProperty('padding-bottom', `${footerHeights}px`);
+                page?.style.setProperty('padding-bottom', `${footerHeights}px`);
                 // Apply positioning styles to keep footer at bottom
                 cachedFooterEl.classList.add('modal-footer-moving');
                 // Apply our preserved styles to pin the footer
@@ -1167,7 +1168,7 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
     if (wrapperAnimation && backdropAnimation) {
         wrapperAnimation.keyframes([...SheetDefaults.WRAPPER_KEYFRAMES]);
         backdropAnimation.keyframes([...SheetDefaults.BACKDROP_KEYFRAMES]);
-        contentAnimation === null || contentAnimation === void 0 ? void 0 : contentAnimation.keyframes([...SheetDefaults.CONTENT_KEYFRAMES]);
+        contentAnimation?.keyframes([...SheetDefaults.CONTENT_KEYFRAMES]);
         animation.progressStart(true, 1 - currentBreakpoint);
         /**
          * If backdrop is not enabled, then content
@@ -1191,9 +1192,6 @@ 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.
@@ -1201,37 +1199,21 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
         const contentEl = findClosestIonContent(detail.event.target);
         currentBreakpoint = getCurrentBreakpoint();
         /**
-         * If `expandToScroll` is disabled, we should not allow the swipe gesture
-         * to start if the content is not scrolled to the top.
+         * Upwards swipes on the content cannot move the sheet anyway, so this only
+         * blocks swiping the sheet down from the content.
          */
-        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;
+        if (contentEl && (!expandToScroll || currentBreakpoint === 1)) {
+            return canSwipeOnContent(contentEl);
         }
         return true;
     };
     const onStart = (detail) => {
-        var _a;
         /**
          * Firefox automatically selects the header text during drag
          * due to the focusable wrapper (tabindex="-1"). Remove any
          * selection that may have occurred.
          */
-        (_a = window.getSelection()) === null || _a === void 0 ? void 0 : _a.removeAllRanges();
+        window.getSelection()?.removeAllRanges();
         /**
          * If canDismiss is anything other than `true`
          * then users should be able to swipe down
@@ -1359,12 +1341,22 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
     };
     const onEnd = (detail) => {
         const snapBreakpoint = calculateSnapBreakpoint(detail.deltaY);
+        /**
+         * `snapBreakpoint === 0` is not enough on its own. `canDismiss: false`
+         * snaps to 0 but never dismisses, since `handleCanDismiss` returns early
+         * when canDismiss is not a function. A canDismiss function dismisses
+         * through `handleCanDismiss`, which awaits the callback, so the outcome
+         * is not known when this event is emitted.
+         */
+        const shouldPreventDismiss = canDismissBlocksGesture && snapBreakpoint === 0;
+        const isDismissing = shouldPreventDismiss ? typeof baseEl.canDismiss === 'function' : snapBreakpoint === 0;
         const eventDetail = {
             currentY: detail.currentY,
             deltaY: detail.deltaY,
             velocityY: detail.velocityY,
             progress: calculateProgress(detail.currentY),
             snapBreakpoint,
+            isDismissing,
         };
         /**
          * If expandToScroll is disabled, we should not allow the moveSheetToBreakpoint
@@ -1380,7 +1372,11 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
              * swap to moving on drag and if we don't swap back here then the footer will get stuck.
              */
             swapFooterPosition('stationary');
-            onDragEnd(eventDetail);
+            /**
+             * The sheet does not move in this case, so the gesture
+             * never dismisses the modal.
+             */
+            onDragEnd({ ...eventDetail, isDismissing: false });
             return;
         }
         moveSheetToBreakpoint({
@@ -1453,14 +1449,14 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
             onDismiss();
         }
         /**
-         * Enables scrolling immediately if the sheet is about to fully expand
-         * or if it allows scrolling at any breakpoint. Without this, there would
+         * 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
          * 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 = true;
+            contentEl.scrollY = initialContentScrollY;
         }
         /**
          * If expandToScroll is disabled and we're animating
@@ -1495,7 +1491,7 @@ const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, ba
                         raf(() => {
                             wrapperAnimation.keyframes([...SheetDefaults.WRAPPER_KEYFRAMES]);
                             backdropAnimation.keyframes([...SheetDefaults.BACKDROP_KEYFRAMES]);
-                            contentAnimation === null || contentAnimation === void 0 ? void 0 : contentAnimation.keyframes([...SheetDefaults.CONTENT_KEYFRAMES]);
+                            contentAnimation?.keyframes([...SheetDefaults.CONTENT_KEYFRAMES]);
                             animation.progressStart(true, 1 - snapToBreakpoint);
                             currentBreakpoint = snapToBreakpoint;
                             onBreakpointChange(currentBreakpoint);
@@ -1642,9 +1638,20 @@ 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,
     };
 };
 
@@ -1694,8 +1701,8 @@ const getRootSafeAreaTop = () => {
     if (cachedRootSafeAreaTop !== null) {
         return cachedRootSafeAreaTop;
     }
-    const doc = win === null || win === void 0 ? void 0 : win.document;
-    if (!(doc === null || doc === void 0 ? void 0 : doc.body)) {
+    const doc = win?.document;
+    if (!doc?.body) {
         return 0;
     }
     const el = doc.createElement('div');
@@ -1714,6 +1721,41 @@ const getRootSafeAreaTop = () => {
     }
     return value;
 };
+/**
+ * Calls back when the resolved root `--ion-safe-area-top` changes, which no
+ * event and no window resize covers. The probe's height tracks the variable, so
+ * a change to it becomes a size change the observer can see.
+ */
+const onRootSafeAreaTopChange = (callback) => {
+    const doc = win?.document;
+    if (!doc?.body || typeof ResizeObserver === 'undefined') {
+        return () => undefined;
+    }
+    const probe = doc.createElement('div');
+    probe.style.cssText =
+        'position:fixed;visibility:hidden;pointer-events:none;top:0;left:0;width:0;' +
+            'height:var(--ion-safe-area-top,0px);';
+    doc.body.appendChild(probe);
+    /**
+     * Seeded with the value the caller has already applied, so a change that
+     * lands before the observer's first delivery still gets reported. Comparing
+     * against an unset value instead would consume that first delivery and treat
+     * the new inset as the baseline.
+     */
+    let lastHeight = getRootSafeAreaTop();
+    const observer = new ResizeObserver((entries) => {
+        const { height } = entries[0].contentRect;
+        if (height !== lastHeight) {
+            lastHeight = height;
+            callback(height);
+        }
+    });
+    observer.observe(probe);
+    return () => {
+        observer.disconnect();
+        probe.remove();
+    };
+};
 /**
  * True when the modal host declares BOTH a non-fullscreen `--width` AND a
  * non-fullscreen `--height` (i.e. a centered-dialog-like modal that doesn't
@@ -1798,10 +1840,9 @@ const getInitialSafeAreaConfig = (context) => {
  * @returns SafeAreaConfig based on position
  */
 const getPositionBasedSafeAreaConfig = (wrapperEl) => {
-    var _a, _b;
     const rect = wrapperEl.getBoundingClientRect();
-    const vh = (_a = win === null || win === void 0 ? void 0 : win.innerHeight) !== null && _a !== void 0 ? _a : 0;
-    const vw = (_b = win === null || win === void 0 ? void 0 : win.innerWidth) !== null && _b !== void 0 ? _b : 0;
+    const vh = win?.innerHeight ?? 0;
+    const vw = win?.innerWidth ?? 0;
     // Only apply safe-area to sides where modal overlaps with screen edge
     return {
         top: rect.top <= EDGE_THRESHOLD ? 'inherit' : '0px',
@@ -1862,6 +1903,9 @@ const Modal = class {
         this.inline = false;
         // Whether or not modal is being dismissed via gesture
         this.gestureAnimationDismissing = false;
+        // True from the first safe-area write in `present()` until the enter
+        // animation settles. A position-based read in that window is not the rest position.
+        this.isPresenting = false;
         this.presented = false;
         /** @internal */
         this.hasController = false;
@@ -1896,13 +1940,20 @@ const Modal = class {
         /**
          * The interaction behavior for the sheet modal when the handle is pressed.
          *
-         * Defaults to `"none"`, which  means the modal will not change size or position when the handle is pressed.
-         * Set to `"cycle"` to let the modal cycle between available breakpoints when pressed.
+         * Handle behavior is unavailable when the `handle` property is set to
+         * `false` or when the `breakpoints` property is not set (using a
+         * fullscreen or card modal).
+         *
+         * Set to `"cycle"` to make the handle focusable and let the sheet modal
+         * cycle between available breakpoints when pressed. This keeps the sheet
+         * operable with assistive technology.
+         *
+         * Set to `"none"` to make the handle purely decorative when pressed and
+         * removed from the tab order.
          *
-         * Handle behavior is unavailable when the `handle` property is set to `false` or
-         * when the `breakpoints` property is not set (using a fullscreen or card modal).
+         * Defaults to `"cycle"`.
          */
-        this.handleBehavior = 'none';
+        this.handleBehavior = 'cycle';
         /**
          * If `true`, the modal will be dismissed when the backdrop is clicked.
          */
@@ -2010,7 +2061,6 @@ const Modal = class {
          * if it exists and is focusable, otherwise let the focus trap handle it.
          */
         this.onModalFocus = (ev) => {
-            var _a;
             const { dragHandleEl, el } = this;
             /**
              * Shadow DOM focus is retargeted to the host, so `ev.target === el` is also
@@ -2018,7 +2068,7 @@ const Modal = class {
              * shadowRoot's activeElement is null only when the host was focused directly,
              * so redirect to the handle only then and leave present()'s wrapper focus intact.
              */
-            if (ev.target === el && ((_a = el.shadowRoot) === null || _a === void 0 ? void 0 : _a.activeElement) == null && dragHandleEl && dragHandleEl.tabIndex !== -1) {
+            if (ev.target === el && el.shadowRoot?.activeElement == null && dragHandleEl && dragHandleEl.tabIndex !== -1) {
                 dragHandleEl.focus();
             }
         };
@@ -2092,6 +2142,17 @@ const Modal = class {
         const { el } = this;
         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.
+        if (this.presented || this.isPresenting) {
+            this.restoreSafeAreaOverrides();
+        }
+        // A relocation from `willPresent` reaches these before `present()` has
+        // applied the lock, so they apply it instead. Both are idempotent.
+        if (this.presented) {
+            restoreRootFocusTrapAccessibility(el);
+            this.initParentRemovalObserver();
+        }
     }
     disconnectedCallback() {
         this.triggerController.removeClickListener();
@@ -2100,9 +2161,12 @@ const Modal = class {
         // Also called in dismiss() — intentional dual cleanup covers both
         // dismiss-then-remove and direct DOM removal without dismiss.
         this.cleanupSafeAreaOverrides();
+        // Clean up aria-hidden if removed without dismiss() being called
+        if (this.presented) {
+            cleanupRootFocusTrapAccessibility();
+        }
     }
     componentWillLoad() {
-        var _a;
         const { breakpoints, initialBreakpoint, el, htmlAttributes } = this;
         const isSheetModal = (this.isSheetModal = breakpoints !== undefined && initialBreakpoint !== undefined);
         const attributesToInherit = ['aria-label', 'role'];
@@ -2137,7 +2201,10 @@ const Modal = class {
                      * htmlAttributes wins, but that's not a pattern that we recommend.
                      * The only time you'd need htmlAttributes is when using modalController.
                      */
-                    this.inheritedAttributes = Object.assign(Object.assign({}, this.inheritedAttributes), { [attribute]: htmlAttributes[attribute] });
+                    this.inheritedAttributes = {
+                        ...this.inheritedAttributes,
+                        [attribute]: htmlAttributes[attribute],
+                    };
                     delete htmlAttributes[attribute];
                 }
             });
@@ -2148,7 +2215,7 @@ const Modal = class {
         if (breakpoints !== undefined && initialBreakpoint !== undefined && !breakpoints.includes(initialBreakpoint)) {
             printIonWarning('[ion-modal] - Your breakpoints array must include the initialBreakpoint value.');
         }
-        if (!((_a = this.htmlAttributes) === null || _a === void 0 ? void 0 : _a.id)) {
+        if (!this.htmlAttributes?.id) {
             setOverlayId(this.el);
         }
     }
@@ -2263,25 +2330,33 @@ const Modal = class {
         // Recalculate isSheetModal before safe-area setup because framework
         // bindings (e.g., Angular) may not have been applied when componentWillLoad ran.
         this.isSheetModal = this.breakpoints !== undefined && this.initialBreakpoint !== undefined;
-        // Set initial safe-area overrides before animation
-        this.setInitialSafeAreaOverrides();
+        this.isPresenting = true;
         const hasCardModal = presentingElement !== undefined;
-        /**
-         * We need to change the status bar at the
-         * start of the animation so that it completes
-         * by the time the card animation is done.
-         */
-        if (hasCardModal && getIonMode(this) === 'ios') {
-            // Cache the original status bar color before the modal is presented
-            this.statusBarStyle = await StatusBar.getStyle();
-            setCardStatusBarDark();
+        // Wrapped so a throw cannot strand `isPresenting`, which would suppress
+        // the position-based correction for the life of this instance.
+        try {
+            // Set initial safe-area overrides before animation
+            this.setInitialSafeAreaOverrides();
+            /**
+             * We need to change the status bar at the
+             * start of the animation so that it completes
+             * by the time the card animation is done.
+             */
+            if (hasCardModal && getIonMode(this) === 'ios') {
+                // Cache the original status bar color before the modal is presented
+                this.statusBarStyle = await StatusBar.getStyle();
+                setCardStatusBarDark();
+            }
+            await present(this, 'modalEnter', iosEnterAnimation, mdEnterAnimation, {
+                presentingEl: presentingElement,
+                currentBreakpoint: this.initialBreakpoint,
+                backdropBreakpoint: this.backdropBreakpoint,
+                expandToScroll: this.expandToScroll,
+            });
+        }
+        finally {
+            this.isPresenting = false;
         }
-        await present(this, 'modalEnter', iosEnterAnimation, mdEnterAnimation, {
-            presentingEl: presentingElement,
-            currentBreakpoint: this.initialBreakpoint,
-            backdropBreakpoint: this.backdropBreakpoint,
-            expandToScroll: this.expandToScroll,
-        });
         // Update safe-area based on actual position after animation
         this.updateSafeAreaOverrides();
         // Apply fullscreen safe-area padding if needed
@@ -2330,7 +2405,6 @@ const Modal = class {
         unlock();
     }
     initSwipeToClose() {
-        var _a;
         if (getIonMode(this) !== 'ios') {
             return;
         }
@@ -2348,7 +2422,7 @@ const Modal = class {
             printIonContentErrorMsg(el);
             return;
         }
-        const statusBarStyle = (_a = this.statusBarStyle) !== null && _a !== void 0 ? _a : Style.Default;
+        const statusBarStyle = this.statusBarStyle ?? Style.Default;
         this.gesture = createSwipeToCloseGesture(el, ani, statusBarStyle, () => this.cardOnDismiss(), () => this.onDragStart(), (detail) => this.onDragMove(detail), (detail) => this.onDragEnd(detail));
         this.gesture.enable(true);
     }
@@ -2365,7 +2439,7 @@ const Modal = class {
             expandToScroll: this.expandToScroll,
         }));
         ani.progressStart(true, 1);
-        const { gesture, moveSheetToBreakpoint } = createSheetGesture(this.el, this.backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, ani, this.sortedBreakpoints, this.expandToScroll, () => { var _a; return (_a = this.currentBreakpoint) !== null && _a !== void 0 ? _a : 0; }, () => this.sheetOnDismiss(), (breakpoint) => {
+        const { gesture, moveSheetToBreakpoint, resetContentScroll } = createSheetGesture(this.el, this.backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, ani, this.sortedBreakpoints, this.expandToScroll, () => this.currentBreakpoint ?? 0, () => this.sheetOnDismiss(), (breakpoint) => {
             if (this.currentBreakpoint !== breakpoint) {
                 this.currentBreakpoint = breakpoint;
                 this.ionBreakpointDidChange.emit({ breakpoint });
@@ -2373,6 +2447,7 @@ const Modal = class {
         }, () => 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
@@ -2390,7 +2465,6 @@ const Modal = class {
      * passthrough on child route page wrappers and nested router outlets.
      */
     setupChildRoutePassthrough() {
-        var _a;
         // Cache the page parent for cleanup
         this.cachedPageParent = this.getOriginalPageParent();
         const pageParent = this.cachedPageParent;
@@ -2398,14 +2472,11 @@ const Modal = class {
         if (!pageParent || pageParent.tagName === 'ION-APP') {
             return;
         }
-        const hasVisibleContent = Array.from(pageParent.children).some((child) => {
-            var _a;
-            return child !== this.el &&
-                !(child instanceof HTMLElement && window.getComputedStyle(child).display === 'none') &&
-                child.tagName !== 'TEMPLATE' &&
-                child.tagName !== 'SLOT' &&
-                !(child.nodeType === Node.TEXT_NODE && !((_a = child.textContent) === null || _a === void 0 ? void 0 : _a.trim()));
-        });
+        const hasVisibleContent = Array.from(pageParent.children).some((child) => child !== this.el &&
+            !(child instanceof HTMLElement && window.getComputedStyle(child).display === 'none') &&
+            child.tagName !== 'TEMPLATE' &&
+            child.tagName !== 'SLOT' &&
+            !(child.nodeType === Node.TEXT_NODE && !child.textContent?.trim()));
         if (hasVisibleContent) {
             return;
         }
@@ -2413,7 +2484,7 @@ const Modal = class {
         pageParent.classList.add('ion-page-overlay-passthrough');
         // Also make nested router outlets passthrough
         const routerOutlet = pageParent.parentElement;
-        if ((routerOutlet === null || routerOutlet === void 0 ? void 0 : routerOutlet.tagName) === 'ION-ROUTER-OUTLET' && ((_a = routerOutlet.parentElement) === null || _a === void 0 ? void 0 : _a.tagName) !== 'ION-APP') {
+        if (routerOutlet?.tagName === 'ION-ROUTER-OUTLET' && routerOutlet.parentElement?.tagName !== 'ION-APP') {
             routerOutlet.style.setProperty('pointer-events', 'none');
             routerOutlet.setAttribute('data-overlay-passthrough', 'true');
         }
@@ -2441,7 +2512,7 @@ const Modal = class {
         }
         pageParent.classList.remove('ion-page-overlay-passthrough');
         const routerOutlet = pageParent.parentElement;
-        if (routerOutlet === null || routerOutlet === void 0 ? void 0 : routerOutlet.hasAttribute('data-overlay-passthrough')) {
+        if (routerOutlet?.hasAttribute('data-overlay-passthrough')) {
             routerOutlet.style.removeProperty('pointer-events');
             routerOutlet.removeAttribute('data-overlay-passthrough');
         }
@@ -2504,7 +2575,6 @@ const Modal = class {
      * For example, `cancel` or `backdrop`.
      */
     async dismiss(data, role) {
-        var _a;
         if (this.gestureAnimationDismissing && role !== GESTURE) {
             return false;
         }
@@ -2549,7 +2619,7 @@ const Modal = class {
         }
         const dismissed = await dismiss(this, data, role, 'modalLeave', iosLeaveAnimation, mdLeaveAnimation, {
             presentingEl: presentingElement,
-            currentBreakpoint: (_a = this.currentBreakpoint) !== null && _a !== void 0 ? _a : this.initialBreakpoint,
+            currentBreakpoint: this.currentBreakpoint ?? this.initialBreakpoint,
             backdropBreakpoint: this.backdropBreakpoint,
             expandToScroll: this.expandToScroll,
         });
@@ -2563,6 +2633,13 @@ 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.
+             */
+            this.resetSheetContentScroll?.();
+            this.resetSheetContentScroll = undefined;
             this.cleanupViewTransitionListener();
             this.cleanupParentRemovalObserver();
             this.cleanupSafeAreaOverrides();
@@ -2737,7 +2814,7 @@ const Modal = class {
             wrapperEl.style.transform = 'translateY(0vh)';
             wrapperEl.style.opacity = '1';
         }
-        if ((presentingElement === null || presentingElement === void 0 ? void 0 : presentingElement.tagName) === 'ION-MODAL') {
+        if (presentingElement?.tagName === 'ION-MODAL') {
             const isPortrait = window.innerWidth < 768;
             if (isPortrait) {
                 const transformOffset = !CSS.supports('width', 'max(0px, 1px)')
@@ -2753,7 +2830,7 @@ const Modal = class {
     }
     async dismissNestedModals() {
         const nestedModals = document.querySelectorAll(`ion-modal[data-parent-ion-modal="${this.el.id}"]`);
-        nestedModals === null || nestedModals === void 0 ? void 0 : nestedModals.forEach(async (modal) => {
+        nestedModals?.forEach(async (modal) => {
             await modal.dismiss(undefined, 'parent-dismissed');
         });
     }
@@ -2781,15 +2858,17 @@ const Modal = class {
             this.cachedOriginalParent.tagName === 'ION-APP') {
             return;
         }
+        // Both `present()` and a reconnect call this, so drop any existing
+        // observer. Below the guards, so a call that bails cannot leave none.
+        this.cleanupParentRemovalObserver();
         this.parentRemovalObserver = new MutationObserver((mutations) => {
             mutations.forEach((mutation) => {
                 if (mutation.type === 'childList' && mutation.removedNodes.length > 0) {
                     // Check if our cached original parent was removed
                     const cachedParentWasRemoved = Array.from(mutation.removedNodes).some((node) => {
-                        var _a, _b;
                         const isDirectMatch = node === this.cachedOriginalParent;
                         const isContainedMatch = this.cachedOriginalParent
-                            ? (_b = (_a = node).contains) === null || _b === void 0 ? void 0 : _b.call(_a, this.cachedOriginalParent)
+                            ? node.contains?.(this.cachedOriginalParent)
                             : false;
                         return isDirectMatch || isContainedMatch;
                     });
@@ -2811,8 +2890,7 @@ const Modal = class {
         });
     }
     cleanupParentRemovalObserver() {
-        var _a;
-        (_a = this.parentRemovalObserver) === null || _a === void 0 ? void 0 : _a.disconnect();
+        this.parentRemovalObserver?.disconnect();
         this.parentRemovalObserver = undefined;
     }
     onDragStart() {
@@ -2852,22 +2930,30 @@ const Modal = class {
      * sheets to prevent header content from getting double-offset padding).
      */
     setInitialSafeAreaOverrides() {
-        const context = Object.assign(Object.assign({}, this.getSafeAreaContext()), { hasCustomDimensions: hasCustomModalDimensions(this.el) });
+        const context = {
+            ...this.getSafeAreaContext(),
+            hasCustomDimensions: hasCustomModalDimensions(this.el),
+        };
         const safeAreaConfig = getInitialSafeAreaConfig(context);
         applySafeAreaOverrides(this.el, safeAreaConfig);
         // Set the internal offset property with the resolved root safe-area-top value
         if (context.isSheetModal) {
             this.updateSheetOffsetTop();
+            // A restore after a DOM move runs this a second time for the same
+            // modal, so drop the previous subscription rather than stacking one.
+            this.unsubscribeRootSafeAreaTop?.();
+            this.unsubscribeRootSafeAreaTop = onRootSafeAreaTopChange((safeAreaTop) => this.updateSheetOffsetTop(safeAreaTop));
         }
     }
     /**
-     * Resolves the current root --ion-safe-area-top value and sets the
-     * internal --ion-modal-offset-top property on the host element.
-     * Called on present and on resize (e.g., device rotation changes safe-area).
+     * Sets the internal --ion-modal-offset-top property on the host element,
+     * resolving the current root --ion-safe-area-top when no value is given.
+     * Called on present, on resize (e.g., device rotation changes safe-area),
+     * and whenever the root safe-area value itself changes.
      */
-    updateSheetOffsetTop() {
-        const safeAreaTop = getRootSafeAreaTop();
-        this.el.style.setProperty('--ion-modal-offset-top', `${safeAreaTop}px`);
+    updateSheetOffsetTop(safeAreaTop) {
+        const value = safeAreaTop ?? getRootSafeAreaTop();
+        this.el.style.setProperty('--ion-modal-offset-top', `${value}px`);
     }
     /**
      * Updates safe-area overrides during dynamic state changes.
@@ -2967,11 +3053,38 @@ const Modal = class {
      */
     cleanupSafeAreaOverrides() {
         clearSafeAreaOverrides(this.el);
+        this.unsubscribeRootSafeAreaTop?.();
+        this.unsubscribeRootSafeAreaTop = undefined;
         // Remove internal sheet offset property
         this.el.style.removeProperty('--ion-modal-offset-top');
         const { contentEl } = this.findContentAndFooter();
         this.clearContentSafeAreaPadding(contentEl);
     }
+    /**
+     * Re-applies what `cleanupSafeAreaOverrides()` removed for a modal moved
+     * while presented. Anything needing no measurement goes on synchronously so
+     * the modal is never painted without safe-area. The position-based
+     * correction waits a frame for the layout pass it reads.
+     */
+    restoreSafeAreaOverrides() {
+        this.setInitialSafeAreaOverrides();
+        this.applyFullscreenSafeArea();
+        raf(() => {
+            // A dismiss or another move can land first, and a read before the enter
+            // animation settles is not the rest position. `present()` redoes it.
+            if (!this.presented || !this.el.isConnected || this.isPresenting) {
+                return;
+            }
+            // A hidden subtree carries `display: none`, so there is no box and the
+            // read would write the safe-area for a modal touching no edge. The
+            // prediction applied above holds until the modal is shown again.
+            const { width, height } = this.el.getBoundingClientRect();
+            if (width === 0 && height === 0) {
+                return;
+            }
+            this.updateSafeAreaOverrides();
+        });
+    }
     render() {
         const { handle, isSheetModal, presentingElement, htmlAttributes, handleBehavior, inheritedAttributes, focusTrap, expandToScroll, } = this;
         const showHandle = handle !== false && isSheetModal;
@@ -2979,11 +3092,20 @@ const Modal = class {
         const isCardModal = presentingElement !== undefined && mode === 'ios';
         const isHandleCycle = handleBehavior === 'cycle';
         const isSheetModalWithHandle = isSheetModal && showHandle;
-        return (h(Host, Object.assign({ key: 'bad33199a939bd1e289b3b3f936c676ba403224f', "no-router": true,
+        return (h(Host, { key: '7c9c736052c5a788cf31040b6b2386dd9ea7454b', "no-router": true,
             // Allow the modal to be navigable when the handle is focusable
-            tabIndex: isHandleCycle && isSheetModalWithHandle ? 0 : -1 }, htmlAttributes, { style: {
+            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: 'd098688a65fb2d1befb255f0e59fd4c00b401092', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: '96cd2e59a7d1c0de7c9afb8f8d366367b09fbc93', class: "modal-shadow" }), h("div", Object.assign({ key: '882ccc39ce344a2c51d6508c11c3f40b26eaf2a7',
+            }, class: {
+                [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: '01b5b5765fb3a32393c736065c824bf760728823', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: '40fa7727a0923f7d7461dd027f1511a6a148d84a', class: "modal-shadow" }), h("div", { key: '9af934b607f60795bd5bff7bee6eacfc9b14fa35',
             /*
               role and aria-modal must be used on the
               same element. They must also be set inside the
@@ -2996,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: '714d9904fcc8105b21e2bb66cdc032bffd685d72', 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: 'df84a6806413b13efc5b03c862edde83151579a7', 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: '79dfbeb3fe5eee7dc3a243ad880d3f63184f3ab7', onSlotchange: this.onSlotChange }))));
+            tabIndex: !isHandleCycle ? -1 : 0, "aria-label": "Activate to adjust the size of the dialog overlaying the screen", onClick: isHandleCycle ? this.onHandleClick : undefined, part: "handle", ref: (el) => (this.dragHandleEl = el) })), h("slot", { key: '072d3929ec6f25481946b184d8ac24219011e783', onSlotchange: this.onSlotChange }))));
     }
     get el() { return getElement(this); }
     static get watchers() { return {