@ionic/core 9.0.6-dev.11790615145.1d8c56a2 → 9.0.6-dev.11790776272.1d27d1bd

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 { config } from "../../global/config";
+import { getIonMode, getIonTheme } from "../../global/ionic-global";
 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,26 @@ export class SelectModal {
             option.checked = ev.detail.checked;
         }
     }
+    /**
+     * Get the icon to use for the cancel icon.
+     * Use the icon set in the config.
+     * If no icon is set in the config, use the default icon.
+     */
+    get selectModalCancelIcon() {
+        // Determine the theme and map to the default icon
+        const theme = getIonTheme(this);
+        const defaultIcon = theme === 'ios' ? closeOutline : closeSharp;
+        return config.get('selectModalCancelIcon', defaultIcon);
+    }
+    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) => {
             /**
@@ -76,9 +102,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: {
                     // TODO FW-4784
@@ -106,7 +132,7 @@ export class SelectModal {
         })));
     }
     renderCheckboxOptions() {
-        const mode = getIonMode(this);
+        const theme = getIonTheme(this);
         return this.options.map((option, index) => {
             /**
              * Cast to `SelectOverlayOption` to access rich content
@@ -123,16 +149,15 @@ 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: {
                     // TODO FW-4784
                     'item-checkbox-checked': option.checked,
                     ...getClassMap(option.cssClass),
-                }
-            }, h("ion-checkbox", { class: {
+                } }, h("ion-checkbox", { class: {
                     'select-option-has-rich-content': hasRichContent,
                 }, value: option.value, disabled: option.disabled, checked: option.checked, justify: richOption.justify ?? defaultJustify, labelPlacement: richOption.labelPlacement ?? defaultLabelPlacement, onIonChange: (ev) => {
                     this.setChecked(ev);
@@ -143,7 +168,10 @@ export class SelectModal {
         });
     }
     render() {
-        return (h(Host, { key: '791e95b985dd4b135db17a25fc678e9f8b73c597', class: getIonMode(this) }, h("ion-header", { key: '697d18eef394c4c11c73afe69b9eadd1bad97d38' }, h("ion-toolbar", { key: '036968824ad8771020fe2b7604a6e72b73efc8ae' }, this.header !== undefined && h("ion-title", { key: '102e0346be83e879e733f9b410437b26216156aa' }, this.header), h("ion-buttons", { key: '436b997e990ce2f5e12e1651f8afc31ae231f7b0', slot: "end" }, h("ion-button", { key: 'ee4ddfd0612d33583aa0b93ebdb5257b10d4fda5', onClick: () => this.closeModal() }, this.cancelText)))), h("ion-content", { key: '38ea098f85ac69226e614e0a09f668e9209f7ea1' }, h("ion-list", { key: '20becc2537a1a027915fe0598203039ceb8ba4f3' }, this.multiple === true ? this.renderCheckboxOptions() : this.renderRadioOptions()))));
+        return (h(Host, { key: '523097dfb459f06d3060496c86230d2e739b0ed3', class: {
+                [getIonMode(this)]: true,
+                ...this.getModalContextClasses(),
+            } }, h("ion-header", { key: 'd07eeb47de02254fea5db6932a655c0423cc7975' }, h("ion-toolbar", { key: 'a12d6f5d96168024ac97e48ffb95e1f26df81d23' }, this.header !== undefined && h("ion-title", { key: '33cf2de34a1eff6ce412d9c17608dd628d95ea3c' }, this.header), h("ion-buttons", { key: '8da140fbb98d7032f787940b8481d5d84fc3e1e1', slot: "end" }, h("ion-button", { key: 'b579ce37b28c9e934f35c63441933712b59874ff', "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.selectModalCancelIcon })) : (this.cancelText))))), h("ion-content", { key: '56a33bcd8ab6676571c0264fec04074779099e2e' }, h("ion-list", { key: 'f9efec43aedc2afb5beb5b61a3207e09ce298b82' }, this.multiple === true ? this.renderCheckboxOptions() : this.renderRadioOptions()))));
     }
     static get is() { return "ion-select-modal"; }
     static get encapsulation() { return "scoped"; }
@@ -151,14 +179,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 +230,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,181 @@
+/**
+ * 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 {
+  font-size: 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 +231,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 +346,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,40 +386,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 {
-  font-size: 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%;
 }
@@ -188,6 +412,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: '01275b5a613c4b065b24e0d939f611f6ed1fc9ee', role: "option", id: this.inputId, class: getIonMode(this) });
+        const theme = getIonTheme(this);
+        return (h(Host, { key: '14c492767ce4ac6793b8807a443ddd313608e941', 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,