@ionic/core 9.0.11-dev.11793890855.1bf6a6e5 → 9.0.11-dev.11793906456.1ea7a0a7

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

@@ -7,32 +7,18 @@ import { clamp, getElementRoot, raf } from "../../../utils/helpers";
 import { FOCUS_TRAP_DISABLE_CLASS } from "../../../utils/overlays";
 import { getBackdropValueForSheet } from "../utils";
 import { calculateSpringStep, canSwipeOnContent, handleCanDismiss } from "./utils";
-/** Gesture velocity arrives in pixels per millisecond; the thresholds below are per second. */
-const MILLISECONDS_PER_SECOND = 1000;
-/**
- * Flick speeds for the ionic theme's physics-based gesture, in pixels per
- * second. Both are magnitudes. Y grows downwards, so the upward threshold is
- * negated where it is compared.
- */
-const FLICK_DOWN_VELOCITY = 500;
-const FLICK_UP_VELOCITY = 400;
-/**
- * How far below its starting breakpoint a slow drag has to end to dismiss the
- * sheet. 0.4 means the user dragged 40% of the way down from where they started.
- */
-const DISMISS_PROGRESS_RATIO = 0.4;
 /** How far ahead, in milliseconds, a drag's velocity is projected when snapping. */
 const FLICK_PROJECTION_MS = 350;
