Skip to content

Commit d515e97

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Adjust check for non-mergeable record types.
1 parent 02b866a commit d515e97

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

projects/igniteui-angular/src/lib/data-operations/data-util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export class DataUtil {
102102
): any[] {
103103
let result = [];
104104
for (const col of columns) {
105-
strategy.merge(data, col.field, col.mergingComparer, result);
105+
strategy.merge(data, col.field, col.mergingComparer, result, grid);
106106
}
107107
return result;
108108
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ export interface IGridMergeStrategy {
1010
data: any[],
1111
field: string,
1212
comparer: (prevRecord: any, currentRecord: any, field: string) => boolean,
13-
result: any[]
13+
result: any[],
14+
grid?: GridType
1415
) => any[];
1516
}
1617

@@ -26,15 +27,16 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
2627
data: any[],
2728
field: string,
2829
comparer: (prevRecord: any, record: any, field: string) => boolean = this.comparer,
29-
result: any[]
30+
result: any[],
31+
grid?: GridType
3032
) {
3133
let prev = null;
3234
let index = 0;
3335
for (const rec of data) {
3436

3537
const recData = result[index];
3638
// if this is some special record type - add and skip merging
37-
if (rec.ghostRecord) {
39+
if (grid && grid.isDetailRecord(rec) || grid.isGhostRecord(rec) || grid.isGroupByRecord(rec)) {
3840
if(!recData) {
3941
result.push(rec);
4042
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h4 class="sample-title">Grid with cell merge</h4>
1414
</igx-column>
1515
<igx-column field="ReorderLevel" width="200px" [merge]="true" editable="true">
1616
</igx-column>
17-
<igx-column required field="ProductName" width="200px" [merge]="true">
17+
<igx-column required field="ProductName" width="200px" [merge]="true" groupable="true">
1818
</igx-column>
1919
<igx-column field="UnitsInStock" header="UnitsInStock" width="200px" [merge]="true">
2020
</igx-column>

0 commit comments

Comments
 (0)