Skip to content

Commit ca9f087

Browse files
authored
refactor(cell-merge): change blazorSuppress to blazorCSSuppress - 20.1.x (#16274)
1 parent 5bb55f8 commit ca9f087

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

projects/igniteui-angular-elements/src/public_api.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { IgxPivotDateDimension } from 'projects/igniteui-angular/src/lib/grids/p
1212
import { PivotDimensionType } from 'projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.interface';
1313
import { IgxDateSummaryOperand, IgxNumberSummaryOperand, IgxSummaryOperand, IgxTimeSummaryOperand } from 'projects/igniteui-angular/src/lib/grids/summaries/grid-summary';
1414
import { HorizontalAlignment, VerticalAlignment } from 'projects/igniteui-angular/src/lib/services/overlay/utilities';
15-
import { ByLevelTreeGridMergeStrategy } from 'projects/igniteui-angular/src/lib/data-operations/merge-strategy';
15+
import { ByLevelTreeGridMergeStrategy, DefaultTreeGridMergeStrategy } from 'projects/igniteui-angular/src/lib/data-operations/merge-strategy';
1616

1717
/** Export Public API, TODO: reorganize, Generate all w/ renames? */
1818
export {
@@ -35,6 +35,7 @@ export {
3535

3636
NoopSortingStrategy as IgcNoopSortingStrategy,
3737
NoopFilteringStrategy as IgcNoopFilteringStrategy,
38+
DefaultTreeGridMergeStrategy as IgcDefaultTreeGridMergeStrategy,
3839
ByLevelTreeGridMergeStrategy as IgcByLevelTreeGridMergeStrategy,
3940

4041
// Pivot API

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export interface IMergeByResult {
1313
* Merge strategy interface.
1414
*/
1515
export interface IGridMergeStrategy {
16-
/* blazorSuppress */
16+
/* blazorCSSuppress */
1717
/**
1818
* Function that processes merging of the whole data per merged field.
1919
* Returns collection where object has reference to the original record and map of the cell merge metadata per field.
@@ -49,7 +49,7 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
4949
return this._instance || (this._instance = new this());
5050
}
5151

52-
/* blazorSuppress */
52+
/* blazorCSSuppress */
5353
public merge(
5454
data: any[],
5555
field: string,
@@ -90,7 +90,7 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
9090
return result;
9191
}
9292

93-
/* blazorSuppress */
93+
/* blazorCSSuppress */
9494
public comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {
9595
const a = this.getFieldValue(prevRecord,field, isDate, isTime);
9696
const b = this.getFieldValue(record,field, isDate, isTime);
@@ -145,7 +145,7 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
145145

146146

147147
export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy {
148-
/* blazorSuppress */
148+
/* blazorCSSuppress */
149149
public override comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {
150150
const a = this.getFieldValue( prevRecord.data, field, isDate, isTime);
151151
const b = this.getFieldValue(record.data,field, isDate, isTime);
@@ -164,7 +164,7 @@ export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy {
164164
}
165165

166166
export class ByLevelTreeGridMergeStrategy extends DefaultMergeStrategy {
167-
/* blazorSuppress */
167+
/* blazorCSSuppress */
168168
public override comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {
169169
const a = this.getFieldValue( prevRecord.data, field, isDate, isTime);
170170
const b = this.getFieldValue(record.data,field, isDate, isTime);

0 commit comments

Comments
 (0)