Merge branch 'master' into nalipiev/drag-rowSelect-setters

Author: kdinev

projects/igniteui-angular/src/lib/grids/api.service.ts

@@ -235,14 +235,14 @@ export class GridBaseAPIService <T extends IgxGridBaseComponent & IGridDataBinda
             return args;
         }
 
-        if (!args.newValue) {
-            return args;
-        }
-
         if (rowInEditMode) {
             grid.transactions.endPending(false);
         }
 
+        if (!args.newValue) {
+            return args;
+        }
+
         if (hasSummarized) {
             grid.summaryService.removeSummaries(args.rowID);
         }

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

@@ -2918,6 +2918,27 @@ describe('IgxGrid Component Tests', () => {
         });
 
         describe('Row Editing - Transaction', () => {
+            it('Should properly exit pending state when committing row edit w/o changes', fakeAsync(() => {
+                const fixture = TestBed.createComponent(IgxBasicGridRowEditingComponent);
+                fixture.detectChanges();
+
+                const grid = fixture.componentInstance.grid;
+                const initialDataLength = grid.data.length;
+                const productNameCell = fixture.debugElement.queryAll(By.css('.igx-grid__td'))[2];
+                const enterEvent = { key: 'enter', stopPropagation: () => {}, preventDefault: () => {} };
+                productNameCell.triggerEventHandler('keydown', enterEvent);
+                tick();
+                fixture.detectChanges();
+                expect(grid.getCellByKey(1, 'ProductName').inEditMode).toBeTruthy();
+                productNameCell.triggerEventHandler('keydown', enterEvent);
+                tick();
+                fixture.detectChanges();
+                expect(grid.getCellByKey(1, 'ProductName').inEditMode).toBeFalsy();
+                grid.deleteRow(2);
+                tick();
+                fixture.detectChanges();
+                expect(grid.data.length).toEqual(initialDataLength - 1);
+            }));
             it('Transaction Update, Delete, Add, Undo, Redo, Commit check transaction and grid state', fakeAsync(() => {
                 const fixture = TestBed.createComponent(IgxGridRowEditingTransactionComponent);
                 fixture.detectChanges();