@vaadin/combo-box 23.0.0-alpha5 → 23.0.0-beta4

package/package.json

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

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

@@ -423,6 +423,16 @@ export const ComboBoxMixin = (subclass) =>
       }
     }
 
+    /**
+     * @param {Event} event
+     * @protected
+     */
+    _onHostClick(_event) {
+      if (!this.autoOpenDisabled) {
+        this.open();
+      }
+    }
+
     /** @private */
     _onClick(e) {
       this._closeOnBlurIsPrevented = true;
@@ -437,8 +447,8 @@ export const ComboBoxMixin = (subclass) =>
         } else {
           this.open();
         }
-      } else if (!this.autoOpenDisabled) {
-        this.open();
+      } else {
+        this._onHostClick(e);
       }
 
       this._closeOnBlurIsPrevented = false;
@@ -698,6 +708,7 @@ export const ComboBoxMixin = (subclass) =>
         this.selectedItem = null;
 
         if (this.allowCustomValue) {
+          delete this._lastCustomValue;
           this.value = '';
         }
       } else {
@@ -714,17 +725,27 @@ export const ComboBoxMixin = (subclass) =>
           // to prevent a repetitive input value being saved after pressing ESC and Tab.
           !itemMatchingByLabel
         ) {
+          const customValue = this._inputElementValue;
+
+          // User's logic in `custom-value-set` event listener might cause input to blur,
+          // which will result in attempting to commit the same custom value once again.
+          if (this._lastCustomValue === customValue) {
+            return;
+          }
+
+          // Store reference to the last custom value for checking it
+          this._lastCustomValue = customValue;
+
           // An item matching by label was not found, but custom values are allowed.
           // Dispatch a custom-value-set event with the input value.
           const e = new CustomEvent('custom-value-set', {
-            detail: this._inputElementValue,
+            detail: customValue,
             composed: true,
             cancelable: true,
             bubbles: true
           });
           this.dispatchEvent(e);
           if (!e.defaultPrevented) {
-            const customValue = this._inputElementValue;
             this._selectItemForValue(customValue);
             this.value = customValue;
           }

package/src/vaadin-combo-box.js

@@ -183,8 +183,8 @@ class ComboBox extends ComboBoxDataProviderMixin(
         >
           <slot name="prefix" slot="prefix"></slot>
           <slot name="input"></slot>
-          <div id="clearButton" part="clear-button" slot="suffix"></div>
-          <div id="toggleButton" part="toggle-button" slot="suffix"></div>
+          <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">
@@ -293,6 +293,19 @@ class ComboBox extends ComboBoxDataProviderMixin(
 
     this._handleClearButtonClick(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);
+    }
+  }
 }
 
 customElements.define(ComboBox.is, ComboBox);