Merge branch 'master' into mkirova/fix-7315

Author: kdinev

projects/igniteui-angular/src/lib/combo/combo.component.spec.ts

@@ -750,7 +750,8 @@ describe('igxCombo', () => {
                 scrollIndex += 10;
                 if (scrollIndex < combo.data.length) {
                     combo.virtualScrollContainer.scrollTo(scrollIndex);
-                    combo.virtualScrollContainer.onChunkLoad.pipe(take(1)).subscribe(() => {
+                    combo.virtualScrollContainer.onChunkLoad.pipe(take(1)).subscribe(async() => {
+                        await wait(30);
                         checkGroupedItemsClass();
                     });
                 } else {

projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts

@@ -734,13 +734,8 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
         if (!parseInt(this.scrollComponent.nativeElement.style.height, 10)) {
             return;
         }
-
-        const containerSize = parseInt(this.igxForContainerSize, 10);
-        const maxRealScrollTop = event.target.children[0].scrollHeight - containerSize;
-        const realPercentScrolled = maxRealScrollTop !== 0 ?  event.target.scrollTop / maxRealScrollTop : 0;
         if (!this._bScrollInternal) {
-            const maxVirtScrollTop = this._virtHeight - containerSize;
-            this._virtScrollTop = realPercentScrolled * maxVirtScrollTop;
+            this._calcVirtualScrollTop(event.target.scrollTop);
         } else {
             this._bScrollInternal = false;
         }
@@ -1340,11 +1335,25 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
     }
     private _updateVScrollOffset() {
         let scrollOffset = 0;
+        let currentScrollTop = this.scrollPosition;
+        if (this._virtHeightRatio !== 1) {
+            this._calcVirtualScrollTop(this.scrollPosition);
+            currentScrollTop = this._virtScrollTop;
+        }
         const vScroll =  this.scrollComponent.nativeElement;
         scrollOffset = vScroll && this.scrollComponent.size ?
-            this.scrollPosition - this.sizesCache[this.state.startIndex] : 0;
+        currentScrollTop - this.sizesCache[this.state.startIndex] : 0;
         this.dc.instance._viewContainer.element.nativeElement.style.top = -(scrollOffset) + 'px';
     }
+
+    protected _calcVirtualScrollTop(scrollTop: number) {
+        const containerSize = parseInt(this.igxForContainerSize, 10);
+        const maxRealScrollTop = this.scrollComponent.size - containerSize;
+        const realPercentScrolled = maxRealScrollTop !== 0 ?  scrollTop / maxRealScrollTop : 0;
+        const maxVirtScrollTop = this._virtHeight - containerSize;
+        this._virtScrollTop = realPercentScrolled * maxVirtScrollTop;
+    }
+
     private _updateHScrollOffset() {
         let scrollOffset = 0;
         scrollOffset =  this.scrollComponent.nativeElement &&
@@ -1615,13 +1624,8 @@ export class IgxGridForOfDirective<T> extends IgxForOfDirective<T> implements On
         if (!parseInt(this.scrollComponent.nativeElement.style.height, 10)) {
             return;
         }
-
-        const containerSize = parseInt(this.igxForContainerSize, 10);
-        const maxRealScrollTop = event.target.children[0].scrollHeight - containerSize;
-        const realPercentScrolled = maxRealScrollTop !== 0 ?  event.target.scrollTop / maxRealScrollTop : 0;
         if (!this._bScrollInternal) {
-            const maxVirtScrollTop = this._virtHeight - containerSize;
-            this._virtScrollTop = realPercentScrolled * maxVirtScrollTop;
+            this._calcVirtualScrollTop(event.target.scrollTop);
         } else {
             this._bScrollInternal = false;
         }

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

@@ -797,9 +797,11 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
      */
     public onKeyDown(eventArgs: KeyboardEvent) {
         eventArgs.stopPropagation();
-        if (!this.contextMenuToggle.collapsed &&
-            (eventArgs.key === KEYS.ESCAPE || eventArgs.key === KEYS.ESCAPE_IE)) {
+        const key = eventArgs.key;
+        if (!this.contextMenuToggle.collapsed && (key === KEYS.ESCAPE || key === KEYS.ESCAPE_IE)) {
             this.clearSelection();
+        } else if (key === KEYS.ESCAPE || key === KEYS.ESCAPE_IE) {
+            this.closeDialog();
         }
     }
 
@@ -1072,6 +1074,9 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
         if (this._overlayComponentId) {
             this._overlayService.hide(this._overlayComponentId);
         }
+        if (this.grid.navigation.activeNode && this.grid.navigation.activeNode.row === -1) {
+            (this.grid as any).theadRow.nativeElement.focus();
+        }
     }
 
     /**

projects/igniteui-angular/src/lib/grids/grid/grid-keyBoardNav-headers.spec.ts

@@ -421,6 +421,35 @@ describe('IgxGrid - Headers Keyboard navigation #grid', () => {
             expect(GridFunctions.getAdvancedFilteringComponent(fix)).not.toBeNull();
         });
 
+        it('Advanced Filtering: Should be able to close Advanced filtering with "escape"',  fakeAsync(() => {
+            // Enable Advanced Filtering
+            grid.allowAdvancedFiltering = true;
+            fix.detectChanges();
+            let header = GridFunctions.getColumnHeader('Name', fix);
+            UIInteractions.simulateClickAndSelectEvent(header);
+            fix.detectChanges();
+
+            // Verify first header is focused
+            GridFunctions.verifyHeaderIsFocused(header.parent);
+
+            UIInteractions.triggerEventHandlerKeyDown('L', gridHeader, true);
+            fix.detectChanges();
+
+            // Verify AF dialog is opened.
+            expect(GridFunctions.getAdvancedFilteringComponent(fix)).not.toBeNull();
+
+            const afDialog = fix.nativeElement.querySelector('.igx-advanced-filter');
+            UIInteractions.triggerKeyDownEvtUponElem('Escape', afDialog);
+            tick(DEBOUNCETIME);
+            fix.detectChanges();
+
+            // Verify AF dialog is closed.
+            header = GridFunctions.getColumnHeader('Name', fix);
+            expect(GridFunctions.getAdvancedFilteringComponent(fix)).toBeNull();
+            GridFunctions.verifyHeaderIsFocused(header.parent);
+        }));
+
+
         it('Column selection: Should be able to select columns when columnSelection is multi', () => {
             const columnID = grid.getColumnByName('ID');
             const columnParentID = grid.getColumnByName('ParentID');