voyager-ionic-core 8.5.7 → 8.6.1

package/dist/collection/components/menu-button/menu-button.js

@@ -18,15 +18,22 @@ import { updateVisibility } from "../menu-toggle/menu-toggle-util";
 export class MenuButton {
     constructor() {
         this.inheritedAttributes = {};
-        this.onClick = async () => {
-            return menuController.toggle(this.menu);
-        };
         this.visible = false;
-        this.color = undefined;
+        /**
+         * If `true`, the user cannot interact with the menu button.
+         */
         this.disabled = false;
-        this.menu = undefined;
+        /**
+         * Automatically hides the menu button when the corresponding menu is not active
+         */
         this.autoHide = true;
+        /**
+         * The type of the button.
+         */
         this.type = 'button';
+        this.onClick = async () => {
+            return menuController.toggle(this.menu);
+        };
     }
     componentWillLoad() {
         this.inheritedAttributes = inheritAriaAttributes(this.el);
@@ -46,7 +53,7 @@ export class MenuButton {
             type: this.type,
         };
         const ariaLabel = inheritedAttributes['aria-label'] || 'menu';
-        return (h(Host, { key: '3cde3704f28eb275f4a5ff2985bbb68c1024e79c', onClick: this.onClick, "aria-disabled": disabled ? 'true' : null, "aria-hidden": hidden ? 'true' : null, class: createColorClasses(color, {
+        return (h(Host, { key: '9f0f0e50d39a6872508220c58e64bb2092a0d7ef', onClick: this.onClick, "aria-disabled": disabled ? 'true' : null, "aria-hidden": hidden ? 'true' : null, class: createColorClasses(color, {
                 [mode]: true,
                 button: true, // ion-buttons target .button
                 'menu-button-hidden': hidden,
@@ -55,7 +62,7 @@ export class MenuButton {
                 'in-toolbar-color': hostContext('ion-toolbar[color]', this.el),
                 'ion-activatable': true,
                 'ion-focusable': true,
-            }) }, h("button", Object.assign({ key: 'a02a3374288bd1759b6e352ada8eab0d45c6422f' }, attrs, { disabled: disabled, class: "button-native", part: "native", "aria-label": ariaLabel }), h("span", { key: 'ba699f2277a4e7b27ce5e42faeefc53d8805bb43', class: "button-inner" }, h("slot", { key: '829fe6cbdeb173f50d1a670389d1565baa6273e4' }, h("ion-icon", { key: 'a9a9f7b8dcffc648a8429fe0adbe766869de72fd', part: "icon", icon: menuIcon, mode: mode, lazy: false, "aria-hidden": "true" }))), mode === 'md' && h("ion-ripple-effect", { key: '48deca9a771a249f2fc76eaa8b9741c8d66d8355', type: "unbounded" }))));
+            }) }, h("button", Object.assign({ key: 'ffebf7083d23501839970059ef8e411b571de197' }, attrs, { disabled: disabled, class: "button-native", part: "native", "aria-label": ariaLabel }), h("span", { key: 'cab0c1c763b3ce33ef11dba1d230f66126e59424', class: "button-inner" }, h("slot", { key: 'ccfd2be8479b75b5c63e97e1ca7dfe203e9b36ee' }, h("ion-icon", { key: 'ac254fe7f327b08f1ae3fcea89d5cf0e83c9a96c', part: "icon", icon: menuIcon, mode: mode, lazy: false, "aria-hidden": "true" }))), mode === 'md' && h("ion-ripple-effect", { key: 'f0f17c4ca96e3eed3c1727ee00578d40af8f0115', type: "unbounded" }))));
     }
     static get is() { return "ion-menu-button"; }
     static get encapsulation() { return "shadow"; }
@@ -75,6 +82,7 @@ export class MenuButton {
         return {
             "color": {
                 "type": "string",
+                "attribute": "color",
                 "mutable": false,
                 "complexType": {
                     "original": "Color",
@@ -93,11 +101,13 @@ export class MenuButton {
                     "tags": [],
                     "text": "The color to use from your application's color palette.\nDefault options are: `\"primary\"`, `\"secondary\"`, `\"tertiary\"`, `\"success\"`, `\"warning\"`, `\"danger\"`, `\"light\"`, `\"medium\"`, and `\"dark\"`.\nFor more information on colors, see [theming](/docs/theming/basics)."
                 },
-                "attribute": "color",
+                "getter": false,
+                "setter": false,
                 "reflect": true
             },
             "disabled": {
                 "type": "boolean",
+                "attribute": "disabled",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean",
@@ -110,12 +120,14 @@ export class MenuButton {
                     "tags": [],
                     "text": "If `true`, the user cannot interact with the menu button."
                 },
-                "attribute": "disabled",
+                "getter": false,
+                "setter": false,
                 "reflect": false,
                 "defaultValue": "false"
             },
             "menu": {
                 "type": "string",
+                "attribute": "menu",
                 "mutable": false,
                 "complexType": {
                     "original": "string",
@@ -128,11 +140,13 @@ export class MenuButton {
                     "tags": [],
                     "text": "Optional property that maps to a Menu's `menuId` prop. Can also be `start` or `end` for the menu side. This is used to find the correct menu to toggle"
                 },
-                "attribute": "menu",
+                "getter": false,
+                "setter": false,
                 "reflect": false
             },
             "autoHide": {
                 "type": "boolean",
+                "attribute": "auto-hide",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean",
@@ -145,12 +159,14 @@ export class MenuButton {
                     "tags": [],
                     "text": "Automatically hides the menu button when the corresponding menu is not active"
                 },
-                "attribute": "auto-hide",
+                "getter": false,
+                "setter": false,
                 "reflect": false,
                 "defaultValue": "true"
             },
             "type": {
                 "type": "string",
+                "attribute": "type",
                 "mutable": false,
                 "complexType": {
                     "original": "'submit' | 'reset' | 'button'",
@@ -163,7 +179,8 @@ export class MenuButton {
                     "tags": [],
                     "text": "The type of the button."
                 },
-                "attribute": "type",
+                "getter": false,
+                "setter": false,
                 "reflect": false,
                 "defaultValue": "'button'"
             }

package/dist/collection/components/menu-toggle/menu-toggle.js

@@ -10,12 +10,17 @@ import { updateVisibility } from "./menu-toggle-util";
  */
 export class MenuToggle {
     constructor() {
+        this.visible = false;
+        /**
+         * Automatically hides the content when the corresponding menu is not active.
+         *
+         * By default, it's `true`. Change it to `false` in order to
+         * keep `ion-menu-toggle` always visible regardless the state of the menu.
+         */
+        this.autoHide = true;
         this.onClick = () => {
             return menuController.toggle(this.menu);
         };
-        this.visible = false;
-        this.menu = undefined;
-        this.autoHide = true;
     }
     connectedCallback() {
         this.visibilityChanged();
@@ -26,10 +31,10 @@ export class MenuToggle {
     render() {
         const mode = getIonMode(this);
         const hidden = this.autoHide && !this.visible;
-        return (h(Host, { key: '88e88fa13ac7f10ba3acfe378bd11cda0c7e2749', onClick: this.onClick, "aria-hidden": hidden ? 'true' : null, class: {
+        return (h(Host, { key: 'cd567114769a30bd3871ed5d15bf42aed39956e1', onClick: this.onClick, "aria-hidden": hidden ? 'true' : null, class: {
                 [mode]: true,
                 'menu-toggle-hidden': hidden,
-            } }, h("slot", { key: '0a14c7b63eda64702d2fd1b4bc7db4809892842d' })));
+            } }, h("slot", { key: '773d4cff95ca75f23578b1e1dca53c9933f28a33' })));
     }
     static get is() { return "ion-menu-toggle"; }
     static get encapsulation() { return "shadow"; }
@@ -47,6 +52,7 @@ export class MenuToggle {
         return {
             "menu": {
                 "type": "string",
+                "attribute": "menu",
                 "mutable": false,
                 "complexType": {
                     "original": "string",
@@ -59,11 +65,13 @@ export class MenuToggle {
                     "tags": [],
                     "text": "Optional property that maps to a Menu's `menuId` prop.\nCan also be `start` or `end` for the menu side.\nThis is used to find the correct menu to toggle.\n\nIf this property is not used, `ion-menu-toggle` will toggle the\nfirst menu that is active."
                 },
-                "attribute": "menu",
+                "getter": false,
+                "setter": false,
                 "reflect": false
             },
             "autoHide": {
                 "type": "boolean",
+                "attribute": "auto-hide",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean",
@@ -76,7 +84,8 @@ export class MenuToggle {
                     "tags": [],
                     "text": "Automatically hides the content when the corresponding menu is not active.\n\nBy default, it's `true`. Change it to `false` in order to\nkeep `ion-menu-toggle` always visible regardless the state of the menu."
                 },
-                "attribute": "auto-hide",
+                "getter": false,
+                "setter": false,
                 "reflect": false,
                 "defaultValue": "true"
             }

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

@@ -31,47 +31,7 @@ export const iosEnterAnimation = (baseEl, opts) => {
         .addElement(baseEl)
         .easing('cubic-bezier(0.32,0.72,0,1)')
         .duration(500)
-        .addAnimation([wrapperAnimation])
-        .beforeAddWrite(() => {
-        if (expandToScroll) {
-            // Scroll can only be done when the modal is fully expanded.
-            return;
-        }
-        /**
-         * There are some browsers that causes flickering when
-         * dragging the content when scroll is enabled at every
-         * breakpoint. This is due to the wrapper element being
-         * transformed off the screen and having a snap animation.
-         *
-         * A workaround is to clone the footer element and append
-         * it outside of the wrapper element. This way, the footer
-         * is still visible and the drag can be done without
-         * flickering. The original footer is hidden until the modal
-         * is dismissed. This maintains the animation of the footer
-         * when the modal is dismissed.
-         *
-         * The workaround needs to be done before the animation starts
-         * so there are no flickering issues.
-         */
-        const ionFooter = baseEl.querySelector('ion-footer');
-        /**
-         * This check is needed to prevent more than one footer
-         * from being appended to the shadow root.
-         * Otherwise, iOS and MD enter animations would append
-         * the footer twice.
-         */
-        const ionFooterAlreadyAppended = baseEl.shadowRoot.querySelector('ion-footer');
-        if (ionFooter && !ionFooterAlreadyAppended) {
-            const footerHeight = ionFooter.clientHeight;
-            const clonedFooter = ionFooter.cloneNode(true);
-            baseEl.shadowRoot.appendChild(clonedFooter);
-            ionFooter.style.setProperty('display', 'none');
-            ionFooter.setAttribute('aria-hidden', 'true');
-            // Padding is added to prevent some content from being hidden.
-            const page = baseEl.querySelector('.ion-page');
-            page.style.setProperty('padding-bottom', `${footerHeight}px`);
-        }
-    });
+        .addAnimation([wrapperAnimation]);
     if (contentAnimation) {
         baseAnimation.addAnimation(contentAnimation);
     }

package/dist/collection/components/modal/animations/ios.leave.js

@@ -14,7 +14,7 @@ const createLeaveAnimation = () => {
  * iOS Modal Leave Animation
  */
 export const iosLeaveAnimation = (baseEl, opts, duration = 500) => {
-    const { presentingEl, currentBreakpoint, expandToScroll } = opts;
+    const { presentingEl, currentBreakpoint } = opts;
     const root = getElementRoot(baseEl);
     const { wrapperAnimation, backdropAnimation } = currentBreakpoint !== undefined ? createSheetLeaveAnimation(opts) : createLeaveAnimation();
     backdropAnimation.addElement(root.querySelector('ion-backdrop'));
@@ -23,29 +23,7 @@ export const iosLeaveAnimation = (baseEl, opts, duration = 500) => {
         .addElement(baseEl)
         .easing('cubic-bezier(0.32,0.72,0,1)')
         .duration(duration)
-        .addAnimation(wrapperAnimation)
-        .beforeAddWrite(() => {
-        if (expandToScroll) {
-            // Scroll can only be done when the modal is fully expanded.
-            return;
-        }
-        /**
-         * If expandToScroll is disabled, we need to swap
-         * the visibility to the original, so the footer
-         * dismisses with the modal and doesn't stay
-         * until the modal is removed from the DOM.
-         */
-        const ionFooter = baseEl.querySelector('ion-footer');
-        if (ionFooter) {
-            const clonedFooter = baseEl.shadowRoot.querySelector('ion-footer');
-            ionFooter.style.removeProperty('display');
-            ionFooter.removeAttribute('aria-hidden');
-            clonedFooter.style.setProperty('display', 'none');
-            clonedFooter.setAttribute('aria-hidden', 'true');
-            const page = baseEl.querySelector('.ion-page');
-            page.style.removeProperty('padding-bottom');
-        }
-    });
+        .addAnimation(wrapperAnimation);
     const appEl = baseEl.closest('ion-app');
     if (presentingEl && appEl) {
         const isMobile = window.innerWidth < 768;

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

@@ -28,52 +28,12 @@ export const mdEnterAnimation = (baseEl, opts) => {
     wrapperAnimation.addElement(root.querySelector('.modal-wrapper'));
     // The content animation is only added if scrolling is enabled for
     // all the breakpoints.
-    expandToScroll && (contentAnimation === null || contentAnimation === void 0 ? void 0 : contentAnimation.addElement(baseEl.querySelector('.ion-page')));
+    !expandToScroll && (contentAnimation === null || contentAnimation === void 0 ? void 0 : contentAnimation.addElement(baseEl.querySelector('.ion-page')));
     const baseAnimation = createAnimation()
         .addElement(baseEl)
         .easing('cubic-bezier(0.36,0.66,0.04,1)')
         .duration(280)
-        .addAnimation([backdropAnimation, wrapperAnimation])
-        .beforeAddWrite(() => {
-        if (expandToScroll) {
-            // Scroll can only be done when the modal is fully expanded.
-            return;
-        }
-        /**
-         * There are some browsers that causes flickering when
-         * dragging the content when scroll is enabled at every
-         * breakpoint. This is due to the wrapper element being
-         * transformed off the screen and having a snap animation.
-         *
-         * A workaround is to clone the footer element and append
-         * it outside of the wrapper element. This way, the footer
-         * is still visible and the drag can be done without
-         * flickering. The original footer is hidden until the modal
-         * is dismissed. This maintains the animation of the footer
-         * when the modal is dismissed.
-         *
-         * The workaround needs to be done before the animation starts
-         * so there are no flickering issues.
-         */
-        const ionFooter = baseEl.querySelector('ion-footer');
-        /**
-         * This check is needed to prevent more than one footer
-         * from being appended to the shadow root.
-         * Otherwise, iOS and MD enter animations would append
-         * the footer twice.
-         */
-        const ionFooterAlreadyAppended = baseEl.shadowRoot.querySelector('ion-footer');
-        if (ionFooter && !ionFooterAlreadyAppended) {
-            const footerHeight = ionFooter.clientHeight;
-            const clonedFooter = ionFooter.cloneNode(true);
-            baseEl.shadowRoot.appendChild(clonedFooter);
-            ionFooter.style.setProperty('display', 'none');
-            ionFooter.setAttribute('aria-hidden', 'true');
-            // Padding is added to prevent some content from being hidden.
-            const page = baseEl.querySelector('.ion-page');
-            page.style.setProperty('padding-bottom', `${footerHeight}px`);
-        }
-    });
+        .addAnimation([backdropAnimation, wrapperAnimation]);
     if (contentAnimation) {
         baseAnimation.addAnimation(contentAnimation);
     }

package/dist/collection/components/modal/animations/md.leave.js

@@ -16,7 +16,7 @@ const createLeaveAnimation = () => {
  * Md Modal Leave Animation
  */
 export const mdLeaveAnimation = (baseEl, opts) => {
-    const { currentBreakpoint, expandToScroll } = opts;
+    const { currentBreakpoint } = opts;
     const root = getElementRoot(baseEl);
     const { wrapperAnimation, backdropAnimation } = currentBreakpoint !== undefined ? createSheetLeaveAnimation(opts) : createLeaveAnimation();
     backdropAnimation.addElement(root.querySelector('ion-backdrop'));
@@ -24,28 +24,6 @@ export const mdLeaveAnimation = (baseEl, opts) => {
     const baseAnimation = createAnimation()
         .easing('cubic-bezier(0.47,0,0.745,0.715)')
         .duration(200)
-        .addAnimation([backdropAnimation, wrapperAnimation])
-        .beforeAddWrite(() => {
-        if (expandToScroll) {
-            // Scroll can only be done when the modal is fully expanded.
-            return;
-        }
-        /**
-         * If expandToScroll is disabled, we need to swap
-         * the visibility to the original, so the footer
-         * dismisses with the modal and doesn't stay
-         * until the modal is removed from the DOM.
-         */
-        const ionFooter = baseEl.querySelector('ion-footer');
-        if (ionFooter) {
-            const clonedFooter = baseEl.shadowRoot.querySelector('ion-footer');
-            ionFooter.style.removeProperty('display');
-            ionFooter.removeAttribute('aria-hidden');
-            clonedFooter.style.setProperty('display', 'none');
-            clonedFooter.setAttribute('aria-hidden', 'true');
-            const page = baseEl.querySelector('.ion-page');
-            page.style.removeProperty('padding-bottom');
-        }
-    });
+        .addAnimation([backdropAnimation, wrapperAnimation]);
     return baseAnimation;
 };

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

@@ -35,6 +35,9 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
     let offset = 0;
     let canDismissBlocksGesture = false;
     let cachedScrollEl = null;
+    let cachedFooterEls = null;
+    let cachedFooterYPosition = null;
+    let currentFooterState = null;
     const canDismissMaxStep = 0.95;
     const maxBreakpoint = breakpoints[breakpoints.length - 1];
     const minBreakpoint = breakpoints[0];
@@ -64,29 +67,87 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
         baseEl.classList.add(FOCUS_TRAP_DISABLE_CLASS);
     };
     /**
-     * Toggles the visible modal footer when `expandToScroll` is disabled.
-     * @param footer The footer to show.
+     * Toggles the footer to an absolute position while moving to prevent
+     * it from shaking while the sheet is being dragged.
+     * @param newPosition Whether the footer is in a moving or stationary position.
      */
-    const swapFooterVisibility = (footer) => {
-        const originalFooter = baseEl.querySelector('ion-footer');
-        if (!originalFooter) {
-            return;
+    const swapFooterPosition = (newPosition) => {
+        if (!cachedFooterEls) {
+            cachedFooterEls = Array.from(baseEl.querySelectorAll('ion-footer'));
+            if (!cachedFooterEls.length) {
+                return;
+            }
         }
-        const clonedFooter = wrapperEl.nextElementSibling;
-        const footerToHide = footer === 'original' ? clonedFooter : originalFooter;
-        const footerToShow = footer === 'original' ? originalFooter : clonedFooter;
-        footerToShow.style.removeProperty('display');
-        footerToShow.removeAttribute('aria-hidden');
         const page = baseEl.querySelector('.ion-page');
-        if (footer === 'original') {
-            page.style.removeProperty('padding-bottom');
+        currentFooterState = newPosition;
+        if (newPosition === 'stationary') {
+            cachedFooterEls.forEach((cachedFooterEl) => {
+                // Reset positioning styles to allow normal document flow
+                cachedFooterEl.classList.remove('modal-footer-moving');
+                cachedFooterEl.style.removeProperty('position');
+                cachedFooterEl.style.removeProperty('width');
+                cachedFooterEl.style.removeProperty('height');
+                cachedFooterEl.style.removeProperty('top');
+                cachedFooterEl.style.removeProperty('left');
+                page === null || page === void 0 ? void 0 : page.style.removeProperty('padding-bottom');
+                // Move to page
+                page === null || page === void 0 ? void 0 : page.appendChild(cachedFooterEl);
+            });
         }
         else {
-            const pagePadding = footerToShow.clientHeight;
-            page.style.setProperty('padding-bottom', `${pagePadding}px`);
+            let footerHeights = 0;
+            cachedFooterEls.forEach((cachedFooterEl, index) => {
+                // Get both the footer and document body positions
+                const cachedFooterElRect = cachedFooterEl.getBoundingClientRect();
+                const bodyRect = document.body.getBoundingClientRect();
+                // Calculate the total height of all footers
+                // so we can add padding to the page element
+                footerHeights += cachedFooterEl.clientHeight;
+                // Calculate absolute position relative to body
+                // We need to subtract the body's offsetTop to get true position within document.body
+                const absoluteTop = cachedFooterElRect.top - bodyRect.top;
+                const absoluteLeft = cachedFooterElRect.left - bodyRect.left;
+                // Capture the footer's current dimensions and store them in CSS variables for
+                // later use when applying absolute positioning.
+                cachedFooterEl.style.setProperty('--pinned-width', `${cachedFooterEl.clientWidth}px`);
+                cachedFooterEl.style.setProperty('--pinned-height', `${cachedFooterEl.clientHeight}px`);
+                cachedFooterEl.style.setProperty('--pinned-top', `${absoluteTop}px`);
+                cachedFooterEl.style.setProperty('--pinned-left', `${absoluteLeft}px`);
+                // Only cache the first footer's Y position
+                // This is used to determine if the sheet has been moved below the footer
+                // and needs to be swapped back to stationary so it collapses correctly.
+                if (index === 0) {
+                    cachedFooterYPosition = absoluteTop;
+                    // If there's a header, we need to combine the header height with the footer position
+                    // because the header moves with the drag handle, so when it starts overlapping the footer,
+                    // we need to account for that.
+                    const header = baseEl.querySelector('ion-header');
+                    if (header) {
+                        cachedFooterYPosition -= header.clientHeight;
+                    }
+                }
+            });
+            // Apply the pinning of styles after we've calculated everything
+            // so that we don't cause layouts to shift while calculating the footer positions.
+            // Otherwise, with multiple footers we'll end up capturing the wrong positions.
+            cachedFooterEls.forEach((cachedFooterEl) => {
+                // Add padding to the parent element to prevent content from being hidden
+                // when the footer is positioned absolutely. This has to be done before we
+                // make the footer absolutely positioned or we may accidentally cause the
+                // sheet to scroll.
+                page === null || page === void 0 ? void 0 : page.style.setProperty('padding-bottom', `${footerHeights}px`);
+                // Apply positioning styles to keep footer at bottom
+                cachedFooterEl.classList.add('modal-footer-moving');
+                // Apply our preserved styles to pin the footer
+                cachedFooterEl.style.setProperty('position', 'absolute');
+                cachedFooterEl.style.setProperty('width', 'var(--pinned-width)');
+                cachedFooterEl.style.setProperty('height', 'var(--pinned-height)');
+                cachedFooterEl.style.setProperty('top', 'var(--pinned-top)');
+                cachedFooterEl.style.setProperty('left', 'var(--pinned-left)');
+                // Move the element to the body when everything else is done
+                document.body.appendChild(cachedFooterEl);
+            });
         }
-        footerToHide.style.setProperty('display', 'none');
-        footerToHide.setAttribute('aria-hidden', 'true');
     };
     /**
      * After the entering animation completes,
@@ -180,12 +241,11 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
         }
         /**
          * If expandToScroll is disabled, we need to swap
-         * the footer visibility to the original, so if the modal
-         * is dismissed, the footer dismisses with the modal
-         * and doesn't stay on the screen after the modal is gone.
+         * the footer position to moving so that it doesn't shake
+         * while the sheet is being dragged.
          */
         if (!expandToScroll) {
-            swapFooterVisibility('original');
+            swapFooterPosition('moving');
         }
         /**
          * If we are pulling down, then it is possible we are pulling on the content.
@@ -204,6 +264,21 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
         animation.progressStart(true, 1 - currentBreakpoint);
     };
     const onMove = (detail) => {
+        /**
+         * If `expandToScroll` is disabled, we need to see if we're currently below
+         * the footer element and the footer is in a stationary position. If so,
+         * we need to make the stationary the original position so that the footer
+         * collapses with the sheet.
+         */
+        if (!expandToScroll && cachedFooterYPosition !== null && currentFooterState !== null) {
+            // Check if we need to swap the footer position
+            if (detail.currentY >= cachedFooterYPosition && currentFooterState === 'moving') {
+                swapFooterPosition('stationary');
+            }
+            else if (detail.currentY < cachedFooterYPosition && currentFooterState === 'stationary') {
+                swapFooterPosition('moving');
+            }
+        }
         /**
          * If `expandToScroll` is disabled, and an upwards swipe gesture is done within
          * the scrollable content, we should not allow the swipe gesture to continue.
@@ -263,6 +338,14 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
          * is not scrolled to the top.
          */
         if (!expandToScroll && detail.deltaY <= 0 && cachedScrollEl && cachedScrollEl.scrollTop > 0) {
+            /**
+             * If expand to scroll is disabled, we need to make sure we swap the footer position
+             * back to stationary so that it will collapse correctly if the modal is dismissed without
+             * dragging (e.g. through a dismiss button).
+             * This can cause issues if the user has a modal with content that can be dragged, as we'll
+             * swap to moving on drag and if we don't swap back here then the footer will get stuck.
+             */
+            swapFooterPosition('stationary');
             return;
         }
         /**
@@ -337,14 +420,6 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
          * snapping animation completes.
          */
         gesture.enable(false);
-        /**
-         * If expandToScroll is disabled, we need to swap
-         * the footer visibility to the cloned one so the footer
-         * doesn't flicker when the sheet's height is animated.
-         */
-        if (!expandToScroll && shouldRemainOpen) {
-            swapFooterVisibility('cloned');
-        }
         if (shouldPreventDismiss) {
             handleCanDismiss(baseEl, animation);
         }
@@ -361,10 +436,28 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
         if (contentEl && (snapToBreakpoint === breakpoints[breakpoints.length - 1] || !expandToScroll)) {
             contentEl.scrollY = true;
         }
+        /**
+         * If expandToScroll is disabled and we're animating
+         * to close the sheet, we need to swap
+         * the footer position to stationary so that it
+         * will collapse correctly. We cannot just always swap
+         * here or it'll be jittery while animating movement.
+         */
+        if (!expandToScroll && snapToBreakpoint === 0) {
+            swapFooterPosition('stationary');
+        }
         return new Promise((resolve) => {
             animation
                 .onFinish(() => {
                 if (shouldRemainOpen) {
+                    /**
+                     * If expandToScroll is disabled, we need to swap
+                     * the footer position to stationary so that it
+                     * will act as it would by default.
+                     */
+                    if (!expandToScroll) {
+                        swapFooterPosition('stationary');
+                    }
                     /**
                      * Once the snapping animation completes,
                      * we need to reset the animation to go

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

@@ -331,14 +331,4 @@ ion-backdrop {
   border-start-end-radius: var(--border-radius);
   border-end-end-radius: 0;
   border-end-start-radius: 0;
-}
-
-/**
- * Sheet modals require an additional padding as mentioned in the
- * `core.scss` file. However, there's a workaround that requires
- * a cloned footer to be added to the modal. This is only necessary
- * because the core styles are not being applied to the cloned footer.
- */
-:host(.modal-sheet.modal-no-expand-scroll) ion-footer ion-toolbar:first-of-type {
-  padding-top: 6px;
 }