@vaadin/combo-box 25.2.0-beta1 → 25.2.0-beta2

package/custom-elements.json

@@ -279,6 +279,33 @@
         }
       ]
     },
+    {
+      "kind": "javascript-module",
+      "path": "src/vaadin-combo-box-focus-index-mixin.js",
+      "declarations": [
+        {
+          "kind": "mixin",
+          "description": "",
+          "name": "ComboBoxFocusIndexMixin",
+          "members": [],
+          "parameters": [
+            {
+              "name": "superClass"
+            }
+          ]
+        }
+      ],
+      "exports": [
+        {
+          "kind": "js",
+          "name": "ComboBoxFocusIndexMixin",
+          "declaration": {
+            "name": "ComboBoxFocusIndexMixin",
+            "module": "src/vaadin-combo-box-focus-index-mixin.js"
+          }
+        }
+      ]
+    },
     {
       "kind": "javascript-module",
       "path": "src/vaadin-combo-box-item-mixin.js",
@@ -1459,48 +1486,6 @@
         }
       ]
     },
-    {
-      "kind": "javascript-module",
-      "path": "src/vaadin-combo-box-scroll-to-index-mixin.js",
-      "declarations": [
-        {
-          "kind": "mixin",
-          "description": "",
-          "name": "ComboBoxScrollToIndexMixin",
-          "members": [
-            {
-              "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."
-            }
-          ],
-          "parameters": [
-            {
-              "name": "superClass"
-            }
-          ]
-        }
-      ],
-      "exports": [
-        {
-          "kind": "js",
-          "name": "ComboBoxScrollToIndexMixin",
-          "declaration": {
-            "name": "ComboBoxScrollToIndexMixin",
-            "module": "src/vaadin-combo-box-scroll-to-index-mixin.js"
-          }
-        }
-      ]
-    },
     {
       "kind": "javascript-module",
       "path": "src/vaadin-combo-box-scroller-mixin.js",
@@ -2246,24 +2231,6 @@
                 "package": "@vaadin/field-base/src/validate-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",
-                "module": "src/vaadin-combo-box-scroll-to-index-mixin.js"
-              }
-            },
             {
               "kind": "field",
               "name": "selectedItem",
@@ -2811,8 +2778,8 @@
           ],
           "mixins": [
             {
-              "name": "ComboBoxScrollToIndexMixin",
-              "module": "src/vaadin-combo-box-scroll-to-index-mixin.js"
+              "name": "ComboBoxFocusIndexMixin",
+              "module": "src/vaadin-combo-box-focus-index-mixin.js"
             },
             {
               "name": "ComboBoxDataProviderMixin",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/combo-box",
-  "version": "25.2.0-beta1",
+  "version": "25.2.0-beta2",
   "publishConfig": {
     "access": "public"
   },
@@ -36,28 +36,28 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "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-beta2",
+    "@vaadin/component-base": "25.2.0-beta2",
+    "@vaadin/field-base": "25.2.0-beta2",
+    "@vaadin/input-container": "25.2.0-beta2",
+    "@vaadin/item": "25.2.0-beta2",
+    "@vaadin/lit-renderer": "25.2.0-beta2",
+    "@vaadin/overlay": "25.2.0-beta2",
+    "@vaadin/vaadin-themable-mixin": "25.2.0-beta2",
     "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-beta2",
+    "@vaadin/chai-plugins": "25.2.0-beta2",
+    "@vaadin/test-runner-commands": "25.2.0-beta2",
     "@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-beta2",
+    "sinon": "^22.0.0"
   },
   "customElements": "custom-elements.json",
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "471a23f60d1eb725f98a33f62cb9664d9c0a4163"
+  "gitHead": "9e18feb8057baf278b72fec4e42657b19e48f499"
 }

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

