@ionic/core 9.0.4-nightly.20260914 → 9.0.4-nightly.20260916

package/dist/cjs/{overlays-BR21NUIG.js → overlays-DwMDYc_O.js}

@@ -3,14 +3,129 @@
  */
 'use strict';
 
-var index$1 = require('./index-DkNv4J_i.js');
-var helpers = require('./helpers-7wzdhdeg.js');
-var hardwareBackButton = require('./hardware-back-button-Bu4Dzw8l.js');
-var index = require('./index-DXoo08JC.js');
-var ionicGlobal = require('./ionic-global-CYJNT-2P.js');
-var frameworkDelegate = require('./framework-delegate-d-fWfeI6.js');
+var helpers = require('./helpers-DHjAEaU9.js');
+var index = require('./index-T36W_eKv.js');
+var ionicGlobal = require('./ionic-global-BWd7usAF.js');
+var frameworkDelegate = require('./framework-delegate-DYIuFqQx.js');
 var gestureController = require('./gesture-controller-CeJslptU.js');
 
+/**
+ * CloseWatcher is a newer API that lets
+ * use detect the hardware back button event
+ * in a web browser: https://caniuse.com/?search=closewatcher
+ * However, not every browser supports it yet.
+ *
+ * This needs to be a function so that we can
+ * check the config once it has been set.
+ * Otherwise, this code would be evaluated the
+ * moment this file is evaluated which could be
+ * before the config is set.
+ */
+const shouldUseCloseWatcher = () => index.config.get('experimentalCloseWatcher', false) && helpers.win !== undefined && 'CloseWatcher' in helpers.win;
+/**
+ * When hardwareBackButton: false in config,
+ * we need to make sure we also block the default
+ * webview behavior. If we don't then it will be
+ * possible for users to navigate backward while
+ * an overlay is still open. Additionally, it will
+ * give the appearance that the hardwareBackButton
+ * config is not working as the page transition
+ * will still happen.
+ */
+const blockHardwareBackButton = () => {
+    document.addEventListener('backbutton', () => { });
+};
+const startHardwareBackButton = () => {
+    const doc = document;
+    let busy = false;
+    const backButtonCallback = () => {
+        if (busy) {
+            return;
+        }
+        let index$1 = 0;
+        let handlers = [];
+        const ev = new CustomEvent('ionBackButton', {
+            bubbles: false,
+            detail: {
+                register(priority, handler) {
+                    handlers.push({ priority, handler, id: index$1++ });
+                },
+            },
+        });
+        doc.dispatchEvent(ev);
+        const executeAction = async (handlerRegister) => {
+            try {
+                if (handlerRegister?.handler) {
+                    const result = handlerRegister.handler(processHandlers);
+                    if (result != null) {
+                        await result;
+                    }
+                }
+            }
+            catch (e) {
+                index.printIonError('[ion-app] - Exception in startHardwareBackButton:', e);
+            }
+        };
+        const processHandlers = () => {
+            if (handlers.length > 0) {
+                let selectedHandler = {
+                    priority: Number.MIN_SAFE_INTEGER,
+                    handler: () => undefined,
+                    id: -1,
+                };
+                handlers.forEach((handler) => {
+                    if (handler.priority >= selectedHandler.priority) {
+                        selectedHandler = handler;
+                    }
+                });
+                busy = true;
+                handlers = handlers.filter((handler) => handler.id !== selectedHandler.id);
+                executeAction(selectedHandler).then(() => (busy = false));
+            }
+        };
+        processHandlers();
+    };
+    /**
+     * If the CloseWatcher is defined then
+     * we don't want to also listen for the native
+     * backbutton event otherwise we may get duplicate
+     * events firing.
+     */
+    if (shouldUseCloseWatcher()) {
+        let watcher;
+        const configureWatcher = () => {
+            watcher?.destroy();
+            watcher = new helpers.win.CloseWatcher();
+            /**
+             * Once a close request happens
+             * the watcher gets destroyed.
+             * As a result, we need to re-configure
+             * the watcher so we can respond to other
+             * close requests.
+             */
+            watcher.onclose = () => {
+                backButtonCallback();
+                configureWatcher();
+            };
+        };
+        configureWatcher();
+    }
+    else {
+        doc.addEventListener('backbutton', backButtonCallback);
+    }
+};
+const OVERLAY_BACK_BUTTON_PRIORITY = 100;
+const MENU_BACK_BUTTON_PRIORITY = 99; // 1 less than overlay priority since menu is displayed behind overlays
+
+var hardwareBackButton = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    MENU_BACK_BUTTON_PRIORITY: MENU_BACK_BUTTON_PRIORITY,
+    OVERLAY_BACK_BUTTON_PRIORITY: OVERLAY_BACK_BUTTON_PRIORITY,
+    blockHardwareBackButton: blockHardwareBackButton,
+    shouldUseCloseWatcher: shouldUseCloseWatcher,
+    startHardwareBackButton: startHardwareBackButton
+});
+
 /**
  * This query string selects elements that
  * are eligible to receive focus. We select
@@ -407,7 +522,7 @@ const connectListeners = (doc) => {
         doc.addEventListener('ionBackButton', (ev) => {
             const lastOverlay = getPresentedOverlay(doc);
             if (lastOverlay?.backdropDismiss) {
-                ev.detail.register(hardwareBackButton.OVERLAY_BACK_BUTTON_PRIORITY, () => {
+                ev.detail.register(OVERLAY_BACK_BUTTON_PRIORITY, () => {
                     /**
                      * Do not return this promise otherwise
                      * the hardware back button utility will
@@ -430,7 +545,7 @@ const connectListeners = (doc) => {
          * this behavior will be handled via the ionBackButton
          * event.
          */
