Merge branch '8.2.x' into dmdimitrov/issue6224-8.2.x

Author: DiyanDimitrov

projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.ts

@@ -208,12 +208,6 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
     constructor(private element: ElementRef, public cdr: ChangeDetectorRef) { }
 
     public ngAfterViewInit(): void {
-        if (this.addRootAndGroupButton) {
-            this.addRootAndGroupButton.nativeElement.focus();
-        } else if (this.addConditionButton) {
-            this.addConditionButton.nativeElement.focus();
-        }
-
         this._overlaySettings.outlet = this.overlayOutlet;
         this.columnSelectOverlaySettings.outlet = this.overlayOutlet;
         this.conditionSelectOverlaySettings.outlet = this.overlayOutlet;
@@ -791,6 +785,17 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
         }
     }
 
+    /**
+     * @hidden @internal
+     */
+    public setAddButtonFocus() {
+        if (this.addRootAndGroupButton) {
+            this.addRootAndGroupButton.nativeElement.focus();
+        } else if (this.addConditionButton) {
+            this.addConditionButton.nativeElement.focus();
+        }
+    }
+
     public context(expression: ExpressionItem, afterExpression?: ExpressionItem) {
         return {
             $implicit: expression,

projects/igniteui-angular/src/lib/grids/grid-base.component.ts

@@ -2991,6 +2991,10 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
         this.overlayService.onOpened.pipe(destructor).subscribe((event) => {
             // do not hide the advanced filtering overlay on scroll
             if (this._advancedFilteringOverlayId === event.id) {
+                const instance = event.componentRef.instance as IgxAdvancedFilteringDialogComponent;
+                if (instance) {
+                    instance.setAddButtonFocus();
+                }
                 return;
             }