@vaadin/vaadin-grid 21.0.3 → 21.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/vaadin-grid",
-  "version": "21.0.3",
+  "version": "21.0.4",
   "description": "A free, flexible and high-quality Web Component for showing large amounts of tabular data",
   "main": "vaadin-grid.js",
   "module": "vaadin-grid.js",
@@ -32,23 +32,23 @@
   ],
   "dependencies": {
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/vaadin-checkbox": "^21.0.3",
-    "@vaadin/vaadin-element-mixin": "^21.0.3",
-    "@vaadin/vaadin-lumo-styles": "^21.0.3",
-    "@vaadin/vaadin-material-styles": "^21.0.3",
-    "@vaadin/vaadin-text-field": "^21.0.3",
-    "@vaadin/vaadin-themable-mixin": "^21.0.3",
-    "@vaadin/vaadin-virtual-list": "^21.0.3"
+    "@vaadin/vaadin-checkbox": "^21.0.4",
+    "@vaadin/vaadin-element-mixin": "^21.0.4",
+    "@vaadin/vaadin-lumo-styles": "^21.0.4",
+    "@vaadin/vaadin-material-styles": "^21.0.4",
+    "@vaadin/vaadin-text-field": "^21.0.4",
+    "@vaadin/vaadin-themable-mixin": "^21.0.4",
+    "@vaadin/vaadin-virtual-list": "^21.0.4"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.1.5",
     "@vaadin/testing-helpers": "^0.2.1",
-    "@vaadin/vaadin-template-renderer": "^21.0.3",
+    "@vaadin/vaadin-template-renderer": "^21.0.4",
     "lit": "^2.0.0",
     "sinon": "^9.2.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f2b0583ef776e6c52a74da7540b06bfd2d9adf1b"
+  "gitHead": "5bcf4893e594a60701c723f5c9157ad6ac694baf"
 }

package/src/vaadin-grid-drag-and-drop-mixin.js

@@ -85,7 +85,7 @@ export const DragAndDropMixin = (superClass) =>
     }
 
     static get observers() {
-      return ['_dragDropAccessChanged(rowsDraggable, dropMode, dragFilter, dropFilter)'];
+      return ['_dragDropAccessChanged(rowsDraggable, dropMode, dragFilter, dropFilter, loading)'];
     }
 
     /** @protected */
@@ -376,8 +376,9 @@ export const DragAndDropMixin = (superClass) =>
      * @protected
      */
     _filterDragAndDrop(row, model) {
-      const dragDisabled = !this.rowsDraggable || (this.dragFilter && !this.dragFilter(model));
-      const dropDisabled = !this.dropMode || (this.dropFilter && !this.dropFilter(model));
+      const loading = this.loading || row.hasAttribute('loading');
+      const dragDisabled = !this.rowsDraggable || loading || (this.dragFilter && !this.dragFilter(model));
+      const dropDisabled = !this.dropMode || loading || (this.dropFilter && !this.dropFilter(model));
 
       const draggableElements = Array.from(row.children).map((cell) => cell._content);
 

package/src/vaadin-grid-selection-column.js

@@ -184,7 +184,11 @@ class GridSelectionColumnElement extends GridColumnElement {
       return;
     }
 
-    this._grid.selectedItems = selectAll && Array.isArray(this._grid.items) ? this.__getRootLevelItems() : [];
+    if (selectAll && Array.isArray(this._grid.items)) {
+      this.__withFilteredItemsArray((items) => (this._grid.selectedItems = items));
+    } else {
+      this._grid.selectedItems = [];
+    }
   }
 
   /**
@@ -251,26 +255,22 @@ class GridSelectionColumnElement extends GridColumnElement {
     this.__previousActiveItem = activeItem;
   }
 
-  /** @private */
-  __getRootLevelItems() {
-    const rootCache = this._grid._cache;
-    return [...Array(rootCache.size)].map((_, idx) => rootCache.items[idx]);
-  }
-
   /** @private */
   __onSelectedItemsChanged() {
     this._selectAllChangeLock = true;
     if (Array.isArray(this._grid.items)) {
-      if (!this._grid.selectedItems.length) {
-        this.selectAll = false;
-        this.__indeterminate = false;
-      } else if (this.__arrayContains(this._grid.selectedItems, this.__getRootLevelItems())) {
-        this.selectAll = true;
-        this.__indeterminate = false;
-      } else {
-        this.selectAll = false;
-        this.__indeterminate = true;
-      }
+      this.__withFilteredItemsArray((items) => {
+        if (!this._grid.selectedItems.length) {
+          this.selectAll = false;
+          this.__indeterminate = false;
+        } else if (this.__arrayContains(this._grid.selectedItems, items)) {
+          this.selectAll = true;
+          this.__indeterminate = false;
+        } else {
+          this.selectAll = false;
+          this.__indeterminate = true;
+        }
+      });
     }
     this._selectAllChangeLock = false;
   }
@@ -279,6 +279,22 @@ class GridSelectionColumnElement extends GridColumnElement {
   __onDataProviderChanged() {
     this.__selectAllHidden = !Array.isArray(this._grid.items);
   }
+
+  /**
+   * Assuming the grid uses an items array data provider, fetches all the filtered items
+   * from the data provider and invokes the callback with the resulting array.
+   *
+   * @private
+   */
+  __withFilteredItemsArray(callback) {
+    const params = {
+      page: 0,
+      pageSize: Infinity,
+      sortOrders: [],
+      filters: this._grid._mapFilters()
+    };
+    this._grid.dataProvider(params, (items) => callback(items));
+  }
 }
 
 customElements.define(GridSelectionColumnElement.is, GridSelectionColumnElement);

package/src/vaadin-grid.js

@@ -317,7 +317,7 @@ class GridElement extends ElementMixin(
   }
 
   static get version() {
-    return '21.0.3';
+    return '21.0.4';
   }
 
   static get observers() {