Skip to content

Commit cb1094b

Browse files
authored
Merge pull request #16776 from IgniteUI/iminchev/fix-16299
fix(merge-strategy): add return type to merge method - 21.0.x
2 parents b15e610 + 87fa637 commit cb1094b

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
5959
isDate = false,
6060
isTime = false,
6161
grid?: GridTypeBase
62-
) {
62+
): any[] {
6363
let prev = null;
6464
let index = 0;
6565
for (const rec of data) {
@@ -93,8 +93,8 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
9393

9494
/* blazorCSSuppress */
9595
public comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {
96-
const a = this.getFieldValue(prevRecord,field, isDate, isTime);
97-
const b = this.getFieldValue(record,field, isDate, isTime);
96+
const a = this.getFieldValue(prevRecord, field, isDate, isTime);
97+
const b = this.getFieldValue(record, field, isDate, isTime);
9898
const an = (a === null || a === undefined);
9999
const bn = (b === null || b === undefined);
100100
if (an) {
@@ -148,8 +148,8 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
148148
export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy {
149149
/* blazorCSSuppress */
150150
public override comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {
151-
const a = this.getFieldValue( prevRecord.data, field, isDate, isTime);
152-
const b = this.getFieldValue(record.data,field, isDate, isTime);
151+
const a = this.getFieldValue(prevRecord.data, field, isDate, isTime);
152+
const b = this.getFieldValue(record.data, field, isDate, isTime);
153153
const an = (a === null || a === undefined);
154154
const bn = (b === null || b === undefined);
155155
if (an) {
@@ -168,8 +168,8 @@ export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy {
168168
export class ByLevelTreeGridMergeStrategy extends DefaultMergeStrategy {
169169
/* blazorCSSuppress */
170170
public override comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {
171-
const a = this.getFieldValue( prevRecord.data, field, isDate, isTime);
172-
const b = this.getFieldValue(record.data,field, isDate, isTime);
171+
const a = this.getFieldValue(prevRecord.data, field, isDate, isTime);
172+
const b = this.getFieldValue(record.data, field, isDate, isTime);
173173
const levelA = prevRecord.level;
174174
const levelB = record.level;
175175
const an = (a === null || a === undefined);

0 commit comments

Comments
 (0)