Skip to content

Commit c1d8a3c

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Fix collection to splice into original merge data.
1 parent e1919b6 commit c1d8a3c

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,24 +126,25 @@ export class IgxGridUnmergeActivePipe implements PipeTransform {
126126
const index = result.indexOf(x);
127127
const colKeys = [...x.cellMergeMeta.keys()];
128128
const cols = colsToMerge.filter(x => colKeys.indexOf(x.field) !== -1);
129+
let res = [];
129130
for (const col of cols) {
130-
const rs = x.cellMergeMeta.get(col.field).rowSpan;
131+
131132
let childData = x.cellMergeMeta.get(col.field).childRecords;
132133
const childRecs = childData.map(x => x.recordRef);
133134
const isDate = col?.dataType === 'date' || col?.dataType === 'dateTime';
134135
const isTime = col?.dataType === 'time' || col?.dataType === 'dateTime';
135-
const res = this.grid.mergeStrategy.merge(
136+
res = this.grid.mergeStrategy.merge(
136137
[x.recordRef, ...childRecs],
137138
col.field,
138139
col.mergingComparer,
139-
[],
140+
res,
140141
activeRowIndexes,
141142
isDate,
142143
isTime,
143144
this.grid);
144-
result.splice(index, index + rs, ...res);
145-
}
146145

146+
}
147+
result.splice(index, (index + res.length - 1), ...res);
147148
});
148149

149150

src/app/grid-cellMerging/grid-cellMerging.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ <h4 class="sample-title">Grid with cell merge</h4>
5252
</igx-column>
5353
<igx-column field="ShipCountry" header="Ship Country" [merge]="true" width="200px" sortable="true">
5454
</igx-column>
55-
<igx-column field="OrderDate" header="Order Date" width="200px" [groupable]="true" [dataType]="'date'" sortable="true">
55+
<igx-column field="OrderDate" header="Order Date" width="200px" [merge]="true" [groupable]="true" [dataType]="'date'" sortable="true">
5656
</igx-column>
5757
<igx-column field="PostalCode" header="Postal Code" width="200px" >
5858
</igx-column>

0 commit comments

Comments
 (0)