@vaadin/combo-box 23.0.7 → 23.0.10

package/package.json

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

package/src/vaadin-combo-box-data-provider-mixin.d.ts

@@ -15,11 +15,11 @@ export interface ComboBoxDataProviderParams {
 
 export type ComboBoxDataProvider<TItem> = (
   params: ComboBoxDataProviderParams,
-  callback: ComboBoxDataProviderCallback<TItem>
+  callback: ComboBoxDataProviderCallback<TItem>,
 ) => void;
 
 export declare function ComboBoxDataProviderMixin<TItem, T extends Constructor<HTMLElement>>(
-  base: T
+  base: T,
 ): T & Constructor<ComboBoxDataProviderMixinClass<TItem>>;
 
 export declare class ComboBoxDataProviderMixinClass<TItem> {

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

@@ -20,7 +20,7 @@ export const ComboBoxDataProviderMixin = (superClass) =>
         pageSize: {
           type: Number,
           value: 50,
-          observer: '_pageSizeChanged'
+          observer: '_pageSizeChanged',
         },
 
         /**
@@ -29,7 +29,7 @@ export const ComboBoxDataProviderMixin = (superClass) =>
          */
         size: {
           type: Number,
-          observer: '_sizeChanged'
+          observer: '_sizeChanged',
         },
 
         /**
@@ -48,20 +48,20 @@ export const ComboBoxDataProviderMixin = (superClass) =>
          */
         dataProvider: {
           type: Object,
-          observer: '_dataProviderChanged'
+          observer: '_dataProviderChanged',
         },
 
         /** @private */
         _pendingRequests: {
           value: () => {
             return {};
-          }
+          },
         },
 
         /** @private */
         __placeHolder: {
-          value: new ComboBoxPlaceholder()
-        }
+          value: new ComboBoxPlaceholder(),
+        },
       };
     }
 
@@ -70,7 +70,7 @@ export const ComboBoxDataProviderMixin = (superClass) =>
         '_dataProviderFilterChanged(filter, dataProvider)',
         '_dataProviderClearFilter(dataProvider, opened, value)',
         '_warnDataProviderValue(dataProvider, value)',
-        '_ensureFirstPage(opened)'
+        '_ensureFirstPage(opened)',
       ];
     }
 
@@ -171,7 +171,7 @@ export const ComboBoxDataProviderMixin = (superClass) =>
         const params = {
           page,
           pageSize: this.pageSize,
-          filter: this.filter
+          filter: this.filter,
         };
 
         const callback = (items, size) => {
@@ -282,7 +282,7 @@ export const ComboBoxDataProviderMixin = (superClass) =>
               'Nothing to display in the text field. This usually happens when ' +
               'setting an initial `value` before any items are returned from ' +
               'the `dataProvider` callback. Consider setting `selectedItem` ' +
-              'instead of `value`'
+              'instead of `value`',
           );
         }
       }

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

