@ionic/core 8.8.16-dev.11784913436.1a334b43 → 8.8.16-dev.11784914346.10d0804c

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

@@ -1,12 +1,14 @@
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
  */
-import { getIonMode } from "../../global/ionic-global";
+import { getIonMode, getIonTheme } from "../../global/ionic-global";
+import xRegular from "@phosphor-icons/core/assets/regular/x.svg";
 import { Host, forceUpdate, h } from "@stencil/core";
 import { getOverlayLabelJustify, getOverlayLabelPlacement } from "../../utils/overlay-control-label";
 import { safeCall } from "../../utils/overlays";
 import { renderOptionLabel } from "../../utils/select-option-render";
-import { getClassMap } from "../../utils/theme";
+import { getClassMap, hostContext } from "../../utils/theme";
+import { closeOutline, closeSharp } from "ionicons/icons";
 export class SelectModal {
     constructor() {
         // Tracks the option that received Enter-keydown so keyup only
@@ -17,6 +19,12 @@ export class SelectModal {
          * The text to display on the cancel button.
          */
         this.cancelText = 'Close';
+        /**
+         * If `true`, the cancel button will display a close icon instead of the `cancelText`.
+         * When `cancelIcon` is `true`, `cancelText` is not displayed visually but is still used
+         * as the accessible label (`aria-label`) for the button.
+         */
+        this.cancelIcon = false;
         this.options = [];
     }
     closeModal() {
@@ -57,8 +65,24 @@ export class SelectModal {
             option.checked = ev.detail.checked;
         }
     }
+    get cancelButtonIcon() {
+        const theme = getIonTheme(this);
+        const icons = {
+            ios: closeOutline,
+            md: closeSharp,
+            ionic: xRegular,
+        };
+        return icons[theme];
+    }
+    getModalContextClasses() {
+        const el = this.el;
+        return {
+            'in-modal-default': hostContext('ion-modal.modal-default', el),
+            'in-modal-sheet': hostContext('ion-modal.modal-sheet', el),
+        };
+    }
     renderRadioOptions() {
-        const mode = getIonMode(this);
+        const theme = getIonTheme(this);
         const checked = this.options.filter((o) => o.checked).map((o) => o.value)[0];
         return (h("ion-radio-group", { value: checked, onIonChange: (ev) => this.callOptionHandler(ev) }, this.options.map((option, index) => {
             var _a, _b;
@@ -77,9 +101,9 @@ export class SelectModal {
                 endContent: richOption.endContent,
                 description: richOption.description,
             };
-            const defaultLabelPlacement = getOverlayLabelPlacement(mode, 'radio', 'modal');
-            const defaultJustify = getOverlayLabelJustify(mode, 'radio', 'modal');
-            return (h("ion-item", { lines: "none",
+            const defaultLabelPlacement = getOverlayLabelPlacement(theme, 'radio', 'modal');
+            const defaultJustify = getOverlayLabelJustify(theme, 'radio', 'modal');
+            return (h("ion-item", { lines: "none", "data-focus-ignore": true,
                 // TODO FW-4784
                 disabled: option.disabled, class: Object.assign({
                     // TODO FW-4784
@@ -106,7 +130,7 @@ export class SelectModal {
         })));
     }
     renderCheckboxOptions() {
-        const mode = getIonMode(this);
+        const theme = getIonTheme(this);
         return this.options.map((option, index) => {
             var _a, _b;
             /**
@@ -124,15 +148,14 @@ export class SelectModal {
                 endContent: richOption.endContent,
                 description: richOption.description,
             };
-            const defaultLabelPlacement = getOverlayLabelPlacement(mode, 'checkbox', 'modal');
-            const defaultJustify = getOverlayLabelJustify(mode, 'checkbox', 'modal');
-            return (h("ion-item", {
+            const defaultLabelPlacement = getOverlayLabelPlacement(theme, 'checkbox', 'modal');
+            const defaultJustify = getOverlayLabelJustify(theme, 'checkbox', 'modal');
+            return (h("ion-item", { "data-focus-ignore": true,
                 // TODO FW-4784
                 disabled: option.disabled, class: Object.assign({
                     // TODO FW-4784
                     'item-checkbox-checked': option.checked
-                }, getClassMap(option.cssClass))
-            }, h("ion-checkbox", { class: {
+                }, getClassMap(option.cssClass)) }, h("ion-checkbox", { class: {
                     'select-option-has-rich-content': hasRichContent,
                 }, value: option.value, disabled: option.disabled, checked: option.checked, justify: (_a = richOption.justify) !== null && _a !== void 0 ? _a : defaultJustify, labelPlacement: (_b = richOption.labelPlacement) !== null && _b !== void 0 ? _b : defaultLabelPlacement, onIonChange: (ev) => {
                     this.setChecked(ev);
@@ -143,7 +166,7 @@ export class SelectModal {
         });
     }
     render() {
-        return (h(Host, { key: '2cb1ae057b7a66f5d12c926f618f6b945f019803', class: getIonMode(this) }, h("ion-header", { key: 'e41f1c4ad1c71dcc927d210502d6366cea894a14' }, h("ion-toolbar", { key: '1a191dfc8980541469ee4d8996ba4de52cac1ac5' }, this.header !== undefined && h("ion-title", { key: '14ab9cb7d41d15b982c6ccd8ba6cee0e9cb528d9' }, this.header), h("ion-buttons", { key: '80451a2ed3a82138eb1575135cf2ebbd5e8f6e60', slot: "end" }, h("ion-button", { key: '01a315cd739569f3c0b23a4d243d52b69b63dfa7', onClick: () => this.closeModal() }, this.cancelText)))), h("ion-content", { key: 'd953101bae9a91f8108f7a5e411bb1e34338655d' }, h("ion-list", { key: '171a5668afc67b03d2ee87e91cf400b17541bc7f' }, this.multiple === true ? this.renderCheckboxOptions() : this.renderRadioOptions()))));
+        return (h(Host, { key: '9c8958c8e0b84421e5d6468bfc582acbea6a5f4f', class: Object.assign({ [getIonMode(this)]: true }, this.getModalContextClasses()) }, h("ion-header", { key: 'f994491c2b20ce1051e72bd164e4d5801e3cbe3c' }, h("ion-toolbar", { key: '9259caf459d88d0c83415ff2c612ad1dbb82598f' }, this.header !== undefined && h("ion-title", { key: '8eac7a1449dccd2e875639b2ded9b3b01759d474' }, this.header), h("ion-buttons", { key: 'b5a988ceb69f4b6b12c6f8379871120a18418f7c', slot: "end" }, h("ion-button", { key: 'ff996f920f44202a251abccc2e5ff9c586fdd5c5', "aria-label": this.cancelIcon ? this.cancelText : undefined, "data-focus-order": "2", onClick: () => this.closeModal() }, this.cancelIcon ? (h("ion-icon", { "aria-hidden": "true", slot: "icon-only", icon: this.cancelButtonIcon })) : (this.cancelText))))), h("ion-content", { key: 'b97cacb34df32548d36404919d316eb4bd1e5b71' }, h("ion-list", { key: 'f45ced2c9818d471f95046014f962163c72a9570' }, this.multiple === true ? this.renderCheckboxOptions() : this.renderRadioOptions()))));
     }
     static get is() { return "ion-select-modal"; }
     static get encapsulation() { return "scoped"; }
@@ -151,14 +174,14 @@ export class SelectModal {
         return {
             "ios": ["select-modal.ios.scss"],
             "md": ["select-modal.md.scss"],
-            "ionic": ["select-modal.md.scss"]
+            "ionic": ["select-modal.ionic.scss"]
         };
     }
     static get styleUrls() {
         return {
             "ios": ["select-modal.ios.css"],
             "md": ["select-modal.md.css"],
-            "ionic": ["select-modal.md.css"]
+            "ionic": ["select-modal.ionic.css"]
         };
     }
     static get properties() {
@@ -202,6 +225,26 @@ export class SelectModal {
                 "attribute": "cancel-text",
                 "defaultValue": "'Close'"
             },
+            "cancelIcon": {
+                "type": "boolean",
+                "mutable": false,
+                "complexType": {
+                    "original": "boolean",
+                    "resolved": "boolean",
+                    "references": {}
+                },
+                "required": false,
+                "optional": false,
+                "docs": {
+                    "tags": [],
+                    "text": "If `true`, the cancel button will display a close icon instead of the `cancelText`.\nWhen `cancelIcon` is `true`, `cancelText` is not displayed visually but is still used\nas the accessible label (`aria-label`) for the button."
+                },
+                "getter": false,
+                "setter": false,
+                "reflect": false,
+                "attribute": "cancel-icon",
+                "defaultValue": "false"
+            },
             "multiple": {
                 "type": "boolean",
                 "mutable": false,

package/dist/collection/components/select-modal/select-modal.md.css

@@ -1,3 +1,182 @@
+/**
+ * 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;
+ *   }
+ * }
+ */
+/**
+ * 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 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.
+ */
+.action-sheet-button-label-has-rich-content,
+.alert-radio-label-has-rich-content,
+.alert-checkbox-label-has-rich-content,
+.select-option-label-has-rich-content {
+  gap: 16px;
+}
+
+.action-sheet-button-label-text,
+.alert-checkbox-label-text,
+.alert-radio-label-text,
+.select-option-label-text {
+  gap: 12px;
+}
+
+.select-option-start,
+.select-option-end {
+  gap: 8px;
+}
+
+.select-option-description {
+  padding-left: 0;
+  padding-right: 0;
+  padding-top: 5px;
+  padding-bottom: 0;
+  color: var(--ion-color-step-700, var(--ion-text-color-step-300, #4d4d4d));
+  font-size: 0.75rem;
+}
+
+/**
+ * Cap slotted children so they can't stretch the option
+ * row out of proportion, keeping rows visually uniform
+ * regardless of the content.
+ */
+.select-option-start > ion-avatar,
+.select-option-end > ion-avatar {
+  width: 40px;
+  height: 40px;
+}
+
+.select-option-start > ion-icon,
+.select-option-end > ion-icon {
+  width: 24px;
+  height: 24px;
+}
+
+.select-option-start > ion-img,
+.select-option-start > img,
+.select-option-start > svg,
+.select-option-start > ion-thumbnail,
+.select-option-end > ion-img,
+.select-option-end > img,
+.select-option-end > svg,
+.select-option-end > ion-thumbnail {
+  width: 56px;
+  height: 56px;
+}
+
+.select-option-start > video,
+.select-option-end > video {
+  width: 114px;
+  height: 56px;
+}
+
 /**
  * A heuristic that applies CSS to tablet
  * viewports.
@@ -53,13 +232,101 @@
  * @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 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;
+ *   }
+ * }
+ */
+.action-sheet-button-label-has-rich-content,
+.alert-radio-label-has-rich-content,
+.alert-checkbox-label-has-rich-content,
+.select-option-label-has-rich-content {
+  gap: 16px;
+}
+
+.action-sheet-button-label-text,
+.alert-checkbox-label-text,
+.alert-radio-label-text,
+.select-option-label-text {
+  gap: 12px;
+}
+
+.select-option-start,
+.select-option-end {
+  gap: 8px;
+}
+
+.select-option-description {
+  padding-left: 0;
+  padding-right: 0;
+  padding-top: 5px;
+  padding-bottom: 0;
+  color: var(--ion-color-step-700, var(--ion-text-color-step-300, #4d4d4d));
+  font-size: 0.75rem;
+}
+
 .action-sheet-button-label-has-rich-content,
 .alert-radio-label-has-rich-content,
 .alert-checkbox-label-has-rich-content,
 .select-option-label-has-rich-content {
   display: flex;
   align-items: center;
-  gap: 16px;
 }
 
 /**
@@ -80,24 +347,16 @@
 .select-option-label-text {
   display: flex;
   align-items: center;
-  gap: 12px;
 }
 
 .select-option-start,
 .select-option-end {
   display: flex;
   align-items: center;
-  gap: 8px;
 }
 
 .select-option-description {
-  padding-left: 0;
-  padding-right: 0;
-  padding-top: 5px;
-  padding-bottom: 0;
   display: block;
-  color: var(--ion-color-step-700, var(--ion-text-color-step-300, #4d4d4d));
-  font-size: 0.75rem;
 }
 
 /**
@@ -128,41 +387,6 @@ ion-checkbox.select-option-has-rich-content::part(label),
   white-space: normal;
 }
 
-/**
- * Cap slotted children so they can't stretch the option
- * row out of proportion, keeping rows visually uniform
- * regardless of the content.
- */
-.select-option-start > ion-avatar,
-.select-option-end > ion-avatar {
-  width: 40px;
-  height: 40px;
-}
-
-.select-option-start > ion-icon,
-.select-option-end > ion-icon {
-  width: 24px;
-  height: 24px;
-}
-
-.select-option-start > ion-img,
-.select-option-start > img,
-.select-option-start > svg,
-.select-option-start > ion-thumbnail,
-.select-option-end > ion-img,
-.select-option-end > img,
-.select-option-end > svg,
-.select-option-end > ion-thumbnail {
-  width: 56px;
-  height: 56px;
-}
-
-.select-option-start > video,
-.select-option-end > video {
-  width: 114px;
-  height: 56px;
-}
-
 :host {
   height: 100%;
 }
@@ -189,6 +413,12 @@ ion-checkbox.select-option-has-rich-content::part(label),
  *   }
  * }
  */
+/**
+ * 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

package/dist/collection/components/select-option/select-option.js

@@ -2,9 +2,10 @@
  * (C) Ionic http://ionicframework.com - MIT License
  */
 import { Host, h } from "@stencil/core";
-import { getIonMode } from "../../global/ionic-global";
+import { getIonTheme } from "../../global/ionic-global";
 /**
  * @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.
  *
  * @slot - Content is placed between the named slots if provided without a slot.
  * @slot start - Content is placed to the left of the select option text in LTR, and to the right in RTL.
@@ -19,7 +20,10 @@ export class SelectOption {
         this.disabled = false;
     }
     render() {
-        return h(Host, { key: '8b8bef0f5a55f18048708c34d3ea3ff0ff2f1d47', role: "option", id: this.inputId, class: getIonMode(this) });
+        const theme = getIonTheme(this);
+        return (h(Host, { key: '059d2198c422852c16aba1c7523ac6e9e586006f', class: {
+                [theme]: true,
+            }, role: "option", id: this.inputId }));
     }
     static get is() { return "ion-select-option"; }
     static get encapsulation() { return "shadow"; }
@@ -105,7 +109,7 @@ export class SelectOption {
                 "optional": true,
                 "docs": {
                     "tags": [],
-                    "text": "Where the label is placed relative to the option's selection control\n(radio circle or checkbox box) when the option is rendered in an\n`alert`, `popover`, or `modal` interface.\n`\"start\"`: The label will appear to the left of the radio in LTR and to the right in RTL.\n`\"end\"`: The label will appear to the right of the radio in LTR and to the left in RTL.\n\nApplies to the `alert`, `popover`, and `modal` interfaces, but has no\nvisible effect on radio options in `popover` or `modal` on `md` (the radio control is hidden there).\n\nWhen unset, the interface picks a default based on mode and control\ntype."
+                    "text": "Where the label is placed relative to the option's selection control\n(radio circle or checkbox box) when the option is rendered in an\n`alert`, `popover`, or `modal` interface.\n`\"start\"`: The label will appear to the left of the radio in LTR and to the right in RTL.\n`\"end\"`: The label will appear to the right of the radio in LTR and to the left in RTL.\n\nApplies to the `alert`, `popover`, and `modal` interfaces, but has no\nvisible effect on radio options in `popover` or `modal` on the `md`\nand `ionic` themes (the radio control is hidden there).\n\nWhen unset, the interface picks a default based on theme and control\ntype."
                 },
                 "getter": false,
                 "setter": false,
@@ -124,7 +128,7 @@ export class SelectOption {
                 "optional": true,
                 "docs": {
                     "tags": [],
-                    "text": "How to pack the label and the option's selection control within a line.\n`\"start\"`: The label and radio will appear on the left in LTR and\non the right in RTL.\n`\"end\"`: The label and radio will appear on the right in LTR and\non the left in RTL.\n`\"space-between\"`: The label and radio will appear on opposite\nends of the line with space between the two elements.\n\nApplies to the `alert`, `popover`, and `modal` interfaces, but has no\nvisible effect on radio options in `popover` or `modal` on `md` (the radio control is hidden there).\n\nWhen unset, the interface picks a default based on mode and control\ntype."
+                    "text": "How to pack the label and the option's selection control within a line.\n`\"start\"`: The label and radio will appear on the left in LTR and\non the right in RTL.\n`\"end\"`: The label and radio will appear on the right in LTR and\non the left in RTL.\n`\"space-between\"`: The label and radio will appear on opposite\nends of the line with space between the two elements.\n\nApplies to the `alert`, `popover`, and `modal` interfaces, but has no\nvisible effect on radio options in `popover` or `modal` on the `md`\nand `ionic` themes (the radio control is hidden there).\n\nWhen unset, the interface picks a default based on theme and control\ntype."
                 },
                 "getter": false,
                 "setter": false,