Merge 4bcb678 into febfcf6

vaadin · Oct 15, 2018 · 7d8562b · 7d8562b
2 parents febfcf6 + 4bcb678
commit 7d8562b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/vaadin-combo-box-data-provider-mixin.html b/src/vaadin-combo-box-data-provider-mixin.html
@@ -175,12 +175,13 @@
       }
     }
 
-    _sizeChanged(size) {
-      const filteredItems = this.filteredItems || [];
-      filteredItems.length = size || 0;
-      this.filteredItems = new Array(...filteredItems).map(item => {
-        return item !== undefined ? item : new Vaadin.ComboBoxPlaceholder();
-      });
+    _sizeChanged(size = 0) {
+      this.filteredItems = Array.from(new Array(size))
+        .map((_, index) => {
+          return (this.filteredItems && this.filteredItems[index] !== undefined)
+            ? this.filteredItems[index]
+            : new Vaadin.ComboBoxPlaceholder();
+        });
     }
 
     _pageSizeChanged(pageSize, oldPageSize) {

diff --git a/test/lazy-loading.html b/test/lazy-loading.html
@@ -88,6 +88,10 @@
             expect(spyDataProvider).to.be.calledOnce;
           });
 
+          it('should not throw with large size', () => {
+            expect(() => comboBox.size = 500000).not.to.throw(Error);
+          });
+
           it('should throw if set after items', () => {
             comboBox.items = ['foo'];
             function setDataProvider() {