Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular into vkombov/feat-10125-master

Author: viktorkombov

projects/igniteui-angular/src/lib/directives/toggle/toggle.directive.ts

@@ -322,7 +322,7 @@ export class IgxToggleDirective implements IToggleView, OnInit, OnDestroy {
         if (this.navigationService && this.id) {
             this.navigationService.remove(this.id);
         }
-        if (!this.collapsed && this._overlayId) {
+        if (this._overlayId) {
             this.overlayService.detach(this._overlayId);
         }
         this.unsubscribe();

projects/igniteui-angular/src/lib/grids/state.directive.spec.ts

@@ -178,6 +178,27 @@ describe('IgxGridState - input properties #grid', () => {
         expect(gridState).toBe(filteringState);
     });
 
+    it('setState should correctly restore grid filtering state from  with null date values', () => {
+        const fix = TestBed.createComponent(IgxGridStateComponent);
+        fix.detectChanges();
+        const grid  = fix.componentInstance.grid;
+        grid.getCellByColumn(0, 'OrderDate').value = null;
+        fix.detectChanges();
+        const state = fix.componentInstance.state;
+
+        const filteringState = '{"filtering":{"filteringOperands":[{"filteringOperands":[{"condition":{"name":"empty","isUnary":true,"iconName":"is-empty"},"fieldName":"OrderDate","ignoreCase":true,"searchVal":null}],"operator":1,"fieldName":"OrderDate"}],"operator":0,"type":0}}';
+        const initialState = '{"filtering":{"filteringOperands":[],"operator":0}}';
+
+        let gridState = state.getState(true, 'filtering');
+        expect(gridState).toBe(initialState);
+
+        state.setState(filteringState);
+        gridState = state.getState(false, 'filtering') as IGridState;
+        HelperFunctions.verifyFilteringExpressions(grid.filteringExpressionsTree, gridState);
+        gridState = state.getState(true, 'filtering');
+        expect(gridState).toBe(filteringState);
+    });
+
     it('setState should correctly restore grid filtering state from object', () => {
         const fix = TestBed.createComponent(IgxGridStateComponent);
         fix.detectChanges();

projects/igniteui-angular/src/lib/grids/state.directive.ts

@@ -549,7 +549,7 @@ export class IgxGridStateDirective {
                 if (Array.isArray(expr.searchVal)) {
                     expr.searchVal = new Set(expr.searchVal);
                 } else {
-                    expr.searchVal = (dataType === 'date') ? new Date(Date.parse(expr.searchVal)) : expr.searchVal;
+                    expr.searchVal = expr.searchVal && (dataType === 'date') ? new Date(Date.parse(expr.searchVal)) : expr.searchVal;
                 }
                 expr.condition = this.generateFilteringCondition(dataType, expr.condition.name);
                 expressionsTree.filteringOperands.push(expr);

projects/igniteui-angular/src/lib/services/overlay/overlay.ts

@@ -644,7 +644,9 @@ export class IgxOverlayService implements OnDestroy {
             // to eliminate flickering show the element just before animation start
             info.wrapperElement.style.visibility = 'hidden';
         }
-        this.closed.emit({ id: info.id, componentRef: info.componentRef, event: info.event });
+        if (!info.closeAnimationDetaching) {
+            this.closed.emit({ id: info.id, componentRef: info.componentRef, event: info.event });
+        }
         delete info.event;
     }
 
@@ -659,15 +661,14 @@ export class IgxOverlayService implements OnDestroy {
         if (info.componentRef) {
             this._appRef.detachView(info.componentRef.hostView);
             info.componentRef.destroy();
+            delete info.componentRef;
         }
         if (info.hook) {
             info.hook.parentElement.insertBefore(info.elementRef.nativeElement, info.hook);
             info.hook.parentElement.removeChild(info.hook);
             delete info.hook;
         }
-        if (info.wrapperElement) {
-            delete info.wrapperElement;
-        }
+
         const index = this._overlayInfos.indexOf(info);
         this._overlayInfos.splice(index, 1);
 
@@ -679,6 +680,22 @@ export class IgxOverlayService implements OnDestroy {
             }
             this.removeCloseOnEscapeListener();
         }
+
+        // clean all the resources attached to info
+        delete info.elementRef;
+        delete info.settings;
+        delete info.initialSize;
+        info.openAnimationDetaching = true;
+        info.openAnimationPlayer?.destroy();
+        delete info.openAnimationPlayer;
+        delete info.openAnimationInnerPlayer;
+        info.closeAnimationDetaching = true;
+        info.closeAnimationPlayer?.destroy();
+        delete info.closeAnimationPlayer;
+        delete info.closeAnimationInnerPlayer;
+        delete info.ngZone;
+        delete info.wrapperElement;
+        info = null;
     }
 
     private playOpenAnimation(info: OverlayInfo) {
@@ -924,7 +941,9 @@ export class IgxOverlayService implements OnDestroy {
     }
 
     private openAnimationDone(info: OverlayInfo) {
-        this.opened.emit({ id: info.id, componentRef: info.componentRef });
+        if (!info.openAnimationDetaching) {
+            this.opened.emit({ id: info.id, componentRef: info.componentRef });
+        }
         if (info.openAnimationPlayer) {
             info.openAnimationPlayer.reset();
             // calling reset does not change hasStarted to false. This is why we are doing it here via internal field
@@ -940,7 +959,6 @@ export class IgxOverlayService implements OnDestroy {
     }
 
     private closeAnimationDone(info: OverlayInfo) {
-        this.closeDone(info);
         if (info.closeAnimationPlayer) {
             info.closeAnimationPlayer.reset();
             // calling reset does not change hasStarted to false. This is why we are doing it here via internal field
@@ -954,16 +972,17 @@ export class IgxOverlayService implements OnDestroy {
             // calling reset does not change hasStarted to false. This is why we are doing it here via internal field
             (info.openAnimationPlayer as any)._started = false;
         }
+        this.closeDone(info);
     }
 
     private finishAnimations(info: OverlayInfo) {
         // TODO: should we emit here opened or closed events
-        if (info.openAnimationPlayer) {
+        if (info.openAnimationPlayer && info.openAnimationPlayer.hasStarted()) {
             info.openAnimationPlayer.reset();
             // calling reset does not change hasStarted to false. This is why we are doing it here via internal field
             (info.openAnimationPlayer as any)._started = false;
         }
-        if (info.closeAnimationPlayer) {
+        if (info.closeAnimationPlayer && info.closeAnimationPlayer.hasStarted()) {
             info.closeAnimationPlayer.reset();
             // calling reset does not change hasStarted to false. This is why we are doing it here via internal field
             (info.closeAnimationPlayer as any)._started = false;

projects/igniteui-angular/src/lib/services/overlay/utilities.ts

@@ -147,8 +147,14 @@ export interface OverlayInfo {
     initialSize?: Size;
     hook?: HTMLElement;
     openAnimationPlayer?: AnimationPlayer;
-    closeAnimationPlayer?: AnimationPlayer;
     openAnimationInnerPlayer?: any;
+    // calling animation.destroy in detach fires animation.done. This should not happen
+    // this is why we should trace if animation ever started
+    openAnimationDetaching?: boolean;
+    closeAnimationPlayer?: AnimationPlayer;
+    // calling animation.destroy in detach fires animation.done. This should not happen
+    // this is why we should trace if animation ever started
+    closeAnimationDetaching?: boolean;
     closeAnimationInnerPlayer?: any;
     ngZone: NgZone;
     transformX?: number;

src/app/grid-cell-api/grid-cell-api.sample.ts

@@ -4,8 +4,6 @@ import {
     IgxTreeGridComponent,
     IgxHierarchicalGridComponent,
     CellType,
-    IgxGridTransaction,
-    IgxTransactionService
 } from 'igniteui-angular';
 import { HIERARCHICAL_SAMPLE_DATA } from '../shared/sample-data';
 

src/app/grid-row-api/grid-row-api.sample.ts

@@ -6,7 +6,6 @@ import {
     IgxHierarchicalGridComponent,
     IPinningConfig,
     RowPinningPosition,
-    IRowDragStartEventArgs,
     GridSummaryCalculationMode,
     GridSummaryPosition
 } from 'igniteui-angular';
@@ -179,7 +178,6 @@ export class GridRowAPISampleComponent implements OnInit {
     public togglePinning(grid: IgxGridComponent | IgxTreeGridComponent | IgxHierarchicalGridComponent,
         byIndex: boolean, index: number, key: any) {
         const row: RowType = byIndex ? grid.getRowByIndex(index) : grid.getRowByKey(key);
-        const index2: number = row.index;
         if (row.pinned) {
             row.unpin();
         } else {
@@ -308,16 +306,15 @@ export class GridRowAPISampleComponent implements OnInit {
         }
     }
 
-    public onEnter(args) {
+    public onEnter() {
         this.dragIcon = 'add';
     }
-    public onRowDragStart(args: IRowDragStartEventArgs) {
-        const row = args.dragData;
+    public onRowDragStart() {
         const count = this.grid.selectedRows.length || 1;
         this.countIcon = `filter_${count > 9 ? '9_plus' : `${count}`}`;
     }
-    public onLeave(args) {
-        this.onRowDragStart(args);
+    public onLeave() {
+        this.onRowDragStart();
         this.dragIcon = 'arrow_right_alt';
     }
 }

src/app/tree-grid-groupby/tree-grid-groupby.sample.ts

@@ -59,7 +59,7 @@ export class TreeGridGroupBySampleComponent implements OnInit {
         this.density = this.displayDensities[event.index].label;
     }
 
-    public cellEditDone(event: any) {
+    public cellEditDone() {
         this.groupingExpressions = [...this.groupingExpressions]; // will trigger grouping pipe
     }
 }

src/app/tree/tree.sample.ts

@@ -188,18 +188,14 @@ export class TreeSampleComponent implements AfterViewInit, OnDestroy {
 
     public ngAfterViewInit() {
         this.tree.nodes.toArray().forEach(node => {
-            node.selectedChange.subscribe((ev) => {
-                // console.log(ev);
-            });
+            node.selectedChange.subscribe(() => {});
         });
     }
 
     public ngOnDestroy() {
     }
 
-    public toggleSelectionMode(args) {
-        // this.tree.selection = this.selectionModes[args.index].selectMode;
-    }
+    public toggleSelectionMode() { }
 
     public changeDensity(args) {
         this.density = this.displayDensities[args.index].selectMode;