-export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange, usePhysicsBasedGesture, onDragStart, onDragMove, onDragEnd) => {
+export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, animation, breakpoints = [], expandToScroll, getCurrentBreakpoint, onDismiss, onBreakpointChange, onDragStart, onDragMove, onDragEnd) => {
     // Defaults for the sheet swipe animation
     const defaultBackdrop = [
         { offset: 0, opacity: 'var(--backdrop-opacity)' },
-        { offset: 1, opacity: usePhysicsBasedGesture ? 'var(--backdrop-opacity)' : 0.01 },
+        { offset: 1, opacity: 0.01 },
     ];
     const customBackdrop = [
         { offset: 0, opacity: 'var(--backdrop-opacity)' },
-        { offset: 1 - backdropBreakpoint, opacity: usePhysicsBasedGesture ? 'var(--backdrop-opacity)' : 0 },
-        { offset: 1, opacity: usePhysicsBasedGesture ? 'var(--backdrop-opacity)' : 0 },
+        { offset: 1 - backdropBreakpoint, opacity: 0 },
+        { offset: 1, opacity: 0 },
     ];
     const SheetDefaults = {
         WRAPPER_KEYFRAMES: [
@@ -422,14 +408,6 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
          */
         const shouldPreventDismiss = canDismiss && breakpoint === 0;
         const snapToBreakpoint = shouldPreventDismiss ? currentBreakpoint : breakpoint;
-        /**
-         * Detect snap-back behavior: when the snap target is the same as the current breakpoint,
-         * the user released before crossing the threshold to a new breakpoint.
-         * Apply different timing and easing for snap-back vs. snap-to-new.
-         */
-        const isSnapBack = snapToBreakpoint === currentBreakpoint;
-        const duration = usePhysicsBasedGesture ? (isSnapBack ? 300 : 400) : 500;
-        const easing = isSnapBack ? 'cubic-bezier(0.34, 1.4, 0.64, 1)' : 'cubic-bezier(0.32, 0.68, 0, 1)';
         const shouldRemainOpen = snapToBreakpoint !== 0;
         currentBreakpoint = 0;
         /**
@@ -444,15 +422,11 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
             backdropAnimation.keyframes([
                 {
                     offset: 0,
-                    opacity: usePhysicsBasedGesture
-                        ? 'var(--backdrop-opacity)'
-                        : `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(1 - breakpointOffset, backdropBreakpoint)})`,
+                    opacity: `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(1 - breakpointOffset, backdropBreakpoint)})`,
                 },
                 {
                     offset: 1,
-                    opacity: usePhysicsBasedGesture
-                        ? 'var(--backdrop-opacity)'
-                        : `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(snapToBreakpoint, backdropBreakpoint)})`,
+                    opacity: `calc(var(--backdrop-opacity) * ${getBackdropValueForSheet(snapToBreakpoint, backdropBreakpoint)})`,
                 },
             ]);
             if (contentAnimation) {
@@ -470,12 +444,6 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
             }
             animation.progressStep(0);
         }
-        /**
-         * Apply the appropriate easing curve for this snap behavior.
-         */
-        if (usePhysicsBasedGesture) {
-            animation.easing(easing);
-        }
         /**
          * Gesture should remain disabled until the
          * snapping animation completes.
@@ -565,7 +533,7 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
                  * be added every time onEnd runs.
                  */
             }, { oneTimeCallback: true })
-                .progressEnd(1, 0, animated ? duration : 0);
+                .progressEnd(1, 0, animated ? 500 : 0);
         });
     };
     /**
@@ -576,22 +544,8 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
      * @returns The snap breakpoint value
      */
     const calculateSnapBreakpoint = (deltaY, velocityY) => {
-        if (usePhysicsBasedGesture) {
-            return calculateVelocitySnapBreakpoint(deltaY, velocityY);
-        }
         // Project the drag forward so a quick flick counts.
-        return calculatePositionSnapBreakpoint(deltaY + velocityY * FLICK_PROJECTION_MS);
-    };
-    /**
-     * Calculates the breakpoint based on the current deltaY.
-     * This determines where the sheet should snap to when the user releases the
-     * gesture.
-     *
-     * @param deltaY The change in Y position since the gesture started.
-     * @returns The snap breakpoint value.
-     */
-    const calculatePositionSnapBreakpoint = (deltaY) => {
-        const currentProgress = calculateProgress(deltaY);
+        const currentProgress = calculateProgress(deltaY + velocityY * FLICK_PROJECTION_MS);
         /**
          * Find and return the defined breakpoint that is closest to the
          * current progress.
@@ -601,48 +555,6 @@ export const createSheetGesture = (baseEl, backdropEl, wrapperEl, initialBreakpo
         });
         return snapBreakpoint;
     };
-    /**
-     * Calculates the snap breakpoint using velocity-based logic.
-     * This provides a more intuitive and responsive sheet behavior for the Ionic theme.
-     *
-     * Rules:
-     * 1. Fast downward flick (> 500 px/s) always dismisses, regardless of position
-     * 2. Fast upward flick (> 400 px/s) snaps to the next breakpoint above
-     * 3. If dragged 40% below current snap point without fast upward flick, dismisses
-     * 4. Otherwise, falls back to position-based snap (closest breakpoint)
-     *
-     * @param deltaY The change in Y position since gesture started
-     * @param velocityY The velocity in pixels per millisecond
-     * @returns The snap breakpoint value
-     */
-    const calculateVelocitySnapBreakpoint = (deltaY, velocityY) => {
-        // Convert velocity from px/ms to px/s for easier threshold comparison
-        const velocityYPerSecond = velocityY * MILLISECONDS_PER_SECOND;
-        // Calculate current progress (0 = fully closed, 1 = fully expanded)
-        const currentProgress = calculateProgress(deltaY);
-        // Rule 1: Fast downward flick always dismisses
-        if (velocityYPerSecond > FLICK_DOWN_VELOCITY) {
-            return minBreakpoint;
-        }
-        // Rule 2: Fast upward flick moves to next breakpoint above
-        if (velocityYPerSecond < -FLICK_UP_VELOCITY) {
-            // Find next breakpoint above current position
-            const nextBreakpoint = breakpoints.find((bp) => bp > currentProgress);
-            // If no breakpoint above, stay at max breakpoint
-            return nextBreakpoint ?? maxBreakpoint;
-        }
-        // Rule 3: 40% dismissal rule (only if not flicking up and 0 breakpoint exists)
-        if (minBreakpoint === 0 && currentBreakpoint > 0) {
-            // Calculate how far we've moved below the current snap point
-            const distanceBelowSnap = currentBreakpoint - currentProgress;
-            const percentageBelowSnap = distanceBelowSnap / currentBreakpoint;
-            if (percentageBelowSnap > DISMISS_PROGRESS_RATIO) {
-                return 0;
-            }
-        }
-        // Rule 4: Fallback to position-based snap (existing logic)
-        return calculatePositionSnapBreakpoint(deltaY);
-    };
     /**
      * Calculates how open the sheet is part way through a gesture, on the same
      * 0 to 1 scale as the breakpoints: 1 is fully open and 0 is fully closed.

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

@@ -1,3 +1,36 @@
+/**
+ * Convert a font size to a dynamic font size.
+ * Fonts that participate in Dynamic Type should use
+ * dynamic font sizes.
+ * @param size - The initial font size including the unit (i.e. px or pt)
+ * @param unit (optional) - The unit to convert to. Use this if you want to
+ * convert to a unit other than $baselineUnit.
+ */
+/**
+ * Convert a font size to a dynamic font size but impose
+ * a maximum font size.
+ * @param size - The initial font size including the unit (i.e. px or pt)
+ * @param maxScale - The maximum scale of the font (i.e. 2.5 for a maximum 250% scale).
+ * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to
+ * convert to a unit other than $baselineUnit.
+ */
+/**
+ * Convert a font size to a dynamic font size but impose
+ * a minimum font size.
+ * @param size - The initial font size including the unit (i.e. px or pt)
+ * @param minScale - The minimum scale of the font (i.e. 0.8 for a minimum 80% scale).
+ * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to
+ * convert to a unit other than $baselineUnit.
+ */
+/**
+ * Convert a font size to a dynamic font size but impose
+ * maximum and minimum font sizes.
+ * @param size - The initial font size including the unit (i.e. px or pt)
+ * @param minScale - The minimum scale of the font (i.e. 0.8 for a minimum 80% scale).
+ * @param maxScale - The maximum scale of the font (i.e. 2.5 for a maximum 250% scale).
+ * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to
+ * convert to a unit other than $baselineUnit.
+ */
 /**
  * A heuristic that applies CSS to tablet
  * viewports.
@@ -51,12 +84,15 @@
    */
   --max-height: 100%;
   --overflow: hidden;
+  --border-radius: 0;
   --border-width: 0;
   --border-style: none;
   --border-color: transparent;
+  --background: var(--ion-background-color, #fff);
   --box-shadow: none;
-  right: 0;
+  --backdrop-opacity: 0;
   left: 0;
+  right: 0;
   top: 0;
   bottom: 0;
   display: flex;
@@ -64,6 +100,7 @@
   align-items: center;
   justify-content: center;
   outline: none;
+  color: var(--ion-text-color, #000);
   contain: strict;
 }
 
@@ -113,177 +150,10 @@ ion-backdrop {
   background: transparent;
 }
 
-.modal-handle {
-  -webkit-margin-start: auto;
-  margin-inline-start: auto;
-  -webkit-margin-end: auto;
-  margin-inline-end: auto;
-  position: absolute;
-  /**
-   * This allows the handle to appear
-   * on top of user content in WebKit.
-   */
-  transform: translateZ(0);
-  border: 0;
-  cursor: pointer;
-  z-index: 11;
-}
-
-.modal-handle::before {
-  position: absolute;
-  transform: translate(-50%, -50%);
-  content: "";
-}
-
-:host(.modal-sheet) .modal-wrapper,
-:host(.modal-sheet) .modal-shadow {
-  position: absolute;
-  bottom: 0;
-}
-
-:host(.modal-sheet.modal-no-expand-scroll) ion-footer {
-  position: absolute;
-  bottom: 0;
-  width: var(--width);
-}
-
-/**
- * Convert a pixels given value into rem
- * 
- * @param pixels - Value in pixels to be converted (i.e. px)
- * @param context (optional) - Baseline value
- */
-/**
- * Convert a font size to a dynamic font size.
- * Fonts that participate in Dynamic Type should use
- * dynamic font sizes.
- * @param size - The initial font size including the unit (i.e. px or pt)
- * @param unit (optional) - The unit to convert to. Use this if you want to
- * convert to a unit other than $baselineUnit.
- */
-/**
- * Convert a font size to a dynamic font size but impose
- * a maximum font size.
- * @param size - The initial font size including the unit (i.e. px or pt)
- * @param maxScale - The maximum scale of the font (i.e. 2.5 for a maximum 250% scale).
- * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to
- * convert to a unit other than $baselineUnit.
- */
-/**
- * Convert a font size to a dynamic font size but impose
- * a minimum font size.
- * @param size - The initial font size including the unit (i.e. px or pt)
- * @param minScale - The minimum scale of the font (i.e. 0.8 for a minimum 80% scale).
- * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to
- * convert to a unit other than $baselineUnit.
- */
-/**
- * Convert a font size to a dynamic font size but impose
- * maximum and minimum font sizes.
- * @param size - The initial font size including the unit (i.e. px or pt)
- * @param minScale - The minimum scale of the font (i.e. 0.8 for a minimum 80% scale).
- * @param maxScale - The maximum scale of the font (i.e. 2.5 for a maximum 250% scale).
- * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to
- * convert to a unit other than $baselineUnit.
- */
-/**
- * A heuristic that applies CSS to tablet
- * viewports.
- *
- * Usage:
- * @include tablet-viewport() {
- *   :host {
- *     background-color: green;
- *   }
- * }
- */
-/**
- * A heuristic that applies CSS to mobile
- * viewports (i.e. phones, not tablets).
- *
- * Usage:
- * @include mobile-viewport() {
- *   :host {
- *     background-color: blue;
- *   }
- * }
- */
-/**
- * Convert a pixels given value into rem
- * 
- * @param pixels - Value in pixels to be converted (i.e. px)
- * @param context (optional) - Baseline value
- */
-/**
- * Convert a font size to a dynamic font size.
- * Fonts that participate in Dynamic Type should use
- * dynamic font sizes.
- * @param size - The initial font size including the unit (i.e. px or pt)
- * @param unit (optional) - The unit to convert to. Use this if you want to
- * convert to a unit other than $baselineUnit.
- */
-/**
- * Convert a font size to a dynamic font size but impose
- * a maximum font size.
- * @param size - The initial font size including the unit (i.e. px or pt)
- * @param maxScale - The maximum scale of the font (i.e. 2.5 for a maximum 250% scale).
- * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to
- * convert to a unit other than $baselineUnit.
- */
-/**
- * Convert a font size to a dynamic font size but impose
- * a minimum font size.
- * @param size - The initial font size including the unit (i.e. px or pt)
- * @param minScale - The minimum scale of the font (i.e. 0.8 for a minimum 80% scale).
- * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to
- * convert to a unit other than $baselineUnit.
- */
-/**
- * Convert a font size to a dynamic font size but impose
- * maximum and minimum font sizes.
- * @param size - The initial font size including the unit (i.e. px or pt)
- * @param minScale - The minimum scale of the font (i.e. 0.8 for a minimum 80% scale).
- * @param maxScale - The maximum scale of the font (i.e. 2.5 for a maximum 250% scale).
- * @param unit (optional) - The unit to convert the initial font size to. Use this if you want to
- * convert to a unit other than $baselineUnit.
- */
-/**
- * A heuristic that applies CSS to tablet
- * viewports.
- *
- * Usage:
- * @include tablet-viewport() {
- *   :host {
- *     background-color: green;
- *   }
- * }
- */
-/**
- * A heuristic that applies CSS to mobile
- * viewports (i.e. phones, not tablets).
- *
- * Usage:
- * @include mobile-viewport() {
- *   :host {
- *     background-color: blue;
- *   }
- * }
- */
-:host {
-  --background: var(--ion-background-color, #fff);
-  --border-radius: 0;
-  --backdrop-opacity: 0;
-  color: var(--ion-text-color, #000);
-}
-
 @media only screen and (min-width: 768px) and (min-height: 600px) {
   :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) {
@@ -293,27 +163,43 @@ ion-backdrop {
   }
 }
 .modal-handle {
-  right: 0px;
   left: 0px;
+  right: 0px;
   top: 5px;
   border-radius: 8px;
+  -webkit-margin-start: auto;
+  margin-inline-start: auto;
+  -webkit-margin-end: auto;
+  margin-inline-end: auto;
+  position: absolute;
   width: 36px;
   height: 5px;
+  /**
+   * This allows the handle to appear
+   * on top of user content in WebKit.
+   */
+  transform: translateZ(0);
+  border: 0;
   background: var(--ion-color-step-350, var(--ion-background-color-step-350, #c0c0be));
+  cursor: pointer;
+  z-index: 11;
 }
 .modal-handle::before {
   /**
-  * Adds a 4px tap area to the perimeter
-  * of the handle.
-  */
+   * Adds a 4px tap area to the perimeter
+   * of the handle.
+   */
   -webkit-padding-start: 4px;
   padding-inline-start: 4px;
   -webkit-padding-end: 4px;
   padding-inline-end: 4px;
   padding-top: 4px;
   padding-bottom: 4px;
+  position: absolute;
   width: 36px;
   height: 5px;
+  transform: translate(-50%, -50%);
+  content: "";
 }
 
 /**
@@ -329,12 +215,18 @@ ion-backdrop {
   --height: calc(100% - (var(--ion-modal-offset-top, 0px) + 10px));
 }
 
-/**
- * Convert a pixels given value into rem
- * 
- * @param pixels - Value in pixels to be converted (i.e. px)
- * @param context (optional) - Baseline value
- */
+:host(.modal-sheet) .modal-wrapper,
+:host(.modal-sheet) .modal-shadow {
+  position: absolute;
+  bottom: 0;
+}
+
+:host(.modal-sheet.modal-no-expand-scroll) ion-footer {
+  position: absolute;
+  bottom: 0;
+  width: var(--width);
+}
+
 /**
  * Convert a font size to a dynamic font size.
  * Fonts that participate in Dynamic Type should use

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

@@ -12,9 +12,8 @@ import { BACKDROP, cleanupRootFocusTrapAccessibility, createTriggerController, d
 import { getClassMap } from "../../utils/theme";
 import { deepReady, waitForMount } from "../../utils/transition/index";
 import { config } from "../../global/config";
-import { getIonMode, getIonTheme } from "../../global/ionic-global";
+import { getIonMode } from "../../global/ionic-global";
 import { KEYBOARD_DID_OPEN } from "../../utils/keyboard/keyboard";
-import { ionicEnterAnimation } from "./animations/ionic.enter";
 import { iosEnterAnimation } from "./animations/ios.enter";
 import { iosLeaveAnimation } from "./animations/ios.leave";
 import { portraitToLandscapeTransition, landscapeToPortraitTransition } from "./animations/ios.transition";
@@ -26,8 +25,7 @@ import { getInitialSafeAreaConfig, getPositionBasedSafeAreaConfig, applySafeArea
 import { onModalHeightChange, setCardStatusBarDark, setCardStatusBarDefault } from "./utils";
 // TODO(FW-2832): types
 /**
- * @virtualProp {"ios" | "md"} mode - The mode determines the platform behaviors of the component.
- * @virtualProp {"ios" | "md" | "ionic"} theme - The theme determines the visual appearance of the component.
+ * @virtualProp {"ios" | "md"} mode - The mode determines which platform styles to use.
  *
  * @slot - Content is placed inside of the `.modal-content` element.
  *
@@ -489,12 +487,11 @@ export class Modal {
                 this.statusBarStyle = await StatusBar.getStyle();
                 setCardStatusBarDark();
             }
-            await present(this, 'modalEnter', iosEnterAnimation, mdEnterAnimation, ionicEnterAnimation, {
+            await present(this, 'modalEnter', iosEnterAnimation, mdEnterAnimation, {
                 presentingEl: presentingElement,
                 currentBreakpoint: this.initialBreakpoint,
                 backdropBreakpoint: this.backdropBreakpoint,
                 expandToScroll: this.expandToScroll,
-                staticBackdropOpacity: getIonTheme(this) === 'ionic',
             });
         }
         finally {
@@ -580,7 +577,6 @@ export class Modal {
             currentBreakpoint: initialBreakpoint,
             backdropBreakpoint,
             expandToScroll: this.expandToScroll,
-            staticBackdropOpacity: getIonTheme(this) === 'ionic',
         }));
         ani.progressStart(true, 1);
         const { gesture, moveSheetToBreakpoint, resetContentScroll } = createSheetGesture(this.el, this.backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, ani, this.sortedBreakpoints, this.expandToScroll, () => this.currentBreakpoint ?? 0, () => this.sheetOnDismiss(), (breakpoint) => {
@@ -588,7 +584,7 @@ export class Modal {
                 this.currentBreakpoint = breakpoint;
                 this.ionBreakpointDidChange.emit({ breakpoint });
             }
-        }, getIonTheme(this) === 'ionic', () => this.onDragStart(), (detail) => this.onDragMove(detail), (detail) => this.onDragEnd(detail));
+        }, () => this.onDragStart(), (detail) => this.onDragMove(detail), (detail) => this.onDragEnd(detail));
         this.gesture = gesture;
         this.moveSheetToBreakpoint = moveSheetToBreakpoint;
         this.resetSheetContentScroll = resetContentScroll;
@@ -863,18 +859,6 @@ export class Modal {
         await this.setCurrentBreakpoint(nextBreakpoint);
         return true;
     }
-    getShape() {
-        const theme = getIonTheme(this);
-        const { shape } = this;
-        // TODO(ROU-11167): Remove theme check when shapes are defined for all themes.
-        if (theme !== 'ionic') {
-            return undefined;
-        }
-        if (shape === undefined) {
-            return 'round';
-        }
-        return shape;
-    }
     initViewTransitionListener() {
         // Only enable for iOS card modals when no custom animations are provided
         if (getIonMode(this) !== 'ios' || !this.presentingElement || this.enterAnimation || this.leaveAnimation) {
@@ -1275,26 +1259,24 @@ export class Modal {
     render() {
         const { handle, isSheetModal, presentingElement, htmlAttributes, handleBehavior, inheritedAttributes, focusTrap, expandToScroll, } = this;
         const showHandle = handle !== false && isSheetModal;
-        const theme = getIonTheme(this);
-        const isCardModal = presentingElement !== undefined && theme === 'ios';
+        const mode = getIonMode(this);
+        const isCardModal = presentingElement !== undefined && mode === 'ios';
         const isHandleCycle = handleBehavior === 'cycle';
-        const shape = this.getShape();
         const isSheetModalWithHandle = isSheetModal && showHandle;
-        return (h(Host, { key: 'd7d9e9f103fb1ac669da34819e6f460316cffa48', "no-router": true,
+        return (h(Host, { key: '17a95bd7722bac2344bea041aff97db17f55c0cf', "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: {
-                [theme]: true,
+                [mode]: true,
                 ['modal-default']: !isCardModal && !isSheetModal,
                 [`modal-card`]: isCardModal,
                 [`modal-sheet`]: isSheetModal,
-                [`modal-${shape}`]: shape !== undefined,
                 [`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: '030d13dadaef45a24fd694478cf6583a637b9e9e', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), theme === 'ios' && h("div", { key: '111f4df167615ee37f6db3f1000f6bd1a6b25fee', class: "modal-shadow" }), h("div", { key: '2720518be4e2701a5641f31e3f13336778f2fdbb',
+            }, onIonBackdropTap: this.onBackdropTap, onIonModalDidPresent: this.onLifecycle, onIonModalWillPresent: this.onLifecycle, onIonModalWillDismiss: this.onLifecycle, onIonModalDidDismiss: this.onLifecycle, onFocus: this.onModalFocus }, h("ion-backdrop", { key: '9dab1ef4771c0d847ba2be8672afbaa2748517f3', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: '64af7ed1c5f552b61fc4b9387b926acc76c8a99a', class: "modal-shadow" }), h("div", { key: '7e76d77d5b2e8f0467bb793facf5aa86f8d01bbe',
             /*
               role and aria-modal must be used on the
               same element. They must also be set inside the
@@ -1307,24 +1289,22 @@ export class Modal {
               without the tabindex focus() would be a no-op and screen readers
               may not properly announce the dialog and its content when it opens.
             */
-            role: "dialog", ...inheritedAttributes, "aria-modal": "true", tabIndex: -1, class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }, showHandle && (h("button", { key: '7b8d765349e94315383e15c59ae55bbf92b7834a', class: "modal-handle",
+            role: "dialog", ...inheritedAttributes, "aria-modal": "true", tabIndex: -1, class: "modal-wrapper ion-overlay-wrapper", part: "content", ref: (el) => (this.wrapperEl = el) }, showHandle && (h("button", { key: '5efc0bb0a59adcc594ac48da9fd90e57908a7ffb', 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", "data-focus-order": "1", ref: (el) => (this.dragHandleEl = el) })), h("slot", { key: 'fb952f2216991352c002b796933d3dbee1397051', 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: '6175fcd0b39c086b4e9eb9e96c4d631c2a86774b', onSlotchange: this.onSlotChange }))));
     }
     static get is() { return "ion-modal"; }
     static get encapsulation() { return "shadow"; }
     static get originalStyleUrls() {
         return {
             "ios": ["modal.ios.scss"],
-            "md": ["modal.md.scss"],
-            "ionic": ["modal.ionic.scss"]
+            "md": ["modal.md.scss"]
         };
     }
     static get styleUrls() {
         return {
             "ios": ["modal.ios.css"],
-            "md": ["modal.md.css"],
-            "ionic": ["modal.ionic.css"]
+            "md": ["modal.md.css"]
         };
     }
     static get properties() {
@@ -1871,25 +1851,6 @@ export class Modal {
                 "reflect": false,
                 "attribute": "can-dismiss",
                 "defaultValue": "true"
-            },
-            "shape": {
-                "type": "string",
-                "mutable": false,
-                "complexType": {
-                    "original": "'soft' | 'round' | 'rectangular'",
-                    "resolved": "\"rectangular\" | \"round\" | \"soft\" | undefined",
-                    "references": {}
-                },
-                "required": false,
-                "optional": true,
-                "docs": {
-                    "tags": [],
-                    "text": "Set to `\"soft\"` for a modal with slightly rounded corners,\n`\"round\"` for a modal with fully rounded corners, or `\"rectangular\"`\nfor a modal without rounded corners.\n\nDefaults to `\"round\"` for the `ionic` theme, undefined for all other themes."
-                },
-                "getter": false,
-                "setter": false,
-                "reflect": false,
-                "attribute": "shape"
             }
         };
     }