Merge branch '15.1.x' into bpachilova/fix-13392-15.1.x

ddaribo · web-flow · commit 3362901fb1fd · 2023-09-11T09:16:54.000+03:00
diff --git a/projects/igniteui-angular/src/lib/grids/cell.component.ts b/projects/igniteui-angular/src/lib/grids/cell.component.ts
@@ -1198,6 +1198,6 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy, CellT
 
     private getCellType(useRow?: boolean): CellType {
         const rowID = useRow ? this.grid.createRow(this.intRow.index, this.intRow.data) : this.intRow.index;
-        return new IgxGridCell(this.grid, rowID, this.column.field);
+        return new IgxGridCell(this.grid, rowID, this.column);
     }
 }
diff --git a/projects/igniteui-angular/src/lib/grids/columns/column.component.ts b/projects/igniteui-angular/src/lib/grids/columns/column.component.ts
@@ -1365,7 +1365,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
             .map((rec, index) => {
                 if (!this.grid.isGroupByRecord(rec) && !this.grid.isSummaryRow(rec)) {
                     this.grid.pagingMode === 1 && this.grid.page !== 0 ? index = index + this.grid.perPage * this.grid.page : index = this.grid.dataRowList.first.index + index;
-                    const cell = new IgxGridCell(this.grid as any, index, this.field);
+                    const cell = new IgxGridCell(this.grid as any, index, this);
                     return cell;
                 }
             }).filter(cell => cell);