@@ -0,0 +1,96 @@
+/**
+ * @license
+ * Copyright (c) 2015 - 2026 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+export const ComboBoxFocusIndexMixin = (superClass) =>
+  class FocusIndexMixin extends superClass {
+    static get observers() {
+      return ['__clearPendingFocusOnFilter(filter)'];
+    }
+
+    /**
+     * Scrolls the dropdown to the item at the given index and sets it as the
+     * focused (highlighted) item. Closing the dropdown without an explicit
+     * selection change (e.g. via outside click or blur) will commit the
+     * focused item as `selectedItem` — callers focusing an index other than
+     * the current selection should be aware of this side effect.
+     *
+     * @private
+     * @param {number} index
+     */
+    __focusIndex(index) {
+      if (typeof index !== 'number' || Number.isNaN(index) || index < 0) {
+        return;
+      }
+
+      // Defer until the dropdown is open and the items array has been
+      // populated. `_onOpened` and `__onDataProviderPageLoaded` re-fire
+      // the queued call once those conditions hold.
+      if (!this._overlayOpened || !this._dropdownItems || this._dropdownItems.length === 0) {
+        this.__pendingFocusIndex = index;
+        return;
+      }
+
+      if (index >= this._dropdownItems.length) {
+        return;
+      }
+
+      // Move the viewport and set the focused row. Rendering rows
+      // around `index` lets placeholder rows fire `index-requested`,
+      // which loads any missing pages via the data-provider chain.
+      this._scrollIntoView(index);
+      this._focusedIndex = index;
+
+      // A page-load may have kicked in during the scroll (placeholder
+      // rows in the new viewport requested their pages). Re-fire after
+      // the page lands so the viewport can settle around real items.
+      if (this.loading) {
+        this.__pendingFocusIndex = index;
+        return;
+      }
+
+      delete this.__pendingFocusIndex;
+      requestAnimationFrame(() => {
+        if (this.isConnected) {
+          this._updateActiveDescendant(index);
+        }
+      });
+    }
+
+    /** @private */
+    __focusPendingIndexIfNeeded() {
+      if (this.__pendingFocusIndex !== undefined && !this.loading) {
+        this.__focusIndex(this.__pendingFocusIndex);
+      }
+    }
+
+    /** @private */
+    __clearPendingFocusOnFilter() {
+      delete this.__pendingFocusIndex;
+    }
+
+    /**
+     * Override method from `ComboBoxBaseMixin` to flush any pending
+     * `__focusIndex` call after the overlay opens.
+     *
+     * @protected
+     * @override
+     */
+    _onOpened() {
+      super._onOpened();
+      this.__focusPendingIndexIfNeeded();
+    }
+
+    /**
+     * Override method from `ComboBoxDataProviderMixin` to flush any pending
+     * `__focusIndex` call after a data-provider page lands.
+     *
+     * @private
+     * @override
+     */
+    __onDataProviderPageLoaded() {
+      super.__onDataProviderPageLoaded();
+      this.__focusPendingIndexIfNeeded();
+    }
+  };

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

@@ -5,6 +5,7 @@
  */
 import { ValidateMixin } from '@vaadin/field-base/src/validate-mixin.js';
 import { ComboBoxItemsMixin } from './vaadin-combo-box-items-mixin.js';
+import { ComboBoxPlaceholder } from './vaadin-combo-box-placeholder.js';
 
 /**
  * Checks if the value is supported as an item value in this control.
@@ -518,6 +519,18 @@ export const ComboBoxMixin = (superClass) =>
         this.selectedItem = newItems[valueIndex];
       }
 
+      // 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/src/vaadin-combo-box-scroller-mixin.js

@@ -192,18 +192,20 @@ export const ComboBoxScrollerMixin = (superClass) =>
       }
       this.__virtualizer.scrollToIndex(Math.max(0, targetIndex));
 
-      // Sometimes the item is partly below the bottom edge, detect and adjust.
-      const lastPhysicalItem = [...this.children].find(
-        (el) => !el.hidden && el.index === this.__virtualizer.lastVisibleIndex,
-      );
-      if (!lastPhysicalItem || index !== lastPhysicalItem.index) {
+      // Flush so the rect-based correction below runs on settled positions.
+      this.__virtualizer.flush();
+
+      const target = [...this.children].find((el) => !el.hidden && el.index === index);
+      if (!target) {
         return;
       }
-      const lastPhysicalItemRect = lastPhysicalItem.getBoundingClientRect();
+      const targetRect = target.getBoundingClientRect();
       const scrollerRect = this.getBoundingClientRect();
-      const scrollTopAdjust = lastPhysicalItemRect.bottom - scrollerRect.bottom + this._viewportTotalPaddingBottom;
-      if (scrollTopAdjust > 0) {
-        this.scrollTop += scrollTopAdjust;
+      const targetBottom = targetRect.bottom + this._viewportTotalPaddingBottom;
+      if (targetBottom > scrollerRect.bottom) {
+        this.scrollTop += targetBottom - scrollerRect.bottom;
+      } else if (targetRect.top < scrollerRect.top) {
+        this.scrollTop -= scrollerRect.top - targetRect.top;
       }
     }
 

package/src/vaadin-combo-box.d.ts

@@ -24,7 +24,6 @@ import type { ComboBoxDataProviderMixinClass } from './vaadin-combo-box-data-pro
 import type { ComboBoxItemsMixinClass } from './vaadin-combo-box-items-mixin.js';
 import type { ComboBoxMixinClass } from './vaadin-combo-box-mixin.js';
 import type { ComboBoxDefaultItem } from './vaadin-combo-box-mixin.js';
-import type { ComboBoxScrollToIndexMixinClass } from './vaadin-combo-box-scroll-to-index-mixin.js';
 
 export {
   ComboBoxDataProvider,
@@ -248,7 +247,6 @@ interface ComboBox<TItem = ComboBoxDefaultItem>
     ComboBoxDataProviderMixinClass<TItem>,
     ComboBoxItemsMixinClass<TItem>,
     ComboBoxMixinClass<TItem>,
-    ComboBoxScrollToIndexMixinClass,
     ComboBoxBaseMixinClass,
     ValidateMixinClass,
     PatternMixinClass,

package/src/vaadin-combo-box.js

@@ -22,8 +22,8 @@ import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import { comboBoxStyles } from './styles/vaadin-combo-box-base-styles.js';
 import { ComboBoxDataProviderMixin } from './vaadin-combo-box-data-provider-mixin.js';
+import { ComboBoxFocusIndexMixin } from './vaadin-combo-box-focus-index-mixin.js';
 import { ComboBoxMixin } from './vaadin-combo-box-mixin.js';
-import { ComboBoxScrollToIndexMixin } from './vaadin-combo-box-scroll-to-index-mixin.js';
 
 /**
  * `<vaadin-combo-box>` is a web component for choosing a value from a filterable list of options
@@ -164,7 +164,7 @@ import { ComboBoxScrollToIndexMixin } from './vaadin-combo-box-scroll-to-index-m
  * @customElement vaadin-combo-box
  * @extends HTMLElement
  */