-        if (!hardwareBackButton.shouldUseCloseWatcher()) {
+        if (!shouldUseCloseWatcher()) {
             doc.addEventListener('keydown', (ev) => {
                 if (ev.key === 'Escape') {
                     const lastOverlay = getPresentedOverlay(doc);
@@ -716,7 +831,7 @@ const dismiss = async (overlay, data, role, name, iosLeaveAnimation, mdLeaveAnim
     if (!overlay.presented) {
         return false;
     }
-    const presentedOverlays = index$1.doc !== undefined ? getPresentedOverlays(index$1.doc) : [];
+    const presentedOverlays = helpers.doc !== undefined ? getPresentedOverlays(helpers.doc) : [];
     /**
      * For accessibility, toasts lack focus traps and don't receive
      * `aria-hidden` on the root element when presented.
@@ -845,6 +960,40 @@ const safeCall = (handler, arg) => {
     }
     return undefined;
 };
+/**
+ * `--width` and `--height` values that leave an overlay spanning the viewport
+ * on that axis, so it reaches both edges. An empty value means the property
+ * was never overridden.
+ */
+const FULLSCREEN_SIZES = ['', '100%', '100vw', '100vh', '100dvw', '100dvh', '100svw', '100svh'];
+/**
+ * `--width` and `--height` values that size an overlay to its content, leaving
+ * the rendered size dependent on the content and on `--max-width` or
+ * `--max-height`.
+ */
+const CONTENT_SIZES = ['auto', 'fit-content', 'min-content', 'max-content'];
+/**
+ * How an overlay's `--width` or `--height` determines its used size:
+ *
+ * `fullscreen` spans the viewport on that axis. `content` depends on the
+ * overlay's content, so its used size is not known until layout. `definite`
+ * resolves independently of the overlay's content size.
+ *
+ * Values are lowercased because CSS keywords are case-insensitive, while a
+ * custom property preserves the case in which it was authored. Content values
+ * are matched as a suffix so vendor-prefixed values such as `-moz-fit-content`
+ * are recognized.
+ */
+const getOverlaySizeType = (size) => {
+    const value = size.trim().toLowerCase();
+    if (FULLSCREEN_SIZES.includes(value)) {
+        return 'fullscreen';
+    }
+    if (CONTENT_SIZES.some((keyword) => value.endsWith(keyword))) {
+        return 'content';
+    }
+    return 'definite';
+};
 const BACKDROP = 'backdrop';
 const GESTURE = 'gesture';
 const OVERLAY_GESTURE_PRIORITY = 39;
@@ -979,6 +1128,7 @@ const FOCUS_TRAP_DISABLE_CLASS = 'ion-disable-focus-trap';
 exports.BACKDROP = BACKDROP;
 exports.FOCUS_TRAP_DISABLE_CLASS = FOCUS_TRAP_DISABLE_CLASS;
 exports.GESTURE = GESTURE;
+exports.MENU_BACK_BUTTON_PRIORITY = MENU_BACK_BUTTON_PRIORITY;
 exports.OVERLAY_GESTURE_PRIORITY = OVERLAY_GESTURE_PRIORITY;
 exports.actionSheetController = actionSheetController;
 exports.alertController = alertController;
@@ -989,7 +1139,9 @@ exports.dismiss = dismiss;
 exports.eventMethod = eventMethod;
 exports.focusFirstDescendant = focusFirstDescendant;
 exports.focusLastDescendant = focusLastDescendant;
+exports.getOverlaySizeType = getOverlaySizeType;
 exports.getPresentedOverlay = getPresentedOverlay;
+exports.hardwareBackButton = hardwareBackButton;
 exports.isCancel = isCancel;
 exports.loadingController = loadingController;
 exports.modalController = modalController;
@@ -999,4 +1151,5 @@ exports.present = present;
 exports.restoreRootFocusTrapAccessibility = restoreRootFocusTrapAccessibility;
 exports.safeCall = safeCall;
 exports.setOverlayId = setOverlayId;
+exports.shouldUseCloseWatcher = shouldUseCloseWatcher;
 exports.toastController = toastController;

package/dist/cjs/{select-option-render-D8ZEjYji.js → select-option-render-Cu-ABBRH.js}

@@ -3,8 +3,8 @@
  */
 'use strict';
 
-var index = require('./index-DXoo08JC.js');
-var index$1 = require('./index-KiSZqhYS.js');
+var index = require('./index-T36W_eKv.js');
+var index$1 = require('./index-MdIUU940.js');
 
 /**
  * Converts a DOM node into a Stencil VNode (or text string) so the

package/dist/cjs/{slot-mutation-controller-yNStVQqX.js → slot-mutation-controller-CtYZdaWI.js}

@@ -3,8 +3,7 @@
  */
 'use strict';
 
-var index = require('./index-DkNv4J_i.js');
-var helpers = require('./helpers-7wzdhdeg.js');
+var helpers = require('./helpers-DHjAEaU9.js');
 var dir = require('./dir-zwDPRE5K.js');
 
 /**
@@ -96,8 +95,8 @@ const createNotchController = (el, getNotchSpacerEl, getLabelSlot) => {
          */
         width === 0 &&
             notchSpacerEl.offsetParent === null &&
-            index.win !== undefined &&
-            'IntersectionObserver' in index.win) {
+            helpers.win !== undefined &&
+            'IntersectionObserver' in helpers.win) {
             /**
              * If there is an IO already attached
              * then that will update the notch
@@ -360,7 +359,7 @@ const createClickController = (el, getNativeInput) => {
 const createSlotMutationController = (el, slotName, mutationCallback) => {
     let hostMutationObserver;
     let slottedContentMutationObserver;
-    if (index.win !== undefined && 'MutationObserver' in index.win) {
+    if (helpers.win !== undefined && 'MutationObserver' in helpers.win) {
         const slots = Array.isArray(slotName) ? slotName : [slotName];
         hostMutationObserver = new MutationObserver((entries) => {
             for (const entry of entries) {

package/dist/cjs/{status-tap-CNP5eD1R.js → status-tap-BUfv_eD4.js}

@@ -3,9 +3,9 @@
  */
 'use strict';
 
-var index = require('./index-DXoo08JC.js');
-var index$1 = require('./index-DtvKGwdh.js');
-var helpers = require('./helpers-7wzdhdeg.js');
+var index = require('./index-T36W_eKv.js');
+var index$1 = require('./index-BLq7TkUV.js');
+var helpers = require('./helpers-DHjAEaU9.js');
 require('./dir-zwDPRE5K.js');
 
 const startStatusTap = () => {

package/dist/cjs/{swipe-back-BYb_nLJe.js → swipe-back-DYKxJU5r.js}

@@ -3,10 +3,10 @@
  */
 'use strict';
 
-var helpers = require('./helpers-7wzdhdeg.js');
+var helpers = require('./helpers-DHjAEaU9.js');
 var dir = require('./dir-zwDPRE5K.js');
 var index = require('./index-DRPqwSvU.js');
-require('./index-DXoo08JC.js');
+require('./index-T36W_eKv.js');
 require('./gesture-controller-CeJslptU.js');
 
 const createSwipeBackGesture = (el, canStartHandler, onStartHandler, onMoveHandler, onEndHandler) => {

package/dist/collection/collection-manifest.json

@@ -99,7 +99,7 @@
   "mixins": [],
   "compiler": {
     "name": "@stencil/core",
-    "version": "4.44.2",
+    "version": "4.45.0",
     "typescriptVersion": "5.8.3"
   },
   "collections": [

package/dist/collection/components/content/content.js

@@ -3,6 +3,7 @@
  */
 import { Build, Host, forceUpdate, h, readTask, } from "@stencil/core";
 import { componentOnReady, hasLazyBuild, inheritAriaAttributes } from "../../utils/helpers";
+import { getOverlaySizeType } from "../../utils/overlays";
 import { isPlatform } from "../../utils/platform";
 import { isRTL } from "../../utils/rtl/index";
 import { createColorClasses, hostContext } from "../../utils/theme";
@@ -47,6 +48,10 @@ export class Content {
             data: undefined,
             isScrolling: true,
         };
+        /**
+         * Whether the host is sized to its content.
+         */
+        this.sizeToContent = false;
         /**
          * If `true`, the content will scroll behind the headers
          * and footers. This effect can easily be seen by setting the toolbar
@@ -80,6 +85,7 @@ export class Content {
     }
     componentWillLoad() {
         this.inheritedAttributes = inheritAriaAttributes(this.el);
+        this.sizeToContent = this.readSizeToContent();
     }
     connectedCallback() {
         this.isMainContent = this.el.closest('ion-menu, ion-popover, ion-modal') === null;
@@ -119,6 +125,7 @@ export class Content {
         }
         // Re-observe on reattach, since componentDidLoad only fires once.
         this.setupFullscreenResizeObserver();
+        this.updateSizeToContent();
     }
     componentDidLoad() {
         // The custom elements build assigns fullscreen after connectedCallback.
@@ -175,6 +182,16 @@ export class Content {
         });
         this.fullscreenResizeObserver.observe(this.el);
     }
+    /**
+     * Picks up an overlay that is no longer sized the way the last render
+     * assumed, re-rendering only when the answer changes. Read in a `readTask`
+     * because resolving the custom property forces a style recalculation.
+     */
+    updateSizeToContent() {
+        readTask(() => {
+            this.sizeToContent = this.readSizeToContent();
+        });
+    }
     destroyFullscreenResizeObserver() {
         if (this.fullscreenResizeObserver !== undefined) {
             this.fullscreenResizeObserver.disconnect();
@@ -221,6 +238,30 @@ export class Content {
         const mode = getIonMode(this);
         return forceOverscroll === undefined ? mode === 'ios' && isPlatform('ios') : forceOverscroll;
     }
+    /**
+     * Reads whether to size the component to its content height. Forces a style
+     * recalculation, so it belongs in a read task or before the first render.
+     *
+     * This applies inside popovers and modals with a content-based `--height`,
+     * where the overlay does not provide the content with a definite height
+     * to fill.
+     *
+     * Only `--height` is consulted. Styling the wrapper directly, such as
+     * `ion-modal::part(content) { height: fit-content; }`, does not change
+     * `--height` and therefore cannot be observed. `--height` is the only
+     * supported way to opt into content-based sizing.
+     */
+    readSizeToContent() {
+        if (hostContext('ion-popover', this.el)) {
+            return true;
+        }
+        const modal = this.el.closest('ion-modal');
+        if (modal === null) {
+            return false;
+        }
+        const height = getComputedStyle(modal).getPropertyValue('--height');
+        return getOverlaySizeType(height) === 'content';
+    }
     resize() {
         /**
          * Only force update if the component is rendered in a browser context.
@@ -231,6 +272,12 @@ export class Content {
          * TODO: Remove if STENCIL-834 determines Stencil will account for this.
          */
         if (Build.isBrowser) {
+            /**
+             * A window resize can cross a media query that changes the modal's
+             * `--height`. The content's own offsets are unchanged, so neither branch
+             * below re-renders and the class from the last render would go stale.
+             */
+            this.updateSizeToContent();
             if (this.fullscreen) {
                 readTask(() => this.readDimensions());
             }
@@ -241,13 +288,15 @@ export class Content {
         }
     }
     /**
-     * Recalculate content dimensions. Called by overlays (e.g., popover) when
-     * sibling elements like headers or footers have finished rendering and their
-     * heights are available, ensuring accurate offset-top calculations.
+     * Recalculates the content dimensions and whether it should size itself to
+     * its content. Called by overlays when something they own changes, such as
+     * a header finishing its render or `--height` being updated.
+     *
      * @internal
      */
     async recalculateDimensions() {
         readTask(() => this.readDimensions());
+        this.updateSizeToContent();
     }
     readDimensions() {
         const page = getPageElement(this.el);
@@ -418,21 +467,21 @@ export class Content {
         const forceOverscroll = this.shouldForceOverscroll();
         const transitionShadow = mode === 'ios';
         this.resize();
-        return (h(Host, { key: '9551c759df407b10d809171641fc6e8f14d92219', role: isMainContent ? 'main' : undefined, class: createColorClasses(this.color, {
+        return (h(Host, { key: 'e1013621096729354ef92915af52dd823e69fdff', role: isMainContent ? 'main' : undefined, class: createColorClasses(this.color, {
                 [mode]: true,
                 'content-fullscreen': this.fullscreen,
-                'content-sizing': hostContext('ion-popover', this.el),
+                'content-sizing': this.sizeToContent,
                 overscroll: forceOverscroll,
                 [`content-${rtl}`]: true,
             }), style: {
                 '--offset-top': `${this.cTop}px`,
                 '--offset-bottom': `${this.cBottom}px`,
-            }, ...inheritedAttributes }, h("div", { key: 'c6de8fd226f0d10a534eb107fe032ac155fbe68e', ref: (el) => (this.backgroundContentEl = el), id: "background-content", part: "background" }), fixedSlotPlacement === 'before' ? h("slot", { name: "fixed" }) : null, h("div", { key: '082fc2936061360060b48221ecb1c864a3711fa0', class: {
+            }, ...inheritedAttributes }, h("div", { key: '3d8649b164d6324beaa1bc50e1d204ad06c2ec1a', ref: (el) => (this.backgroundContentEl = el), id: "background-content", part: "background" }), fixedSlotPlacement === 'before' ? h("slot", { name: "fixed" }) : null, h("div", { key: 'dd2d3bed8690b4f5027a43f5ec60e7e7df18106d', class: {
                 'inner-scroll': true,
                 'scroll-x': scrollX,
                 'scroll-y': scrollY,
                 overscroll: (scrollX || scrollY) && forceOverscroll,
-            }, ref: (scrollEl) => (this.scrollEl = scrollEl), onScroll: this.scrollEvents ? (ev) => this.onScroll(ev) : undefined, part: "scroll" }, h("slot", { key: '0d2286206facb22696a9ca7e74a3f6b7d2397aab' })), transitionShadow ? (h("div", { class: "transition-effect" }, h("div", { class: "transition-cover" }), h("div", { class: "transition-shadow" }))) : null, fixedSlotPlacement === 'after' ? h("slot", { name: "fixed" }) : null));
+            }, ref: (scrollEl) => (this.scrollEl = scrollEl), onScroll: this.scrollEvents ? (ev) => this.onScroll(ev) : undefined, part: "scroll" }, h("slot", { key: 'dc3d4584d9e9afd43699525a619b8e873078fbbf' })), transitionShadow ? (h("div", { class: "transition-effect" }, h("div", { class: "transition-cover" }), h("div", { class: "transition-shadow" }))) : null, fixedSlotPlacement === 'after' ? h("slot", { name: "fixed" }) : null));
     }
     static get is() { return "ion-content"; }
     static get encapsulation() { return "shadow"; }
@@ -595,6 +644,11 @@ export class Content {
             }
         };
     }
+    static get states() {
+        return {
+            "sizeToContent": {}
+        };
+    }
     static get events() {
         return [{
                 "method": "ionScrollStart",
@@ -679,7 +733,7 @@ export class Content {
                     "return": "Promise<void>"
                 },
                 "docs": {
-                    "text": "Recalculate content dimensions. Called by overlays (e.g., popover) when\nsibling elements like headers or footers have finished rendering and their\nheights are available, ensuring accurate offset-top calculations.",
+                    "text": "Recalculates the content dimensions and whether it should size itself to\nits content. Called by overlays when something they own changes, such as\na header finishing its render or `--height` being updated.",
                     "tags": [{
                             "name": "internal",
                             "text": undefined

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

@@ -77,7 +77,12 @@
   --max-width: auto;
   --height: 100%;
   --min-height: auto;
-  --max-height: auto;
+  /**
+   * Clamps a content-sized `--height` (auto, fit-content, ...) to the
+   * overlay, giving the wrapper's flex children something to shrink
+   * toward so `ion-content` scrolls instead of overflowing.
+   */
+  --max-height: 100%;
   --overflow: hidden;
   --border-radius: 0;
   --border-width: 0;
@@ -129,8 +134,14 @@ ion-backdrop {
 /**
  * The wrapper receives programmatic focus for screen readers but should not
  * show a visible focus ring, which is meant only for keyboard navigation.
+ *
+ * A flex layout is required for the wrapper to size itself to its content
+ * when the modal is content-sized (`--height` is auto, fit-content, ...).
+ * This makes it so that the content can scroll when it overflows the wrapper.
  */
 .modal-wrapper {
+  display: flex;
+  flex-direction: column;
   outline: none;
 }
 

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

@@ -21,8 +21,8 @@ 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, onRootSafeAreaTopChange, hasCustomModalDimensions, } from "./safe-area-utils";
-import { setCardStatusBarDark, setCardStatusBarDefault } from "./utils";
+import { getInitialSafeAreaConfig, getPositionBasedSafeAreaConfig, applySafeAreaOverrides, clearSafeAreaOverrides, getRootSafeAreaTop, onRootSafeAreaTopChange, getModalCoveredAxes, } from "./safe-area-utils";
+import { onModalHeightChange, setCardStatusBarDark, setCardStatusBarDefault } from "./utils";
 // TODO(FW-2832): types
 /**
  * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use.
@@ -1053,7 +1053,7 @@ export class Modal {
     /**
      * Creates the context object for safe-area utilities.
      *
-     * `hasCustomDimensions` is only set by `setInitialSafeAreaOverrides()`
+     * `coveredAxes` is only set by `setInitialSafeAreaOverrides()`
      * because it is only read by `getInitialSafeAreaConfig()`. Other callers
      * (resize handler, post-animation update, fullscreen-padding apply) would
      * pay a `getComputedStyle()` cost for a value they never consult.
@@ -1067,6 +1067,26 @@ export class Modal {
             currentBreakpoint: this.currentBreakpoint,
         };
     }
+    /**
+     * Keeps the content's sizing in sync with `--height`. The content reads the
+     * property to determine whether it should size itself to its content, and
+     * changes to `--height` on an ancestor or the root can change that behavior
+     * without changing the modal itself.
+     */
+    watchHeightForContent() {
+        /**
+         * A sheet's height comes from its breakpoints, so its content never sizes
+         * itself to `--height`. Watching it would cause the drag to recalculate on
+         * every frame.
+         */
+        if (this.isSheetModal) {
+            return;
+        }
+        this.unsubscribeHeightChange?.();
+        this.unsubscribeHeightChange = onModalHeightChange(this.el, () => {
+            this.el.querySelectorAll('ion-content').forEach((contentEl) => contentEl.recalculateDimensions());
+        });
+    }
     /**
      * Sets initial safe-area overrides before modal animation.
      * Called in present() before animation starts.
@@ -1080,10 +1100,11 @@ export class Modal {
     setInitialSafeAreaOverrides() {
         const context = {
             ...this.getSafeAreaContext(),
-            hasCustomDimensions: hasCustomModalDimensions(this.el),
+            coveredAxes: getModalCoveredAxes(this.el),
         };
         const safeAreaConfig = getInitialSafeAreaConfig(context);
         applySafeAreaOverrides(this.el, safeAreaConfig);
+        this.watchHeightForContent();
         // Set the internal offset property with the resolved root safe-area-top value
         if (context.isSheetModal) {
             this.updateSheetOffsetTop();
@@ -1203,6 +1224,8 @@ export class Modal {
         clearSafeAreaOverrides(this.el);
         this.unsubscribeRootSafeAreaTop?.();
         this.unsubscribeRootSafeAreaTop = undefined;
+        this.unsubscribeHeightChange?.();
+        this.unsubscribeHeightChange = undefined;
         // Remove internal sheet offset property
         this.el.style.removeProperty('--ion-modal-offset-top');
         const { contentEl } = this.findContentAndFooter();
@@ -1240,7 +1263,7 @@ export class Modal {
         const isCardModal = presentingElement !== undefined && mode === 'ios';
         const isHandleCycle = handleBehavior === 'cycle';
         const isSheetModalWithHandle = isSheetModal && showHandle;
-        return (h(Host, { key: '7c9c736052c5a788cf31040b6b2386dd9ea7454b', "no-router": true,
+        return (h(Host, { key: '17a95bd7722bac2344bea041aff97db17f55c0cf', "no-router": true,
             // Allow the modal to be navigable when the handle is focusable
             tabIndex: isHandleCycle && isSheetModalWithHandle ? 0 : -1, ...htmlAttributes, style: {
                 zIndex: `${20000 + this.overlayIndex}`,
@@ -1253,7 +1276,7 @@ export class Modal {
                 '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',
+            }, onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }, h("ion-backdrop", { key: '9dab1ef4771c0d847ba2be8672afbaa2748517f3', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: '64af7ed1c5f552b61fc4b9387b926acc76c8a99a', class: "modal-shadow" }), h("div", { key: '7e76d77d5b2e8f0467bb793facf5aa86f8d01bbe',
             /*
               role and aria-modal must be used on the
               same element. They must also be set inside the
@@ -1266,9 +1289,9 @@ 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: 'df84a6806413b13efc5b03c862edde83151579a7', 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: '5efc0bb0a59adcc594ac48da9fd90e57908a7ffb', 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: '072d3929ec6f25481946b184d8ac24219011e783', 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: '6175fcd0b39c086b4e9eb9e96c4d631c2a86774b', onSlotchange: this.onSlotChange }))));
     }
     static get is() { return "ion-modal"; }
     static get encapsulation() { return "shadow"; }

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

@@ -77,7 +77,12 @@
   --max-width: auto;
   --height: 100%;
   --min-height: auto;
-  --max-height: auto;
+  /**
+   * Clamps a content-sized `--height` (auto, fit-content, ...) to the
+   * overlay, giving the wrapper's flex children something to shrink
+   * toward so `ion-content` scrolls instead of overflowing.
+   */
+  --max-height: 100%;
   --overflow: hidden;
   --border-radius: 0;
   --border-width: 0;
@@ -129,8 +134,14 @@ ion-backdrop {
 /**
  * The wrapper receives programmatic focus for screen readers but should not
  * show a visible focus ring, which is meant only for keyboard navigation.
+ *
+ * A flex layout is required for the wrapper to size itself to its content
+ * when the modal is content-sized (`--height` is auto, fit-content, ...).
+ * This makes it so that the content can scroll when it overflows the wrapper.
  */
 .modal-wrapper {
+  display: flex;
+  flex-direction: column;
   outline: none;
 }