@vaadin/multi-select-combo-box 24.2.0-alpha1 → 24.2.0-alpha11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/multi-select-combo-box",
-  "version": "24.2.0-alpha1",
+  "version": "24.2.0-alpha11",
   "publishConfig": {
     "access": "public"
   },
@@ -37,21 +37,21 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "24.2.0-alpha1",
-    "@vaadin/combo-box": "24.2.0-alpha1",
-    "@vaadin/component-base": "24.2.0-alpha1",
-    "@vaadin/field-base": "24.2.0-alpha1",
-    "@vaadin/input-container": "24.2.0-alpha1",
-    "@vaadin/item": "24.2.0-alpha1",
-    "@vaadin/lit-renderer": "24.2.0-alpha1",
-    "@vaadin/overlay": "24.2.0-alpha1",
-    "@vaadin/vaadin-lumo-styles": "24.2.0-alpha1",
-    "@vaadin/vaadin-material-styles": "24.2.0-alpha1",
-    "@vaadin/vaadin-themable-mixin": "24.2.0-alpha1"
+    "@vaadin/a11y-base": "24.2.0-alpha11",
+    "@vaadin/combo-box": "24.2.0-alpha11",
+    "@vaadin/component-base": "24.2.0-alpha11",
+    "@vaadin/field-base": "24.2.0-alpha11",
+    "@vaadin/input-container": "24.2.0-alpha11",
+    "@vaadin/item": "24.2.0-alpha11",
+    "@vaadin/lit-renderer": "24.2.0-alpha11",
+    "@vaadin/overlay": "24.2.0-alpha11",
+    "@vaadin/vaadin-lumo-styles": "24.2.0-alpha11",
+    "@vaadin/vaadin-material-styles": "24.2.0-alpha11",
+    "@vaadin/vaadin-themable-mixin": "24.2.0-alpha11"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
-    "@vaadin/testing-helpers": "^0.4.2",
+    "@vaadin/testing-helpers": "^0.5.0",
     "lit": "^2.0.0",
     "sinon": "^13.0.2"
   },
@@ -59,5 +59,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "0dbb118320203ab6c0c07450a3e718815367589f"
+  "gitHead": "a958207d5f6a09ca0e2dcf9f62194b3f92c8766a"
 }

package/src/lit/renderer-directives.d.ts

@@ -3,9 +3,9 @@
  * Copyright (c) 2017 - 2023 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import type { TemplateResult } from 'lit';
 import type { DirectiveResult } from 'lit/directive.js';
 import type { ComboBoxItemModel } from '@vaadin/combo-box/src/vaadin-combo-box.js';
+import type { LitRendererResult } from '@vaadin/lit-renderer';
 import { LitRendererDirective } from '@vaadin/lit-renderer';
 import type { MultiSelectComboBox } from '../vaadin-multi-select-combo-box.js';
 
@@ -13,7 +13,7 @@ export type MultiSelectComboBoxLitRenderer<TItem> = (
   item: TItem,
   model: ComboBoxItemModel<TItem>,
   comboBox: MultiSelectComboBox<TItem>,
-) => TemplateResult;
+) => LitRendererResult;
 
 export class MultiSelectComboBoxRendererDirective<TItem> extends LitRendererDirective<
   MultiSelectComboBox,

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();
+      event.stopPropagation();
+      if (this.opened) {
+        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);
-
-      return;
-    }
-
-    super._closeOrCommit();
+    super._onEscape(event);
   }
 
   /**
@@ -232,18 +243,20 @@ class MultiSelectComboBoxInternal extends ComboBoxDataProviderMixin(ComboBoxMixi
   /**
    * Override method inherited from the combo-box
    * to close dropdown on blur when readonly.
-   * @param {FocusEvent} event
+   * @param {boolean} focused
    * @protected
    * @override
    */
