@ionic/core 8.7.17-dev.11767717752.14fe98a4 → 8.7.17-dev.11767891829.1a63afa3

package/hydrate/index.js

@@ -10583,7 +10583,11 @@ 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();
         /**
@@ -10616,21 +10620,48 @@ 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();
+                };
                 closestTabs.addEventListener('ionTabBarLoaded', this.tabsLoadCallback);
             }
         }
     }
     /**
-     * Detects sibling ion-header and ion-footer elements.
-     * When these are absent, content needs to handle safe-area padding directly.
+     * Detects sibling ion-header and ion-footer elements and sets up
+     * a mutation observer to handle dynamic changes (e.g., conditional rendering).
      */
     detectSiblingElements() {
-        // Check parent element for sibling header/footer.
+        this.updateSiblingDetection();
+        // Watch for dynamic header/footer changes (common in React conditional rendering)
+        const parent = this.el.parentElement;
+        if (parent && !this.parentMutationObserver && win$1 !== undefined && 'MutationObserver' in win$1) {
+            this.parentMutationObserver = new MutationObserver(() => {
+                this.updateSiblingDetection();
+            });
+            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) {
@@ -10640,8 +10671,28 @@ class Content {
             }
         }
     }
+    /**
+     * 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
@@ -10876,7 +10927,7 @@ class Content {
         const forceOverscroll = this.shouldForceOverscroll();
         const transitionShadow = mode === 'ios';
         this.resize();
-        return (hAsync(Host, Object.assign({ key: '83665c0e35e4f4117709606e47d27ad36e343458', role: isMainContent ? 'main' : undefined, class: createColorClasses$1(this.color, {
+        return (hAsync(Host, Object.assign({ key: 'f7218f733e4022a30875441bd949747537d28aa1', role: isMainContent ? 'main' : undefined, class: createColorClasses$1(this.color, {
                 [mode]: true,
                 'content-sizing': hostContext('ion-popover', this.el),
                 overscroll: forceOverscroll,
@@ -10886,12 +10937,12 @@ class Content {
             }), style: {
                 '--offset-top': `${this.cTop}px`,
                 '--offset-bottom': `${this.cBottom}px`,
-            } }, inheritedAttributes), hAsync("div", { key: '75d7cf9315bc8dfb150c3b5bcc356a1f9c793b5a', ref: (el) => (this.backgroundContentEl = el), id: "background-content", part: "background" }), fixedSlotPlacement === 'before' ? hAsync("slot", { name: "fixed" }) : null, hAsync("div", { key: 'f68bc5843c93ed6f32e998b80c5edc553c77a2d7', class: {
+            } }, inheritedAttributes), hAsync("div", { key: 'b735ec68c18c0b99c3595bb194029830e6542cde', ref: (el) => (this.backgroundContentEl = el), id: "background-content", part: "background" }), fixedSlotPlacement === 'before' ? hAsync("slot", { name: "fixed" }) : null, hAsync("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" }, hAsync("slot", { key: '8d4b2be00f036f6a24bfa65e6324ca715dd93b60' })), transitionShadow ? (hAsync("div", { class: "transition-effect" }, hAsync("div", { class: "transition-cover" }), hAsync("div", { class: "transition-shadow" }))) : null, fixedSlotPlacement === 'after' ? hAsync("slot", { name: "fixed" }) : null));
+            }, ref: (scrollEl) => (this.scrollEl = scrollEl), onScroll: this.scrollEvents ? (ev) => this.onScroll(ev) : undefined, part: "scroll" }, hAsync("slot", { key: '9049be4cea9b5da5ec1e1012248b05286fddeb7a' })), transitionShadow ? (hAsync("div", { class: "transition-effect" }, hAsync("div", { class: "transition-cover" }), hAsync("div", { class: "transition-shadow" }))) : null, fixedSlotPlacement === 'after' ? hAsync("slot", { name: "fixed" }) : null));
     }
     get el() { return getElement(this); }
     static get style() { return contentCss; }
@@ -22828,6 +22879,8 @@ class Modal {
         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;
@@ -23018,7 +23071,8 @@ class Modal {
         }
     }
     onWindowResize() {
-        // Update safe-area overrides for all modal types on resize
+        // 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$1(this) !== 'ios' || !this.presentingElement || this.enterAnimation || this.leaveAnimation) {
@@ -23043,6 +23097,8 @@ 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;
@@ -23477,8 +23533,28 @@ class Modal {
      */
     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$1 !== undefined && 'MutationObserver' in win$1) {
+            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) {
+        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');
         }
