@ionic/core 8.7.17-dev.11767895575.16ea7cef → 8.7.17-dev.11767897190.1ef0f479

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

@@ -2,6 +2,7 @@
  * (C) Ionic http://ionicframework.com - MIT License
  */
 import { Build, Host, forceUpdate, h, readTask } from "@stencil/core";
+import { win } from "../../utils/browser/index";
 import { componentOnReady, hasLazyBuild, inheritAriaAttributes } from "../../utils/helpers";
 import { isPlatform } from "../../utils/platform";
 import { isRTL } from "../../utils/rtl/index";
@@ -25,6 +26,12 @@ export class Content {
         this.isMainContent = true;
         this.resizeTimeout = null;
         this.inheritedAttributes = {};
+        /**
+         * Track whether this content has sibling header/footer elements.
+         * When absent, we need to apply safe-area padding directly.
+         */
+        this.hasHeader = false;
+        this.hasFooter = false;
         this.tabsElement = null;
         // Detail is used in a hot loop in the scroll event, by allocating it here
         // V8 will be able to inline any read/write to it since it's a monomorphic class.
@@ -79,7 +86,13 @@ export class Content {
         this.inheritedAttributes = inheritAriaAttributes(this.el);
     }
     connectedCallback() {
-        this.isMainContent = this.el.closest('ion-menu, ion-popover, ion-modal') === null;
+        var _a;
+        // Content is "main" if not inside menu/popover/modal and not nested in another ion-content
+        this.isMainContent =
+            this.el.closest('ion-menu, ion-popover, ion-modal') === null &&
+                ((_a = this.el.parentElement) === null || _a === void 0 ? void 0 : _a.closest('ion-content')) === null;
+        // Detect sibling header/footer for safe-area handling
+        this.detectSiblingElements();
         /**
          * The fullscreen content offsets need to be
          * computed after the tab bar has loaded. Since
@@ -110,13 +123,86 @@ export class Content {
                  * bubbles, we can catch any instances of child tab bars loading by listening
                  * on IonTabs.
                  */
-                this.tabsLoadCallback = () => this.resize();
+                this.tabsLoadCallback = () => {
+                    this.resize();
+                    // Re-detect footer when tab bar loads (it may not exist during initial detection)
+                    this.updateSiblingDetection();
+                    forceUpdate(this);
+                };
                 closestTabs.addEventListener('ionTabBarLoaded', this.tabsLoadCallback);
             }
         }
     }
