@vaadin/custom-field 24.2.0-dev.f254716fe → 24.3.0-alpha2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/custom-field",
-  "version": "24.2.0-dev.f254716fe",
+  "version": "24.3.0-alpha2",
   "publishConfig": {
     "access": "public"
   },
@@ -21,6 +21,8 @@
   "type": "module",
   "files": [
     "src",
+    "!src/vaadin-lit-custom-field.d.ts",
+    "!src/vaadin-lit-custom-field.js",
     "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
@@ -34,32 +36,33 @@
     "web-component"
   ],
   "dependencies": {
+    "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "24.2.0-dev.f254716fe",
-    "@vaadin/component-base": "24.2.0-dev.f254716fe",
-    "@vaadin/field-base": "24.2.0-dev.f254716fe",
-    "@vaadin/vaadin-lumo-styles": "24.2.0-dev.f254716fe",
-    "@vaadin/vaadin-material-styles": "24.2.0-dev.f254716fe",
-    "@vaadin/vaadin-themable-mixin": "24.2.0-dev.f254716fe"
+    "@vaadin/a11y-base": "24.3.0-alpha2",
+    "@vaadin/component-base": "24.3.0-alpha2",
+    "@vaadin/field-base": "24.3.0-alpha2",
+    "@vaadin/vaadin-lumo-styles": "24.3.0-alpha2",
+    "@vaadin/vaadin-material-styles": "24.3.0-alpha2",
+    "@vaadin/vaadin-themable-mixin": "24.3.0-alpha2"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/combo-box": "24.2.0-dev.f254716fe",
-    "@vaadin/date-picker": "24.2.0-dev.f254716fe",
-    "@vaadin/email-field": "24.2.0-dev.f254716fe",
-    "@vaadin/form-layout": "24.2.0-dev.f254716fe",
-    "@vaadin/number-field": "24.2.0-dev.f254716fe",
-    "@vaadin/password-field": "24.2.0-dev.f254716fe",
-    "@vaadin/select": "24.2.0-dev.f254716fe",
-    "@vaadin/testing-helpers": "^0.4.3",
-    "@vaadin/text-area": "24.2.0-dev.f254716fe",
-    "@vaadin/text-field": "24.2.0-dev.f254716fe",
-    "@vaadin/time-picker": "24.2.0-dev.f254716fe",
+    "@vaadin/combo-box": "24.3.0-alpha2",
+    "@vaadin/date-picker": "24.3.0-alpha2",
+    "@vaadin/email-field": "24.3.0-alpha2",
+    "@vaadin/form-layout": "24.3.0-alpha2",
+    "@vaadin/number-field": "24.3.0-alpha2",
+    "@vaadin/password-field": "24.3.0-alpha2",
+    "@vaadin/select": "24.3.0-alpha2",
+    "@vaadin/testing-helpers": "^0.5.0",
+    "@vaadin/text-area": "24.3.0-alpha2",
+    "@vaadin/text-field": "24.3.0-alpha2",
+    "@vaadin/time-picker": "24.3.0-alpha2",
     "sinon": "^13.0.2"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "da54950b9f8c14c6451ede0d426e16a489c7fb9b"
+  "gitHead": "0fd437292fa2a2f65e29b424d2456909ad2d684b"
 }

package/src/vaadin-custom-field-mixin.d.ts

@@ -0,0 +1,83 @@
+/**
+ * @license
+ * Copyright (c) 2019 - 2023 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import type { Constructor } from '@open-wc/dedupe-mixin';
+import type { FocusMixinClass } from '@vaadin/a11y-base/src/focus-mixin.js';
+import type { KeyboardMixinClass } from '@vaadin/a11y-base/src/keyboard-mixin.js';
+import type { FieldMixinClass } from '@vaadin/field-base/src/field-mixin.js';
+import type { LabelMixinClass } from '@vaadin/field-base/src/label-mixin.js';
+import type { ValidateMixinClass } from '@vaadin/field-base/src/validate-mixin.js';
+
+export type CustomFieldParseValueFn = (value: string) => unknown[];
+
+export type CustomFieldFormatValueFn = (inputValues: unknown[]) => string;
+
+/**
+ * A mixin providing common custom field functionality.
+ */
+export declare function CustomFieldMixin<T extends Constructor<HTMLElement>>(
+  base: T,
+): Constructor<CustomFieldMixinClass> &
+  Constructor<FieldMixinClass> &
+  Constructor<FocusMixinClass> &
+  Constructor<KeyboardMixinClass> &
+  Constructor<LabelMixinClass> &
+  Constructor<ValidateMixinClass> &
+  T;
+
+export declare class CustomFieldMixinClass {
+  /**
+   * Array of available input nodes
+   */
+  readonly inputs: HTMLElement[] | undefined;
+
+  /**
+   * A function to format the values of the individual fields contained by
+   * the custom field into a single component value. The function receives
+   * an array of all values of the individual fields in the order of their
+   * presence in the DOM, and must return a single component value.
+   * This function is called each time a value of an internal field is
+   * changed.
+   *
+   * Example:
+   * ```js
+   * customField.formatValue = (fieldValues) => {
+   *   return fieldValues.join("-");
+   * }
+   * ```
+   */
+  formatValue: CustomFieldFormatValueFn | undefined;
+
+  /**
+   * A function to parse the component value into values for the individual
+   * fields contained by the custom field. The function receives the
+   * component value, and must return an array of values for the individual
+   * fields in the order of their presence in the DOM.
+   * The function is called each time the value of the component changes.
+   *
+   * Example:
+   * ```js
+   * customField.parseValue = (componentValue) => {
+   *   return componentValue.split("-");
+   * }
+   * ```
+   */
+  parseValue: CustomFieldParseValueFn | undefined;
+
+  /**
+   * The name of the control, which is submitted with the form data.
+   */
+  name: string | null | undefined;
+
+  /**
+   * The value of the field. When wrapping several inputs, it will contain `\t`
+   * (Tab character) as a delimiter indicating parts intended to be used as the
+   * corresponding inputs values.
+   * Use the [`formatValue`](#/elements/vaadin-custom-field#property-formatValue)
+   * and [`parseValue`](#/elements/vaadin-custom-field#property-parseValue)
+   * properties to customize this behavior.
+   */
+  value: string | null | undefined;
+}

