Merge branch 'master' into dmdimitrov/issue6810-master

Author: nrobakova

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_tooltip.scss

@@ -46,7 +46,10 @@ $_fluent-tooltip: extend(
     $_fluent-shape-tooltip,
     (
         background: (
-            igx-color: 'surface'
+            igx-color: ('grays', 900)
+        ),
+        text-color: (
+            igx-contrast-color: ('grays', 900)
         )
     )
 );

projects/igniteui-angular/src/lib/grids/filtering/excel-style/grid.excel-style-filtering.component.html

@@ -104,14 +104,14 @@ <h4>{{ column.header || column.field }}</h4>
 
     <section class="igx-excel-filter__actions">
 
-        <div *ngIf="column.selectable && grid.displayDensity==='comfortable'">
-            <ng-container *ngTemplateOutlet="selectingTemplate"></ng-container>
-        </div>
-
         <div *ngIf="column.movable">
             <ng-container *ngTemplateOutlet="movingTemplate"></ng-container>
         </div>
 
+        <div *ngIf="column.selectable && grid.displayDensity==='comfortable'">
+            <ng-container *ngTemplateOutlet="selectingTemplate"></ng-container>
+        </div>
+
         <div *ngIf="!column.disablePinning && grid.displayDensity==='comfortable'">
             <ng-container *ngTemplateOutlet="pinningTemplate"></ng-container>
         </div>

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.selection.spec.ts

@@ -49,14 +49,15 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             rowIsland2 = fix.componentInstance.rowIsland2;
         }));
 
-        it('should allow only one cell to be selected in the whole hierarchical grid.',  () => {
+        it('should allow only one cell to be selected in the whole hierarchical grid.', fakeAsync(() => {
             hierarchicalGrid.height = '500px';
             hierarchicalGrid.reflow();
             fix.detectChanges();
 
             let firstRow = hierarchicalGrid.getRowByIndex(0) as IgxHierarchicalRowComponent;
             firstRow.toggle();
             fix.detectChanges();
+            tick(100);
             expect(firstRow.expanded).toBeTruthy();
 
             let fCell = firstRow.cells.toArray()[0];
@@ -85,7 +86,8 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             fix.detectChanges();
             expect(fChildCell.selected).toBeFalsy();
             expect(fCell.selected).toBeTruthy();
-        });
+        }));
+
     });
 
     describe('Row Selection', () => {
@@ -97,10 +99,12 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             rowIsland2 = fix.componentInstance.rowIsland2;
         }));
 
-        it('should have checkboxes on each row', () => {
+        it('should have checkboxes on each row', fakeAsync(() => {
             hierarchicalGrid.expandChildren = true;
+            tick(100);
             fix.detectChanges();
             rowIsland1.expandChildren = true;
+            tick(100);
             fix.detectChanges();
 
             expect(hierarchicalGrid.rowSelection).toEqual(GridSelectionMode.multiple);
@@ -127,7 +131,7 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             for (const r of childGrid.dataRowList.toArray()) {
                 GridSelectionFunctions.verifyRowHasCheckbox(r.nativeElement, false, false);
             }
-        });
+        }));
 
         it('should able to change rowSelection at runtime', () => {
             hierarchicalGrid.expandChildren = true;
@@ -556,13 +560,14 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
             GridSelectionFunctions.verifyRowsArraySelected(childGrid.dataRowList.toArray());
         });
 
-        it('should not be able to select deleted row', () => {
+        it('should not be able to select deleted row', fakeAsync(() => {
             // Expand first row
             const firstRow = hierarchicalGrid.getRowByIndex(0) as IgxHierarchicalRowComponent;
             firstRow.toggle();
             fix.detectChanges();
 
             firstRow.onClick(UIInteractions.getMouseEvent('click'));
+            tick();
             fix.detectChanges();
 
             GridSelectionFunctions.verifyRowSelected(firstRow);
@@ -578,6 +583,7 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
 
             // Click on deleted row
             firstRow.onClick(UIInteractions.getMouseEvent('click'));
+            tick();
             fix.detectChanges();
 
             GridSelectionFunctions.verifyRowSelected(firstRow, false);
@@ -606,13 +612,14 @@ describe('IgxHierarchicalGrid selection #hGrid', () => {
 
             const childGridFirstRow = childGrid.getRowByIndex(0);
             childGridFirstRow.onClick(UIInteractions.getMouseEvent('click', false, false, true));
+            tick();
             fix.detectChanges();
 
             GridSelectionFunctions.verifyRowSelected(firstRow, false);
             GridSelectionFunctions.verifyHeaderRowCheckboxState(fix, true);
             expect(hierarchicalGrid.selectedRows()).toEqual(['1', '2', '3', '4']);
             expect(childGrid.selectedRows()).toEqual(['00']);
-        });
+        }));
 
         it('should be able to select added row', () => {
             // Set multiple selection to first row island