@ionic/core 8.8.19-dev.11786610762.137bbb21 → 8.8.19-dev.11786735826.1fad7c0a

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

@@ -8,13 +8,12 @@ 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, setOverlayId, } from "../../utils/overlays";
 import { getClassMap } from "../../utils/theme";
 import { deepReady, waitForMount } from "../../utils/transition/index";
 import { config } from "../../global/config";
-import { getIonMode, getIonTheme } from "../../global/ionic-global";
+import { getIonMode } from "../../global/ionic-global";
 import { KEYBOARD_DID_OPEN } from "../../utils/keyboard/keyboard";
-import { ionicEnterAnimation } from "./animations/ionic.enter";
 import { iosEnterAnimation } from "./animations/ios.enter";
 import { iosLeaveAnimation } from "./animations/ios.leave";
 import { portraitToLandscapeTransition, landscapeToPortraitTransition } from "./animations/ios.transition";
@@ -26,8 +25,7 @@ import { getInitialSafeAreaConfig, getPositionBasedSafeAreaConfig, applySafeArea
 import { setCardStatusBarDark, setCardStatusBarDefault } from "./utils";
 // TODO(FW-2832): types
 /**
- * @virtualProp {"ios" | "md"} mode - The mode determines the platform behaviors of the component.
- * @virtualProp {"ios" | "md" | "ionic"} theme - The theme determines the visual appearance of the component.
+ * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use.
  *
  * @slot - Content is placed inside of the `.modal-content` element.
  *
@@ -36,196 +34,177 @@ import { setCardStatusBarDark, setCardStatusBarDefault } from "./utils";
  * @part handle - The handle that is displayed at the top of the sheet modal when `handle="true"`.
  */
 export class Modal {
-    constructor() {
-        this.lockController = createLockController();
-        this.triggerController = createTriggerController();
-        this.coreDelegate = CoreDelegate();
-        this.isSheetModal = false;
-        this.inheritedAttributes = {};
-        this.inline = false;
-        // Whether or not modal is being dismissed via gesture
-        this.gestureAnimationDismissing = false;
-        this.presented = false;
-        /** @internal */
-        this.hasController = false;
-        /**
-         * If `true`, the keyboard will be automatically dismissed when the overlay is presented.
-         */
-        this.keyboardClose = true;
-        /**
-         * Controls whether scrolling or dragging within the sheet modal expands
-         * it to a larger breakpoint. This only takes effect when `breakpoints`
-         * and `initialBreakpoint` are set.
-         *
-         * If `true`, scrolling or dragging anywhere in the modal will first expand
-         * it to the next breakpoint. Once fully expanded, scrolling will affect the
-         * content.
-         * If `false`, scrolling will always affect the content. The modal will
-         * only expand when dragging the header or handle. The modal will close when
-         * dragging the header or handle. It can also be closed when dragging the
-         * content, but only if the content is scrolled to the top.
-         */
-        this.expandToScroll = true;
-        /**
-         * A decimal value between 0 and 1 that indicates the
-         * point after which the backdrop will begin to fade in
-         * when using a sheet modal. Prior to this point, the
-         * backdrop will be hidden and the content underneath
-         * the sheet can be interacted with. This value is exclusive
-         * meaning the backdrop will become active after the value
-         * specified.
-         */
-        this.backdropBreakpoint = 0;
-        /**
-         * 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).
-         */
-        this.handleBehavior = 'none';
-        /**
-         * If `true`, the modal will be dismissed when the backdrop is clicked.
-         */
-        this.backdropDismiss = true;
-        /**
-         * If `true`, a backdrop will be displayed behind the modal.
-         * This property controls whether or not the backdrop
-         * darkens the screen when the modal is presented.
-         * It does not control whether or not the backdrop
-         * is active or present in the DOM.
-         */
-        this.showBackdrop = true;
-        /**
-         * If `true`, the modal will animate.
-         */
-        this.animated = true;
-        /**
-         * If `true`, the modal will open. If `false`, the modal will close.
-         * Use this if you need finer grained control over presentation, otherwise
-         * just use the modalController or the `trigger` property.
-         * Note: `isOpen` will not automatically be set back to `false` when
-         * the modal dismisses. You will need to do that in your code.
-         */
-        this.isOpen = false;
-        /**
-         * If `true`, the component passed into `ion-modal` will
-         * automatically be mounted when the modal is created. The
-         * component will remain mounted even when the modal is dismissed.
-         * However, the component will be destroyed when the modal is
-         * destroyed. This property is not reactive and should only be
-         * used when initially creating a modal.
-         *
-         * Note: This feature only applies to inline modals in JavaScript
-         * frameworks such as Angular, React, and Vue.
-         */
-        this.keepContentsMounted = false;
-        /**
-         * If `true`, focus will not be allowed to move outside of this overlay.
-         * If `false`, focus will be allowed to move outside of the overlay.
-         *
-         * In most scenarios this property should remain set to `true`. Setting
-         * this property to `false` can cause severe accessibility issues as users
-         * relying on assistive technologies may be able to move focus into
-         * a confusing state. We recommend only setting this to `false` when
-         * absolutely necessary.
-         *
-         * Developers may want to consider disabling focus trapping if this
-         * overlay presents a non-Ionic overlay from a 3rd party library.
-         * Developers would disable focus trapping on the Ionic overlay
-         * when presenting the 3rd party overlay and then re-enable
-         * focus trapping when dismissing the 3rd party overlay and moving
-         * focus back to the Ionic overlay.
-         */
-        this.focusTrap = true;
-        /**
-         * Determines whether or not a modal can dismiss
-         * when calling the `dismiss` method.
-         *
-         * If the value is `true` or the value's function returns `true`, the modal will close when trying to dismiss.
-         * If the value is `false` or the value's function returns `false`, the modal will not close when trying to dismiss.
-         *
-         * See https://ionicframework.com/docs/troubleshooting/runtime#accessing-this
-         * if you need to access `this` from within the callback.
-         */
-        this.canDismiss = true;
-        this.onHandleClick = () => {
-            const { sheetTransition, handleBehavior } = this;
-            if (handleBehavior !== 'cycle' || sheetTransition !== undefined) {
-                /**
-                 * The sheet modal should not advance to the next breakpoint
-                 * if the handle behavior is not `cycle` or if the handle
-                 * is clicked while the sheet is moving to a breakpoint.
-                 */
-                return;
-            }
-            this.moveToNextBreakpoint();
-        };
-        this.onBackdropTap = () => {
-            const { sheetTransition } = this;
-            if (sheetTransition !== undefined) {
-                /**
-                 * When the handle is double clicked at the largest breakpoint,
-                 * it will start to move to the first breakpoint. While transitioning,
-                 * the backdrop will often receive the second click. We prevent the
-                 * backdrop from dismissing the modal while moving between breakpoints.
-                 */
-                return;
-            }
-            this.dismiss(undefined, BACKDROP);
-        };
-        this.onLifecycle = (modalEvent) => {
-            const el = this.usersElement;
-            const name = LIFECYCLE_MAP[modalEvent.type];
-            if (el && name) {
-                const ev = new CustomEvent(name, {
-                    bubbles: false,
-                    cancelable: false,
-                    detail: modalEvent.detail,
-                });
-                el.dispatchEvent(ev);
-            }
-        };
-        /**
-         * When the modal receives focus directly, pass focus to the handle
-         * 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
-             * 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 && ((_a = el.shadowRoot) === null || _a === void 0 ? void 0 : _a.activeElement) == null && dragHandleEl && dragHandleEl.tabIndex !== -1) {
-                dragHandleEl.focus();
-            }
-        };
-        /**
-         * When the slot changes, we need to find all the modals in the slot
-         * and set the data-parent-ion-modal attribute on them so we can find them
-         * and dismiss them when we get dismissed.
-         * We need to do it this way because when a modal is opened, it's moved to
-         * the end of the body and is no longer an actual child of the modal.
-         */
-        this.onSlotChange = ({ target }) => {
-            const slot = target;
-            slot.assignedElements().forEach((el) => {
-                el.querySelectorAll('ion-modal').forEach((childModal) => {
-                    // We don't need to write to the DOM if the modal is already tagged
-                    // If this is a deeply nested modal, this effect should cascade so we don't
-                    // need to worry about another modal claiming the same child.
-                    if (childModal.getAttribute('data-parent-ion-modal') === null) {
-                        childModal.setAttribute('data-parent-ion-modal', this.el.id);
-                    }
-                });
-            });
-        };
-    }
+    lockController = createLockController();
+    triggerController = createTriggerController();
+    gesture;
+    coreDelegate = CoreDelegate();
+    sheetTransition;
+    isSheetModal = false;
+    /**
+     * The breakpoint value that has been committed for a sheet modal.
+     * This represents the modal's resting state when it is not being dragged
+     * or animating toward a new position.
+     */
+    currentBreakpoint;
+    wrapperEl;
+    backdropEl;
+    dragHandleEl;
+    sortedBreakpoints;
+    keyboardOpenCallback;
+    moveSheetToBreakpoint;
+    resetSheetContentScroll;
+    inheritedAttributes = {};
+    statusBarStyle;
+    inline = false;
+    workingDelegate;
+    // Reference to the user's provided modal content
+    usersElement;
+    // Whether or not modal is being dismissed via gesture
+    gestureAnimationDismissing = false;
+    // View transition properties for handling portrait/landscape switches
+    currentViewIsPortrait;
+    viewTransitionAnimation;
+    resizeTimeout;
+    unsubscribeRootSafeAreaTop;
+    // Mutation observer to watch for parent removal
+    parentRemovalObserver;
+    // Cached original parent from before modal is moved to body during presentation
+    cachedOriginalParent;
+    // Cached ion-page ancestor for child route passthrough
+    cachedPageParent;
+    lastFocus;
+    animation;
+    presented = false;
+    el;
+    /** @internal */
+    hasController = false;
+    /** @internal */
+    overlayIndex;
+    /** @internal */
+    delegate;
+    /**
+     * If `true`, the keyboard will be automatically dismissed when the overlay is presented.
+     */
+    keyboardClose = true;
+    /**
+     * Animation to use when the modal is presented.
+     */
+    enterAnimation;
+    /**
+     * Animation to use when the modal is dismissed.
+     */
+    leaveAnimation;
+    /**
+     * The breakpoints to use when creating a sheet modal. Each value in the
+     * array must be a decimal between 0 and 1 where 0 indicates the modal is fully
+     * closed and 1 indicates the modal is fully open. Values are relative
+     * to the height of the modal, not the height of the screen. One of the values in this
+     * array must be the value of the `initialBreakpoint` property.
+     * For example: [0, .25, .5, 1]
+     */
+    breakpoints;
+    /**
+     * Controls whether scrolling or dragging within the sheet modal expands
+     * it to a larger breakpoint. This only takes effect when `breakpoints`
+     * and `initialBreakpoint` are set.
+     *
+     * If `true`, scrolling or dragging anywhere in the modal will first expand
+     * it to the next breakpoint. Once fully expanded, scrolling will affect the
+     * content.
+     * If `false`, scrolling will always affect the content. The modal will
+     * only expand when dragging the header or handle. The modal will close when
+     * dragging the header or handle. It can also be closed when dragging the
+     * content, but only if the content is scrolled to the top.
+     */
+    expandToScroll = true;
+    /**
+     * A decimal value between 0 and 1 that indicates the
+     * initial point the modal will open at when creating a
+     * sheet modal. This value must also be listed in the
+     * `breakpoints` array.
+     */
+    initialBreakpoint;
+    /**
+     * A decimal value between 0 and 1 that indicates the
+     * point after which the backdrop will begin to fade in
+     * when using a sheet modal. Prior to this point, the
+     * backdrop will be hidden and the content underneath
+     * the sheet can be interacted with. This value is exclusive
+     * meaning the backdrop will become active after the value
+     * specified.
+     */
+    backdropBreakpoint = 0;
+    /**
+     * The horizontal line that displays at the top of a sheet modal. It is `true` by default when
+     * setting the `breakpoints` and `initialBreakpoint` properties.
+     */
+    handle;
+    /**
+     * The interaction behavior for the sheet modal when the handle is 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.
+     *
+     * Defaults to `"cycle"`.
+     */
+    handleBehavior = 'cycle';
+    /**
+     * The component to display inside of the modal.
+     * @internal
+     */
+    component;
+    /**
+     * The data to pass to the modal component.
+     * @internal
+     */
+    componentProps;
+    /**
+     * Additional classes to apply for custom CSS. If multiple classes are
+     * provided they should be separated by spaces.
+     * @internal
+     */
+    cssClass;
+    /**
+     * If `true`, the modal will be dismissed when the backdrop is clicked.
+     */
+    backdropDismiss = true;
+    /**
+     * If `true`, a backdrop will be displayed behind the modal.
+     * This property controls whether or not the backdrop
+     * darkens the screen when the modal is presented.
+     * It does not control whether or not the backdrop
+     * is active or present in the DOM.
+     */
+    showBackdrop = true;
+    /**
+     * If `true`, the modal will animate.
+     */
+    animated = true;
+    /**
+     * The element that presented the modal. This is used for card presentation effects
+     * and for stacking multiple modals on top of each other. Only applies in iOS mode.
+     */
+    presentingElement;
+    /**
+     * Additional attributes to pass to the modal.
+     */
+    htmlAttributes;
+    /**
+     * If `true`, the modal will open. If `false`, the modal will close.
+     * Use this if you need finer grained control over presentation, otherwise
+     * just use the modalController or the `trigger` property.
+     * Note: `isOpen` will not automatically be set back to `false` when
+     * the modal dismisses. You will need to do that in your code.
+     */
+    isOpen = false;
     onIsOpenChange(newValue, oldValue) {
         if (newValue === true && oldValue === false) {
             this.present();
@@ -234,6 +213,11 @@ export class Modal {
             this.dismiss();
         }
     }
+    /**
+     * An ID corresponding to the trigger element that
+     * causes the modal to open when clicked.
+     */
+    trigger;
     triggerChanged() {
         const { trigger, el, triggerController } = this;
         if (trigger) {
@@ -266,6 +250,108 @@ export class Modal {
             }
         }, 50); // Debounce to avoid excessive calls during active resizing
     }
+    /**
+     * If `true`, the component passed into `ion-modal` will
+     * automatically be mounted when the modal is created. The
+     * component will remain mounted even when the modal is dismissed.
+     * However, the component will be destroyed when the modal is
+     * destroyed. This property is not reactive and should only be
+     * used when initially creating a modal.
+     *
+     * Note: This feature only applies to inline modals in JavaScript
+     * frameworks such as Angular, React, and Vue.
+     */
+    keepContentsMounted = false;
+    /**
+     * If `true`, focus will not be allowed to move outside of this overlay.
+     * If `false`, focus will be allowed to move outside of the overlay.
+     *
+     * In most scenarios this property should remain set to `true`. Setting
+     * this property to `false` can cause severe accessibility issues as users
+     * relying on assistive technologies may be able to move focus into
+     * a confusing state. We recommend only setting this to `false` when
+     * absolutely necessary.
+     *
+     * Developers may want to consider disabling focus trapping if this
+     * overlay presents a non-Ionic overlay from a 3rd party library.
+     * Developers would disable focus trapping on the Ionic overlay
+     * when presenting the 3rd party overlay and then re-enable
+     * focus trapping when dismissing the 3rd party overlay and moving
+     * focus back to the Ionic overlay.
+     */
+    focusTrap = true;
+    /**
+     * Determines whether or not a modal can dismiss
+     * when calling the `dismiss` method.
+     *
+     * If the value is `true` or the value's function returns `true`, the modal will close when trying to dismiss.
+     * If the value is `false` or the value's function returns `false`, the modal will not close when trying to dismiss.
+     *
+     * See https://ionicframework.com/docs/troubleshooting/runtime#accessing-this
+     * if you need to access `this` from within the callback.
+     */
+    canDismiss = true;
+    /**
+     * Emitted after the modal has presented.
+     */
+    didPresent;
+    /**
+     * Emitted before the modal has presented.
+     */
+    willPresent;
+    /**
+     * Emitted before the modal has dismissed.
+     */
+    willDismiss;
+    /**
+     * Emitted after the modal has dismissed.
+     */
+    didDismiss;
+    /**
+     * Emitted after the modal breakpoint has changed.
+     */
+    ionBreakpointDidChange;
+    /**
+     * Emitted after the modal has presented.
+     * Shorthand for ionModalDidPresent.
+     */
+    didPresentShorthand;
+    /**
+     * Emitted before the modal has presented.
+     * Shorthand for ionModalWillPresent.
+     */
+    willPresentShorthand;
+    /**
+     * Emitted before the modal has dismissed.
+     * Shorthand for ionModalWillDismiss.
+     */
+    willDismissShorthand;
+    /**
+     * Emitted after the modal has dismissed.
+     * Shorthand for ionModalDidDismiss.
+     */
+    didDismissShorthand;
+    /**
+     * Emitted before the modal has presented, but after the component
+     * has been mounted in the DOM.
+     * This event exists so iOS can run the entering
+     * transition properly
+     *
+     * @internal
+     */
+    ionMount;
+    /**
+     * Event that is emitted when the sheet modal or card modal gesture starts.
+     */
+    ionDragStart;
+    /**
+     * Event that is emitted when the sheet modal or card modal gesture moves.
+     */
+    ionDragMove;
+    /**
+     * Event that is emitted when the sheet modal or card modal gesture ends.
+     */
+    ionDragEnd;
     breakpointsChanged(breakpoints) {
         if (breakpoints !== undefined) {
             this.sortedBreakpoints = breakpoints.sort((a, b) => a - b);
@@ -283,9 +369,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'];
@@ -320,7 +409,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];
                 }
             });
