@vaadin/field-base 23.1.0-beta4 → 23.1.0-rc3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/field-base",
-  "version": "23.1.0-beta4",
+  "version": "23.1.0-rc3",
   "publishConfig": {
     "access": "public"
   },
@@ -32,7 +32,7 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "23.1.0-beta4",
+    "@vaadin/component-base": "23.1.0-rc3",
     "lit": "^2.0.0"
   },
   "devDependencies": {
@@ -40,5 +40,5 @@
     "@vaadin/testing-helpers": "^0.3.2",
     "sinon": "^13.0.2"
   },
-  "gitHead": "06e283473964ecb3085aacf3eddb5333d052a045"
+  "gitHead": "49c312fbe0228adb559296d45655bbfd4eac6235"
 }

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

@@ -9,13 +9,13 @@
  * either the component itself or slotted `<input>` element.
  */
 export class FieldAriaController {
-  constructor(host: HTMLElement);
-
   /**
    * The controller host element.
    */
   host: HTMLElement;
 
+  constructor(host: HTMLElement);
+
   /**
    * Sets a target element to which ARIA attributes are added.
    */

package/src/field-mixin.d.ts

@@ -5,7 +5,6 @@
  */
 import { Constructor } from '@open-wc/dedupe-mixin';
 import { ControllerMixinClass } from '@vaadin/component-base/src/controller-mixin.js';
-import { SlotMixinClass } from '@vaadin/component-base/src/slot-mixin.js';
 import { LabelMixinClass } from './label-mixin.js';
 import { ValidateMixinClass } from './validate-mixin.js';
 
@@ -18,7 +17,6 @@ export declare function FieldMixin<T extends Constructor<HTMLElement>>(
   Constructor<ControllerMixinClass> &
   Constructor<FieldMixinClass> &
   Constructor<LabelMixinClass> &
-  Constructor<SlotMixinClass> &
   Constructor<ValidateMixinClass>;
 
 export declare class FieldMixinClass {
@@ -49,11 +47,7 @@ export declare class FieldMixinClass {
 
   protected _ariaTargetChanged(target: HTMLElement): void;
 
-  protected _updateErrorMessage(invalid: boolean, errorMessage: string | null | undefined): void;
-
   protected _requiredChanged(required: boolean): void;
 
-  protected _helperIdChanged(helperId: string): void;
-
   protected _invalidChanged(invalid: boolean): void;
 }

package/src/field-mixin.js

@@ -49,9 +49,6 @@ export const FieldMixin = (superclass) =>
           type: String,
           observer: '_helperTextChanged',
         },
-
-        /** @protected */
-        _helperId: String,
       };
     }
 
@@ -169,7 +166,7 @@ export const FieldMixin = (superclass) =>
       this._errorController.setInvalid(invalid);
 
       // This timeout is needed to prevent NVDA from announcing the error message twice:
-      // 1. Once adding the `[role=alert]` attribute by the `_updateErrorMessage` method (OK).
+      // 1. Once adding the `[role=alert]` attribute when updating `has-error-message` (OK).
       // 2. Once linking the error ID with the ARIA target here (unwanted).
       // Related issue: https://github.com/vaadin/web-components/issues/3061.
       setTimeout(() => {

package/src/input-control-mixin.js

@@ -127,15 +127,16 @@ export const InputControlMixin = (superclass) =>
     /**
      * Override an event listener inherited from `KeydownMixin` to clear on Esc.
      * Components that extend this mixin can prevent this behavior by overriding
-     * this method without calling `super._onKeyDown` to provide custom logic.
+     * this method without calling `super._onEscape` to provide custom logic.
      * @param {KeyboardEvent} event
      * @protected
      * @override
      */
-    _onKeyDown(event) {
-      super._onKeyDown(event);
+    _onEscape(event) {
+      super._onEscape(event);
 
-      if (event.key === 'Escape' && this.clearButtonVisible && !!this.value) {
+      if (this.clearButtonVisible && !!this.value) {
+        event.stopPropagation();
         this.__clear();
       }
     }

package/src/input-field-mixin.js

@@ -179,7 +179,7 @@ export const InputFieldMixin = (superclass) =>
     }
 
     /**
-     * Override an event listener from `ClearButtonMixin`
+     * Override an event listener from `InputControlMixin`
      * to avoid adding a separate listener.
      * @param {!KeyboardEvent} event
      * @protected

package/src/label-controller.d.ts

@@ -9,6 +9,11 @@ import { SlotController } from '@vaadin/component-base/src/slot-controller.js';
  * A controller to manage the label element.
  */
 export class LabelController extends SlotController {
+  /**
+   * ID attribute value set on the label element.
+   */
+  labelId: string;
+
   /**
    * String used for the label.
    */
@@ -18,9 +23,4 @@ export class LabelController extends SlotController {
    * Set label based on corresponding host property.
    */
   setLabel(label: string | null | undefined): void;
-
-  /**
-   * ID attribute value set on the label element.
-   */
-  labelId: string;
 }

package/src/label-mixin.d.ts

@@ -4,15 +4,12 @@
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
 import { Constructor } from '@open-wc/dedupe-mixin';
-import { SlotMixinClass } from '@vaadin/component-base/src/slot-mixin.js';
 import { LabelController } from './label-controller.js';
 
 /**
  * A mixin to provide label via corresponding property or named slot.
  */
-export declare function LabelMixin<T extends Constructor<HTMLElement>>(
-  base: T,
-): T & Constructor<LabelMixinClass> & Constructor<SlotMixinClass>;
+export declare function LabelMixin<T extends Constructor<HTMLElement>>(base: T): T & Constructor<LabelMixinClass>;
 
 export declare class LabelMixinClass {
   /**

package/src/slot-target-controller.d.ts

@@ -6,14 +6,6 @@
 import { ReactiveController } from 'lit';
 
 export class SlotTargetController implements ReactiveController {
-  constructor(
-    sourceSlot: HTMLSlotElement,
-    targetFactory: () => HTMLElement,
-    copyCallback?: (nodes: HTMLElement[]) => void,
-  );
-
-  hostConnected(): void;
-
   /**
    * The source `<slot>` element to copy nodes from.
    */
@@ -28,4 +20,12 @@ export class SlotTargetController implements ReactiveController {
    * Function called after copying nodes to target.
    */
   protected copyCallback?: (nodes: HTMLElement[]) => void;
+
+  constructor(
+    sourceSlot: HTMLSlotElement,
+    targetFactory: () => HTMLElement,
+    copyCallback?: (nodes: HTMLElement[]) => void,
+  );
+
+  hostConnected(): void;
 }