Merge branch 'master' into sstoychev/cancel-add-improv-master

ChronosSF · web-flow · commit 968a640a7f32 · 2021-06-25T11:04:52.000+03:00
diff --git a/projects/igniteui-angular/src/lib/grids/cell.component.ts b/projects/igniteui-angular/src/lib/grids/cell.component.ts
@@ -990,7 +990,7 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {
                     this.grid.cdr.detectChanges();
                 }
 
-                if (editableArgs.cancel) {
+                if (editableArgs && editableArgs.cancel) {
                     return true;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -990,7 +990,7 @@ export class IgxGridCellComponent implements OnInit, OnChanges, OnDestroy {`
`990`	`990`	`this.grid.cdr.detectChanges();`
`991`	`991`	`}`
`992`	`992`
`993`		`- if (editableArgs.cancel) {`
	`993`	`+ if (editableArgs && editableArgs.cancel) {`
`994`	`994`	`return true;`
`995`	`995`	`}`
`996`	`996`