@vaadin/combo-box 23.0.0-alpha1 → 23.0.0-alpha2

package/package.json

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

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

@@ -158,9 +158,8 @@ export const ComboBoxDataProviderMixin = (superClass) =>
       const loadedItem = this.filteredItems[page * this.pageSize];
       if (loadedItem !== undefined) {
         return loadedItem instanceof ComboBoxPlaceholder;
-      } else {
-        return this.size === undefined;
       }
+      return this.size === undefined;
     }
 
     /** @private */

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';
   }
@@ -31,6 +29,8 @@ export class ComboBoxDropdown extends mixinBehaviors(IronResizableBehavior, Poly
         theme$="[[theme]]"
         position-target="[[positionTarget]]"
         no-vertical-overlap
+        restore-focus-on-close="[[restoreFocusOnClose]]"
+        restore-focus-node="[[restoreFocusNode]]"
       ></vaadin-combo-box-overlay>
     `;
   }
@@ -171,14 +171,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', {
@@ -262,6 +254,7 @@ export class ComboBoxDropdown extends mixinBehaviors(IronResizableBehavior, Poly
     }
   }
 
+  // eslint-disable-next-line max-params
   __updateScroller(scroller, items, opened, loading, selectedItem, itemIdPath, focusedIndex, renderer, theme) {
     if (scroller) {
       scroller.setProperties({

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

@@ -140,7 +140,7 @@ export class ComboBoxItem extends ThemableMixin(DirMixin(PolymerElement)) {
   }
 
   /** @private */
-  __rendererOrItemChanged(renderer, index, item, _selected, _focused) {
+  __rendererOrItemChanged(renderer, index, item) {
     if (item === undefined || index === undefined) {
       return;
     }
@@ -161,7 +161,9 @@ export class ComboBoxItem extends ThemableMixin(DirMixin(PolymerElement)) {
 
   /** @private */
   __updateLabel(label, renderer) {
-    if (renderer) return;
+    if (renderer) {
+      return;
+    }
 
     this.textContent = label;
   }

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

@@ -79,6 +79,8 @@ class ComboBoxLight extends ComboBoxDataProviderMixin(ComboBoxMixin(ThemableMixi
         id="dropdown"
         opened="[[opened]]"
         position-target="[[inputElement]]"
+        restore-focus-on-close="[[__restoreFocusOnClose]]"
+        restore-focus-node="[[inputElement]]"
         renderer="[[renderer]]"
         _focused-index="[[_focusedIndex]]"
         _item-id-path="[[itemIdPath]]"
@@ -133,9 +135,8 @@ class ComboBoxLight extends ComboBoxDataProviderMixin(ComboBoxMixin(ThemableMixi
   checkValidity() {
     if (this.inputElement.validate) {
       return this.inputElement.validate();
-    } else {
-      return super.checkValidity();
     }
+    return super.checkValidity();
   }
 
   /**

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

@@ -190,7 +190,10 @@ export const ComboBoxMixin = (subclass) =>
         },
 
         /** @private */
-        _closeOnBlurIsPrevented: Boolean
+        _closeOnBlurIsPrevented: Boolean,
+
+        /** @private */
+        __restoreFocusOnClose: Boolean
       };
     }
 
@@ -364,6 +367,8 @@ export const ComboBoxMixin = (subclass) =>
         if (!this.hasAttribute('focused') && !isTouch) {
           this.focus();
         }
+
+        this.__restoreFocusOnClose = true;
       } else {
         this._onClosed();
         if (this._openedWithFocusRing && this.hasAttribute('focused')) {
@@ -435,23 +440,25 @@ export const ComboBoxMixin = (subclass) =>
      * @override
      */
     _onKeyDown(e) {
-      if (e.keyCode === 40) {
+      if (e.key === 'Tab') {
+        this.__restoreFocusOnClose = false;
+      } else if (e.key === 'ArrowDown') {
         this._closeOnBlurIsPrevented = true;
         this._onArrowDown();
         this._closeOnBlurIsPrevented = false;
 
         // prevent caret from moving
         e.preventDefault();
-      } else if (e.keyCode === 38) {
+      } else if (e.key === 'ArrowUp') {
         this._closeOnBlurIsPrevented = true;
         this._onArrowUp();
         this._closeOnBlurIsPrevented = false;
 
         // prevent caret from moving
         e.preventDefault();
-      } else if (e.keyCode === 13) {
+      } else if (e.key === 'Enter') {
         this._onEnter(e);
-      } else if (e.keyCode === 27) {
+      } else if (e.key === 'Escape') {
         this._onEscape(e);
       }
     }
@@ -581,25 +588,23 @@ export const ComboBoxMixin = (subclass) =>
           // The clear button is visible and the overlay is closed, so clear the value.
           this._clear();
         }
-      } else {
+      } else if (this.opened) {
         // Auto-open is enabled
-        if (this.opened) {
-          // The overlay is open
-          e.stopPropagation();
+        // The overlay is open
+        e.stopPropagation();
 
-          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) {
-          e.stopPropagation();
-          // The clear button is visible and the overlay is closed, so clear the value.
-          this._clear();
+        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) {
+        e.stopPropagation();
+        // The clear button is visible and the overlay is closed, so clear the value.
+        this._clear();
       }
     }
 
@@ -643,8 +648,6 @@ export const ComboBoxMixin = (subclass) =>
 
     /** @private */
     _onOpened() {
-      setTimeout(() => this._resizeDropdown(), 1);
-
       // Defer scroll position adjustment to improve performance.
       requestAnimationFrame(() => {
         this.$.dropdown.adjustScrollPosition();
@@ -820,11 +823,6 @@ export const ComboBoxMixin = (subclass) =>
       }
     }
 
-    /** @private */
-    _resizeDropdown() {
-      this.$.dropdown.notifyResize();
-    }
-
     /** @private */
     _selectedItemChanged(selectedItem) {
       if (selectedItem === null || selectedItem === undefined) {

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

@@ -221,9 +221,8 @@ export class ComboBoxScroller extends PolymerElement {
       return false;
     } else if (itemIdPath && item !== undefined && selectedItem !== undefined) {
       return this.get(itemIdPath, item) === this.get(itemIdPath, selectedItem);
-    } else {
-      return item === selectedItem;
     }
+    return item === selectedItem;
   }
 
   /** @private */

package/src/vaadin-combo-box.js

@@ -201,6 +201,8 @@ class ComboBox extends ComboBoxDataProviderMixin(
         opened="[[opened]]"
         renderer="[[renderer]]"
         position-target="[[_positionTarget]]"
+        restore-focus-on-close="[[__restoreFocusOnClose]]"
+        restore-focus-node="[[inputElement]]"
         _focused-index="[[_focusedIndex]]"
         _item-id-path="[[itemIdPath]]"
         _item-label-path="[[itemLabelPath]]"