voyager-ionic-core 7.7.3 → 8.0.0-beta.2

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

@@ -2,9 +2,8 @@
  * (C) Ionic http://ionicframework.com - MIT License
  */
 import { Host, h, forceUpdate } from "@stencil/core";
-import { compareOptions, createLegacyFormController, createNotchController, isOptionSelected } from "../../utils/forms/index";
-import { findItemLabel, focusVisibleElement, getAriaLabel, renderHiddenInput, inheritAttributes } from "../../utils/helpers";
-import { printIonWarning } from "../../utils/logging/index";
+import { compareOptions, createNotchController, isOptionSelected } from "../../utils/forms/index";
+import { focusVisibleElement, getAriaLabel, renderHiddenInput, inheritAttributes } from "../../utils/helpers";
 import { actionSheetController, alertController, popoverController } from "../../utils/overlays";
 import { isRTL } from "../../utils/rtl/index";
 import { createColorClasses, hostContext } from "../../utils/theme";
@@ -29,8 +28,6 @@ export class Select {
     constructor() {
         this.inputId = `ion-sel-${selectIds++}`;
         this.inheritedAttributes = {};
-        // This flag ensures we log the deprecation warning at most once.
-        this.hasLoggedDeprecationWarning = false;
         this.onClick = (ev) => {
             const target = ev.target;
             const closestSlot = target.closest('[slot="start"], [slot="end"]');
@@ -85,7 +82,6 @@ export class Select {
         this.justify = 'space-between';
         this.label = undefined;
         this.labelPlacement = 'start';
-        this.legacy = undefined;
         this.multiple = false;
         this.name = this.inputId;
         this.okText = 'OK';
@@ -108,7 +104,6 @@ export class Select {
     }
     async connectedCallback() {
         const { el } = this;
-        this.legacyFormController = createLegacyFormController(el);
         this.notchController = createNotchController(el, () => this.notchSpacerEl, () => this.labelSlot);
         this.updateOverlayOptions();
         this.emitStyle();
@@ -312,38 +307,24 @@ export class Select {
         const value = this.value;
         let event = ev;
         let size = 'auto';
-        if (this.legacyFormController.hasLegacyControl()) {
-            const item = this.el.closest('ion-item');
-            // If the select is inside of an item containing a floating
-            // or stacked label then the popover should take up the
-            // full width of the item when it presents
-            if (item && (item.classList.contains('item-label-floating') || item.classList.contains('item-label-stacked'))) {
-                event = Object.assign(Object.assign({}, ev), { detail: {
-                        ionShadowTarget: item,
-                    } });
-                size = 'cover';
-            }
-        }
-        else {
-            const hasFloatingOrStackedLabel = labelPlacement === 'floating' || labelPlacement === 'stacked';
+        const hasFloatingOrStackedLabel = labelPlacement === 'floating' || labelPlacement === 'stacked';
+        /**
+         * The popover should take up the full width
+         * when using a fill in MD mode or if the
+         * label is floating/stacked.
+         */
+        if (hasFloatingOrStackedLabel || (mode === 'md' && fill !== undefined)) {
+            size = 'cover';
             /**
-             * The popover should take up the full width
-             * when using a fill in MD mode or if the
-             * label is floating/stacked.
+             * Otherwise the popover
+             * should be positioned relative
+             * to the native element.
              */
-            if (hasFloatingOrStackedLabel || (mode === 'md' && fill !== undefined)) {
-                size = 'cover';
-                /**
-                 * Otherwise the popover
-                 * should be positioned relative
-                 * to the native element.
-                 */
-            }
-            else {
-                event = Object.assign(Object.assign({}, ev), { detail: {
-                        ionShadowTarget: this.nativeWrapperEl,
-                    } });
-            }
+        }
+        else {
+            event = Object.assign(Object.assign({}, ev), { detail: {
+                    ionShadowTarget: this.nativeWrapperEl,
+                } });
         }
         const popoverOpts = Object.assign(Object.assign({ mode,
             event, alignment: 'center', size,
@@ -387,26 +368,10 @@ export class Select {
         return actionSheetController.create(actionSheetOpts);
     }
     async openAlert() {
-        /**
-         * TODO FW-3194
-         * Remove legacyFormController logic.
-         * Remove label and labelText vars
-         * Pass `this.labelText` instead of `labelText`
-         * when setting the header.
-         */
-        let label;
-        let labelText;
-        if (this.legacyFormController.hasLegacyControl()) {
-            label = this.getLabel();
-            labelText = label ? label.textContent : null;
-        }
-        else {
-            labelText = this.labelText;
-        }
         const interfaceOptions = this.interfaceOptions;
         const inputType = this.multiple ? 'checkbox' : 'radio';
         const mode = getIonMode(this);
-        const alertOpts = Object.assign(Object.assign({ mode }, interfaceOptions), { header: interfaceOptions.header ? interfaceOptions.header : labelText, inputs: this.createAlertInputs(this.childOpts, inputType, this.value), buttons: [
+        const alertOpts = Object.assign(Object.assign({ mode }, interfaceOptions), { header: interfaceOptions.header ? interfaceOptions.header : this.labelText, inputs: this.createAlertInputs(this.childOpts, inputType, this.value), buttons: [
                 {
                     text: this.cancelText,
                     role: 'cancel',
@@ -447,10 +412,6 @@ export class Select {
         }
         return this.overlay.dismiss();
     }
-    // TODO FW-3194 Remove this
-    getLabel() {
-        return findItemLabel(this.el);
-    }
     hasValue() {
         return this.getText() !== '';
     }
@@ -493,16 +454,6 @@ export class Select {
         const style = {
             'interactive-disabled': disabled,
         };
-        if (this.legacyFormController.hasLegacyControl()) {
-            style['interactive'] = true;
-            style['select'] = true;
-            style['select-disabled'] = disabled;
-            style['has-placeholder'] = this.placeholder !== undefined;
-            style['has-value'] = this.hasValue();
-            style['has-focus'] = this.isExpanded;
-            // TODO(FW-3194): remove this
-            style['legacy'] = !!this.legacy;
-        }
         this.ionStyle.emit(style);
     }
     renderLabel() {
@@ -561,92 +512,6 @@ export class Select {
          */
         return this.renderLabel();
     }
-    renderSelect() {
-        const { disabled, el, isExpanded, expandedIcon, labelPlacement, justify, placeholder, fill, shape, name, value } = this;
-        const mode = getIonMode(this);
-        const hasFloatingOrStackedLabel = labelPlacement === 'floating' || labelPlacement === 'stacked';
-        const justifyEnabled = !hasFloatingOrStackedLabel;
-        const rtl = isRTL(el) ? 'rtl' : 'ltr';
-        const inItem = hostContext('ion-item', this.el);
-        const shouldRenderHighlight = mode === 'md' && fill !== 'outline' && !inItem;
-        const hasValue = this.hasValue();
-        const hasStartEndSlots = el.querySelector('[slot="start"], [slot="end"]') !== null;
-        renderHiddenInput(true, el, name, parseValue(value), disabled);
-        /**
-         * If the label is stacked, it should always sit above the select.
-         * For floating labels, the label should move above the select if
-         * the select has a value, is open, or has anything in either
-         * the start or end slot.
-         *
-         * If there is content in the start slot, the label would overlap
-         * it if not forced to float. This is also applied to the end slot
-         * because with the default or solid fills, the select is not
-         * vertically centered in the container, but the label is. This
-         * causes the slots and label to appear vertically offset from each
-         * other when the label isn't floating above the input. This doesn't
-         * apply to the outline fill, but this was not accounted for to keep
-         * things consistent.
-         *
-         * TODO(FW-5592): Remove hasStartEndSlots condition
-         */
-        const labelShouldFloat = labelPlacement === 'stacked' || (labelPlacement === 'floating' && (hasValue || isExpanded || hasStartEndSlots));
-        return (h(Host, { onClick: this.onClick, class: createColorClasses(this.color, {
-                [mode]: true,
-                'in-item': inItem,
-                'in-item-color': hostContext('ion-item.ion-color', el),
-                'select-disabled': disabled,
-                'select-expanded': isExpanded,
-                'has-expanded-icon': expandedIcon !== undefined,
-                'has-value': hasValue,
-                'label-floating': labelShouldFloat,
-                'has-placeholder': placeholder !== undefined,
-                'ion-focusable': true,
-                [`select-${rtl}`]: true,
-                [`select-fill-${fill}`]: fill !== undefined,
-                [`select-justify-${justify}`]: justifyEnabled,
-                [`select-shape-${shape}`]: shape !== undefined,
-                [`select-label-placement-${labelPlacement}`]: true,
-            }) }, h("label", { class: "select-wrapper", id: "select-label" }, this.renderLabelContainer(), h("div", { class: "select-wrapper-inner" }, h("slot", { name: "start" }), h("div", { class: "native-wrapper", ref: (el) => (this.nativeWrapperEl = el), part: "container" }, this.renderSelectText(), this.renderListbox()), h("slot", { name: "end" }), !hasFloatingOrStackedLabel && this.renderSelectIcon()), hasFloatingOrStackedLabel && this.renderSelectIcon(), shouldRenderHighlight && h("div", { class: "select-highlight" }))));
-    }
-    // TODO FW-3194 - Remove this
-    renderLegacySelect() {
-        if (!this.hasLoggedDeprecationWarning) {
-            printIonWarning(`ion-select now requires providing a label with either the "label" property or the "aria-label" attribute. To migrate, remove any usage of "ion-label" and pass the label text to either the "label" property or the "aria-label" attribute.
-
-Example: <ion-select label="Favorite Color">...</ion-select>
-Example with aria-label: <ion-select aria-label="Favorite Color">...</ion-select>
-
-Developers can use the "legacy" property to continue using the legacy form markup. This property will be removed in an upcoming major release of Ionic where this form control will use the modern form markup.`, this.el);
-            if (this.legacy) {
-                printIonWarning(`ion-select is being used with the "legacy" property enabled which will forcibly enable the legacy form markup. This property will be removed in an upcoming major release of Ionic where this form control will use the modern form markup.
-    Developers can dismiss this warning by removing their usage of the "legacy" property and using the new select syntax.`, this.el);
-            }
-            this.hasLoggedDeprecationWarning = true;
-        }
-        const { disabled, el, inputId, isExpanded, expandedIcon, name, placeholder, value } = this;
-        const mode = getIonMode(this);
-        const { labelText, labelId } = getAriaLabel(el, inputId);
-        renderHiddenInput(true, el, name, parseValue(value), disabled);
-        const displayValue = this.getText();
-        let selectText = displayValue;
-        if (selectText === '' && placeholder !== undefined) {
-            selectText = placeholder;
-        }
-        // If there is a label then we need to concatenate it with the
-        // current value (or placeholder) and a comma so it separates
-        // nicely when the screen reader announces it, otherwise just
-        // announce the value / placeholder
-        const displayLabel = labelText !== undefined ? (selectText !== '' ? `${selectText}, ${labelText}` : labelText) : selectText;
-        return (h(Host, { onClick: this.onClick, role: "button", "aria-haspopup": "listbox", "aria-disabled": disabled ? 'true' : null, "aria-label": displayLabel, class: {
-                [mode]: true,
-                'in-item': hostContext('ion-item', el),
-                'in-item-color': hostContext('ion-item.ion-color', el),
-                'select-disabled': disabled,
-                'select-expanded': isExpanded,
-                'has-expanded-icon': expandedIcon !== undefined,
-                'legacy-select': true,
-            } }, this.renderSelectText(), this.renderSelectIcon(), h("label", { id: labelId }, displayLabel), this.renderListbox()));
-    }
     /**
      * Renders either the placeholder
      * or the selected values based on
@@ -717,8 +582,51 @@ Developers can use the "legacy" property to continue using the legacy form marku
         return (h("button", { disabled: disabled, id: inputId, "aria-label": this.ariaLabel, "aria-haspopup": "dialog", "aria-expanded": `${isExpanded}`, onFocus: this.onFocus, onBlur: this.onBlur, ref: (focusEl) => (this.focusEl = focusEl) }));
     }
     render() {
-        const { legacyFormController } = this;
-        return legacyFormController.hasLegacyControl() ? this.renderLegacySelect() : this.renderSelect();
+        const { disabled, el, isExpanded, expandedIcon, labelPlacement, justify, placeholder, fill, shape, name, value } = this;
+        const mode = getIonMode(this);
+        const hasFloatingOrStackedLabel = labelPlacement === 'floating' || labelPlacement === 'stacked';
+        const justifyEnabled = !hasFloatingOrStackedLabel;
+        const rtl = isRTL(el) ? 'rtl' : 'ltr';
+        const inItem = hostContext('ion-item', this.el);
+        const shouldRenderHighlight = mode === 'md' && fill !== 'outline' && !inItem;
+        const hasValue = this.hasValue();
+        const hasStartEndSlots = el.querySelector('[slot="start"], [slot="end"]') !== null;
+        renderHiddenInput(true, el, name, parseValue(value), disabled);
+        /**
+         * If the label is stacked, it should always sit above the select.
+         * For floating labels, the label should move above the select if
+         * the select has a value, is open, or has anything in either
+         * the start or end slot.
+         *
+         * If there is content in the start slot, the label would overlap
+         * it if not forced to float. This is also applied to the end slot
+         * because with the default or solid fills, the select is not
+         * vertically centered in the container, but the label is. This
+         * causes the slots and label to appear vertically offset from each
+         * other when the label isn't floating above the input. This doesn't
+         * apply to the outline fill, but this was not accounted for to keep
+         * things consistent.
+         *
+         * TODO(FW-5592): Remove hasStartEndSlots condition
+         */
+        const labelShouldFloat = labelPlacement === 'stacked' || (labelPlacement === 'floating' && (hasValue || isExpanded || hasStartEndSlots));
+        return (h(Host, { key: '00e3a22ca92044556f50b029d5d52178eedd00ca', onClick: this.onClick, class: createColorClasses(this.color, {
+                [mode]: true,
+                'in-item': inItem,
+                'in-item-color': hostContext('ion-item.ion-color', el),
+                'select-disabled': disabled,
+                'select-expanded': isExpanded,
+                'has-expanded-icon': expandedIcon !== undefined,
+                'has-value': hasValue,
+                'label-floating': labelShouldFloat,
+                'has-placeholder': placeholder !== undefined,
+                'ion-focusable': true,
+                [`select-${rtl}`]: true,
+                [`select-fill-${fill}`]: fill !== undefined,
+                [`select-justify-${justify}`]: justifyEnabled,
+                [`select-shape-${shape}`]: shape !== undefined,
+                [`select-label-placement-${labelPlacement}`]: true,
+            }) }, h("label", { key: 'b286c77110501d17e7defa9b3c4f02a1aba620f8', class: "select-wrapper", id: "select-label" }, this.renderLabelContainer(), h("div", { key: 'e2de491d3cb57678d30c0383a0782cfdd28abba0', class: "select-wrapper-inner" }, h("slot", { key: '7b9054dbcdab00505a9195eb1674d96322741614', name: "start" }), h("div", { key: '874e4da16c1140be0b5043330e0538936d13ac56', class: "native-wrapper", ref: (el) => (this.nativeWrapperEl = el), part: "container" }, this.renderSelectText(), this.renderListbox()), h("slot", { key: '64256b876c88e02852c8745f14c10636c48a6a72', name: "end" }), !hasFloatingOrStackedLabel && this.renderSelectIcon()), hasFloatingOrStackedLabel && this.renderSelectIcon(), shouldRenderHighlight && h("div", { class: "select-highlight" }))));
     }
     static get is() { return "ion-select"; }
     static get encapsulation() { return "shadow"; }
@@ -930,23 +838,6 @@ Developers can use the "legacy" property to continue using the legacy form marku
                 "reflect": false,
                 "defaultValue": "'start'"
             },
-            "legacy": {
-                "type": "boolean",
-                "mutable": false,
-                "complexType": {
-                    "original": "boolean",
-                    "resolved": "boolean | undefined",
-                    "references": {}
-                },
-                "required": false,
-                "optional": true,
-                "docs": {
-                    "tags": [],
-                    "text": "Set the `legacy` property to `true` to forcibly use the legacy form control markup.\nIonic will only opt components in to the modern form markup when they are\nusing either the `aria-label` attribute or the `label` property. As a result,\nthe `legacy` property should only be used as an escape hatch when you want to\navoid this automatic opt-in behavior.\nNote that this property will be removed in an upcoming major release\nof Ionic, and all form components will be opted-in to using the modern form markup."
-                },
-                "attribute": "legacy",
-                "reflect": false
-            },
             "multiple": {
                 "type": "boolean",
                 "mutable": false,