Merge branch '10.2.x' into grid-cell-edit-styling

Author: zdrawku

.github/workflows/nodejs.yml

@@ -5,9 +5,9 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ master, 9.1.x, 10.0.x, 10.1.x ]
+    branches: [ master, '[0-9]+.[0-9]+.x' ]
   pull_request:
-    branches: [ master, 9.1.x, 10.0.x, 10.1.x ]
+    branches: [ master, '[0-9]+.[0-9]+.x' ]
 
 jobs:
   build:

projects/igniteui-angular/src/lib/action-strip/grid-actions/grid-editing-actions.component.spec.ts

@@ -139,10 +139,10 @@ describe('igxGridEditingActions #grid ', () => {
             actionStrip = fixture.componentInstance.actionStrip;
             grid = fixture.componentInstance.grid;
         }));
-        it('should auto-show on mouse over of row.', () => {
+        it('should auto-show on mouse enter of row.', () => {
             const row = grid.getRowByIndex(0);
             const rowElem = row.nativeElement;
-            UIInteractions.simulateMouseEvent('mouseover', rowElem, 0, 0);
+            UIInteractions.simulateMouseEvent('mouseenter', rowElem, 0, 0);
             fixture.detectChanges();
 
             expect(actionStrip.context).toBe(row);
@@ -171,18 +171,18 @@ describe('igxGridEditingActions #grid ', () => {
             hierarchicalGrid = fixture.componentInstance.hgrid;
         }));
 
-        it('should auto-show root actionStrip on mouse over of root row.', () => {
+        it('should auto-show root actionStrip on mouse enter of root row.', () => {
             const row = hierarchicalGrid.getRowByIndex(0);
             const rowElem = row.nativeElement;
-            UIInteractions.simulateMouseEvent('mouseover', rowElem, 0, 0);
+            UIInteractions.simulateMouseEvent('mouseenter', rowElem, 0, 0);
             fixture.detectChanges();
 
             expect(actionStripRoot.context).toBe(row);
             expect(actionStripRoot.hidden).toBeFalse();
             expect(actionStripChild.context).toBeUndefined();
         });
 
-        it('should auto-show row island actionStrip on mouse over of child row.', () => {
+        it('should auto-show row island actionStrip on mouse enter of child row.', () => {
             const row = hierarchicalGrid.getRowByIndex(0) as IgxHierarchicalRowComponent;
             row.toggle();
             fixture.detectChanges();
@@ -191,7 +191,7 @@ describe('igxGridEditingActions #grid ', () => {
 
             const childRow = childGrid.getRowByIndex(0);
             const rowElem = childRow.nativeElement;
-            UIInteractions.simulateMouseEvent('mouseover', rowElem, 0, 0);
+            UIInteractions.simulateMouseEvent('mouseenter', rowElem, 0, 0);
             fixture.detectChanges();
 
             expect(actionStripChild.context).toBe(childRow);

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

@@ -250,9 +250,19 @@ export class IgxExcelStyleSearchComponent implements AfterViewInit, OnDestroy {
      * @hidden @internal
      */
     public onInputKeyDown(event): void {
-        if (event.key === KEYS.ENTER) {
-            event.preventDefault();
-            this.applyFilter();
+        switch (event.key) {
+            case KEYS.ENTER:
+                event.preventDefault();
+                this.applyFilter();
+
+                return;
+            case KEYS.ESCAPE || KEYS.ESCAPE_IE:
+                if (this.searchValue) {
+                    event.stopPropagation();
+                    this.clearInput();
+                }
+
+                return;
         }
     }
 

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

@@ -4587,6 +4587,11 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
             // Open excel style filtering dialog.
             GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'Downloads');
 
+            let excelMenu = GridFunctions.getExcelStyleFilteringComponent(fix);
+
+            // Verify ESF is visible.
+            expect(excelMenu).not.toBeNull();
+
             // Type string in search box.
             const searchComponent = GridFunctions.getExcelStyleSearchComponent(fix);
             const inputNativeElement = GridFunctions.getExcelStyleSearchComponentInput(fix, searchComponent);
@@ -4609,10 +4614,43 @@ describe('IgxGrid - Filtering actions - Excel style filtering #grid', () => {
                 .sort();
 
             // Verify that excel style filtering dialog is closed and data is filtered.
-            expect(fix.debugElement.query(By.css(FILTER_UI_ROW))).toBeNull();
+            excelMenu = GridFunctions.getExcelStyleFilteringComponent(fix);
+            expect(excelMenu).toBeNull();
             expect(gridCellValues.length).toEqual(4);
             expect(gridCellValues).toEqual(listItems);
         }));
+
+        it('Should clear input if there is text and \'Escape\' is pressed.', fakeAsync(() => {
+            // Open excel style filtering dialog.
+            GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'Downloads');
+
+            let inputNativeElement = GridFunctions.getExcelStyleSearchComponentInput(fix);
+            let excelMenu = GridFunctions.getExcelStyleFilteringComponent(fix);
+
+            // Verify ESF is visible.
+            expect(excelMenu).not.toBeNull();
+
+             // Verify that the dialog is closed on pressing Escape.
+            inputNativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }));
+            excelMenu = GridFunctions.getExcelStyleFilteringComponent(fix);
+            expect(excelMenu).toBeNull();
+
+            // Open excel style filtering dialog again and type in the input.
+            GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'Downloads');
+            inputNativeElement = GridFunctions.getExcelStyleSearchComponentInput(fix);
+
+            UIInteractions.clickAndSendInputElementValue(inputNativeElement, '2', fix);
+
+            // Press Escape again and verify that ESF menu is still visible and the input is empty
+            inputNativeElement.dispatchEvent(new KeyboardEvent('keydown', { key: 'Escape', bubbles: true }));
+            inputNativeElement = GridFunctions.getExcelStyleSearchComponentInput(fix);
+            fix.detectChanges();
+            flush();
+
+            excelMenu = GridFunctions.getExcelStyleFilteringComponent(fix);
+            expect(excelMenu).not.toBeNull();
+            expect(inputNativeElement.value).toBe('', 'input isn\'t cleared correctly');
+        }));
 });
 
     describe('Templates: ', () => {

projects/igniteui-angular/src/lib/grids/row.directive.ts

@@ -396,7 +396,7 @@ export class IgxRowDirective<T extends IgxGridBaseDirective & GridType> implemen
      * @hidden
      * @internal
      */
-    @HostListener('mouseover', ['$event'])
+    @HostListener('mouseenter', ['$event'])
     public showActionStrip(event: MouseEvent) {
         if (this.grid.actionStrip) {
             this.grid.actionStrip.show(this);