voyager-ionic-core 8.8.12 → 9.0.1

package/dist/collection/components/modal/modal.ios.css

@@ -126,6 +126,14 @@ ion-backdrop {
   z-index: 10;
 }
 
+/**
+ * The wrapper receives programmatic focus for screen readers but should not
+ * show a visible focus ring, which is meant only for keyboard navigation.
+ */
+.modal-wrapper {
+  outline: none;
+}
+
 .modal-shadow {
   position: absolute;
   background: transparent;

package/dist/collection/components/modal/modal.js

@@ -8,7 +8,7 @@ import { raf, inheritAttributes, hasLazyBuild, getElementRoot } from "../../util
 import { createLockController } from "../../utils/lock-controller";
 import { printIonWarning } from "../../utils/logging/index";
 import { Style as StatusBarStyle, StatusBar } from "../../utils/native/status-bar";
-import { GESTURE, BACKDROP, dismiss, eventMethod, prepareOverlay, present, createTriggerController, setOverlayId, FOCUS_TRAP_DISABLE_CLASS, } from "../../utils/overlays";
+import { BACKDROP, cleanupRootFocusTrapAccessibility, createTriggerController, dismiss, eventMethod, FOCUS_TRAP_DISABLE_CLASS, GESTURE, prepareOverlay, present, restoreRootFocusTrapAccessibility, setOverlayId, } from "../../utils/overlays";
 import { getClassMap } from "../../utils/theme";
 import { deepReady, waitForMount } from "../../utils/transition/index";
 import { config } from "../../global/config";
@@ -21,7 +21,7 @@ import { mdEnterAnimation } from "./animations/md.enter";
 import { mdLeaveAnimation } from "./animations/md.leave";
 import { createSheetGesture } from "./gestures/sheet";
 import { createSwipeToCloseGesture, SwipeToCloseDefaults } from "./gestures/swipe-to-close";
-import { getInitialSafeAreaConfig, getPositionBasedSafeAreaConfig, applySafeAreaOverrides, clearSafeAreaOverrides, getRootSafeAreaTop, hasCustomModalDimensions, } from "./safe-area-utils";
+import { getInitialSafeAreaConfig, getPositionBasedSafeAreaConfig, applySafeAreaOverrides, clearSafeAreaOverrides, getRootSafeAreaTop, onRootSafeAreaTopChange, hasCustomModalDimensions, } from "./safe-area-utils";
 import { setCardStatusBarDark, setCardStatusBarDefault } from "./utils";
 // TODO(FW-2832): types
 /**
@@ -43,6 +43,9 @@ export class Modal {
         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;
@@ -77,13 +80,20 @@ export class Modal {
         /**
          * 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).
          *
-         * 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.
+         *
+         * Defaults to `"cycle"`.
          */
-        this.handleBehavior = 'none';
+        this.handleBehavior = 'cycle';
         /**
          * If `true`, the modal will be dismissed when the backdrop is clicked.
          */
@@ -192,8 +202,13 @@ export class Modal {
          */
         this.onModalFocus = (ev) => {
             const { dragHandleEl, el } = this;
-            // Only handle focus if the modal itself was focused (not a child element)
-            if (ev.target === el && dragHandleEl && dragHandleEl.tabIndex !== -1) {
+            /**
+             * Shadow DOM focus is retargeted to the host, so `ev.target === el` is also
+             * true when a shadow child (the dialog wrapper present() focuses) is focused.
+             * 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 && el.shadowRoot?.activeElement == null && dragHandleEl && dragHandleEl.tabIndex !== -1) {
                 dragHandleEl.focus();
             }
         };
@@ -267,6 +282,17 @@ export class Modal {
         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();
@@ -275,9 +301,12 @@ export class Modal {
         // 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'];
@@ -312,7 +341,10 @@ export class Modal {
                      * 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];
                 }
             });
@@ -323,7 +355,7 @@ export class Modal {
         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);
         }
     }
@@ -438,25 +470,33 @@ export class Modal {
         // Recalculate isSheetModal before safe-area setup because framework
         // bindings (e.g., Angular) may not have been applied when componentWillLoad ran.
         this.isSheetModal = this.breakpoints !== undefined && this.initialBreakpoint !== undefined;
-        // Set initial safe-area overrides before animation
-        this.setInitialSafeAreaOverrides();
+        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
@@ -505,7 +545,6 @@ export class Modal {
         unlock();
     }
     initSwipeToClose() {
-        var _a;
         if (getIonMode(this) !== 'ios') {
             return;
         }
@@ -523,7 +562,7 @@ export class Modal {
             printIonContentErrorMsg(el);
             return;
         }
-        const statusBarStyle = (_a = this.statusBarStyle) !== null && _a !== void 0 ? _a : StatusBarStyle.Default;
+        const statusBarStyle = this.statusBarStyle ?? StatusBarStyle.Default;
         this.gesture = createSwipeToCloseGesture(el, ani, statusBarStyle, () => this.cardOnDismiss(), () => this.onDragStart(), (detail) => this.onDragMove(detail), (detail) => this.onDragEnd(detail));
         this.gesture.enable(true);
     }
@@ -540,7 +579,7 @@ export class Modal {
             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 });
@@ -548,6 +587,7 @@ export class Modal {
         }, () => 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
@@ -565,7 +605,6 @@ export class Modal {
      * 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;
@@ -573,14 +612,11 @@ export class Modal {
         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;
         }
@@ -588,7 +624,7 @@ export class Modal {
         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');
         }
@@ -616,7 +652,7 @@ export class Modal {
         }
         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');
         }
@@ -679,7 +715,6 @@ export class Modal {
      * For example, `cancel` or `backdrop`.
      */
     async dismiss(data, role) {
-        var _a;
         if (this.gestureAnimationDismissing && role !== GESTURE) {
             return false;
         }
@@ -724,7 +759,7 @@ export class Modal {
         }
         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,
         });
@@ -738,6 +773,13 @@ export class Modal {
             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();
@@ -920,7 +962,7 @@ export class Modal {
             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)')
@@ -936,7 +978,7 @@ export class Modal {
     }
     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');
         });
     }
@@ -964,15 +1006,17 @@ export class Modal {
             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;
                     });
