File tree Expand file tree Collapse file tree 6 files changed +12
-3
lines changed
projects/igniteui-angular/src/lib
core/styles/components/grid Expand file tree Collapse file tree 6 files changed +12
-3
lines changed Original file line number Diff line number Diff line change 276
276
@extend %igx-grid__tr--merged !optional ;
277
277
}
278
278
279
+ @include e (tr, $m : merged- top) {
280
+ @extend %igx-grid__tr--merged-top !optional ;
281
+ }
282
+
279
283
@include e (tr, $m : pinned- top) {
280
284
@extend %igx-grid__tr--pinned-top !optional ;
281
285
}
Original file line number Diff line number Diff line change 1341
1341
}
1342
1342
1343
1343
%igx-grid__tr--merged {
1344
+ border-bottom : 0px ;
1345
+ }
1346
+
1347
+ %igx-grid__tr--merged-top {
1344
1348
position : absolute ;
1345
1349
width : 100% ;
1346
1350
}
Original file line number Diff line number Diff line change @@ -128,6 +128,7 @@ export class IgxGridRowClassesPipe implements PipeTransform {
128
128
[ deleted , 'igx-grid__tr--deleted' ] ,
129
129
[ dragging , 'igx-grid__tr--drag' ] ,
130
130
[ mrl || merged , 'igx-grid__tr--mrl' ] ,
131
+ [ merged , 'igx-grid__tr--merged' ] ,
131
132
// Tree grid only
132
133
[ filteredOut , 'igx-grid__tr--filtered' ]
133
134
] ;
Original file line number Diff line number Diff line change 50
50
51
51
52
52
@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) "
54
54
[ngClass] ="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowData.index:hasColumnLayouts:isRecordMerged(rowData):false:rowData.record:pipeTrigger "
55
55
[ngStyle] ="rowStyles | igxGridRowStyles:rowData.record:rowData.index:pipeTrigger " #row >
56
56
</ igx-grid-row >
Original file line number Diff line number Diff line change 33
33
}
34
34
35
35
@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) "
37
37
[ngClass] ="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowData.index:hasColumnLayouts:isRecordMerged(rowData.record):false:rowData.record:pipeTrigger "
38
38
[ngStyle] ="rowStyles | igxGridRowStyles:rowData.record:rowData.index:pipeTrigger " #row >
39
39
</ igx-hierarchical-grid-row >
Original file line number Diff line number Diff line change 32
32
}
33
33
34
34
@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) "
36
36
[ngClass] ="rowClasses | igxGridRowClasses:row:row.inEditMode:row.selected:row.dirty:row.deleted:row.dragging:rowData.index:hasColumnLayouts:isRecordMerged(rowData):row.treeRow.isFilteredOutParent:rowData:pipeTrigger "
37
37
[ngStyle] ="rowStyles | igxGridRowStyles:rowData:rowData.index:pipeTrigger " #row >
38
38
</ igx-tree-grid-row >
You can’t perform that action at this time.
0 commit comments