package/src/vaadin-custom-field-mixin.js

@@ -0,0 +1,282 @@
+/**
+ * @license
+ * Copyright (c) 2019 - 2023 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { FocusMixin } from '@vaadin/a11y-base/src/focus-mixin.js';
+import { KeyboardMixin } from '@vaadin/a11y-base/src/keyboard-mixin.js';
+import { getFlattenedElements } from '@vaadin/component-base/src/dom-utils.js';
+import { TooltipController } from '@vaadin/component-base/src/tooltip-controller.js';
+import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js';
+
+/**
+ * Default implementation of the parse function that creates individual field
+ * values from the single component value.
+ * @param value
+ * @returns {*}
+ */
+const defaultParseValue = (value) => {
+  return value.split('\t');
+};
+
+/**
+ * Default implementation of the format function that creates a single component
+ * value from individual field values.
+ * @param inputValues
+ * @returns {*}
+ */
+const defaultFormatValue = (inputValues) => {
+  return inputValues.join('\t');
+};
+
+/**
+ * @polymerMixin
+ * @mixes FieldMixin
+ * @mixes FocusMixin
+ * @mixes KeyboardMixin
+ */
+export const CustomFieldMixin = (superClass) =>
+  class CustomFieldMixin extends FieldMixin(FocusMixin(KeyboardMixin(superClass))) {
+    static get properties() {
+      return {
+        /**
+         * The name of the control, which is submitted with the form data.
+         */
+        name: String,
+
+        /**
+         * The value of the field. When wrapping several inputs, it will contain `\t`
+         * (Tab character) as a delimiter indicating parts intended to be used as the
+         * corresponding inputs values.
+         * Use the [`formatValue`](#/elements/vaadin-custom-field#property-formatValue)
+         * and [`parseValue`](#/elements/vaadin-custom-field#property-parseValue)
+         * properties to customize this behavior.
+         */
+        value: {
+          type: String,
+          observer: '__valueChanged',
+          notify: true,
+        },
+
+        /**
+         * Array of available input nodes
+         * @type {!Array<!HTMLElement> | undefined}
+         */
+        inputs: {
+          type: Array,
+          readOnly: true,
+        },
+
+        /**
+         * A function to format the values of the individual fields contained by
+         * the custom field into a single component value. The function receives
+         * an array of all values of the individual fields in the order of their
+         * presence in the DOM, and must return a single component value.
+         * This function is called each time a value of an internal field is
+         * changed.
+         *
+         * Example:
+         * ```js
+         * customField.formatValue = (fieldValues) => {
+         *   return fieldValues.join("-");
+         * }
+         * ```
+         * @type {!CustomFieldFormatValueFn | undefined}
+         */
+        formatValue: {
+          type: Function,
+        },
+
+        /**
+         * A function to parse the component value into values for the individual
+         * fields contained by the custom field. The function receives the
+         * component value, and must return an array of values for the individual
+         * fields in the order of their presence in the DOM.
+         * The function is called each time the value of the component changes.
+         *
+         * Example:
+         * ```js
+         * customField.parseValue = (componentValue) => {
+         *   return componentValue.split("-");
+         * }
+         * ```
+         * @type {!CustomFieldParseValueFn | undefined}
+         */
+        parseValue: {
+          type: Function,
+        },
+      };
+    }
+
+    /** @protected */
+    ready() {
+      super.ready();
+
+      // See https://github.com/vaadin/vaadin-web-components/issues/94
+      this.setAttribute('role', 'group');
+
+      this.ariaTarget = this;
+
+      this.__childrenObserver = new MutationObserver(() => {
+        this.__setInputsFromSlot();
+      });
+
+      this.__setInputsFromSlot();
+      this.$.slot.addEventListener('slotchange', () => {
+        this.__setInputsFromSlot();
+
+        // Observe changes to any children except inputs
+        // to allow wrapping `<input>` with `<div>` etc.
+        getFlattenedElements(this.$.slot)
+          .filter((el) => !this.__isInput(el))
+          .forEach((el) => {
+            this.__childrenObserver.observe(el, { childList: true });
+          });
+      });
+
+      this._tooltipController = new TooltipController(this);
+      this.addController(this._tooltipController);
+      this._tooltipController.setShouldShow((target) => {
+        const inputs = target.inputs || [];
+        return !inputs.some((el) => el.opened);
+      });
+    }
+
+    /** @protected */
+    focus() {
+      if (this.inputs && this.inputs[0]) {
+        this.inputs[0].focus();
+      }
+    }
+
+    /**
+     * Override method inherited from `FocusMixin` to validate on blur.
+     * @param {boolean} focused
+     * @protected
+     */
+    _setFocused(focused) {
+      super._setFocused(focused);
+
+      if (!focused) {
+        this.validate();
+      }
+    }
+
+    /**
+     * Override method inherited from `FocusMixin` to not remove focused
+     * state when focus moves to another input in the custom field.
+     * @param {FocusEvent} event
+     * @return {boolean}
+     * @protected
+     */
+    _shouldRemoveFocus(event) {
+      const { relatedTarget } = event;
+      return !this.inputs.some((el) => relatedTarget === (el.focusElement || el));
+    }
+
+    /**
+     * Returns true if the current inputs values satisfy all constraints (if any).
+     *
+     * @return {boolean}
+     */
+    checkValidity() {
+      const invalidFields = this.inputs.filter((input) => !(input.validate || input.checkValidity).call(input));
+
+      if (invalidFields.length || (this.required && !this.value.trim())) {
+        // Either 1. one of the input fields is invalid or
+        // 2. the custom field itself is required but doesn't have a value
+        return false;
+      }
+      return true;
+    }
+
+    /**
+     * @param {KeyboardEvent} e
+     * @protected
+     * @override
+     */
+    _onKeyDown(e) {
+      if (e.key === 'Tab') {
+        if (
+          (this.inputs.indexOf(e.target) < this.inputs.length - 1 && !e.shiftKey) ||
+          (this.inputs.indexOf(e.target) > 0 && e.shiftKey)
+        ) {
+          this.dispatchEvent(new CustomEvent('internal-tab'));
+        } else {
+          // FIXME(yuriy): remove this workaround when value should not be updated before focusout
+          this.__setValue();
+        }
+      }
+    }
+
+    /** @protected */
+    _onInputChange(event) {
+      // Stop native change events
+      event.stopPropagation();
+
+      this.__setValue();
+      this.validate();
+      this.dispatchEvent(
+        new CustomEvent('change', {
+          bubbles: true,
+          cancelable: false,
+          detail: {
+            value: this.value,
+          },
+        }),
+      );
+    }
+
+    /** @private */
+    __setValue() {
+      this.__settingValue = true;
+      const formatFn = this.formatValue || defaultFormatValue;
+      this.value = formatFn.apply(this, [this.inputs.map((input) => input.value)]);
+      this.__settingValue = false;
+    }
+
+    /** @private */
+    __isInput(node) {
+      const isSlottedInput = node.getAttribute('slot') === 'input' || node.getAttribute('slot') === 'textarea';
+      return !isSlottedInput && (node.validate || node.checkValidity);
+    }
+
+    /** @private */
+    __getInputsFromSlot() {
+      return getFlattenedElements(this.$.slot).filter((node) => this.__isInput(node));
+    }
+
+    /** @private */
+    __setInputsFromSlot() {
+      this._setInputs(this.__getInputsFromSlot());
+      this.__setValue();
+    }
+
+    /** @private */
+    __toggleHasValue(value) {
+      this.toggleAttribute('has-value', value !== null && value.trim() !== '');
+    }
+
+    /** @private */
+    __valueChanged(value, oldValue) {
+      if (this.__settingValue || !this.inputs) {
+        return;
+      }
+
+      this.__toggleHasValue(value);
+
+      const parseFn = this.parseValue || defaultParseValue;
+      const valuesArray = parseFn.apply(this, [value]);
+      if (!valuesArray || valuesArray.length === 0) {
+        console.warn('Value parser has not provided values array');
+        return;
+      }
+
+      this.inputs.forEach((input, id) => {
+        input.value = valuesArray[id];
+      });
+      if (oldValue !== undefined) {
+        this.validate();
+      }
+    }
+  };