@@ -48,7 +48,7 @@ export class ComboBoxDropdown extends PolymerElement {
        */
       positionTarget: {
         type: Object,
-        observer: '_positionTargetChanged'
+        observer: '_positionTargetChanged',
       },
 
       /**
@@ -62,7 +62,7 @@ export class ComboBoxDropdown extends PolymerElement {
       loading: {
         type: Boolean,
         value: false,
-        reflectToAttribute: true
+        reflectToAttribute: true,
       },
 
       /**
@@ -71,31 +71,31 @@ export class ComboBoxDropdown extends PolymerElement {
       theme: String,
 
       _selectedItem: {
-        type: Object
+        type: Object,
       },
 
       _items: {
-        type: Array
+        type: Array,
       },
 
       _focusedIndex: {
         type: Number,
-        value: -1
+        value: -1,
       },
 
       focusedItem: {
         type: String,
-        computed: '_getFocusedItem(_focusedIndex)'
+        computed: '_getFocusedItem(_focusedIndex)',
       },
 
       _itemLabelPath: {
         type: String,
-        value: 'label'
+        value: 'label',
       },
 
       _itemValuePath: {
         type: String,
-        value: 'value'
+        value: 'value',
       },
 
       _scroller: Object,
@@ -104,15 +104,15 @@ export class ComboBoxDropdown extends PolymerElement {
 
       _overlayOpened: {
         type: Boolean,
-        observer: '_openedChanged'
-      }
+        observer: '_openedChanged',
+      },
     };
   }
 
   static get observers() {
     return [
       '_openedOrItemsChanged(opened, _items, loading)',
-      '__updateScroller(_scroller, _items, opened, loading, _selectedItem, _itemIdPath, _focusedIndex, renderer, theme)'
+      '__updateScroller(_scroller, _items, opened, loading, _selectedItem, _itemIdPath, _focusedIndex, renderer, theme)',
     ];
   }
 
@@ -174,8 +174,8 @@ export class ComboBoxDropdown extends PolymerElement {
   _fireTouchAction(sourceEvent) {
     this.dispatchEvent(
       new CustomEvent('vaadin-overlay-touch-action', {
-        detail: { sourceEvent: sourceEvent }
-      })
+        detail: { sourceEvent: sourceEvent },
+      }),
     );
   }
 
@@ -265,7 +265,7 @@ export class ComboBoxDropdown extends PolymerElement {
         itemIdPath,
         focusedIndex,
         renderer,
-        theme
+        theme,
       });
     }
   }

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

@@ -79,7 +79,7 @@ export class ComboBoxItem extends ThemableMixin(DirMixin(PolymerElement)) {
       selected: {
         type: Boolean,
         value: false,
-        reflectToAttribute: true
+        reflectToAttribute: true,
       },
 
       /**
@@ -88,7 +88,7 @@ export class ComboBoxItem extends ThemableMixin(DirMixin(PolymerElement)) {
       focused: {
         type: Boolean,
         value: false,
-        reflectToAttribute: true
+        reflectToAttribute: true,
       },
 
       /**
@@ -99,7 +99,7 @@ export class ComboBoxItem extends ThemableMixin(DirMixin(PolymerElement)) {
       /**
        * Saved instance of a custom renderer function.
        */
-      _oldRenderer: Function
+      _oldRenderer: Function,
     };
   }
 
@@ -133,7 +133,7 @@ export class ComboBoxItem extends ThemableMixin(DirMixin(PolymerElement)) {
       index: this.index,
       item: this.item,
       focused: this.focused,
-      selected: this.selected
+      selected: this.selected,
     };
 
     this.renderer(this, this._comboBox, model);

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

@@ -13,7 +13,7 @@ import { ComboBoxDefaultItem } from './vaadin-combo-box-mixin.js';
 export {
   ComboBoxDataProvider,
   ComboBoxDataProviderCallback,
-  ComboBoxDataProviderParams
+  ComboBoxDataProviderParams,
 } from './vaadin-combo-box-data-provider-mixin.js';
 export { ComboBoxDefaultItem, ComboBoxItemModel, ComboBoxRenderer } from './vaadin-combo-box-mixin.js';
 
@@ -126,13 +126,13 @@ declare class ComboBoxLight<TItem = ComboBoxDefaultItem> extends HTMLElement {
   addEventListener<K extends keyof ComboBoxLightEventMap<TItem>>(
     type: K,
     listener: (this: ComboBoxLight<TItem>, ev: ComboBoxLightEventMap<TItem>[K]) => void,
-    options?: boolean | AddEventListenerOptions
+    options?: boolean | AddEventListenerOptions,
   ): void;
 
   removeEventListener<K extends keyof ComboBoxLightEventMap<TItem>>(
     type: K,
     listener: (this: ComboBoxLight<TItem>, ev: ComboBoxLightEventMap<TItem>[K]) => void,
-    options?: boolean | EventListenerOptions
+    options?: boolean | EventListenerOptions,
   ): void;
 }
 

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

@@ -101,8 +101,8 @@ class ComboBoxLight extends ComboBoxDataProviderMixin(ComboBoxMixin(ThemableMixi
        */
       attrForValue: {
         type: String,
-        value: 'value'
-      }
+        value: 'value',
+      },
     };
   }
 

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

