@progress/kendo-angular-grid 5.5.0-dev.202111231008 → 5.5.1-dev.202112071035

package/dist/es2015/navigation/navigation.service.js

@@ -507,7 +507,7 @@ let NavigationService = class NavigationService {
                 this.editService.closeCell(args);
             }
             else if (cancel) {
-                this.editService.cancelCell();
+                this.editService.closeCell(args);
                 this.cd.detectChanges();
             }
             else if (navigate) {

package/dist/es2015/package-metadata.js

@@ -9,7 +9,7 @@ export const packageMetadata = {
     name: '@progress/kendo-angular-grid',
     productName: 'Kendo UI for Angular',
     productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
-    publishDate: 1637661571,
+    publishDate: 1638872746,
     version: '',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/?utm_medium=product&utm_source=kendoangular&utm_campaign=kendo-ui-angular-purchase-license-keys-warning'
 };

package/dist/fesm2015/index.js

@@ -1915,7 +1915,7 @@ let NavigationService = class NavigationService {
                 this.editService.closeCell(args);
             }
             else if (cancel) {
-                this.editService.cancelCell();
+                this.editService.closeCell(args);
                 this.cd.detectChanges();
             }
             else if (navigate) {
@@ -2831,7 +2831,7 @@ const packageMetadata = {
     name: '@progress/kendo-angular-grid',
     productName: 'Kendo UI for Angular',
     productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
-    publishDate: 1637661571,
+    publishDate: 1638872746,
     version: '',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/?utm_medium=product&utm_source=kendoangular&utm_campaign=kendo-ui-angular-purchase-license-keys-warning'
 };
@@ -3277,7 +3277,10 @@ const isColumnContainer = column => column.isColumnGroup || isSpanColumn(column)
  * The base class for the column components of the Grid.
  */
 class ColumnBase$1 {
-    constructor(parent) {
+    /**
+     * @hidden
+     */
+    constructor(parent, idService) {
         this.parent = parent;
         /**
          * @hidden
@@ -3386,7 +3389,8 @@ class ColumnBase$1 {
          * @hidden
          */
         this.columnMenuTemplates = new QueryList();
-        if (parent && !isColumnContainer(parent)) {
+        this.idService = idService;
+        if (parent && idService && parent.idService.gridId() === idService.gridId() && !isColumnContainer(parent)) {
             throw new Error('Columns can be nested only inside ColumnGroupComponent');
         }
     }
@@ -3592,6 +3596,33 @@ FilterMenuTemplateDirective = __decorate([
     __metadata("design:paramtypes", [TemplateRef])
 ], FilterMenuTemplateDirective);
 
+// Incremented each time the service is instantiated.
+let sequence = 0;
+/**
+ * @hidden
+ */
+let IdService = class IdService {
+    constructor() {
+        this.prefix = `k-grid${sequence++}`;
+    }
+    gridId() {
+        return this.prefix;
+    }
+    cellId(rowIndex, colIndex) {
+        return `${this.prefix}-r${rowIndex}c${colIndex}`;
+    }
+    selectionCheckboxId(itemIndex) {
+        return `${this.prefix}-checkbox${itemIndex}`;
+    }
+    selectAllCheckboxId() {
+        return `${this.prefix}-select-all`;
+    }
+};
+IdService = __decorate([
+    Injectable(),
+    __metadata("design:paramtypes", [])
+], IdService);
+
 var ColumnComponent_1;
 /**
  * @hidden
@@ -3648,8 +3679,8 @@ function isColumnComponent(column) {
  * ```
  */
 let ColumnComponent = ColumnComponent_1 = class ColumnComponent extends ColumnBase$1 {
-    constructor(parent) {
-        super(parent);
+    constructor(parent, idService) {
+        super(parent, idService);
         /**
          * Allows the column headers to be clicked and the `sortChange` event emitted.
          * You have to handle the `sortChange` event yourself and sort the data.
@@ -3806,8 +3837,8 @@ ColumnComponent = ColumnComponent_1 = __decorate([
         selector: 'kendo-grid-column',
         template: ``
     }),
-    __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()),
-    __metadata("design:paramtypes", [ColumnBase$1])
+    __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()), __param(1, Optional()),
+    __metadata("design:paramtypes", [ColumnBase$1, IdService])
 ], ColumnComponent);
 
 var SpanColumnComponent_1;
@@ -3884,8 +3915,8 @@ function isSpanColumnComponent(column) {
  * ```
  */
 let SpanColumnComponent = SpanColumnComponent_1 = class SpanColumnComponent extends ColumnBase$1 {
-    constructor(parent) {
-        super(parent);
+    constructor(parent, idService) {
+        super(parent, idService);
         /*
          * @hidden
          */
@@ -4066,8 +4097,8 @@ SpanColumnComponent = SpanColumnComponent_1 = __decorate([
         selector: 'kendo-grid-span-column',
         template: ``
     }),
-    __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()),
-    __metadata("design:paramtypes", [ColumnBase$1])
+    __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()), __param(1, Optional()),
+    __metadata("design:paramtypes", [ColumnBase$1, IdService])
 ], SpanColumnComponent);
 
 /**
@@ -4202,8 +4233,8 @@ function isColumnGroupComponent(column) {
  * ```
  */
 let ColumnGroupComponent = ColumnGroupComponent_1 = class ColumnGroupComponent extends ColumnBase$1 {
-    constructor(parent) {
-        super(parent);
+    constructor(parent, idService) {
+        super(parent, idService);
         this.parent = parent;
         /**
          * @hidden
@@ -4268,8 +4299,8 @@ ColumnGroupComponent = ColumnGroupComponent_1 = __decorate([
         selector: 'kendo-grid-column-group',
         template: ``
     }),
-    __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()),
-    __metadata("design:paramtypes", [ColumnBase$1])
+    __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()), __param(1, Optional()),
+    __metadata("design:paramtypes", [ColumnBase$1, IdService])
 ], ColumnGroupComponent);
 
 /**
@@ -6165,30 +6196,6 @@ class NavigationMetadata {
     }
 }
 
-// Incremented each time the service is instantiated.
-let sequence = 0;
-/**
- * @hidden
- */
-let IdService = class IdService {
-    constructor() {
-        this.prefix = `k-grid${sequence++}`;
-    }
-    cellId(rowIndex, colIndex) {
-        return `${this.prefix}-r${rowIndex}c${colIndex}`;
-    }
-    selectionCheckboxId(itemIndex) {
-        return `${this.prefix}-checkbox${itemIndex}`;
-    }
-    selectAllCheckboxId() {
-        return `${this.prefix}-select-all`;
-    }
-};
-IdService = __decorate([
-    Injectable(),
-    __metadata("design:paramtypes", [])
-], IdService);
-
 const NO_STICKY = { left: '0px', right: '0px' };
 /**
  * @hidden
@@ -20212,8 +20219,8 @@ var CommandColumnComponent_1;
  * ```
  */
 let CommandColumnComponent = CommandColumnComponent_1 = class CommandColumnComponent extends ColumnBase$1 {
-    constructor(parent) {
-        super(parent);
+    constructor(parent, idService) {
+        super(parent, idService);
         this.parent = parent;
     }
     get templateRef() {
@@ -20235,8 +20242,8 @@ CommandColumnComponent = CommandColumnComponent_1 = __decorate([
         selector: 'kendo-grid-command-column',
         template: ``
     }),
-    __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()),
-    __metadata("design:paramtypes", [ColumnBase$1])
+    __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()), __param(1, Optional()),
+    __metadata("design:paramtypes", [ColumnBase$1, IdService])
 ], CommandColumnComponent);
 
 var CheckboxColumnComponent_1;
@@ -20303,8 +20310,8 @@ var CheckboxColumnComponent_1;
  * ```
  */
 let CheckboxColumnComponent = CheckboxColumnComponent_1 = class CheckboxColumnComponent extends ColumnBase$1 {
-    constructor(parent) {
-        super(parent);
+    constructor(parent, idService) {
+        super(parent, idService);
         this.parent = parent;
         /*
          * @hidden
@@ -20334,8 +20341,8 @@ CheckboxColumnComponent = CheckboxColumnComponent_1 = __decorate([
         selector: 'kendo-grid-checkbox-column',
         template: ``
     }),
-    __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()),
-    __metadata("design:paramtypes", [ColumnBase$1])
+    __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()), __param(1, Optional()),
+    __metadata("design:paramtypes", [ColumnBase$1, IdService])
 ], CheckboxColumnComponent);
 
 /**
@@ -22298,6 +22305,9 @@ let InCellEditingDirective = class InCellEditingDirective extends EditingDirecti
             args.preventDefault();
         }
         else if (formGroup.dirty) {
+            if (args.originalEvent && args.originalEvent.keyCode === Keys.Escape) {
+                return;
+            }
             this.editService.assignValues(dataItem, formGroup.value);
             this.editService.update(dataItem);
         }

package/dist/fesm5/index.js

@@ -2076,7 +2076,7 @@ var NavigationService = /** @class */ (function () {
                 this.editService.closeCell(args);
             }
             else if (cancel) {
-                this.editService.cancelCell();
+                this.editService.closeCell(args);
                 this.cd.detectChanges();
             }
             else if (navigate) {
@@ -3046,7 +3046,7 @@ var packageMetadata = {
     name: '@progress/kendo-angular-grid',
     productName: 'Kendo UI for Angular',
     productCodes: ['KENDOUIANGULAR', 'KENDOUICOMPLETE'],
-    publishDate: 1637661571,
+    publishDate: 1638872746,
     version: '',
     licensingDocsUrl: 'https://www.telerik.com/kendo-angular-ui/my-license/?utm_medium=product&utm_source=kendoangular&utm_campaign=kendo-ui-angular-purchase-license-keys-warning'
 };
@@ -3500,7 +3500,10 @@ var isColumnContainer = function (column) { return column.isColumnGroup || isSpa
  * The base class for the column components of the Grid.
  */
 var ColumnBase$1 = /** @class */ (function () {
-    function ColumnBase$$1(parent) {
+    /**
+     * @hidden
+     */
+    function ColumnBase$$1(parent, idService) {
         this.parent = parent;
         /**
          * @hidden
@@ -3609,7 +3612,8 @@ var ColumnBase$1 = /** @class */ (function () {
          * @hidden
          */
         this.columnMenuTemplates = new QueryList();
-        if (parent && !isColumnContainer(parent)) {
+        this.idService = idService;
+        if (parent && idService && parent.idService.gridId() === idService.gridId() && !isColumnContainer(parent)) {
             throw new Error('Columns can be nested only inside ColumnGroupComponent');
         }
     }
@@ -3854,6 +3858,34 @@ var FilterMenuTemplateDirective = /** @class */ (function () {
     return FilterMenuTemplateDirective;
 }());
 
+// Incremented each time the service is instantiated.
+var sequence = 0;
+/**
+ * @hidden
+ */
+var IdService = /** @class */ (function () {
+    function IdService() {
+        this.prefix = "k-grid" + sequence++;
+    }
+    IdService.prototype.gridId = function () {
+        return this.prefix;
+    };
+    IdService.prototype.cellId = function (rowIndex, colIndex) {
+        return this.prefix + "-r" + rowIndex + "c" + colIndex;
+    };
+    IdService.prototype.selectionCheckboxId = function (itemIndex) {
+        return this.prefix + "-checkbox" + itemIndex;
+    };
+    IdService.prototype.selectAllCheckboxId = function () {
+        return this.prefix + "-select-all";
+    };
+    IdService = __decorate([
+        Injectable(),
+        __metadata("design:paramtypes", [])
+    ], IdService);
+    return IdService;
+}());
+
 /**
  * @hidden
  */
@@ -3910,8 +3942,8 @@ function isColumnComponent(column) {
  */
 var ColumnComponent = /** @class */ (function (_super) {
     __extends(ColumnComponent, _super);
-    function ColumnComponent(parent) {
-        var _this = _super.call(this, parent) || this;
+    function ColumnComponent(parent, idService) {
+        var _this = _super.call(this, parent, idService) || this;
         /**
          * Allows the column headers to be clicked and the `sortChange` event emitted.
          * You have to handle the `sortChange` event yourself and sort the data.
@@ -4102,8 +4134,8 @@ var ColumnComponent = /** @class */ (function (_super) {
             selector: 'kendo-grid-column',
             template: ""
         }),
-        __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()),
-        __metadata("design:paramtypes", [ColumnBase$1])
+        __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()), __param(1, Optional()),
+        __metadata("design:paramtypes", [ColumnBase$1, IdService])
     ], ColumnComponent);
     return ColumnComponent;
 }(ColumnBase$1));
@@ -4182,8 +4214,8 @@ function isSpanColumnComponent(column) {
  */
 var SpanColumnComponent = /** @class */ (function (_super) {
     __extends(SpanColumnComponent, _super);
-    function SpanColumnComponent(parent) {
-        var _this = _super.call(this, parent) || this;
+    function SpanColumnComponent(parent, idService) {
+        var _this = _super.call(this, parent, idService) || this;
         /*
          * @hidden
          */
@@ -4402,8 +4434,8 @@ var SpanColumnComponent = /** @class */ (function (_super) {
             selector: 'kendo-grid-span-column',
             template: ""
         }),
-        __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()),
-        __metadata("design:paramtypes", [ColumnBase$1])
+        __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()), __param(1, Optional()),
+        __metadata("design:paramtypes", [ColumnBase$1, IdService])
     ], SpanColumnComponent);
     return SpanColumnComponent;
 }(ColumnBase$1));
@@ -4554,8 +4586,8 @@ function isColumnGroupComponent(column) {
  */
 var ColumnGroupComponent = /** @class */ (function (_super) {
     __extends(ColumnGroupComponent, _super);
-    function ColumnGroupComponent(parent) {
-        var _this = _super.call(this, parent) || this;
+    function ColumnGroupComponent(parent, idService) {
+        var _this = _super.call(this, parent, idService) || this;
         _this.parent = parent;
         /**
          * @hidden
@@ -4645,8 +4677,8 @@ var ColumnGroupComponent = /** @class */ (function (_super) {
             selector: 'kendo-grid-column-group',
             template: ""
         }),
-        __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()),
-        __metadata("design:paramtypes", [ColumnBase$1])
+        __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()), __param(1, Optional()),
+        __metadata("design:paramtypes", [ColumnBase$1, IdService])
     ], ColumnGroupComponent);
     return ColumnGroupComponent;
 }(ColumnBase$1));
@@ -6677,31 +6709,6 @@ var NavigationMetadata = /** @class */ (function () {
     return NavigationMetadata;
 }());
 
-// Incremented each time the service is instantiated.
-var sequence = 0;
-/**
- * @hidden
- */
-var IdService = /** @class */ (function () {
-    function IdService() {
-        this.prefix = "k-grid" + sequence++;
-    }
-    IdService.prototype.cellId = function (rowIndex, colIndex) {
-        return this.prefix + "-r" + rowIndex + "c" + colIndex;
-    };
-    IdService.prototype.selectionCheckboxId = function (itemIndex) {
-        return this.prefix + "-checkbox" + itemIndex;
-    };
-    IdService.prototype.selectAllCheckboxId = function () {
-        return this.prefix + "-select-all";
-    };
-    IdService = __decorate([
-        Injectable(),
-        __metadata("design:paramtypes", [])
-    ], IdService);
-    return IdService;
-}());
-
 var NO_STICKY = { left: '0px', right: '0px' };
 /**
  * @hidden
@@ -20442,8 +20449,8 @@ var HeaderModule = /** @class */ (function () {
  */
 var CommandColumnComponent = /** @class */ (function (_super) {
     __extends(CommandColumnComponent, _super);
-    function CommandColumnComponent(parent) {
-        var _this = _super.call(this, parent) || this;
+    function CommandColumnComponent(parent, idService) {
+        var _this = _super.call(this, parent, idService) || this;
         _this.parent = parent;
         return _this;
     }
@@ -20471,8 +20478,8 @@ var CommandColumnComponent = /** @class */ (function (_super) {
             selector: 'kendo-grid-command-column',
             template: ""
         }),
-        __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()),
-        __metadata("design:paramtypes", [ColumnBase$1])
+        __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()), __param(1, Optional()),
+        __metadata("design:paramtypes", [ColumnBase$1, IdService])
     ], CommandColumnComponent);
     return CommandColumnComponent;
 }(ColumnBase$1));
@@ -20541,8 +20548,8 @@ var CommandColumnComponent = /** @class */ (function (_super) {
  */
 var CheckboxColumnComponent = /** @class */ (function (_super) {
     __extends(CheckboxColumnComponent, _super);
-    function CheckboxColumnComponent(parent) {
-        var _this = _super.call(this, parent) || this;
+    function CheckboxColumnComponent(parent, idService) {
+        var _this = _super.call(this, parent, idService) || this;
         _this.parent = parent;
         /*
          * @hidden
@@ -20578,8 +20585,8 @@ var CheckboxColumnComponent = /** @class */ (function (_super) {
             selector: 'kendo-grid-checkbox-column',
             template: ""
         }),
-        __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()),
-        __metadata("design:paramtypes", [ColumnBase$1])
+        __param(0, SkipSelf()), __param(0, Host()), __param(0, Optional()), __param(1, Optional()),
+        __metadata("design:paramtypes", [ColumnBase$1, IdService])
     ], CheckboxColumnComponent);
     return CheckboxColumnComponent;
 }(ColumnBase$1));
@@ -22412,6 +22419,9 @@ var InCellEditingDirective = /** @class */ (function (_super) {
             args.preventDefault();
         }
         else if (formGroup.dirty) {
+            if (args.originalEvent && args.originalEvent.keyCode === Keys.Escape) {
+                return;
+            }
             this.editService.assignValues(dataItem, formGroup.value);
             this.editService.update(dataItem);
         }

package/dist/npm/columns/checkbox-column.component.js

@@ -8,6 +8,7 @@ var tslib_1 = require("tslib");
 var core_1 = require("@angular/core");
 var column_base_1 = require("./column-base");
 var cell_template_directive_1 = require("../rendering/cell-template.directive");
+var id_service_1 = require("../common/id.service");
 /**
  * Represents the checkbox for selecting columns in the Grid. If the column is
  * defined as empty, it renders a default checkbox for row selection.
@@ -72,8 +73,8 @@ var cell_template_directive_1 = require("../rendering/cell-template.directive");
  */
 var CheckboxColumnComponent = /** @class */ (function (_super) {
     tslib_1.__extends(CheckboxColumnComponent, _super);
-    function CheckboxColumnComponent(parent) {
-        var _this = _super.call(this, parent) || this;
+    function CheckboxColumnComponent(parent, idService) {
+        var _this = _super.call(this, parent, idService) || this;
         _this.parent = parent;
         /*
          * @hidden
@@ -109,8 +110,8 @@ var CheckboxColumnComponent = /** @class */ (function (_super) {
             selector: 'kendo-grid-checkbox-column',
             template: ""
         }),
-        tslib_1.__param(0, core_1.SkipSelf()), tslib_1.__param(0, core_1.Host()), tslib_1.__param(0, core_1.Optional()),
-        tslib_1.__metadata("design:paramtypes", [column_base_1.ColumnBase])
+        tslib_1.__param(0, core_1.SkipSelf()), tslib_1.__param(0, core_1.Host()), tslib_1.__param(0, core_1.Optional()), tslib_1.__param(1, core_1.Optional()),
+        tslib_1.__metadata("design:paramtypes", [column_base_1.ColumnBase, id_service_1.IdService])
     ], CheckboxColumnComponent);
     return CheckboxColumnComponent;
 }(column_base_1.ColumnBase));

package/dist/npm/columns/column-base.js

@@ -24,7 +24,10 @@ exports.ɵ0 = ɵ0;
  * The base class for the column components of the Grid.
  */
 var ColumnBase = /** @class */ (function () {
-    function ColumnBase(parent) {
+    /**
+     * @hidden
+     */
+    function ColumnBase(parent, idService) {
         this.parent = parent;
         /**
          * @hidden
@@ -133,7 +136,8 @@ var ColumnBase = /** @class */ (function () {
          * @hidden
          */
         this.columnMenuTemplates = new core_1.QueryList();
-        if (parent && !isColumnContainer(parent)) {
+        this.idService = idService;
+        if (parent && idService && parent.idService.gridId() === idService.gridId() && !isColumnContainer(parent)) {
             throw new Error('Columns can be nested only inside ColumnGroupComponent');
         }
     }

package/dist/npm/columns/column-group.component.js

@@ -6,6 +6,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var core_1 = require("@angular/core");
+var id_service_1 = require("../common/id.service");
 var column_base_1 = require("./column-base");
 var column_common_1 = require("./column-common");
 /**
@@ -71,8 +72,8 @@ exports.isColumnGroupComponent = isColumnGroupComponent;
  */
 var ColumnGroupComponent = /** @class */ (function (_super) {
     tslib_1.__extends(ColumnGroupComponent, _super);
-    function ColumnGroupComponent(parent) {
-        var _this = _super.call(this, parent) || this;
+    function ColumnGroupComponent(parent, idService) {
+        var _this = _super.call(this, parent, idService) || this;
         _this.parent = parent;
         /**
          * @hidden
@@ -162,8 +163,8 @@ var ColumnGroupComponent = /** @class */ (function (_super) {
             selector: 'kendo-grid-column-group',
             template: ""
         }),
-        tslib_1.__param(0, core_1.SkipSelf()), tslib_1.__param(0, core_1.Host()), tslib_1.__param(0, core_1.Optional()),
-        tslib_1.__metadata("design:paramtypes", [column_base_1.ColumnBase])
+        tslib_1.__param(0, core_1.SkipSelf()), tslib_1.__param(0, core_1.Host()), tslib_1.__param(0, core_1.Optional()), tslib_1.__param(1, core_1.Optional()),
+        tslib_1.__metadata("design:paramtypes", [column_base_1.ColumnBase, id_service_1.IdService])
     ], ColumnGroupComponent);
     return ColumnGroupComponent;
 }(column_base_1.ColumnBase));

package/dist/npm/columns/column.component.js

@@ -15,6 +15,7 @@ var column_base_1 = require("./column-base");
 var utils_1 = require("../utils");
 var filter_cell_template_directive_1 = require("../filtering/cell/filter-cell-template.directive");
 var filter_menu_template_directive_1 = require("../filtering/menu/filter-menu-template.directive");
+var id_service_1 = require("../common/id.service");
 /**
  * @hidden
  */
@@ -72,8 +73,8 @@ exports.isColumnComponent = isColumnComponent;
  */
 var ColumnComponent = /** @class */ (function (_super) {
     tslib_1.__extends(ColumnComponent, _super);
-    function ColumnComponent(parent) {
-        var _this = _super.call(this, parent) || this;
+    function ColumnComponent(parent, idService) {
+        var _this = _super.call(this, parent, idService) || this;
         /**
          * Allows the column headers to be clicked and the `sortChange` event emitted.
          * You have to handle the `sortChange` event yourself and sort the data.
@@ -264,8 +265,8 @@ var ColumnComponent = /** @class */ (function (_super) {
             selector: 'kendo-grid-column',
             template: ""
         }),
-        tslib_1.__param(0, core_1.SkipSelf()), tslib_1.__param(0, core_1.Host()), tslib_1.__param(0, core_1.Optional()),
-        tslib_1.__metadata("design:paramtypes", [column_base_1.ColumnBase])
+        tslib_1.__param(0, core_1.SkipSelf()), tslib_1.__param(0, core_1.Host()), tslib_1.__param(0, core_1.Optional()), tslib_1.__param(1, core_1.Optional()),
+        tslib_1.__metadata("design:paramtypes", [column_base_1.ColumnBase, id_service_1.IdService])
     ], ColumnComponent);
     return ColumnComponent;
 }(column_base_1.ColumnBase));

package/dist/npm/columns/command-column.component.js

@@ -8,6 +8,7 @@ var tslib_1 = require("tslib");
 var core_1 = require("@angular/core");
 var column_base_1 = require("./column-base");
 var cell_template_directive_1 = require("../rendering/cell-template.directive");
+var id_service_1 = require("../common/id.service");
 /**
  * Represents the command columns of the Grid. You have to define the content of the
  * column inside an `<ng-template>` tag. The template context is set to the current
@@ -76,8 +77,8 @@ var cell_template_directive_1 = require("../rendering/cell-template.directive");
  */
 var CommandColumnComponent = /** @class */ (function (_super) {
     tslib_1.__extends(CommandColumnComponent, _super);
-    function CommandColumnComponent(parent) {
-        var _this = _super.call(this, parent) || this;
+    function CommandColumnComponent(parent, idService) {
+        var _this = _super.call(this, parent, idService) || this;
         _this.parent = parent;
         return _this;
     }
@@ -105,8 +106,8 @@ var CommandColumnComponent = /** @class */ (function (_super) {
             selector: 'kendo-grid-command-column',
             template: ""
         }),
-        tslib_1.__param(0, core_1.SkipSelf()), tslib_1.__param(0, core_1.Host()), tslib_1.__param(0, core_1.Optional()),
-        tslib_1.__metadata("design:paramtypes", [column_base_1.ColumnBase])
+        tslib_1.__param(0, core_1.SkipSelf()), tslib_1.__param(0, core_1.Host()), tslib_1.__param(0, core_1.Optional()), tslib_1.__param(1, core_1.Optional()),
+        tslib_1.__metadata("design:paramtypes", [column_base_1.ColumnBase, id_service_1.IdService])
     ], CommandColumnComponent);
     return CommandColumnComponent;
 }(column_base_1.ColumnBase));

package/dist/npm/columns/span-column.component.js

@@ -11,6 +11,7 @@ var edit_template_directive_1 = require("../editing/edit-template.directive");
 var column_base_1 = require("./column-base");
 var column_component_1 = require("./column.component");
 var utils_1 = require("../utils");
+var id_service_1 = require("../common/id.service");
 /**
  * @hidden
  */
@@ -86,8 +87,8 @@ exports.isSpanColumnComponent = isSpanColumnComponent;
  */
 var SpanColumnComponent = /** @class */ (function (_super) {
     tslib_1.__extends(SpanColumnComponent, _super);
-    function SpanColumnComponent(parent) {
-        var _this = _super.call(this, parent) || this;
+    function SpanColumnComponent(parent, idService) {
+        var _this = _super.call(this, parent, idService) || this;
         /*
          * @hidden
          */
@@ -306,8 +307,8 @@ var SpanColumnComponent = /** @class */ (function (_super) {
             selector: 'kendo-grid-span-column',
             template: ""
         }),
-        tslib_1.__param(0, core_1.SkipSelf()), tslib_1.__param(0, core_1.Host()), tslib_1.__param(0, core_1.Optional()),
-        tslib_1.__metadata("design:paramtypes", [column_base_1.ColumnBase])
+        tslib_1.__param(0, core_1.SkipSelf()), tslib_1.__param(0, core_1.Host()), tslib_1.__param(0, core_1.Optional()), tslib_1.__param(1, core_1.Optional()),
+        tslib_1.__metadata("design:paramtypes", [column_base_1.ColumnBase, id_service_1.IdService])
     ], SpanColumnComponent);
     return SpanColumnComponent;
 }(column_base_1.ColumnBase));

package/dist/npm/common/id.service.js

@@ -15,6 +15,9 @@ var IdService = /** @class */ (function () {
     function IdService() {
         this.prefix = "k-grid" + sequence++;
     }
+    IdService.prototype.gridId = function () {
+        return this.prefix;
+    };
     IdService.prototype.cellId = function (rowIndex, colIndex) {
         return this.prefix + "-r" + rowIndex + "c" + colIndex;
     };

package/dist/npm/editing-directives/in-cell-editing.directive.js

@@ -6,6 +6,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var core_1 = require("@angular/core");
+var kendo_angular_common_1 = require("@progress/kendo-angular-common");
 var editing_directive_base_1 = require("./editing-directive-base");
 var grid_component_1 = require("../grid.component");
 var local_data_changes_service_1 = require("../editing/local-data-changes.service");
@@ -62,6 +63,9 @@ var InCellEditingDirective = /** @class */ (function (_super) {
             args.preventDefault();
         }
         else if (formGroup.dirty) {
+            if (args.originalEvent && args.originalEvent.keyCode === kendo_angular_common_1.Keys.Escape) {
+                return;
+            }
             this.editService.assignValues(dataItem, formGroup.value);
             this.editService.update(dataItem);
         }