Merge branch 'master' into mpopov/disabled-button

Author: zdrawku

projects/igniteui-angular/src/lib/grids/cell.component.ts

@@ -89,7 +89,7 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
      */
     @Input()
     public get row(): RowType {
-        return this.grid.createRow(this.intRow.index, this.intRow.rowData);
+        return this.grid.createRow(this.intRow.index);
     }
 
     /**
@@ -174,7 +174,7 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
          * N = number of visible cells in the grid, leading to massive performance degradation in large grids.
          */
         Object.defineProperty(ctx, 'cell', {
-            get: () => this.getCellType()
+            get: () => this.getCellType(true)
         });
         return ctx;
     }
@@ -1040,7 +1040,8 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
         this.nativeElement.removeEventListener('pointerup', this.pointerup);
     }
 
-    private getCellType(): CellType {
-        return new IgxGridCell(this.grid, this.intRow.index, this.column.field);
+    private getCellType(useRow?: boolean): CellType {
+        const rowID = useRow ? this.grid.createRow(this.intRow.index, this.intRow.rowData) : this.intRow.index;
+        return new IgxGridCell(this.grid, rowID, this.column.field);
     }
 }

projects/igniteui-angular/src/lib/grids/columns/column.component.ts

@@ -1209,6 +1209,8 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy {
      *
      */
     public get cells(): CellType[] {
+        // TODO calclulate index for remote data scenarios
+        // check indexes in this.dataRowList.first and this.dataRowList.last
         return this.grid.dataView
             .map((rec, index) => {
                 if (!this.grid.isGroupByRecord(rec) && !this.grid.isSummaryRow(rec)) {

projects/igniteui-angular/src/lib/grids/grid-public-cell.ts

@@ -53,7 +53,7 @@ export class IgxGridCell implements CellType {
 	 * @memberof IgxGridCell
 	 */
 	public get row(): RowType {
-		return this.grid.createRow(this._rowIndex);
+		return this._row || this.grid.createRow(this._rowIndex);
 	}
 
 	/**

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

@@ -1138,10 +1138,10 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
     /**
      * @hidden @internal
      */
-    public createRow(index: number): RowType {
+    public createRow(index: number, data?: any): RowType {
         let row: RowType;
 
-        const rec: any = this.dataView[index];
+        const rec: any = data ?? this.dataView[index];
 
         if (rec && this.isGroupByRecord(rec)) {
             row = new IgxGroupByRow(this, index, rec);

projects/igniteui-angular/src/lib/grids/grid/row-drag.directive.spec.ts

@@ -1116,12 +1116,12 @@ describe('Row Drag Tests #tGrid', () => {
 
         rowDragDirective.onPointerDown(pointerDownEvent);
         rowDragDirective.onPointerMove(pointerMoveEvent);
-        verifyRowDragStartEvent(dragGrid, dragGrid.getRowByIndex(rowToDrag.index),
+        verifyRowDragStartEvent(dragGrid, dragGrid.getRowByKey(rowToDrag.rowID),
             rowToDrag.nativeElement, rowDragDirective, 1);
         rowDragDirective.onPointerMove(pointerMoveToDropEvent);
         rowDragDirective.onPointerUp(pointerUpEvent);
         fixture.detectChanges();
-        verifyRowDragEndEvent(dragGrid, dragGrid.getRowByIndex(rowToDrag.index),
+        verifyRowDragEndEvent(dragGrid, dragGrid.getRowByKey(rowToDrag.rowID),
             rowToDrag.nativeElement, rowDragDirective, false, 1);
 
         // second level row
@@ -1133,11 +1133,11 @@ describe('Row Drag Tests #tGrid', () => {
 
         rowDragDirective.onPointerDown(pointerDownEvent);
         rowDragDirective.onPointerMove(pointerMoveEvent);
-        verifyRowDragStartEvent(dragGrid, dragGrid.getRowByIndex(rowToDrag.index), rowToDrag.nativeElement, rowDragDirective, 2);
+        verifyRowDragStartEvent(dragGrid, dragGrid.getRowByKey(rowToDrag.rowID), rowToDrag.nativeElement, rowDragDirective, 2);
         rowDragDirective.onPointerMove(pointerMoveToDropEvent);
         rowDragDirective.onPointerUp(pointerUpEvent);
         fixture.detectChanges();
-        verifyRowDragEndEvent(dragGrid, dragGrid.getRowByIndex(rowToDrag.index), rowToDrag.nativeElement, rowDragDirective, false, 2);
+        verifyRowDragEndEvent(dragGrid, dragGrid.getRowByKey(rowToDrag.rowID), rowToDrag.nativeElement, rowDragDirective, false, 2);
 
         // third level row
         dragIndicatorElement = dragIndicatorElements[3].nativeElement;
@@ -1148,12 +1148,12 @@ describe('Row Drag Tests #tGrid', () => {
 
         rowDragDirective.onPointerDown(pointerDownEvent);
         rowDragDirective.onPointerMove(pointerMoveEvent);
-        verifyRowDragStartEvent(dragGrid, dragGrid.getRowByIndex(rowToDrag.index),
+        verifyRowDragStartEvent(dragGrid, dragGrid.getRowByKey(rowToDrag.rowID),
             rowToDrag.nativeElement, rowDragDirective, 3);
         rowDragDirective.onPointerMove(pointerMoveToDropEvent);
         rowDragDirective.onPointerUp(pointerUpEvent);
         fixture.detectChanges();
-        verifyRowDragEndEvent(dragGrid, dragGrid.getRowByIndex(rowToDrag.index),
+        verifyRowDragEndEvent(dragGrid, dragGrid.getRowByKey(rowToDrag.rowID),
             rowToDrag.nativeElement, rowDragDirective, false, 3);
     });
 });

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

@@ -477,8 +477,6 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
         return new IgxHierarchicalGridRow(this, index, rec);
     }
 
-    // TODO cell
-    // isHier .childGridsData?
     /**
      * @hidden @internal
      */
@@ -827,9 +825,9 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
     /**
      * @hidden
      */
-    public createRow(index: number): RowType {
+    public createRow(index: number, data?: any): RowType {
         let row: RowType;
-        const rec: any = this.dataView[index];
+        const rec: any = data ?? this.dataView[index];
 
         if (!row && rec && !rec.childGridsData) {
             row = new IgxHierarchicalGridRow(this, index, rec);

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

@@ -825,19 +825,19 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
     /**
      * @hidden
      */
-    public createRow(index: number): RowType {
+    public createRow(index: number, data?: any): RowType {
         let row: RowType;
-        const rec: any = this.dataView[index];
+        const rec: any = data ?? this.dataView[index];
 
         if (this.isSummaryRow(rec)) {
             row = new IgxSummaryRow(this, index, rec.summaries, GridInstanceType.TreeGrid);
         }
 
         if (!row && rec) {
             const isTreeRow = this.isTreeRow(rec);
-            const data = isTreeRow ? rec.data : rec;
+            const dataRec = isTreeRow ? rec.data : rec;
             const treeRow = isTreeRow ? rec : undefined;
-            row = new IgxTreeGridRow(this, index, data, treeRow);
+            row = new IgxTreeGridRow(this, index, dataRec, treeRow);
         }
 
         return row;