@@ -331,7 +423,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);
         }
     }
@@ -459,12 +551,11 @@ export class Modal {
             this.statusBarStyle = await StatusBar.getStyle();
             setCardStatusBarDark();
         }
-        await present(this, 'modalEnter', iosEnterAnimation, mdEnterAnimation, ionicEnterAnimation, {
+        await present(this, 'modalEnter', iosEnterAnimation, mdEnterAnimation, {
             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();
@@ -514,7 +605,6 @@ export class Modal {
         unlock();
     }
     initSwipeToClose() {
-        var _a;
         if (getIonMode(this) !== 'ios') {
             return;
         }
@@ -532,7 +622,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);
     }
@@ -547,15 +637,14 @@ export class Modal {
             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, 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 });
             }
-        }, getIonTheme(this) === 'ionic', () => this.onDragStart(), (detail) => this.onDragMove(detail), (detail) => this.onDragEnd(detail));
+        }, () => this.onDragStart(), (detail) => this.onDragMove(detail), (detail) => this.onDragEnd(detail));
         this.gesture = gesture;
         this.moveSheetToBreakpoint = moveSheetToBreakpoint;
         this.resetSheetContentScroll = resetContentScroll;
@@ -576,7 +665,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;
@@ -584,14 +672,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;
         }
@@ -599,7 +684,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');
         }
