@vaadin/grid 24.2.0-dev.538d07bdf → 24.2.0-dev.e9803eea7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/grid",
-  "version": "24.2.0-dev.538d07bdf",
+  "version": "24.2.0-dev.e9803eea7",
   "publishConfig": {
     "access": "public"
   },
@@ -46,14 +46,14 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "24.2.0-dev.538d07bdf",
-    "@vaadin/checkbox": "24.2.0-dev.538d07bdf",
-    "@vaadin/component-base": "24.2.0-dev.538d07bdf",
-    "@vaadin/lit-renderer": "24.2.0-dev.538d07bdf",
-    "@vaadin/text-field": "24.2.0-dev.538d07bdf",
-    "@vaadin/vaadin-lumo-styles": "24.2.0-dev.538d07bdf",
-    "@vaadin/vaadin-material-styles": "24.2.0-dev.538d07bdf",
-    "@vaadin/vaadin-themable-mixin": "24.2.0-dev.538d07bdf"
+    "@vaadin/a11y-base": "24.2.0-dev.e9803eea7",
+    "@vaadin/checkbox": "24.2.0-dev.e9803eea7",
+    "@vaadin/component-base": "24.2.0-dev.e9803eea7",
+    "@vaadin/lit-renderer": "24.2.0-dev.e9803eea7",
+    "@vaadin/text-field": "24.2.0-dev.e9803eea7",
+    "@vaadin/vaadin-lumo-styles": "24.2.0-dev.e9803eea7",
+    "@vaadin/vaadin-material-styles": "24.2.0-dev.e9803eea7",
+    "@vaadin/vaadin-themable-mixin": "24.2.0-dev.e9803eea7"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
@@ -65,5 +65,5 @@
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "86c2fd5f37cf1240af98f7c7d752518c8d701db2"
+  "gitHead": "a065b79b9d5a189e457fab312cc8aff0d7f2f910"
 }

package/src/vaadin-grid-data-provider-mixin.js

@@ -180,7 +180,7 @@ export const DataProviderMixin = (superClass) =>
         this.__updateLoading(el, false);
         this._updateItem(el, item);
         if (this._isExpanded(item)) {
-          this._dataProviderController.ensureFlatIndexChildrenLoaded(index);
+          this._dataProviderController.ensureFlatIndexHierarchy(index);
         }
       } else {
         this.__updateLoading(el, true);
@@ -282,7 +282,7 @@ export const DataProviderMixin = (superClass) =>
 
       // After updating the cache, check if some of the expanded items should have sub-caches loaded
       this._getRenderedRows().forEach((row) => {
-        this._dataProviderController.ensureFlatIndexChildrenLoaded(row.index);
+        this._dataProviderController.ensureFlatIndexHierarchy(row.index);
       });
 
       this._hasData = true;
@@ -305,7 +305,7 @@ export const DataProviderMixin = (superClass) =>
       });
 
       // If the grid is not loading anything, flush the debouncer immediately
-      if (!this._dataProviderController.isLoading) {
+      if (!this._dataProviderController.isLoading()) {
         this._debouncerApplyCachedData.flush();
       }
     }
@@ -317,16 +317,18 @@ export const DataProviderMixin = (superClass) =>
       this._dataProviderController.clearCache();
       this._hasData = false;
       this.__updateVisibleRows();
-      this._ensureFirstPageLoaded();
+
+      if (!this._effectiveSize) {
+        this._dataProviderController.loadFirstPage();
+      }
     }
 
     /** @private */
     _pageSizeChanged(pageSize, oldPageSize) {
+      this._dataProviderController.setPageSize(pageSize);
+
       if (oldPageSize !== undefined && pageSize !== oldPageSize) {
-        this._dataProviderController.setPageSize(pageSize);
-        this._hasData = false;
-        this.__updateVisibleRows();
-        this._ensureFirstPageLoaded();
+        this.clearCache();
       }
     }
 
@@ -347,8 +349,7 @@ export const DataProviderMixin = (superClass) =>
       this._dataProviderController.setDataProvider(dataProvider ? dataProvider.bind(this) : null);
 
       if (oldDataProvider !== undefined) {
-        this._hasData = false;
-        this.__updateVisibleRows();
+        this.clearCache();
       }
 
       this._ensureFirstPageLoaded();
@@ -365,7 +366,7 @@ export const DataProviderMixin = (superClass) =>
       if (!this._hasData) {
         // Load data before adding rows to make sure they have content when
         // rendered for the first time.
-        this._dataProviderController.ensureFirstPageLoaded();
+        this._dataProviderController.loadFirstPage();
       }
     }
 
@@ -419,7 +420,7 @@ export const DataProviderMixin = (superClass) =>
         this._scrollToFlatIndex(targetIndex);
       }
 
-      if (this._dataProviderController.isLoading || !this.clientHeight) {
+      if (this._dataProviderController.isLoading() || !this.clientHeight) {
         this.__pendingScrollToIndexes = indexes;
       }
     }

package/src/vaadin-grid.js

@@ -738,7 +738,7 @@ class Grid extends ElementMixin(
     if (!this._columnTree) {
       return; // No columns
     }
-    if (isElementHidden(this) || this._dataProviderController.isLoading) {
+    if (isElementHidden(this) || this._dataProviderController.isLoading()) {
       this.__pendingRecalculateColumnWidths = true;
       return;
     }
@@ -751,7 +751,7 @@ class Grid extends ElementMixin(
     if (
       this.__pendingRecalculateColumnWidths &&
       !isElementHidden(this) &&
-      !this._dataProviderController.isLoading &&
+      !this._dataProviderController.isLoading() &&
       this.__hasRowsWithClientHeight()
     ) {
       this.__pendingRecalculateColumnWidths = false;