@vaadin/select 23.0.10 → 23.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/select",
-  "version": "23.0.10",
+  "version": "23.0.13",
   "publishConfig": {
     "access": "public"
   },
@@ -34,24 +34,24 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.2.0",
-    "@vaadin/button": "^23.0.10",
-    "@vaadin/component-base": "^23.0.10",
-    "@vaadin/field-base": "^23.0.10",
-    "@vaadin/input-container": "^23.0.10",
-    "@vaadin/item": "^23.0.10",
-    "@vaadin/list-box": "^23.0.10",
-    "@vaadin/vaadin-list-mixin": "^23.0.10",
-    "@vaadin/vaadin-lumo-styles": "^23.0.10",
-    "@vaadin/vaadin-material-styles": "^23.0.10",
-    "@vaadin/vaadin-overlay": "^23.0.10",
-    "@vaadin/vaadin-themable-mixin": "^23.0.10"
+    "@vaadin/button": "^23.0.13",
+    "@vaadin/component-base": "^23.0.13",
+    "@vaadin/field-base": "^23.0.13",
+    "@vaadin/input-container": "^23.0.13",
+    "@vaadin/item": "^23.0.13",
+    "@vaadin/list-box": "^23.0.13",
+    "@vaadin/vaadin-list-mixin": "^23.0.13",
+    "@vaadin/vaadin-lumo-styles": "^23.0.13",
+    "@vaadin/vaadin-material-styles": "^23.0.13",
+    "@vaadin/vaadin-overlay": "^23.0.13",
+    "@vaadin/vaadin-themable-mixin": "^23.0.13"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/polymer-legacy-adapter": "^23.0.10",
+    "@vaadin/polymer-legacy-adapter": "^23.0.13",
     "@vaadin/testing-helpers": "^0.3.2",
     "lit": "^2.0.0",
     "sinon": "^9.2.0"
   },
-  "gitHead": "e8402a55ce0e823ae6da5c97486998cfd931b1d3"
+  "gitHead": "e915550ec6400b5eae6c779fe0afeb1931399312"
 }

package/src/vaadin-select.d.ts

@@ -6,6 +6,7 @@
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { SlotMixin } from '@vaadin/component-base/src/slot-mixin.js';
 import { DelegateFocusMixin } from '@vaadin/field-base/src/delegate-focus-mixin.js';
+import { DelegateStateMixin } from '@vaadin/field-base/src/delegate-state-mixin.js';
 import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 
@@ -164,7 +165,9 @@ export interface SelectEventMap extends HTMLElementEventMap, SelectCustomEventMa
  * @fires {CustomEvent} opened-changed - Fired when the `opened` property changes.
  * @fires {CustomEvent} value-changed - Fired when the `value` property changes.
  */
