@vaadin/combo-box 24.4.0-alpha17 → 24.4.0-alpha19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/combo-box",
-  "version": "24.4.0-alpha17",
+  "version": "24.4.0-alpha19",
   "publishConfig": {
     "access": "public"
   },
@@ -26,7 +26,9 @@
     "vaadin-*.d.ts",
     "vaadin-*.js",
     "web-types.json",
-    "web-types.lit.json"
+    "web-types.lit.json",
+    "!vaadin-lit-*.d.ts",
+    "!vaadin-lit-*.js"
   ],
   "keywords": [
     "Vaadin",
@@ -38,21 +40,21 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "24.4.0-alpha17",
-    "@vaadin/component-base": "24.4.0-alpha17",
-    "@vaadin/field-base": "24.4.0-alpha17",
-    "@vaadin/input-container": "24.4.0-alpha17",
-    "@vaadin/item": "24.4.0-alpha17",
-    "@vaadin/lit-renderer": "24.4.0-alpha17",
-    "@vaadin/overlay": "24.4.0-alpha17",
-    "@vaadin/vaadin-lumo-styles": "24.4.0-alpha17",
-    "@vaadin/vaadin-material-styles": "24.4.0-alpha17",
-    "@vaadin/vaadin-themable-mixin": "24.4.0-alpha17"
+    "@vaadin/a11y-base": "24.4.0-alpha19",
+    "@vaadin/component-base": "24.4.0-alpha19",
+    "@vaadin/field-base": "24.4.0-alpha19",
+    "@vaadin/input-container": "24.4.0-alpha19",
+    "@vaadin/item": "24.4.0-alpha19",
+    "@vaadin/lit-renderer": "24.4.0-alpha19",
+    "@vaadin/overlay": "24.4.0-alpha19",
+    "@vaadin/vaadin-lumo-styles": "24.4.0-alpha19",
+    "@vaadin/vaadin-material-styles": "24.4.0-alpha19",
+    "@vaadin/vaadin-themable-mixin": "24.4.0-alpha19"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
     "@vaadin/testing-helpers": "^0.6.0",
-    "@vaadin/text-field": "24.4.0-alpha17",
+    "@vaadin/text-field": "24.4.0-alpha19",
     "lit": "^3.0.0",
     "sinon": "^13.0.2"
   },
@@ -60,5 +62,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "eb6b4dac66be1c0ddc77757bed5f84a6d355e5cf"
+  "gitHead": "5fad5eb53de7da69c1a19776a11ba74ceba27ea0"
 }

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

@@ -21,6 +21,7 @@ export const ComboBoxDataProviderMixin = (superClass) =>
           type: Number,
           value: 50,
           observer: '_pageSizeChanged',
+          sync: true,
         },
 
         /**
@@ -30,6 +31,7 @@ export const ComboBoxDataProviderMixin = (superClass) =>
         size: {
           type: Number,
           observer: '_sizeChanged',
+          sync: true,
         },
 
         /**
@@ -49,6 +51,7 @@ export const ComboBoxDataProviderMixin = (superClass) =>
         dataProvider: {
           type: Object,
           observer: '_dataProviderChanged',
+          sync: true,
         },
 
         /** @private */