@@ -23495,22 +23571,51 @@ class Modal {
         style.setProperty('--ion-safe-area-right', '0px');
     }
     /**
-     * Gets the root safe-area values from the document element.
-     * These represent the actual device safe areas before any overlay overrides.
+     * Resets all safe-area related state and styles.
+     * Called during dismiss and disconnectedCallback to ensure clean state
+     * for re-presentation of inline modals.
      */
-    getRootSafeAreaValues() {
-        const rootStyle = getComputedStyle(document.documentElement);
-        return {
-            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,
-        };
+    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) {
@@ -23521,20 +23626,34 @@ class Modal {
             return;
         }
         const rect = wrapper.getBoundingClientRect();
-        const safeAreas = this.getRootSafeAreaValues();
+        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;
-        extendsIntoTop ? style.removeProperty('--ion-safe-area-top') : style.setProperty('--ion-safe-area-top', '0px');
-        extendsIntoBottom
-            ? style.removeProperty('--ion-safe-area-bottom')
-            : style.setProperty('--ion-safe-area-bottom', '0px');
-        extendsIntoLeft ? style.removeProperty('--ion-safe-area-left') : style.setProperty('--ion-safe-area-left', '0px');
-        extendsIntoRight
-            ? style.removeProperty('--ion-safe-area-right')
-            : style.setProperty('--ion-safe-area-right', '0px');
+        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() {
         /**
@@ -23628,8 +23747,8 @@ class Modal {
         }
         this.currentBreakpoint = undefined;
         this.animation = undefined;
-        // Reset safe-area detection flag for potential re-presentation
-        this.skipSafeAreaCoordinateDetection = false;
+        // Reset safe-area state for potential re-presentation
+        this.resetSafeAreaState();
         unlock();
         return dismissed;
     }
@@ -23879,20 +23998,20 @@ class Modal {
         const isCardModal = presentingElement !== undefined && mode === 'ios';
         const isHandleCycle = handleBehavior === 'cycle';
         const isSheetModalWithHandle = isSheetModal && showHandle;
-        return (hAsync(Host, Object.assign({ key: '07ebca6a70eb99f8a2236e1d66a03097a7bb67d8', "no-router": true,
+        return (hAsync(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 }), hAsync("ion-backdrop", { key: '1b6850d9b9f6e8f3865b49e0a14399e2ef43a5d6', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && hAsync("div", { key: 'eab52c0ebccb820781e92392dc6fa90db93525d5', class: "modal-shadow" }), hAsync("div", Object.assign({ key: 'ab9448cabdf03a633319999771ce1ca1edce5699',
+            }, 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 }), hAsync("ion-backdrop", { key: 'ddd7e4f6eef51ac1f62ac70e0af10fb01e707f07', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && hAsync("div", { key: '58620980e3e4ec273c6787bde026e1c010b904b7', class: "modal-shadow" }), hAsync("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 && (hAsync("button", { key: 'b2b8c0a8d8add0d43e928dd3d3519f184551e62b', class: "modal-handle",
+            role: "dialog" }, inheritedAttributes, { "aria-modal": "true", class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }), showHandle && (hAsync("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) })), hAsync("slot", { key: 'b994f206765f7b340971d378f00999c0da334102', 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) })), hAsync("slot", { key: 'b9a8b5d2d3d3c9b06f99179f496c9f08907d0bad', onSlotchange: this.onSlotChange }))));
     }
     get el() { return getElement(this); }
     static get watchers() { return {
@@ -27758,7 +27877,7 @@ const mdEnterAnimation$1 = (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, checkSafeAreaTop, checkSafeAreaBottom } = 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
@@ -27767,14 +27886,23 @@ const mdEnterAnimation$1 = (baseEl, opts) => {
      */
     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();
@@ -27792,7 +27920,7 @@ const mdEnterAnimation$1 = (baseEl, opts) => {
         .addElement(contentEl)
         .beforeStyles({
         top: `calc(${topValue} + var(--offset-y, 0px))`,
-        left: `calc(${left}px + var(--offset-x, 0px))`,
+        left: `calc(${leftValue} + var(--offset-x, 0px))`,
         'transform-origin': `${originY} ${originX}`,
     })
         .beforeAddWrite(() => {