From 1eeec5d2a8fec79d4fd97f1a8f4684e6cc10ce44 Mon Sep 17 00:00:00 2001 From: Ivan Minchev Date: Wed, 29 Oct 2025 11:26:31 +0200 Subject: [PATCH] fix(merge-strategy): add return type to merge method --- .../src/lib/data-operations/merge-strategy.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/igniteui-angular/src/lib/data-operations/merge-strategy.ts b/projects/igniteui-angular/src/lib/data-operations/merge-strategy.ts index a7a4f8c1059..1791793de63 100644 --- a/projects/igniteui-angular/src/lib/data-operations/merge-strategy.ts +++ b/projects/igniteui-angular/src/lib/data-operations/merge-strategy.ts @@ -60,7 +60,7 @@ export class DefaultMergeStrategy implements IGridMergeStrategy { isDate = false, isTime = false, grid?: GridType - ) { + ): any[] { let prev = null; let index = 0; for (const rec of data) { @@ -94,8 +94,8 @@ export class DefaultMergeStrategy implements IGridMergeStrategy { /* blazorCSSuppress */ public comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean { - const a = this.getFieldValue(prevRecord,field, isDate, isTime); - const b = this.getFieldValue(record,field, isDate, isTime); + const a = this.getFieldValue(prevRecord, field, isDate, isTime); + const b = this.getFieldValue(record, field, isDate, isTime); const an = (a === null || a === undefined); const bn = (b === null || b === undefined); if (an) { @@ -149,8 +149,8 @@ export class DefaultMergeStrategy implements IGridMergeStrategy { export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy { /* blazorCSSuppress */ public override comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean { - const a = this.getFieldValue( prevRecord.data, field, isDate, isTime); - const b = this.getFieldValue(record.data,field, isDate, isTime); + const a = this.getFieldValue(prevRecord.data, field, isDate, isTime); + const b = this.getFieldValue(record.data, field, isDate, isTime); const an = (a === null || a === undefined); const bn = (b === null || b === undefined); if (an) { @@ -168,8 +168,8 @@ export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy { export class ByLevelTreeGridMergeStrategy extends DefaultMergeStrategy { /* blazorCSSuppress */ public override comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean { - const a = this.getFieldValue( prevRecord.data, field, isDate, isTime); - const b = this.getFieldValue(record.data,field, isDate, isTime); + const a = this.getFieldValue(prevRecord.data, field, isDate, isTime); + const b = this.getFieldValue(record.data, field, isDate, isTime); const levelA = prevRecord.level; const levelB = record.level; const an = (a === null || a === undefined);