chore(*): additional fixes for expand/collapse.

Author: MKirova

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.pipes.ts

@@ -115,16 +115,19 @@ export class IgxPivotCellMergingPipe implements PipeTransform {
     ): any[] {
         if (collection.length === 0 || config.rows.length === 0) return collection;
         const data = collection ? cloneArray(collection, true) : [];
-        let groupData = [];
-        let prev;
-        let prevDim;
-        let prevDimRoot;
+
         const enabledRows = config.rows.filter(x => x.enabled);
+        let prev;
         for (let dim of enabledRows) {
+            let groupData = [];
+            let prevValue;
+            let prevDim;
+            let prevDimRoot;
             for (let rec of data) {
                 const dimData = PivotUtil.getDimensionLevel(dim, rec, pivotKeys);
                 const val = rec[dimData.dimension.memberName];
-                if (prev !== val && groupData.length > 0) {
+                const sameSiblingDim = prev ? rec[prev.memberName] : true;
+                if (prevValue !== val && groupData.length > 0 && sameSiblingDim) {
                     groupData.forEach((gr, ind) => {
                         if (ind === 0) {
                             gr[prevDim.dimension.memberName + pivotKeys.rowDimensionSeparator + 'first'] = true;
@@ -134,13 +137,15 @@ export class IgxPivotCellMergingPipe implements PipeTransform {
                         }
                         gr[prevDim.dimension.memberName + pivotKeys.rowDimensionSeparator + 'rowSpan'] = groupData.length;
                     });
+                    groupData[groupData.length - 1][prevDim.dimension.memberName + pivotKeys.rowDimensionSeparator + 'last'] = true;
                     groupData = [];
                 }
                 groupData.push(rec);
-                prev = val;
+                prevValue = val;
                 prevDim = dimData;
                 prevDimRoot = dim;
             }
+            prev = dim;
         }
         return data;
     }

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-row-dimension-content.component.ts

@@ -145,8 +145,12 @@ export class IgxPivotRowDimensionContentComponent extends IgxGridHeaderRowCompon
 
     protected extractFromDimensions() {
         const dimData = PivotUtil.getDimensionLevel(this.dimension, this.rowData, this.grid.pivotKeys);
-        const col = this.extractFromDimension(dimData, this.rowData);
         const prevDims = this.getPrevDims(this.dimension);
+        let lvl = 0;
+        prevDims.forEach(prev => {
+            lvl += prev.level;
+        });
+        const col = this.extractFromDimension(dimData, this.rowData, lvl);
         this.rowDimensionData = {
             column: col,
             dimension: dimData.dimension,
@@ -157,18 +161,18 @@ export class IgxPivotRowDimensionContentComponent extends IgxGridHeaderRowCompon
     protected getPrevDims(currDim) {
         const ind = this.grid.rowDimensions.indexOf(currDim);
         const prevDims = [];
-        for (let i = 0; i < ind - 1; i++) {
+        for (let i = 0; i < ind; i++) {
             const prevDim = this.grid.rowDimensions[i];
             const dimData = PivotUtil.getDimensionLevel(prevDim, this.rowData, this.grid.pivotKeys);
             prevDims.push(dimData.dimension);
         }
         return prevDims;
     }
 
-    protected extractFromDimension(dimData, rowData: any[]) {
+    protected extractFromDimension(dimData, rowData: any[], lvl) {
         const field = dimData.dimension.memberName;
         const header = rowData[field];
-        const col = this._createColComponent(field, header, dimData.dimension, dimData.level);
+        const col = this._createColComponent(field, header, dimData.dimension, lvl);
         return col;
     }