@ionic/core 8.7.12-dev.11764868084.1e8d52ae → 8.7.12-dev.11764903007.1dc6d1ca

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.
@@ -46,12 +79,15 @@
   --min-height: auto;
   --max-height: auto;
   --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;
@@ -59,6 +95,7 @@
   align-items: center;
   justify-content: center;
   outline: none;
+  color: var(--ion-text-color, #000);
   contain: strict;
 }
 
@@ -67,6 +104,19 @@ ion-backdrop {
   pointer-events: auto;
 }
 
+/**
+ * When focus trap is disabled, allow clicks to pass through the modal
+ * to content behind it. The .modal-wrapper retains pointer-events: auto
+ * so modal content remains interactive.
+ */
+:host(.ion-disable-focus-trap) {
+  pointer-events: none;
+}
+
+:host(.ion-disable-focus-trap) ion-backdrop {
+  pointer-events: none;
+}
+
 :host(.overlay-hidden) {
   display: none;
 }
@@ -94,169 +144,6 @@ 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;
@@ -274,27 +161,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: "";
 }
 
 /**
@@ -305,12 +208,18 @@ ion-backdrop {
   --height: calc(100% - (var(--ion-safe-area-top) + 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,7 +12,7 @@ import { GESTURE, BACKDROP, dismiss, eventMethod, prepareOverlay, present, creat
 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 { iosEnterAnimation } from "./animations/ios.enter";
 import { iosLeaveAnimation } from "./animations/ios.leave";
@@ -24,8 +24,7 @@ import { createSwipeToCloseGesture, SwipeToCloseDefaults } from "./gestures/swip
 import { 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.
  *
@@ -432,7 +431,6 @@ export class Modal {
             currentBreakpoint: this.initialBreakpoint,
             backdropBreakpoint: this.backdropBreakpoint,
             expandToScroll: this.expandToScroll,
-            staticBackdropOpacity: getIonTheme(this) === 'ionic',
         });
         /* tslint:disable-next-line */
         if (typeof window !== 'undefined') {
@@ -465,7 +463,13 @@ export class Modal {
             };
             window.addEventListener(KEYBOARD_DID_OPEN, this.keyboardOpenCallback);
         }
-        if (this.isSheetModal) {
+        /**
+         * Recalculate isSheetModal here because framework bindings (e.g., Angular)
+         * may not have been applied when componentWillLoad ran.
+         */
+        const isSheetModal = this.breakpoints !== undefined && this.initialBreakpoint !== undefined;
+        this.isSheetModal = isSheetModal;
+        if (isSheetModal) {
             this.initSheetGesture();
         }
         else if (hasCardModal) {
@@ -536,7 +540,6 @@ export class Modal {
             currentBreakpoint: initialBreakpoint,
             backdropBreakpoint,
             expandToScroll: this.expandToScroll,
-            staticBackdropOpacity: getIonTheme(this) === 'ionic',
         }));
         ani.progressStart(true, 1);
         const { gesture, moveSheetToBreakpoint } = createSheetGesture(this.el, this.backdropEl, wrapperEl, initialBreakpoint, backdropBreakpoint, ani, this.sortedBreakpoints, this.expandToScroll, () => { var _a; return (_a = this.currentBreakpoint) !== null && _a !== void 0 ? _a : 0; }, () => this.sheetOnDismiss(), (breakpoint) => {
@@ -544,10 +547,35 @@ export class Modal {
                 this.currentBreakpoint = breakpoint;
                 this.ionBreakpointDidChange.emit({ breakpoint });
             }
-        }, getIonTheme(this) === 'ionic');
+        });
         this.gesture = gesture;
         this.moveSheetToBreakpoint = moveSheetToBreakpoint;
         this.gesture.enable(true);
+        /**
+         * When showBackdrop or focusTrap is false, allow clicks to pass through
+         * the modal to content behind it. This also handles the case where the modal
+         * is in a child route - the parent elements need pointer-events disabled.
+         * See https://github.com/ionic-team/ionic-framework/issues/30700
+         */
+        if (this.showBackdrop === false || this.focusTrap === false) {
+            this.el.classList.add(FOCUS_TRAP_DISABLE_CLASS);
+            this.el.style.setProperty('pointer-events', 'none');
+            if (this.backdropEl) {
+                this.backdropEl.style.setProperty('pointer-events', 'none');
+            }
+            /**
+             * The modal's original parent may block pointer events after the modal
+             * is moved to ion-app. Disable pointer-events on the parent and its
+             * immediate ion-router-outlet (if in a child route).
+             */
+            if (this.cachedOriginalParent) {
+                this.cachedOriginalParent.style.setProperty('pointer-events', 'none');
+                const immediateParent = this.cachedOriginalParent.parentElement;
+                if ((immediateParent === null || immediateParent === void 0 ? void 0 : immediateParent.tagName) === 'ION-ROUTER-OUTLET') {
+                    immediateParent.style.setProperty('pointer-events', 'none');
+                }
+            }
+        }
     }
     sheetOnDismiss() {
         /**
@@ -579,7 +607,7 @@ export class Modal {
      * For example, `cancel` or `backdrop`.
      */
     async dismiss(data, role) {
-        var _a;
+        var _a, _b;
         if (this.gestureAnimationDismissing && role !== GESTURE) {
             return false;
         }
@@ -637,6 +665,19 @@ export class Modal {
             }
             this.cleanupViewTransitionListener();
             this.cleanupParentRemovalObserver();
+            /**
+             * Clean up pointer-events changes made in initSheetGesture.
+             */
+            this.el.classList.remove(FOCUS_TRAP_DISABLE_CLASS);
+            this.el.style.removeProperty('pointer-events');
+            (_b = this.backdropEl) === null || _b === void 0 ? void 0 : _b.style.removeProperty('pointer-events');
+            if (this.cachedOriginalParent) {
+                this.cachedOriginalParent.style.removeProperty('pointer-events');
+                const immediateParent = this.cachedOriginalParent.parentElement;
+                if ((immediateParent === null || immediateParent === void 0 ? void 0 : immediateParent.tagName) === 'ION-ROUTER-OUTLET') {
+                    immediateParent.style.removeProperty('pointer-events');
+                }
+            }
         }
         this.currentBreakpoint = undefined;
         this.animation = undefined;
@@ -712,18 +753,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) {
@@ -890,40 +919,37 @@ 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, Object.assign({ key: '8ced9dcdb4ec35817bc1ad5f4f0c1b56bf76c93f', "no-router": true,
+        return (h(Host, Object.assign({ key: '034e57f66152a97863886b8152f0b9c64139a719', "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({ [theme]: 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: '952e76177128f7c5dcc9c9fe7792d73ec4c9c573', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), theme === 'ios' && h("div", { key: '3be69826a33edae93d2276b88347f025f3b46d92', class: "modal-shadow" }), h("div", Object.assign({ key: 'adeb46e4c78d08418f27277db8300706f1ce6d48',
+            }, 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: 'e60cea429657b664475d930a45ea15b65c97b9b6', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: '9cacec5e0eb6c8a2683318656c6aaafdd4edf561', class: "modal-shadow" }), h("div", Object.assign({ key: '63de4640f1ddb2d290e9a86a637f1f6034d653ae',
             /*
               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: '22ac19bef95f75b5b26147c6c41439690beb3849', 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: '760ef15fe7f75dbcc608a20a66c5f0ba31ee293e', 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: '0039450fb7b0caa84f7a16c38e6db148cd9a5371', 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: '68bab993da56d687b7c3f7fd5b8faa6128269b42', 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() {
@@ -1464,25 +1490,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"
             }
         };
     }