@ionic/core 8.6.4-nightly.20250708 → 8.6.4

package/components/modal.js

@@ -587,7 +587,7 @@ const iosEnterAnimation = (baseEl, opts) => {
         baseAnimation.addAnimation(contentAnimation);
     }
     if (presentingEl) {
-        const isMobile = window.innerWidth < 768;
+        const isPortrait = window.innerWidth < 768;
         const hasCardModal = presentingEl.tagName === 'ION-MODAL' && presentingEl.presentingElement !== undefined;
         const presentingElRoot = getElementRoot(presentingEl);
         const presentingAnimation = createAnimation().beforeStyles({
@@ -596,7 +596,7 @@ const iosEnterAnimation = (baseEl, opts) => {
             overflow: 'hidden',
         });
         const bodyEl = document.body;
-        if (isMobile) {
+        if (isPortrait) {
             /**
              * Fallback for browsers that does not support `max()` (ex: Firefox)
              * No need to worry about statusbar padding since engines like Gecko
@@ -674,7 +674,7 @@ const iosLeaveAnimation = (baseEl, opts, duration = 500) => {
         .duration(duration)
         .addAnimation(wrapperAnimation);
     if (presentingEl) {
-        const isMobile = window.innerWidth < 768;
+        const isPortrait = window.innerWidth < 768;
         const hasCardModal = presentingEl.tagName === 'ION-MODAL' && presentingEl.presentingElement !== undefined;
         const presentingElRoot = getElementRoot(presentingEl);
         const presentingAnimation = createAnimation()
@@ -692,7 +692,7 @@ const iosLeaveAnimation = (baseEl, opts, duration = 500) => {
             }
         });
         const bodyEl = document.body;
-        if (isMobile) {
+        if (isPortrait) {
             const transformOffset = !CSS.supports('width', 'max(0px, 1px)') ? '30px' : 'max(30px, var(--ion-safe-area-top))';
             const modalTransform = hasCardModal ? '-10px' : transformOffset;
             const toPresentingScale = SwipeToCloseDefaults.MIN_PRESENTING_SCALE;
@@ -739,6 +739,163 @@ const iosLeaveAnimation = (baseEl, opts, duration = 500) => {
     return baseAnimation;
 };
 
+/**
+ * Transition animation from portrait view to landscape view
+ * This handles the case where a card modal is open in portrait view
+ * and the user switches to landscape view
+ */
+const portraitToLandscapeTransition = (baseEl, opts, duration = 300) => {
+    const { presentingEl } = opts;
+    if (!presentingEl) {
+        // No transition needed for non-card modals
+        return createAnimation('portrait-to-landscape-transition');
+    }
+    const presentingElIsCardModal = presentingEl.tagName === 'ION-MODAL' && presentingEl.presentingElement !== undefined;
+    const presentingElRoot = getElementRoot(presentingEl);
+    const bodyEl = document.body;
+    const baseAnimation = createAnimation('portrait-to-landscape-transition')
+        .addElement(baseEl)
+        .easing('cubic-bezier(0.32,0.72,0,1)')
+        .duration(duration);
+    const presentingAnimation = createAnimation().beforeStyles({
+        transform: 'translateY(0)',
+        'transform-origin': 'top center',
+        overflow: 'hidden',
+    });
+    if (!presentingElIsCardModal) {
+        // The presenting element is not a card modal, so we do not
+        // need to care about layering and modal-specific styles.
+        const root = getElementRoot(baseEl);
+        const wrapperAnimation = createAnimation()
+            .addElement(root.querySelectorAll('.modal-wrapper, .modal-shadow'))
+            .fromTo('opacity', '1', '1'); // Keep wrapper visible in landscape
+        const backdropAnimation = createAnimation()
+            .addElement(root.querySelector('ion-backdrop'))
+            .fromTo('opacity', 'var(--backdrop-opacity)', 'var(--backdrop-opacity)'); // Keep backdrop visible
+        // Animate presentingEl from portrait state back to normal
+        const transformOffset = !CSS.supports('width', 'max(0px, 1px)') ? '30px' : 'max(30px, var(--ion-safe-area-top))';
+        const toPresentingScale = SwipeToCloseDefaults.MIN_PRESENTING_SCALE;
+        const fromTransform = `translateY(${transformOffset}) scale(${toPresentingScale})`;
+        presentingAnimation
+            .addElement(presentingEl)
+            .afterStyles({
+            transform: 'translateY(0px) scale(1)',
+            'border-radius': '0px',
+        })
+            .beforeAddWrite(() => bodyEl.style.setProperty('background-color', ''))
+            .fromTo('transform', fromTransform, 'translateY(0px) scale(1)')
+            .fromTo('filter', 'contrast(0.85)', 'contrast(1)')
+            .fromTo('border-radius', '10px 10px 0 0', '0px');
+        baseAnimation.addAnimation([presentingAnimation, wrapperAnimation, backdropAnimation]);
+    }
+    else {
+        // The presenting element is a card modal, so we do
+        // need to care about layering and modal-specific styles.
+        const toPresentingScale = SwipeToCloseDefaults.MIN_PRESENTING_SCALE;
+        const fromTransform = `translateY(-10px) scale(${toPresentingScale})`;
+        const toTransform = `translateY(-10px) scale(${toPresentingScale})`;
+        presentingAnimation
+            .addElement(presentingElRoot.querySelector('.modal-wrapper'))
+            .afterStyles({
+            transform: toTransform,
+        })
+            .fromTo('transform', fromTransform, toTransform)
+            .fromTo('filter', 'contrast(0.85)', 'contrast(0.85)'); // Keep same contrast for card
+        const shadowAnimation = createAnimation()
+            .addElement(presentingElRoot.querySelector('.modal-shadow'))
+            .afterStyles({
+            transform: toTransform,
+        })
+            .fromTo('opacity', '0', '0') // Shadow stays hidden in landscape for card modals
+            .fromTo('transform', fromTransform, toTransform);
+        baseAnimation.addAnimation([presentingAnimation, shadowAnimation]);
+    }
+    return baseAnimation;
+};
+/**
+ * Transition animation from landscape view to portrait view
+ * This handles the case where a card modal is open in landscape view
+ * and the user switches to portrait view
+ */
+const landscapeToPortraitTransition = (baseEl, opts, duration = 300) => {
+    const { presentingEl } = opts;
+    if (!presentingEl) {
+        // No transition needed for non-card modals
+        return createAnimation('landscape-to-portrait-transition');
+    }
+    const presentingElIsCardModal = presentingEl.tagName === 'ION-MODAL' && presentingEl.presentingElement !== undefined;
+    const presentingElRoot = getElementRoot(presentingEl);
+    const bodyEl = document.body;
+    const baseAnimation = createAnimation('landscape-to-portrait-transition')
+        .addElement(baseEl)
+        .easing('cubic-bezier(0.32,0.72,0,1)')
+        .duration(duration);
+    const presentingAnimation = createAnimation().beforeStyles({
+        transform: 'translateY(0)',
+        'transform-origin': 'top center',
+        overflow: 'hidden',
+    });
+    if (!presentingElIsCardModal) {
+        // The presenting element is not a card modal, so we do not
+        // need to care about layering and modal-specific styles.
+        const root = getElementRoot(baseEl);
+        const wrapperAnimation = createAnimation()
+            .addElement(root.querySelectorAll('.modal-wrapper, .modal-shadow'))
+            .fromTo('opacity', '1', '1'); // Keep wrapper visible
+        const backdropAnimation = createAnimation()
+            .addElement(root.querySelector('ion-backdrop'))
+            .fromTo('opacity', 'var(--backdrop-opacity)', 'var(--backdrop-opacity)'); // Keep backdrop visible
+        // Animate presentingEl from normal state to portrait state
+        const transformOffset = !CSS.supports('width', 'max(0px, 1px)') ? '30px' : 'max(30px, var(--ion-safe-area-top))';
+        const toPresentingScale = SwipeToCloseDefaults.MIN_PRESENTING_SCALE;
+        const toTransform = `translateY(${transformOffset}) scale(${toPresentingScale})`;
+        presentingAnimation
+            .addElement(presentingEl)
+            .beforeStyles({
+            transform: 'translateY(0px) scale(1)',
+            'transform-origin': 'top center',
+            overflow: 'hidden',
+        })
+            .afterStyles({
+            transform: toTransform,
+            'border-radius': '10px 10px 0 0',
+            filter: 'contrast(0.85)',
+            overflow: 'hidden',
+            'transform-origin': 'top center',
+        })
+            .beforeAddWrite(() => bodyEl.style.setProperty('background-color', 'black'))
+            .keyframes([
+            { offset: 0, transform: 'translateY(0px) scale(1)', filter: 'contrast(1)', borderRadius: '0px' },
+            { offset: 0.2, transform: 'translateY(0px) scale(1)', filter: 'contrast(1)', borderRadius: '10px 10px 0 0' },
+            { offset: 1, transform: toTransform, filter: 'contrast(0.85)', borderRadius: '10px 10px 0 0' },
+        ]);
+        baseAnimation.addAnimation([presentingAnimation, wrapperAnimation, backdropAnimation]);
+    }
+    else {
+        // The presenting element is also a card modal, so we need
+        // to handle layering and modal-specific styles.
+        const toPresentingScale = SwipeToCloseDefaults.MIN_PRESENTING_SCALE;
+        const fromTransform = `translateY(-10px) scale(${toPresentingScale})`;
+        const toTransform = `translateY(-10px) scale(${toPresentingScale})`;
+        presentingAnimation
+            .addElement(presentingElRoot.querySelector('.modal-wrapper'))
+            .afterStyles({
+            transform: toTransform,
+        })
+            .fromTo('transform', fromTransform, toTransform)
+            .fromTo('filter', 'contrast(0.85)', 'contrast(0.85)'); // Keep same contrast for card
+        const shadowAnimation = createAnimation()
+            .addElement(presentingElRoot.querySelector('.modal-shadow'))
+            .afterStyles({
+            transform: toTransform,
+        })
+            .fromTo('opacity', '0', '0') // Shadow stays hidden
+            .fromTo('transform', fromTransform, toTransform);
+        baseAnimation.addAnimation([presentingAnimation, shadowAnimation]);
+    }
+    return baseAnimation;
+};
+
 const createEnterAnimation = () => {
     const backdropAnimation = createAnimation()
         .fromTo('opacity', 0.01, 'var(--backdrop-opacity)')
@@ -1510,6 +1667,16 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
             triggerController.addClickListener(el, trigger);
         }
     }
+    onWindowResize() {
+        // Only handle resize for iOS card modals when no custom animations are provided
+        if (getIonMode(this) !== 'ios' || !this.presentingElement || this.enterAnimation || this.leaveAnimation) {
+            return;
+        }
+        clearTimeout(this.resizeTimeout);
+        this.resizeTimeout = setTimeout(() => {
+            this.handleViewTransition();
+        }, 50); // Debounce to avoid excessive calls during active resizing
+    }
     breakpointsChanged(breakpoints) {
         if (breakpoints !== undefined) {
             this.sortedBreakpoints = breakpoints.sort((a, b) => a - b);
@@ -1522,6 +1689,7 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
     }
     disconnectedCallback() {
         this.triggerController.removeClickListener();
+        this.cleanupViewTransitionListener();
     }
     componentWillLoad() {
         var _a;
@@ -1732,6 +1900,8 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
         else if (hasCardModal) {
             this.initSwipeToClose();
         }
+        // Initialize view transition listener for iOS card modals
+        this.initViewTransitionListener();
         unlock();
     }
     initSwipeToClose() {
@@ -1885,6 +2055,7 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
             if (this.gesture) {
                 this.gesture.destroy();
             }
+            this.cleanupViewTransitionListener();
         }
         this.currentBreakpoint = undefined;
         this.animation = undefined;
@@ -1960,6 +2131,108 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
         await this.setCurrentBreakpoint(nextBreakpoint);
         return true;
     }
+    initViewTransitionListener() {
+        // Only enable for iOS card modals when no custom animations are provided
+        if (getIonMode(this) !== 'ios' || !this.presentingElement || this.enterAnimation || this.leaveAnimation) {
+            return;
+        }
+        // Set initial view state
+        this.currentViewIsPortrait = window.innerWidth < 768;
+    }
+    handleViewTransition() {
+        const isPortrait = window.innerWidth < 768;
+        // Only transition if view state actually changed
+        if (this.currentViewIsPortrait === isPortrait) {
+            return;
+        }
+        // Cancel any ongoing transition animation
+        if (this.viewTransitionAnimation) {
+            this.viewTransitionAnimation.destroy();
+            this.viewTransitionAnimation = undefined;
+        }
+        const { presentingElement } = this;
+        if (!presentingElement) {
+            return;
+        }
+        // Create transition animation
+        let transitionAnimation;
+        if (this.currentViewIsPortrait && !isPortrait) {
+            // Portrait to landscape transition
+            transitionAnimation = portraitToLandscapeTransition(this.el, {
+                presentingEl: presentingElement});
+        }
+        else {
+            // Landscape to portrait transition
+            transitionAnimation = landscapeToPortraitTransition(this.el, {
+                presentingEl: presentingElement});
+        }
+        // Update state and play animation
+        this.currentViewIsPortrait = isPortrait;
+        this.viewTransitionAnimation = transitionAnimation;
+        transitionAnimation.play().then(() => {
+            this.viewTransitionAnimation = undefined;
+            // After orientation transition, recreate the swipe-to-close gesture
+            // with updated animation that reflects the new presenting element state
+            this.reinitSwipeToClose();
+        });
+    }
+    cleanupViewTransitionListener() {
+        // Clear any pending resize timeout
+        if (this.resizeTimeout) {
+            clearTimeout(this.resizeTimeout);
+            this.resizeTimeout = undefined;
+        }
+        if (this.viewTransitionAnimation) {
+            this.viewTransitionAnimation.destroy();
+            this.viewTransitionAnimation = undefined;
+        }
+    }
+    reinitSwipeToClose() {
+        // Only reinitialize if we have a presenting element and are on iOS
+        if (getIonMode(this) !== 'ios' || !this.presentingElement) {
+            return;
+        }
+        // Clean up existing gesture and animation
+        if (this.gesture) {
+            this.gesture.destroy();
+            this.gesture = undefined;
+        }
+        if (this.animation) {
+            // Properly end the progress-based animation at initial state before destroying
+            // to avoid leaving modal in intermediate swipe position
+            this.animation.progressEnd(0, 0, 0);
+            this.animation.destroy();
+            this.animation = undefined;
+        }
+        // Force the modal back to the correct position or it could end up
+        // in a weird state after destroying the animation
+        raf(() => {
+            this.ensureCorrectModalPosition();
+            this.initSwipeToClose();
+        });
+    }
+    ensureCorrectModalPosition() {
+        const { el, presentingElement } = this;
+        const root = getElementRoot(el);
+        const wrapperEl = root.querySelector('.modal-wrapper');
+        if (wrapperEl) {
+            wrapperEl.style.transform = 'translateY(0vh)';
+            wrapperEl.style.opacity = '1';
+        }
+        if (presentingElement) {
+            const isPortrait = window.innerWidth < 768;
+            if (isPortrait) {
+                const transformOffset = !CSS.supports('width', 'max(0px, 1px)')
+                    ? '30px'
+                    : 'max(30px, var(--ion-safe-area-top))';
+                const scale = SwipeToCloseDefaults.MIN_PRESENTING_SCALE;
+                presentingElement.style.transform = `translateY(${transformOffset}) scale(${scale})`;
+            }
+            else {
+                presentingElement.style.transform = 'translateY(0px) scale(1)';
+            }
+        }
+    }
     render() {
         const { handle, isSheetModal, presentingElement, htmlAttributes, handleBehavior, inheritedAttributes, focusTrap, expandToScroll, } = this;
         const showHandle = handle !== false && isSheetModal;
@@ -1967,20 +2240,20 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
         const isCardModal = presentingElement !== undefined && mode === 'ios';
         const isHandleCycle = handleBehavior === 'cycle';
         const isSheetModalWithHandle = isSheetModal && showHandle;
-        return (h(Host, Object.assign({ key: '8add05bb43a2cdb5e3cf180147d31eb85a018fe0', "no-router": true,
+        return (h(Host, Object.assign({ key: '1980fa23331381c568a2be8091d888e09754fc52', "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: '90a6605a9564a699d6f66cf71cf6b506796a2963', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: 'a97d071395333bf803c0a9347bda000cf7500d8d', class: "modal-shadow" }), h("div", Object.assign({ key: 'e7b7985c7414a13e3ba8dcecf497b76e92edf53e',
+            }, 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: 'ba94b055c064e2907eabbe6d7a43cb52adff1048', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: '991f47859250d2143275ebb9b0b01a6ea8c491c0', class: "modal-shadow" }), h("div", Object.assign({ key: '02ecf8ac6a5bdb309ff993cc74a3911e99502a89',
             /*
               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: '8258b65570b11a8ee9c9df2537d6419cd2e34536', 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: '0180a4d6952e41bfd736272d1a49d47d86ca7fef', 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: '394370d0ed03ee03152f8f8abae7ff7664ca5c13' }))));
+            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: 'd062f330675f730ad70c23267baed200ca9b43b0' }))));
     }
     get el() { return this; }
     static get watchers() { return {
@@ -2024,7 +2297,7 @@ const Modal = /*@__PURE__*/ proxyCustomElement(class Modal extends HTMLElement {
         "onWillDismiss": [64],
         "setCurrentBreakpoint": [64],
         "getCurrentBreakpoint": [64]
-    }, undefined, {
+    }, [[9, "resize", "onWindowResize"]], {
         "isOpen": ["onIsOpenChange"],
         "trigger": ["triggerChanged"]
     }]);