Merge branch 'master' into apetrov/fix-tabs-demo-icon

Author: adrianptrv

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

@@ -4106,7 +4106,10 @@ export abstract class IgxGridBaseDirective implements GridType,
             return this._activeRowIndexes;
         } else {
             const activeRow = this.navigation.activeNode?.row;
-            const selectedCellIndexes = (this.selectionService.selection?.keys() as any)?.toArray();
+
+            const selectedCellIndexes = this.selectionService.selection
+            ? Array.from(this.selectionService.selection.keys())
+            : [];
             this._activeRowIndexes = [activeRow, ...selectedCellIndexes];
             return this._activeRowIndexes;
         }

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

@@ -6580,27 +6580,24 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
 
             // Scroll the search list to the bottom.
             let scrollbar = GridFunctions.getExcelStyleSearchComponentScrollbar(fix);
+            expect(scrollbar.scrollTop).toBe(0);
+            let listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix);
+            expect(listItems[0].innerText).toBe('Select All');
+
             scrollbar.scrollTop = 3000;
             await wait();
             fix.detectChanges();
+            expect(listItems[0].innerText).not.toBe('Select All');
+            expect(scrollbar.scrollTop).toBeGreaterThan(300);
 
             // Select another column
             GridFunctions.clickExcelFilterIcon(fix, 'Downloads');
             await wait();
             fix.detectChanges();
 
             // Update scrollbar
-            const searchComponent = GridFunctions.getExcelStyleSearchComponent(fix);
             scrollbar = GridFunctions.getExcelStyleSearchComponentScrollbar(fix);
-            await wait();
-            fix.detectChanges();
-
-            // Get the display container and its parent and verify that the display container is at start
-            const displayContainer = searchComponent.querySelector('igx-display-container');
-            const displayContainerRect = displayContainer.getBoundingClientRect();
-            const parentContainerRect = displayContainer.parentElement.getBoundingClientRect();
-
-            expect(displayContainerRect.top - parentContainerRect.top <= 1).toBe(true, 'search scrollbar did not reset');
+            expect(scrollbar.scrollTop).toBe(0, 'search scrollbar did not reset');
         });
     });