@vaadin/multi-select-combo-box 25.2.0-beta1 → 25.2.0-rc1

package/custom-elements.json

@@ -549,24 +549,6 @@
                 "package": "@vaadin/field-base/src/field-mixin.js"
               }
             },
-            {
-              "kind": "method",
-              "name": "scrollToIndex",
-              "parameters": [
-                {
-                  "name": "index",
-                  "description": "Index of the item to scroll to",
-                  "type": {
-                    "text": "number"
-                  }
-                }
-              ],
-              "description": "Scrolls the dropdown to the item at the given index and sets it as the\nfocused (highlighted) item. Safe to call before the dropdown is opened\nor while the data provider is loading: the call is queued and executed\nonce the overlay is open and not loading.\n\nBecause this sets the focused item, closing the dropdown without an\nexplicit selection change (e.g. via outside click or blur) will commit\nthe focused item as `selectedItem`. In the typical use case (scroll to\nthe currently selected item) this is a no-op; callers scrolling to a\ndifferent index should be aware of this behavior.",
-              "inheritedFrom": {
-                "name": "ComboBoxScrollToIndexMixin",
-                "package": "@vaadin/combo-box/src/vaadin-combo-box-scroll-to-index-mixin.js"
-              }
-            },
             {
               "kind": "field",
               "name": "selectedItems",
@@ -1084,8 +1066,8 @@
               "package": "@vaadin/component-base/src/i18n-mixin.js"
             },
             {
-              "name": "ComboBoxScrollToIndexMixin",
-              "package": "@vaadin/combo-box/src/vaadin-combo-box-scroll-to-index-mixin.js"
+              "name": "ComboBoxFocusIndexMixin",
+              "package": "@vaadin/combo-box/src/vaadin-combo-box-focus-index-mixin.js"
             },
             {
               "name": "ComboBoxDataProviderMixin",
@@ -1694,24 +1676,6 @@
                 "package": "@vaadin/field-base/src/field-mixin.js"
               }
             },
-            {
-              "kind": "method",
-              "name": "scrollToIndex",
-              "parameters": [
-                {
-                  "name": "index",
-                  "description": "Index of the item to scroll to",
-                  "type": {
-                    "text": "number"
-                  }
-                }
-              ],
-              "description": "Scrolls the dropdown to the item at the given index and sets it as the\nfocused (highlighted) item. Safe to call before the dropdown is opened\nor while the data provider is loading: the call is queued and executed\nonce the overlay is open and not loading.\n\nBecause this sets the focused item, closing the dropdown without an\nexplicit selection change (e.g. via outside click or blur) will commit\nthe focused item as `selectedItem`. In the typical use case (scroll to\nthe currently selected item) this is a no-op; callers scrolling to a\ndifferent index should be aware of this behavior.",
-              "inheritedFrom": {
-                "name": "ComboBoxScrollToIndexMixin",
-                "package": "@vaadin/combo-box/src/vaadin-combo-box-scroll-to-index-mixin.js"
-              }
-            },
             {
               "kind": "field",
               "name": "selectedItems",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/multi-select-combo-box",
-  "version": "25.2.0-beta1",
+  "version": "25.2.0-rc1",
   "publishConfig": {
     "access": "public"
   },
@@ -37,29 +37,29 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "25.2.0-beta1",
-    "@vaadin/combo-box": "25.2.0-beta1",
-    "@vaadin/component-base": "25.2.0-beta1",
-    "@vaadin/field-base": "25.2.0-beta1",
-    "@vaadin/input-container": "25.2.0-beta1",
-    "@vaadin/item": "25.2.0-beta1",
-    "@vaadin/lit-renderer": "25.2.0-beta1",
-    "@vaadin/overlay": "25.2.0-beta1",
-    "@vaadin/vaadin-themable-mixin": "25.2.0-beta1",
+    "@vaadin/a11y-base": "25.2.0-rc1",
+    "@vaadin/combo-box": "25.2.0-rc1",
+    "@vaadin/component-base": "25.2.0-rc1",
+    "@vaadin/field-base": "25.2.0-rc1",
+    "@vaadin/input-container": "25.2.0-rc1",
+    "@vaadin/item": "25.2.0-rc1",
+    "@vaadin/lit-renderer": "25.2.0-rc1",
+    "@vaadin/overlay": "25.2.0-rc1",
+    "@vaadin/vaadin-themable-mixin": "25.2.0-rc1",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/aura": "25.2.0-beta1",
-    "@vaadin/chai-plugins": "25.2.0-beta1",
-    "@vaadin/test-runner-commands": "25.2.0-beta1",
+    "@vaadin/aura": "25.2.0-rc1",
+    "@vaadin/chai-plugins": "25.2.0-rc1",
+    "@vaadin/test-runner-commands": "25.2.0-rc1",
     "@vaadin/testing-helpers": "^2.0.0",
-    "@vaadin/vaadin-lumo-styles": "25.2.0-beta1",
-    "sinon": "^21.0.2"
+    "@vaadin/vaadin-lumo-styles": "25.2.0-rc1",
+    "sinon": "^22.0.0"
   },
   "customElements": "custom-elements.json",
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "471a23f60d1eb725f98a33f62cb9664d9c0a4163"
+  "gitHead": "7c581b396dbb889f75c8073d6b4d25537a65b873"
 }

