@ionic/core 8.0.0-dev.11709632212.139b6f63 → 8.0.0-dev.11711035263.183d2423

package/dist/collection/components/item/item.js

@@ -3,7 +3,6 @@
  */
 import { Host, forceUpdate, h } from "@stencil/core";
 import { inheritAttributes, raf } from "../../utils/helpers";
-import { printIonError, printIonWarning } from "../../utils/logging/index";
 import { createColorClasses, hostContext, openURL } from "../../utils/theme";
 import { chevronForward } from "ionicons/icons";
 import { getIonMode } from "../../global/ionic-global";
@@ -13,8 +12,6 @@ import { getIonMode } from "../../global/ionic-global";
  * @slot - Content is placed between the named slots if provided without a slot.
  * @slot start - Content is placed to the left of the item text in LTR, and to the right in RTL.
  * @slot end - Content is placed to the right of the item text in LTR, and to the left in RTL.
- * @slot helper - Content is placed under the item and displayed when no error is detected. **DEPRECATED** Use the "helperText" property on ion-input or ion-textarea instead.
- * @slot error - Content is placed under the item and displayed when an error is detected. **DEPRECATED** Use the "errorText" property on ion-input or ion-textarea instead.
  *
  * @part native - The native HTML button, anchor or div element that wraps all child elements.
  * @part detail-icon - The chevron icon for the item. Only applies when `detail="true"`.
@@ -32,31 +29,18 @@ export class Item {
         this.detailIcon = chevronForward;
         this.disabled = false;
         this.download = undefined;
-        this.fill = undefined;
-        this.shape = undefined;
         this.href = undefined;
         this.rel = undefined;
         this.lines = undefined;
-        this.counter = false;
         this.routerAnimation = undefined;
         this.routerDirection = 'forward';
         this.target = undefined;
         this.type = 'button';
-        this.counterFormatter = undefined;
-        this.counterString = undefined;
     }
     buttonChanged() {
         // Update the focusable option when the button option is changed
         this.focusable = this.isFocusable();
     }
