@vaadin/field-base 24.0.0-rc2 → 24.1.0-alpha1

package/index.d.ts

@@ -1,5 +1,4 @@
 export { CheckedMixin } from './src/checked-mixin.js';
-export { FieldAriaController } from './src/field-aria-controller.js';
 export { FieldMixin } from './src/field-mixin.js';
 export { InputController } from './src/input-controller.js';
 export { InputControlMixin } from './src/input-control-mixin.js';

package/index.js

@@ -1,5 +1,4 @@
 export { CheckedMixin } from './src/checked-mixin.js';
-export { FieldAriaController } from './src/field-aria-controller.js';
 export { FieldMixin } from './src/field-mixin.js';
 export { InputController } from './src/input-controller.js';
 export { InputControlMixin } from './src/input-control-mixin.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/field-base",
-  "version": "24.0.0-rc2",
+  "version": "24.1.0-alpha1",
   "publishConfig": {
     "access": "public"
   },
@@ -32,7 +32,8 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "24.0.0-rc2",
+    "@vaadin/a11y-base": "24.1.0-alpha1",
+    "@vaadin/component-base": "24.1.0-alpha1",
     "lit": "^2.0.0"
   },
   "devDependencies": {
@@ -40,5 +41,5 @@
     "@vaadin/testing-helpers": "^0.4.0",
     "sinon": "^13.0.2"
   },
-  "gitHead": "7601e71eaf22c45309852d5d491e0e01bb6322f0"
+  "gitHead": "599a339181595923b9ad6373d6888d8a79540141"
 }

package/src/checked-mixin.d.ts

@@ -4,8 +4,8 @@
  * 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 { DisabledMixinClass } from '@vaadin/a11y-base/src/disabled-mixin.js';
 import type { DelegateStateMixinClass } from '@vaadin/component-base/src/delegate-state-mixin.js';
