@ionic/core 8.7.6-dev.11759493293.13f81b9f → 8.7.6-dev.11759523190.11a976aa

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') {
@@ -536,7 +534,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,7 +541,7 @@ export class Modal {
                 this.currentBreakpoint = breakpoint;
                 this.ionBreakpointDidChange.emit({ breakpoint });
             }
-        }, getIonTheme(this) === 'ionic');
+        });
         this.gesture = gesture;
         this.moveSheetToBreakpoint = moveSheetToBreakpoint;
         this.gesture.enable(true);
@@ -712,18 +709,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,46 +875,44 @@ 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: '9e9a7bd591eb17a225a00b4fa2e379e94601d17f', "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: 'e5eae2c14f830f75e308fcd7f4c10c86fac5b962', ref: (el) => (this.backdropEl = el), visible: this.showBackdrop, tappable: this.backdropDismiss, part: "backdrop" }), mode === 'ios' && h("div", { key: 'e268f9cd310c3cf4e051b5b92524ce4fb70d005e', class: "modal-shadow" }), h("div", Object.assign({ key: '9c380f36c18144c153077b15744d1c3346bce63e',
             /*
               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: '2d5ee6d5959d97309c306e8ce72eb0f2c19be144', 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: '5590434c35ea04c42fc006498bc189038e15a298', 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() {
         return {
             "hasController": {
                 "type": "boolean",
+                "attribute": "has-controller",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean",
@@ -948,11 +931,11 @@ export class Modal {
                 "getter": false,
                 "setter": false,
                 "reflect": false,
-                "attribute": "has-controller",
                 "defaultValue": "false"
             },
             "overlayIndex": {
                 "type": "number",
+                "attribute": "overlay-index",
                 "mutable": false,
                 "complexType": {
                     "original": "number",
@@ -970,11 +953,11 @@ export class Modal {
                 },
                 "getter": false,
                 "setter": false,
-                "reflect": false,
-                "attribute": "overlay-index"
+                "reflect": false
             },
             "delegate": {
                 "type": "unknown",
+                "attribute": "delegate",
                 "mutable": false,
                 "complexType": {
                     "original": "FrameworkDelegate",
@@ -1001,6 +984,7 @@ export class Modal {
             },
             "keyboardClose": {
                 "type": "boolean",
+                "attribute": "keyboard-close",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean",
@@ -1016,11 +1000,11 @@ export class Modal {
                 "getter": false,
                 "setter": false,
                 "reflect": false,
-                "attribute": "keyboard-close",
                 "defaultValue": "true"
             },
             "enterAnimation": {
                 "type": "unknown",
+                "attribute": "enter-animation",
                 "mutable": false,
                 "complexType": {
                     "original": "AnimationBuilder",
@@ -1044,6 +1028,7 @@ export class Modal {
             },
             "leaveAnimation": {
                 "type": "unknown",
+                "attribute": "leave-animation",
                 "mutable": false,
                 "complexType": {
                     "original": "AnimationBuilder",
@@ -1067,6 +1052,7 @@ export class Modal {
             },
             "breakpoints": {
                 "type": "unknown",
+                "attribute": "breakpoints",
                 "mutable": false,
                 "complexType": {
                     "original": "number[]",
@@ -1084,6 +1070,7 @@ export class Modal {
             },
             "expandToScroll": {
                 "type": "boolean",
+                "attribute": "expand-to-scroll",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean",
@@ -1099,11 +1086,11 @@ export class Modal {
                 "getter": false,
                 "setter": false,
                 "reflect": false,
-                "attribute": "expand-to-scroll",
                 "defaultValue": "true"
             },
             "initialBreakpoint": {
                 "type": "number",
+                "attribute": "initial-breakpoint",
                 "mutable": false,
                 "complexType": {
                     "original": "number",
@@ -1118,11 +1105,11 @@ export class Modal {
                 },
                 "getter": false,
                 "setter": false,
-                "reflect": false,
-                "attribute": "initial-breakpoint"
+                "reflect": false
             },
             "backdropBreakpoint": {
                 "type": "number",
+                "attribute": "backdrop-breakpoint",
                 "mutable": false,
                 "complexType": {
                     "original": "number",
@@ -1138,11 +1125,11 @@ export class Modal {
                 "getter": false,
                 "setter": false,
                 "reflect": false,
-                "attribute": "backdrop-breakpoint",
                 "defaultValue": "0"
             },
             "handle": {
                 "type": "boolean",
+                "attribute": "handle",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean",
@@ -1157,11 +1144,11 @@ export class Modal {
                 },
                 "getter": false,
                 "setter": false,
-                "reflect": false,
-                "attribute": "handle"
+                "reflect": false
             },
             "handleBehavior": {
                 "type": "string",
+                "attribute": "handle-behavior",
                 "mutable": false,
                 "complexType": {
                     "original": "ModalHandleBehavior",
@@ -1183,11 +1170,11 @@ export class Modal {
                 "getter": false,
                 "setter": false,
                 "reflect": false,
-                "attribute": "handle-behavior",
                 "defaultValue": "'none'"
             },
             "component": {
                 "type": "string",
+                "attribute": "component",
                 "mutable": false,
                 "complexType": {
                     "original": "ComponentRef",
@@ -1211,11 +1198,11 @@ export class Modal {
                 },
                 "getter": false,
                 "setter": false,
-                "reflect": false,
-                "attribute": "component"
+                "reflect": false
             },
             "componentProps": {
                 "type": "unknown",
+                "attribute": "component-props",
                 "mutable": false,
                 "complexType": {
                     "original": "ComponentProps",
@@ -1242,6 +1229,7 @@ export class Modal {
             },
             "cssClass": {
                 "type": "string",
+                "attribute": "css-class",
                 "mutable": false,
                 "complexType": {
                     "original": "string | string[]",
@@ -1259,11 +1247,11 @@ export class Modal {
                 },
                 "getter": false,
                 "setter": false,
-                "reflect": false,
-                "attribute": "css-class"
+                "reflect": false
             },
             "backdropDismiss": {
                 "type": "boolean",
+                "attribute": "backdrop-dismiss",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean",
@@ -1279,11 +1267,11 @@ export class Modal {
                 "getter": false,
                 "setter": false,
                 "reflect": false,
-                "attribute": "backdrop-dismiss",
                 "defaultValue": "true"
             },
             "showBackdrop": {
                 "type": "boolean",
+                "attribute": "show-backdrop",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean",
@@ -1299,11 +1287,11 @@ export class Modal {
                 "getter": false,
                 "setter": false,
                 "reflect": false,
-                "attribute": "show-backdrop",
                 "defaultValue": "true"
             },
             "animated": {
                 "type": "boolean",
+                "attribute": "animated",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean",
@@ -1319,11 +1307,11 @@ export class Modal {
                 "getter": false,
                 "setter": false,
                 "reflect": false,
-                "attribute": "animated",
                 "defaultValue": "true"
             },
             "presentingElement": {
                 "type": "unknown",
+                "attribute": "presenting-element",
                 "mutable": false,
                 "complexType": {
                     "original": "HTMLElement",
@@ -1346,6 +1334,7 @@ export class Modal {
             },
             "htmlAttributes": {
                 "type": "unknown",
+                "attribute": "html-attributes",
                 "mutable": false,
                 "complexType": {
                     "original": "{ [key: string]: any }",
@@ -1363,6 +1352,7 @@ export class Modal {
             },
             "isOpen": {
                 "type": "boolean",
+                "attribute": "is-open",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean",
@@ -1378,11 +1368,11 @@ export class Modal {
                 "getter": false,
                 "setter": false,
                 "reflect": false,
-                "attribute": "is-open",
                 "defaultValue": "false"
             },
             "trigger": {
                 "type": "string",
+                "attribute": "trigger",
                 "mutable": false,
                 "complexType": {
                     "original": "string | undefined",
@@ -1397,11 +1387,11 @@ export class Modal {
                 },
                 "getter": false,
                 "setter": false,
-                "reflect": false,
-                "attribute": "trigger"
+                "reflect": false
             },
             "keepContentsMounted": {
                 "type": "boolean",
+                "attribute": "keep-contents-mounted",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean",
@@ -1417,11 +1407,11 @@ export class Modal {
                 "getter": false,
                 "setter": false,
                 "reflect": false,
-                "attribute": "keep-contents-mounted",
                 "defaultValue": "false"
             },
             "focusTrap": {
                 "type": "boolean",
+                "attribute": "focus-trap",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean",
@@ -1437,11 +1427,11 @@ export class Modal {
                 "getter": false,
                 "setter": false,
                 "reflect": false,
-                "attribute": "focus-trap",
                 "defaultValue": "true"
             },
             "canDismiss": {
                 "type": "boolean",
+                "attribute": "can-dismiss",
                 "mutable": false,
                 "complexType": {
                     "original": "boolean | ((data?: any, role?: string) => Promise<boolean>)",
@@ -1462,27 +1452,7 @@ export class Modal {
                 "getter": false,
                 "setter": false,
                 "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"
             }
         };
     }