@@ -627,7 +712,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');
         }
@@ -690,7 +775,6 @@ export class Modal {
      * For example, `cancel` or `backdrop`.
      */
     async dismiss(data, role) {
-        var _a, _b;
         if (this.gestureAnimationDismissing && role !== GESTURE) {
             return false;
         }
@@ -735,7 +819,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,
         });
@@ -754,7 +838,7 @@ export class Modal {
              * 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?.();
             this.resetSheetContentScroll = undefined;
             this.cleanupViewTransitionListener();
             this.cleanupParentRemovalObserver();
@@ -835,18 +919,59 @@ export class Modal {
         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;
+    onHandleClick = () => {
+        const { sheetTransition, handleBehavior } = this;
+        if (handleBehavior !== 'cycle' || sheetTransition !== undefined) {
+            /**
+             * The sheet modal should not advance to the next breakpoint
+             * if the handle behavior is not `cycle` or if the handle
+             * is clicked while the sheet is moving to a breakpoint.
+             */
+            return;
         }
-        if (shape === undefined) {
-            return 'round';
+        this.moveToNextBreakpoint();
+    };
+    onBackdropTap = () => {
+        const { sheetTransition } = this;
+        if (sheetTransition !== undefined) {
+            /**
+             * When the handle is double clicked at the largest breakpoint,
+             * it will start to move to the first breakpoint. While transitioning,
+             * the backdrop will often receive the second click. We prevent the
+             * backdrop from dismissing the modal while moving between breakpoints.
+             */
+            return;
         }
-        return shape;
-    }
+        this.dismiss(undefined, BACKDROP);
+    };
+    onLifecycle = (modalEvent) => {
+        const el = this.usersElement;
+        const name = LIFECYCLE_MAP[modalEvent.type];
+        if (el && name) {
+            const ev = new CustomEvent(name, {
+                bubbles: false,
+                cancelable: false,
+                detail: modalEvent.detail,
+            });
+            el.dispatchEvent(ev);
+        }
+    };
+    /**
+     * When the modal receives focus directly, pass focus to the handle
+     * if it exists and is focusable, otherwise let the focus trap handle it.
+     */
+    onModalFocus = (ev) => {
+        const { dragHandleEl, el } = this;
+        /**
+         * 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();
+        }
+    };
     initViewTransitionListener() {
         // Only enable for iOS card modals when no custom animations are provided
         if (getIonMode(this) !== 'ios' || !this.presentingElement || this.enterAnimation || this.leaveAnimation) {
@@ -950,7 +1075,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)')
@@ -964,9 +1089,29 @@ export class Modal {
             }
         }
     }
+    /**
+     * When the slot changes, we need to find all the modals in the slot
+     * and set the data-parent-ion-modal attribute on them so we can find them
+     * and dismiss them when we get dismissed.
+     * We need to do it this way because when a modal is opened, it's moved to
+     * the end of the body and is no longer an actual child of the modal.
+     */
+    onSlotChange = ({ target }) => {
+        const slot = target;
+        slot.assignedElements().forEach((el) => {
+            el.querySelectorAll('ion-modal').forEach((childModal) => {
+                // We don't need to write to the DOM if the modal is already tagged
+                // If this is a deeply nested modal, this effect should cascade so we don't
+                // need to worry about another modal claiming the same child.
+                if (childModal.getAttribute('data-parent-ion-modal') === null) {
+                    childModal.setAttribute('data-parent-ion-modal', this.el.id);
+                }
+            });
+        });
+    };
     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');
         });
     }
