Merge branch 'master' into simeonoff/css-spacing-vars

simeonoff · web-flow · commit 8b405c224ea8 · 2022-04-21T10:47:01.000+03:00
diff --git a/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-custom-dialog.component.ts b/projects/igniteui-angular/src/lib/grids/filtering/excel-style/excel-style-custom-dialog.component.ts
@@ -130,6 +130,7 @@ export class IgxExcelStyleCustomDialogComponent implements AfterViewInit {
                 this.grid.rootGrid ? this.grid.rootGrid.nativeElement : this.grid.nativeElement :
                 esf;
         this.toggle.open(this._customDialogOverlaySettings);
+        this.overlayComponentId = this.toggle.overlayId;
     }
 
     public onClearButtonClick() {
@@ -141,6 +142,7 @@ export class IgxExcelStyleCustomDialogComponent implements AfterViewInit {
     public closeDialog() {
         if (this.overlayComponentId) {
             this.overlayService.hide(this.overlayComponentId);
+            this.overlayComponentId = null;
         } else {
             this.toggle.close();
         }

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,7 @@ export class IgxExcelStyleCustomDialogComponent implements AfterViewInit {`
`130`	`130`	`this.grid.rootGrid ? this.grid.rootGrid.nativeElement : this.grid.nativeElement :`
`131`	`131`	`esf;`
`132`	`132`	`this.toggle.open(this._customDialogOverlaySettings);`
	`133`	`+ this.overlayComponentId = this.toggle.overlayId;`
`133`	`134`	`}`
`134`	`135`
`135`	`136`	`public onClearButtonClick() {`
`@@ -141,6 +142,7 @@ export class IgxExcelStyleCustomDialogComponent implements AfterViewInit {`
`141`	`142`	`public closeDialog() {`
`142`	`143`	`if (this.overlayComponentId) {`
`143`	`144`	`this.overlayService.hide(this.overlayComponentId);`
	`145`	`+ this.overlayComponentId = null;`
`144`	`146`	`} else {`
`145`	`147`	`this.toggle.close();`
`146`	`148`	`}`