revert some changes, add more tests

vaadin · Apr 19, 2024 · 73cc8c8 · 73cc8c8
1 parent 912b959
commit 73cc8c8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/packages/combo-box/src/vaadin-combo-box-data-provider-mixin.js b/packages/combo-box/src/vaadin-combo-box-data-provider-mixin.js
@@ -56,12 +56,6 @@ export const ComboBoxDataProviderMixin = (superClass) =>
           sync: true,
         },
 
-        /** @private */
-        _hasData: {
-          type: Boolean,
-          value: false,
-        },
-
         /** @private */
         __previousDataProviderFilter: {
           type: String,
@@ -143,7 +137,8 @@ export const ComboBoxDataProviderMixin = (superClass) =>
         return;
       }
 
-      if (opened && !this._hasData) {
+      if (opened && this._forceNextRequest) {
+        this._forceNextRequest = false;
         this._dataProviderController.loadFirstPage();
       }
     }
@@ -155,8 +150,6 @@ export const ComboBoxDataProviderMixin = (superClass) =>
 
     /** @private */
     _onDataProviderPageLoaded() {
-      this._hasData = true;
-
       this.requestContentUpdate();
 
       if (!this.opened && !this._isInputFocused()) {
@@ -174,12 +167,13 @@ export const ComboBoxDataProviderMixin = (superClass) =>
 
       this._dataProviderController.clearCache();
 
-      this._hasData = false;
-
       this.requestContentUpdate();
 
       if (this._shouldFetchData()) {
         this._dataProviderController.loadFirstPage();
+        this._forceNextRequest = false;
+      } else {
+        this._forceNextRequest = true;
       }
     }
 

diff --git a/packages/combo-box/test/lazy-loading.common.js b/packages/combo-box/test/lazy-loading.common.js
@@ -576,12 +576,23 @@ describe('lazy loading', () => {
         expect(comboBox.size).to.be.undefined;
       });
 
+      it('should not have default value after setting dataProvider', () => {
+        comboBox.dataProvider = spyDataProvider;
+        expect(comboBox.size).to.be.undefined;
+      });
+
       it('should be set from dataProvider callback', () => {
         comboBox.opened = true;
         comboBox.dataProvider = spyDataProvider;
         expect(comboBox.size).to.equal(SIZE);
       });
 
+      it('should be set to 0 when dataProvider returns size 0', () => {
+        comboBox.opened = true;
+        comboBox.dataProvider = (params, callback) => callback([], 0);
+        expect(comboBox.size).to.equal(0);
+      });
+
       it('should remove extra filteredItems when decreasing size', () => {
         comboBox.dataProvider = (params, callback) => callback(['foo', 'bar'], 2);
         comboBox.open();