@@ -999,10 +1144,9 @@ export class Modal {
                 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;
                     });
@@ -1024,8 +1168,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() {
@@ -1065,7 +1208,10 @@ 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
@@ -1081,7 +1227,7 @@ export class Modal {
      * and whenever the root safe-area value itself changes.
      */
     updateSheetOffsetTop(safeAreaTop) {
-        const value = safeAreaTop !== null && safeAreaTop !== void 0 ? safeAreaTop : getRootSafeAreaTop();
+        const value = safeAreaTop ?? getRootSafeAreaTop();
         this.el.style.setProperty('--ion-modal-offset-top', `${value}px`);
     }
     /**
@@ -1181,9 +1327,8 @@ export class Modal {
      * Clears all safe-area overrides and padding.
      */
     cleanupSafeAreaOverrides() {
-        var _a;
         clearSafeAreaOverrides(this.el);
-        (_a = this.unsubscribeRootSafeAreaTop) === null || _a === void 0 ? void 0 : _a.call(this);
+        this.unsubscribeRootSafeAreaTop?.();
         this.unsubscribeRootSafeAreaTop = undefined;
         // Remove internal sheet offset property
         this.el.style.removeProperty('--ion-modal-offset-top');
@@ -1193,16 +1338,24 @@ export class Modal {
     render() {
         const { handle, isSheetModal, presentingElement, htmlAttributes, handleBehavior, inheritedAttributes, focusTrap, expandToScroll, } = this;
         const showHandle = handle !== false && isSheetModal;
-        const theme = getIonTheme(this);
-        const isCardModal = presentingElement !== undefined && theme === 'ios';
+        const mode = getIonMode(this);
+        const isCardModal = presentingElement !== undefined && mode === 'ios';
         const isHandleCycle = handleBehavior === 'cycle';
-        const shape = this.getShape();
         const isSheetModalWithHandle = isSheetModal && showHandle;
-        return (h(Host, Object.assign({ key: 'cf99da2a03dd010716265401c8b6fe46a9bf0ced', "no-router": true,
+        return (h(Host, { key: 'a471c293319cb6ee5ffb7ffafec0b8413e4289de', "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({ [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: '91d148a13955bcda57b5d15d2613e74cc8cd5047', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), theme === 'ios' && h("div", { key: 'bd51fa967ced9c6d574f0bb6d3c569fe53a2be59', class: "modal-shadow" }), h("div", Object.assign({ key: '45fc1228a8dfc8009c933c6cee4067c08ab27fe6',
+            }, 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: 'f67934afd4ddad64623856fb641cb6db846df428', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: 'a23f5cb6cf60c8f717c1dd556bce375829c80a43', class: "modal-shadow" }), h("div", { key: '51eb6cd1070e4b7e49840a78dc7437238c867a01',
             /*
               role and aria-modal must be used on the
               same element. They must also be set inside the
@@ -1215,24 +1368,22 @@ export class Modal {
               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: '9bcc1589af7c422ee6f116aa50f62981031042ba', 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: 'f49a144642b5c227c0c2b00b33f4c7e37a2bf088', 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", "data-focus-order": "1", ref: (el) => (this.dragHandleEl = el) })), h("slot", { key: 'd913facdd6abf0d87ba5e2d7f8b2f1c18e3ef556', 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: 'e781c0d5881762c6b61aa432721a38b49580ff64', onSlotchange: this.onSlotChange }))));
     }
     static get is() { return "ion-modal"; }
     static get encapsulation() { return "shadow"; }
     static get originalStyleUrls() {
         return {
             "ios": ["modal.ios.scss"],
-            "md": ["modal.md.scss"],
-            "ionic": ["modal.ionic.scss"]
+            "md": ["modal.md.scss"]
         };
     }
     static get styleUrls() {
         return {
             "ios": ["modal.ios.css"],
-            "md": ["modal.md.css"],
-            "ionic": ["modal.ionic.css"]
+            "md": ["modal.md.css"]
         };
     }
     static get properties() {
@@ -1491,13 +1642,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",
@@ -1779,25 +1930,6 @@ export class Modal {
                 "reflect": false,
                 "attribute": "can-dismiss",
                 "defaultValue": "true"
-            },
-            "shape": {
-                "type": "string",
-                "mutable": false,
-                "complexType": {
-                    "original": "'soft' | 'round' | 'rectangular'",
-                    "resolved": "\"rectangular\" | \"round\" | \"soft\" | undefined",
-                    "references": {}
-                },
-                "required": false,
-                "optional": true,
-                "docs": {
-                    "tags": [],
-                    "text": "Set to `\"soft\"` for a modal with slightly rounded corners,\n`\"round\"` for a modal with fully rounded corners, or `\"rectangular\"`\nfor a modal without rounded corners.\n\nDefaults to `\"round\"` for the `ionic` theme, undefined for all other themes."
-                },
-                "getter": false,
-                "setter": false,
-                "reflect": false,
-                "attribute": "shape"
             }
         };
     }