Skip to content

Commit eca73a8

Browse files
authored
Merge pull request #16753 from IgniteUI/dpetev/elements-21-fixes-master
fix(elements,cell-merge): analyzer suppress props/strategies, pivot getters
2 parents 7f199ee + eaefe4a commit eca73a8

File tree

7 files changed

+18
-13
lines changed

7 files changed

+18
-13
lines changed

projects/igniteui-angular-elements/src/analyzer/elements.config.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -874,8 +874,6 @@ export var registerConfig = [
874874
{ name: "nativeElement" },
875875
{ name: "defaultRowHeight" },
876876
{ name: "columns" },
877-
{ name: "pinnedStartColumns" },
878-
{ name: "pinnedEndColumns" },
879877
{ name: "pinnedRows" },
880878
],
881879
methods: [

projects/igniteui-angular/core/src/data-operations/grid-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ export interface IPathSegment {
429429
rowIslandKey: string;
430430
}
431431

432-
/* tsPlainInterface *
432+
/* tsPlainInterface */
433433
/* marshalByValue */
434434
export interface ISummaryExpression {
435435
fieldName: string;

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export interface IMergeByResult {
77
childRecords?: any[];
88
}
99

10+
/* csSuppress */
1011
/**
1112
* Merge strategy interface.
1213
*/
@@ -40,6 +41,7 @@ export interface IGridMergeStrategy {
4041
comparer: (prevRecord: any, record: any, field: string) => boolean;
4142
}
4243

44+
/* csSuppress */
4345
export class DefaultMergeStrategy implements IGridMergeStrategy {
4446
protected static _instance: DefaultMergeStrategy = null;
4547

@@ -142,7 +144,7 @@ export class DefaultMergeStrategy implements IGridMergeStrategy {
142144
}
143145
}
144146

145-
147+
/* csSuppress */
146148
export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy {
147149
/* blazorCSSuppress */
148150
public override comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {
@@ -162,6 +164,7 @@ export class DefaultTreeGridMergeStrategy extends DefaultMergeStrategy {
162164
}
163165
}
164166

167+
/* csSuppress */
165168
export class ByLevelTreeGridMergeStrategy extends DefaultMergeStrategy {
166169
/* blazorCSSuppress */
167170
public override comparer(prevRecord: any, record: any, field: string, isDate = false, isTime = false): boolean {

projects/igniteui-angular/directives/src/directives/toggle/toggle.directive.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,11 @@ import { Subscription, Subject, MonoTypeOperatorFunction } from 'rxjs';
2323
export interface ToggleViewEventArgs extends IBaseEventArgs {
2424
/** Id of the toggle view */
2525
id: string;
26-
/** Provides reference to the owner component (from IBaseEventArgs) */
27-
owner?: any;
2826
/* blazorSuppress */
2927
event?: Event;
3028
}
3129

32-
export interface ToggleViewCancelableEventArgs extends ToggleViewEventArgs, CancelableBrowserEventArgs {
33-
cancel: boolean;
34-
}
30+
export interface ToggleViewCancelableEventArgs extends ToggleViewEventArgs, CancelableBrowserEventArgs { }
3531

3632
@Directive({
3733
exportAs: 'toggle',

projects/igniteui-angular/grids/core/src/common/enums.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,12 @@ export type GridSelectionMode = (typeof GridSelectionMode)[keyof typeof GridSele
6363

6464
/**
6565
* Enumeration representing different cell merging modes for the grid elements.
66-
* - 'never': Never merge cells.
67-
* - 'always': Always merge adjacent cells based on merge strategy.
6866
* - 'onSort': Only merge cells in column that are sorted.
67+
* - 'always': Always merge adjacent cells based on merge strategy.
6968
*/
7069
export const GridCellMergeMode = {
70+
onSort: 'onSort',
7171
always: 'always',
72-
onSort: 'onSort'
7372
} as const;
7473
export type GridCellMergeMode = (typeof GridCellMergeMode)[keyof typeof GridCellMergeMode];
7574

projects/igniteui-angular/grids/grid/src/grid-base.directive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2461,7 +2461,7 @@ export abstract class IgxGridBaseDirective implements GridType,
24612461
this._sortingStrategy = value;
24622462
}
24632463

2464-
2464+
/* csSuppress */
24652465
/**
24662466
* Gets/Sets the merge strategy of the grid.
24672467
*

projects/igniteui-angular/grids/hierarchical-grid/src/row-island.component.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,15 @@ export class IgxRowIslandComponent extends IgxHierarchicalGridBaseDirective
270270
return [];
271271
}
272272

273+
/** @hidden */
274+
public override get pinnedStartColumns(): IgxColumnComponent[] {
275+
return [];
276+
}
277+
/** @hidden */
278+
public override get pinnedEndColumns(): IgxColumnComponent[] {
279+
return [];
280+
}
281+
273282
/** @hidden */
274283
public override get unpinnedColumns(): IgxColumnComponent[] {
275284
return [];

0 commit comments

Comments
 (0)