@vaadin/vaadin-combo-box 5.4.9 → 5.4.10

package/package.json

@@ -10,7 +10,7 @@
   "repository": "vaadin/vaadin-combo-box",
   "homepage": "https://vaadin.com/components",
   "name": "@vaadin/vaadin-combo-box",
-  "version": "5.4.9",
+  "version": "5.4.10",
   "main": "vaadin-combo-box.js",
   "author": "Vaadin Ltd",
   "license": "Apache-2.0",

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

@@ -576,16 +576,36 @@ export const ComboBoxMixin = subclass => class VaadinComboBoxMixinElement extend
    */
   _onEscape(e) {
     if (this.autoOpenDisabled) {
-      this._focusedIndex = -1;
-      this.cancel();
-    } else if (this.opened) {
-      this._stopPropagation(e);
-
-      if (this._focusedIndex > -1) {
+      // Auto-open is disabled
+      if (this.opened || (this.value !== this._inputElementValue && this._inputElementValue.length > 0)) {
+        // The overlay is open or
+        // the input value has changed but the change hasn't been committed, so cancel it.
+        this._stopPropagation(e);
         this._focusedIndex = -1;
-        this._revertInputValue();
-      } else {
         this.cancel();
+      } else if (this.clearButtonVisible && !this.opened && !!this.value) {
+        this._stopPropagation(e);
+        // The clear button is visible and the overlay is closed, so clear the value.
+        this._clear();
+      }
+    } else {
+      // Auto-open is enabled
+      if (this.opened) {
+        // The overlay is open
+        this._stopPropagation(e);
+
+        if (this._focusedIndex > -1) {
+          // An item is focused, revert the input to the filtered value
+          this._focusedIndex = -1;
+          this._revertInputValue();
+        } else {
+          // No item is focused, cancel the change and close the overlay
+          this.cancel();
+        }
+      } else if (this.clearButtonVisible && !!this.value) {
+        this._stopPropagation(e);
+        // The clear button is visible and the overlay is closed, so clear the value.
+        this._clear();
       }
     }
   }

package/src/vaadin-combo-box.js

@@ -229,7 +229,7 @@ class ComboBoxElement extends
   }
 
   static get version() {
-    return '5.4.9';
+    return '5.4.10';
   }
 
   static get properties() {
@@ -358,12 +358,8 @@ class ComboBoxElement extends
     // Stop propagation of Esc in capturing phase so that
     // vaadin-text-field will not handle Esc as a shortcut
     // to clear the value.
-    // We need to set this listener for "this.inputElement"
-    // instead of just "this", otherwise keyboard navigation behaviour
-    // breaks a bit on Safari and some related tests fail.
-    this.inputElement.addEventListener('keydown', e => {
+    this.addEventListener('keydown', e => {
       if (this._isEventKey(e, 'esc')) {
-        this._stopPropagation(e);
         // Trigger _onEscape method of vaadin-combo-box-mixin because
         // bubbling phase is not reached.
         this._onEscape(e);