diff --git a/projects/igniteui-angular/src/lib/grids/common/grid.interface.ts b/projects/igniteui-angular/src/lib/grids/common/grid.interface.ts index e6a3db7c85f..bf2984078c7 100644 --- a/projects/igniteui-angular/src/lib/grids/common/grid.interface.ts +++ b/projects/igniteui-angular/src/lib/grids/common/grid.interface.ts @@ -1111,7 +1111,7 @@ export interface GridType extends IGridDataBindable { getVisibleContentHeight(): number; getDragGhostCustomTemplate(): TemplateRef | null; openRowOverlay(id: any): void; - openAdvancedFilteringDialog(): void; + openAdvancedFilteringDialog(overlaySettings?: OverlaySettings): void; showSnackbarFor(index: number): void; getColumnByName(name: string): any; getColumnByVisibleIndex(index: number): ColumnType; diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts b/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts index d7f0bf67eb3..52fce57cbad 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts +++ b/projects/igniteui-angular/src/lib/grids/grid/grid-filtering-advanced.spec.ts @@ -14,7 +14,8 @@ import { IgxGridAdvancedFilteringColumnGroupComponent, IgxGridAdvancedFilteringComponent, IgxGridExternalAdvancedFilteringComponent, - IgxGridAdvancedFilteringBindingComponent + IgxGridAdvancedFilteringBindingComponent, + IgxGridAdvancedFilteringOverlaySettingsComponent } from '../../test-utils/grid-samples.spec'; import { ControlsFunction } from '../../test-utils/controls-functions.spec'; import { FormattedValuesFilteringStrategy } from '../../data-operations/filtering-strategy'; @@ -3043,6 +3044,29 @@ describe('IgxGrid - Advanced Filtering #grid - ', () => { expect(grid.filteredData).toBe(null); })); }); + + describe('Overlay settings - ', () => { + it('Should respect the overlay settings set in the component.', fakeAsync(() => { + const fix = TestBed.createComponent(IgxGridAdvancedFilteringOverlaySettingsComponent); + const grid: IgxGridComponent = fix.componentInstance.grid; + fix.detectChanges(); + + // Open Advanced Filtering dialog. + grid.openAdvancedFilteringDialog(); + fix.detectChanges(); + + // Verify context menu is opened. + expect(GridFunctions.getAdvancedFilteringComponent(fix)).not.toBeNull(); + + // Press 'Escape' on the context menu. + UIInteractions.triggerKeyDownEvtUponElem('Escape', GridFunctions.getRowEditingOverlay(fix)); + tick(); + fix.detectChanges(); + + // Verify context menu is opened. + expect(GridFunctions.getAdvancedFilteringComponent(fix)).not.toBeNull(); + })); + }); }); const selectColumnInEditModeExpression = (fix, dropdownItemIndex: number) => { diff --git a/projects/igniteui-angular/src/lib/grids/toolbar/grid-toolbar-advanced-filtering.component.html b/projects/igniteui-angular/src/lib/grids/toolbar/grid-toolbar-advanced-filtering.component.html index e578f76efbc..c91a6263490 100644 --- a/projects/igniteui-angular/src/lib/grids/toolbar/grid-toolbar-advanced-filtering.component.html +++ b/projects/igniteui-angular/src/lib/grids/toolbar/grid-toolbar-advanced-filtering.component.html @@ -1,6 +1,6 @@