@vaadin/multi-select-combo-box 24.2.0-alpha10 → 24.2.0-alpha12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/multi-select-combo-box",
-  "version": "24.2.0-alpha10",
+  "version": "24.2.0-alpha12",
   "publishConfig": {
     "access": "public"
   },
@@ -37,17 +37,17 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "24.2.0-alpha10",
-    "@vaadin/combo-box": "24.2.0-alpha10",
-    "@vaadin/component-base": "24.2.0-alpha10",
-    "@vaadin/field-base": "24.2.0-alpha10",
-    "@vaadin/input-container": "24.2.0-alpha10",
-    "@vaadin/item": "24.2.0-alpha10",
-    "@vaadin/lit-renderer": "24.2.0-alpha10",
-    "@vaadin/overlay": "24.2.0-alpha10",
-    "@vaadin/vaadin-lumo-styles": "24.2.0-alpha10",
-    "@vaadin/vaadin-material-styles": "24.2.0-alpha10",
-    "@vaadin/vaadin-themable-mixin": "24.2.0-alpha10"
+    "@vaadin/a11y-base": "24.2.0-alpha12",
+    "@vaadin/combo-box": "24.2.0-alpha12",
+    "@vaadin/component-base": "24.2.0-alpha12",
+    "@vaadin/field-base": "24.2.0-alpha12",
+    "@vaadin/input-container": "24.2.0-alpha12",
+    "@vaadin/item": "24.2.0-alpha12",
+    "@vaadin/lit-renderer": "24.2.0-alpha12",
+    "@vaadin/overlay": "24.2.0-alpha12",
+    "@vaadin/vaadin-lumo-styles": "24.2.0-alpha12",
+    "@vaadin/vaadin-material-styles": "24.2.0-alpha12",
+    "@vaadin/vaadin-themable-mixin": "24.2.0-alpha12"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
@@ -59,5 +59,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "ca16b5f88b00ae05fb6d7c7e9874525048e389f0"
+  "gitHead": "854d2809340ef73f765350808bb92ed5c840d147"
 }

package/src/vaadin-multi-select-combo-box-internal.js

@@ -160,33 +160,44 @@ class MultiSelectComboBoxInternal extends ComboBoxDataProviderMixin(ComboBoxMixi
    * @override
    */
   _onEnter(event) {
-    this.__enterPressed = true;
+    if (this.opened) {
+      // Do not submit the surrounding form.
+      event.preventDefault();
+      // Do not trigger global listeners.
+      event.stopPropagation();
+
+      if (this.readonly) {
+        this.close();
+      } else {
+        // Keep selected item focused after committing on Enter.
+        const focusedItem = this.filteredItems[this._focusedIndex];
+        this._commitValue();
+        this._focusedIndex = this.filteredItems.indexOf(focusedItem);
+      }
+
+      return;
+    }
 
     super._onEnter(event);
   }
 
   /**
+   * Override Escape handler to not clear
+   * selected items when readonly.
+   * @param {!Event} event
    * @protected
    * @override
    */
-  _closeOrCommit() {
+  _onEscape(event) {
     if (this.readonly) {
-      this.close();
-      return;
-    }
-
-    if (this.__enterPressed) {
-      this.__enterPressed = null;
-
-      // Keep selected item focused after committing on Enter.
-      const focusedItem = this.filteredItems[this._focusedIndex];
-      this._commitValue();
-      this._focusedIndex = this.filteredItems.indexOf(focusedItem);
-
+      event.stopPropagation();
+      if (this.opened) {
+        this.close();
+      }
       return;
     }
 
-    super._closeOrCommit();
+    super._onEscape(event);
   }
 
   /**

package/src/vaadin-multi-select-combo-box.d.ts

@@ -16,13 +16,13 @@ import type { ControllerMixinClass } from '@vaadin/component-base/src/controller
 import type { DelegateStateMixinClass } from '@vaadin/component-base/src/delegate-state-mixin.js';
 import type { ElementMixinClass } from '@vaadin/component-base/src/element-mixin.js';
 import type { ResizeMixinClass } from '@vaadin/component-base/src/resize-mixin.js';
+import type { SlotStylesMixinClass } from '@vaadin/component-base/src/slot-styles-mixin.js';
 import type { ClearButtonMixinClass } from '@vaadin/field-base/src/clear-button-mixin.js';
 import type { FieldMixinClass } from '@vaadin/field-base/src/field-mixin.js';
 import type { InputConstraintsMixinClass } from '@vaadin/field-base/src/input-constraints-mixin.js';
 import type { InputControlMixinClass } from '@vaadin/field-base/src/input-control-mixin.js';
 import type { InputMixinClass } from '@vaadin/field-base/src/input-mixin.js';
 import type { LabelMixinClass } from '@vaadin/field-base/src/label-mixin.js';
-import type { SlotStylesMixinClass } from '@vaadin/field-base/src/slot-styles-mixin.js';
 import type { ValidateMixinClass } from '@vaadin/field-base/src/validate-mixin.js';
 import type { ThemableMixinClass } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import type { ThemePropertyMixinClass } from '@vaadin/vaadin-themable-mixin/vaadin-theme-property-mixin.js';

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/multi-select-combo-box",
-  "version": "24.2.0-alpha10",
+  "version": "24.2.0-alpha12",
   "description-markup": "markdown",
   "contributions": {
     "html": {

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/multi-select-combo-box",
-  "version": "24.2.0-alpha10",
+  "version": "24.2.0-alpha12",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {