Merge branch 'master' into dpetev/exporter-decorator-revert

Author: damyanpetev

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.html

@@ -115,6 +115,7 @@
             let-rowIndex="index" [igxForScrollOrientation]="'vertical'" [igxForScrollContainer]='verticalScroll'
             [igxForContainerSize]='calcHeight'
             [igxForItemSize]="hasColumnLayouts ? rowHeight * multiRowLayoutRowSize + 1 : renderedRowHeight"
+            [igxForTrackBy]='trackChanges'
             #verticalScrollContainer (onChunkPreload)="dataLoading($event)">
             <ng-template
                 [igxTemplateOutlet]='getRowTemplate(rowData)'

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();
         }
     }
 
@@ -687,6 +688,16 @@ export class IgxGridComponent extends IgxGridBaseDirective implements GridType,
         }
     }
 
+    /**
+     * @hidden
+     */
+    public trackChanges(index, rec) {
+        if (rec.detailsData !== undefined) {
+            return rec.detailsData;
+        }
+        return rec;
+    }
+
     public detailsKeyboardHandler(event, rowIndex, container) {
         const colIndex = this.selectionService.activeElement ? this.selectionService.activeElement.column : 0;
         const shift = event.shiftKey;

src/app/app.module.ts

@@ -111,16 +111,10 @@ import { GridFlexSampleComponent } from './grid-flex-layout/grid-flex.sample';
 import { GridEsfLoadOnDemandComponent } from './grid-esf-load-on-demand/grid-esf-load-on-demand.component';
 import { GridFilteringComponent } from './grid-filtering/grid-filtering.sample';
 import { GridExternalFilteringComponent } from './grid-external-filtering/grid-external-filtering.sample';
-<<<<<<< HEAD
 import { AboutComponent } from './grid-state/about.component';
 import { GridSaveStateComponent } from './grid-state/grid-state.component';
-=======
 import { GridMasterDetailSampleComponent } from './grid-master-detail/grid-master-detail.sample';
 
->>>>>>> d6c950b7be7f540e1ff3c167dd5f79301676e035
-
-
-
 const components = [
     AppComponent,
     AutocompletePipeContains,