refactor: cleanup selection column changes

Author: tomivirkki

packages/vaadin-grid/src/vaadin-grid-array-data-provider-mixin.js

@@ -26,6 +26,7 @@ export const ArrayDataProviderMixin = (superClass) =>
       return ['__dataProviderOrItemsChanged(dataProvider, items, isAttached, items.*, _filters, _sorters)'];
     }
 
+    /** @private */
     __setArrayDataProvider(items) {
       const arrayDataProvider = createArrayDataProvider(this.items, {});
       arrayDataProvider.__items = items;
@@ -36,13 +37,15 @@ export const ArrayDataProviderMixin = (superClass) =>
       });
     }
 
+    /** @private */
     __unsetArrayDataProvider() {
       this.setProperties({
         _arrayDataProvider: undefined,
         items: undefined // TODO: selection column just checks for grid.items in some logic. Add a test which adds items and then a custom dp.
       });
     }
 
+    /** @private */
     __dataProviderOrItemsChanged(dataProvider, items, isAttached) {
       if (!isAttached) {
         return;

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

@@ -178,11 +178,7 @@ class GridSelectionColumnElement extends GridColumnElement {
       return;
     }
 
-    if (this.__gridUsesArrayDataProvider() && selectAll) {
-      this.__withFilteredItemsArray((items) => (this._grid.selectedItems = items));
-    } else {
-      this._grid.selectedItems = [];
-    }
+    this._grid.selectedItems = selectAll && Array.isArray(this._grid.items) ? this.__getRootLevelItems() : [];
   }
 
   /**
@@ -249,54 +245,33 @@ 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 (this.__gridUsesArrayDataProvider()) {
-      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;
-        }
-      });
+    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._selectAllChangeLock = false;
   }
 
   /** @private */
   __onDataProviderChanged() {
-    this.__selectAllHidden = !this.__gridUsesArrayDataProvider();
-  }
-
-  /**
-   * 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));
-  }
-
-  /**
-   * Checks whether the grid's dataProvider is an array data provider
-   *
-   * @private
-   **/
-  __gridUsesArrayDataProvider() {
-    return this._grid._arrayDataProvider;
+    this.__selectAllHidden = !Array.isArray(this._grid.items);
   }
 }