@vaadin/combo-box 23.0.0-alpha4 → 23.0.0-alpha5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/combo-box",
-  "version": "23.0.0-alpha4",
+  "version": "23.0.0-alpha5",
   "publishConfig": {
     "access": "public"
   },
@@ -34,23 +34,23 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "23.0.0-alpha4",
-    "@vaadin/field-base": "23.0.0-alpha4",
-    "@vaadin/input-container": "23.0.0-alpha4",
-    "@vaadin/item": "23.0.0-alpha4",
-    "@vaadin/vaadin-lumo-styles": "23.0.0-alpha4",
-    "@vaadin/vaadin-material-styles": "23.0.0-alpha4",
-    "@vaadin/vaadin-overlay": "23.0.0-alpha4",
-    "@vaadin/vaadin-themable-mixin": "23.0.0-alpha4"
+    "@vaadin/component-base": "23.0.0-alpha5",
+    "@vaadin/field-base": "23.0.0-alpha5",
+    "@vaadin/input-container": "23.0.0-alpha5",
+    "@vaadin/item": "23.0.0-alpha5",
+    "@vaadin/vaadin-lumo-styles": "23.0.0-alpha5",
+    "@vaadin/vaadin-material-styles": "23.0.0-alpha5",
+    "@vaadin/vaadin-overlay": "23.0.0-alpha5",
+    "@vaadin/vaadin-themable-mixin": "23.0.0-alpha5"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/dialog": "23.0.0-alpha4",
-    "@vaadin/polymer-legacy-adapter": "23.0.0-alpha4",
+    "@vaadin/dialog": "23.0.0-alpha5",
+    "@vaadin/polymer-legacy-adapter": "23.0.0-alpha5",
     "@vaadin/testing-helpers": "^0.3.2",
-    "@vaadin/text-field": "23.0.0-alpha4",
+    "@vaadin/text-field": "23.0.0-alpha5",
     "lit": "^2.0.0",
     "sinon": "^9.2.0"
   },
-  "gitHead": "81e2deee5147bb7c1f4884760f4598613306f1fb"
+  "gitHead": "74f9294964eb8552d96578c14af6ad214f5257bc"
 }

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

@@ -313,6 +313,8 @@ export const ComboBoxMixin = (subclass) =>
         return;
       }
 
+      this.$.dropdown._scroller.requestContentUpdate();
+
       this._getItemElements().forEach((item) => {
         item.requestContentUpdate();
       });
@@ -414,6 +416,11 @@ export const ComboBoxMixin = (subclass) =>
     _handleClearButtonClick(event) {
       event.preventDefault();
       this._clear();
+
+      // De-select dropdown item
+      if (this.opened) {
+        this.requestContentUpdate();
+      }
     }
 
     /** @private */
@@ -695,17 +702,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,
@@ -718,9 +728,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 || '';
         }
       }
@@ -934,10 +946,14 @@ export const ComboBoxMixin = (subclass) =>
       if (e.path === 'filteredItems' || e.path === 'filteredItems.splices') {
         this._setOverlayItems(this.filteredItems);
 
-        this._focusedIndex =
-          this.opened || this.autoOpenDisabled
-            ? this.$.dropdown.indexOfLabel(this.filter)
-            : this._indexOfValue(this.value, this.filteredItems);
+        const filterIndex = this.$.dropdown.indexOfLabel(this.filter);
+        if (this.opened) {
+          this._focusedIndex = filterIndex;
+        } else {
+          // Pre-select item matching the filter to focus it later when overlay opens
+          const valueIndex = this._indexOfValue(this.value, this.filteredItems);
+          this._focusedIndex = filterIndex === -1 ? valueIndex : filterIndex;
+        }
 
         // see https://github.com/vaadin/web-components/issues/2615
         if (this.selectedItem === null && this._focusedIndex >= 0) {

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;
@@ -232,29 +238,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();
     }
   }