Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions projects/igniteui-angular-elements/src/public_api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ import { IgxPivotAggregate, IgxPivotDateAggregate, IgxPivotNumericAggregate, Igx
import { IgxPivotDateDimension } from 'projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-grid-dimensions';
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';


/** Export Public API, TODO: reorganize, Generate all w/ renames? */
export {
//Grids API
FilteringExpressionsTree as IgcFilteringExpressionsTree,
FilteringLogic, // TODO: already exported by analyzer?
FilteringLogic,
FilteringExpressionsTreeType,
IgxFilteringOperand as IgcFilteringOperand,
IgxBooleanFilteringOperand as IgcBooleanFilteringOperand,
Expand Down Expand Up @@ -48,5 +49,9 @@ export {
RowPinningPosition,
GridPagingMode,
DropPosition,
PivotDimensionType
PivotDimensionType,

// overlay position settings (used in grids, paginator, toolbar)
HorizontalAlignment,
VerticalAlignment,
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,12 @@ export class IgxFilteringOperand {
* Returns an array of names of the conditions which are visible in the filtering UI
*/
public conditionList(): string[] {
return this.operations.filter(f => !f.hidden && !f.isNestedQuery).map((element) => element.name);
return this.operations.filter(f => !f.hidden && !f.isNestedQuery).map((element) => element.name);
}

/**
* Returns an array of names of the conditions which are visible in the UI, including "In" and "Not In", allowing the creation of sub-queries.
* @hidden @internal
*/
public extendedConditionList(): string[] {
return this.operations.filter(f => !f.hidden).map((element) => element.name);
Expand All @@ -76,10 +77,7 @@ export class IgxFilteringOperand {
this.operations.push(operation);
}

/**
* @hidden
*/
public findValueInSet(target: any, searchVal: Set<any>) {
protected findValueInSet(target: any, searchVal: Set<any>) {
return searchVal.has(target);
}
}
Expand Down Expand Up @@ -119,7 +117,7 @@ export class IgxBooleanFilteringOperand extends IgxFilteringOperand {
iconName: 'filter_not_empty',
logic: (target: boolean) => target !== null && target !== undefined
}];

this.operations = newOperations.concat(this.operations);
}
}
Expand All @@ -143,7 +141,7 @@ class IgxBaseDateTimeFilteringOperand extends IgxFilteringOperand {
iconName: 'filter_not_empty',
logic: (target: Date) => target !== null && target !== undefined
}];

this.operations = newOperations.concat(this.operations);
}

Expand Down Expand Up @@ -189,10 +187,7 @@ class IgxBaseDateTimeFilteringOperand extends IgxFilteringOperand {
return res;
}

/**
* @hidden
*/
public override findValueInSet(target: any, searchVal: Set<any>) {
protected override findValueInSet(target: any, searchVal: Set<any>) {
if (!target) {
return false;
}
Expand Down Expand Up @@ -416,11 +411,11 @@ export class IgxDateFilteringOperand extends IgxBaseDateTimeFilteringOperand {
return d.year === now.year + 1;
}
}];

this.operations = newOperations.concat(this.operations);
}

public override findValueInSet(target: any, searchVal: Set<any>) {
protected override findValueInSet(target: any, searchVal: Set<any>) {
if (!target) {
return false;
}
Expand Down Expand Up @@ -637,7 +632,7 @@ export class IgxDateTimeFilteringOperand extends IgxBaseDateTimeFilteringOperand
return d.year === now.year + 1;
}
}];

this.operations = newOperations.concat(this.operations);
}
}
Expand Down Expand Up @@ -741,14 +736,11 @@ export class IgxTimeFilteringOperand extends IgxBaseDateTimeFilteringOperand {
true : targetn.hours === search.hours && targetn.minutes === search.minutes && targetn.seconds > search.seconds;
}
}];

this.operations = newOperations.concat(this.operations);
}

/**
* @hidden
*/
public override findValueInSet(target: any, searchVal: Set<any>) {
protected override findValueInSet(target: any, searchVal: Set<any>) {
if (!target) {
return false;
}
Expand Down Expand Up @@ -806,7 +798,7 @@ export class IgxNumberFilteringOperand extends IgxFilteringOperand {
iconName: 'filter_not_empty',
logic: (target: number) => target !== null && target !== undefined && !isNaN(target)
}];

this.operations = newOperations.concat(this.operations);
}
}
Expand Down Expand Up @@ -885,7 +877,7 @@ export class IgxStringFilteringOperand extends IgxFilteringOperand {
iconName: 'filter_not_empty',
logic: (target: string) => target !== null && target !== undefined && target.length > 0
}];

this.operations = newOperations.concat(this.operations);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export abstract class IgxHierarchicalGridBaseDirective extends IgxGridBaseDirect
viewRef: ViewContainerRef,
injector: Injector,
envInjector: EnvironmentInjector,
navigation: IgxHierarchicalGridNavigationService,
public override navigation: IgxHierarchicalGridNavigationService,
filteringService: IgxFilteringService,
textHighlightService: IgxTextHighlightService,
@Inject(IgxOverlayService) overlayService: IgxOverlayService,
Expand Down Expand Up @@ -200,8 +200,6 @@ export abstract class IgxHierarchicalGridBaseDirective extends IgxGridBaseDirect
);
}

public override navigation: IgxHierarchicalGridNavigationService;

/**
* @hidden
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
viewRef: ViewContainerRef,
injector: Injector,
envInjector: EnvironmentInjector,
navigation: IgxPivotGridNavigationService,
public override navigation: IgxPivotGridNavigationService,
filteringService: IgxFilteringService,
textHighlightService: IgxTextHighlightService,
@Inject(IgxOverlayService) overlayService: IgxOverlayService,
Expand Down Expand Up @@ -1054,8 +1054,6 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
_diTransactions);
}

public override navigation: IgxPivotGridNavigationService;

/**
* @hidden
*/
Expand Down