@syncfusion/ej2-treegrid 20.4.48 → 20.4.54

package/dist/es6/ej2-treegrid.es5.js

@@ -1862,7 +1862,7 @@ var Render = /** @__PURE__ @class */ (function () {
                 }
                 else {
                     var str = 'isStringTemplate';
-                    var result = args.column["" + templateFn](extend$1({ 'index': '' }, args.data), this.parent, 'template', tempID, this.parent["" + str]);
+                    var result = args.column["" + templateFn](extend$1({ 'index': '' }, args.data), this.parent, 'template', tempID, this.parent["" + str], undefined, undefined, this.parent['root']);
                     appendChildren(cellElement, result);
                 }
                 delete args.column.template;
@@ -2264,13 +2264,13 @@ var DataManipulation = /** @__PURE__ @class */ (function () {
         if (this.parent.enableVirtualization && rowDetails.action === 'remoteExpand') {
             qry.take(this.parent.pageSettings.pageSize);
             var expandDetail = [];
-            expandDetail.push('ExpandingAction', rowDetails.record[this.parent.idMapping]);
+            expandDetail.push('ExpandingAction', parseInt(rowDetails.record[this.parent.idMapping], 10).toString());
             qry.expand(expandDetail);
         }
         else if (this.parent.enableVirtualization && rowDetails.action === 'collapse') {
             qry.take(this.parent.grid.pageSettings.pageSize);
             var expandDetail = [];
-            expandDetail.push('CollapsingAction', rowDetails.record[this.parent.idMapping]);
+            expandDetail.push('CollapsingAction', parseInt(rowDetails.record[this.parent.idMapping], 10).toString());
             qry.expand(expandDetail);
         }
         qry.where(this.parent.parentIdMapping, 'equal', rowDetails.record[this.parent.idMapping]);
@@ -5734,6 +5734,21 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         if (this.grid.columns.length !== this.columnModel.length) {
             this.stackedHeader = true;
         }
+        if (this.stackedHeader && this.allowResizing) {
+            for (var i = 0; i < this.columns.length; i++) {
+                if (!isNullOrUndefined(this.columns[parseInt(i.toString(), 10)].columns)) {
+                    for (var j = 0; j < this.columns[parseInt(i.toString(), 10)].columns.length; j++) {
+                        var stackedColumn = this.columns[parseInt(i.toString(), 10)].columns[parseInt(j.toString(), 10)];
+                        var currentColumn = this.grid.getColumnByField(stackedColumn.field);
+                        stackedColumn.width = currentColumn.width;
+                    }
+                }
+                else if (!isNullOrUndefined(this.columns[parseInt(i.toString(), 10)].field)) {
+                    var currentColumn = this.grid.getColumnByField(this.columns[parseInt(i.toString(), 10)].field);
+                    this.columns[parseInt(i.toString(), 10)].width = currentColumn.width;
+                }
+            }
+        }
         if (!this.stackedHeader) {
             merge(this.columns, this.columnModel);
         }
@@ -6337,6 +6352,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         this.isCollapseAll = false;
     };
     TreeGrid.prototype.expandCollapse = function (action, row, record, isChild) {
+        var _this = this;
         var expandingArgs = { row: row, data: record, childData: [], requestType: action };
         var childRecords = this.getCurrentViewRecords().filter(function (e) {
             return e.parentUniqueID === record.uniqueID;
@@ -6427,7 +6443,11 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 }
             }
             if (isCountRequired(this) && action === 'expand') {
-                this.dataResults.result = this.getCurrentViewRecords();
+                var currentData = this.getCurrentViewRecords();
+                var visibleRecords = currentData.filter(function (e) {
+                    return getExpandStatus(_this, e, _this.parentData);
+                });
+                this.dataResults.result = visibleRecords;
             }
             if (!isNullOrUndefined(targetEle) && targetEle.closest('.e-treerowcell').classList.contains('e-cellselectionbackground')) {
                 targetEle.closest('.e-treerowcell').classList.remove('e-cellselectionbackground');
@@ -10782,7 +10802,7 @@ var BatchEdit = /** @__PURE__ @class */ (function () {
         this.batchAddedRecords = this.batchRecords = this.batchAddRowRecord = this.batchDeletedRecords = this.currentViewRecords = [];
     };
     BatchEdit.prototype.cellSaved = function (args) {
-        var actualCellIndex = args.cell.cellIndex;
+        var actualCellIndex = args.column.index;
         var frozenCols = this.parent.frozenColumns || this.parent.getFrozenColumns();
         if (frozenCols && args.columnObject.index > frozenCols) {
             actualCellIndex = actualCellIndex + frozenCols;
@@ -10793,13 +10813,13 @@ var BatchEdit = /** @__PURE__ @class */ (function () {
             var colCount = this.parent.getFrozenLeftColumnsCount() + actualCellIndex;
             if (colCount === this.parent.treeColumnIndex) {
                 this.parent.renderModule.cellRender({ data: args.rowData, cell: args.cell,
-                    column: this.parent.grid.getColumnByIndex(args.cell.cellIndex)
+                    column: this.parent.grid.getColumnByIndex(args.column.index)
                 });
             }
         }
         else if (actualCellIndex === this.parent.treeColumnIndex) {
             this.parent.renderModule.cellRender({ data: args.rowData, cell: args.cell,
-                column: this.parent.grid.getColumnByIndex(args.cell.cellIndex)
+                column: this.parent.grid.getColumnByIndex(args.column.index)
             });
         }
         if (this.isAdd && this.parent.editSettings.mode === 'Batch' && this.parent.editSettings.newRowPosition !== 'Bottom') {
@@ -13616,10 +13636,6 @@ var Freeze$1 = /** @__PURE__ @class */ (function () {
                 getValue('addRenderer', renderer)
                     .apply(renderer, [RenderType.Content, new VirtualTreeFreezeRenderer(getValue('grid', this.parent), getValue('serviceLocator', this.parent.grid))]);
             }
-            else {
-                getValue('addRenderer', renderer)
-                    .apply(renderer, [RenderType.Content, new FreezeContentRender(getValue('grid', this.parent), getValue('serviceLocator', this.parent.grid))]);
-            }
         }
         if (this.parent.getFrozenLeftColumnsCount() || this.parent.getFrozenRightColumnsCount()) {
             getValue('addRenderer', renderer)
@@ -13655,14 +13671,15 @@ var Freeze$1 = /** @__PURE__ @class */ (function () {
             rows = args.detailrows;
         }
         for (var i = 0; i < rows.length; i++) {
-            var rData = this.parent.grid.getRowObjectFromUID(rows[parseInt(i.toString(), 10)].getAttribute('data-Uid')).data;
-            rows[parseInt(i.toString(), 10)].style.display = args.action;
-            if (freeze && frozenRightRows.length) {
-                frozenRightRows[parseInt(i.toString(), 10)].style.display = args.action;
+            var row = rows[parseInt(i.toString(), 10)];
+            var rData = this.parent.grid.getRowObjectFromUID(row.getAttribute('data-Uid')).data;
+            if (!isNullOrUndefined(movableRows) && row.parentElement.firstElementChild.clientHeight > 0) {
+                row.style.height = row.parentElement.firstElementChild.clientHeight + 'px';
             }
+            row.style.display = args.action;
             var queryselector = args.action === 'none' ? '.e-treecolumn-container .e-treegridcollapse'
                 : '.e-treecolumn-container .e-treegridexpand';
-            if (frozenrows[rows[parseInt(i.toString(), 10)].rowIndex].querySelector(queryselector)) {
+            if (frozenrows[row.rowIndex].querySelector(queryselector)) {
                 var cRow = [];
                 for (var i_1 = 0; i_1 < movableRows.length; i_1++) {
                     if (movableRows[parseInt(i_1.toString(), 10)].querySelector('.e-gridrowindex' + rData.index + 'level' + (rData.level + 1))) {