Merge branch 'master' into add--custom-sort-strategy

Author: zdrawku

projects/igniteui-angular/src/lib/grids/cell.component.ts

@@ -527,18 +527,16 @@ export class IgxGridCellComponent implements OnInit, AfterViewInit {
             return;
         }
         const editRowState = this.grid.rowEditable ? this.gridAPI.get_edit_row_state(this.gridID) : null; // Get current edited row
-        const inEditRow = this.belongsToEditRow; // Check if cell is in current editable mode, if any
         this._clearCellSelection();
         this._saveCellSelection();
         const hasFilteredResults = this.grid.filteredData ? this.grid.filteredData.length > 0 : true;
         if (hasFilteredResults) {
             if (this.column.editable && this.previousCellEditMode && hasFilteredResults) {
                 this.inEditMode = true;
             }
-            if (editRowState) { // If there is a row being edited
-                if (inEditRow && !this.column.editable) { // and this cell is in the row and is NOT editable, submit the values and close
-                    this.exitRowEdit(true, true, editRowState);
-                }
+            if (editRowState && !this.inEditMode) {
+                // If there is a row being edited & this cell did not enter edit mode (!editable, row.deleted)
+                this.exitRowEdit(true, true, editRowState);
             }
             this.selected = true;
             if (fireFocus) {
@@ -548,17 +546,10 @@ export class IgxGridCellComponent implements OnInit, AfterViewInit {
         }
     }
 
-    private get belongsToEditRow(): boolean { // If the cell belongs to the row that is currently being edited
-        const cellInEditMode = this.gridAPI.get_cell_inEditMode(this.gridID);
-        if (cellInEditMode && this.grid.rowEditable) {
-            return this.cellID.rowID === cellInEditMode.cellID.rowID;
-        }
-        return false;
-    }
-
+    /** TODO: Refactor away, move to grid.endRowEdit! */
     private exitRowEdit(commit = true, close = true, row?: {rowID: any, rowIndex: number}) {
         const grid = this.grid;
-        if (grid.rowEditable/*  && grid.rowChangesCount */) {
+        if (grid.rowEditable) {
             grid.endRowTransaction(commit, close, row);
         }
     }

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

@@ -1762,6 +1762,31 @@ describe('IgxGrid Component Tests', () => {
                 expect(gridAPI.submit_value).not.toHaveBeenCalled();
                 expect(gridAPI.escape_editMode).toHaveBeenCalled();
             }));
+
+            it(`Should exit row editing when clicking on a cell from a deleted row`, fakeAsync(() => {
+                const fixture = TestBed.createComponent(IgxGridRowEditingTransactionComponent);
+                fixture.detectChanges();
+
+                const grid = fixture.componentInstance.grid as any;
+                grid.deleteRow(1);
+                tick();
+                fixture.detectChanges();
+                spyOn(grid, 'endRowTransaction');
+
+                const firstCell = grid.getCellByColumn(2, 'ProductName');
+                firstCell.inEditMode = true;
+                tick();
+                fixture.detectChanges();
+                expect(grid.endRowTransaction).toHaveBeenCalledTimes(0);
+
+                const targetCell = grid.getCellByColumn(0, 'ProductName');
+                targetCell.onFocus({});
+                tick();
+                fixture.detectChanges();
+                expect(grid.endRowTransaction).toHaveBeenCalledTimes(1);
+                expect(targetCell.focused).toBeTruthy();
+                expect(firstCell.focused).toBeFalsy();
+            }));
         });
 
         describe('Row Editing - Paging', () => {

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

@@ -147,10 +147,7 @@ export class IgxRowComponent<T extends IgxGridBaseComponent> implements DoCheck
     @HostBinding('attr.aria-selected')
     public isSelected: boolean;
 
-    /**
-     * @hidden
-     */
-    @HostBinding('attr.aria-dirty')
+    /** @hidden */
     public get dirty(): boolean {
         const row: State = this.grid.transactions.getState(this.rowID);
         if (row) {
@@ -160,10 +157,7 @@ export class IgxRowComponent<T extends IgxGridBaseComponent> implements DoCheck
         return false;
     }
 
-    /**
-     * @hidden
-     */
-    @HostBinding('attr.aria-deleted')
+    /** @hidden */
     public get deleted(): boolean {
         const row: State = this.grid.transactions.getState(this.rowID);
         if (row) {

src/app/grid-row-edit/data.ts

@@ -4,7 +4,7 @@ export const data = [{
     SupplierID: 1,
     CategoryID: 1,
     QuantityPerUnit: '10 boxes x 20 bags',
-    UnitPrice: '18.0000',
+    UnitPrice: 18,
     UnitsInStock: 39,
     UnitsOnOrder: 0,
     ReorderLevel: 10,
@@ -16,7 +16,7 @@ export const data = [{
     SupplierID: 1,
     CategoryID: 1,
     QuantityPerUnit: '24 - 12 oz bottles',
-    UnitPrice: '19.0000',
+    UnitPrice: 19,
     UnitsInStock: 17,
     UnitsOnOrder: 40,
     ReorderLevel: 25,
@@ -28,7 +28,7 @@ export const data = [{
     SupplierID: 1,
     CategoryID: 2,
     QuantityPerUnit: '12 - 550 ml bottles',
-    UnitPrice: '10.0000',
+    UnitPrice: 10,
     UnitsInStock: 13,
     UnitsOnOrder: 70,
     ReorderLevel: 25,
@@ -40,7 +40,7 @@ export const data = [{
     SupplierID: 2,
     CategoryID: 2,
     QuantityPerUnit: '48 - 6 oz jars',
-    UnitPrice: '22.0000',
+    UnitPrice: 22,
     UnitsInStock: 53,
     UnitsOnOrder: 0,
     ReorderLevel: 0,
@@ -52,7 +52,7 @@ export const data = [{
     SupplierID: 2,
     CategoryID: 2,
     QuantityPerUnit: '36 boxes',
-    UnitPrice: '21.3500',
+    UnitPrice: 21.3500,
     UnitsInStock: 0,
     UnitsOnOrder: 0,
     ReorderLevel: 0,
@@ -64,7 +64,7 @@ export const data = [{
     SupplierID: 3,
     CategoryID: 2,
     QuantityPerUnit: '12 - 8 oz jars',
-    UnitPrice: '25.0000',
+    UnitPrice: 25,
     UnitsInStock: 0,
     UnitsOnOrder: 0,
     ReorderLevel: 25,
@@ -76,7 +76,7 @@ export const data = [{
     SupplierID: 3,
     CategoryID: 7,
     QuantityPerUnit: '12 - 1 lb pkgs.',
-    UnitPrice: '30.0000',
+    UnitPrice: 30,
     UnitsInStock: 150,
     UnitsOnOrder: 0,
     ReorderLevel: 10,
@@ -88,7 +88,7 @@ export const data = [{
     SupplierID: 3,
     CategoryID: 2,
     QuantityPerUnit: '12 - 12 oz jars',
-    UnitPrice: '40.0000',
+    UnitPrice: 40,
     UnitsInStock: 6,
     UnitsOnOrder: 0,
     ReorderLevel: 0,
@@ -100,7 +100,7 @@ export const data = [{
     SupplierID: 4,
     CategoryID: 6,
     QuantityPerUnit: '18 - 500 g pkgs.',
-    UnitPrice: '$97.0000',
+    UnitPrice: 97,
     UnitsInStock: 29,
     UnitsOnOrder: 0,
     ReorderLevel: 0,
@@ -112,7 +112,7 @@ export const data = [{
     SupplierID: 4,
     CategoryID: 8,
     QuantityPerUnit: '12 - 200 ml jars',
-    UnitPrice: '31.0000',
+    UnitPrice: 31,
     UnitsInStock: 31,
     UnitsOnOrder: 0,
     ReorderLevel: 0,