Merge branch 'master' into ddincheva/summaryChangelog

Author: zdrawku

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

@@ -198,9 +198,8 @@ export class GridBaseAPIService <T extends IgxGridBaseDirective & GridType> {
             row.data = { ...row.data, ...rowInEditMode.transactionState };
         // TODO: Workaround for updating a row in edit mode through the API
         } else if (this.grid.transactions.enabled) {
-            const lastCommitedValue = grid.transactions.getState(row.id) ?
-                grid.transactions.getState(row.id).value : null;
-            row.data = lastCommitedValue ? Object.assign(row.data, lastCommitedValue) : row.data;
+            const state = grid.transactions.getState(row.id);
+            row.data = state ? Object.assign({}, row.data, state.value) : row.data;
         }
     }
 

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

@@ -694,6 +694,44 @@ describe('IgxGrid - Cell Editing #grid', () => {
             expect(cell.value).toEqual('New Name');
         });
 
+        it(`Should not update data in grid with transactions, when row is updated in onCellEdit and onCellEdit is canceled`, () => {
+            fixture = TestBed.createComponent(SelectionWithTransactionsComponent);
+            fixture.detectChanges();
+            grid = fixture.componentInstance.grid;
+
+            grid.primaryKey = 'ID';
+            fixture.detectChanges();
+
+            // update the cell value via updateRow and cancel the event
+            grid.onCellEdit.subscribe((e: IGridEditEventArgs) => {
+                const rowIndex: number = e.cellID.rowIndex;
+                const row = grid.getRowByIndex(rowIndex);
+                grid.updateRow({[row.columns[e.cellID.columnID].field]: e.newValue}, row.rowID);
+                e.cancel = true;
+            });
+
+            const cell = grid.getCellByColumn(0, 'Name');
+            const initialValue = cell.value;
+            const firstNewValue = 'New Value';
+            const secondNewValue = 'Very New Value';
+
+            cell.update(firstNewValue);
+            fixture.detectChanges();
+            expect(cell.value).toBe(firstNewValue);
+
+            cell.update(secondNewValue);
+            fixture.detectChanges();
+            expect(cell.value).toBe(secondNewValue);
+
+            grid.transactions.undo();
+            fixture.detectChanges();
+            expect(cell.value).toBe(firstNewValue);
+
+            grid.transactions.undo();
+            fixture.detectChanges();
+            expect(cell.value).toBe(initialValue);
+        });
+
         it(`Should properly emit 'onCellEditCancel' event`, () => {
             spyOn(grid.onCellEditCancel, 'emit').and.callThrough();
             const cell = grid.getCellByColumn(0, 'fullName');