@vaadin/combo-box 23.1.3 → 23.1.6

package/package.json

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

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

@@ -5,6 +5,7 @@
  */
 import './vaadin-combo-box-dropdown.js';
 import { dashToCamelCase } from '@polymer/polymer/lib/utils/case-map.js';
+import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import { ComboBoxDataProviderMixin } from './vaadin-combo-box-data-provider-mixin.js';
@@ -118,14 +119,14 @@ class ComboBoxLight extends ComboBoxDataProviderMixin(ComboBoxMixin(ThemableMixi
   /** @protected */
   ready() {
     super.ready();
+
     this._toggleElement = this.querySelector('.toggle-button');
-  }
 
-  /** @protected */
-  connectedCallback() {
-    super.connectedCallback();
-    this._setInputElement(this.querySelector('vaadin-text-field,.input'));
-    this._revertInputValue();
+    // Wait until the slotted input DOM is ready
+    afterNextRender(this, () => {
+      this._setInputElement(this.querySelector('vaadin-text-field,.input'));
+      this._revertInputValue();
+    });
   }
 
   /**
@@ -147,6 +148,38 @@ class ComboBoxLight extends ComboBoxDataProviderMixin(ComboBoxMixin(ThemableMixi
     return dashToCamelCase(this.attrForValue);
   }
 
+  /**
+   * @protected
+   * @override
+   * @return {HTMLInputElement | undefined}
+   */
+  get _nativeInput() {
+    const input = this.inputElement;
+
+    if (input) {
+      // Support `<input class="input">`
+      if (input instanceof HTMLInputElement) {
+        return input;
+      }
+
+      // Support `<input>` in light DOM (e.g. `vaadin-text-field`)
+      const slottedInput = input.querySelector('input');
+      if (slottedInput) {
+        return slottedInput;
+      }
+
+      if (input.shadowRoot) {
+        // Support `<input>` in Shadow DOM (e.g. `mwc-textfield`)
+        const shadowInput = input.shadowRoot.querySelector('input');
+        if (shadowInput) {
+          return shadowInput;
+        }
+      }
+    }
+
+    return undefined;
+  }
+
   /** @protected */
   _isClearButton(event) {
     return (

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

@@ -238,14 +238,26 @@ export const ComboBoxMixin = (subclass) =>
       }
     }
 
+    /**
+     * Get a reference to the native `<input>` element.
+     * Override to provide a custom input.
+     * @protected
+     * @return {HTMLInputElement | undefined}
+     */
+    get _nativeInput() {
+      return this.inputElement;
+    }
+
     /**
      * Override method inherited from `InputMixin`
      * to customize the input element.
      * @protected
      * @override
      */
-    _inputElementChanged(input) {
-      super._inputElementChanged(input);
+    _inputElementChanged(inputElement) {
+      super._inputElementChanged(inputElement);
+
+      const input = this._nativeInput;
 
       if (input) {
         input.autocomplete = 'off';
@@ -346,7 +358,7 @@ export const ComboBoxMixin = (subclass) =>
 
     /** @private */
     _updateActiveDescendant(index) {
-      const input = this.inputElement;
+      const input = this._nativeInput;
       if (!input) {
         return;
       }
@@ -382,7 +394,7 @@ export const ComboBoxMixin = (subclass) =>
         }
       }
 
-      const input = this.inputElement;
+      const input = this._nativeInput;
       if (input) {
         input.setAttribute('aria-expanded', !!opened);
 
@@ -1094,6 +1106,12 @@ export const ComboBoxMixin = (subclass) =>
 
     /** @private */
     _onFocusout(event) {
+      // VoiceOver on iOS fires `focusout` event when moving focus to the item in the dropdown.
+      // Do not focus the input in this case, because it would break announcement for the item.
+      if (event.relatedTarget && this._getItemElements().includes(event.relatedTarget)) {
+        return;
+      }
+
       // Fixes the problem with `focusout` happening when clicking on the scroll bar on Edge
       if (event.relatedTarget === this.$.dropdown.$.overlay) {
         event.composedPath()[0].focus();