@vaadin/multi-select-combo-box 23.1.1 → 23.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/multi-select-combo-box",
-  "version": "23.1.1",
+  "version": "23.1.4",
   "publishConfig": {
     "access": "public"
   },
@@ -33,18 +33,18 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/combo-box": "^23.1.1",
-    "@vaadin/component-base": "^23.1.1",
-    "@vaadin/field-base": "^23.1.1",
-    "@vaadin/input-container": "^23.1.1",
-    "@vaadin/vaadin-lumo-styles": "^23.1.1",
-    "@vaadin/vaadin-material-styles": "^23.1.1",
-    "@vaadin/vaadin-themable-mixin": "^23.1.1"
+    "@vaadin/combo-box": "^23.1.4",
+    "@vaadin/component-base": "^23.1.4",
+    "@vaadin/field-base": "^23.1.4",
+    "@vaadin/input-container": "^23.1.4",
+    "@vaadin/vaadin-lumo-styles": "^23.1.4",
+    "@vaadin/vaadin-material-styles": "^23.1.4",
+    "@vaadin/vaadin-themable-mixin": "^23.1.4"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
     "@vaadin/testing-helpers": "^0.3.2",
     "sinon": "^13.0.2"
   },
-  "gitHead": "390458d6519433a2dd502cef90da48e84573a275"
+  "gitHead": "0a82302064f1276a000f0cbd810076539407d133"
 }

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

@@ -86,6 +86,15 @@ class MultiSelectComboBoxInternal extends ComboBoxDataProviderMixin(ComboBoxMixi
         value: () => [],
       },
 
+      /**
+       * Last input value entered by the user before value is updated.
+       * Used to store `filter` property value before clearing it.
+       */
+      lastFilter: {
+        type: String,
+        notify: true,
+      },
+
       _target: {
         type: Object,
       },
@@ -183,6 +192,18 @@ class MultiSelectComboBoxInternal extends ComboBoxDataProviderMixin(ComboBoxMixi
     super._closeOrCommit();
   }
 
+  /**
+   * @protected
+   * @override
+   */
+  _commitValue() {
+    // Store filter value for checking if user input is matching
+    // an item which is already selected, to not un-select it.
+    this.lastFilter = this.filter;
+
+    super._commitValue();
+  }
+
   /**
    * Override method inherited from the combo-box
    * to not update focused item when readonly.

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

@@ -294,6 +294,11 @@ declare class MultiSelectComboBox<TItem = ComboBoxDefaultItem> extends HTMLEleme
    */
   clearCache(): void;
 
+  /**
+   * Clears the selected items.
+   */
+  clear(): void;
+
   /**
    * Requests an update for the content of items.
    * While performing the update, it invokes the renderer (passed in the `renderer` property) once an item.
@@ -305,13 +310,13 @@ declare class MultiSelectComboBox<TItem = ComboBoxDefaultItem> extends HTMLEleme
   addEventListener<K extends keyof MultiSelectComboBoxEventMap<TItem>>(
     type: K,
     listener: (this: MultiSelectComboBox<TItem>, ev: MultiSelectComboBoxEventMap<TItem>[K]) => void,
-    options?: boolean | AddEventListenerOptions,
+    options?: AddEventListenerOptions | boolean,
   ): void;
 
   removeEventListener<K extends keyof MultiSelectComboBoxEventMap<TItem>>(
     type: K,
     listener: (this: MultiSelectComboBox<TItem>, ev: MultiSelectComboBoxEventMap<TItem>[K]) => void,
-    options?: boolean | EventListenerOptions,
+    options?: EventListenerOptions | boolean,
   ): void;
 }
 

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

@@ -163,6 +163,7 @@ class MultiSelectComboBox extends ResizeMixin(InputControlMixin(ThemableMixin(El
           allow-custom-value="[[allowCustomValue]]"
           data-provider="[[dataProvider]]"
           filter="{{filter}}"
+          last-filter="{{_lastFilter}}"
           loading="{{loading}}"
           size="{{size}}"
           filtered-items="[[filteredItems]]"
@@ -195,7 +196,13 @@ class MultiSelectComboBox extends ResizeMixin(InputControlMixin(ThemableMixin(El
             ></vaadin-multi-select-combo-box-chip>
             <div id="chips" part="chips" slot="prefix"></div>
             <slot name="input"></slot>
-            <div id="clearButton" part="clear-button" slot="suffix" aria-hidden="true"></div>
+            <div
+              id="clearButton"
+              part="clear-button"
+              slot="suffix"
+              on-touchend="_onClearButtonTouchend"
+              aria-hidden="true"
+            ></div>
             <div id="toggleButton" class="toggle-button" part="toggle-button" slot="suffix" aria-hidden="true"></div>
           </vaadin-multi-select-combo-box-container>
         </vaadin-multi-select-combo-box-internal>
@@ -441,6 +448,11 @@ class MultiSelectComboBox extends ResizeMixin(InputControlMixin(ThemableMixin(El
         value: -1,
         observer: '_focusedChipIndexChanged',
       },
+
+      /** @private */
+      _lastFilter: {
+        type: String,
+      },
     };
   }
 
