Skip to content

Commit 16d4ac6

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Merge ghost(pinned) records with same value in main area.
1 parent 52860e8 commit 16d4ac6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

projects/igniteui-angular/src/lib/data-operations/merge-strategy.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
3838

3939
const recData = result[index];
4040
// if this is active row or some special record type - add and skip merging
41-
if (activeRowIndex === index || (grid && grid.isDetailRecord(rec) || grid.isGhostRecord(rec) || grid.isGroupByRecord(rec))) {
41+
if (activeRowIndex === index || (grid && grid.isDetailRecord(rec) || grid.isGroupByRecord(rec))) {
4242
if(!recData) {
4343
result.push(rec);
4444
}
4545
prev = null;
4646
index++;
4747
continue;
4848
}
49-
let recToUpdateData = recData ?? { recordRef: rec, cellMergeMeta: new Map<string, IMergeByResult>() };
49+
let recToUpdateData = recData ?? { recordRef: grid.isGhostRecord(rec) ? rec.recordRef : rec, cellMergeMeta: new Map<string, IMergeByResult>(), ghostRecord: rec.ghostRecord };
5050
recToUpdateData.cellMergeMeta.set(field, { rowSpan: 1 });
51-
if (prev && comparer(prev.recordRef, recToUpdateData.recordRef, field)) {
51+
if (prev && comparer(prev.recordRef, recToUpdateData.recordRef, field) && prev.ghostRecord === recToUpdateData.ghostRecord) {
5252
const root = prev.cellMergeMeta.get(field)?.root ?? prev;
5353
root.cellMergeMeta.get(field).rowSpan += 1;
5454
recToUpdateData.cellMergeMeta.get(field).root = root;

0 commit comments

Comments
 (0)