Skip to content

refactor(cell-merge): change blazorSuppress to blazorCSSuppress - 20.1.x #16274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 6, 2025
Merged

refactor(cell-merge): change blazorSuppress to blazorCSSuppress - 20.1.x #16274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f06a84
refactor(cell-merge): change blazorSuppress to blazorCSSuppress
IMinchev64 Oct 6, 2025
b9bb0fb
chore(cell-merge): add DefaultTreeGridMergeStrategy to elements publi…
IMinchev64 Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion projects/igniteui-angular-elements/src/public_api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { IgxPivotDateDimension } from 'projects/igniteui-angular/src/lib/grids/p
import { PivotDimensionType } from 'projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid.interface';
import { IgxDateSummaryOperand, IgxNumberSummaryOperand, IgxSummaryOperand, IgxTimeSummaryOperand } from 'projects/igniteui-angular/src/lib/grids/summaries/grid-summary';
import { HorizontalAlignment, VerticalAlignment } from 'projects/igniteui-angular/src/lib/services/overlay/utilities';
import { ByLevelTreeGridMergeStrategy } from 'projects/igniteui-angular/src/lib/data-operations/merge-strategy';
import { ByLevelTreeGridMergeStrategy, DefaultTreeGridMergeStrategy } from 'projects/igniteui-angular/src/lib/data-operations/merge-strategy';

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

NoopSortingStrategy as IgcNoopSortingStrategy,
NoopFilteringStrategy as IgcNoopFilteringStrategy,
DefaultTreeGridMergeStrategy as IgcDefaultTreeGridMergeStrategy,
ByLevelTreeGridMergeStrategy as IgcByLevelTreeGridMergeStrategy,

// Pivot API
Expand Down
10 changes: 5 additions & 5 deletions projects/igniteui-angular/src/lib/data-operations/merge-strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface IMergeByResult {
* Merge strategy interface.
*/
export interface IGridMergeStrategy {
/* blazorSuppress */
/* blazorCSSuppress */
/**
* Function that processes merging of the whole data per merged field.
* Returns collection where object has reference to the original record and map of the cell merge metadata per field.
Expand Down Expand Up @@ -49,7 +49,7 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
return this._instance || (this._instance = new this());
}

/* blazorSuppress */
/* blazorCSSuppress */
public merge(
data: any[],
field: string,
Expand Down Expand Up @@ -90,7 +90,7 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
return result;
}

/* blazorSuppress */
/* 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);
Expand Down Expand Up @@ -145,7 +145,7 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {


export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy {
/* blazorSuppress */
/* 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);
Expand All @@ -164,7 +164,7 @@ export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy {
}

export class ByLevelTreeGridMergeStrategy extends DefaultMergeStrategy {
/* blazorSuppress */
/* 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);
Expand Down
Loading