@vaadin/vaadin-grid 5.9.6 → 5.9.7

package/package.json

@@ -15,7 +15,7 @@
   "repository": "vaadin/vaadin-grid",
   "homepage": "https://vaadin.com/components",
   "name": "@vaadin/vaadin-grid",
-  "version": "5.9.6",
+  "version": "5.9.7",
   "main": "vaadin-grid.js",
   "author": "Vaadin Ltd",
   "license": "Apache-2.0",

package/src/vaadin-grid-column-reordering-mixin.d.ts

@@ -36,7 +36,12 @@ interface ColumnReorderingMixin {
    */
   columnReorderingAllowed: boolean;
   ready(): void;
-  _getColumnsInOrder(): GridColumnElement[];
+
+  /**
+   * Returns the columns (or column groups) on the specified header level in visual order.
+   * By default, the bottom level is used.
+   */
+  _getColumnsInOrder(headerLevel: any): GridColumnElement[];
   _cellFromPoint(x: number, y: number): HTMLElement|null|undefined;
   _updateGhostPosition(eventClientX: number, eventClientY: number): void;
   _getInnerText(e: Element): string;

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

@@ -165,7 +165,23 @@ export const ColumnReorderingMixin = superClass => class ColumnReorderingMixin e
     const targetColumn = this._getTargetColumn(targetCell, this._draggedColumn);
     if (this._isSwapAllowed(this._draggedColumn, targetColumn) &&
       this._isSwappableByPosition(targetColumn, e.detail.x)) {
-      this._swapColumnOrders(this._draggedColumn, targetColumn);
+      // Get the header level of the target column (and the dragged column)
+      const columnTreeLevel = this.__getColumnTreeLevel(targetColumn);
+      // Get the columns on that level in visual order
+      const levelColumnsInOrder = this._getColumnsInOrder(columnTreeLevel);
+
+      // Index of the column being dragged
+      const startIndex = levelColumnsInOrder.indexOf(this._draggedColumn);
+      // Index of the column being dragged over
+      const endIndex = levelColumnsInOrder.indexOf(targetColumn);
+
+      // Direction of iteration
+      const direction = startIndex < endIndex ? 1 : -1;
+
+      // Iteratively swap all the columns from the dragged column to the target column
+      for (let i = startIndex; i !== endIndex; i += direction) {
+        this._swapColumnOrders(this._draggedColumn, levelColumnsInOrder[i + direction]);
+      }
     }
 
     this._updateGhostPosition(e.detail.x, this._touchDevice ? e.detail.y - 50 : e.detail.y);
@@ -192,13 +208,17 @@ export const ColumnReorderingMixin = superClass => class ColumnReorderingMixin e
   }
 
   /**
+   * Returns the columns (or column groups) on the specified header level in visual order.
+   * By default, the bottom level is used.
+   *
    * @return {!Array<!GridColumnElement>}
    * @protected
    */
-  _getColumnsInOrder() {
-    return this._columnTree.slice(0).pop()
-      .filter(c => !c.hidden)
-      .sort((b, a) => (b._order - a._order));
+  _getColumnsInOrder(headerLevel) {
+    if (!headerLevel && headerLevel !== 0) {
+      headerLevel = this._columnTree.length - 1;
+    }
+    return this._columnTree[headerLevel].filter((c) => !c.hidden).sort((b, a) => b._order - a._order);
   }
 
   /**
@@ -401,6 +421,16 @@ export const ColumnReorderingMixin = superClass => class ColumnReorderingMixin e
     }
   }
 
+  /** @private */
+  __getColumnTreeLevel(column) {
+    for (let level = 0; level < this._columnTree.length; level++) {
+      if (this._columnTree[level].indexOf(column) >= 0) {
+        return level;
+      }
+    }
+    return -1;
+  }
+
   /**
    * Fired when the columns in the grid are reordered.
    *

package/src/vaadin-grid-scroller.js

@@ -277,6 +277,27 @@ class GridScrollerElement extends PolymerIronList {
   _scrollHandler() {
     const delta = this.$.table.scrollTop - this._scrollPosition;
     this._accessIronListAPI(super._scrollHandler);
+
+    if (this._physicalCount !== 0) {
+      const isScrollingDown = delta >= 0;
+      const reusables = this._getReusables(!isScrollingDown);
+
+      if (reusables.indexes.length) {
+        // After running super._scrollHandler, fix internal properties to workaround an iron-list issue.
+        // See https://github.com/vaadin/web-components/issues/1691
+        this._physicalTop = reusables.physicalTop;
+
+        if (isScrollingDown) {
+          this._virtualStart -= reusables.indexes.length;
+          this._physicalStart -= reusables.indexes.length;
+        } else {
+          this._virtualStart += reusables.indexes.length;
+          this._physicalStart += reusables.indexes.length;
+        }
+        this._update(reusables.indexes, !isScrollingDown);
+      }
+    }
+
     const oldOffset = this._vidxOffset;
     if (this._accessIronListAPI(() => this._maxScrollTop) && this._virtualCount < this._effectiveSize) {
       this._adjustVirtualIndexOffset(delta);

package/src/vaadin-grid.js

@@ -325,7 +325,7 @@ class GridElement extends
   }
 
   static get version() {
-    return '5.9.6';
+    return '5.9.7';
   }
 
   static get observers() {