Merge branch 'rkaraivanov/skip-small-scrolls-logic' of https://github.com/IgniteUI/igniteui-angular into rkaraivanov/skip-small-scrolls-logic

Author: ddincheva

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

@@ -1216,19 +1216,21 @@ describe('igxCombo', () => {
                 fixture.detectChanges();
                 let items = fixture.debugElement.queryAll(By.css(`.${CSS_CLASS_DROPDOWNLISTITEM}`));
                 let lastItem = items[items.length - 1].componentInstance;
+                let lastItemIndex = lastItem.index;
                 expect(lastItem).toBeDefined();
                 lastItem.clicked(mockClick);
                 await wait(30);
                 fixture.detectChanges();
-                expect(dropdown.focusedItem).toEqual(lastItem);
+                expect(dropdown.focusedItem.index).toEqual(lastItemIndex);
                 dropdown.navigateItem(-1);
                 await wait(30);
                 fixture.detectChanges();
                 expect(virtualMockDOWN).toHaveBeenCalledTimes(0);
+                lastItemIndex = lastItem.index;
                 lastItem.clicked(mockClick);
                 await wait(30);
                 fixture.detectChanges();
-                expect(dropdown.focusedItem).toEqual(lastItem);
+                expect(dropdown.focusedItem.index).toEqual(lastItemIndex);
                 dropdown.navigateNext();
                 await wait(30);
                 fixture.detectChanges();

projects/igniteui-angular/src/lib/grids/filtering/grid-filtering.service.ts

@@ -105,7 +105,6 @@ export class IgxFilteringService implements OnDestroy {
         this._overlayService.onClosed.pipe(
             filter(overlay => overlay.id === this._componentOverlayId),
             takeUntil(this.destroy$)).subscribe(() => {
-                console.log('Close');
                 this._componentOverlayId = null;
                 this.grid.theadRow.nativeElement.focus();
             });

projects/igniteui-angular/src/lib/grids/grid/grid-cell-editing.spec.ts

@@ -13,6 +13,7 @@ import {
     ColumnEditablePropertyTestComponent
 } from '../../test-utils/grid-samples.spec';
 import { DebugElement } from '@angular/core';
+import { setupGridScrollDetection } from '../../test-utils/helper-utils.spec';
 
 const DEBOUNCETIME = 30;
 const CELL_CSS_CLASS = '.igx-grid__td';
@@ -381,38 +382,31 @@ describe('IgxGrid - Cell Editing #grid', () => {
         });
 
         it('When cell in editMode and try to navigate with `ArrowUp` - focus should remain over the input.', (async () => {
-            const verticalScroll = grid.verticalScrollContainer.getScroll();
-            let expectedScroll;
-            let cellElem;
-            GridFunctions.scrollTop(grid, 1000);
-            await wait(500);
+            let cell = grid.getCellByColumn(0, 'firstName' );
+            UIInteractions.simulateClickAndSelectEvent(cell);
+            fixture.detectChanges();
+            GridFunctions.simulateGridContentKeydown(fixture, 'ArrowDown', false, false, true);
+            await wait(100);
             fixture.detectChanges();
 
-            let testCells = grid.getColumnByName('firstName').cells;
-            let cell = testCells[testCells.length - 1];
-            cellElem = cell.nativeElement;
-
-            cellElem.dispatchEvent(new Event('focus'));
-            cellElem.dispatchEvent(new MouseEvent('dblclick'));
+            cell = grid.getCellByColumn(8, 'firstName' );
+            UIInteractions.simulateDoubleClickAndSelectEvent(cell);
+            await wait(DEBOUNCETIME);
             fixture.detectChanges();
-            await wait(50);
 
-            let inputElem: HTMLInputElement = document.activeElement as HTMLInputElement;
+            const inputElem: HTMLInputElement = document.activeElement as HTMLInputElement;
             expect(cell.editMode).toBeTruthy();
-            expect(cellElem.classList.contains(CELL_CLASS_IN_EDIT_MODE)).toBe(true);
-            expectedScroll = verticalScroll.scrollTop;
+            expect(cell.nativeElement.classList.contains(CELL_CLASS_IN_EDIT_MODE)).toBe(true);
+            const expectedScroll = grid.verticalScrollContainer.getScroll().scrollTop;
 
             UIInteractions.triggerKeyDownEvtUponElem('ArrowUp', inputElem, true);
-            fixture.detectChanges();
             await wait(DEBOUNCETIME);
+            fixture.detectChanges();
 
-            inputElem = document.activeElement as HTMLInputElement;
-            testCells = grid.getColumnByName('firstName').cells;
-            cell = testCells[testCells.length - 1];
-            cellElem = cell.nativeElement;
+            cell = grid.getCellByColumn(8, 'firstName' );
             expect(cell.editMode).toBeTruthy();
-            expect(cellElem.classList.contains(CELL_CLASS_IN_EDIT_MODE)).toBe(true);
-            expect(verticalScroll.scrollTop).toBe(expectedScroll);
+            expect(cell.nativeElement.classList.contains(CELL_CLASS_IN_EDIT_MODE)).toBe(true);
+            expect(grid.verticalScrollContainer.getScroll().scrollTop).toBe(expectedScroll);
         }));
 
         it('When cell in editMode and try to navigate with `ArrowRight` - focus should remain over the input.', (async () => {

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid-multi-cell-selection.spec.ts

@@ -369,6 +369,7 @@ describe('IgxTreeGrid - Multi Cell selection #tGrid', () => {
             const selectionChangeSpy = spyOn<any>(treeGrid.onRangeSelection, 'emit').and.callThrough();
             treeGrid.getColumnByName('Name').hasSummary = true;
             treeGrid.summaryCalculationMode = 'childLevelsOnly';
+            await wait(30);
             fix.detectChanges();
 
             const gridContent = GridFunctions.getGridContent(fix);
@@ -378,28 +379,28 @@ describe('IgxTreeGrid - Multi Cell selection #tGrid', () => {
 
             GridSelectionFunctions.verifyCellSelected(cell);
 
-            for (let i = 8; i < 16; i++) {
+            for (let i = 8; i < 12; i++) {
                 UIInteractions.triggerEventHandlerKeyDown('arrowdown', gridContent, false, true);
                 await wait(30);
                 fix.detectChanges();
             }
 
-            expect(selectionChangeSpy).toHaveBeenCalledTimes(5);
-            GridSelectionFunctions.verifyCellsRegionSelected(treeGrid, 8, 15, 1, 1);
+            expect(selectionChangeSpy).toHaveBeenCalledTimes(3);
+            GridSelectionFunctions.verifyCellsRegionSelected(treeGrid, 8, 11, 1, 1);
 
             for (let i = 1; i < 3; i++) {
                 UIInteractions.triggerEventHandlerKeyDown('arrowright', gridContent, false, true);
                 await wait(30);
                 fix.detectChanges();
             }
 
-            GridSelectionFunctions.verifyCellsRegionSelected(treeGrid, 8, 15, 1, 1);
+            GridSelectionFunctions.verifyCellsRegionSelected(treeGrid, 8, 11, 1, 1);
 
             UIInteractions.triggerEventHandlerKeyDown('arrowup', gridContent, false, true);
             await wait(30);
             fix.detectChanges();
-            expect(selectionChangeSpy).toHaveBeenCalledTimes(6);
-            GridSelectionFunctions.verifySelectedRange(treeGrid, 8, 15, 1, 3);
+            expect(selectionChangeSpy).toHaveBeenCalledTimes(4);
+            GridSelectionFunctions.verifySelectedRange(treeGrid, 8, 11, 1, 3);
         }));
 
         it('Summaries: should clear selected range when navigate from summary cell without pressed shift', (async () => {

projects/igniteui-angular/src/lib/test-utils/grid-functions.spec.ts

@@ -244,7 +244,7 @@ export class GridFunctions {
     }
 
     public static getGroupedRows(fix): DebugElement[] {
-        return fix.debugElement.queryAll(By.css(GROUP_ROW_CLASS));
+        return this.sortDebugElementsVertically(fix.debugElement.queryAll(By.css(GROUP_ROW_CLASS)));
     }
 
     public static verifyGroupRowIsFocused(groupRow, focused = true) {