Merge 9ef0563 into 752e870

vaadin · Jun 4, 2019 · da19da5 · da19da5
2 parents 752e870 + 9ef0563
commit da19da5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/vaadin-combo-box-data-provider-mixin.html b/src/vaadin-combo-box-data-provider-mixin.html
@@ -156,6 +156,10 @@
             if (Object.keys(this._pendingRequests).length === 0) {
               this.loading = false;
             }
+            if (page === 0 && this.__repositionOverlayDebouncer && items.length > (this.__maxRenderedItems || 0)) {
+              setTimeout(() => this.__repositionOverlayDebouncer.flush());
+              this.__maxRenderedItems = items.length;
+            }
           }
         };
         this._pendingRequests[page] = callback;

diff --git a/test/lazy-loading.html b/test/lazy-loading.html
@@ -258,6 +258,23 @@
               comboBox.open();
               expect(dp).to.be.calledOnce;
             });
+
+            it('should render all visible items after delayed response', done => {
+              const items = [...Array(10)].map((_, i) => 'item ' + i);
+              comboBox.dataProvider = (params, callback) => {
+                setTimeout(() => {
+                  callback(items, 10);
+                  setTimeout(() => {
+                    const renderedTexts = Array.from(comboBox.$.overlay._selector
+                      .querySelectorAll('vaadin-combo-box-item'))
+                      .map(i => i.shadowRoot.querySelector('#content').innerText);
+                    expect(renderedTexts).to.eql(items);
+                    done();
+                  });
+                }, 50);
+              };
+              comboBox.open();
+            });
           });
 
           describe('when selecting item', () => {