-import type { DisabledMixinClass } from '@vaadin/component-base/src/disabled-mixin.js';
 import type { InputMixinClass } from './input-mixin.js';
 
 /**

package/src/checked-mixin.js

@@ -4,9 +4,9 @@
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { dedupingMixin } from '@polymer/polymer/lib/utils/mixin.js';
+import { DisabledMixin } from '@vaadin/a11y-base/src/disabled-mixin.js';
+import { isElementFocused } from '@vaadin/a11y-base/src/focus-utils.js';
 import { DelegateStateMixin } from '@vaadin/component-base/src/delegate-state-mixin.js';
-import { DisabledMixin } from '@vaadin/component-base/src/disabled-mixin.js';
-import { isElementFocused } from '@vaadin/component-base/src/focus-utils.js';
 import { InputMixin } from './input-mixin.js';
 
 /**

package/src/clear-button-mixin.d.ts

@@ -4,8 +4,8 @@
  * 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 { KeyboardMixinClass } from '@vaadin/a11y-base/src/keyboard-mixin.js';
 import type { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
-import type { KeyboardMixinClass } from '@vaadin/component-base/src/keyboard-mixin.js';
 import type { InputMixinClass } from './input-mixin.js';
 
 /**
@@ -13,7 +13,11 @@ import type { InputMixinClass } from './input-mixin.js';
  */
 export declare function ClearButtonMixin<T extends Constructor<HTMLElement>>(
   base: T,
-): Constructor<ClearButtonMixinClass> & Constructor<InputMixinClass> & Constructor<KeyboardMixinClass> & T;
+): Constructor<ClearButtonMixinClass> &
+  Constructor<ControllerMixinClass> &
+  Constructor<InputMixinClass> &
+  Constructor<KeyboardMixinClass> &
+  T;
 
 export declare class ClearButtonMixinClass {
   /**

package/src/clear-button-mixin.js

@@ -3,7 +3,7 @@
  * Copyright (c) 2021 - 2023 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { KeyboardMixin } from '@vaadin/component-base/src/keyboard-mixin.js';
+import { KeyboardMixin } from '@vaadin/a11y-base/src/keyboard-mixin.js';
 import { InputMixin } from './input-mixin.js';
 
 /**

package/src/field-mixin.js

@@ -3,9 +3,9 @@
  * Copyright (c) 2021 - 2023 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
+import { FieldAriaController } from '@vaadin/a11y-base/src/field-aria-controller.js';
 import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
 import { ErrorController } from './error-controller.js';
-import { FieldAriaController } from './field-aria-controller.js';
 import { HelperController } from './helper-controller.js';
 import { LabelMixin } from './label-mixin.js';
 import { ValidateMixin } from './validate-mixin.js';

package/src/input-control-mixin.d.ts

@@ -4,12 +4,12 @@
  * 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 { DelegateFocusMixinClass } from '@vaadin/a11y-base/src/delegate-focus-mixin.js';
+import type { DisabledMixinClass } from '@vaadin/a11y-base/src/disabled-mixin.js';
+import type { FocusMixinClass } from '@vaadin/a11y-base/src/focus-mixin.js';
+import type { KeyboardMixinClass } from '@vaadin/a11y-base/src/keyboard-mixin.js';
 import type { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
-import type { DelegateFocusMixinClass } from '@vaadin/component-base/src/delegate-focus-mixin.js';
 import type { DelegateStateMixinClass } from '@vaadin/component-base/src/delegate-state-mixin.js';
-import type { DisabledMixinClass } from '@vaadin/component-base/src/disabled-mixin.js';
-import type { FocusMixinClass } from '@vaadin/component-base/src/focus-mixin.js';
-import type { KeyboardMixinClass } from '@vaadin/component-base/src/keyboard-mixin.js';
 import type { ClearButtonMixinClass } from './clear-button-mixin.js';
 import type { FieldMixinClass } from './field-mixin.js';
 import type { InputConstraintsMixinClass } from './input-constraints-mixin.js';

package/src/input-control-mixin.js

@@ -3,10 +3,10 @@
  * Copyright (c) 2021 - 2023 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
+import { DelegateFocusMixin } from '@vaadin/a11y-base/src/delegate-focus-mixin.js';
+import { KeyboardMixin } from '@vaadin/a11y-base/src/keyboard-mixin.js';
 import { timeOut } from '@vaadin/component-base/src/async.js';
 import { Debouncer } from '@vaadin/component-base/src/debounce.js';
-import { DelegateFocusMixin } from '@vaadin/component-base/src/delegate-focus-mixin.js';
-import { KeyboardMixin } from '@vaadin/component-base/src/keyboard-mixin.js';
 import { ClearButtonMixin } from './clear-button-mixin.js';
 import { FieldMixin } from './field-mixin.js';
 import { InputConstraintsMixin } from './input-constraints-mixin.js';

package/src/input-field-mixin.d.ts

@@ -4,12 +4,12 @@
  * 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 { DelegateFocusMixinClass } from '@vaadin/a11y-base/src/delegate-focus-mixin.js';
+import type { DisabledMixinClass } from '@vaadin/a11y-base/src/disabled-mixin.js';
+import type { FocusMixinClass } from '@vaadin/a11y-base/src/focus-mixin.js';
+import type { KeyboardMixinClass } from '@vaadin/a11y-base/src/keyboard-mixin.js';
 import type { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
-import type { DelegateFocusMixinClass } from '@vaadin/component-base/src/delegate-focus-mixin.js';
 import type { DelegateStateMixinClass } from '@vaadin/component-base/src/delegate-state-mixin.js';
-import type { DisabledMixinClass } from '@vaadin/component-base/src/disabled-mixin.js';
-import type { FocusMixinClass } from '@vaadin/component-base/src/focus-mixin.js';
-import type { KeyboardMixinClass } from '@vaadin/component-base/src/keyboard-mixin.js';
 import type { ClearButtonMixinClass } from './clear-button-mixin.js';
 import type { FieldMixinClass } from './field-mixin.js';
 import type { InputConstraintsMixinClass } from './input-constraints-mixin.js';

package/src/input-mixin.d.ts

@@ -34,6 +34,18 @@ export declare class InputMixinClass {
    */
   protected readonly _hasValue: boolean;
 
+  /**
+   * A property for accessing the input element's value.
+   *
+   * Override this getter if the property is different from the default `value` one.
+   */
+  protected readonly _inputElementValueProperty: string;
+
+  /**
+   * The input element's value.
+   */
+  protected _inputElementValue: string | undefined;
+
   /**
    * Clear the value of the field.
    */

package/src/input-mixin.js

@@ -86,6 +86,39 @@ export const InputMixin = dedupingMixin(
         return this.value != null && this.value !== '';
       }
 
+      /**
+       * A property for accessing the input element's value.
+       *
+       * Override this getter if the property is different from the default `value` one.
+       *
+       * @protected
+       * @return {string}
+       */
+      get _inputElementValueProperty() {
+        return 'value';
+      }
+
+      /**
+       * The input element's value.
+       *
+       * @protected
+       * @return {string}
+       */
+      get _inputElementValue() {
+        return this.inputElement ? this.inputElement[this._inputElementValueProperty] : undefined;
+      }
+
+      /**
+       * The input element's value.
+       *
+       * @protected
+       */
+      set _inputElementValue(value) {
+        if (this.inputElement) {
+          this.inputElement[this._inputElementValueProperty] = value;
+        }
+      }
+
       /**
        * Clear the value of the field.
        */
@@ -96,9 +129,7 @@ export const InputMixin = dedupingMixin(
 
         // Clear the input immediately without waiting for the observer.
         // Otherwise, when using Lit, the old value would be restored.
-        if (this.inputElement) {
-          this.inputElement.value = '';
-        }
+        this._inputElementValue = '';
       }
 
       /**
@@ -138,11 +169,7 @@ export const InputMixin = dedupingMixin(
           return;
         }
 
-        if (value != null) {
-          this.inputElement.value = value;
-        } else {
-          this.inputElement.value = '';
-        }
+        this._inputElementValue = value != null ? value : '';
       }
 
       /**

package/src/field-aria-controller.d.ts

@@ -1,56 +0,0 @@
-/**
- * @license
- * Copyright (c) 2021 - 2023 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-
-/**
- * A controller for managing ARIA attributes for a field element:
- * either the component itself or slotted `<input>` element.
- */
-export class FieldAriaController {
-  /**
-   * The controller host element.
-   */
-  host: HTMLElement;
-
-  constructor(host: HTMLElement);
-
-  /**
-   * Sets a target element to which ARIA attributes are added.
-   */
-  setTarget(target: HTMLElement): void;
-
-  /**
-   * Toggles the `aria-required` attribute on the target element
-   * if the target is the host component (e.g. a field group).
-   * Otherwise, it does nothing.
-   */
-  setRequired(required: boolean): void;
-
-  /**
-   * Links the target element with a slotted label element
-   * via the target's attribute `aria-labelledby`.
-   *
-   * To unlink the previous slotted label element, pass `null` as `labelId`.
-   */
-  setLabelId(labelId: string | null): void;
-
-  /**
-   * Links the target element with a slotted error element via the target's attribute:
-   * - `aria-labelledby` if the target is the host component (e.g a field group).
-   * - `aria-describedby` otherwise.
-   *
-   * To unlink the previous slotted error element, pass `null` as `errorId`.
-   */
-  setErrorId(errorId: string | null): void;
-
-  /**
-   * Links the target element with a slotted helper element via the target's attribute:
-   * - `aria-labelledby` if the target is the host component (e.g a field group).
-   * - `aria-describedby` otherwise.
-   *
-   * To unlink the previous slotted helper element, pass `null` as `helperId`.
-   */
-  setHelperId(helperId: string | null): void;
-}

package/src/field-aria-controller.js

@@ -1,172 +0,0 @@
-/**
- * @license
- * Copyright (c) 2021 - 2023 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import { addValueToAttribute, removeValueFromAttribute } from '@vaadin/component-base/src/dom-utils.js';
-
-/**
- * A controller for managing ARIA attributes for a field element:
- * either the component itself or slotted `<input>` element.
- */
-export class FieldAriaController {
-  constructor(host) {
-    this.host = host;
-    this.__required = false;
-  }
-
-  /**
-   * `true` if the target element is the host component itself, `false` otherwise.
-   *
-   * @return {boolean}
-   * @private
-   */
-  get __isGroupField() {
-    return this.__target === this.host;
-  }
-
-  /**
-   * Sets a target element to which ARIA attributes are added.
-   *
-   * @param {HTMLElement} target
-   */
-  setTarget(target) {
-    this.__target = target;
-    this.__setAriaRequiredAttribute(this.__required);
-    this.__setLabelIdToAriaAttribute(this.__labelId);
-    this.__setErrorIdToAriaAttribute(this.__errorId);
-    this.__setHelperIdToAriaAttribute(this.__helperId);
-  }
-
-  /**
-   * Toggles the `aria-required` attribute on the target element
-   * if the target is the host component (e.g. a field group).
-   * Otherwise, it does nothing.
-   *
-   * @param {boolean} required
-   */
-  setRequired(required) {
-    this.__setAriaRequiredAttribute(required);
-    this.__required = required;
-  }
-
-  /**
-   * Links the target element with a slotted label element
-   * via the target's attribute `aria-labelledby`.
-   *
-   * To unlink the previous slotted label element, pass `null` as `labelId`.
-   *
-   * @param {string | null} labelId
-   */
-  setLabelId(labelId) {
-    this.__setLabelIdToAriaAttribute(labelId, this.__labelId);
-    this.__labelId = labelId;
-  }
-
-  /**
-   * Links the target element with a slotted error element via the target's attribute:
-   * - `aria-labelledby` if the target is the host component (e.g a field group).
-   * - `aria-describedby` otherwise.
-   *
-   * To unlink the previous slotted error element, pass `null` as `errorId`.
-   *
-   * @param {string | null} errorId
-   */
-  setErrorId(errorId) {
-    this.__setErrorIdToAriaAttribute(errorId, this.__errorId);
-    this.__errorId = errorId;
-  }
-
-  /**
-   * Links the target element with a slotted helper element via the target's attribute:
-   * - `aria-labelledby` if the target is the host component (e.g a field group).
-   * - `aria-describedby` otherwise.
-   *
-   * To unlink the previous slotted helper element, pass `null` as `helperId`.
-   *
-   * @param {string | null} helperId
-   */
-  setHelperId(helperId) {
-    this.__setHelperIdToAriaAttribute(helperId, this.__helperId);
-    this.__helperId = helperId;
-  }
-
-  /**
-   * @param {string | null | undefined} labelId
-   * @param {string | null | undefined} oldLabelId
-   * @private
-   */
-  __setLabelIdToAriaAttribute(labelId, oldLabelId) {
-    this.__setAriaAttributeId('aria-labelledby', labelId, oldLabelId);
-  }
-
-  /**
-   * @param {string | null | undefined} errorId
-   * @param {string | null | undefined} oldErrorId
-   * @private
-   */
-  __setErrorIdToAriaAttribute(errorId, oldErrorId) {
-    // For groups, add all IDs to aria-labelledby rather than aria-describedby -
-    // that should guarantee that it's announced when the group is entered.
-    if (this.__isGroupField) {
-      this.__setAriaAttributeId('aria-labelledby', errorId, oldErrorId);
-    } else {
-      this.__setAriaAttributeId('aria-describedby', errorId, oldErrorId);
-    }
-  }
-
-  /**
-   * @param {string | null | undefined} helperId
-   * @param {string | null | undefined} oldHelperId
-   * @private
-   */
-  __setHelperIdToAriaAttribute(helperId, oldHelperId) {
-    // For groups, add all IDs to aria-labelledby rather than aria-describedby -
-    // that should guarantee that it's announced when the group is entered.
-    if (this.__isGroupField) {
-      this.__setAriaAttributeId('aria-labelledby', helperId, oldHelperId);
-    } else {
-      this.__setAriaAttributeId('aria-describedby', helperId, oldHelperId);
-    }
-  }
-
-  /**
-   * @param {boolean} required
-   * @private
-   */
-  __setAriaRequiredAttribute(required) {
-    if (!this.__target) {
-      return;
-    }
-
-    if (['input', 'textarea'].includes(this.__target.localName)) {
-      // Native <input> or <textarea>, required is enough
-      return;
-    }
-
-    if (required) {
-      this.__target.setAttribute('aria-required', 'true');
-    } else {
-      this.__target.removeAttribute('aria-required');
-    }
-  }
-
-  /**
-   * @param {string | null | undefined} newId
-   * @param {string | null | undefined} oldId
-   * @private
-   */
-  __setAriaAttributeId(attr, newId, oldId) {
-    if (!this.__target) {
-      return;
-    }
-
-    if (oldId) {
-      removeValueFromAttribute(this.__target, attr, oldId);
-    }
-
-    if (newId) {
-      addValueToAttribute(this.__target, attr, newId);
-    }
-  }
-}