set selectedItem after DOM attaching and before items set (Fixes #580)

vaadin · Jan 10, 2018 · cfa1011 · cfa1011
1 parent 957dd4e
commit cfa1011
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/vaadin-combo-box-mixin.html b/src/vaadin-combo-box-mixin.html
@@ -583,17 +583,15 @@
     }
 
     _selectedItemChanged(selectedItem) {
-      if (!this.filteredItems) {
-        return;
-      }
-
       if (selectedItem === null || selectedItem === undefined) {
-        if (!this.allowCustomValue) {
-          this.value = '';
-        }
+        if (this.filteredItems) {
+          if (!this.allowCustomValue) {
+            this.value = '';
+          }
 
-        this._updateHasValue(this.value !== '');
-        this._inputElementValue = this.value;
+          this._setHasValue(this.value !== '');
+          this._inputElementValue = this.value;
+        }
       } else {
         const value = this._getItemValue(selectedItem);
         if (this.value !== value) {
@@ -610,7 +608,9 @@
       }
 
       this.$.overlay._selectedItem = selectedItem;
-      this._focusedIndex = this.filteredItems.indexOf(selectedItem);
+      if (this.filteredItems) {
+        this._focusedIndex = this.filteredItems.indexOf(selectedItem);
+      }
     }
 
     _valueChanged(value, oldVal) {

diff --git a/test/selecting-items.html b/test/selecting-items.html
@@ -152,6 +152,14 @@
       expect(newComboBox.value).to.equal('foo');
     });
 
+    it('should be possible to set selectedItem after attaching to the DOM and before setting items', () => {
+      var newComboBox = combobox.cloneNode(true);
+      combobox.parentElement.appendChild(newComboBox);
+      newComboBox.selectedItem = 'foo';
+      newComboBox.items = ['foo', 'bar'];
+      expect(newComboBox.value).to.equal('foo');
+    });
+
     describe('`change` event', () => {
       it('should fire `value-changed` and `selected-item-changed` before `changed`', done => {
         combobox.addEventListener('change', () => {