@@ -82,18 +85,11 @@ export const ComboBoxDataProviderMixin = (superClass) =>
     ready() {
       super.ready();
       this._scroller.addEventListener('index-requested', (e) => {
-        const index = e.detail.index;
-        const currentScrollerPos = e.detail.currentScrollerPos;
-        const allowedIndexRange = Math.floor(this.pageSize * 1.5);
-
-        // Ignores the indexes, which are being re-sent during scrolling reset,
-        // if the corresponding page is around the current scroller position.
-        // Otherwise, there might be a last pages duplicates, which cause the
-        // loading indicator hanging and blank items
-        if (this._shouldSkipIndex(index, allowedIndexRange, currentScrollerPos)) {
+        if (!this._shouldFetchData()) {
           return;
         }
 
+        const index = e.detail.index;
         if (index !== undefined) {
           const page = this._getPageForIndex(index);
           if (this._shouldLoadPage(page)) {
@@ -125,7 +121,7 @@ export const ComboBoxDataProviderMixin = (superClass) =>
       }
     }
 
-    /** @private */
+    /** @protected */
     _shouldFetchData() {
       if (!this.dataProvider) {
         return false;
@@ -136,23 +132,18 @@ export const ComboBoxDataProviderMixin = (superClass) =>
 
     /** @private */
     _ensureFirstPage(opened) {
+      if (!this._shouldFetchData()) {
+        return;
+      }
+
       if (opened && this._shouldLoadPage(0)) {
         this._loadPage(0);
       }
     }
 
-    /** @private */
-    _shouldSkipIndex(index, allowedIndexRange, currentScrollerPos) {
-      return (
-        currentScrollerPos !== 0 &&
-        index >= currentScrollerPos - allowedIndexRange &&
-        index <= currentScrollerPos + allowedIndexRange
-      );
-    }
-
     /** @private */
     _shouldLoadPage(page) {
-      if (!this.filteredItems || this._forceNextRequest) {
+      if (this._forceNextRequest) {
         this._forceNextRequest = false;
         return true;
       }

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

@@ -60,7 +60,7 @@ export const ComboBoxItemMixin = (superClass) =>
     }
 
     static get observers() {
-      return ['__rendererOrItemChanged(renderer, index, item.*, selected, focused)', '__updateLabel(label, renderer)'];
+      return ['__rendererOrItemChanged(renderer, index, item, selected, focused)', '__updateLabel(label, renderer)'];
     }
 
     static get observedAttributes() {

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

@@ -71,6 +71,7 @@ export const ComboBoxMixin = (subclass) =>
           notify: true,
           value: false,
           reflectToAttribute: true,
+          sync: true,
           observer: '_openedChanged',
         },
 
@@ -80,6 +81,7 @@ export const ComboBoxMixin = (subclass) =>
          */
         autoOpenDisabled: {
           type: Boolean,
+          sync: true,
         },
 
         /**
@@ -104,7 +106,10 @@ export const ComboBoxMixin = (subclass) =>
          *   - `model.item` The item.
          * @type {ComboBoxRenderer | undefined}
          */
-        renderer: Function,
+        renderer: {
+          type: Object,
+          sync: true,
+        },
 
         /**
          * A full set of items to filter the visible options from.
@@ -113,6 +118,7 @@ export const ComboBoxMixin = (subclass) =>
          */
         items: {
           type: Array,
+          sync: true,
           observer: '_itemsChanged',
         },
 
@@ -138,6 +144,7 @@ export const ComboBoxMixin = (subclass) =>
         filteredItems: {
           type: Array,
           observer: '_filteredItemsChanged',
+          sync: true,
         },
 
         /**
@@ -154,6 +161,7 @@ export const ComboBoxMixin = (subclass) =>
           type: Boolean,
           value: false,
           reflectToAttribute: true,
+          sync: true,
         },
 
         /**
@@ -164,6 +172,7 @@ export const ComboBoxMixin = (subclass) =>
           type: Number,
           observer: '_focusedIndexChanged',
           value: -1,
+          sync: true,
         },
 
         /**
@@ -174,6 +183,7 @@ export const ComboBoxMixin = (subclass) =>
           type: String,
           value: '',
           notify: true,
+          sync: true,
         },
 
         /**
@@ -183,6 +193,7 @@ export const ComboBoxMixin = (subclass) =>
         selectedItem: {
           type: Object,
           notify: true,
+          sync: true,
         },
 
         /**
@@ -199,6 +210,7 @@ export const ComboBoxMixin = (subclass) =>
           type: String,
           value: 'label',
           observer: '_itemLabelPathChanged',
+          sync: true,
         },
 
         /**
@@ -214,6 +226,7 @@ export const ComboBoxMixin = (subclass) =>
         itemValuePath: {
           type: String,
           value: 'value',
+          sync: true,
         },
 
         /**
@@ -223,7 +236,10 @@ export const ComboBoxMixin = (subclass) =>
          * `dataProvider` callback).
          * @attr {string} item-id-path
          */
-        itemIdPath: String,
+        itemIdPath: {
+          type: String,
+          sync: true,
+        },
 
         /**
          * @type {!HTMLElement | undefined}
@@ -240,17 +256,22 @@ export const ComboBoxMixin = (subclass) =>
          */
         _dropdownItems: {
           type: Array,
+          sync: true,
         },
 
         /** @private */
         _closeOnBlurIsPrevented: Boolean,
 
         /** @private */
-        _scroller: Object,
+        _scroller: {
+          type: Object,
+          sync: true,
+        },
 
         /** @private */
         _overlayOpened: {
           type: Boolean,
+          sync: true,
           observer: '_overlayOpenedChanged',
         },
       };
@@ -260,7 +281,7 @@ export const ComboBoxMixin = (subclass) =>
       return [
         '_selectedItemChanged(selectedItem, itemValuePath, itemLabelPath)',
         '_openedOrItemsChanged(opened, _dropdownItems, loading)',
-        '_updateScroller(_scroller, _dropdownItems, opened, loading, selectedItem, itemIdPath, _focusedIndex, renderer, theme)',
+        '_updateScroller(_scroller, _dropdownItems, opened, loading, selectedItem, itemIdPath, _focusedIndex, renderer, _theme)',
       ];
     }
 
@@ -413,6 +434,18 @@ export const ComboBoxMixin = (subclass) =>
       }
     }
 
+    /**
+     * Override LitElement lifecycle callback to handle filter property change.
+     * @param {Object} props
+     */
+    updated(props) {
+      super.updated(props);
+
+      if (props.has('filter')) {
+        this._filterChanged(this.filter);
+      }
+    }
+
     /** @private */
     _initOverlay() {
       const overlay = this.$.overlay;
@@ -441,25 +474,23 @@ export const ComboBoxMixin = (subclass) =>
      * @protected
      */
     _initScroller(host) {
-      const scrollerTag = `${this._tagNamePrefix}-scroller`;
+      const scroller = document.createElement(`${this._tagNamePrefix}-scroller`);
+
+      scroller.owner = host || this;
+      scroller.getItemLabel = this._getItemLabel.bind(this);
+      scroller.addEventListener('selection-changed', this._boundOverlaySelectedItemChanged);
 
       const overlay = this._overlayElement;
 
       overlay.renderer = (root) => {
-        if (!root.firstChild) {
-          root.appendChild(document.createElement(scrollerTag));
+        if (!root.innerHTML) {
+          root.appendChild(scroller);
         }
       };
 
       // Ensure the scroller is rendered
       overlay.requestContentUpdate();
 
-      const scroller = overlay.querySelector(scrollerTag);
-
-      scroller.owner = host || this;
-      scroller.getItemLabel = this._getItemLabel.bind(this);
-      scroller.addEventListener('selection-changed', this._boundOverlaySelectedItemChanged);
-
       // Trigger the observer to set properties
       this._scroller = scroller;
     }
@@ -483,6 +514,17 @@ export const ComboBoxMixin = (subclass) =>
           renderer,
           theme,
         });
+
+        // NOTE: in PolylitMixin, setProperties() waits for `hasUpdated` to be set.
+        // This means for the first opening, properties won't be set synchronously.
+        // Call `performUpdate()` in this case to mimic the Polymer version logic.
+        if (scroller.performUpdate && !scroller.hasUpdated) {
+          try {
+            scroller.performUpdate();
+          } catch (_) {
+            // Suppress errors in synchronous tests for pre-opened combo-box.
+          }
+        }
       }
     }
 

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

@@ -21,6 +21,7 @@ export const ComboBoxScrollerMixin = (superClass) =>
          */
         items: {
           type: Array,
+          sync: true,
           observer: '__itemsChanged',
         },
 
@@ -30,6 +31,7 @@ export const ComboBoxScrollerMixin = (superClass) =>
          */
         focusedIndex: {
           type: Number,
+          sync: true,
           observer: '__focusedIndexChanged',
         },
 
@@ -38,6 +40,7 @@ export const ComboBoxScrollerMixin = (superClass) =>
          */
         loading: {
           type: Boolean,
+          sync: true,
           observer: '__loadingChanged',
         },
 
@@ -47,6 +50,7 @@ export const ComboBoxScrollerMixin = (superClass) =>
          */
         opened: {
           type: Boolean,
+          sync: true,
           observer: '__openedChanged',
         },
 
@@ -55,6 +59,7 @@ export const ComboBoxScrollerMixin = (superClass) =>
          */
         selectedItem: {
           type: Object,
+          sync: true,
           observer: '__selectedItemChanged',
         },
 
@@ -84,6 +89,7 @@ export const ComboBoxScrollerMixin = (superClass) =>
          */
         renderer: {
           type: Object,
+          sync: true,
           observer: '__rendererChanged',
         },
 
@@ -158,7 +164,7 @@ export const ComboBoxScrollerMixin = (superClass) =>
      * @param {number} index
      */
     scrollIntoView(index) {
-      if (!(this.opened && index >= 0)) {
+      if (!this.__virtualizer || !(this.opened && index >= 0)) {
         return;
       }
 
@@ -286,6 +292,12 @@ export const ComboBoxScrollerMixin = (superClass) =>
         focused: !this.loading && focusedIndex === index,
       });
 
+      // NOTE: in PolylitMixin, setProperties() waits for `hasUpdated` to be set.
+      // However, this causes issues with virtualizer. So we enforce sync update.
+      if (el.performUpdate && !el.hasUpdated) {
+        el.performUpdate();
+      }
+
       el.id = `${this.__hostTagName}-item-${index}`;
       el.setAttribute('role', index !== undefined ? 'option' : false);
       el.setAttribute('aria-selected', selected.toString());
@@ -346,7 +358,6 @@ export const ComboBoxScrollerMixin = (superClass) =>
           new CustomEvent('index-requested', {
             detail: {
               index,
-              currentScrollerPos: this._oldScrollerPosition,
             },
           }),
         );

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

