@vaadin/combo-box 23.1.0-beta3 → 23.1.0-beta4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/combo-box",
-  "version": "23.1.0-beta3",
+  "version": "23.1.0-beta4",
   "publishConfig": {
     "access": "public"
   },
@@ -36,24 +36,24 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "23.1.0-beta3",
-    "@vaadin/field-base": "23.1.0-beta3",
-    "@vaadin/input-container": "23.1.0-beta3",
-    "@vaadin/item": "23.1.0-beta3",
-    "@vaadin/lit-renderer": "23.1.0-beta3",
-    "@vaadin/vaadin-lumo-styles": "23.1.0-beta3",
-    "@vaadin/vaadin-material-styles": "23.1.0-beta3",
-    "@vaadin/vaadin-overlay": "23.1.0-beta3",
-    "@vaadin/vaadin-themable-mixin": "23.1.0-beta3"
+    "@vaadin/component-base": "23.1.0-beta4",
+    "@vaadin/field-base": "23.1.0-beta4",
+    "@vaadin/input-container": "23.1.0-beta4",
+    "@vaadin/item": "23.1.0-beta4",
+    "@vaadin/lit-renderer": "23.1.0-beta4",
+    "@vaadin/vaadin-lumo-styles": "23.1.0-beta4",
+    "@vaadin/vaadin-material-styles": "23.1.0-beta4",
+    "@vaadin/vaadin-overlay": "23.1.0-beta4",
+    "@vaadin/vaadin-themable-mixin": "23.1.0-beta4"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/dialog": "23.1.0-beta3",
-    "@vaadin/polymer-legacy-adapter": "23.1.0-beta3",
+    "@vaadin/dialog": "23.1.0-beta4",
+    "@vaadin/polymer-legacy-adapter": "23.1.0-beta4",
     "@vaadin/testing-helpers": "^0.3.2",
-    "@vaadin/text-field": "23.1.0-beta3",
+    "@vaadin/text-field": "23.1.0-beta4",
     "lit": "^2.0.0",
     "sinon": "^13.0.2"
   },
-  "gitHead": "c787ceb8a312f88631c6d429ff320d5f89b1b838"
+  "gitHead": "06e283473964ecb3085aacf3eddb5333d052a045"
 }

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

@@ -971,19 +971,15 @@ export const ComboBoxMixin = (subclass) =>
           this._selectItemForValue(this.value);
         }
 
-        // Do not update `_focusedIndex` to from `-1` to old value during scroll.
-        // Otherwise, the scroll would jump back to the previously focused item.
-        if (!this.loading) {
-          const inputValue = this._inputElementValue;
-          if (inputValue === undefined || inputValue === this._getItemLabel(this.selectedItem)) {
-            // 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.$.dropdown.indexOfLabel(this._getItemLabel(this.selectedItem));
-          } 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);
-          }
+        const inputValue = this._inputElementValue;
+        if (inputValue === undefined || inputValue === this._getItemLabel(this.selectedItem)) {
+          // 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.$.dropdown.indexOfLabel(this._getItemLabel(this.selectedItem));
+        } 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);
         }
       }
     }

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

@@ -259,7 +259,9 @@ export class ComboBoxScroller extends PolymerElement {
       this.requestContentUpdate();
     }
 
-    if (index >= 0) {
+    // Do not jump back to the previously focused item while loading
+    // when requesting next page from the data provider on scroll.
+    if (index >= 0 && !this.loading) {
       this.scrollIntoView(index);
     }
   }