@ionic/core 8.8.18 → 8.8.19-dev.11786730389.1a1927bf

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

@@ -8,7 +8,6 @@ import { FOCUS_TRAP_DISABLE_CLASS } from "../../../utils/overlays";
 import { getBackdropValueForSheet } from "../utils";
 import { calculateSpringStep, canSwipeOnContent, handleCanDismiss } from "./utils";
 export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange, onDragStart, onDragMove, onDragEnd) => {
-    var _a;
     // Defaults for the sheet swipe animation
     const defaultBackdrop = [
         { offset: 0, opacity: 'var(--backdrop-opacity)' },
@@ -32,7 +31,7 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
     };
     const contentEl = baseEl.querySelector('ion-content');
     // Cache the initial value so the gesture restores it instead of forcing scrolling on.
-    const initialContentScrollY = (_a = contentEl === null || contentEl === void 0 ? void 0 : contentEl.scrollY) !== null && _a !== void 0 ? _a : true;
+    const initialContentScrollY = contentEl?.scrollY ?? true;
     const height = wrapperEl.clientHeight;
     let currentBreakpoint = initialBreakpoint;
     let offset = 0;
@@ -98,9 +97,9 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
                 cachedFooterEl.style.removeProperty('height');
                 cachedFooterEl.style.removeProperty('top');
                 cachedFooterEl.style.removeProperty('left');
-                page === null || page === void 0 ? void 0 : page.style.removeProperty('padding-bottom');
+                page?.style.removeProperty('padding-bottom');
                 // Move to page
-                page === null || page === void 0 ? void 0 : page.appendChild(cachedFooterEl);
+                page?.appendChild(cachedFooterEl);
             });
         }
         else {
@@ -144,7 +143,7 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
                 // 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`);
+                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
@@ -169,7 +168,7 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
     if (wrapperAnimation && backdropAnimation) {
         wrapperAnimation.keyframes([...SheetDefaults.WRAPPER_KEYFRAMES]);
         backdropAnimation.keyframes([...SheetDefaults.BACKDROP_KEYFRAMES]);
-        contentAnimation === null || contentAnimation === void 0 ? void 0 : contentAnimation.keyframes([...SheetDefaults.CONTENT_KEYFRAMES]);
+        contentAnimation?.keyframes([...SheetDefaults.CONTENT_KEYFRAMES]);
         animation.progressStart(true, 1 - currentBreakpoint);
         /**
          * If backdrop is not enabled, then content
@@ -209,13 +208,12 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
         return true;
     };
     const onStart = (detail) => {
-        var _a;
         /**
          * Firefox automatically selects the header text during drag
          * due to the focusable wrapper (tabindex="-1"). Remove any
          * selection that may have occurred.
          */
-        (_a = window.getSelection()) === null || _a === void 0 ? void 0 : _a.removeAllRanges();
+        window.getSelection()?.removeAllRanges();
         /**
          * If canDismiss is anything other than `true`
          * then users should be able to swipe down
@@ -343,12 +341,22 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
     };
     const onEnd = (detail) => {
         const snapBreakpoint = calculateSnapBreakpoint(detail.deltaY);
+        /**
+         * `snapBreakpoint === 0` is not enough on its own. `canDismiss: false`
+         * snaps to 0 but never dismisses, since `handleCanDismiss` returns early
+         * when canDismiss is not a function. A canDismiss function dismisses
+         * through `handleCanDismiss`, which awaits the callback, so the outcome
+         * is not known when this event is emitted.
+         */
+        const shouldPreventDismiss = canDismissBlocksGesture && snapBreakpoint === 0;
+        const isDismissing = shouldPreventDismiss ? typeof baseEl.canDismiss === 'function' : snapBreakpoint === 0;
         const eventDetail = {
             currentY: detail.currentY,
             deltaY: detail.deltaY,
             velocityY: detail.velocityY,
             progress: calculateProgress(detail.currentY),
             snapBreakpoint,
+            isDismissing,
         };
         /**
          * If expandToScroll is disabled, we should not allow the moveSheetToBreakpoint
@@ -364,7 +372,11 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
              * swap to moving on drag and if we don't swap back here then the footer will get stuck.
              */
             swapFooterPosition('stationary');
-            onDragEnd(eventDetail);
+            /**
+             * The sheet does not move in this case, so the gesture
+             * never dismisses the modal.
+             */
+            onDragEnd({ ...eventDetail, isDismissing: false });
             return;
         }
         moveSheetToBreakpoint({
@@ -479,7 +491,7 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
                         raf(() => {
                             wrapperAnimation.keyframes([...SheetDefaults.WRAPPER_KEYFRAMES]);
                             backdropAnimation.keyframes([...SheetDefaults.BACKDROP_KEYFRAMES]);
-                            contentAnimation === null || contentAnimation === void 0 ? void 0 : contentAnimation.keyframes([...SheetDefaults.CONTENT_KEYFRAMES]);
+                            contentAnimation?.keyframes([...SheetDefaults.CONTENT_KEYFRAMES]);
                             animation.progressStart(true, 1 - snapToBreakpoint);
                             currentBreakpoint = snapToBreakpoint;
                             onBreakpointChange(currentBreakpoint);

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

@@ -67,14 +67,13 @@ export const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismi
         return false;
     };
     const onStart = (detail) => {
-        var _a;
         const { deltaY } = detail;
         /**
          * Firefox automatically selects the header text during drag
          * due to the focusable wrapper (tabindex="-1"). Remove any
          * selection that may have occurred.
          */
-        (_a = window.getSelection()) === null || _a === void 0 ? void 0 : _a.removeAllRanges();
+        window.getSelection()?.removeAllRanges();
         /**
          * Get the initial scrollY value so
          * that we can correctly reset the scrollY
@@ -227,17 +226,30 @@ export const createSwipeToCloseGesture = (el, animation, statusBarStyle, onDismi
          * check canDismiss. 25% was chosen
          * to avoid accidental swipes.
          */
-        if (isAttemptingDismissWithCanDismiss && clampedStep > maxStep / 4) {
+        const isAttemptingCanDismiss = isAttemptingDismissWithCanDismiss && clampedStep > maxStep / 4;
+        if (isAttemptingCanDismiss) {
             handleCanDismiss(el, animation);
         }
         else if (shouldComplete) {
             onDismiss();
         }
+        /**
+         * `shouldComplete` is not enough on its own, since it is always `false`
+         * when canDismiss blocks the gesture. `canDismiss: false` blocks it and
+         * never dismisses, because `handleCanDismiss` returns early when
+         * canDismiss is not a function. A canDismiss function dismisses through
+         * `handleCanDismiss`, which awaits the callback, so the outcome is not
+         * known when this event is emitted.
+         */
+        const isDismissing = isAttemptingDismissWithCanDismiss
+            ? isAttemptingCanDismiss && typeof el.canDismiss === 'function'
+            : shouldComplete;
         const eventDetail = {
             currentY: detail.currentY,
             deltaY: detail.deltaY,
             velocityY: detail.velocityY,
             progress: calculateProgress(el, detail.deltaY),
+            isDismissing,
         };
         onDragEnd(eventDetail);
     };