Merge e5472ef into 8427e9c

vaadin · Nov 5, 2020 · 6397005 · 6397005
2 parents 8427e9c + e5472ef
commit 6397005
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/vaadin-combo-box-mixin.html b/src/vaadin-combo-box-mixin.html
@@ -947,7 +947,7 @@
         return this._getItemLabel(item).toString().toLowerCase().indexOf(filter) > -1;
       });
 
-      return !filteredItems.length && this.autoOpenDisabled ? arr : filteredItems;
+      return filteredItems;
     }
 
     /** @private */

diff --git a/test/filtering.html b/test/filtering.html
@@ -66,6 +66,17 @@
         expect(comboBox.opened).to.equal(false);
       });
 
+      it('should filter items when filter is changed regardless of autoOpenDisabled', () => {
+        comboBox.autoOpenDisabled = true;
+        comboBox.close();
+
+        comboBox.value = 'foo';
+        comboBox.open();
+        setInputValue('foo ');
+
+        expect(getFilteredItems()).to.be.empty;
+      });
+
       it('should open the popup when the value of the input field is set to none', () => {
         comboBox.value = 'foo';
         comboBox.close();