@@ -994,8 +1038,7 @@ export class Modal {
         });
     }
     cleanupParentRemovalObserver() {
-        var _a;
-        (_a = this.parentRemovalObserver) === null || _a === void 0 ? void 0 : _a.disconnect();
+        this.parentRemovalObserver?.disconnect();
         this.parentRemovalObserver = undefined;
     }
     onDragStart() {
@@ -1035,22 +1078,30 @@ export class Modal {
      * 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.
@@ -1150,11 +1201,38 @@ export class Modal {
      */
     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;
@@ -1162,20 +1240,35 @@ export class Modal {
         const isCardModal = presentingElement !== undefined && mode === 'ios';
         const isHandleCycle = handleBehavior === 'cycle';
         const isSheetModalWithHandle = isSheetModal && showHandle;
-        return (h(Host, Object.assign({ key: 'ab93657f4a5b4c97168d292b398d975e4b5b4af4', "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: '5ba6315c7c8c64fa04c62f85fd493da5275b2cbd', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: 'a76c48d41c67f86c18a7481e980e6925e614f85d', class: "modal-shadow" }), h("div", Object.assign({ key: '3f6c61ba60b063592784d76a9594073b3bf210a9',
+            }, 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
               shadow DOM otherwise ion-button will not be highlighted
               when using VoiceOver: https://bugs.webkit.org/show_bug.cgi?id=247134
+  
+              tabIndex={-1} is required so present() can move focus to this
+              element (which carries the dialog role) instead of the role-less
+              host. role="dialog" alone does not make an element focusable, so
+              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", class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }), showHandle && (h("button", { key: '7f66b4fdb3dec61a2b9aec4e9dbacf5d013d637c', 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: '2dfaaebe3d0b2a46be1224c25f9ab89bf1744332', 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 }))));
     }
     static get is() { return "ion-modal"; }
     static get encapsulation() { return "shadow"; }
@@ -1447,13 +1540,13 @@ export class Modal {
                 "optional": true,
                 "docs": {
                     "tags": [],
-                    "text": "The interaction behavior for the sheet modal when the handle is pressed.\n\nDefaults to `\"none\"`, which  means the modal will not change size or position when the handle is pressed.\nSet to `\"cycle\"` to let the modal cycle between available breakpoints when pressed.\n\nHandle behavior is unavailable when the `handle` property is set to `false` or\nwhen the `breakpoints` property is not set (using a fullscreen or card modal)."
+                    "text": "The interaction behavior for the sheet modal when the handle is pressed.\n\nHandle behavior is unavailable when the `handle` property is set to\n`false` or when the `breakpoints` property is not set (using a\nfullscreen or card modal).\n\nSet to `\"cycle\"` to make the handle focusable and let the sheet modal\ncycle between available breakpoints when pressed. This keeps the sheet\noperable with assistive technology.\n\nSet to `\"none\"` to make the handle purely decorative when pressed and\nremoved from the tab order.\n\nDefaults to `\"cycle\"`."
                 },
                 "getter": false,
                 "setter": false,
                 "reflect": false,
                 "attribute": "handle-behavior",
-                "defaultValue": "'none'"
+                "defaultValue": "'cycle'"
             },
             "component": {
                 "type": "string",

package/dist/collection/components/modal/modal.md.css

@@ -126,6 +126,14 @@ ion-backdrop {
   z-index: 10;
 }
 
+/**
+ * The wrapper receives programmatic focus for screen readers but should not
+ * show a visible focus ring, which is meant only for keyboard navigation.
+ */
+.modal-wrapper {
+  outline: none;
+}
+
 .modal-shadow {
   position: absolute;
   background: transparent;

package/dist/collection/components/modal/safe-area-utils.js

@@ -49,8 +49,8 @@ export 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');
@@ -69,6 +69,41 @@ export 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.
+ */
+export 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
@@ -153,10 +188,9 @@ export const getInitialSafeAreaConfig = (context) => {
  * @returns SafeAreaConfig based on position
  */
 export 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',