Skip to content

Commit 5528867

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Fix border styles for cell merging.
1 parent a06132a commit 5528867

File tree

6 files changed

+12
-3
lines changed

6 files changed

+12
-3
lines changed

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-component.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,10 @@
276276
@extend %igx-grid__tr--merged !optional;
277277
}
278278

279+
@include e(tr, $m: merged-top) {
280+
@extend %igx-grid__tr--merged-top !optional;
281+
}
282+
279283
@include e(tr, $m: pinned-top) {
280284
@extend %igx-grid__tr--pinned-top !optional;
281285
}

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,6 +1341,10 @@
13411341
}
13421342

13431343
%igx-grid__tr--merged {
1344+
border-bottom: 0px;
1345+
}
1346+
1347+
%igx-grid__tr--merged-top {
13441348
position: absolute;
13451349
width: 100%;
13461350
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ export class IgxGridRowClassesPipe implements PipeTransform {
128128
[deleted, 'igx-grid__tr--deleted'],
129129
[dragging, 'igx-grid__tr--drag'],
130130
[mrl || merged, 'igx-grid__tr--mrl'],
131+
[merged, 'igx-grid__tr--merged'],
131132
// Tree grid only
132133
[filteredOut, 'igx-grid__tr--filtered']
133134
];

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151

5252
@for (rowData of mergedDataInView; track rowData.record;) {
53-
<igx-grid-row class="igx-grid__tr--merged" [gridID]="id" [index]="rowData.index" [data]="rowData.record.recordRef" [metaData]="rowData.record" [style.top.px]="getMergeCellOffset(rowData)"
53+
<igx-grid-row class="igx-grid__tr--merged-top" [gridID]="id" [index]="rowData.index" [data]="rowData.record.recordRef" [metaData]="rowData.record" [style.top.px]="getMergeCellOffset(rowData)"
5454
[ngClass]="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowData.index:hasColumnLayouts:isRecordMerged(rowData):false:rowData.record:pipeTrigger"
5555
[ngStyle]="rowStyles | igxGridRowStyles:rowData.record:rowData.index:pipeTrigger" #row>
5656
</igx-grid-row>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
}
3434

3535
@for (rowData of mergedDataInView; track rowData.record;) {
36-
<igx-hierarchical-grid-row class="igx-grid__tr--merged" [gridID]="id" [index]="rowData.index" [data]="rowData.record.recordRef" [metaData]="rowData.record" [style.top.px]="getMergeCellOffset(rowData)"
36+
<igx-hierarchical-grid-row class="igx-grid__tr--merged-top" [gridID]="id" [index]="rowData.index" [data]="rowData.record.recordRef" [metaData]="rowData.record" [style.top.px]="getMergeCellOffset(rowData)"
3737
[ngClass]="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowData.index:hasColumnLayouts:isRecordMerged(rowData.record):false:rowData.record:pipeTrigger"
3838
[ngStyle]="rowStyles | igxGridRowStyles:rowData.record:rowData.index:pipeTrigger" #row>
3939
</igx-hierarchical-grid-row>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
}
3333

3434
@for (rowData of mergedDataInView; track rowData.record;) {
35-
<igx-tree-grid-row class="igx-grid__tr--merged" [gridID]="id" [index]="rowData.index" [treeRow]="rowData.record.recordRef" [metaData]="rowData.record" [style.top.px]="getMergeCellOffset(rowData)"
35+
<igx-tree-grid-row class="igx-grid__tr--merged-top" [gridID]="id" [index]="rowData.index" [treeRow]="rowData.record.recordRef" [metaData]="rowData.record" [style.top.px]="getMergeCellOffset(rowData)"
3636
[ngClass]="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowData.index:hasColumnLayouts:isRecordMerged(rowData):row.treeRow.isFilteredOutParent:rowData:pipeTrigger"
3737
[ngStyle]="rowStyles | igxGridRowStyles:rowData:rowData.index:pipeTrigger" #row>
3838
</igx-tree-grid-row>

0 commit comments

Comments
 (0)