-    counterFormatterChanged() {
-        this.updateCounterOutput(this.getFirstInput());
-    }
-    handleIonInput(ev) {
-        if (this.counter && ev.target === this.getFirstInput()) {
-            this.updateCounterOutput(ev.target);
-        }
-    }
     labelColorChanged(ev) {
         const { color } = this;
         // There will be a conflict with item color if
@@ -91,36 +75,12 @@ export class Item {
         }
     }
     connectedCallback() {
-        if (this.counter) {
-            this.updateCounterOutput(this.getFirstInput());
-        }
         this.hasStartEl();
     }
     componentWillLoad() {
         this.inheritedAriaAttributes = inheritAttributes(this.el, ['aria-label']);
     }
     componentDidLoad() {
-        const { el, counter, counterFormatter, fill, shape } = this;
-        const hasHelperSlot = el.querySelector('[slot="helper"]') !== null;
-        if (hasHelperSlot) {
-            printIonWarning('The "helper" slot has been deprecated in favor of using the "helperText" property on ion-input or ion-textarea.', el);
-        }
-        const hasErrorSlot = el.querySelector('[slot="error"]') !== null;
-        if (hasErrorSlot) {
-            printIonWarning('The "error" slot has been deprecated in favor of using the "errorText" property on ion-input or ion-textarea.', el);
-        }
-        if (counter === true) {
-            printIonWarning('The "counter" property has been deprecated in favor of using the "counter" property on ion-input or ion-textarea.', el);
-        }
-        if (counterFormatter !== undefined) {
-            printIonWarning('The "counterFormatter" property has been deprecated in favor of using the "counterFormatter" property on ion-input or ion-textarea.', el);
-        }
-        if (fill !== undefined) {
-            printIonWarning('The "fill" property has been deprecated in favor of using the "fill" property on ion-input or ion-textarea.', el);
-        }
-        if (shape !== undefined) {
-            printIonWarning('The "shape" property has been deprecated in favor of using the "shape" property on ion-input or ion-textarea.', el);
-        }
         raf(() => {
             this.setMultipleInputs();
             this.focusable = this.isFocusable();
@@ -165,33 +125,6 @@ export class Item {
         const focusableChild = this.el.querySelector('.ion-focusable');
         return this.canActivate() || focusableChild !== null;
     }
-    getFirstInput() {
-        const inputs = this.el.querySelectorAll('ion-input, ion-textarea');
-        return inputs[0];
-    }
-    updateCounterOutput(inputEl) {
-        var _a, _b;
-        const { counter, counterFormatter, defaultCounterFormatter } = this;
-        if (counter && !this.multipleInputs && (inputEl === null || inputEl === void 0 ? void 0 : inputEl.maxlength) !== undefined) {
-            const length = (_b = (_a = inputEl === null || inputEl === void 0 ? void 0 : inputEl.value) === null || _a === void 0 ? void 0 : _a.toString().length) !== null && _b !== void 0 ? _b : 0;
-            if (counterFormatter === undefined) {
-                this.counterString = defaultCounterFormatter(length, inputEl.maxlength);
-            }
-            else {
-                try {
-                    this.counterString = counterFormatter(length, inputEl.maxlength);
-                }
-                catch (e) {
-                    printIonError('Exception in provided `counterFormatter`.', e);
-                    // Fallback to the default counter formatter when an exception happens
-                    this.counterString = defaultCounterFormatter(length, inputEl.maxlength);
-                }
-            }
-        }
-    }
-    defaultCounterFormatter(length, maxlength) {
-        return `${length} / ${maxlength}`;
-    }
     hasStartEl() {
         const startEl = this.el.querySelector('[slot="start"]');
         if (startEl !== null) {
@@ -199,11 +132,11 @@ export class Item {
         }
     }
     getFirstInteractive() {
-        const controls = this.el.querySelectorAll('ion-toggle:not([disabled]), ion-checkbox:not([disabled]), ion-radio:not([disabled]), ion-select:not([disabled])');
+        const controls = this.el.querySelectorAll('ion-toggle:not([disabled]), ion-checkbox:not([disabled]), ion-radio:not([disabled]), ion-select:not([disabled]), ion-input:not([disabled]), ion-textarea:not([disabled])');
         return controls[0];
     }
     render() {
-        const { counterString, detail, detailIcon, download, fill, labelColorStyles, lines, disabled, href, rel, shape, target, routerAnimation, routerDirection, inheritedAriaAttributes, multipleInputs, } = this;
+        const { detail, detailIcon, download, labelColorStyles, lines, disabled, href, rel, target, routerAnimation, routerDirection, inheritedAriaAttributes, multipleInputs, } = this;
         const childStyles = {};
         const mode = getIonMode(this);
         const clickable = this.isClickable();
@@ -241,7 +174,17 @@ export class Item {
                              */
                             const clickedWithinShadowRoot = this.el.shadowRoot.contains(target);
                             if (clickedWithinShadowRoot) {
-                                firstInteractive.click();
+                                /**
+                                 * For input/textarea clicking the padding should focus the
+                                 * text field (thus making it editable). For everything else,
+                                 * we want to click the control so it activates.
+                                 */
+                                if (firstInteractive.tagName === 'ION-INPUT' || firstInteractive.tagName === 'ION-TEXTAREA') {
+                                    firstInteractive.setFocus();
+                                }
+                                else {
+                                    firstInteractive.click();
+                                }
                             }
                         }
                     }
@@ -253,27 +196,28 @@ export class Item {
             Object.assign(childStyles, value);
         });
         const ariaDisabled = disabled || childStyles['item-interactive-disabled'] ? 'true' : null;
-        const fillValue = fill || 'none';
         const inList = hostContext('ion-list', this.el) && !hostContext('ion-radio-group', this.el);
-        return (h(Host, { key: '077c9ab04985292f79c30691151d2778a26285fb', "aria-disabled": ariaDisabled, class: Object.assign(Object.assign(Object.assign({}, childStyles), labelColorStyles), createColorClasses(this.color, {
+        /**
+         * Inputs and textareas do not need to show a cursor pointer.
+         * However, other form controls such as checkboxes and radios do.
+         */
+        const firstInteractiveNeedsPointerCursor = firstInteractive !== undefined && !['ION-INPUT', 'ION-TEXTAREA'].includes(firstInteractive.tagName);
+        return (h(Host, { key: '6fe6bae954259703482f175312a051ff1b315a95', "aria-disabled": ariaDisabled, class: Object.assign(Object.assign(Object.assign({}, childStyles), labelColorStyles), createColorClasses(this.color, {
                 item: true,
                 [mode]: true,
                 'item-lines-default': lines === undefined,
                 [`item-lines-${lines}`]: lines !== undefined,
-                [`item-fill-${fillValue}`]: true,
-                [`item-shape-${shape}`]: shape !== undefined,
-                'item-has-interactive-control': firstInteractive !== undefined,
+                'item-control-needs-pointer-cursor': firstInteractiveNeedsPointerCursor,
                 'item-disabled': disabled,
                 'in-list': inList,
                 'item-multiple-inputs': this.multipleInputs,
                 'ion-activatable': canActivate,
                 'ion-focusable': this.focusable,
                 'item-rtl': document.dir === 'rtl',
-            })), role: inList ? 'listitem' : null }, h(TagType, Object.assign({ key: '08bb75c85d0584e9fb7f461e9e06b9b651ef3515' }, attrs, inheritedAriaAttributes, { class: "item-native", part: "native", disabled: disabled }, clickFn), h("slot", { key: '3f742b07c4a58eadedf675be4878a3e00070750e', name: "start" }), h("div", { key: '0160b8963434f3107856a2df2fb96f1abb4fdbfe', class: "item-inner" }, h("div", { key: '9439b21474443341f06a651d7c44aef90bd4c591', class: "input-wrapper" }, h("slot", { key: '8034e1337a6c950b7725bc9aa46d55de980827bf' })), h("slot", { key: '690de6d3dd3a238ab7a2d3dfea69daa6647e5134', name: "end" }), showDetail && (h("ion-icon", { icon: detailIcon, lazy: false, class: "item-detail-icon", part: "detail-icon", "aria-hidden": "true", "flip-rtl": detailIcon === chevronForward })), h("div", { key: 'e96885084ca845656fd4d18902528ce7de207c86', class: "item-inner-highlight" })), canActivate && mode === 'md' && h("ion-ripple-effect", null), h("div", { key: '64e5323c380e05aa183e8dd7fbe560d084725f5e', class: "item-highlight" })), h("div", { key: '677132e6193981697f494b215ddc02407fdd96a5', class: "item-bottom" }, h("slot", { key: 'cda34a9208020bbb18ca5313e0bfbf270f024012', name: "error" }), h("slot", { key: 'c1b3541b11ece13309d0e28dd3a95c048dfab43f', name: "helper" }), counterString && h("ion-note", { class: "item-counter" }, counterString))));
+            })), role: inList ? 'listitem' : null }, h(TagType, Object.assign({ key: 'fcfcffacb7d4e52f9458724332efa93d140cf637' }, attrs, inheritedAriaAttributes, { class: "item-native", part: "native", disabled: disabled }, clickFn), h("slot", { key: '2c1be89990d1b4264f056f3afca2657dc25e868f', name: "start" }), h("div", { key: 'a12010f2f251c29870806050357e247f297f752d', class: "item-inner" }, h("div", { key: 'd0dc5901d634d3b7d8c9b4339ed02585b5b88828', class: "input-wrapper" }, h("slot", { key: '5589d491f6058858310c72971de50ddf441379b1' })), h("slot", { key: '7b2d2182336abef508d00882759df1a99a1cf93e', name: "end" }), showDetail && (h("ion-icon", { icon: detailIcon, lazy: false, class: "item-detail-icon", part: "detail-icon", "aria-hidden": "true", "flip-rtl": detailIcon === chevronForward }))), canActivate && mode === 'md' && h("ion-ripple-effect", null))));
     }
     static get is() { return "ion-item"; }
     static get encapsulation() { return "shadow"; }
-    static get delegatesFocus() { return true; }
     static get originalStyleUrls() {
         return {
             "ios": ["item.ios.scss"],
@@ -399,43 +343,6 @@ export class Item {
                 "attribute": "download",
                 "reflect": false
             },
-            "fill": {
-                "type": "string",
-                "mutable": false,
-                "complexType": {
-                    "original": "'outline' | 'solid'",
-                    "resolved": "\"outline\" | \"solid\" | undefined",
-                    "references": {}
-                },
-                "required": false,
-                "optional": true,
-                "docs": {
-                    "tags": [{
-                            "name": "deprecated",
-                            "text": "Use the `fill` property on `ion-input` or `ion-textarea` instead."
-                        }],
-                    "text": "The fill for the item. If `\"solid\"` the item will have a background. If\n`\"outline\"` the item will be transparent with a border. Only available in `md` mode."
-                },
-                "attribute": "fill",
-                "reflect": false
-            },
-            "shape": {
-                "type": "string",
-                "mutable": false,
-                "complexType": {
-                    "original": "'round'",
-                    "resolved": "\"round\" | undefined",
-                    "references": {}
-                },
-                "required": false,
-                "optional": true,
-                "docs": {
-                    "tags": [],
-                    "text": "The shape of the item. If \"round\" it will have increased\nborder radius."
-                },
-                "attribute": "shape",
-                "reflect": false
-            },
             "href": {
                 "type": "string",
                 "mutable": false,
@@ -487,27 +394,6 @@ export class Item {
                 "attribute": "lines",
                 "reflect": false
             },
-            "counter": {
-                "type": "boolean",
-                "mutable": false,
-                "complexType": {
-                    "original": "boolean",
-                    "resolved": "boolean",
-                    "references": {}
-                },
-                "required": false,
-                "optional": false,
-                "docs": {
-                    "tags": [{
-                            "name": "deprecated",
-                            "text": "Use the `counter` property on `ion-input` or `ion-textarea` instead."
-                        }],
-                    "text": "If `true`, a character counter will display the ratio of characters used and the total character limit. Only applies when the `maxlength` property is set on the inner `ion-input` or `ion-textarea`."
-                },
-                "attribute": "counter",
-                "reflect": false,
-                "defaultValue": "false"
-            },
             "routerAnimation": {
                 "type": "unknown",
                 "mutable": false,
@@ -587,38 +473,13 @@ export class Item {
                 "attribute": "type",
                 "reflect": false,
                 "defaultValue": "'button'"
-            },
-            "counterFormatter": {
-                "type": "unknown",
-                "mutable": false,
-                "complexType": {
-                    "original": "CounterFormatter",
-                    "resolved": "((inputLength: number, maxLength: number) => string) | undefined",
-                    "references": {
-                        "CounterFormatter": {
-                            "location": "import",
-                            "path": "./item-interface",
-                            "id": "src/components/item/item-interface.ts::CounterFormatter"
-                        }
-                    }
-                },
-                "required": false,
-                "optional": true,
-                "docs": {
-                    "tags": [{
-                            "name": "deprecated",
-                            "text": "Use the `counterFormatter` property on `ion-input` or `ion-textarea` instead."
-                        }],
-                    "text": "A callback used to format the counter text.\nBy default the counter text is set to \"itemLength / maxLength\"."
-                }
             }
         };
     }
     static get states() {
         return {
             "multipleInputs": {},
-            "focusable": {},
-            "counterString": {}
+            "focusable": {}
         };
     }
     static get elementRef() { return "el"; }
@@ -626,19 +487,10 @@ export class Item {
         return [{
                 "propName": "button",
                 "methodName": "buttonChanged"
-            }, {
-                "propName": "counterFormatter",
-                "methodName": "counterFormatterChanged"
             }];
     }
     static get listeners() {
         return [{
-                "name": "ionInput",
-                "method": "handleIonInput",
-                "target": undefined,
-                "capture": false,
-                "passive": false
-            }, {
                 "name": "ionColor",
                 "method": "labelColorChanged",
                 "target": undefined,