-declare class Select extends DelegateFocusMixin(FieldMixin(SlotMixin(ElementMixin(ThemableMixin(HTMLElement))))) {
+declare class Select extends DelegateFocusMixin(
+  DelegateStateMixin(FieldMixin(SlotMixin(ElementMixin(ThemableMixin(HTMLElement))))),
+) {
   /**
    * An array containing items that will be rendered as the options of the select.
    *

package/src/vaadin-select.js

@@ -14,6 +14,7 @@ import { MediaQueryController } from '@vaadin/component-base/src/media-query-con
 import { SlotMixin } from '@vaadin/component-base/src/slot-mixin.js';
 import { processTemplates } from '@vaadin/component-base/src/templates.js';
 import { DelegateFocusMixin } from '@vaadin/field-base/src/delegate-focus-mixin.js';
+import { DelegateStateMixin } from '@vaadin/field-base/src/delegate-state-mixin.js';
 import { FieldMixin } from '@vaadin/field-base/src/field-mixin.js';
 import { fieldShared } from '@vaadin/field-base/src/styles/field-shared-styles.js';
 import { inputFieldContainer } from '@vaadin/field-base/src/styles/input-field-container-styles.js';
@@ -131,8 +132,11 @@ registerStyles('vaadin-select', [fieldShared, inputFieldContainer], { moduleId:
  * @mixes SlotMixin
  * @mixes FieldMixin
  * @mixes DelegateFocusMixin
+ * @mixes DelegateStateMixin
  */
-class Select extends DelegateFocusMixin(FieldMixin(SlotMixin(ElementMixin(ThemableMixin(PolymerElement))))) {
+class Select extends DelegateFocusMixin(
+  DelegateStateMixin(FieldMixin(SlotMixin(ElementMixin(ThemableMixin(PolymerElement))))),
+) {
   static get is() {
     return 'vaadin-select';
   }
@@ -162,7 +166,7 @@ class Select extends DelegateFocusMixin(FieldMixin(SlotMixin(ElementMixin(Themab
         >
           <slot name="prefix" slot="prefix"></slot>
           <slot name="value"></slot>
-          <div part="toggle-button" slot="suffix" aria-hidden="true"></div>
+          <div part="toggle-button" slot="suffix" aria-hidden="true" on-mousedown="_onToggleMouseDown"></div>
         </vaadin-input-container>
 
         <div part="helper-text">
@@ -303,10 +307,13 @@ class Select extends DelegateFocusMixin(FieldMixin(SlotMixin(ElementMixin(Themab
     };
   }
 
+  static get delegateAttrs() {
+    return [...super.delegateAttrs, 'invalid'];
+  }
+
   static get observers() {
     return [
       '_updateAriaExpanded(opened)',
-      '_updateAriaRequired(required)',
       '_updateSelectedItem(value, _items, placeholder)',
       '_rendererChanged(renderer, _overlayElement)',
     ];
@@ -346,11 +353,11 @@ class Select extends DelegateFocusMixin(FieldMixin(SlotMixin(ElementMixin(Themab
     if (this._valueButton) {
       this._valueButton.setAttribute('aria-labelledby', `${this._labelId} ${this._fieldId}`);
 
-      this._updateAriaRequired(this.required);
       this._updateAriaExpanded(this.opened);
 
       this._setFocusElement(this._valueButton);
       this.ariaTarget = this._valueButton;
+      this.stateTarget = this._valueButton;
 
       this._valueButton.addEventListener('keydown', this._boundOnKeyDown);
     }
@@ -485,10 +492,21 @@ class Select extends DelegateFocusMixin(FieldMixin(SlotMixin(ElementMixin(Themab
    *
    * @private
    */
-  _onClick() {
+  _onClick(event) {
+    // Prevent parent components such as `vaadin-grid`
+    // from handling the click event after it bubbles.
+    event.preventDefault();
+
     this.opened = !this.readonly;
   }
 
+  /** @private */
+  _onToggleMouseDown(event) {
+    // Prevent mousedown event to avoid blur and preserve focused state
+    // while opening, and to restore focus-ring attribute on closing.
+    event.preventDefault();
+  }
+
   /**
    * @param {!KeyboardEvent} e
    * @protected
@@ -565,13 +583,6 @@ class Select extends DelegateFocusMixin(FieldMixin(SlotMixin(ElementMixin(Themab
     }
   }
 
-  /** @private */
-  _updateAriaRequired(required) {
-    if (this._valueButton) {
-      this._valueButton.setAttribute('aria-required', required ? 'true' : 'false');
-    }
-  }
-
   /** @private */
   _updateAriaLive(ariaLive) {
     if (this._valueButton) {

package/theme/lumo/vaadin-select.js

@@ -7,5 +7,6 @@ import '@vaadin/button/theme/lumo/vaadin-button.js';
 import '@vaadin/input-container/theme/lumo/vaadin-input-container.js';
 import '@vaadin/item/theme/lumo/vaadin-item.js';
 import '@vaadin/list-box/theme/lumo/vaadin-list-box.js';
+import '@vaadin/vaadin-overlay/theme/lumo/vaadin-overlay.js';
 import './vaadin-select-styles.js';
 import '../../src/vaadin-select.js';

package/theme/material/vaadin-select.js

@@ -7,5 +7,6 @@ import '@vaadin/button/theme/material/vaadin-button.js';
 import '@vaadin/input-container/theme/material/vaadin-input-container.js';
 import '@vaadin/item/theme/material/vaadin-item.js';
 import '@vaadin/list-box/theme/material/vaadin-list-box.js';
+import '@vaadin/vaadin-overlay/theme/material/vaadin-overlay.js';
 import './vaadin-select-styles.js';
 import '../../src/vaadin-select.js';