@@ -0,0 +1,50 @@
+/**
+ * @license
+ * Copyright (c) 2015 - 2024 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { css, html, LitElement } from 'lit';
+import { defineCustomElement } from '@vaadin/component-base/src/define.js';
+import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
+import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
+import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { ComboBoxItemMixin } from './vaadin-combo-box-item-mixin.js';
+
+/**
+ * LitElement based version of `<vaadin-combo-box-item>` web component.
+ *
+ * ## Disclaimer
+ *
+ * This component is an experiment not intended for publishing to npm.
+ * There is no ETA regarding specific Vaadin version where it'll land.
+ * Feel free to try this code in your apps as per Apache 2.0 license.
+ */
+export class ComboBoxItem extends ComboBoxItemMixin(ThemableMixin(DirMixin(PolylitMixin(LitElement)))) {
+  static get is() {
+    return 'vaadin-combo-box-item';
+  }
+
+  static get styles() {
+    return css`
+      :host {
+        display: block;
+      }
+
+      :host([hidden]) {
+        display: none;
+      }
+    `;
+  }
+
+  /** @protected */
+  render() {
+    return html`
+      <span part="checkmark" aria-hidden="true"></span>
+      <div part="content">
+        <slot></slot>
+      </div>
+    `;
+  }
+}
+
+defineCustomElement(ComboBoxItem);

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

