@vaadin/text-area 24.6.0-alpha8 → 24.6.0-alpha9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/text-area",
-  "version": "24.6.0-alpha8",
+  "version": "24.6.0-alpha9",
   "publishConfig": {
     "access": "public"
   },
@@ -36,17 +36,17 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "24.6.0-alpha8",
-    "@vaadin/component-base": "24.6.0-alpha8",
-    "@vaadin/field-base": "24.6.0-alpha8",
-    "@vaadin/input-container": "24.6.0-alpha8",
-    "@vaadin/vaadin-lumo-styles": "24.6.0-alpha8",
-    "@vaadin/vaadin-material-styles": "24.6.0-alpha8",
-    "@vaadin/vaadin-themable-mixin": "24.6.0-alpha8",
+    "@vaadin/a11y-base": "24.6.0-alpha9",
+    "@vaadin/component-base": "24.6.0-alpha9",
+    "@vaadin/field-base": "24.6.0-alpha9",
+    "@vaadin/input-container": "24.6.0-alpha9",
+    "@vaadin/vaadin-lumo-styles": "24.6.0-alpha9",
+    "@vaadin/vaadin-material-styles": "24.6.0-alpha9",
+    "@vaadin/vaadin-themable-mixin": "24.6.0-alpha9",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "24.6.0-alpha8",
+    "@vaadin/chai-plugins": "24.6.0-alpha9",
     "@vaadin/testing-helpers": "^1.0.0",
     "sinon": "^18.0.0"
   },
@@ -54,5 +54,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "a11e1510c4caa08775b202714f5fc1198c22132a"
+  "gitHead": "e303d77ba20c3089c9998be9a318733d9ec5b53c"
 }

package/src/vaadin-text-area-mixin.d.ts

@@ -62,6 +62,23 @@ export declare class TextAreaMixinClass {
    */
   pattern: string;
 
+  /**
+   * Minimum number of rows to show. Default is two rows, which is also the minimum value.
+   *
+   * When using a custom slotted textarea, the minimum number of rows are not applied for backwards compatibility.
+   *
+   * @attr {number} min-rows
+   */
+  minRows: number;
+
+  /**
+   * Maximum number of rows to expand to before the text area starts scrolling. This effectively sets a max-height
+   * on the `input-field` part. By default, it is not set, and the text area grows with the content without
+   * constraints.
+   * @attr {number} max-rows
+   */
+  maxRows: number | null | undefined;
+
   /**
    * Scrolls the textarea to the start if it has a vertical scrollbar.
    */

package/src/vaadin-text-area-mixin.js

@@ -40,6 +40,29 @@ export const TextAreaMixin = (superClass) =>
         pattern: {
           type: String,
         },
+
+        /**
+         * Minimum number of rows to show. Default is two rows, which is also the minimum value.
+         *
+         * When using a custom slotted textarea, the minimum number of rows are not applied for backwards compatibility.
+         *
+         * @attr {number} min-rows
+         */
+        minRows: {
+          type: Number,
+          value: 2,
+          observer: '__minRowsChanged',
+        },
+
+        /**
+         * Maximum number of rows to expand to before the text area starts scrolling. This effectively sets a max-height
+         * on the `input-field` part. By default, it is not set, and the text area grows with the content without
+         * constraints.
+         * @attr {number} max-rows
+         */
+        maxRows: {
+          type: Number,
+        },
       };
     }
 
@@ -51,6 +74,10 @@ export const TextAreaMixin = (superClass) =>
       return [...super.constraints, 'maxlength', 'minlength', 'pattern'];
     }
 