package/src/vaadin-multi-select-combo-box-mixin.d.ts

@@ -12,7 +12,6 @@ import type { ComboBoxItemModel } from '@vaadin/combo-box/src/vaadin-combo-box.j
 import type { ComboBoxBaseMixinClass } from '@vaadin/combo-box/src/vaadin-combo-box-base-mixin.js';
 import type { ComboBoxDataProviderMixinClass } from '@vaadin/combo-box/src/vaadin-combo-box-data-provider-mixin.js';
 import type { ComboBoxItemsMixinClass } from '@vaadin/combo-box/src/vaadin-combo-box-items-mixin.js';
-import type { ComboBoxScrollToIndexMixinClass } from '@vaadin/combo-box/src/vaadin-combo-box-scroll-to-index-mixin.js';
 import type { DelegateStateMixinClass } from '@vaadin/component-base/src/delegate-state-mixin.js';
 import type { I18nMixinClass } from '@vaadin/component-base/src/i18n-mixin.js';
 import type { ResizeMixinClass } from '@vaadin/component-base/src/resize-mixin.js';
@@ -46,7 +45,6 @@ export declare function MultiSelectComboBoxMixin<TItem, T extends Constructor<HT
   Constructor<ComboBoxBaseMixinClass> &
   Constructor<ComboBoxDataProviderMixinClass<TItem>> &
   Constructor<ComboBoxItemsMixinClass<TItem>> &
-  Constructor<ComboBoxScrollToIndexMixinClass> &
   Constructor<DelegateFocusMixinClass> &
   Constructor<DelegateStateMixinClass> &
   Constructor<DisabledMixinClass> &

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

@@ -5,9 +5,9 @@
  */
 import { announce } from '@vaadin/a11y-base/src/announce.js';
 import { ComboBoxDataProviderMixin } from '@vaadin/combo-box/src/vaadin-combo-box-data-provider-mixin.js';
+import { ComboBoxFocusIndexMixin } from '@vaadin/combo-box/src/vaadin-combo-box-focus-index-mixin.js';
 import { ComboBoxItemsMixin } from '@vaadin/combo-box/src/vaadin-combo-box-items-mixin.js';
 import { ComboBoxPlaceholder } from '@vaadin/combo-box/src/vaadin-combo-box-placeholder.js';
-import { ComboBoxScrollToIndexMixin } from '@vaadin/combo-box/src/vaadin-combo-box-scroll-to-index-mixin.js';
 import { I18nMixin } from '@vaadin/component-base/src/i18n-mixin.js';
 import { ResizeMixin } from '@vaadin/component-base/src/resize-mixin.js';
 import { SlotController } from '@vaadin/component-base/src/slot-controller.js';
@@ -26,9 +26,7 @@ const DEFAULT_I18N = {
 
 export const MultiSelectComboBoxMixin = (superClass) =>
   class MultiSelectComboBoxMixinClass extends I18nMixin(
-    ComboBoxScrollToIndexMixin(
-      ComboBoxDataProviderMixin(ComboBoxItemsMixin(InputControlMixin(ResizeMixin(superClass)))),
-    ),
+    ComboBoxFocusIndexMixin(ComboBoxDataProviderMixin(ComboBoxItemsMixin(InputControlMixin(ResizeMixin(superClass))))),
   ) {
     static get properties() {
       return {
@@ -729,6 +727,18 @@ export const MultiSelectComboBoxMixin = (superClass) =>
       // when the user types in a filter query.
       const focusedItem = oldItems ? oldItems[this._focusedIndex] : null;
 
+      // When both the previously-focused entry and the new entry at the
+      // same index are placeholders (e.g. the Flow connector mid-scroll
+      // re-pushing `__setDropdownItems`), preserve `_focusedIndex` until
+      // a follow-up call lands a real item at that position.
+      if (
+        oldItems &&
+        oldItems[this._focusedIndex] instanceof ComboBoxPlaceholder &&
+        newItems[this._focusedIndex] instanceof ComboBoxPlaceholder
+      ) {
+        return;
+      }
+
       // Try to first set focus on the item that had been focused before `newItems` were updated
       // if it is still present in the `newItems` array. Otherwise, set the focused index
       // depending on the selected item or the filter query.

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/multi-select-combo-box",
-  "version": "25.2.0-beta1",
+  "version": "25.2.0-rc1",
   "description-markup": "markdown",
   "contributions": {
     "html": {

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/multi-select-combo-box",
-  "version": "25.2.0-beta1",
+  "version": "25.2.0-rc1",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {