@vaadin/form-layout 23.0.0-alpha2 → 23.0.0-alpha3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/form-layout",
-  "version": "23.0.0-alpha2",
+  "version": "23.0.0-alpha3",
   "publishConfig": {
     "access": "public"
   },
@@ -32,19 +32,18 @@
     "polymer"
   ],
   "dependencies": {
-    "@polymer/iron-resizable-behavior": "^3.0.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "23.0.0-alpha2",
-    "@vaadin/vaadin-lumo-styles": "23.0.0-alpha2",
-    "@vaadin/vaadin-material-styles": "23.0.0-alpha2",
-    "@vaadin/vaadin-themable-mixin": "23.0.0-alpha2"
+    "@vaadin/component-base": "23.0.0-alpha3",
+    "@vaadin/vaadin-lumo-styles": "23.0.0-alpha3",
+    "@vaadin/vaadin-material-styles": "23.0.0-alpha3",
+    "@vaadin/vaadin-themable-mixin": "23.0.0-alpha3"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/custom-field": "23.0.0-alpha2",
+    "@vaadin/custom-field": "23.0.0-alpha3",
     "@vaadin/testing-helpers": "^0.3.2",
-    "@vaadin/text-field": "23.0.0-alpha2",
+    "@vaadin/text-field": "23.0.0-alpha3",
     "sinon": "^9.2.1"
   },
-  "gitHead": "070f586dead02ca41b66717820c647f48bf1665f"
+  "gitHead": "490037919a9e054cc002c1b3be0c94a1603e1a44"
 }

package/src/vaadin-form-item.d.ts

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2021 Vaadin Ltd.
+ * Copyright (c) 2017 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
@@ -9,7 +9,7 @@ import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mix
  * `<vaadin-form-item>` is a Web Component providing labelled form item wrapper
  * for using inside `<vaadin-form-layout>`.
  *
- * `<vaadin-form-item>` accepts any number of children as the input content,
+ * `<vaadin-form-item>` accepts a single child as the input content,
  * and also has a separate named `label` slot:
  *
  * ```html
@@ -19,19 +19,6 @@ import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mix
  * </vaadin-form-item>
  * ```
  *
- * Any content can be used. For instance, you can have multiple input elements
- * with surrounding text. The label can be an element of any type:
- *
- * ```html
- * <vaadin-form-item>
- *   <span slot="label">Date of Birth</span>
- *   <input placeholder="YYYY" size="4"> -
- *   <input placeholder="MM" size="2"> -
- *   <input placeholder="DD" size="2"><br>
- *   <em>Example: 1900-01-01</em>
- * </vaadin-form-item>
- * ```
- *
  * The label is optional and can be omitted:
  *
  * ```html
@@ -58,7 +45,7 @@ import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mix
  * ### Input Width
  *
  * By default, `<vaadin-form-item>` does not manipulate the width of the slotted
- * input elements. Optionally you can stretch the child input element to fill
+ * input element. Optionally you can stretch the child input element to fill
  * the available width for the input content by adding the `full-width` class:
  *
  * ```html

package/src/vaadin-form-item.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright (c) 2021 Vaadin Ltd.
+ * Copyright (c) 2017 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
@@ -11,7 +11,7 @@ import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mix
  * `<vaadin-form-item>` is a Web Component providing labelled form item wrapper
  * for using inside `<vaadin-form-layout>`.
  *
- * `<vaadin-form-item>` accepts any number of children as the input content,
+ * `<vaadin-form-item>` accepts a single child as the input content,
  * and also has a separate named `label` slot:
  *
  * ```html
@@ -21,19 +21,6 @@ import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mix
  * </vaadin-form-item>
  * ```
  *
- * Any content can be used. For instance, you can have multiple input elements
- * with surrounding text. The label can be an element of any type:
- *
- * ```html
- * <vaadin-form-item>
- *   <span slot="label">Date of Birth</span>
- *   <input placeholder="YYYY" size="4"> -
- *   <input placeholder="MM" size="2"> -
- *   <input placeholder="DD" size="2"><br>
- *   <em>Example: 1900-01-01</em>
- * </vaadin-form-item>
- * ```
- *
  * The label is optional and can be omitted:
  *
  * ```html
@@ -60,7 +47,7 @@ import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mix
  * ### Input Width
  *
  * By default, `<vaadin-form-item>` does not manipulate the width of the slotted
- * input elements. Optionally you can stretch the child input element to fill
+ * input element. Optionally you can stretch the child input element to fill
  * the available width for the input content by adding the `full-width` class:
  *
  * ```html
@@ -295,7 +282,15 @@ class FormItem extends ThemableMixin(PolymerElement) {
       this.__fieldNode = null;
     }
 
