Merge pull request #7414 from IgniteUI/dmdimitrov/issue7343-8.2.x

fix(grid): end grid edit on advanced filtering clear/apply - 8.2.x

Author: kdinev

projects/igniteui-angular/src/lib/grids/filtering/advanced-filtering/advanced-filtering-dialog.component.ts

@@ -814,6 +814,7 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
         this.cancelOperandEdit();
         this.currentGroup = null;
         this.rootGroup = null;
+        this.grid.endEdit(false);
         this.grid.advancedFilteringExpressionsTree = null;
     }
 
@@ -824,6 +825,7 @@ export class IgxAdvancedFilteringDialogComponent implements AfterViewInit, OnDes
     }
 
     public applyChanges() {
+        this.grid.endEdit(false);
         this.exitOperandEdit();
         this.grid.advancedFilteringExpressionsTree = this.createExpressionsTreeFromGroupItem(this.rootGroup);
     }

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

@@ -265,6 +265,45 @@ describe('IgxGrid - Cell Editing #grid', () => {
             expect(editCell.nativeElement.value).toBe('test');
             expect(firstCell.editMode).toBeTruthy();
         }));
+
+        it('should end cell editing when clearing or applying advanced filter', () => {
+            const cellElem = fixture.debugElement.query(By.css(CELL_CSS_CLASS));
+            const cell = grid.getCellByColumn(0, 'fullName');
+
+            // Enter cell edit mode
+            cellElem.triggerEventHandler('dblclick', new Event('dblclick'));
+            fixture.detectChanges();
+            expect(cell.editMode).toBe(true);
+
+            // Open Advanced Filtering dialog.
+            grid.openAdvancedFilteringDialog();
+            fixture.detectChanges();
+
+            // Clear the filters.
+            GridFunctions.clickAdvancedFilteringClearFilterButton(fixture);
+            fixture.detectChanges();
+
+            expect(cell.editMode).toBe(false);
+
+            // Close the dialog.
+            GridFunctions.clickAdvancedFilteringCancelButton(fixture);
+            fixture.detectChanges();
+
+            // Enter cell edit mode
+            cellElem.triggerEventHandler('dblclick', new Event('dblclick'));
+            fixture.detectChanges();
+            expect(cell.editMode).toBe(true);
+
+            // Open Advanced Filtering dialog.
+            grid.openAdvancedFilteringDialog();
+            fixture.detectChanges();
+
+            // Apply the filters.
+            GridFunctions.clickAdvancedFilteringApplyButton(fixture);
+            fixture.detectChanges();
+
+            expect(cell.editMode).toBe(false);
+        });
     });
 
     describe('Scroll, pin and blur', () => {

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

@@ -338,6 +338,44 @@ describe('IgxGrid - Row Editing #grid', () => {
             cell.setEditMode(false);
             tick(16);
         }));
+
+        it('should end row editing when clearing or applying advanced filter', () => {
+            // Enter row edit mode
+            const cellElement = grid.getCellByColumn(2, 'ProductName').nativeElement;
+            cellElement.dispatchEvent(new Event('dblclick'));
+            fix.detectChanges();
+            const row = grid.getRowByIndex(2);
+            expect(row.inEditMode).toBe(true);
+
+            // Open Advanced Filtering dialog.
+            grid.openAdvancedFilteringDialog();
+            fix.detectChanges();
+
+            // Clear the filters.
+            GridFunctions.clickAdvancedFilteringClearFilterButton(fix);
+            fix.detectChanges();
+
+            expect(row.inEditMode).toBe(false);
+
+            // Close the dialog.
+            GridFunctions.clickAdvancedFilteringCancelButton(fix);
+            fix.detectChanges();
+
+            // Enter row edit mode
+            cellElement.dispatchEvent(new Event('dblclick'));
+            fix.detectChanges();
+            expect(row.inEditMode).toBe(true);
+
+            // Open Advanced Filtering dialog.
+            grid.openAdvancedFilteringDialog();
+            fix.detectChanges();
+
+            // Apply the filters.
+            GridFunctions.clickAdvancedFilteringApplyButton(fix);
+            fix.detectChanges();
+
+            expect(row.inEditMode).toBe(false);
+        });
     });
 
     describe('Navigation - Keyboard', () => {