@vaadin/combo-box 23.0.3 → 23.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/combo-box",
-  "version": "23.0.3",
+  "version": "23.0.4",
   "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.3",
-    "@vaadin/field-base": "^23.0.3",
-    "@vaadin/input-container": "^23.0.3",
-    "@vaadin/item": "^23.0.3",
-    "@vaadin/vaadin-lumo-styles": "^23.0.3",
-    "@vaadin/vaadin-material-styles": "^23.0.3",
-    "@vaadin/vaadin-overlay": "^23.0.3",
-    "@vaadin/vaadin-themable-mixin": "^23.0.3"
+    "@vaadin/component-base": "^23.0.4",
+    "@vaadin/field-base": "^23.0.4",
+    "@vaadin/input-container": "^23.0.4",
+    "@vaadin/item": "^23.0.4",
+    "@vaadin/vaadin-lumo-styles": "^23.0.4",
+    "@vaadin/vaadin-material-styles": "^23.0.4",
+    "@vaadin/vaadin-overlay": "^23.0.4",
+    "@vaadin/vaadin-themable-mixin": "^23.0.4"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/dialog": "^23.0.3",
-    "@vaadin/polymer-legacy-adapter": "^23.0.3",
+    "@vaadin/dialog": "^23.0.4",
+    "@vaadin/polymer-legacy-adapter": "^23.0.4",
     "@vaadin/testing-helpers": "^0.3.2",
-    "@vaadin/text-field": "^23.0.3",
+    "@vaadin/text-field": "^23.0.4",
     "lit": "^2.0.0",
     "sinon": "^9.2.0"
   },
-  "gitHead": "3f010a4167c9e04405c9dfab098da0821e02a601"
+  "gitHead": "d8db2046661c42fb5aac09ed683b500bf4613b26"
 }

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

@@ -576,20 +576,27 @@ export const ComboBoxMixin = (subclass) =>
 
     /** @private */
     _onEnter(e) {
-      // should close on enter when custom values are allowed, input field is cleared, or when an existing
-      // item is focused with keyboard. If auto open is disabled, under the same conditions, commit value.
-      if (
-        (this.opened || this.autoOpenDisabled) &&
-        (this.allowCustomValue || this._inputElementValue === '' || this._focusedIndex > -1)
-      ) {
-        this._closeOrCommit();
-
+      // do not commit value when custom values are disallowed and input value is not a valid option
+      // also stop propagation of the event, otherwise the user could submit a form while the input
+      // still contains an invalid value
+      if (!this.allowCustomValue && this._inputElementValue !== '' && this._focusedIndex < 0) {
         // Do not submit the surrounding form.
         e.preventDefault();
+        // Do not trigger global listeners
+        e.stopPropagation();
+        return;
+      }
 
+      // stop propagation of the enter event only if the dropdown is opened, this
+      // "consumes" the enter event for the action of closing the dropdown
+      if (this.opened) {
+        // Do not submit the surrounding form.
+        e.preventDefault();
         // Do not trigger global listeners
         e.stopPropagation();
       }
+
+      this._closeOrCommit();
     }
 
     /**
@@ -960,21 +967,23 @@ export const ComboBoxMixin = (subclass) =>
       if (e.path === 'filteredItems' || e.path === 'filteredItems.splices') {
         this._setOverlayItems(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;
+        // When the external filtering is used and `value` was provided before `filteredItems`,
+        // initialize the selected item with the current value here. This will also cause
+        // the input element value to sync. In other cases, the selected item is already initialized
+        // in other observers such as `valueChanged`, `_itemsOrPathsChanged`.
+        const valueIndex = this._indexOfValue(this.value, this.filteredItems);
+        if (this.selectedItem === null && valueIndex >= 0) {
+          this._selectItemForValue(this.value);
         }
 
-        // see https://github.com/vaadin/web-components/issues/2615
-        if (this.selectedItem === null && this._focusedIndex >= 0) {
-          const filteredItem = this.filteredItems[this._focusedIndex];
-          if (this._getItemValue(filteredItem) === this.value) {
-            this._selectItemForValue(this.value);
-          }
+        if (this._inputElementValue === undefined || this._inputElementValue === this.value) {
+          // When the input element value is the same as the current value or not defined,
+          // set the focused index to the item that matches the value.
+          this._focusedIndex = this._indexOfValue(this.value, this.filteredItems);
+        } else {
+          // When the user filled in something that is different from the current value = filtering is enabled,
+          // set the focused index to the item that matches the filter query.
+          this._focusedIndex = this.$.dropdown.indexOfLabel(this.filter);
         }
       }
     }
@@ -999,12 +1008,13 @@ export const ComboBoxMixin = (subclass) =>
       const valueIndex = this._indexOfValue(value, this.filteredItems);
       const previouslySelectedItem = this.selectedItem;
 
-      this.selectedItem =
-        valueIndex >= 0
-          ? this.filteredItems[valueIndex]
-          : this.dataProvider && this.selectedItem === undefined
-          ? undefined
-          : null;
+      if (valueIndex >= 0) {
+        this.selectedItem = this.filteredItems[valueIndex];
+      } else if (this.dataProvider && this.selectedItem === undefined) {
+        this.selectedItem = undefined;
+      } else {
+        this.selectedItem = null;
+      }
 
       if (this.selectedItem === null && previouslySelectedItem === null) {
         this._selectedItemChanged(this.selectedItem);
@@ -1028,15 +1038,17 @@ export const ComboBoxMixin = (subclass) =>
 
     /** @private */
     _indexOfValue(value, items) {
-      if (items && this._isValidValue(value)) {
-        for (let i = 0; i < items.length; i++) {
-          if (items[i] !== this.__placeHolder && this._getItemValue(items[i]) === value) {
-            return i;
-          }
-        }
+      if (!items || !this._isValidValue(value)) {
+        return -1;
       }
 
-      return -1;
+      return items.findIndex((item) => {
+        if (item instanceof ComboBoxPlaceholder) {
+          return false;
+        }
+
+        return this._getItemValue(item) === value;
+      });
     }
 
     /**

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

@@ -250,9 +250,16 @@ export class ComboBoxScroller extends PolymerElement {
   }
 
   /** @private */
-  __focusedIndexChanged(index) {
-    if (this.__virtualizer && index >= 0) {
+  __focusedIndexChanged(index, oldIndex) {
+    if (!this.__virtualizer) {
+      return;
+    }
+
+    if (index !== oldIndex) {
       this.requestContentUpdate();
+    }
+
+    if (index >= 0) {
       this.scrollIntoView(index);
     }
   }