fix(grid): focus grid body after close filter row #7384

Author: nrobakova

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

@@ -6283,11 +6283,22 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
             this.navigateTo(rowIndex, visibleColIndex, (c) => {
                 if (c.targetType === GridKeydownTargetType.dataCell && c.target) {
                     c.target.activate();
-                    this.tbody.nativeElement.focus();
                 }
             });
         }
     }
+
+    /**
+     * @hidden
+     * @internal
+     */
+    public endRowEdit(commit = true, event?: Event) {
+        this.endEdit(commit, event);
+        const activeCell = this.navigation.activeNode;
+        if (activeCell && activeCell.row !== -1) {
+            this.tbody.nativeElement.focus();
+        }
+    }
     /**
      * @hidden
      */

projects/igniteui-angular/src/lib/grids/grid/grid.component.html

@@ -291,8 +291,8 @@
 </ng-template>
 
 <ng-template #defaultRowEditActions>
-    <button igxButton igxRowEditTabStop (click)="endEdit(false, $event)">Cancel</button>
-    <button igxButton igxRowEditTabStop (click)="endEdit(true, $event)">Done</button>
+    <button igxButton igxRowEditTabStop (click)="endRowEdit(false, $event)">Cancel</button>
+    <button igxButton igxRowEditTabStop (click)="endRowEdit(true, $event)">Done</button>
 </ng-template>
 
 <ng-template #defaultRowEditTemplate>

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html

@@ -237,8 +237,8 @@
     You have {{ rowChangesCount }} changes in this row
 </ng-template>
 <ng-template #defaultRowEditActions>
-    <button igxButton igxRowEditTabStop (click)="endEdit(false, $event)">Cancel</button>
-    <button igxButton igxRowEditTabStop (click)="endEdit(true, $event)">Done</button>
+    <button igxButton igxRowEditTabStop (click)="endRowEdit(false, $event)">Cancel</button>
+    <button igxButton igxRowEditTabStop (click)="endRowEdit(true, $event)">Done</button>
 </ng-template>
 <ng-template #defaultRowEditTemplate>
     <div class="igx-banner__message">

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html

@@ -206,8 +206,8 @@
 </ng-template>
 
 <ng-template #defaultRowEditActions>
-    <button igxButton igxRowEditTabStop (click)="endEdit(false, $event)">Cancel</button>
-    <button igxButton igxRowEditTabStop (click)="endEdit(true, $event)">Done</button>
+    <button igxButton igxRowEditTabStop (click)="endRowEdit(false, $event)">Cancel</button>
+    <button igxButton igxRowEditTabStop (click)="endRowEdit(true, $event)">Done</button>
 </ng-template>
 
 <ng-template #defaultRowEditTemplate>