Merge branch '10.2.x' into alt-l-under-mac-10.2.x

Author: zdrawku

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

@@ -619,6 +619,7 @@ export class IgxGridExcelStyleFilteringComponent implements OnDestroy {
 
     private addItems(shouldUpdateSelection: boolean) {
         this.selectAllSelected = true;
+        this.containsNullOrEmpty = false;
         this.selectAllIndeterminate = false;
 
         this.uniqueValues.forEach(element => {

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

@@ -175,11 +175,6 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
     private _cdrRequests = false;
     protected _cdrRequestRepaint = false;
 
-    /**
-     * @hidden @internal
-     */
-    public snackbarDisplayTime = 2000;
-
     /**
      * @hidden @internal
      */
@@ -250,6 +245,14 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
         return this._resourceStrings;
     }
 
+    /**
+     * Gets/Sets the display time for the row adding snackbar notification.
+     * @remarks
+     * By default it is 6000ms.
+     */
+    @Input()
+    public snackbarDisplayTime = 6000;
+
     /**
      * Gets/Sets whether to autogenerate the columns.
      * @remarks

projects/igniteui-angular/src/lib/grids/grid/grid-add-row.spec.ts

@@ -288,6 +288,27 @@ describe('IgxGrid - Row Adding #grid', () => {
             const cell = newRow.cells.find(c => c.column === column);
             expect(typeof(cell.value)).toBe(type);
         });
+
+        it('should allow setting a different display time for snackbar', async() => {
+            grid.snackbarDisplayTime = 50;
+            fixture.detectChanges();
+
+            const row = grid.getRowByIndex(0);
+            row.beginAddRow();
+            fixture.detectChanges();
+
+            endTransition();
+
+            grid.endEdit(true);
+            fixture.detectChanges();
+
+            expect(grid.addRowSnackbar.isVisible).toBe(true);
+            // should hide after 50ms
+            await wait(51);
+            fixture.detectChanges();
+
+            expect(grid.addRowSnackbar.isVisible).toBe(false);
+        });
     });
 
     describe('Add row events tests:', () => {

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

@@ -4860,6 +4860,20 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
             inputNativeElement = GridFunctions.getExcelStyleSearchComponentInput(fix);
             expect(inputNativeElement.value).toBe('', 'input value didn\'t reset');
         }));
+
+        it('Should reset blank items on column change.', fakeAsync(() => {
+            GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'ProductName');
+            flush();
+
+            let listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix);
+            expect(listItems[1].innerText).toBe('(Blanks)');
+
+            GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'AnotherField');
+            flush();
+
+            listItems = GridFunctions.getExcelStyleSearchComponentListItems(fix);
+            expect(listItems[1].innerText).not.toBe('(Blanks)');
+        }));
     });
 
     describe('Load values on demand', () => {