@@ -0,0 +1,58 @@
+/**
+ * @license
+ * Copyright (c) 2015 - 2024 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import './vaadin-lit-combo-box-item.js';
+import './vaadin-lit-combo-box-overlay.js';
+import './vaadin-lit-combo-box-scroller.js';
+import { css, html, LitElement } from 'lit';
+import { ifDefined } from 'lit/directives/if-defined.js';
+import { defineCustomElement } from '@vaadin/component-base/src/define.js';
+import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
+import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { ComboBoxLightMixin } from './vaadin-combo-box-light-mixin.js';
+
+/**
+ * LitElement based version of `<vaadin-combo-box-light>` web component.
+ *
+ * ## Disclaimer
+ *
+ * This component is an experiment not intended for publishing to npm.
+ * There is no ETA regarding specific Vaadin version where it'll land.
+ * Feel free to try this code in your apps as per Apache 2.0 license.
+ */
+class ComboBoxLight extends ComboBoxLightMixin(ThemableMixin(PolylitMixin(LitElement))) {
+  static get is() {
+    return 'vaadin-combo-box-light';
+  }
+
+  static get styles() {
+    return css`
+      :host([opened]) {
+        pointer-events: auto;
+      }
+    `;
+  }
+
+  /** @protected */
+  render() {
+    return html`
+      <slot></slot>
+
+      <vaadin-combo-box-overlay
+        id="overlay"
+        .opened="${this._overlayOpened}"
+        ?loading="${this.loading}"
+        theme="${ifDefined(this._theme)}"
+        .positionTarget="${this.inputElement}"
+        .restoreFocusNode="${this.inputElement}"
+        no-vertical-overlap
+      ></vaadin-combo-box-overlay>
+    `;
+  }
+}
+
+defineCustomElement(ComboBoxLight);
+
+export { ComboBoxLight };

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

