Skip to content

Commit 75fd965

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Small review comments.
1 parent 6e103ac commit 75fd965

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4083,12 +4083,7 @@ export abstract class IgxGridBaseDirective implements GridType,
40834083
}
40844084

40854085
protected get hasCellsToMerge() {
4086-
const columnToMerge = this.visibleColumns.filter(
4087-
x => x.merge && (this.cellMergeMode ==='always' ||
4088-
(this.cellMergeMode === 'onSort' && !!this.sortingExpressions
4089-
.find(y => y.fieldName === x.field)))
4090-
);
4091-
return columnToMerge.length > 0;
4086+
return this.columnsToMerge.length > 0;
40924087
}
40934088

40944089
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@
171171

172172
<ng-template #expandableCellTemplate let-col>
173173
<igx-expandable-grid-cell
174-
[class.igx-grid__td--merged]="metaData?.cellMergeMeta.get(col.field)?.rowSpan > 1"
175174
[class.igx-grid__td--merged]="metaData?.cellMergeMeta.get(col.field)?.rowSpan > 1"
176175
[class.igx-grid__td--merged-selected]="isSelectionRoot(col)"
177176
[class.igx-grid__td--merged-hovered]="isHoveredRoot(col)"

0 commit comments

Comments
 (0)