+    static get observers() {
+      return ['__updateMinHeight(minRows, inputElement)', '__updateMaxHeight(maxRows, inputElement, _inputField)'];
+    }
+
     /**
      * Used by `InputControlMixin` as a reference to the clear button element.
      * @protected
@@ -77,14 +104,13 @@ export const TextAreaMixin = (superClass) =>
     ready() {
       super.ready();
 
-      this.addController(
-        new TextAreaController(this, (input) => {
-          this._setInputElement(input);
-          this._setFocusElement(input);
-          this.stateTarget = input;
-          this.ariaTarget = input;
-        }),
-      );
+      this.__textAreaController = new TextAreaController(this, (input) => {
+        this._setInputElement(input);
+        this._setFocusElement(input);
+        this.stateTarget = input;
+        this.ariaTarget = input;
+      });
+      this.addController(this.__textAreaController);
       this.addController(new LabelledInputController(this.inputElement, this._labelController));
 
       this.addEventListener('animationend', this._onAnimationEnd);
@@ -176,6 +202,64 @@ export const TextAreaMixin = (superClass) =>
       inputField.style.removeProperty('display');
       inputField.style.removeProperty('height');
       inputField.scrollTop = scrollTop;
+
+      // Update max height in case this update was triggered by style changes
+      // affecting line height, paddings or margins.
+      this.__updateMaxHeight(this.maxRows);
+    }
+
+    /** @private */
+    __updateMinHeight(minRows) {
+      if (!this.inputElement) {
+        return;
+      }
+
+      // For minimum height, just set the number of rows on the native textarea,
+      // which causes the input container to grow as well.
+      // Do not override this on custom slotted textarea as number of rows may
+      // have been configured there.
+      if (this.inputElement === this.__textAreaController.defaultNode) {
+        this.inputElement.rows = Math.max(minRows, 2);
+      }
+    }
+
+    /** @private */
+    __updateMaxHeight(maxRows) {
+      if (!this._inputField || !this.inputElement) {
+        return;
+      }
+
+      if (maxRows) {
+        // For maximum height, we need to constrain the height of the input
+        // container to prevent it from growing further. For this we take the
+        // line height of the native textarea times the number of rows, and add
+        // other properties affecting the height of the input container.
+        const inputStyle = getComputedStyle(this.inputElement);
+        const inputFieldStyle = getComputedStyle(this._inputField);
+
+        const lineHeight = parseFloat(inputStyle.lineHeight);
+        const contentHeight = lineHeight * maxRows;
+        const marginsAndPaddings =
+          parseFloat(inputStyle.paddingTop) +
+          parseFloat(inputStyle.paddingBottom) +
+          parseFloat(inputStyle.marginTop) +
+          parseFloat(inputStyle.marginBottom) +
+          parseFloat(inputFieldStyle.paddingTop) +
+          parseFloat(inputFieldStyle.paddingBottom);
+        const maxHeight = Math.ceil(contentHeight + marginsAndPaddings);
+        this._inputField.style.setProperty('max-height', `${maxHeight}px`);
+      } else {
+        this._inputField.style.removeProperty('max-height');
+      }
+    }
+
+    /**
+     * @private
+     */
+    __minRowsChanged(minRows) {
+      if (minRows < 2) {
+        console.warn('<vaadin-text-area> minRows must be at least 2.');
+      }
     }
 
     /**

package/src/vaadin-text-area-styles.js

@@ -54,6 +54,7 @@ export const textAreaStyles = css`
   [part='input-field'] ::slotted(textarea) {
     align-self: stretch;
     white-space: pre-wrap;
+    box-sizing: border-box;
   }
 
   [part='input-field'] ::slotted(:not(textarea)) {

package/web-types.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/text-area",
-  "version": "24.6.0-alpha8",
+  "version": "24.6.0-alpha9",
   "description-markup": "markdown",
   "contributions": {
     "html": {
       "elements": [
         {
           "name": "vaadin-text-area",
-          "description": "`<vaadin-text-area>` is a web component for multi-line text input.\n\n```html\n<vaadin-text-area label=\"Comment\"></vaadin-text-area>\n```\n\n### Prefixes and suffixes\n\nThese are child elements of a `<vaadin-text-area>` that are displayed\ninline with the input, before or after.\nIn order for an element to be considered as a prefix, it must have the slot\nattribute set to `prefix` (and similarly for `suffix`).\n\n```html\n<vaadin-text-area label=\"Description\">\n  <div slot=\"prefix\">Details:</div>\n  <div slot=\"suffix\">The end!</div>\n</vaadin-text-area>\n```\n\n### Styling\n\nThe following custom properties are available for styling:\n\nCustom property                | Description                | Default\n-------------------------------|----------------------------|---------\n`--vaadin-field-default-width` | Default width of the field | `12em`\n\n`<vaadin-text-area>` provides the same set of shadow DOM parts and state attributes as `<vaadin-text-field>`.\nSee [`<vaadin-text-field>`](https://cdn.vaadin.com/vaadin-web-components/24.6.0-alpha8/#/elements/vaadin-text-field) for the styling documentation.\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
+          "description": "`<vaadin-text-area>` is a web component for multi-line text input.\n\n```html\n<vaadin-text-area label=\"Comment\"></vaadin-text-area>\n```\n\n### Prefixes and suffixes\n\nThese are child elements of a `<vaadin-text-area>` that are displayed\ninline with the input, before or after.\nIn order for an element to be considered as a prefix, it must have the slot\nattribute set to `prefix` (and similarly for `suffix`).\n\n```html\n<vaadin-text-area label=\"Description\">\n  <div slot=\"prefix\">Details:</div>\n  <div slot=\"suffix\">The end!</div>\n</vaadin-text-area>\n```\n\n### Styling\n\nThe following custom properties are available for styling:\n\nCustom property                | Description                | Default\n-------------------------------|----------------------------|---------\n`--vaadin-field-default-width` | Default width of the field | `12em`\n\n`<vaadin-text-area>` provides the same set of shadow DOM parts and state attributes as `<vaadin-text-field>`.\nSee [`<vaadin-text-field>`](https://cdn.vaadin.com/vaadin-web-components/24.6.0-alpha9/#/elements/vaadin-text-field) for the styling documentation.\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
           "attributes": [
             {
               "name": "disabled",
@@ -274,6 +274,28 @@
                 ]
               }
             },
+            {
+              "name": "min-rows",
+              "description": "Minimum number of rows to show. Default is two rows, which is also the minimum value.\n\nWhen using a custom slotted textarea, the minimum number of rows are not applied for backwards compatibility.",
+              "value": {
+                "type": [
+                  "number",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
+            {
+              "name": "max-rows",
+              "description": "Maximum number of rows to expand to before the text area starts scrolling. This effectively sets a max-height\non the `input-field` part. By default, it is not set, and the text area grows with the content without\nconstraints.",
+              "value": {
+                "type": [
+                  "number",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
             {
               "name": "theme",
               "description": "The theme variants to apply to the component.",
@@ -551,6 +573,28 @@
                     "undefined"
                   ]
                 }
+              },
+              {
+                "name": "minRows",
+                "description": "Minimum number of rows to show. Default is two rows, which is also the minimum value.\n\nWhen using a custom slotted textarea, the minimum number of rows are not applied for backwards compatibility.",
+                "value": {
+                  "type": [
+                    "number",
+                    "null",
+                    "undefined"
+                  ]
+                }
+              },
+              {
+                "name": "maxRows",
+                "description": "Maximum number of rows to expand to before the text area starts scrolling. This effectively sets a max-height\non the `input-field` part. By default, it is not set, and the text area grows with the content without\nconstraints.",
+                "value": {
+                  "type": [
+                    "number",
+                    "null",
+                    "undefined"
+                  ]
+                }
               }
             ],
             "events": [

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/text-area",
-  "version": "24.6.0-alpha8",
+  "version": "24.6.0-alpha9",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {
@@ -16,7 +16,7 @@
       "elements": [
         {
           "name": "vaadin-text-area",
-          "description": "`<vaadin-text-area>` is a web component for multi-line text input.\n\n```html\n<vaadin-text-area label=\"Comment\"></vaadin-text-area>\n```\n\n### Prefixes and suffixes\n\nThese are child elements of a `<vaadin-text-area>` that are displayed\ninline with the input, before or after.\nIn order for an element to be considered as a prefix, it must have the slot\nattribute set to `prefix` (and similarly for `suffix`).\n\n```html\n<vaadin-text-area label=\"Description\">\n  <div slot=\"prefix\">Details:</div>\n  <div slot=\"suffix\">The end!</div>\n</vaadin-text-area>\n```\n\n### Styling\n\nThe following custom properties are available for styling:\n\nCustom property                | Description                | Default\n-------------------------------|----------------------------|---------\n`--vaadin-field-default-width` | Default width of the field | `12em`\n\n`<vaadin-text-area>` provides the same set of shadow DOM parts and state attributes as `<vaadin-text-field>`.\nSee [`<vaadin-text-field>`](https://cdn.vaadin.com/vaadin-web-components/24.6.0-alpha8/#/elements/vaadin-text-field) for the styling documentation.\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
+          "description": "`<vaadin-text-area>` is a web component for multi-line text input.\n\n```html\n<vaadin-text-area label=\"Comment\"></vaadin-text-area>\n```\n\n### Prefixes and suffixes\n\nThese are child elements of a `<vaadin-text-area>` that are displayed\ninline with the input, before or after.\nIn order for an element to be considered as a prefix, it must have the slot\nattribute set to `prefix` (and similarly for `suffix`).\n\n```html\n<vaadin-text-area label=\"Description\">\n  <div slot=\"prefix\">Details:</div>\n  <div slot=\"suffix\">The end!</div>\n</vaadin-text-area>\n```\n\n### Styling\n\nThe following custom properties are available for styling:\n\nCustom property                | Description                | Default\n-------------------------------|----------------------------|---------\n`--vaadin-field-default-width` | Default width of the field | `12em`\n\n`<vaadin-text-area>` provides the same set of shadow DOM parts and state attributes as `<vaadin-text-field>`.\nSee [`<vaadin-text-field>`](https://cdn.vaadin.com/vaadin-web-components/24.6.0-alpha9/#/elements/vaadin-text-field) for the styling documentation.\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
           "extension": true,
           "attributes": [
             {
@@ -187,6 +187,20 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": ".minRows",
+              "description": "Minimum number of rows to show. Default is two rows, which is also the minimum value.\n\nWhen using a custom slotted textarea, the minimum number of rows are not applied for backwards compatibility.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": ".maxRows",
+              "description": "Maximum number of rows to expand to before the text area starts scrolling. This effectively sets a max-height\non the `input-field` part. By default, it is not set, and the text area grows with the content without\nconstraints.",
+              "value": {
+                "kind": "expression"
+              }
+            },
             {
               "name": "@validated",
               "description": "Fired whenever the field is validated.",