@@ -0,0 +1,76 @@
+/**
+ * @license
+ * Copyright (c) 2015 - 2024 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { css, html, LitElement } from 'lit';
+import { defineCustomElement } from '@vaadin/component-base/src/define.js';
+import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
+import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
+import { OverlayMixin } from '@vaadin/overlay/src/vaadin-overlay-mixin.js';
+import { overlayStyles } from '@vaadin/overlay/src/vaadin-overlay-styles.js';
+import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { ComboBoxOverlayMixin } from './vaadin-combo-box-overlay-mixin.js';
+
+const comboBoxOverlayStyles = css`
+  #overlay {
+    width: var(--vaadin-combo-box-overlay-width, var(--_vaadin-combo-box-overlay-default-width, auto));
+  }
+
+  [part='content'] {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
+  }
+`;
+
+/**
+ * An element used internally by `<vaadin-combo-box>`. Not intended to be used separately.
+ *
+ * @extends HTMLElement
+ * @mixes ComboBoxOverlayMixin
+ * @mixes DirMixin
+ * @mixes OverlayMixin
+ * @mixes ThemableMixin
+ * @private
+ */
+export class ComboBoxOverlay extends ComboBoxOverlayMixin(
+  OverlayMixin(DirMixin(ThemableMixin(PolylitMixin(LitElement)))),
+) {
+  static get is() {
+    return 'vaadin-combo-box-overlay';
+  }
+
+  static get styles() {
+    return [overlayStyles, comboBoxOverlayStyles, comboBoxOverlayStyles];
+  }
+
+  static get properties() {
+    return {
+      /**
+       * When true, the overlay is visible and attached to body.
+       * This property config is overridden to set `sync: true`.
+       */
+      opened: {
+        type: Boolean,
+        notify: true,
+        observer: '_openedChanged',
+        reflectToAttribute: true,
+        sync: true,
+      },
+    };
+  }
+
+  /** @protected */
+  render() {
+    return html`
+      <div id="backdrop" part="backdrop" hidden></div>
+      <div part="overlay" id="overlay">
+        <div part="loader"></div>
+        <div part="content" id="content"><slot></slot></div>
+      </div>
+    `;
+  }
+}
+
+defineCustomElement(ComboBoxOverlay);

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

@@ -0,0 +1,59 @@
+/**
+ * @license
+ * Copyright (c) 2015 - 2024 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { css, html, LitElement } from 'lit';
+import { defineCustomElement } from '@vaadin/component-base/src/define.js';
+import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
+import { ComboBoxScrollerMixin } from './vaadin-combo-box-scroller-mixin.js';
+
+/**
+ * An element used internally by `<vaadin-combo-box>`. Not intended to be used separately.
+ *
+ * @extends HTMLElement
+ * @mixes ComboBoxScrollerMixin
+ * @private
+ */
+export class ComboBoxScroller extends ComboBoxScrollerMixin(PolylitMixin(LitElement)) {
+  static get is() {
+    return 'vaadin-combo-box-scroller';
+  }
+
+  static get styles() {
+    return css`
+      :host {
+        display: block;
+        min-height: 1px;
+        overflow: auto;
+
+        /* Fixes item background from getting on top of scrollbars on Safari */
+        transform: translate3d(0, 0, 0);
+
+        /* Enable momentum scrolling on iOS */
+        -webkit-overflow-scrolling: touch;
+
+        /* Fixes scrollbar disappearing when 'Show scroll bars: Always' enabled in Safari */
+        box-shadow: 0 0 0 white;
+      }
+
+      #selector {
+        border-width: var(--_vaadin-combo-box-items-container-border-width);
+        border-style: var(--_vaadin-combo-box-items-container-border-style);
+        border-color: var(--_vaadin-combo-box-items-container-border-color, transparent);
+        position: relative;
+      }
+    `;
+  }
+
+  /** @protected */
+  render() {
+    return html`
+      <div id="selector">
+        <slot></slot>
+      </div>
+    `;
+  }
+}
+
+defineCustomElement(ComboBoxScroller);

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