@@ -19,11 +19,11 @@ export interface ComboBoxItemModel<TItem> {
 export type ComboBoxRenderer<TItem> = (
   root: HTMLElement,
   comboBox: ComboBox<TItem>,
-  model: ComboBoxItemModel<TItem>
+  model: ComboBoxItemModel<TItem>,
 ) => void;
 
 export declare function ComboBoxMixin<TItem, T extends Constructor<HTMLElement>>(
-  base: T
+  base: T,
 ): T &
   Constructor<ComboBoxMixinClass<TItem>> &
   Constructor<DisabledMixinClass> &

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

@@ -29,7 +29,7 @@ export const ComboBoxMixin = (subclass) =>
           notify: true,
           value: false,
           reflectToAttribute: true,
-          observer: '_openedChanged'
+          observer: '_openedChanged',
         },
 
         /**
@@ -37,7 +37,7 @@ export const ComboBoxMixin = (subclass) =>
          * @attr {boolean} auto-open-disabled
          */
         autoOpenDisabled: {
-          type: Boolean
+          type: Boolean,
         },
 
         /**
@@ -47,7 +47,7 @@ export const ComboBoxMixin = (subclass) =>
         readonly: {
           type: Boolean,
           value: false,
-          reflectToAttribute: true
+          reflectToAttribute: true,
         },
 
         /**
@@ -71,7 +71,7 @@ export const ComboBoxMixin = (subclass) =>
          */
         items: {
           type: Array,
-          observer: '_itemsChanged'
+          observer: '_itemsChanged',
         },
 
         /**
@@ -84,7 +84,7 @@ export const ComboBoxMixin = (subclass) =>
          */
         allowCustomValue: {
           type: Boolean,
-          value: false
+          value: false,
         },
 
         /**
@@ -94,7 +94,7 @@ export const ComboBoxMixin = (subclass) =>
          * @type {!Array<!ComboBoxItem | string> | undefined}
          */
         filteredItems: {
-          type: Array
+          type: Array,
         },
 
         /**
@@ -111,7 +111,7 @@ export const ComboBoxMixin = (subclass) =>
           type: Boolean,
           value: false,
           reflectToAttribute: true,
-          observer: '_loadingChanged'
+          observer: '_loadingChanged',
         },
 
         /**
@@ -121,7 +121,7 @@ export const ComboBoxMixin = (subclass) =>
         _focusedIndex: {
           type: Number,
           observer: '_focusedIndexChanged',
-          value: -1
+          value: -1,
         },
 
         /**
@@ -131,7 +131,7 @@ export const ComboBoxMixin = (subclass) =>
         filter: {
           type: String,
           value: '',
-          notify: true
+          notify: true,
         },
 
         /**
@@ -140,7 +140,7 @@ export const ComboBoxMixin = (subclass) =>
          */
         selectedItem: {
           type: Object,
-          notify: true
+          notify: true,
         },
 
         /**
@@ -156,7 +156,7 @@ export const ComboBoxMixin = (subclass) =>
         itemLabelPath: {
           type: String,
           value: 'label',
-          observer: '_itemLabelPathChanged'
+          observer: '_itemLabelPathChanged',
         },
 
         /**
@@ -171,7 +171,7 @@ export const ComboBoxMixin = (subclass) =>
          */
         itemValuePath: {
           type: String,
-          value: 'value'
+          value: 'value',
         },
 
         /**
@@ -189,14 +189,14 @@ export const ComboBoxMixin = (subclass) =>
          */
         _toggleElement: {
           type: Object,
-          observer: '_toggleElementChanged'
+          observer: '_toggleElementChanged',
         },
 
         /** @private */
         _closeOnBlurIsPrevented: Boolean,
 
         /** @private */
-        __restoreFocusOnClose: Boolean
+        __restoreFocusOnClose: Boolean,
       };
     }
 
@@ -205,7 +205,7 @@ export const ComboBoxMixin = (subclass) =>
         '_filterChanged(filter, itemValuePath, itemLabelPath)',
         '_itemsOrPathsChanged(items.*, itemValuePath, itemLabelPath)',
         '_filteredItemsChanged(filteredItems.*, itemValuePath, itemLabelPath)',
-        '_selectedItemChanged(selectedItem, itemValuePath, itemLabelPath)'
+        '_selectedItemChanged(selectedItem, itemValuePath, itemLabelPath)',
       ];
     }
 
