Merge pull request #6204 from IgniteUI/mkirova/fix-6191

chore(*): Re-apply focus after expansion state is changed.

Author: ChronosSF

projects/igniteui-angular/src/lib/directives/template-outlet/template_outlet.directive.ts

@@ -63,9 +63,10 @@ export class IgxTemplateOutletDirective implements OnChanges {
     }
 
     private _recreateView() {
+        const prevIndex = this._viewRef ? this._viewContainerRef.indexOf(this._viewRef) : -1;
         // detach old and create new
-        if (this._viewRef) {
-            this._viewContainerRef.detach(this._viewContainerRef.indexOf(this._viewRef));
+        if (prevIndex !== -1) {
+            this._viewContainerRef.detach(prevIndex);
         }
         if (this.igxTemplateOutlet) {
             this._viewRef = this._viewContainerRef.createEmbeddedView(

projects/igniteui-angular/src/lib/grids/cell.component.ts

@@ -862,15 +862,6 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
             }
             this.grid.expansionStates = expandedStates;
             this.grid.notifyChanges();
-            const isVirtualized = !this.grid.verticalScrollContainer.dc.instance.notVirtual;
-            // persist focused cell
-            const el = this.grid.selectionService.activeElement;
-            if (isVirtualized && el) {
-                const cell = this.grid.gridAPI.get_cell_by_visible_index(el.row, el.column);
-                if (cell) {
-                    cell.nativeElement.focus();
-                }
-            }
         }
     }
 

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

@@ -6044,4 +6044,16 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
             advancedFilteringDialog.closeDialog();
         }
     }
+
+   protected _focusActiveCell() {
+    // persist focused cell
+    const isVirtualized = !this.verticalScrollContainer.dc.instance.notVirtual;
+    const el = this.selectionService.activeElement;
+    if (isVirtualized && el) {
+        const cell = this.gridAPI.get_cell_by_visible_index(el.row, el.column);
+        if (cell) {
+            cell.nativeElement.focus();
+        }
+    }
+}
 }

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

@@ -598,6 +598,7 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
         this.expansionStatesChange.emit(this._expansionStates);
         if (this.gridAPI.grid) {
             this.cdr.detectChanges();
+            this._focusActiveCell();
         }
     }