Merge from master

Author: mddragnev

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-row.component.html

@@ -25,14 +25,14 @@
         [attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
         [class.igx-grid__td--number]="col.dataType === 'number' || col.dataType === 'percent' || col.dataType === 'currency'"
         [class.igx-grid__td--bool]="col.dataType === 'boolean'"
-        [ngClass]="this.getCellClass(col) | igxCellStyleClasses:rowData[col.field]:rowData:col.field:viewIndex:grid.pipeTrigger"
-        [ngStyle]="col.cellStyles | igxCellStyles:rowData[col.field]:rowData:col.field:viewIndex:grid.pipeTrigger"
+        [ngClass]="this.getCellClass(col) | igxCellStyleClasses:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
+        [ngStyle]="col.cellStyles | igxCellStyles:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
         [editMode]="col.editable && this.grid.crudService.targetInEdit(index, col.index)" [column]="col"
         [formatter]="col.formatter" [intRow]="this" [active]="isCellActive(col.visibleIndex)"
-        [style.min-height.px]="cellHeight" [rowData]="rowData" [style.min-width]="col.width"
+        [style.min-height.px]="cellHeight" [rowData]="data" [style.min-width]="col.width"
         [style.max-width]="col.width" [style.flex-basis]="col.width" [width]="col.getCellWidth()"
         [visibleColumnIndex]="col.visibleIndex"
-        [value]="rowData | dataMapper:col.field:grid.pipeTrigger:rowData[col.field]:col.hasNestedPath"
+        [value]="data | dataMapper:col.field:grid.pipeTrigger:data[col.field]:col.hasNestedPath"
         [cellTemplate]="col.bodyTemplate" [lastSearchInfo]="grid.lastSearchInfo"
         [cellSelectionMode]="grid.cellSelection" [displayPinnedChip]="shouldDisplayPinnedChip(col.visibleIndex)">
     </igx-grid-cell>
@@ -56,14 +56,14 @@
         [class.igx-grid__td--edited]="rowID | transactionState:col.field:grid.rowEditable:grid.transactions:grid.pipeTrigger:grid.gridAPI.crudService.cell:grid.gridAPI.crudService.row"
         [attr.aria-describedby]="gridID + '_' + col.field | igxStringReplace:'.':'_'"
         [class.igx-grid__td--number]="col.dataType === 'number' || col.dataType === 'percent' || col.dataType === 'currency'"
-        [ngClass]="col.cellClasses | igxCellStyleClasses:rowData[col.field]:rowData:col.field:viewIndex:grid.pipeTrigger"
-        [ngStyle]="col.cellStyles | igxCellStyles:rowData[col.field]:rowData:col.field:viewIndex:grid.pipeTrigger"
+        [ngClass]="col.cellClasses | igxCellStyleClasses:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
+        [ngStyle]="col.cellStyles | igxCellStyles:data[col.field]:data:col.field:viewIndex:grid.pipeTrigger"
         [editMode]="col.editable && this.grid.crudService.targetInEdit(index, col.index)" [column]="col"
         [formatter]="col.formatter" [intRow]="this" [active]="isCellActive(col.visibleIndex)"
         [firstPinned]="col.isFirstPinned" [lastPinned]="col.isLastPinned" [style.min-height.px]="cellHeight"
-        [rowData]="rowData" [style.min-width]="col.width" [style.max-width]="col.width" [style.flex-basis]="col.width"
+        [rowData]="data" [style.min-width]="col.width" [style.max-width]="col.width" [style.flex-basis]="col.width"
         [style.left]="col.rightPinnedOffset" [width]="col.getCellWidth()" [visibleColumnIndex]="col.visibleIndex"
-        [value]="rowData | dataMapper:col.field:grid.pipeTrigger:rowData[col.field]:col.hasNestedPath"
+        [value]="data | dataMapper:col.field:grid.pipeTrigger:data[col.field]:col.hasNestedPath"
         [cellTemplate]="col.bodyTemplate" [lastSearchInfo]="grid.lastSearchInfo"
         [cellSelectionMode]="grid.cellSelection" [displayPinnedChip]="shouldDisplayPinnedChip(col.visibleIndex)">
     </igx-grid-cell>

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

@@ -63,7 +63,7 @@ export class IgxPivotRowComponent extends IgxRowDirective implements OnChanges {
     public get selected(): boolean {
         let isSelected = false;
         this.rowDimensionData.forEach(x => {
-            const key = this.getRowDimensionKey(x.column);
+            const key = this.getRowDimensionKey(x.column as IgxColumnComponent);
             if (this.selectionService.isPivotRowSelected(key)) {
                 isSelected = true;
             }