-  _onFocusout(event) {
+  _setFocused(focused) {
     // Disable combo-box logic that updates selectedItem
     // based on the overlay focused index on input blur
-    this._ignoreCommitValue = true;
+    if (!focused) {
+      this._ignoreCommitValue = true;
+    }
 
-    super._onFocusout(event);
+    super._setFocused(focused);
 
-    if (this.readonly && !this._closeOnBlurIsPrevented) {
+    if (!focused && this.readonly && !this._closeOnBlurIsPrevented) {
       this.close();
     }
   }

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';
@@ -53,6 +53,11 @@ export type MultiSelectComboBoxChangeEvent<TItem> = Event & {
  */
 export type MultiSelectComboBoxCustomValueSetEvent = CustomEvent<string>;
 
+/**
+ * Fired when the `dirty` property changes.
+ */
+export type MultiSelectComboBoxDirtyChangedEvent = CustomEvent<{ value: boolean }>;
+
 /**
  * Fired when the `filter` property changes.
  */
@@ -78,6 +83,8 @@ export interface MultiSelectComboBoxEventMap<TItem> extends HTMLElementEventMap
 
   'custom-value-set': MultiSelectComboBoxCustomValueSetEvent;
 
+  'dirty-changed': MultiSelectComboBoxDirtyChangedEvent;
+
   'filter-changed': MultiSelectComboBoxFilterChangedEvent;
 
   'invalid-changed': MultiSelectComboBoxInvalidChangedEvent;
@@ -159,6 +166,7 @@ export interface MultiSelectComboBoxEventMap<TItem> extends HTMLElementEventMap
  * @fires {CustomEvent} custom-value-set - Fired when the user sets a custom value.
  * @fires {CustomEvent} filter-changed - Fired when the `filter` property changes.
  * @fires {CustomEvent} invalid-changed - Fired when the `invalid` property changes.
+ * @fires {CustomEvent} dirty-changed - Fired when the `dirty` property changes.
  * @fires {CustomEvent} selected-items-changed - Fired when the `selectedItems` property changes.
  * @fires {CustomEvent} validated - Fired whenever the field is validated.
  */

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

@@ -527,6 +527,7 @@ class MultiSelectComboBox extends ResizeMixin(InputControlMixin(ThemableMixin(El
     this._tooltipController = new TooltipController(this);
     this.addController(this._tooltipController);
     this._tooltipController.setPosition('top');
+    this._tooltipController.setAriaTarget(this.inputElement);
     this._tooltipController.setShouldShow((target) => !target.opened);
 
     this._inputField = this.shadowRoot.querySelector('[part="input-field"]');
@@ -616,7 +617,9 @@ class MultiSelectComboBox extends ResizeMixin(InputControlMixin(ThemableMixin(El
   _setFocused(focused) {
     super._setFocused(focused);
 
-    if (!focused) {
+    // Do not validate when focusout is caused by document
+    // losing focus, which happens on browser tab switch.
+    if (!focused && document.hasFocus()) {
       this._focusedChipIndex = -1;
       this.validate();
     }
@@ -810,6 +813,7 @@ class MultiSelectComboBox extends ResizeMixin(InputControlMixin(ThemableMixin(El
 
   /** @private */
   __updateSelection(selectedItems) {
+    this.dirty = true;
     this.selectedItems = selectedItems;
 
     this.validate();

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-alpha1",
+  "version": "24.2.0-alpha11",
   "description-markup": "markdown",
   "contributions": {
     "html": {
@@ -120,6 +120,17 @@
                 ]
               }
             },
+            {
+              "name": "dirty",
+              "description": "Whether the field is dirty.\n\nThe field is automatically marked as dirty once the user triggers\nan `input` or `change` event. Additionally, the field can be manually\nmarked as dirty by setting the property to `true`.",
+              "value": {
+                "type": [
+                  "boolean",
+                  "null",
+                  "undefined"
+                ]
+              }
+            },
             {
               "name": "clear-button-visible",
               "description": "Set to true to display the clear icon which clears the input.",
@@ -431,6 +442,17 @@
                   ]
                 }
               },
+              {
+                "name": "dirty",
+                "description": "Whether the field is dirty.\n\nThe field is automatically marked as dirty once the user triggers\nan `input` or `change` event. Additionally, the field can be manually\nmarked as dirty by setting the property to `true`.",
+                "value": {
+                  "type": [
+                    "boolean",
+                    "null",
+                    "undefined"
+                  ]
+                }
+              },
               {
                 "name": "clearButtonVisible",
                 "description": "Set to true to display the clear icon which clears the input.",
@@ -722,6 +744,10 @@
               {
                 "name": "invalid-changed",
                 "description": "Fired when the `invalid` property changes."
+              },
+              {
+                "name": "dirty-changed",
+                "description": "Fired when the `dirty` property changes."
               }
             ]
           }

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-alpha1",
+  "version": "24.2.0-alpha11",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {
@@ -47,6 +47,13 @@
                 "kind": "expression"
               }
             },
+            {
+              "name": "?dirty",
+              "description": "Whether the field is dirty.\n\nThe field is automatically marked as dirty once the user triggers\nan `input` or `change` event. Additionally, the field can be manually\nmarked as dirty by setting the property to `true`.",
+              "value": {
+                "kind": "expression"
+              }
+            },
             {
               "name": "?clearButtonVisible",
               "description": "Set to true to display the clear icon which clears the input.",
@@ -298,6 +305,13 @@
               "value": {
                 "kind": "expression"
               }
+            },
+            {
+              "name": "@dirty-changed",
+              "description": "Fired when the `dirty` property changes.",
+              "value": {
+                "kind": "expression"
+              }
             }
           ]
         }