@@ -490,6 +502,15 @@ class MultiSelectComboBox extends ResizeMixin(InputControlMixin(ThemableMixin(El
     return this.required && !this.readonly ? this._hasValue : true;
   }
 
+  /**
+   * Clears the selected items.
+   */
+  clear() {
+    this.__updateSelection([]);
+
+    announce(this.i18n.cleared);
+  }
+
   /**
    * Clears the cached pages and reloads data from data provider when needed.
    */
@@ -614,7 +635,10 @@ class MultiSelectComboBox extends ResizeMixin(InputControlMixin(ThemableMixin(El
    * @private
    */
   _onFilteredItemsChanged(event) {
-    this.filteredItems = event.detail.value;
+    const { value } = event.detail;
+    if (Array.isArray(value) || value == null) {
+      this.filteredItems = value;
+    }
   }
 
   /** @private */
@@ -740,7 +764,8 @@ class MultiSelectComboBox extends ResizeMixin(InputControlMixin(ThemableMixin(El
     const itemsCopy = [...this.selectedItems];
     itemsCopy.splice(itemsCopy.indexOf(item), 1);
     this.__updateSelection(itemsCopy);
-    this.__announceItem(item, false, itemsCopy.length);
+    const itemLabel = this._getItemLabel(item);
+    this.__announceItem(itemLabel, false, itemsCopy.length);
   }
 
   /** @private */
@@ -753,8 +778,9 @@ class MultiSelectComboBox extends ResizeMixin(InputControlMixin(ThemableMixin(El
     let isSelected = false;
 
     if (index !== -1) {
+      const lastFilter = this._lastFilter;
       // Do not unselect when manually typing and committing an already selected item.
-      if (this.filter.toLowerCase() === itemLabel.toLowerCase()) {
+      if (lastFilter && lastFilter.toLowerCase() === itemLabel.toLowerCase()) {
         this.__clearFilter();
         return;
       }
@@ -862,6 +888,14 @@ class MultiSelectComboBox extends ResizeMixin(InputControlMixin(ThemableMixin(El
     this._overflowItems = items;
   }
 
+  /** @private */
+  _onClearButtonTouchend(event) {
+    // Cancel the following click and focus events
+    event.preventDefault();
+
+    this.clear();
+  }
+
   /**
    * Override method inherited from `InputControlMixin` and clear items.
    * @protected
@@ -870,9 +904,7 @@ class MultiSelectComboBox extends ResizeMixin(InputControlMixin(ThemableMixin(El
   _onClearButtonClick(event) {
     event.stopPropagation();
 
-    this.__updateSelection([]);
-
-    announce(this.i18n.cleared);
+    this.clear();
   }
 
   /**