-    const newFieldNode = this.$.contentSlot.assignedElements().find((field) => {
+    const fieldNodes = this.$.contentSlot.assignedElements();
+    if (fieldNodes.length > 1) {
+      console.warn(
+        `WARNING: Since Vaadin 23, placing multiple fields directly to a <vaadin-form-item> is deprecated.
+Please wrap fields with a <vaadin-custom-field> instead.`
+      );
+    }
+
+    const newFieldNode = fieldNodes.find((field) => {
       return !!this.__getValidateFunction(field);
     });
     if (newFieldNode) {

package/src/vaadin-form-layout.d.ts

@@ -1,9 +1,10 @@
 /**
  * @license
- * Copyright (c) 2021 Vaadin Ltd.
+ * Copyright (c) 2017 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
+import { ResizeMixin } from '@vaadin/component-base/src/resize-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 export type FormLayoutLabelsPosition = 'aside' | 'top';
@@ -104,7 +105,7 @@ export type FormLayoutResponsiveStep = {
  * ---|---|---
  * `--vaadin-form-layout-column-spacing` | Length of the spacing between columns | `2em`
  */
-declare class FormLayout extends ElementMixin(ThemableMixin(HTMLElement)) {
+declare class FormLayout extends ResizeMixin(ElementMixin(ThemableMixin(HTMLElement))) {
   /**
    * Allows specifying a responsive behavior with the number of columns
    * and the label position depending on the layout width.
@@ -146,8 +147,16 @@ declare class FormLayout extends ElementMixin(ThemableMixin(HTMLElement)) {
 
   /**
    * Set custom CSS property values and update the layout.
+   *
+   * @deprecated Since Vaadin 23, `updateStyles()` is deprecated.
+   * Use the native element.style.setProperty API to set custom CSS property values.
    */
   updateStyles(properties?: { [key: string]: string }): void;
+
+  /**
+   * Update the layout.
+   */
+  protected _updateLayout(): void;
 }
 
 declare global {

package/src/vaadin-form-layout.js

@@ -1,14 +1,12 @@
 /**
  * @license
- * Copyright (c) 2021 Vaadin Ltd.
+ * Copyright (c) 2017 - 2022 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
-import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
 import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js';
-import { beforeNextRender } from '@polymer/polymer/lib/utils/render-status.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
+import { ResizeMixin } from '@vaadin/component-base/src/resize-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
 /**
@@ -104,8 +102,9 @@ import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mix
  * @extends HTMLElement
  * @mixes ElementMixin
  * @mixes ThemableMixin
+ * @mixes ResizeMixin
  */
-class FormLayout extends ElementMixin(ThemableMixin(mixinBehaviors([IronResizableBehavior], PolymerElement))) {
+class FormLayout extends ResizeMixin(ElementMixin(ThemableMixin(PolymerElement))) {
   static get template() {
     return html`
       <style>
@@ -243,7 +242,7 @@ class FormLayout extends ElementMixin(ThemableMixin(mixinBehaviors([IronResizabl
   }
 
   static get observers() {
-    return ['_invokeUpdateStyles(_columnCount, _labelsOnTop)'];
+    return ['_invokeUpdateLayout(_columnCount, _labelsOnTop)'];
   }
 
   /** @protected */
@@ -254,13 +253,12 @@ class FormLayout extends ElementMixin(ThemableMixin(mixinBehaviors([IronResizabl
     // `super.ready()`, because `super.ready()` invokes property observers,
     // and the observer for `responsiveSteps` does CSS value validation.
     this._styleElement = document.createElement('style');
-    this.root.appendChild(this._styleElement);
+    this.appendChild(this._styleElement);
     // Ensure there is a child text node in the style element
     this._styleElement.textContent = ' ';
 
     super.ready();
 
-    this.addEventListener('iron-resize', this._selectResponsiveStep);
     this.addEventListener('animationend', this.__onAnimationEnd);
   }
 
@@ -268,8 +266,8 @@ class FormLayout extends ElementMixin(ThemableMixin(mixinBehaviors([IronResizabl
   connectedCallback() {
     super.connectedCallback();
 
-    beforeNextRender(this, this._selectResponsiveStep);
-    beforeNextRender(this, this.updateStyles);
+    requestAnimationFrame(() => this._selectResponsiveStep());
+    requestAnimationFrame(() => this._updateLayout());
 
     this._observeChildrenColspanChange();
   }
@@ -293,7 +291,7 @@ class FormLayout extends ElementMixin(ThemableMixin(mixinBehaviors([IronResizabl
           mutation.type === 'attributes' &&
           (mutation.attributeName === 'colspan' || mutation.attributeName === 'hidden')
         ) {
-          this.updateStyles();
+          this._updateLayout();
         }
       });
     });
@@ -307,7 +305,7 @@ class FormLayout extends ElementMixin(ThemableMixin(mixinBehaviors([IronResizabl
       });
 
       if (addedNodes.length > 0 || removedNodes.length > 0) {
-        this.updateStyles();
+        this._updateLayout();
       }
     });
   }
@@ -433,18 +431,33 @@ class FormLayout extends ElementMixin(ThemableMixin(mixinBehaviors([IronResizabl
   }
 
   /** @private */
-  _invokeUpdateStyles() {
-    this.updateStyles();
+  _invokeUpdateLayout() {
+    this._updateLayout();
   }
 
   /**
    * Set custom CSS property values and update the layout.
-   * @param {Object<string, string>=} properties
-   * @protected
+   *
+   * @deprecated Since Vaadin 23, `updateStyles()` is deprecated.
+   * Use the native element.style.setProperty API to set custom CSS property values.
    */
-  updateStyles(properties) {
-    super.updateStyles(properties);
+  updateStyles(properties = {}) {
+    console.warn(
+      `WARNING: Since Vaadin 23, updateStyles() is deprecated. Use the native element.style.setProperty API to set custom CSS property values.`
+    );
+
+    Object.entries(properties).forEach(([key, value]) => {
+      this.style.setProperty(key, value);
+    });
 
+    this._updateLayout();
+  }
+
+  /**
+   * Update the layout.
+   * @protected
+   */
+  _updateLayout() {
     /*
       The item width formula:
 
@@ -525,6 +538,14 @@ class FormLayout extends ElementMixin(ThemableMixin(mixinBehaviors([IronResizabl
         }
       });
   }
+
+  /**
+   * @protected
+   * @override
+   */
+  _onResize() {
+    this._selectResponsiveStep();
+  }
 }
 
 customElements.define(FormLayout.is, FormLayout);