fix(IgxGrid): return the active node when perform filtering #7337

Author: ddincheva

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

@@ -129,6 +129,11 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
      */
     public searchValue: any;
 
+    /**
+     * @hidden @internal
+     */
+    public lastActiveNode;
+
     private _positionSettings = {
         horizontalStartPoint: HorizontalAlignment.Right,
         verticalStartPoint: VerticalAlignment.Top
@@ -1075,6 +1080,7 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
         if (this._overlayComponentId) {
             this._overlayService.hide(this._overlayComponentId);
         }
+        this.grid.navigation.activeNode = this.lastActiveNode;
         if (this.grid.navigation.activeNode && this.grid.navigation.activeNode.row === -1) {
             (this.grid as any).theadRow.nativeElement.focus();
         }

projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts

@@ -46,11 +46,11 @@ export class IgxFilteringService implements OnDestroy {
     private columnToExpressionsMap = new Map<string, ExpressionUI[]>();
     private _datePipe: IgxDatePipeComponent;
     private columnStartIndex = -1;
-    private _filterIconsRegistered = false;
     private _componentOverlayId: string;
     private _filterMenuPositionSettings: PositionSettings;
     private _filterMenuOverlaySettings: OverlaySettings;
     private column;
+    private lastActiveNode;
 
     public isFilterRowVisible = false;
     public filteredColumn: IgxColumnComponent = null;
@@ -98,6 +98,7 @@ export class IgxFilteringService implements OnDestroy {
             takeUntil(this.destroy$)).subscribe((eventArgs) => {
                 const instance = eventArgs.componentRef.instance as any;
                 if (instance) {
+                    this.lastActiveNode = this.grid.navigation.activeNode;
                     instance.initialize(this.column, this._overlayService, eventArgs.id);
                 }
             });
@@ -106,6 +107,7 @@ export class IgxFilteringService implements OnDestroy {
             filter(overlay => overlay.id === this._componentOverlayId),
             takeUntil(this.destroy$)).subscribe(() => {
                 this._componentOverlayId = null;
+                this.grid.navigation.activeNode = this.lastActiveNode;
                 this.grid.theadRow.nativeElement.focus();
             });
     }