@vaadin/combo-box 22.0.3 → 22.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/combo-box",
-  "version": "22.0.3",
+  "version": "22.0.4",
   "publishConfig": {
     "access": "public"
   },
@@ -34,23 +34,23 @@
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/iron-resizable-behavior": "^3.0.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "^22.0.3",
-    "@vaadin/field-base": "^22.0.3",
-    "@vaadin/input-container": "^22.0.3",
-    "@vaadin/item": "^22.0.3",
-    "@vaadin/vaadin-lumo-styles": "^22.0.3",
-    "@vaadin/vaadin-material-styles": "^22.0.3",
-    "@vaadin/vaadin-overlay": "^22.0.3",
-    "@vaadin/vaadin-themable-mixin": "^22.0.3"
+    "@vaadin/component-base": "^22.0.4",
+    "@vaadin/field-base": "^22.0.4",
+    "@vaadin/input-container": "^22.0.4",
+    "@vaadin/item": "^22.0.4",
+    "@vaadin/vaadin-lumo-styles": "^22.0.4",
+    "@vaadin/vaadin-material-styles": "^22.0.4",
+    "@vaadin/vaadin-overlay": "^22.0.4",
+    "@vaadin/vaadin-themable-mixin": "^22.0.4"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/dialog": "^22.0.3",
-    "@vaadin/polymer-legacy-adapter": "^22.0.3",
+    "@vaadin/dialog": "^22.0.4",
+    "@vaadin/polymer-legacy-adapter": "^22.0.4",
     "@vaadin/testing-helpers": "^0.3.2",
-    "@vaadin/text-field": "^22.0.3",
+    "@vaadin/text-field": "^22.0.4",
     "lit": "^2.0.0",
     "sinon": "^9.2.0"
   },
-  "gitHead": "935ad1ea65a79b0f9ecb10d767689479b36c4e07"
+  "gitHead": "55891f68d4da41e846e06dfe51dceba1665e41ce"
 }

package/src/vaadin-combo-box-mixin.js

@@ -305,6 +305,8 @@ export const ComboBoxMixin = (subclass) =>
         return;
       }
 
+      this.$.dropdown._scroller.requestContentUpdate();
+
       this._getItemElements().forEach((item) => {
         item.requestContentUpdate();
       });
@@ -404,6 +406,11 @@ export const ComboBoxMixin = (subclass) =>
     _handleClearButtonClick(event) {
       event.preventDefault();
       this._clear();
+
+      // De-select dropdown item
+      if (this.opened) {
+        this.requestContentUpdate();
+      }
     }
 
     /** @private */
@@ -687,17 +694,20 @@ export const ComboBoxMixin = (subclass) =>
         }
       } else {
         const toLowerCase = (item) => item && item.toLowerCase && item.toLowerCase();
-        const itemsMatchedByLabel =
-          (this.filteredItems &&
-            this.filteredItems.filter(
-              (item) => toLowerCase(this._getItemLabel(item)) === toLowerCase(this._inputElementValue)
-            )) ||
-          [];
+
+        // Try to find an item whose label matches the input value. A matching item is searched from
+        // the filteredItems array (if available) and the selectedItem (if available).
+        const itemMatchingByLabel = [...(this.filteredItems || []), this.selectedItem].find((item) => {
+          return toLowerCase(this._getItemLabel(item)) === toLowerCase(this._inputElementValue);
+        });
+
         if (
           this.allowCustomValue &&
           // to prevent a repetitive input value being saved after pressing ESC and Tab.
-          !itemsMatchedByLabel.length
+          !itemMatchingByLabel
         ) {
+          // An item matching by label was not found, but custom values are allowed.
+          // Dispatch a custom-value-set event with the input value.
           const e = new CustomEvent('custom-value-set', {
             detail: this._inputElementValue,
             composed: true,
@@ -710,9 +720,11 @@ export const ComboBoxMixin = (subclass) =>
             this._selectItemForValue(customValue);
             this.value = customValue;
           }
-        } else if (!this.allowCustomValue && !this.opened && itemsMatchedByLabel.length > 0) {
-          this.value = this._getItemValue(itemsMatchedByLabel[0]);
+        } else if (!this.allowCustomValue && !this.opened && itemMatchingByLabel) {
+          // An item matching by label was found, select it.
+          this.value = this._getItemValue(itemMatchingByLabel);
         } else {
+          // Revert the input value
           this._inputElementValue = this.selectedItem ? this._getItemLabel(this.selectedItem) : this.value || '';
         }
       }

package/src/vaadin-combo-box-scroller.js

@@ -136,8 +136,8 @@ export class ComboBoxScroller extends PolymerElement {
   }
 
   __openedChanged(opened) {
-    if (this.__virtualizer && opened) {
-      this.__virtualizer.update();
+    if (opened) {
+      this.requestContentUpdate();
     }
   }
 
@@ -163,6 +163,12 @@ export class ComboBoxScroller extends PolymerElement {
     });
   }
 
+  requestContentUpdate() {
+    if (this.__virtualizer) {
+      this.__virtualizer.update();
+    }
+  }
+
   scrollIntoView(index) {
     if (!(this.opened && index >= 0)) {
       return;
@@ -233,29 +239,29 @@ export class ComboBoxScroller extends PolymerElement {
       this.__virtualizer.flush();
       // Ensure the total count of items is properly announced.
       this.setAttribute('aria-setsize', items.length);
-      this.__virtualizer.update();
+      this.requestContentUpdate();
     }
   }
 
   /** @private */
   __loadingChanged(loading) {
     if (this.__virtualizer && !loading) {
-      setTimeout(() => this.__virtualizer.update());
+      setTimeout(() => this.requestContentUpdate());
     }
   }
 
   /** @private */
   __focusedIndexChanged(index) {
     if (this.__virtualizer && index >= 0) {
-      this.__virtualizer.update();
+      this.requestContentUpdate();
       this.scrollIntoView(index);
     }
   }
 
   /** @private */
   __rendererChanged(renderer, oldRenderer) {
-    if (this.__virtualizer && (renderer || oldRenderer)) {
-      this.__virtualizer.update();
+    if (renderer || oldRenderer) {
+      this.requestContentUpdate();
     }
   }
 

package/src/vaadin-combo-box.js

@@ -183,8 +183,8 @@ class ComboBox extends ComboBoxDataProviderMixin(
         >
           <slot name="prefix" slot="prefix"></slot>
           <slot name="input"></slot>
-          <div id="clearButton" part="clear-button" slot="suffix"></div>
-          <div id="toggleButton" part="toggle-button" slot="suffix"></div>
+          <div id="clearButton" part="clear-button" slot="suffix" aria-hidden="true"></div>
+          <div id="toggleButton" part="toggle-button" slot="suffix" aria-hidden="true"></div>
         </vaadin-input-container>
 
         <div part="helper-text">