diff --git a/projects/igniteui-angular/src/lib/grids/grid-public-cell.ts b/projects/igniteui-angular/src/lib/grids/grid-public-cell.ts
@@ -21,19 +21,15 @@ export class IgxGridCell implements CellType {
     constructor(
         grid: GridType,
         row: number | RowType,
-        column: string | ColumnType) {
+        column: ColumnType) {
         this.grid = grid;
         if (typeof row === 'number') {
             this._rowIndex = row;
         } else {
             this._row = row;
             this._rowIndex = row.index;
         }
-        if (typeof column === 'string') {
-            this._columnField = column;
-        } else {
-            this._column = column;
-        }
+        this._column = column;
     }
 
     /**
@@ -57,7 +53,7 @@ export class IgxGridCell implements CellType {
      * @memberof IgxGridCell
      */
     public get column(): ColumnType {
-        return this._column || this.grid.getColumnByName(this._columnField);
+        return this._column;
     }
 
     /**
diff --git a/projects/igniteui-angular/src/lib/grids/grid-public-row.ts b/projects/igniteui-angular/src/lib/grids/grid-public-row.ts
@@ -193,7 +193,7 @@ abstract class BaseRow implements RowType {
     public get cells(): CellType[] {
         const res: CellType[] = [];
         this.grid.columns.forEach(col => {
-            const cell: CellType = new IgxGridCell(this.grid, this.index, col.field);
+            const cell: CellType = new IgxGridCell(this.grid, this.index, col);
             res.push(cell);
         });
         return res;
@@ -529,7 +529,7 @@ export class IgxHierarchicalGridRow extends BaseRow implements RowType {
     public override get cells(): CellType[] {
         const res: CellType[] = [];
         this.grid.columns.forEach(col => {
-            const cell: CellType = new IgxGridCell(this.grid, this.index, col.field);
+            const cell: CellType = new IgxGridCell(this.grid, this.index, col);
             res.push(cell);
         });
         return res;
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.component.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.component.ts
@@ -533,7 +533,7 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
         const row = this.getRowByIndex(rowIndex);
         const column = this._columns.find((col) => col.visibleIndex === index);
         if (row && row instanceof IgxGridRow && !row.data?.detailsData && column) {
-            return new IgxGridCell(this, rowIndex, column.field);
+            return new IgxGridCell(this, rowIndex, column);
         }
     }
 
@@ -1174,7 +1174,7 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
             if (this.pagingMode === 1 && this.page !== 0) {
                 row.index = rowIndex + this.perPage * this.page;
             }
-            return new IgxGridCell(this, row.index, columnField);
+            return new IgxGridCell(this, row.index, column);
         }
     }
 
@@ -1194,7 +1194,7 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
         const row = this.getRowByKey(rowSelector);
         const column = this._columns.find((col) => col.field === columnField);
         if (row && column) {
-            return new IgxGridCell(this, row.index, columnField);
+            return new IgxGridCell(this, row.index, column);
         }
     }
 
diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.ts b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.ts
@@ -477,7 +477,7 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
         const row = this.getRowByIndex(rowIndex);
         const column = this.columns.find((col) => col.visibleIndex === index);
         if (row && row instanceof IgxHierarchicalGridRow && column) {
-            return new IgxGridCell(this, rowIndex, column.field);
+            return new IgxGridCell(this, rowIndex, column);
         }
     }
 
@@ -724,7 +724,7 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
         const row = this.getRowByIndex(rowIndex);
         const column = this.columns.find((col) => col.field === columnField);
         if (row && row instanceof IgxHierarchicalGridRow && column) {
-            return new IgxGridCell(this, rowIndex, columnField);
+            return new IgxGridCell(this, rowIndex, column);
         }
     }
 
@@ -744,7 +744,7 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti
         const row = this.getRowByKey(rowSelector);
         const column = this.columns.find((col) => col.field === columnField);
         if (row && column) {
-            return new IgxGridCell(this, row.index, columnField);
+            return new IgxGridCell(this, row.index, column);
         }
     }
 
diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.ts
@@ -405,7 +405,7 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
         const row = this.getRowByIndex(rowIndex);
         const column = this.columns.find((col) => col.visibleIndex === index);
         if (row && row instanceof IgxTreeGridRow && column) {
-            return new IgxGridCell(this as any, rowIndex, column.field);
+            return new IgxGridCell(this as any, rowIndex, column);
         }
     }
 
@@ -791,7 +791,7 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
         const row = this.getRowByIndex(rowIndex);
         const column = this.columns.find((col) => col.field === columnField);
         if (row && row instanceof IgxTreeGridRow && column) {
-            return new IgxGridCell(this as any, rowIndex, columnField);
+            return new IgxGridCell(this as any, rowIndex, column);
         }
     }
 
@@ -811,7 +811,7 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy
         const row = this.getRowByKey(rowSelector);
         const column = this.columns.find((col) => col.field === columnField);
         if (row && column) {
-            return new IgxGridCell(this as any, row.index, columnField);
+            return new IgxGridCell(this as any, row.index, column);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1198,6 +1198,6 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy, CellT`
`1198`	`1198`
`1199`	`1199`	`private getCellType(useRow?: boolean): CellType {`
`1200`	`1200`	`const rowID = useRow ? this.grid.createRow(this.intRow.index, this.intRow.data) : this.intRow.index;`
`1201`		`- return new IgxGridCell(this.grid, rowID, this.column.field);`
	`1201`	`+ return new IgxGridCell(this.grid, rowID, this.column);`
`1202`	`1202`	`}`
`1203`	`1203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1365,7 +1365,7 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy`
`1365`	`1365`	`.map((rec, index) => {`
`1366`	`1366`	`if (!this.grid.isGroupByRecord(rec) && !this.grid.isSummaryRow(rec)) {`
`1367`	`1367`	`this.grid.pagingMode === 1 && this.grid.page !== 0 ? index = index + this.grid.perPage * this.grid.page : index = this.grid.dataRowList.first.index + index;`
`1368`		`- const cell = new IgxGridCell(this.grid as any, index, this.field);`
	`1368`	`+ const cell = new IgxGridCell(this.grid as any, index, this);`
`1369`	`1369`	`return cell;`
`1370`	`1370`	`}`
`1371`	`1371`	`}).filter(cell => cell);`
Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,`
`533`	`533`	`const row = this.getRowByIndex(rowIndex);`
`534`	`534`	`const column = this._columns.find((col) => col.visibleIndex === index);`
`535`	`535`	`if (row && row instanceof IgxGridRow && !row.data?.detailsData && column) {`
`536`		`- return new IgxGridCell(this, rowIndex, column.field);`
	`536`	`+ return new IgxGridCell(this, rowIndex, column);`
`537`	`537`	`}`
`538`	`538`	`}`
`539`	`539`
`@@ -1174,7 +1174,7 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,`
`1174`	`1174`	`if (this.pagingMode === 1 && this.page !== 0) {`
`1175`	`1175`	`row.index = rowIndex + this.perPage * this.page;`
`1176`	`1176`	`}`
`1177`		`- return new IgxGridCell(this, row.index, columnField);`
	`1177`	`+ return new IgxGridCell(this, row.index, column);`
`1178`	`1178`	`}`
`1179`	`1179`	`}`
`1180`	`1180`
`@@ -1194,7 +1194,7 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,`
`1194`	`1194`	`const row = this.getRowByKey(rowSelector);`
`1195`	`1195`	`const column = this._columns.find((col) => col.field === columnField);`
`1196`	`1196`	`if (row && column) {`
`1197`		`- return new IgxGridCell(this, row.index, columnField);`
	`1197`	`+ return new IgxGridCell(this, row.index, column);`
`1198`	`1198`	`}`
`1199`	`1199`	`}`
`1200`	`1200`
Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti`
`477`	`477`	`const row = this.getRowByIndex(rowIndex);`
`478`	`478`	`const column = this.columns.find((col) => col.visibleIndex === index);`
`479`	`479`	`if (row && row instanceof IgxHierarchicalGridRow && column) {`
`480`		`- return new IgxGridCell(this, rowIndex, column.field);`
	`480`	`+ return new IgxGridCell(this, rowIndex, column);`
`481`	`481`	`}`
`482`	`482`	`}`
`483`	`483`
`@@ -724,7 +724,7 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti`
`724`	`724`	`const row = this.getRowByIndex(rowIndex);`
`725`	`725`	`const column = this.columns.find((col) => col.field === columnField);`
`726`	`726`	`if (row && row instanceof IgxHierarchicalGridRow && column) {`
`727`		`- return new IgxGridCell(this, rowIndex, columnField);`
	`727`	`+ return new IgxGridCell(this, rowIndex, column);`
`728`	`728`	`}`
`729`	`729`	`}`
`730`	`730`
`@@ -744,7 +744,7 @@ export class IgxHierarchicalGridComponent extends IgxHierarchicalGridBaseDirecti`
`744`	`744`	`const row = this.getRowByKey(rowSelector);`
`745`	`745`	`const column = this.columns.find((col) => col.field === columnField);`
`746`	`746`	`if (row && column) {`
`747`		`- return new IgxGridCell(this, row.index, columnField);`
	`747`	`+ return new IgxGridCell(this, row.index, column);`
`748`	`748`	`}`
`749`	`749`	`}`
`750`	`750`
Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy`
`405`	`405`	`const row = this.getRowByIndex(rowIndex);`
`406`	`406`	`const column = this.columns.find((col) => col.visibleIndex === index);`
`407`	`407`	`if (row && row instanceof IgxTreeGridRow && column) {`
`408`		`- return new IgxGridCell(this as any, rowIndex, column.field);`
	`408`	`+ return new IgxGridCell(this as any, rowIndex, column);`
`409`	`409`	`}`
`410`	`410`	`}`
`411`	`411`
`@@ -791,7 +791,7 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy`
`791`	`791`	`const row = this.getRowByIndex(rowIndex);`
`792`	`792`	`const column = this.columns.find((col) => col.field === columnField);`
`793`	`793`	`if (row && row instanceof IgxTreeGridRow && column) {`
`794`		`- return new IgxGridCell(this as any, rowIndex, columnField);`
	`794`	`+ return new IgxGridCell(this as any, rowIndex, column);`
`795`	`795`	`}`
`796`	`796`	`}`
`797`	`797`
`@@ -811,7 +811,7 @@ export class IgxTreeGridComponent extends IgxGridBaseDirective implements GridTy`
`811`	`811`	`const row = this.getRowByKey(rowSelector);`
`812`	`812`	`const column = this.columns.find((col) => col.field === columnField);`
`813`	`813`	`if (row && column) {`
`814`		`- return new IgxGridCell(this as any, row.index, columnField);`
	`814`	`+ return new IgxGridCell(this as any, row.index, column);`
`815`	`815`	`}`
`816`	`816`	`}`
`817`	`817`