Skip to content

Commit 5e1b702

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Minor tweaks. Console warn on invalid setup.
1 parent 401370e commit 5e1b702

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export interface IGridMergeStrategy {
1414
activeRowIndex? : number,
1515
grid?: GridType
1616
) => any[];
17+
comparer: (prevRecord: any, record: any, field: string) => boolean;
1718
}
1819

1920
export class DefaultMergeStrategy implements IGridMergeStrategy {

projects/igniteui-angular/src/lib/grids/columns/column.component.ts

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,17 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
115115
*
116116
*/
117117
@Input()
118-
public merge = false;
118+
public get merge() {
119+
return this._merge;
120+
}
121+
122+
public set merge(value) {
123+
if (this.grid.hasColumnLayouts) {
124+
console.warn('Merging is not supported with multi-row layouts.');
125+
return;
126+
}
127+
this._merge = value;
128+
}
119129

120130
/**
121131
* @hidden @internal
@@ -1911,6 +1921,10 @@ export class IgxColumnComponent implements AfterContentInit, OnDestroy, ColumnTy
19111921
* @hidden
19121922
*/
19131923
protected _groupable = false;
1924+
/**
1925+
* @hidden
1926+
*/
1927+
protected _merge = false;
19141928
/**
19151929
* @hidden
19161930
*/

0 commit comments

Comments
 (0)