@@ -742,7 +742,7 @@ export const ComboBoxMixin = (subclass) =>
             detail: customValue,
             composed: true,
             cancelable: true,
-            bubbles: true
+            bubbles: true,
           });
           this.dispatchEvent(e);
           if (!e.defaultPrevented) {
@@ -976,10 +976,11 @@ export const ComboBoxMixin = (subclass) =>
           this._selectItemForValue(this.value);
         }
 
-        if (this._inputElementValue === undefined || this._inputElementValue === this.value) {
+        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._indexOfValue(this.value, this.filteredItems);
+          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.

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

@@ -20,7 +20,7 @@ registerStyles(
       height: 100%;
     }
   `,
-  { moduleId: 'vaadin-combo-box-overlay-styles' }
+  { moduleId: 'vaadin-combo-box-overlay-styles' },
 );
 
 let memoizedTemplate;

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

@@ -56,7 +56,7 @@ export class ComboBoxScroller extends PolymerElement {
        */
       items: {
         type: Array,
-        observer: '__itemsChanged'
+        observer: '__itemsChanged',
       },
 
       /**
@@ -65,7 +65,7 @@ export class ComboBoxScroller extends PolymerElement {
        */
       focusedIndex: {
         type: Number,
-        observer: '__focusedIndexChanged'
+        observer: '__focusedIndexChanged',
       },
 
       /**
@@ -73,7 +73,7 @@ export class ComboBoxScroller extends PolymerElement {
        */
       loading: {
         type: Boolean,
-        observer: '__loadingChanged'
+        observer: '__loadingChanged',
       },
 
       /**
@@ -82,35 +82,35 @@ export class ComboBoxScroller extends PolymerElement {
        */
       opened: {
         type: Boolean,
-        observer: '__openedChanged'
+        observer: '__openedChanged',
       },
 
       /**
        * The selected item from the `items` array.
        */
       selectedItem: {
-        type: Object
+        type: Object,
       },
 
       /**
        * Path for the id of the item, used to detect whether the item is selected.
        */
       itemIdPath: {
-        type: String
+        type: String,
       },
 
       /**
        * Reference to the combo-box, used by the item elements.
        */
       comboBox: {
-        type: Object
+        type: Object,
       },
 
       /**
        * Function used to set a label for every combo-box item.
        */
       getItemLabel: {
-        type: Object
+        type: Object,
       },
 
       /**
@@ -118,15 +118,15 @@ export class ComboBoxScroller extends PolymerElement {
        */
       renderer: {
         type: Object,
-        observer: '__rendererChanged'
+        observer: '__rendererChanged',
       },
 
       /**
        * Used to propagate the `theme` attribute from the host element.
        */
       theme: {
-        type: String
-      }
+        type: String,
+      },
     };
   }
 
@@ -159,7 +159,7 @@ export class ComboBoxScroller extends PolymerElement {
       updateElement: this.__updateElement.bind(this),
       elementsContainer: this,
       scrollTarget: this,
-      scrollContainer: this.$.selector
+      scrollContainer: this.$.selector,
     });
   }
 
@@ -193,7 +193,7 @@ export class ComboBoxScroller extends PolymerElement {
 
     // 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
+      (el) => !el.hidden && el.index === this.__virtualizer.lastVisibleIndex,
     );
     if (!lastPhysicalItem || index !== lastPhysicalItem.index) {
       return;
@@ -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);
     }
   }
@@ -294,7 +296,7 @@ export class ComboBoxScroller extends PolymerElement {
       label: this.getItemLabel(item),
       selected: this.__isItemSelected(item, this.selectedItem, this.itemIdPath),
       renderer: this.renderer,
-      focused: this.__isItemFocused(focusedIndex, index)
+      focused: this.__isItemFocused(focusedIndex, index),
     });
 
     el.id = `${this.__hostTagName}-item-${index}`;
@@ -355,7 +357,7 @@ export class ComboBoxScroller extends PolymerElement {
   __requestItemByIndex(item, index) {
     if (item instanceof ComboBoxPlaceholder && index !== undefined) {
       this.dispatchEvent(
-        new CustomEvent('index-requested', { detail: { index, currentScrollerPos: this._oldScrollerPosition } })
+        new CustomEvent('index-requested', { detail: { index, currentScrollerPos: this._oldScrollerPosition } }),
       );
     }
 

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

@@ -24,7 +24,7 @@ import { ComboBoxDefaultItem } from './vaadin-combo-box-mixin.js';
 export {
   ComboBoxDataProvider,
   ComboBoxDataProviderCallback,
-  ComboBoxDataProviderParams
+  ComboBoxDataProviderParams,
 } from './vaadin-combo-box-data-provider-mixin.js';
 export { ComboBoxDefaultItem, ComboBoxItemModel, ComboBoxRenderer } from './vaadin-combo-box-mixin.js';
 
@@ -212,13 +212,13 @@ declare class ComboBox<TItem = ComboBoxDefaultItem> extends HTMLElement {
   addEventListener<K extends keyof ComboBoxEventMap<TItem>>(
     type: K,
     listener: (this: ComboBox<TItem>, ev: ComboBoxEventMap<TItem>[K]) => void,
-    options?: boolean | AddEventListenerOptions
+    options?: boolean | AddEventListenerOptions,
   ): void;
 
   removeEventListener<K extends keyof ComboBoxEventMap<TItem>>(
     type: K,
     listener: (this: ComboBox<TItem>, ev: ComboBoxEventMap<TItem>[K]) => void,
-    options?: boolean | EventListenerOptions
+    options?: boolean | EventListenerOptions,
   ): void;
 }
 

package/src/vaadin-combo-box.js

@@ -154,7 +154,7 @@ registerStyles('vaadin-combo-box', inputFieldShared, { moduleId: 'vaadin-combo-b
  * @mixes ComboBoxMixin
  */
 class ComboBox extends ComboBoxDataProviderMixin(
-  ComboBoxMixin(PatternMixin(InputControlMixin(ThemableMixin(ElementMixin(PolymerElement)))))
+  ComboBoxMixin(PatternMixin(InputControlMixin(ThemableMixin(ElementMixin(PolymerElement))))),
 ) {
   static get is() {
     return 'vaadin-combo-box';
@@ -218,8 +218,8 @@ class ComboBox extends ComboBoxDataProviderMixin(
        * @protected
        */
       _positionTarget: {
-        type: Object
-      }
+        type: Object,
+      },
     };
   }
 
@@ -242,7 +242,7 @@ class ComboBox extends ComboBoxDataProviderMixin(
         this._setFocusElement(input);
         this.stateTarget = input;
         this.ariaTarget = input;
-      })
+      }),
     );
     this.addController(new LabelledInputController(this.inputElement, this._labelController));
     this._positionTarget = this.shadowRoot.querySelector('[part="input-field"]');

package/theme/lumo/vaadin-combo-box-dropdown-styles.js

@@ -89,5 +89,5 @@ const comboBoxOverlay = css`
 `;
 
 registerStyles('vaadin-combo-box-overlay', [overlay, menuOverlayCore, comboBoxOverlay], {
-  moduleId: 'lumo-combo-box-overlay'
+  moduleId: 'lumo-combo-box-overlay',
 });

package/theme/lumo/vaadin-combo-box-item-styles.js

@@ -19,5 +19,5 @@ const comboBoxItem = css`
 `;
 
 registerStyles('vaadin-combo-box-item', [item, comboBoxItem], {
-  moduleId: 'lumo-combo-box-item'
+  moduleId: 'lumo-combo-box-item',
 });

package/theme/material/vaadin-combo-box-dropdown-styles.js

@@ -117,5 +117,5 @@ const comboBoxOverlay = css`
 `;
 
 registerStyles('vaadin-combo-box-overlay', [menuOverlay, comboBoxOverlay], {
-  moduleId: 'material-combo-box-overlay'
+  moduleId: 'material-combo-box-overlay',
 });

package/theme/material/vaadin-combo-box-item-styles.js

@@ -14,5 +14,5 @@ const comboBoxItem = css`
 `;
 
 registerStyles('vaadin-combo-box-item', [item, comboBoxItem], {
-  moduleId: 'material-combo-box-item'
+  moduleId: 'material-combo-box-item',
 });