@@ -0,0 +1,170 @@
+/**
+ * @license
+ * Copyright (c) 2015 - 2024 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import '@vaadin/input-container/src/vaadin-lit-input-container.js';
+import './vaadin-lit-combo-box-item.js';
+import './vaadin-lit-combo-box-overlay.js';
+import './vaadin-lit-combo-box-scroller.js';
+import { css, html, LitElement } from 'lit';
+import { ifDefined } from 'lit/directives/if-defined.js';
+import { defineCustomElement } from '@vaadin/component-base/src/define.js';
+import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
+import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
+import { TooltipController } from '@vaadin/component-base/src/tooltip-controller.js';
+import { InputControlMixin } from '@vaadin/field-base/src/input-control-mixin.js';
+import { InputController } from '@vaadin/field-base/src/input-controller.js';
+import { LabelledInputController } from '@vaadin/field-base/src/labelled-input-controller.js';
+import { PatternMixin } from '@vaadin/field-base/src/pattern-mixin.js';
+import { inputFieldShared } from '@vaadin/field-base/src/styles/input-field-shared-styles.js';
+import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { ComboBoxDataProviderMixin } from './vaadin-combo-box-data-provider-mixin.js';
+import { ComboBoxMixin } from './vaadin-combo-box-mixin.js';
+
+/**
+ * LitElement based version of `<vaadin-combo-box>` web component.
+ *
+ * ## Disclaimer
+ *
+ * This component is an experiment not intended for publishing to npm.
+ * There is no ETA regarding specific Vaadin version where it'll land.
+ * Feel free to try this code in your apps as per Apache 2.0 license.
+ */
+class ComboBox extends ComboBoxDataProviderMixin(
+  ComboBoxMixin(PatternMixin(InputControlMixin(ThemableMixin(ElementMixin(PolylitMixin(LitElement)))))),
+) {
+  static get is() {
+    return 'vaadin-combo-box';
+  }
+
+  static get styles() {
+    return [
+      inputFieldShared,
+      css`
+        :host([opened]) {
+          pointer-events: auto;
+        }
+      `,
+    ];
+  }
+
+  static get properties() {
+    return {
+      /**
+       * @protected
+       */
+      _positionTarget: {
+        type: Object,
+      },
+    };
+  }
+
+  /**
+   * Used by `InputControlMixin` as a reference to the clear button element.
+   * @protected
+   * @return {!HTMLElement}
+   */
+  get clearElement() {
+    return this.$.clearButton;
+  }
+
+  /** @protected */
+  render() {
+    return html`
+      <div class="vaadin-combo-box-container">
+        <div part="label">
+          <slot name="label"></slot>
+          <span part="required-indicator" aria-hidden="true" @click="${this.focus}"></span>
+        </div>
+
+        <vaadin-input-container
+          part="input-field"
+          .readonly="${this.readonly}"
+          .disabled="${this.disabled}"
+          .invalid="${this.invalid}"
+          theme="${ifDefined(this._theme)}"
+        >
+          <slot name="prefix" slot="prefix"></slot>
+          <slot name="input"></slot>
+          <div id="clearButton" part="clear-button" slot="suffix" aria-hidden="true"></div>
+          <div id="toggleButton" part="toggle-button" slot="suffix" aria-hidden="true"></div>
+        </vaadin-input-container>
+
+        <div part="helper-text">
+          <slot name="helper"></slot>
+        </div>
+
+        <div part="error-message">
+          <slot name="error-message"></slot>
+        </div>
+      </div>
+
+      <vaadin-combo-box-overlay
+        id="overlay"
+        .opened="${this._overlayOpened}"
+        ?loading="${this.loading}"
+        theme="${ifDefined(this._theme)}"
+        .positionTarget="${this._positionTarget}"
+        .restoreFocusNode="${this.inputElement}"
+        no-vertical-overlap
+      ></vaadin-combo-box-overlay>
+
+      <slot name="tooltip"></slot>
+    `;
+  }
+
+  /** @protected */
+  ready() {
+    super.ready();
+
+    this.addController(
+      new InputController(this, (input) => {
+        this._setInputElement(input);
+        this._setFocusElement(input);
+        this.stateTarget = input;
+        this.ariaTarget = input;
+      }),
+    );
+    this.addController(new LabelledInputController(this.inputElement, this._labelController));
+
+    this._tooltipController = new TooltipController(this);
+    this.addController(this._tooltipController);
+    this._tooltipController.setPosition('top');
+    this._tooltipController.setShouldShow((target) => !target.opened);
+
+    this._positionTarget = this.shadowRoot.querySelector('[part="input-field"]');
+    this._toggleElement = this.$.toggleButton;
+  }
+
+  /**
+   * Override the method from `InputControlMixin`
+   * to stop event propagation to prevent `ComboBoxMixin`
+   * from handling this click event also on its own.
+   *
+   * @param {Event} event
+   * @protected
+   * @override
+   */
+  _onClearButtonClick(event) {
+    event.stopPropagation();
+    super._onClearButtonClick(event);
+  }
+
+  /**
+   * @param {Event} event
+   * @protected
+   */
+  _onHostClick(event) {
+    const path = event.composedPath();
+
+    // Open dropdown only when clicking on the label or input field
+    if (path.includes(this._labelNode) || path.includes(this._positionTarget)) {
+      super._onHostClick(event);
+    }
+  }
+}
+
+defineCustomElement(ComboBox);
+
+export { ComboBox };

