Never modify value if there is no item meeting it. Fixes #130 #136

vaadin · Jun 27, 2018 · 810a1bf · 810a1bf
1 parent 635c9fd
commit 810a1bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/vaadin-dropdown-menu.html b/src/vaadin-dropdown-menu.html
@@ -434,9 +434,9 @@
 
           this._attachSelectedItem(selected);
 
-          if (!this._valueChanging) {
+          if (!this._valueChanging && selected) {
             this._selectedChanging = true;
-            this.value = selected && selected.value || '';
+            this.value = selected.value || '';
             delete this._selectedChanging;
           }
         }

diff --git a/test/dropdown-menu-test.html b/test/dropdown-menu-test.html
@@ -353,10 +353,10 @@
           expect(menu.selected).to.be.equal(1);
         });
 
-        it('Should select first item with empty value when when value is not found in items', () => {
+        it('Should not select any item when value is not found in items', () => {
           dropdown.value = 'v2';
           dropdown.value = 'foo';
-          expect(menu.selected).to.be.equal(0);
+          expect(menu.selected).to.be.undefined;
         });
 
         describe('has-value attribute on text-field', () => {