+    /**
+     * Detects sibling ion-header and ion-footer elements and sets up
+     * a mutation observer to handle dynamic changes (e.g., conditional rendering).
+     */
+    detectSiblingElements() {
+        this.updateSiblingDetection();
+        // Watch for dynamic header/footer changes (common in React conditional rendering)
+        const parent = this.el.parentElement;
+        if (parent && !this.parentMutationObserver && win !== undefined && 'MutationObserver' in win) {
+            this.parentMutationObserver = new MutationObserver(() => {
+                const prevHasHeader = this.hasHeader;
+                const prevHasFooter = this.hasFooter;
+                this.updateSiblingDetection();
+                // Only trigger re-render if header/footer detection actually changed
+                if (prevHasHeader !== this.hasHeader || prevHasFooter !== this.hasFooter) {
+                    forceUpdate(this);
+                }
+            });
+            this.parentMutationObserver.observe(parent, { childList: true });
+        }
+    }
+    /**
+     * Updates hasHeader/hasFooter based on current DOM state.
+     * Checks both direct siblings and elements wrapped in custom components
+     * (e.g., <my-header><ion-header>...</ion-header></my-header>).
+     */
+    updateSiblingDetection() {
+        const parent = this.el.parentElement;
+        if (parent) {
+            // First check for direct ion-header/ion-footer siblings
+            this.hasHeader = parent.querySelector(':scope > ion-header') !== null;
+            this.hasFooter = parent.querySelector(':scope > ion-footer') !== null;
+            // If not found, check if any sibling contains them (wrapped components)
+            if (!this.hasHeader) {
+                this.hasHeader = this.siblingContainsElement(parent, 'ion-header');
+            }
+            if (!this.hasFooter) {
+                this.hasFooter = this.siblingContainsElement(parent, 'ion-footer');
+            }
+        }
+        // If no footer found, check if we're inside ion-tabs which has ion-tab-bar
+        if (!this.hasFooter) {
+            const tabs = this.el.closest('ion-tabs');
+            if (tabs) {
+                this.hasFooter = tabs.querySelector(':scope > ion-tab-bar') !== null;
+            }
+        }
+    }
+    /**
+     * Checks if any sibling element of ion-content contains the specified element.
+     * Only searches one level deep to avoid finding elements in nested pages.
+     */
+    siblingContainsElement(parent, tagName) {
+        for (const sibling of parent.children) {
+            // Skip ion-content itself
+            if (sibling === this.el)
+                continue;
+            // Check if this sibling contains the target element as an immediate child
+            if (sibling.querySelector(`:scope > ${tagName}`) !== null) {
+                return true;
+            }
+        }
+        return false;
+    }
     disconnectedCallback() {
+        var _a;
         this.onScrollEnd();
+        // Clean up mutation observer to prevent memory leaks
+        (_a = this.parentMutationObserver) === null || _a === void 0 ? void 0 : _a.disconnect();
+        this.parentMutationObserver = undefined;
         if (hasLazyBuild(this.el)) {
             /**
              * The event listener and tabs caches need to
@@ -363,26 +449,28 @@ export class Content {
         }
     }
     render() {
-        const { fixedSlotPlacement, inheritedAttributes, isMainContent, scrollX, scrollY, el } = this;
+        const { fixedSlotPlacement, hasFooter, hasHeader, inheritedAttributes, isMainContent, scrollX, scrollY, el } = this;
         const rtl = isRTL(el) ? 'rtl' : 'ltr';
         const mode = getIonMode(this);
         const forceOverscroll = this.shouldForceOverscroll();
         const transitionShadow = mode === 'ios';
         this.resize();
-        return (h(Host, Object.assign({ key: 'cd8781f848d8dc926fe66f43d43c49564425a507', role: isMainContent ? 'main' : undefined, class: createColorClasses(this.color, {
+        return (h(Host, Object.assign({ key: 'f7218f733e4022a30875441bd949747537d28aa1', role: isMainContent ? 'main' : undefined, class: createColorClasses(this.color, {
                 [mode]: true,
                 'content-sizing': hostContext('ion-popover', this.el),
                 overscroll: forceOverscroll,
                 [`content-${rtl}`]: true,
+                'safe-area-top': isMainContent && !hasHeader,
+                'safe-area-bottom': isMainContent && !hasFooter,
             }), style: {
                 '--offset-top': `${this.cTop}px`,
                 '--offset-bottom': `${this.cBottom}px`,
-            } }, inheritedAttributes), h("div", { key: '95b112d7cae30f22ef778ceffb88edb4d941c170', ref: (el) => (this.backgroundContentEl = el), id: "background-content", part: "background" }), fixedSlotPlacement === 'before' ? h("slot", { name: "fixed" }) : null, h("div", { key: '2fdfcbc39fb66f11b6191911f2941c660f4c12e5', class: {
+            } }, inheritedAttributes), h("div", { key: 'b735ec68c18c0b99c3595bb194029830e6542cde', ref: (el) => (this.backgroundContentEl = el), id: "background-content", part: "background" }), fixedSlotPlacement === 'before' ? h("slot", { name: "fixed" }) : null, h("div", { key: 'e76c00d030342d44ade6648c3f9e32ca990787ba', 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: '6bc77e0054ec8e21635a7f2abfe0ca46e0962e03' })), 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: '9049be4cea9b5da5ec1e1012248b05286fddeb7a' })), 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"; }

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

@@ -7,7 +7,7 @@ import { clamp, getElementRoot, raf } from "../../../utils/helpers";
 import { FOCUS_TRAP_DISABLE_CLASS } from "../../../utils/overlays";
 import { getBackdropValueForSheet } from "../utils";
 import { calculateSpringStep, handleCanDismiss } from "./utils";
-export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange) => {
+export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange, onGestureMove) => {
     // Defaults for the sheet swipe animation
     const defaultBackdrop = [
         { offset: 0, opacity: 'var(--backdrop-opacity)' },
@@ -338,6 +338,8 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
             : step;
         offset = clamp(0.0001, processedStep, maxStep);
         animation.progressStep(offset);
+        // Notify modal of position change for safe-area updates
+        onGestureMove === null || onGestureMove === void 0 ? void 0 : onGestureMove();
     };
     const onEnd = (detail) => {
         /**

package/dist/collection/components/modal/gestures/swipe-to-close.js

@@ -12,7 +12,7 @@ import { calculateSpringStep, handleCanDismiss } from "./utils";
 export const SwipeToCloseDefaults = {
     MIN_PRESENTING_SCALE: 0.915,
 };
-export const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss) => {
+export const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismiss, onGestureMove) => {
     /**
      * The step value at which a card modal
      * is eligible for dismissing via gesture.
@@ -169,6 +169,8 @@ export const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismi
         const processedStep = isAttemptingDismissWithCanDismiss ? calculateSpringStep(step / maxStep) : step;
         const clampedStep = clamp(0.0001, processedStep, maxStep);
         animation.progressStep(clampedStep);
+        // Notify modal of position change for safe-area updates
+        onGestureMove === null || onGestureMove === void 0 ? void 0 : onGestureMove();
         /**
          * When swiping down half way, the status bar style
          * should be reset to its default value.

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

@@ -135,10 +135,6 @@ ion-backdrop {
   :host {
     --width: 600px;
     --height: 500px;
-    --ion-safe-area-top: 0px;
-    --ion-safe-area-bottom: 0px;
-    --ion-safe-area-right: 0px;
-    --ion-safe-area-left: 0px;
   }
 }
 @media only screen and (min-width: 768px) and (min-height: 768px) {

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

@@ -2,6 +2,7 @@
  * (C) Ionic http://ionicframework.com - MIT License
  */
 import { Host, h, writeTask } from "@stencil/core";
+import { win } from "../../utils/browser/index";
 import { findIonContent, printIonContentErrorMsg } from "../../utils/content/index";
 import { CoreDelegate, attachComponent, detachComponent } from "../../utils/framework-delegate";
 import { raf, inheritAttributes, hasLazyBuild, getElementRoot } from "../../utils/helpers";
@@ -42,6 +43,10 @@ export class Modal {
         this.inline = false;
         // Whether or not modal is being dismissed via gesture
         this.gestureAnimationDismissing = false;
+        // Whether to skip coordinate-based safe-area detection (for fullscreen phone modals)
+        this.skipSafeAreaCoordinateDetection = false;
+        // Track previous safe-area state to avoid redundant DOM writes
+        this.prevSafeAreaState = { top: false, bottom: false, left: false, right: false };
         this.presented = false;
         /** @internal */
         this.hasController = false;
@@ -232,7 +237,10 @@ export class Modal {
         }
     }
     onWindowResize() {
-        // Only handle resize for iOS card modals when no custom animations are provided
+        // Invalidate safe-area cache on resize (device rotation may change values)
+        this.cachedSafeAreas = undefined;
+        this.updateSafeAreaOverrides();
+        // Only handle view transition for iOS card modals when no custom animations are provided
         if (getIonMode(this) !== 'ios' || !this.presentingElement || this.enterAnimation || this.leaveAnimation) {
             return;
         }
@@ -255,6 +263,8 @@ export class Modal {
         this.triggerController.removeClickListener();
         this.cleanupViewTransitionListener();
         this.cleanupParentRemovalObserver();
+        // Reset safe-area state to handle removal without dismiss (e.g., framework unmount)
+        this.resetSafeAreaState();
     }
     componentWillLoad() {
         var _a;
@@ -414,6 +424,8 @@ export class Modal {
         else if (!this.keepContentsMounted) {
             await waitForMount();
         }
+        // Predict safe-area needs based on modal configuration to avoid visual snap
+        this.setInitialSafeAreaOverrides(presentingElement);
         writeTask(() => this.el.classList.add('show-modal'));
         const hasCardModal = presentingElement !== undefined;
         /**
@@ -475,6 +487,8 @@ export class Modal {
         else if (hasCardModal) {
             this.initSwipeToClose();
         }
+        // Now that animation is complete, update safe-area based on actual position
+        this.updateSafeAreaOverrides();
         // Initialize view transition listener for iOS card modals
         this.initViewTransitionListener();
         // Initialize parent removal observer
@@ -526,7 +540,7 @@ export class Modal {
                 await this.dismiss(undefined, GESTURE);
                 this.gestureAnimationDismissing = false;
             });
-        });
+        }, () => this.updateSafeAreaOverrides());
         this.gesture.enable(true);
     }
     initSheetGesture() {
@@ -547,7 +561,8 @@ export class Modal {
                 this.currentBreakpoint = breakpoint;
                 this.ionBreakpointDidChange.emit({ breakpoint });
             }
-        });
+            this.updateSafeAreaOverrides();
+        }, () => this.updateSafeAreaOverrides());
         this.gesture = gesture;
         this.moveSheetToBreakpoint = moveSheetToBreakpoint;
         this.gesture.enable(true);
@@ -625,6 +640,187 @@ export class Modal {
         // Clear the cached reference
         this.cachedPageParent = undefined;
     }
+    /**
+     * Sets initial safe-area overrides based on modal configuration before
+     * the modal becomes visible. This predicts whether the modal will touch
+     * screen edges to avoid a visual snap after animation completes.
+     */
+    setInitialSafeAreaOverrides(presentingElement) {
+        const style = this.el.style;
+        const mode = getIonMode(this);
+        const isSheetModal = this.breakpoints !== undefined && this.initialBreakpoint !== undefined;
+        // Card modals only exist in iOS mode - in MD mode, presentingElement is ignored
+        const isCardModal = presentingElement !== undefined && mode === 'ios';
+        const isTablet = window.innerWidth >= 768;
+        // Sheet modals always touch bottom edge, never top/left/right
+        if (isSheetModal) {
+            style.setProperty('--ion-safe-area-top', '0px');
+            style.setProperty('--ion-safe-area-left', '0px');
+            style.setProperty('--ion-safe-area-right', '0px');
+            return;
+        }
+        // Card modals have rounded top corners
+        if (isCardModal) {
+            style.setProperty('--ion-safe-area-top', '0px');
+            if (isTablet) {
+                // On tablets, card modals are inset from all edges
+                this.zeroAllSafeAreas();
+            }
+            else {
+                // On phones, card modals still extend to the bottom edge
+                style.setProperty('--ion-safe-area-left', '0px');
+                style.setProperty('--ion-safe-area-right', '0px');
+                this.applyFullscreenSafeArea();
+            }
+            return;
+        }
+        // Phone-sized fullscreen modals inherit safe areas and use wrapper padding
+        if (!isTablet) {
+            this.applyFullscreenSafeArea();
+            return;
+        }
+        // Check if tablet modal is fullscreen via CSS custom properties
+        const computedStyle = getComputedStyle(this.el);
+        const width = computedStyle.getPropertyValue('--width').trim();
+        const height = computedStyle.getPropertyValue('--height').trim();
+        const isFullscreen = width === '100%' && height === '100%';
+        if (isFullscreen) {
+            this.applyFullscreenSafeArea();
+        }
+        else {
+            // Centered dialog doesn't touch edges
+            this.zeroAllSafeAreas();
+        }
+    }
+    /**
+     * Applies safe-area handling for fullscreen modals.
+     * Adds wrapper padding when no footer is present to prevent
+     * content from overlapping system navigation areas.
+     */
+    applyFullscreenSafeArea() {
+        this.skipSafeAreaCoordinateDetection = true;
+        this.updateFooterPadding();
+        // Watch for dynamic footer additions/removals (e.g., async data loading)
+        // Use subtree:true to support wrapped footers in framework components
+        // (e.g., <my-footer><ion-footer>...</ion-footer></my-footer>)
+        if (!this.footerObserver && win !== undefined && 'MutationObserver' in win) {
+            this.footerObserver = new MutationObserver(() => this.updateFooterPadding());
+            this.footerObserver.observe(this.el, { childList: true, subtree: true });
+        }
+    }
+    /**
+     * Updates wrapper padding based on footer presence.
+     * Called initially and when footer is dynamically added/removed.
+     */
+    updateFooterPadding() {
+        if (!this.wrapperEl)
+            return;
+        const hasFooter = this.el.querySelector('ion-footer') !== null;
+        if (hasFooter) {
+            this.wrapperEl.style.removeProperty('padding-bottom');
+            this.wrapperEl.style.removeProperty('box-sizing');
+        }
+        else {
+            this.wrapperEl.style.setProperty('padding-bottom', 'var(--ion-safe-area-bottom, 0px)');
+            this.wrapperEl.style.setProperty('box-sizing', 'border-box');
+        }
+    }
+    /**
+     * Sets all safe-area CSS variables to 0px for modals that
+     * don't touch screen edges.
+     */
+    zeroAllSafeAreas() {
+        const style = this.el.style;
+        style.setProperty('--ion-safe-area-top', '0px');
+        style.setProperty('--ion-safe-area-bottom', '0px');
+        style.setProperty('--ion-safe-area-left', '0px');
+        style.setProperty('--ion-safe-area-right', '0px');
+    }
+    /**
+     * Resets all safe-area related state and styles.
+     * Called during dismiss and disconnectedCallback to ensure clean state
+     * for re-presentation of inline modals.
+     */
+    resetSafeAreaState() {
+        var _a;
+        this.skipSafeAreaCoordinateDetection = false;
+        this.cachedSafeAreas = undefined;
+        this.prevSafeAreaState = { top: false, bottom: false, left: false, right: false };
+        (_a = this.footerObserver) === null || _a === void 0 ? void 0 : _a.disconnect();
+        this.footerObserver = undefined;
+        // Clear wrapper styles that may have been set for safe-area handling
+        if (this.wrapperEl) {
+            this.wrapperEl.style.removeProperty('padding-bottom');
+            this.wrapperEl.style.removeProperty('box-sizing');
+        }
+        // Clear safe-area CSS variable overrides
+        const style = this.el.style;
+        style.removeProperty('--ion-safe-area-top');
+        style.removeProperty('--ion-safe-area-bottom');
+        style.removeProperty('--ion-safe-area-left');
+        style.removeProperty('--ion-safe-area-right');
+    }
+    /**
+     * Gets the root safe-area values from the document element.
+     * Uses cached values during gestures to avoid getComputedStyle calls.
+     */
+    getSafeAreaValues() {
+        if (!this.cachedSafeAreas) {
+            const rootStyle = getComputedStyle(document.documentElement);
+            this.cachedSafeAreas = {
+                top: parseFloat(rootStyle.getPropertyValue('--ion-safe-area-top')) || 0,
+                bottom: parseFloat(rootStyle.getPropertyValue('--ion-safe-area-bottom')) || 0,
+                left: parseFloat(rootStyle.getPropertyValue('--ion-safe-area-left')) || 0,
+                right: parseFloat(rootStyle.getPropertyValue('--ion-safe-area-right')) || 0,
+            };
+        }
+        return this.cachedSafeAreas;
+    }
+    /**
+     * Updates safe-area CSS variable overrides based on whether the modal
+     * extends into each safe-area region. Called after animation
+     * and during gestures to handle dynamic position changes.
+     *
+     * Optimized to avoid redundant DOM writes by tracking previous state.
+     */
+    updateSafeAreaOverrides() {
+        if (this.skipSafeAreaCoordinateDetection) {
+            return;
+        }
+        const wrapper = this.wrapperEl;
+        if (!wrapper) {
+            return;
+        }
+        const rect = wrapper.getBoundingClientRect();
+        const safeAreas = this.getSafeAreaValues();
+        const extendsIntoTop = rect.top < safeAreas.top;
+        const extendsIntoBottom = rect.bottom > window.innerHeight - safeAreas.bottom;
+        const extendsIntoLeft = rect.left < safeAreas.left;
+        const extendsIntoRight = rect.right > window.innerWidth - safeAreas.right;
+        // Only update DOM when state actually changes
+        const prev = this.prevSafeAreaState;
+        const style = this.el.style;
+        if (extendsIntoTop !== prev.top) {
+            extendsIntoTop ? style.removeProperty('--ion-safe-area-top') : style.setProperty('--ion-safe-area-top', '0px');
+            prev.top = extendsIntoTop;
+        }
+        if (extendsIntoBottom !== prev.bottom) {
+            extendsIntoBottom
+                ? style.removeProperty('--ion-safe-area-bottom')
+                : style.setProperty('--ion-safe-area-bottom', '0px');
+            prev.bottom = extendsIntoBottom;
+        }
+        if (extendsIntoLeft !== prev.left) {
+            extendsIntoLeft ? style.removeProperty('--ion-safe-area-left') : style.setProperty('--ion-safe-area-left', '0px');
+            prev.left = extendsIntoLeft;
+        }
+        if (extendsIntoRight !== prev.right) {
+            extendsIntoRight
+                ? style.removeProperty('--ion-safe-area-right')
+                : style.setProperty('--ion-safe-area-right', '0px');
+            prev.right = extendsIntoRight;
+        }
+    }
     sheetOnDismiss() {
         /**
          * While the gesture animation is finishing
@@ -717,6 +913,8 @@ export class Modal {
         }
         this.currentBreakpoint = undefined;
         this.animation = undefined;
+        // Reset safe-area state for potential re-presentation
+        this.resetSafeAreaState();
         unlock();
         return dismissed;
     }
@@ -974,20 +1172,20 @@ export class Modal {
         const isCardModal = presentingElement !== undefined && mode === 'ios';
         const isHandleCycle = handleBehavior === 'cycle';
         const isSheetModalWithHandle = isSheetModal && showHandle;
-        return (h(Host, Object.assign({ key: '87328006ea6c75ebc518ace300438492a567223e', "no-router": true,
+        return (h(Host, Object.assign({ key: '44022099fcaf047b97d1c2cb45b9b51c930e707c', "no-router": true,
             // Allow the modal to be navigable when the handle is focusable
             tabIndex: isHandleCycle && isSheetModalWithHandle ? 0 : -1 }, htmlAttributes, { style: {
                 zIndex: `${20000 + this.overlayIndex}`,
-            }, class: Object.assign({ [mode]: true, ['modal-default']: !isCardModal && !isSheetModal, [`modal-card`]: isCardModal, [`modal-sheet`]: isSheetModal, [`modal-no-expand-scroll`]: isSheetModal && !expandToScroll, 'overlay-hidden': true, [FOCUS_TRAP_DISABLE_CLASS]: focusTrap === false }, getClassMap(this.cssClass)), onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }), h("ion-backdrop", { key: 'ee94ff8e09b691dd4ad4e4db1720f06bc3c5a469', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: 'bffd69b4635c22d9f249725bd952c1e93d5615c7', class: "modal-shadow" }), h("div", Object.assign({ key: '1d394d3c68916e464ff1fbf5242419f4a3d3cca1',
+            }, 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: 'ddd7e4f6eef51ac1f62ac70e0af10fb01e707f07', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: '58620980e3e4ec273c6787bde026e1c010b904b7', class: "modal-shadow" }), h("div", Object.assign({ key: '3fb7f6218644ba898fc504467775593eb89426a0',
             /*
               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
             */
-            role: "dialog" }, inheritedAttributes, { "aria-modal": "true", class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }), showHandle && (h("button", { key: '2dcf58792018e557e0c323baad2d672bc99c0bb1', class: "modal-handle",
+            role: "dialog" }, inheritedAttributes, { "aria-modal": "true", class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }), showHandle && (h("button", { key: '9745cd590fdaa9d023a14b487ec2c87ddbafd7f7', 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: '44164b1e8710c3895400ad9f44ecd99873874ad5', 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: 'b9a8b5d2d3d3c9b06f99179f496c9f08907d0bad', onSlotchange: this.onSlotChange }))));
     }
     static get is() { return "ion-modal"; }
     static get encapsulation() { return "shadow"; }

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

@@ -135,10 +135,6 @@ ion-backdrop {
   :host {
     --width: 600px;
     --height: 500px;
-    --ion-safe-area-top: 0px;
-    --ion-safe-area-bottom: 0px;
-    --ion-safe-area-right: 0px;
-    --ion-safe-area-left: 0px;
   }
 }
 @media only screen and (min-width: 768px) and (min-height: 768px) {

package/dist/collection/components/popover/animations/ios.enter.js

@@ -31,7 +31,7 @@ export const iosEnterAnimation = (baseEl, opts) => {
     const results = getPopoverPosition(isRTL, contentWidth, contentHeight, arrowWidth, arrowHeight, reference, side, align, defaultPosition, trigger, ev);
     const padding = size === 'cover' ? 0 : POPOVER_IOS_BODY_PADDING;
     const margin = size === 'cover' ? 0 : 25;
-    const { originX, originY, top, left, bottom, checkSafeAreaLeft, checkSafeAreaRight, arrowTop, arrowLeft, addPopoverBottomClass, } = calculateWindowAdjustment(side, results.top, results.left, padding, bodyWidth, bodyHeight, contentWidth, contentHeight, margin, results.originX, results.originY, results.referenceCoordinates, results.arrowTop, results.arrowLeft, arrowHeight);
+    const { originX, originY, top, left, bottom, checkSafeAreaTop, checkSafeAreaBottom, checkSafeAreaLeft, checkSafeAreaRight, arrowTop, arrowLeft, addPopoverBottomClass, } = calculateWindowAdjustment(side, results.top, results.left, padding, bodyWidth, bodyHeight, contentWidth, contentHeight, margin, results.originX, results.originY, results.referenceCoordinates, results.arrowTop, results.arrowLeft, arrowHeight);
     const baseAnimation = createAnimation();
     const backdropAnimation = createAnimation();
     const contentAnimation = createAnimation();
@@ -61,19 +61,35 @@ export const iosEnterAnimation = (baseEl, opts) => {
         if (addPopoverBottomClass) {
             baseEl.classList.add('popover-bottom');
         }
-        if (bottom !== undefined) {
-            contentEl.style.setProperty('bottom', `${bottom}px`);
-        }
+        /**
+         * Safe area CSS variable adjustments.
+         * When the popover is positioned near an edge, we add the corresponding
+         * safe-area inset to ensure the popover doesn't overlap with system UI
+         * (status bars, home indicators, navigation bars on Android API 36+, etc.)
+         */
+        const safeAreaTop = ' + var(--ion-safe-area-top, 0)';
+        const safeAreaBottom = ' + var(--ion-safe-area-bottom, 0)';
         const safeAreaLeft = ' + var(--ion-safe-area-left, 0)';
         const safeAreaRight = ' - var(--ion-safe-area-right, 0)';
+        let topValue = `${top}px`;
+        let bottomValue = bottom !== undefined ? `${bottom}px` : undefined;
         let leftValue = `${left}px`;
+        if (checkSafeAreaTop) {
+            topValue = `${top}px${safeAreaTop}`;
+        }
+        if (checkSafeAreaBottom && bottomValue !== undefined) {
+            bottomValue = `${bottom}px${safeAreaBottom}`;
+        }
         if (checkSafeAreaLeft) {
             leftValue = `${left}px${safeAreaLeft}`;
         }
         if (checkSafeAreaRight) {
             leftValue = `${left}px${safeAreaRight}`;
         }
-        contentEl.style.setProperty('top', `calc(${top}px + var(--offset-y, 0))`);
+        if (bottomValue !== undefined) {
+            contentEl.style.setProperty('bottom', `calc(${bottomValue})`);
+        }
+        contentEl.style.setProperty('top', `calc(${topValue} + var(--offset-y, 0))`);
         contentEl.style.setProperty('left', `calc(${leftValue} + var(--offset-x, 0))`);
         contentEl.style.setProperty('transform-origin', `${originY} ${originX}`);
         if (arrowEl !== null) {

package/dist/collection/components/popover/animations/md.enter.js

@@ -28,7 +28,32 @@ export const mdEnterAnimation = (baseEl, opts) => {
     };
     const results = getPopoverPosition(isRTL, contentWidth, contentHeight, 0, 0, reference, side, align, defaultPosition, trigger, ev);
     const padding = size === 'cover' ? 0 : POPOVER_MD_BODY_PADDING;
-    const { originX, originY, top, left, bottom } = calculateWindowAdjustment(side, results.top, results.left, padding, bodyWidth, bodyHeight, contentWidth, contentHeight, 0, results.originX, results.originY, results.referenceCoordinates);
+    const { originX, originY, top, left, bottom, checkSafeAreaTop, checkSafeAreaBottom, checkSafeAreaLeft, checkSafeAreaRight, } = calculateWindowAdjustment(side, results.top, results.left, padding, bodyWidth, bodyHeight, contentWidth, contentHeight, 0, results.originX, results.originY, results.referenceCoordinates);
+    /**
+     * Safe area CSS variable adjustments.
+     * When the popover is positioned near an edge, we add the corresponding
+     * safe-area inset to ensure the popover doesn't overlap with system UI
+     * (status bars, home indicators, navigation bars on Android API 36+, etc.)
+     */
+    const safeAreaTop = ' + var(--ion-safe-area-top, 0)';
+    const safeAreaBottom = ' + var(--ion-safe-area-bottom, 0)';
+    const safeAreaLeft = ' + var(--ion-safe-area-left, 0)';
+    const safeAreaRight = ' - var(--ion-safe-area-right, 0)';
+    let topValue = `${top}px`;
+    let bottomValue = bottom !== undefined ? `${bottom}px` : undefined;
+    let leftValue = `${left}px`;
+    if (checkSafeAreaTop) {
+        topValue = `${top}px${safeAreaTop}`;
+    }
+    if (checkSafeAreaBottom && bottomValue !== undefined) {
+        bottomValue = `${bottom}px${safeAreaBottom}`;
+    }
+    if (checkSafeAreaLeft) {
+        leftValue = `${left}px${safeAreaLeft}`;
+    }
+    if (checkSafeAreaRight) {
+        leftValue = `${left}px${safeAreaRight}`;
+    }
     const baseAnimation = createAnimation();
     const backdropAnimation = createAnimation();
     const wrapperAnimation = createAnimation();
@@ -45,13 +70,13 @@ export const mdEnterAnimation = (baseEl, opts) => {
     contentAnimation
         .addElement(contentEl)
         .beforeStyles({
-        top: `calc(${top}px + var(--offset-y, 0px))`,
-        left: `calc(${left}px + var(--offset-x, 0px))`,
+        top: `calc(${topValue} + var(--offset-y, 0px))`,
+        left: `calc(${leftValue} + var(--offset-x, 0px))`,
         'transform-origin': `${originY} ${originX}`,
     })
         .beforeAddWrite(() => {
-        if (bottom !== undefined) {
-            contentEl.style.setProperty('bottom', `${bottom}px`);
+        if (bottomValue !== undefined) {
+            contentEl.style.setProperty('bottom', `calc(${bottomValue})`);
         }
     })
         .fromTo('transform', 'scale(0.8)', 'scale(1)');