package/theme/lumo/{vaadin-combo-box-light.d.ts → vaadin-lit-combo-box-light.js}

@@ -1,3 +1,3 @@
 import './vaadin-combo-box-item-styles.js';
 import './vaadin-combo-box-overlay-styles.js';
-import '../../src/vaadin-combo-box-light.js';
+import '../../src/vaadin-lit-combo-box-light.js';

package/theme/lumo/{vaadin-combo-box.d.ts → vaadin-lit-combo-box.js}

@@ -1,4 +1,4 @@
 import './vaadin-combo-box-item-styles.js';
 import './vaadin-combo-box-overlay-styles.js';
 import './vaadin-combo-box-styles.js';
-import '../../src/vaadin-combo-box.js';
+import '../../src/vaadin-lit-combo-box.js';

package/theme/lumo/vaadin-combo-box-item-styles.d.ts

@@ -1,5 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-declare const comboBoxItem: import("lit").CSSResult;
-export { comboBoxItem };

package/theme/lumo/vaadin-combo-box-overlay-styles.d.ts

@@ -1,6 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-declare const comboBoxOverlay: import("lit").CSSResult;
-declare const comboBoxLoader: import("lit").CSSResult;
-export { comboBoxLoader, comboBoxOverlay };

package/theme/lumo/vaadin-combo-box-styles.d.ts

@@ -1,2 +0,0 @@
-import '@vaadin/input-container/theme/lumo/vaadin-input-container-styles.js';
-import '@vaadin/vaadin-lumo-styles/font-icons.js';

package/theme/material/vaadin-combo-box-item-styles.d.ts

@@ -1,5 +0,0 @@
-import '@vaadin/vaadin-material-styles/color.js';
-import '@vaadin/vaadin-material-styles/font-icons.js';
-import '@vaadin/vaadin-material-styles/typography.js';
-declare const comboBoxItem: import("lit").CSSResult;
-export { comboBoxItem };

package/theme/material/vaadin-combo-box-light.d.ts

@@ -1,3 +0,0 @@
-import './vaadin-combo-box-item-styles.js';
-import './vaadin-combo-box-overlay-styles.js';
-import '../../src/vaadin-combo-box-light.js';

package/theme/material/vaadin-combo-box-overlay-styles.d.ts

@@ -1,4 +0,0 @@
-import '@vaadin/vaadin-material-styles/color.js';
-declare const comboBoxOverlay: import("lit").CSSResult;
-declare const comboBoxLoader: import("lit").CSSResult;
-export { comboBoxLoader, comboBoxOverlay };

package/theme/material/vaadin-combo-box-styles.d.ts

@@ -1,3 +0,0 @@
-import '@vaadin/input-container/theme/material/vaadin-input-container-styles.js';
-import '@vaadin/vaadin-material-styles/color.js';
-import '@vaadin/vaadin-material-styles/font-icons.js';

package/theme/material/vaadin-combo-box.d.ts

@@ -1,4 +0,0 @@
-import './vaadin-combo-box-item-styles.js';
-import './vaadin-combo-box-overlay-styles.js';
-import './vaadin-combo-box-styles.js';
-import '../../src/vaadin-combo-box.js';