@vaadin/grid 24.4.0-alpha1 → 24.4.0-dev.b3e1d14600

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/grid",
-  "version": "24.4.0-alpha1",
+  "version": "24.4.0-dev.b3e1d14600",
   "publishConfig": {
     "access": "public"
   },
@@ -46,24 +46,24 @@
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
     "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "24.4.0-alpha1",
-    "@vaadin/checkbox": "24.4.0-alpha1",
-    "@vaadin/component-base": "24.4.0-alpha1",
-    "@vaadin/lit-renderer": "24.4.0-alpha1",
-    "@vaadin/text-field": "24.4.0-alpha1",
-    "@vaadin/vaadin-lumo-styles": "24.4.0-alpha1",
-    "@vaadin/vaadin-material-styles": "24.4.0-alpha1",
-    "@vaadin/vaadin-themable-mixin": "24.4.0-alpha1"
+    "@vaadin/a11y-base": "24.4.0-dev.b3e1d14600",
+    "@vaadin/checkbox": "24.4.0-dev.b3e1d14600",
+    "@vaadin/component-base": "24.4.0-dev.b3e1d14600",
+    "@vaadin/lit-renderer": "24.4.0-dev.b3e1d14600",
+    "@vaadin/text-field": "24.4.0-dev.b3e1d14600",
+    "@vaadin/vaadin-lumo-styles": "24.4.0-dev.b3e1d14600",
+    "@vaadin/vaadin-material-styles": "24.4.0-dev.b3e1d14600",
+    "@vaadin/vaadin-themable-mixin": "24.4.0-dev.b3e1d14600",
+    "lit": "^3.0.0"
   },
   "devDependencies": {
     "@esm-bundle/chai": "^4.3.4",
     "@vaadin/testing-helpers": "^0.6.0",
-    "lit": "^3.0.0",
     "sinon": "^13.0.2"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "3e2ed41c99d618ff7def2734fd863c21c85775a3"
+  "gitHead": "502d4f5b03f770a83d270d98078cde230254dd0e"
 }

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

@@ -25,7 +25,7 @@ export const ArrayDataProviderMixin = (superClass) =>
     }
 
     static get observers() {
-      return ['__dataProviderOrItemsChanged(dataProvider, items, isAttached, _filters, _sorters, items.*)'];
+      return ['__dataProviderOrItemsChanged(dataProvider, items, isAttached, items.*)'];
     }
 
     /** @private */
@@ -37,6 +37,18 @@ export const ArrayDataProviderMixin = (superClass) =>
       this.dataProvider = arrayDataProvider;
     }
 
+    /**
+     * @override
+     * @protected
+     */
+    _onDataProviderPageReceived() {
+      super._onDataProviderPageReceived();
+
+      if (this._arrayDataProvider) {
+        this.size = this._flatSize;
+      }
+    }
+
     /** @private */
     __dataProviderOrItemsChanged(dataProvider, items, isAttached) {
       if (!isAttached) {
@@ -59,7 +71,6 @@ export const ArrayDataProviderMixin = (superClass) =>
         } else if (this._arrayDataProvider.__items === items) {
           // The items array was modified
           this.clearCache();
-          this.size = this._flatSize;
         } else {
           // The items array was replaced
           this.__setArrayDataProvider(items);

package/src/vaadin-grid-selection-column-base-mixin.d.ts

@@ -19,8 +19,6 @@ export declare function GridSelectionColumnBaseMixin<TItem, T extends Constructo
  * Web component-specific selection state updates must be implemented in the
  * `<vaadin-grid-selection-column>` itself, by overriding the protected methods
  * provided by this mixin.
- *
- * @polymerMixin
  */
 export declare class GridSelectionColumnBaseMixinClass<TItem> {
   /**

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

@@ -7,6 +7,7 @@ import { GridSelectionColumnBaseMixin } from './vaadin-grid-selection-column-bas
 
 /**
  * @polymerMixin
+ * @mixes GridSelectionColumnBaseMixin
  */
 export const GridSelectionColumnMixin = (superClass) =>
   class extends GridSelectionColumnBaseMixin(superClass) {

package/src/vaadin-grid-sort-mixin.js

@@ -104,7 +104,7 @@ export const SortMixin = (superClass) =>
         return;
       }
 
-      this._sorters = this._sorters.filter((sorter) => sortersToRemove.indexOf(sorter) < 0);
+      this._sorters = this._sorters.filter((sorter) => !sortersToRemove.includes(sorter));
       this.__applySorters();
     }
 
@@ -122,44 +122,27 @@ export const SortMixin = (superClass) =>
       }
     }
 
-    /** @private */
-    __appendSorter(sorter) {
-      if (!sorter.direction) {
-        this._removeArrayItem(this._sorters, sorter);
-      } else if (!this._sorters.includes(sorter)) {
-        this._sorters.push(sorter);
-      }
-    }
-
-    /** @private */
-    __prependSorter(sorter) {
-      this._removeArrayItem(this._sorters, sorter);
-      if (sorter.direction) {
-        this._sorters.unshift(sorter);
-      }
-    }
-
     /** @private */
     __updateSorter(sorter, shiftClick, fromSorterClick) {
-      if (!sorter.direction && this._sorters.indexOf(sorter) === -1) {
+      if (!sorter.direction && !this._sorters.includes(sorter)) {
         return;
       }
 
       sorter._order = null;
 
+      const restSorters = this._sorters.filter((s) => s !== sorter);
       if (
         (this.multiSort && (!this.multiSortOnShiftClick || !fromSorterClick)) ||
         (this.multiSortOnShiftClick && shiftClick)
       ) {
         if (this.multiSortPriority === 'append') {
-          this.__appendSorter(sorter);
+          this._sorters = [...restSorters, sorter];
         } else {
-          this.__prependSorter(sorter);
+          this._sorters = [sorter, ...restSorters];
         }
       } else if (sorter.direction || this.multiSortOnShiftClick) {
-        const otherSorters = this._sorters.filter((s) => s !== sorter);
         this._sorters = sorter.direction ? [sorter] : [];
-        otherSorters.forEach((sorter) => {
+        restSorters.forEach((sorter) => {
           sorter._order = null;
           sorter.direction = null;
         });
@@ -204,12 +187,4 @@ export const SortMixin = (superClass) =>
         };
       });
     }
-
-    /** @private */
-    _removeArrayItem(array, item) {
-      const index = array.indexOf(item);
-      if (index > -1) {
-        array.splice(index, 1);
-      }
-    }
   };

package/src/vaadin-grid-styling-mixin.d.ts

@@ -10,7 +10,7 @@ import type { GridColumn } from './vaadin-grid-column.js';
 export type GridCellPartNameGenerator<TItem> = (column: GridColumn<TItem>, model: GridItemModel<TItem>) => string;
 
 /**
- * @deprecated Use `GridPartCellGenerator` type and `cellPartNameGenerator` API instead.
+ * @deprecated Use `GridCellPartNameGenerator` type and `cellPartNameGenerator` API instead.
  */
 export type GridCellClassNameGenerator<TItem> = GridCellPartNameGenerator<TItem>;
 

package/theme/lumo/vaadin-grid-styles.js

@@ -213,6 +213,11 @@ registerStyles(
       border-top: 0;
     }
 
+    /* Hide header row top border if previous row is hidden */
+    [part~='row'][hidden] + [part~='row'] [part~='header-cell'] {
+      border-top: 0;
+    }
+
     [part~='row']:last-child [part~='header-cell'] {
       border-bottom: var(--_lumo-grid-border-width) solid transparent;
     }