fix: allow to set virtualizer items when not opened (#7325)

vaadin · Apr 12, 2024 · 9506724 · 9506724
1 parent 2efeeeb
commit 9506724
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 11 deletions.
diff --git a/packages/combo-box/src/vaadin-combo-box-scroller-mixin.js b/packages/combo-box/src/vaadin-combo-box-scroller-mixin.js
@@ -148,10 +148,6 @@ export const ComboBoxScrollerMixin = (superClass) =>
         return;
       }
 
-      if (!this.__virtualizer) {
-        this.__initVirtualizer();
-      }
-
       this.__virtualizer.update();
     }
 
@@ -226,13 +222,8 @@ export const ComboBoxScrollerMixin = (superClass) =>
 
     /** @private */
     __itemsChanged(items) {
-      if (items && this.opened) {
-        if (!this.__virtualizer) {
-          this.__initVirtualizer();
-        }
-
-        this.__virtualizer.size = items.length;
-        this.__virtualizer.flush();
+      if (items && this.__virtualizer) {
+        this.__setVirtualizerItems(items);
         this.requestContentUpdate();
       }
     }
@@ -245,10 +236,24 @@ export const ComboBoxScrollerMixin = (superClass) =>
     /** @private */
     __openedChanged(opened) {
       if (opened) {
+        if (!this.__virtualizer) {
+          this.__initVirtualizer();
+
+          if (this.items) {
+            this.__setVirtualizerItems(this.items);
+          }
+        }
+
         this.requestContentUpdate();
       }
     }
 
+    /** @private */
+    __setVirtualizerItems(items) {
+      this.__virtualizer.size = items.length;
+      this.__virtualizer.flush();
+    }
+
     /** @private */
     __selectedItemChanged() {
       this.requestContentUpdate();

diff --git a/packages/combo-box/test/lazy-loading.common.js b/packages/combo-box/test/lazy-loading.common.js
@@ -1009,6 +1009,10 @@ describe('lazy loading', () => {
           const pages = spyDataProvider.getCalls().map((call) => call.args[0].page);
           expect(pages).to.contain(1);
         });
+
+        it('should reset visible items count to 0', () => {
+          expect(getVisibleItemsCount(comboBox)).to.equal(0);
+        });
       });
 
       describe('using data provider, lost focus before data is returned', () => {