Skip to content

Commit 25f208f

Browse files
committed
Address review comments
1 parent 9b25995 commit 25f208f

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

projects/igniteui-angular/src/lib/grids/common/pipes.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,23 +88,26 @@ export class IgxGridRowClassesPipe implements PipeTransform {
8888
public transform(
8989
cssClasses: CSSProp,
9090
row: _RowType,
91-
rowData: any,
91+
editMode: boolean,
9292
selected: boolean,
9393
dirty: boolean,
9494
deleted: boolean,
9595
dragging: boolean,
9696
index: number,
9797
mrl: boolean,
98+
filteredOut: boolean,
9899
_: number
99100
) {
100101
const result = new Set(['igx-grid__tr', index % 2 ? row.grid.evenRowCSS : row.grid.oddRowCSS]);
101102
const mapping = [
102103
[selected, 'igx-grid__tr--selected'],
103-
[row.inEditMode, 'igx-grid_-tr--edit'],
104+
[editMode, 'igx-grid__tr--edit'],
104105
[dirty, 'igx-grid__tr--edited'],
105106
[deleted, 'igx-grid__tr--deleted'],
106107
[dragging, 'igx-grid__tr--drag'],
107-
[mrl, 'igx-grid__tr--mrl']
108+
[mrl, 'igx-grid__tr--mrl'],
109+
// Tree grid only
110+
[filteredOut, 'igx-grid__tr--filtered']
108111
];
109112

110113
for (const [state, _class] of mapping) {
@@ -113,14 +116,10 @@ export class IgxGridRowClassesPipe implements PipeTransform {
113116
}
114117
}
115118

116-
if (row instanceof IgxTreeGridRowComponent && row.treeRow.isFilteredOutParent) {
117-
result.add('igx-grid__tr--filtered');
118-
}
119-
120119
for (const cssClass of Object.keys(cssClasses ?? {})) {
121120
const callbackOrValue = cssClasses[cssClass];
122121
this.row.index = index;
123-
(this.row as any)._data = rowData;
122+
(this.row as any)._data = row.rowData;
124123
const apply = typeof callbackOrValue === 'function' ? callbackOrValue(this.row) : callbackOrValue;
125124
if (apply) {
126125
result.add(cssClass);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,13 @@
9494
</ng-container>
9595
<ng-template #record_template let-rowIndex="index" let-rowData let-disabledRow="disabled">
9696
<igx-grid-row [gridID]="id" [index]="rowIndex" [rowData]="rowData" [disabled]="disabledRow"
97-
[ngClass]="rowClasses | igxGridRowClasses:row:rowData:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:pipeTrigger"
97+
[ngClass]="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:false:pipeTrigger"
9898
[ngStyle]="rowStyles | igxGridRowStyles:rowData:rowIndex:pipeTrigger" #row>
9999
</igx-grid-row>
100100
</ng-template>
101101
<ng-template #pinned_record_template let-rowIndex="index" let-rowData>
102102
<igx-grid-row [gridID]="id" [index]="rowIndex" [rowData]="rowData"
103-
[ngClass]="rowClasses | igxGridRowClasses:row:rowData:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:pipeTrigger"
103+
[ngClass]="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:false:pipeTrigger"
104104
[ngStyle]="rowStyles | igxGridRowStyles:rowData:rowIndex:pipeTrigger"#row #pinnedRow>
105105
</igx-grid-row>
106106
</ng-template>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@
6868
</ng-template>
6969
<ng-template #hierarchical_record_template let-rowIndex="index" let-disabledRow="disabled" let-rowData>
7070
<igx-hierarchical-grid-row [gridID]="id" [index]="rowIndex" [disabled]="disabledRow" [rowData]="rowData"
71-
[ngClass]="rowClasses | igxGridRowClasses:row:rowData:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:pipeTrigger"
71+
[ngClass]="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:false:pipeTrigger"
7272
[ngStyle]="rowStyles | igxGridRowStyles:rowData:rowIndex:pipeTrigger" #row>
7373
</igx-hierarchical-grid-row>
7474
</ng-template>
7575

7676
<ng-template #pinned_hierarchical_record_template let-rowIndex="index" let-rowData>
7777
<igx-hierarchical-grid-row [gridID]="id" [index]="rowIndex" [rowData]="rowData"
78-
[ngClass]="rowClasses | igxGridRowClasses:row:rowData:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:pipeTrigger"
78+
[ngClass]="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:false:pipeTrigger"
7979
[ngStyle]="rowStyles | igxGridRowStyles:rowData:rowIndex:pipeTrigger" #row #pinnedRow>
8080
</igx-hierarchical-grid-row>
8181
</ng-template>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@
7070
<ng-container *ngTemplateOutlet="hasPinnedRecords && !isRowPinningToTop ? pinnedRecordsTemplate : null"></ng-container>
7171
<ng-template #record_template let-rowIndex="index" let-disabledRow="disabled" let-rowData>
7272
<igx-tree-grid-row [gridID]="id" [index]="rowIndex" [treeRow]="rowData" [disabled]="disabledRow"
73-
[ngClass]="rowClasses | igxGridRowClasses:row:rowData:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:pipeTrigger"
73+
[ngClass]="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:row.treeRow.isFilteredOutParent:pipeTrigger"
7474
[ngStyle]="rowStyles | igxGridRowStyles:rowData:rowIndex:pipeTrigger" #row>
7575
</igx-tree-grid-row>
7676
</ng-template>
7777
<ng-template #pinned_record_template let-rowIndex="index" let-rowData>
7878
<igx-tree-grid-row [gridID]="id" [index]="rowIndex" [treeRow]="rowData"
79-
[ngClass]="rowClasses | igxGridRowClasses:row:rowData:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:pipeTrigger"
79+
[ngClass]="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowIndex:hasColumnLayouts:row.treeRow.isFilteredOutParent:pipeTrigger"
8080
[ngStyle]="rowStyles | igxGridRowStyles:rowData:rowIndex:pipeTrigger"#row #pinnedRow>
8181
</igx-tree-grid-row>
8282
</ng-template>

0 commit comments

Comments
 (0)