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
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,16 @@ export class IgxToggleDirective implements IToggleView, OnInit, OnDestroy {
return info ? info.closeAnimationPlayer : false;
}

/**
* Returns the id of the overlay the content is rendered in.
* ```typescript
* this.myToggle.overlayId;
* ```
*/
public get overlayId() {
return this._overlayId;
}

/**
* Repositions the toggle.
* ```typescript
Expand Down
10 changes: 8 additions & 2 deletions projects/igniteui-angular/src/lib/grids/grid-base.directive.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2893,6 +2893,8 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
});

this.overlayService.onOpened.pipe(destructor).subscribe((event) => {
const overlaySettings = this.overlayService.getOverlayById(event.id)?.settings;

// do not hide the advanced filtering overlay on scroll
if (this._advancedFilteringOverlayId === event.id) {
const instance = event.componentRef.instance as IgxAdvancedFilteringDialogComponent;
Expand All @@ -2903,8 +2905,12 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
return;
}

if (this.overlayService.getOverlayById(event.id)?.settings?.outlet === this.outlet &&
this.overlayIDs.indexOf(event.id) < 0) {
// do not hide the overlay if it's attached to a row
if (this.rowEditingOverlay?.overlayId === event.id) {
return;
}

if (overlaySettings?.outlet === this.outlet && this.overlayIDs.indexOf(event.id) === -1) {
this.overlayIDs.push(event.id);
}
});
Expand Down
2 changes: 1 addition & 1 deletion projects/igniteui-angular/src/lib/grids/grid.common.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Directive } from '@angular/core';
import { Directive } from '@angular/core';
import { ConnectedPositioningStrategy } from '../services/public_api';
import { VerticalAlignment, PositionSettings } from '../services/overlay/utilities';
import { scaleInVerBottom, scaleInVerTop } from '../animations/main';
Expand Down