package/src/vaadin-custom-field-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2019 - 2023 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import type { CSSResult } from 'lit';
+
+export const customFieldStyles: CSSResult;

package/src/vaadin-custom-field-styles.js

@@ -0,0 +1,34 @@
+/**
+ * @license
+ * Copyright (c) 2019 - 2023 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { css } from 'lit';
+
+export const customFieldStyles = css`
+  :host {
+    display: inline-flex;
+  }
+
+  :host::before {
+    content: '\\2003';
+    width: 0;
+    display: inline-block;
+    /* Size and position this element on the same vertical position as the input-field element
+           to make vertical align for the host element work as expected */
+  }
+
+  :host([hidden]) {
+    display: none !important;
+  }
+
+  .vaadin-custom-field-container {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .inputs-wrapper {
+    flex: none;
+  }
+`;

package/src/vaadin-custom-field.d.ts

@@ -3,15 +3,11 @@
  * Copyright (c) 2019 - 2023 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { FocusMixin } from '@vaadin/a11y-base/src/focus-mixin.js';
-import { KeyboardMixin } from '@vaadin/a11y-base/src/keyboard-mixin.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
-import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { CustomFieldMixin } from './vaadin-custom-field-mixin.js';
 
-export type CustomFieldParseValueFn = (value: string) => unknown[];
-
-export type CustomFieldFormatValueFn = (inputValues: unknown[]) => string;
+export { CustomFieldFormatValueFn, CustomFieldParseValueFn } from './vaadin-custom-field-mixin.js';
 
 /**
  * Fired when the user commits a value change.
@@ -99,60 +95,7 @@ export interface CustomFieldEventMap extends HTMLElementEventMap, CustomFieldCus
  * @fires {CustomEvent} value-changed - Fired when the `value` property changes.
  * @fires {CustomEvent} validated - Fired whenever the field is validated.
  */
-declare class CustomField extends FieldMixin(FocusMixin(KeyboardMixin(ThemableMixin(ElementMixin(HTMLElement))))) {
-  /**
-   * Array of available input nodes
-   */
-  readonly inputs: HTMLElement[] | undefined;
-
-  /**
-   * A function to format the values of the individual fields contained by
-   * the custom field into a single component value. The function receives
-   * an array of all values of the individual fields in the order of their
-   * presence in the DOM, and must return a single component value.
-   * This function is called each time a value of an internal field is
-   * changed.
-   *
-   * Example:
-   * ```js
-   * customField.formatValue = (fieldValues) => {
-   *   return fieldValues.join("-");
-   * }
-   * ```
-   */
-  formatValue: CustomFieldFormatValueFn | undefined;
-
-  /**
-   * A function to parse the component value into values for the individual
-   * fields contained by the custom field. The function receives the
-   * component value, and must return an array of values for the individual
-   * fields in the order of their presence in the DOM.
-   * The function is called each time the value of the component changes.
-   *
-   * Example:
-   * ```js
-   * customField.parseValue = (componentValue) => {
-   *   return componentValue.split("-");
-   * }
-   * ```
-   */
-  parseValue: CustomFieldParseValueFn | undefined;
-
-  /**
-   * The name of the control, which is submitted with the form data.
-   */
-  name: string | null | undefined;
-
-  /**
-   * The value of the field. When wrapping several inputs, it will contain `\t`
-   * (Tab character) as a delimiter indicating parts intended to be used as the
-   * corresponding inputs values.
-   * Use the [`formatValue`](#/elements/vaadin-custom-field#property-formatValue)
-   * and [`parseValue`](#/elements/vaadin-custom-field#property-parseValue)
-   * properties to customize this behavior.
-   */
-  value: string | null | undefined;
-
+declare class CustomField extends CustomFieldMixin(ThemableMixin(ElementMixin(HTMLElement))) {
   addEventListener<K extends keyof CustomFieldEventMap>(
     type: K,
     listener: (this: CustomField, ev: CustomFieldEventMap[K]) => void,

package/src/vaadin-custom-field.js

@@ -3,34 +3,14 @@
  * Copyright (c) 2019 - 2023 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { FlattenedNodesObserver } from '@polymer/polymer/lib/utils/flattened-nodes-observer.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
-import { FocusMixin } from '@vaadin/a11y-base/src/focus-mixin.js';
-import { KeyboardMixin } from '@vaadin/a11y-base/src/keyboard-mixin.js';
+import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
-import { TooltipController } from '@vaadin/component-base/src/tooltip-controller.js';
-import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js';
-import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { registerStyles, ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { CustomFieldMixin } from './vaadin-custom-field-mixin.js';
+import { customFieldStyles } from './vaadin-custom-field-styles.js';
 
-/**
- * Default implementation of the parse function that creates individual field
- * values from the single component value.
- * @param value
- * @returns {*}
- */
-const defaultParseValue = (value) => {
-  return value.split('\t');
-};
-
-/**
- * Default implementation of the format function that creates a single component
- * value from individual field values.
- * @param inputValues
- * @returns {*}
- */
-const defaultFormatValue = (inputValues) => {
-  return inputValues.join('\t');
-};
+registerStyles('vaadin-custom-field', customFieldStyles, { moduleId: 'vaadin-custom-field-styles' });
 
 /**
  * `<vaadin-custom-field>` is a web component for wrapping multiple components as a single field.
@@ -75,55 +55,26 @@ const defaultFormatValue = (inputValues) => {
  * @fires {CustomEvent} value-changed - Fired when the `value` property changes.
  * @fires {CustomEvent} validated - Fired whenever the field is validated.
  *
+ * @customElement
  * @extends HTMLElement
- * @mixes FieldMixin
- * @mixes FocusMixin
+ * @mixes CustomFieldMixin
  * @mixes ElementMixin
- * @mixes KeyboardMixin
  * @mixes ThemableMixin
  */
-class CustomField extends FieldMixin(FocusMixin(KeyboardMixin(ThemableMixin(ElementMixin(PolymerElement))))) {
+class CustomField extends CustomFieldMixin(ThemableMixin(ElementMixin(PolymerElement))) {
   static get is() {
     return 'vaadin-custom-field';
   }
 
   static get template() {
     return html`
-      <style>
-        :host {
-          display: inline-flex;
-        }
-
-        :host::before {
-          content: '\\2003';
-          width: 0;
-          display: inline-block;
-          /* Size and position this element on the same vertical position as the input-field element
-           to make vertical align for the host element work as expected */
-        }
-
-        :host([hidden]) {
-          display: none !important;
-        }
-
-        .vaadin-custom-field-container {
-          width: 100%;
-          display: flex;
-          flex-direction: column;
-        }
-
-        .inputs-wrapper {
-          flex: none;
-        }
-      </style>
-
       <div class="vaadin-custom-field-container">
         <div part="label" on-click="focus">
           <slot name="label"></slot>
           <span part="required-indicator" aria-hidden="true"></span>
         </div>
 
-        <div class="inputs-wrapper" on-change="__onInputChange">
+        <div class="inputs-wrapper" on-change="_onInputChange">
           <slot id="slot"></slot>
         </div>
 
@@ -140,272 +91,6 @@ class CustomField extends FieldMixin(FocusMixin(KeyboardMixin(ThemableMixin(Elem
     `;
   }
 
-  static get properties() {
-    return {
-      /**
-       * The name of the control, which is submitted with the form data.
-       */
-      name: String,
-
-      /**
-       * The value of the field. When wrapping several inputs, it will contain `\t`
-       * (Tab character) as a delimiter indicating parts intended to be used as the
-       * corresponding inputs values.
-       * Use the [`formatValue`](#/elements/vaadin-custom-field#property-formatValue)
-       * and [`parseValue`](#/elements/vaadin-custom-field#property-parseValue)
-       * properties to customize this behavior.
-       */
-      value: {
-        type: String,
-        observer: '__valueChanged',
-        notify: true,
-      },
-
-      /**
-       * Array of available input nodes
-       * @type {!Array<!HTMLElement> | undefined}
-       */
-      inputs: {
-        type: Array,
-        readOnly: true,
-      },
-
-      /**
-       * A function to format the values of the individual fields contained by
-       * the custom field into a single component value. The function receives
-       * an array of all values of the individual fields in the order of their
-       * presence in the DOM, and must return a single component value.
-       * This function is called each time a value of an internal field is
-       * changed.
-       *
-       * Example:
-       * ```js
-       * customField.formatValue = (fieldValues) => {
-       *   return fieldValues.join("-");
-       * }
-       * ```
-       * @type {!CustomFieldFormatValueFn | undefined}
-       */
-      formatValue: {
-        type: Function,
-      },
-
-      /**
-       * A function to parse the component value into values for the individual
-       * fields contained by the custom field. The function receives the
-       * component value, and must return an array of values for the individual
-       * fields in the order of their presence in the DOM.
-       * The function is called each time the value of the component changes.
-       *
-       * Example:
-       * ```js
-       * customField.parseValue = (componentValue) => {
-       *   return componentValue.split("-");
-       * }
-       * ```
-       * @type {!CustomFieldParseValueFn | undefined}
-       */
-      parseValue: {
-        type: Function,
-      },
-    };
-  }
-
-  /** @protected */
-  connectedCallback() {
-    super.connectedCallback();
-
-    if (this.__observer) {
-      this.__observer.connect();
-    }
-  }
-
-  /** @protected */
-  disconnectedCallback() {
-    super.disconnectedCallback();
-
-    if (this.__observer) {
-      this.__observer.disconnect();
-    }
-  }
-
-  /** @protected */
-  ready() {
-    super.ready();
-
-    // See https://github.com/vaadin/vaadin-web-components/issues/94
-    this.setAttribute('role', 'group');
-
-    this.ariaTarget = this;
-
-    this.__setInputsFromSlot();
-    this.__observer = new FlattenedNodesObserver(this.$.slot, () => {
-      this.__setInputsFromSlot();
-    });
-
-    this._tooltipController = new TooltipController(this);
-    this.addController(this._tooltipController);
-    this._tooltipController.setShouldShow((target) => {
-      const inputs = target.inputs || [];
-      return !inputs.some((el) => el.opened);
-    });
-  }
-
-  /** @protected */
-  focus() {
-    if (this.inputs && this.inputs[0]) {
-      this.inputs[0].focus();
-    }
-  }
-
-  /**
-   * Override method inherited from `FocusMixin` to validate on blur.
-   * @param {boolean} focused
-   * @protected
-   */
-  _setFocused(focused) {
-    super._setFocused(focused);
-
-    if (!focused) {
-      this.validate();
-    }
-  }
-
-  /**
-   * Override method inherited from `FocusMixin` to not remove focused
-   * state when focus moves to another input in the custom field.
-   * @param {FocusEvent} event
-   * @return {boolean}
-   * @protected
-   */
-  _shouldRemoveFocus(event) {
-    const { relatedTarget } = event;
-    return !this.inputs.some((el) => relatedTarget === (el.focusElement || el));
-  }
-
-  /**
-   * Returns true if the current inputs values satisfy all constraints (if any).
-   *
-   * @return {boolean}
-   */
-  checkValidity() {
-    const invalidFields = this.inputs.filter((input) => !(input.validate || input.checkValidity).call(input));
-
-    if (invalidFields.length || (this.required && !this.value.trim())) {
-      // Either 1. one of the input fields is invalid or
-      // 2. the custom field itself is required but doesn't have a value
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * @param {KeyboardEvent} e
-   * @protected
-   * @override
-   */
-  _onKeyDown(e) {
-    if (e.key === 'Tab') {
-      if (
-        (this.inputs.indexOf(e.target) < this.inputs.length - 1 && !e.shiftKey) ||
-        (this.inputs.indexOf(e.target) > 0 && e.shiftKey)
-      ) {
-        this.dispatchEvent(new CustomEvent('internal-tab'));
-      } else {
-        // FIXME(yuriy): remove this workaround when value should not be updated before focusout
-        this.__setValue();
-      }
-    }
-  }
-
-  /** @private */
-  __onInputChange(event) {
-    // Stop native change events
-    event.stopPropagation();
-
-    this.__setValue();
-    this.validate();
-    this.dispatchEvent(
-      new CustomEvent('change', {
-        bubbles: true,
-        cancelable: false,
-        detail: {
-          value: this.value,
-        },
-      }),
-    );
-  }
-
-  /** @private */
-  __setValue() {
-    this.__settingValue = true;
-    const formatFn = this.formatValue || defaultFormatValue;
-    this.value = formatFn.apply(this, [this.inputs.map((input) => input.value)]);
-    this.__settingValue = false;
-  }
-
-  /**
-   * Like querySelectorAll('*') but also gets all elements through any nested slots recursively
-   * @private
-   */
-  __queryAllAssignedElements(elem) {
-    const result = [];
-    let elements;
-    if (elem.tagName === 'SLOT') {
-      elements = elem.assignedElements({ flatten: true });
-    } else {
-      result.push(elem);
-      elements = Array.from(elem.children);
-    }
-    elements.forEach((elem) => result.push(...this.__queryAllAssignedElements(elem)));
-    return result;
-  }
-
-  /** @private */
-  __isInput(node) {
-    const isSlottedInput = node.getAttribute('slot') === 'input' || node.getAttribute('slot') === 'textarea';
-    return !isSlottedInput && (node.validate || node.checkValidity);
-  }
-
-  /** @private */
-  __getInputsFromSlot() {
-    return this.__queryAllAssignedElements(this.$.slot).filter((node) => this.__isInput(node));
-  }
-
-  /** @private */
-  __setInputsFromSlot() {
-    this._setInputs(this.__getInputsFromSlot());
-    this.__setValue();
-  }
-
-  /** @private */
-  __toggleHasValue(value) {
-    this.toggleAttribute('has-value', value !== null && value.trim() !== '');
-  }
-
-  /** @private */
-  __valueChanged(value, oldValue) {
-    if (this.__settingValue || !this.inputs) {
-      return;
-    }
-
-    this.__toggleHasValue(value);
-
-    const parseFn = this.parseValue || defaultParseValue;
-    const valuesArray = parseFn.apply(this, [value]);
-    if (!valuesArray || valuesArray.length === 0) {
-      console.warn('Value parser has not provided values array');
-      return;
-    }
-
-    this.inputs.forEach((input, id) => {
-      input.value = valuesArray[id];
-    });
-    if (oldValue !== undefined) {
-      this.validate();
-    }
-  }
-
   /**
    * Fired when the user commits a value change for any of the internal inputs.
    *
@@ -413,6 +98,6 @@ class CustomField extends FieldMixin(FocusMixin(KeyboardMixin(ThemableMixin(Elem
    */
 }
 
-customElements.define(CustomField.is, CustomField);
+defineCustomElement(CustomField);
 
 export { CustomField };

package/web-types.json

@@ -0,0 +1,269 @@
+{
+  "$schema": "https://json.schemastore.org/web-types",
+  "name": "@vaadin/custom-field",
+  "version": "24.3.0-alpha2",
+  "description-markup": "markdown",
+  "contributions": {
+    "html": {
+      "elements": [
+        {
+          "name": "vaadin-custom-field",
+          "description": "`<vaadin-custom-field>` is a web component for wrapping multiple components as a single field.\n\n```\n<vaadin-custom-field label=\"Appointment time\">\n  <vaadin-date-picker></vaadin-date-picker>\n  <vaadin-time-picker></vaadin-time-picker>\n</vaadin-custom-field>\n```\n\n### Styling\n\nThe following shadow DOM parts are available for styling:\n\nPart name            | Description\n---------------------|----------------\n`label`              | The slotted label element wrapper\n`helper-text`        | The slotted helper text element wrapper\n`error-message`      | The slotted error message element wrapper\n`required-indicator` | The `required` state indicator element\n\nThe following state attributes are available for styling:\n\nAttribute           | Description                               | Part name\n--------------------|-------------------------------------------|------------\n`invalid`           | Set when the element is invalid           | :host\n`focused`           | Set when the element is focused           | :host\n`has-label`         | Set when the element has a label          | :host\n`has-value`         | Set when the element has a value          | :host\n`has-helper`        | Set when the element has helper text      | :host\n`has-error-message` | Set when the element has an error message | :host\n\nYou may also manually set `disabled` or `readonly` attribute on this component to make the label\npart look visually the same as on a `<vaadin-text-field>` when it is disabled or readonly.\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
+          "attributes": [
+            {
+              "name": "label",
+              "description": "The label text for the input node.\nWhen no light dom defined via [slot=label], this value will be used.",
+              "value": {
+                "type": [
+                  "string",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
+            {
+              "name": "invalid",
+              "description": "Set to true when the field is invalid.",
+              "value": {
+                "type": [
+                  "boolean",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
+            {
+              "name": "required",
+              "description": "Specifies that the user must fill in a value.",
+              "value": {
+                "type": [
+                  "boolean",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
+            {
+              "name": "error-message",
+              "description": "Error to show when the field is invalid.",
+              "value": {
+                "type": [
+                  "string",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
+            {
+              "name": "helper-text",
+              "description": "String used for the helper text.",
+              "value": {
+                "type": [
+                  "string",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
+            {
+              "name": "accessible-name",
+              "description": "String used to label the component to screen reader users.",
+              "value": {
+                "type": [
+                  "string",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
+            {
+              "name": "accessible-name-ref",
+              "description": "Id of the element used as label of the component to screen reader users.",
+              "value": {
+                "type": [
+                  "string",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
+            {
+              "name": "name",
+              "description": "The name of the control, which is submitted with the form data.",
+              "value": {
+                "type": [
+                  "string",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
+            {
+              "name": "value",
+              "description": "The value of the field. When wrapping several inputs, it will contain `\\t`\n(Tab character) as a delimiter indicating parts intended to be used as the\ncorresponding inputs values.\nUse the [`formatValue`](https://cdn.vaadin.com/vaadin-web-components/24.3.0-alpha2/#/elements/vaadin-custom-field#property-formatValue)\nand [`parseValue`](https://cdn.vaadin.com/vaadin-web-components/24.3.0-alpha2/#/elements/vaadin-custom-field#property-parseValue)\nproperties to customize this behavior.",
+              "value": {
+                "type": [
+                  "string",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
+            {
+              "name": "theme",
+              "description": "The theme variants to apply to the component.",
+              "value": {
+                "type": [
+                  "string",
+                  "null",
+                  "undefined"
+                ]
+              }
+            }
+          ],
+          "js": {
+            "properties": [
+              {
+                "name": "label",
+                "description": "The label text for the input node.\nWhen no light dom defined via [slot=label], this value will be used.",
+                "value": {
+                  "type": [
+                    "string",
+                    "null",
+                    "undefined"
+                  ]
+                }
+              },
+              {
+                "name": "invalid",
+                "description": "Set to true when the field is invalid.",
+                "value": {
+                  "type": [
+                    "boolean",
+                    "null",
+                    "undefined"
+                  ]
+                }
+              },
+              {
+                "name": "required",
+                "description": "Specifies that the user must fill in a value.",
+                "value": {
+                  "type": [
+                    "boolean",
+                    "null",
+                    "undefined"
+                  ]
+                }
+              },
+              {
+                "name": "errorMessage",
+                "description": "Error to show when the field is invalid.",
+                "value": {
+                  "type": [
+                    "string",
+                    "null",
+                    "undefined"
+                  ]
+                }
+              },
+              {
+                "name": "helperText",
+                "description": "String used for the helper text.",
+                "value": {
+                  "type": [
+                    "string",
+                    "null",
+                    "undefined"
+                  ]
+                }
+              },
+              {
+                "name": "accessibleName",
+                "description": "String used to label the component to screen reader users.",
+                "value": {
+                  "type": [
+                    "string",
+                    "null",
+                    "undefined"
+                  ]
+                }
+              },
+              {
+                "name": "accessibleNameRef",
+                "description": "Id of the element used as label of the component to screen reader users.",
+                "value": {
+                  "type": [
+                    "string",
+                    "null",
+                    "undefined"
+                  ]
+                }
+              },
+              {
+                "name": "name",
+                "description": "The name of the control, which is submitted with the form data.",
+                "value": {
+                  "type": [
+                    "string",
+                    "null",
+                    "undefined"
+                  ]
+                }
+              },
+              {
+                "name": "value",
+                "description": "The value of the field. When wrapping several inputs, it will contain `\\t`\n(Tab character) as a delimiter indicating parts intended to be used as the\ncorresponding inputs values.\nUse the [`formatValue`](https://cdn.vaadin.com/vaadin-web-components/24.3.0-alpha2/#/elements/vaadin-custom-field#property-formatValue)\nand [`parseValue`](https://cdn.vaadin.com/vaadin-web-components/24.3.0-alpha2/#/elements/vaadin-custom-field#property-parseValue)\nproperties to customize this behavior.",
+                "value": {
+                  "type": [
+                    "string",
+                    "null",
+                    "undefined"
+                  ]
+                }
+              },
+              {
+                "name": "formatValue",
+                "description": "A function to format the values of the individual fields contained by\nthe custom field into a single component value. The function receives\nan array of all values of the individual fields in the order of their\npresence in the DOM, and must return a single component value.\nThis function is called each time a value of an internal field is\nchanged.\n\nExample:\n```js\ncustomField.formatValue = (fieldValues) => {\n  return fieldValues.join(\"-\");\n}\n```",
+                "value": {
+                  "type": [
+                    "CustomFieldFormatValueFn",
+                    "undefined"
+                  ]
+                }
+              },
+              {
+                "name": "parseValue",
+                "description": "A function to parse the component value into values for the individual\nfields contained by the custom field. The function receives the\ncomponent value, and must return an array of values for the individual\nfields in the order of their presence in the DOM.\nThe function is called each time the value of the component changes.\n\nExample:\n```js\ncustomField.parseValue = (componentValue) => {\n  return componentValue.split(\"-\");\n}\n```",
+                "value": {
+                  "type": [
+                    "CustomFieldParseValueFn",
+                    "undefined"
+                  ]
+                }
+              }
+            ],
+            "events": [
+              {
+                "name": "validated",
+                "description": "Fired whenever the field is validated."
+              },
+              {
+                "name": "change",
+                "description": "Fired when the user commits a value change for any of the internal inputs."
+              },
+              {
+                "name": "invalid-changed",
+                "description": "Fired when the `invalid` property changes."
+              },
+              {
+                "name": "value-changed",
+                "description": "Fired when the `value` property changes."
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}

package/web-types.lit.json

@@ -0,0 +1,132 @@
+{
+  "$schema": "https://json.schemastore.org/web-types",
+  "name": "@vaadin/custom-field",
+  "version": "24.3.0-alpha2",
+  "description-markup": "markdown",
+  "framework": "lit",
+  "framework-config": {
+    "enable-when": {
+      "node-packages": [
+        "lit"
+      ]
+    }
+  },
+  "contributions": {
+    "html": {
+      "elements": [
+        {
+          "name": "vaadin-custom-field",
+          "description": "`<vaadin-custom-field>` is a web component for wrapping multiple components as a single field.\n\n```\n<vaadin-custom-field label=\"Appointment time\">\n  <vaadin-date-picker></vaadin-date-picker>\n  <vaadin-time-picker></vaadin-time-picker>\n</vaadin-custom-field>\n```\n\n### Styling\n\nThe following shadow DOM parts are available for styling:\n\nPart name            | Description\n---------------------|----------------\n`label`              | The slotted label element wrapper\n`helper-text`        | The slotted helper text element wrapper\n`error-message`      | The slotted error message element wrapper\n`required-indicator` | The `required` state indicator element\n\nThe following state attributes are available for styling:\n\nAttribute           | Description                               | Part name\n--------------------|-------------------------------------------|------------\n`invalid`           | Set when the element is invalid           | :host\n`focused`           | Set when the element is focused           | :host\n`has-label`         | Set when the element has a label          | :host\n`has-value`         | Set when the element has a value          | :host\n`has-helper`        | Set when the element has helper text      | :host\n`has-error-message` | Set when the element has an error message | :host\n\nYou may also manually set `disabled` or `readonly` attribute on this component to make the label\npart look visually the same as on a `<vaadin-text-field>` when it is disabled or readonly.\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
+          "extension": true,
+          "attributes": [
+            {
+              "name": "?invalid",
+              "description": "Set to true when the field is invalid.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "?required",
+              "description": "Specifies that the user must fill in a value.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": ".label",
+              "description": "The label text for the input node.\nWhen no light dom defined via [slot=label], this value will be used.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": ".errorMessage",
+              "description": "Error to show when the field is invalid.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": ".helperText",
+              "description": "String used for the helper text.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": ".accessibleName",
+              "description": "String used to label the component to screen reader users.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": ".accessibleNameRef",
+              "description": "Id of the element used as label of the component to screen reader users.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": ".name",
+              "description": "The name of the control, which is submitted with the form data.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": ".value",
+              "description": "The value of the field. When wrapping several inputs, it will contain `\\t`\n(Tab character) as a delimiter indicating parts intended to be used as the\ncorresponding inputs values.\nUse the [`formatValue`](https://cdn.vaadin.com/vaadin-web-components/24.3.0-alpha2/#/elements/vaadin-custom-field#property-formatValue)\nand [`parseValue`](https://cdn.vaadin.com/vaadin-web-components/24.3.0-alpha2/#/elements/vaadin-custom-field#property-parseValue)\nproperties to customize this behavior.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": ".formatValue",
+              "description": "A function to format the values of the individual fields contained by\nthe custom field into a single component value. The function receives\nan array of all values of the individual fields in the order of their\npresence in the DOM, and must return a single component value.\nThis function is called each time a value of an internal field is\nchanged.\n\nExample:\n```js\ncustomField.formatValue = (fieldValues) => {\n  return fieldValues.join(\"-\");\n}\n```",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": ".parseValue",
+              "description": "A function to parse the component value into values for the individual\nfields contained by the custom field. The function receives the\ncomponent value, and must return an array of values for the individual\nfields in the order of their presence in the DOM.\nThe function is called each time the value of the component changes.\n\nExample:\n```js\ncustomField.parseValue = (componentValue) => {\n  return componentValue.split(\"-\");\n}\n```",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "@validated",
+              "description": "Fired whenever the field is validated.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "@change",
+              "description": "Fired when the user commits a value change for any of the internal inputs.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "@invalid-changed",
+              "description": "Fired when the `invalid` property changes.",
+              "value": {
+                "kind": "expression"
+              }
+            },
+            {
+              "name": "@value-changed",
+              "description": "Fired when the `value` property changes.",
+              "value": {
+                "kind": "expression"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}