chore(*): fixing custom edit templates and value types

Author: ChronosSF

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

@@ -155,11 +155,11 @@ export class GridBaseAPIService <T extends IgxGridBaseDirective & GridType> {
             return args;
         }
 
-        if (isEqual(cell.value, cell.editValue)) {
+        if (isEqual(args.oldValue, args.newValue)) {
             return args;
         }
         const data = cell.rowData;
-        mergeObjects(data, reverseMapper(cell.column.field, cell.editValue));
+        mergeObjects(data, reverseMapper(cell.column.field, args.newValue));
         const doneArgs = cell.createDoneEditEventArgs(args.newValue);
         doneArgs.rowData = data;
         this.grid.cellEditDone.emit(doneArgs);

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

@@ -178,13 +178,13 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
      * @memberof IgxGridCellComponent
      */
     get template(): TemplateRef<any> {
-        if (this.grid.rowEditable && this.row.addRow) {
-            return this.addMode ? this.inlineEditorTemplate : this.addRowCellTemplate;
-        }
-        if (this.editMode) {
+        if (this.editMode || this.addMode) {
             const inlineEditorTemplate = this.column.inlineEditorTemplate;
             return inlineEditorTemplate ? inlineEditorTemplate : this.inlineEditorTemplate;
         }
+        if (this.grid.rowEditable && this.row.addRow) {
+            return this.addRowCellTemplate;
+        }
         if (this.cellTemplate) {
             return this.cellTemplate;
         }