@vaadin/combo-box 22.0.4 → 22.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/combo-box",
-  "version": "22.0.4",
+  "version": "22.0.7",
   "publishConfig": {
     "access": "public"
   },
@@ -32,25 +32,24 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@polymer/iron-resizable-behavior": "^3.0.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/component-base": "^22.0.4",
-    "@vaadin/field-base": "^22.0.4",
-    "@vaadin/input-container": "^22.0.4",
-    "@vaadin/item": "^22.0.4",
-    "@vaadin/vaadin-lumo-styles": "^22.0.4",
-    "@vaadin/vaadin-material-styles": "^22.0.4",
-    "@vaadin/vaadin-overlay": "^22.0.4",
-    "@vaadin/vaadin-themable-mixin": "^22.0.4"
+    "@vaadin/component-base": "^22.0.7",
+    "@vaadin/field-base": "^22.0.7",
+    "@vaadin/input-container": "^22.0.7",
+    "@vaadin/item": "^22.0.7",
+    "@vaadin/vaadin-lumo-styles": "^22.0.7",
+    "@vaadin/vaadin-material-styles": "^22.0.7",
+    "@vaadin/vaadin-overlay": "^22.0.7",
+    "@vaadin/vaadin-themable-mixin": "^22.0.7"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/dialog": "^22.0.4",
-    "@vaadin/polymer-legacy-adapter": "^22.0.4",
+    "@vaadin/dialog": "^22.0.7",
+    "@vaadin/polymer-legacy-adapter": "^22.0.7",
     "@vaadin/testing-helpers": "^0.3.2",
-    "@vaadin/text-field": "^22.0.4",
+    "@vaadin/text-field": "^22.0.7",
     "lit": "^2.0.0",
     "sinon": "^9.2.0"
   },
-  "gitHead": "55891f68d4da41e846e06dfe51dceba1665e41ce"
+  "gitHead": "947d74491296ca746b360ecb5f5a8efd55ab2866"
 }

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

@@ -6,8 +6,6 @@
 import './vaadin-combo-box-item.js';
 import './vaadin-combo-box-overlay.js';
 import './vaadin-combo-box-scroller.js';
-import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
-import { mixinBehaviors } from '@polymer/polymer/lib/legacy/class.js';
 import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
 
 /**
@@ -16,7 +14,7 @@ import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
  * @extends HTMLElement
  * @private
  */
-export class ComboBoxDropdown extends mixinBehaviors(IronResizableBehavior, PolymerElement) {
+export class ComboBoxDropdown extends PolymerElement {
   static get is() {
     return 'vaadin-combo-box-dropdown';
   }
@@ -171,14 +169,6 @@ export class ComboBoxDropdown extends mixinBehaviors(IronResizableBehavior, Poly
     this._overlayOpened = false;
   }
 
-  notifyResize() {
-    super.notifyResize();
-
-    if (this.positionTarget && this.opened) {
-      this._setOverlayWidth();
-    }
-  }
-
   _fireTouchAction(sourceEvent) {
     this.dispatchEvent(
       new CustomEvent('vaadin-overlay-touch-action', {

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

@@ -413,6 +413,16 @@ export const ComboBoxMixin = (subclass) =>
       }
     }
 
+    /**
+     * @param {Event} event
+     * @protected
+     */
+    _onHostClick(_event) {
+      if (!this.autoOpenDisabled) {
+        this.open();
+      }
+    }
+
     /** @private */
     _onClick(e) {
       this._closeOnBlurIsPrevented = true;
@@ -427,8 +437,8 @@ export const ComboBoxMixin = (subclass) =>
         } else {
           this.open();
         }
-      } else if (!this.autoOpenDisabled) {
-        this.open();
+      } else {
+        this._onHostClick(e);
       }
 
       this._closeOnBlurIsPrevented = false;
@@ -650,8 +660,6 @@ export const ComboBoxMixin = (subclass) =>
 
     /** @private */
     _onOpened() {
-      setTimeout(() => this._resizeDropdown(), 1);
-
       // Defer scroll position adjustment to improve performance.
       requestAnimationFrame(() => {
         this.$.dropdown.adjustScrollPosition();
@@ -706,17 +714,21 @@ export const ComboBoxMixin = (subclass) =>
           // to prevent a repetitive input value being saved after pressing ESC and Tab.
           !itemMatchingByLabel
         ) {
+          const customValue = this._inputElementValue;
+
+          // Store reference to the last custom value for checking it on focusout.
+          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;
           }
@@ -832,11 +844,6 @@ export const ComboBoxMixin = (subclass) =>
       }
     }
 
-    /** @private */
-    _resizeDropdown() {
-      this.$.dropdown.notifyResize();
-    }
-
     /** @private */
     _selectedItemChanged(selectedItem) {
       if (selectedItem === null || selectedItem === undefined) {
@@ -1059,6 +1066,13 @@ export const ComboBoxMixin = (subclass) =>
         return;
       }
       if (!this.readonly && !this._closeOnBlurIsPrevented) {
+        // 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.opened && this.allowCustomValue && this._inputElementValue === this._lastCustomValue) {
+          delete this._lastCustomValue;
+          return;
+        }
+
         this._closeOrCommit();
       }
     }

package/src/vaadin-combo-box.js

@@ -291,6 +291,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);