-class ComboBox extends ComboBoxScrollToIndexMixin(
+class ComboBox extends ComboBoxFocusIndexMixin(
   ComboBoxDataProviderMixin(
     ComboBoxMixin(
       PatternMixin(InputControlMixin(ThemableMixin(ElementMixin(PolylitMixin(LumoInjectionMixin(LitElement)))))),

package/web-types.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/combo-box",
-  "version": "25.2.0-beta1",
+  "version": "25.2.0-beta2",
   "description-markup": "markdown",
   "contributions": {
     "html": {
       "elements": [
         {
           "name": "vaadin-combo-box",
-          "description": "`<vaadin-combo-box>` is a web component for choosing a value from a filterable list of options\npresented in a dropdown overlay. The options can be provided as a list of strings or objects\nby setting [`items`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta1/#/elements/vaadin-combo-box#property-items) property on the element.\n\n```html\n<vaadin-combo-box id=\"combo-box\"></vaadin-combo-box>\n```\n```js\ndocument.querySelector('#combo-box').items = ['apple', 'orange', 'banana'];\n```\n\nWhen the selected `value` is changed, a `value-changed` event is triggered.\n\n### Item rendering\n\nTo customize the content of the `<vaadin-combo-box-item>` elements placed in the dropdown, use\n[`renderer`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta1/#/elements/vaadin-combo-box#property-renderer) property which accepts a function.\nThe renderer function is called with `root`, `comboBox`, and `model` as arguments.\n\nGenerate DOM content by using `model` object properties if needed, and append it to the `root`\nelement. The `comboBox` reference is provided to access the combo-box element state. Do not\nset combo-box properties in a `renderer` function.\n\n```js\nconst comboBox = document.querySelector('#combo-box');\ncomboBox.items = [{'label': 'Hydrogen', 'value': 'H'}];\ncomboBox.renderer = (root, comboBox, model) => {\n  const item = model.item;\n  root.innerHTML = `${model.index}: ${item.label} <b>${item.value}</b>`;\n};\n```\n\nRenderer is called on the opening of the combo-box and each time the related model is updated.\nBefore creating new content, it is recommended to check if there is already an existing DOM\nelement in `root` from a previous renderer call for reusing it. Even though combo-box uses\ninfinite scrolling, reducing DOM operations might improve performance.\n\nThe following properties are available in the `model` argument:\n\nProperty   | Type             | Description\n-----------|------------------|-------------\n`index`    | Number           | Index of the item in the `items` array\n`item`     | String or Object | The item reference\n`selected` | Boolean          | True when item is selected\n`focused`  | Boolean          | True when item is focused\n\n### Lazy Loading with Function Data Provider\n\nIn addition to assigning an array to the items property, you can alternatively use the\n[`dataProvider`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta1/#/elements/vaadin-combo-box#property-dataProvider) function property.\nThe `<vaadin-combo-box>` calls this function lazily, only when it needs more data\nto be displayed.\n\n__Note that when using function data providers, the total number of items\nneeds to be set manually. The total number of items can be returned\nin the second argument of the data provider callback:__\n\n```js\ncomboBox.dataProvider = async (params, callback) => {\n  const API = 'https://demo.vaadin.com/demo-data/1.0/filtered-countries';\n  const { filter, page, pageSize } = params;\n  const index = page * pageSize;\n\n  const res = await fetch(`${API}?index=${index}&count=${pageSize}&filter=${filter}`);\n  if (res.ok) {\n    const { result, size } = await res.json();\n    callback(result, size);\n  }\n};\n```\n\n### Styling\n\nThe following custom properties are available for styling:\n\nCustom property                         | Description                | Default\n----------------------------------------|----------------------------|---------\n`--vaadin-field-default-width`          | Default width of the field | `12em`\n`--vaadin-combo-box-overlay-width`      | Width of the overlay       | `auto`\n`--vaadin-combo-box-overlay-max-height` | Max height of the overlay  | `65vh`\n\nThe following shadow DOM parts are available for styling:\n\nPart name            | Description\n---------------------|----------------\n`label`              | The label element\n`input-field`        | The element that wraps prefix, value and buttons\n`field-button`       | Set on both clear and toggle buttons\n`clear-button`       | The clear button\n`error-message`      | The error message element\n`helper-text`        | The helper text element wrapper\n`required-indicator` | The `required` state indicator element\n`toggle-button`      | The toggle button\n`overlay`            | The overlay container\n`content`            | The overlay content\n`loader`             | The loading indicator shown while loading items\n\nThe following state attributes are available for styling:\n\nAttribute            | Description\n---------------------|---------------------------------\n`disabled`           | Set when the element is disabled\n`has-value`          | Set when the element has a value\n`has-label`          | Set when the element has a label\n`has-helper`         | Set when the element has helper text or slot\n`has-error-message`  | Set when the element has an error message\n`has-tooltip`        | Set when the element has a slotted tooltip\n`invalid`            | Set when the element is invalid\n`focused`            | Set when the element is focused\n`focus-ring`         | Set when the element is keyboard focused\n`readonly`           | Set when the element is readonly\n`opened`             | Set when the overlay is opened\n`loading`            | Set when loading items from the data provider\n\n### Internal components\n\nIn addition to `<vaadin-combo-box>` itself, the following internal\ncomponents are themable:\n\n- `<vaadin-combo-box-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta1/#/elements/vaadin-item).\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
+          "description": "`<vaadin-combo-box>` is a web component for choosing a value from a filterable list of options\npresented in a dropdown overlay. The options can be provided as a list of strings or objects\nby setting [`items`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta2/#/elements/vaadin-combo-box#property-items) property on the element.\n\n```html\n<vaadin-combo-box id=\"combo-box\"></vaadin-combo-box>\n```\n```js\ndocument.querySelector('#combo-box').items = ['apple', 'orange', 'banana'];\n```\n\nWhen the selected `value` is changed, a `value-changed` event is triggered.\n\n### Item rendering\n\nTo customize the content of the `<vaadin-combo-box-item>` elements placed in the dropdown, use\n[`renderer`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta2/#/elements/vaadin-combo-box#property-renderer) property which accepts a function.\nThe renderer function is called with `root`, `comboBox`, and `model` as arguments.\n\nGenerate DOM content by using `model` object properties if needed, and append it to the `root`\nelement. The `comboBox` reference is provided to access the combo-box element state. Do not\nset combo-box properties in a `renderer` function.\n\n```js\nconst comboBox = document.querySelector('#combo-box');\ncomboBox.items = [{'label': 'Hydrogen', 'value': 'H'}];\ncomboBox.renderer = (root, comboBox, model) => {\n  const item = model.item;\n  root.innerHTML = `${model.index}: ${item.label} <b>${item.value}</b>`;\n};\n```\n\nRenderer is called on the opening of the combo-box and each time the related model is updated.\nBefore creating new content, it is recommended to check if there is already an existing DOM\nelement in `root` from a previous renderer call for reusing it. Even though combo-box uses\ninfinite scrolling, reducing DOM operations might improve performance.\n\nThe following properties are available in the `model` argument:\n\nProperty   | Type             | Description\n-----------|------------------|-------------\n`index`    | Number           | Index of the item in the `items` array\n`item`     | String or Object | The item reference\n`selected` | Boolean          | True when item is selected\n`focused`  | Boolean          | True when item is focused\n\n### Lazy Loading with Function Data Provider\n\nIn addition to assigning an array to the items property, you can alternatively use the\n[`dataProvider`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta2/#/elements/vaadin-combo-box#property-dataProvider) function property.\nThe `<vaadin-combo-box>` calls this function lazily, only when it needs more data\nto be displayed.\n\n__Note that when using function data providers, the total number of items\nneeds to be set manually. The total number of items can be returned\nin the second argument of the data provider callback:__\n\n```js\ncomboBox.dataProvider = async (params, callback) => {\n  const API = 'https://demo.vaadin.com/demo-data/1.0/filtered-countries';\n  const { filter, page, pageSize } = params;\n  const index = page * pageSize;\n\n  const res = await fetch(`${API}?index=${index}&count=${pageSize}&filter=${filter}`);\n  if (res.ok) {\n    const { result, size } = await res.json();\n    callback(result, size);\n  }\n};\n```\n\n### Styling\n\nThe following custom properties are available for styling:\n\nCustom property                         | Description                | Default\n----------------------------------------|----------------------------|---------\n`--vaadin-field-default-width`          | Default width of the field | `12em`\n`--vaadin-combo-box-overlay-width`      | Width of the overlay       | `auto`\n`--vaadin-combo-box-overlay-max-height` | Max height of the overlay  | `65vh`\n\nThe following shadow DOM parts are available for styling:\n\nPart name            | Description\n---------------------|----------------\n`label`              | The label element\n`input-field`        | The element that wraps prefix, value and buttons\n`field-button`       | Set on both clear and toggle buttons\n`clear-button`       | The clear button\n`error-message`      | The error message element\n`helper-text`        | The helper text element wrapper\n`required-indicator` | The `required` state indicator element\n`toggle-button`      | The toggle button\n`overlay`            | The overlay container\n`content`            | The overlay content\n`loader`             | The loading indicator shown while loading items\n\nThe following state attributes are available for styling:\n\nAttribute            | Description\n---------------------|---------------------------------\n`disabled`           | Set when the element is disabled\n`has-value`          | Set when the element has a value\n`has-label`          | Set when the element has a label\n`has-helper`         | Set when the element has helper text or slot\n`has-error-message`  | Set when the element has an error message\n`has-tooltip`        | Set when the element has a slotted tooltip\n`invalid`            | Set when the element is invalid\n`focused`            | Set when the element is focused\n`focus-ring`         | Set when the element is keyboard focused\n`readonly`           | Set when the element is readonly\n`opened`             | Set when the overlay is opened\n`loading`            | Set when loading items from the data provider\n\n### Internal components\n\nIn addition to `<vaadin-combo-box>` itself, the following internal\ncomponents are themable:\n\n- `<vaadin-combo-box-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta2/#/elements/vaadin-item).\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
           "attributes": [
             {
               "name": "accessible-name",

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/combo-box",
-  "version": "25.2.0-beta1",
+  "version": "25.2.0-beta2",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {
@@ -16,7 +16,7 @@
       "elements": [
         {
           "name": "vaadin-combo-box",
-          "description": "`<vaadin-combo-box>` is a web component for choosing a value from a filterable list of options\npresented in a dropdown overlay. The options can be provided as a list of strings or objects\nby setting [`items`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta1/#/elements/vaadin-combo-box#property-items) property on the element.\n\n```html\n<vaadin-combo-box id=\"combo-box\"></vaadin-combo-box>\n```\n```js\ndocument.querySelector('#combo-box').items = ['apple', 'orange', 'banana'];\n```\n\nWhen the selected `value` is changed, a `value-changed` event is triggered.\n\n### Item rendering\n\nTo customize the content of the `<vaadin-combo-box-item>` elements placed in the dropdown, use\n[`renderer`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta1/#/elements/vaadin-combo-box#property-renderer) property which accepts a function.\nThe renderer function is called with `root`, `comboBox`, and `model` as arguments.\n\nGenerate DOM content by using `model` object properties if needed, and append it to the `root`\nelement. The `comboBox` reference is provided to access the combo-box element state. Do not\nset combo-box properties in a `renderer` function.\n\n```js\nconst comboBox = document.querySelector('#combo-box');\ncomboBox.items = [{'label': 'Hydrogen', 'value': 'H'}];\ncomboBox.renderer = (root, comboBox, model) => {\n  const item = model.item;\n  root.innerHTML = `${model.index}: ${item.label} <b>${item.value}</b>`;\n};\n```\n\nRenderer is called on the opening of the combo-box and each time the related model is updated.\nBefore creating new content, it is recommended to check if there is already an existing DOM\nelement in `root` from a previous renderer call for reusing it. Even though combo-box uses\ninfinite scrolling, reducing DOM operations might improve performance.\n\nThe following properties are available in the `model` argument:\n\nProperty   | Type             | Description\n-----------|------------------|-------------\n`index`    | Number           | Index of the item in the `items` array\n`item`     | String or Object | The item reference\n`selected` | Boolean          | True when item is selected\n`focused`  | Boolean          | True when item is focused\n\n### Lazy Loading with Function Data Provider\n\nIn addition to assigning an array to the items property, you can alternatively use the\n[`dataProvider`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta1/#/elements/vaadin-combo-box#property-dataProvider) function property.\nThe `<vaadin-combo-box>` calls this function lazily, only when it needs more data\nto be displayed.\n\n__Note that when using function data providers, the total number of items\nneeds to be set manually. The total number of items can be returned\nin the second argument of the data provider callback:__\n\n```js\ncomboBox.dataProvider = async (params, callback) => {\n  const API = 'https://demo.vaadin.com/demo-data/1.0/filtered-countries';\n  const { filter, page, pageSize } = params;\n  const index = page * pageSize;\n\n  const res = await fetch(`${API}?index=${index}&count=${pageSize}&filter=${filter}`);\n  if (res.ok) {\n    const { result, size } = await res.json();\n    callback(result, size);\n  }\n};\n```\n\n### Styling\n\nThe following custom properties are available for styling:\n\nCustom property                         | Description                | Default\n----------------------------------------|----------------------------|---------\n`--vaadin-field-default-width`          | Default width of the field | `12em`\n`--vaadin-combo-box-overlay-width`      | Width of the overlay       | `auto`\n`--vaadin-combo-box-overlay-max-height` | Max height of the overlay  | `65vh`\n\nThe following shadow DOM parts are available for styling:\n\nPart name            | Description\n---------------------|----------------\n`label`              | The label element\n`input-field`        | The element that wraps prefix, value and buttons\n`field-button`       | Set on both clear and toggle buttons\n`clear-button`       | The clear button\n`error-message`      | The error message element\n`helper-text`        | The helper text element wrapper\n`required-indicator` | The `required` state indicator element\n`toggle-button`      | The toggle button\n`overlay`            | The overlay container\n`content`            | The overlay content\n`loader`             | The loading indicator shown while loading items\n\nThe following state attributes are available for styling:\n\nAttribute            | Description\n---------------------|---------------------------------\n`disabled`           | Set when the element is disabled\n`has-value`          | Set when the element has a value\n`has-label`          | Set when the element has a label\n`has-helper`         | Set when the element has helper text or slot\n`has-error-message`  | Set when the element has an error message\n`has-tooltip`        | Set when the element has a slotted tooltip\n`invalid`            | Set when the element is invalid\n`focused`            | Set when the element is focused\n`focus-ring`         | Set when the element is keyboard focused\n`readonly`           | Set when the element is readonly\n`opened`             | Set when the overlay is opened\n`loading`            | Set when loading items from the data provider\n\n### Internal components\n\nIn addition to `<vaadin-combo-box>` itself, the following internal\ncomponents are themable:\n\n- `<vaadin-combo-box-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta1/#/elements/vaadin-item).\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
+          "description": "`<vaadin-combo-box>` is a web component for choosing a value from a filterable list of options\npresented in a dropdown overlay. The options can be provided as a list of strings or objects\nby setting [`items`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta2/#/elements/vaadin-combo-box#property-items) property on the element.\n\n```html\n<vaadin-combo-box id=\"combo-box\"></vaadin-combo-box>\n```\n```js\ndocument.querySelector('#combo-box').items = ['apple', 'orange', 'banana'];\n```\n\nWhen the selected `value` is changed, a `value-changed` event is triggered.\n\n### Item rendering\n\nTo customize the content of the `<vaadin-combo-box-item>` elements placed in the dropdown, use\n[`renderer`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta2/#/elements/vaadin-combo-box#property-renderer) property which accepts a function.\nThe renderer function is called with `root`, `comboBox`, and `model` as arguments.\n\nGenerate DOM content by using `model` object properties if needed, and append it to the `root`\nelement. The `comboBox` reference is provided to access the combo-box element state. Do not\nset combo-box properties in a `renderer` function.\n\n```js\nconst comboBox = document.querySelector('#combo-box');\ncomboBox.items = [{'label': 'Hydrogen', 'value': 'H'}];\ncomboBox.renderer = (root, comboBox, model) => {\n  const item = model.item;\n  root.innerHTML = `${model.index}: ${item.label} <b>${item.value}</b>`;\n};\n```\n\nRenderer is called on the opening of the combo-box and each time the related model is updated.\nBefore creating new content, it is recommended to check if there is already an existing DOM\nelement in `root` from a previous renderer call for reusing it. Even though combo-box uses\ninfinite scrolling, reducing DOM operations might improve performance.\n\nThe following properties are available in the `model` argument:\n\nProperty   | Type             | Description\n-----------|------------------|-------------\n`index`    | Number           | Index of the item in the `items` array\n`item`     | String or Object | The item reference\n`selected` | Boolean          | True when item is selected\n`focused`  | Boolean          | True when item is focused\n\n### Lazy Loading with Function Data Provider\n\nIn addition to assigning an array to the items property, you can alternatively use the\n[`dataProvider`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta2/#/elements/vaadin-combo-box#property-dataProvider) function property.\nThe `<vaadin-combo-box>` calls this function lazily, only when it needs more data\nto be displayed.\n\n__Note that when using function data providers, the total number of items\nneeds to be set manually. The total number of items can be returned\nin the second argument of the data provider callback:__\n\n```js\ncomboBox.dataProvider = async (params, callback) => {\n  const API = 'https://demo.vaadin.com/demo-data/1.0/filtered-countries';\n  const { filter, page, pageSize } = params;\n  const index = page * pageSize;\n\n  const res = await fetch(`${API}?index=${index}&count=${pageSize}&filter=${filter}`);\n  if (res.ok) {\n    const { result, size } = await res.json();\n    callback(result, size);\n  }\n};\n```\n\n### Styling\n\nThe following custom properties are available for styling:\n\nCustom property                         | Description                | Default\n----------------------------------------|----------------------------|---------\n`--vaadin-field-default-width`          | Default width of the field | `12em`\n`--vaadin-combo-box-overlay-width`      | Width of the overlay       | `auto`\n`--vaadin-combo-box-overlay-max-height` | Max height of the overlay  | `65vh`\n\nThe following shadow DOM parts are available for styling:\n\nPart name            | Description\n---------------------|----------------\n`label`              | The label element\n`input-field`        | The element that wraps prefix, value and buttons\n`field-button`       | Set on both clear and toggle buttons\n`clear-button`       | The clear button\n`error-message`      | The error message element\n`helper-text`        | The helper text element wrapper\n`required-indicator` | The `required` state indicator element\n`toggle-button`      | The toggle button\n`overlay`            | The overlay container\n`content`            | The overlay content\n`loader`             | The loading indicator shown while loading items\n\nThe following state attributes are available for styling:\n\nAttribute            | Description\n---------------------|---------------------------------\n`disabled`           | Set when the element is disabled\n`has-value`          | Set when the element has a value\n`has-label`          | Set when the element has a label\n`has-helper`         | Set when the element has helper text or slot\n`has-error-message`  | Set when the element has an error message\n`has-tooltip`        | Set when the element has a slotted tooltip\n`invalid`            | Set when the element is invalid\n`focused`            | Set when the element is focused\n`focus-ring`         | Set when the element is keyboard focused\n`readonly`           | Set when the element is readonly\n`opened`             | Set when the overlay is opened\n`loading`            | Set when loading items from the data provider\n\n### Internal components\n\nIn addition to `<vaadin-combo-box>` itself, the following internal\ncomponents are themable:\n\n- `<vaadin-combo-box-item>` - has the same API as [`<vaadin-item>`](https://cdn.vaadin.com/vaadin-web-components/25.2.0-beta2/#/elements/vaadin-item).\n\nSee [Styling Components](https://vaadin.com/docs/latest/styling/styling-components) documentation.",
           "extension": true,
           "attributes": [
             {

package/src/vaadin-combo-box-scroll-to-index-mixin.d.ts

@@ -1,28 +0,0 @@
-/**
- * @license
- * Copyright (c) 2015 - 2026 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import type { Constructor } from '@open-wc/dedupe-mixin';
-
-export declare function ComboBoxScrollToIndexMixin<T extends Constructor<HTMLElement>>(
-  base: T,
-): Constructor<ComboBoxScrollToIndexMixinClass> & T;
-
-export declare class ComboBoxScrollToIndexMixinClass {
-  /**
-   * Scrolls the dropdown to the item at the given index and sets it as the
-   * focused (highlighted) item. Safe to call before the dropdown is opened
-   * or while the data provider is loading: the call is queued and executed
-   * once the overlay is open and not loading.
-   *
-   * Because this sets the focused item, closing the dropdown without an
-   * explicit selection change (e.g. via outside click or blur) will commit
-   * the focused item as `selectedItem`. In the typical use case (scroll to
-   * the currently selected item) this is a no-op; callers scrolling to a
-   * different index should be aware of this behavior.
-   *
-   * @param index Index of the item to scroll to
-   */
-  scrollToIndex(index: number): void;
-}

package/src/vaadin-combo-box-scroll-to-index-mixin.js

@@ -1,100 +0,0 @@
-/**
- * @license
- * Copyright (c) 2015 - 2026 Vaadin Ltd.
- * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
- */
-import { ComboBoxPlaceholder } from './vaadin-combo-box-placeholder.js';
-
-export const ComboBoxScrollToIndexMixin = (superClass) =>
-  class ScrollToIndexMixin extends superClass {
-    static get observers() {
-      return ['__clearPendingScrollOnFilter(filter)'];
-    }
-
-    /**
-     * Scrolls the dropdown to the item at the given index and sets it as the
-     * focused (highlighted) item. Safe to call before the dropdown is opened
-     * or while the data provider is loading: the call is queued and executed
-     * once the overlay is open and not loading.
-     *
-     * Because this sets the focused item, closing the dropdown without an
-     * explicit selection change (e.g. via outside click or blur) will commit
-     * the focused item as `selectedItem`. In the typical use case (scroll to
-     * the currently selected item) this is a no-op; callers scrolling to a
-     * different index should be aware of this behavior.
-     *
-     * @param {number} index Index of the item to scroll to
-     */
-    scrollToIndex(index) {
-      if (typeof index !== 'number' || Number.isNaN(index) || index < 0) {
-        return;
-      }
-
-      if (!this._overlayOpened || this.loading) {
-        this.__scrollToPendingIndex = index;
-        return;
-      }
-
-      if (!this._dropdownItems || index >= this._dropdownItems.length) {
-        return;
-      }
-
-      if (this._dropdownItems[index] instanceof ComboBoxPlaceholder) {
-        // The target item is on a page that has not been loaded yet. Request
-        // the page directly and queue the focus-index update for after the
-        // page loads (see `__onDataProviderPageLoaded` →
-        // `__scrollToPendingIndexIfNeeded`). Relying on `_scrollIntoView` to
-        // trigger the page load via the visible-placeholder `index-requested`
-        // chain is unreliable on reopen with cached data: the virtualizer
-        // has just been torn down by closing the overlay and its scroll API
-        // is a no-op while it rebuilds physical items.
-        this.__scrollToPendingIndex = index;
-        this.__dataProviderController.ensureFlatIndexLoaded(index);
-        return;
-      }
-
-      delete this.__scrollToPendingIndex;
-      this._focusedIndex = index;
-      requestAnimationFrame(() => {
-        if (this.isConnected) {
-          this._updateActiveDescendant(index);
-        }
-      });
-    }
-
-    /** @private */
-    __scrollToPendingIndexIfNeeded() {
-      if (this.__scrollToPendingIndex !== undefined && !this.loading) {
-        this.scrollToIndex(this.__scrollToPendingIndex);
-      }
-    }
-
-    /** @private */
-    __clearPendingScrollOnFilter() {
-      delete this.__scrollToPendingIndex;
-    }
-
-    /**
-     * Override method from `ComboBoxBaseMixin` to flush any pending
-     * `scrollToIndex` call after the overlay opens.
-     *
-     * @protected
-     * @override
-     */
-    _onOpened() {
-      super._onOpened();
-      this.__scrollToPendingIndexIfNeeded();
-    }
-
-    /**
-     * Override method from `ComboBoxDataProviderMixin` to flush any pending
-     * `scrollToIndex` call after a data-provider page lands.
-     *
-     * @private
-     * @override
-     */
-    __onDataProviderPageLoaded() {
-      super.__onDataProviderPageLoaded();
-      this.__scrollToPendingIndexIfNeeded();
-    }
-  };