@syncfusion/ej2-treegrid 20.4.48 → 20.4.54

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

@@ -1728,7 +1728,7 @@ class Render {
                 }
                 else {
                     const str = 'isStringTemplate';
-                    const result = args.column[`${templateFn}`](extend$1({ 'index': '' }, args.data), this.parent, 'template', tempID, this.parent[`${str}`]);
+                    const 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;
@@ -2120,13 +2120,13 @@ class DataManipulation {
         if (this.parent.enableVirtualization && rowDetails.action === 'remoteExpand') {
             qry.take(this.parent.pageSettings.pageSize);
             const 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);
             const 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]);
@@ -5453,6 +5453,21 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         if (this.grid.columns.length !== this.columnModel.length) {
             this.stackedHeader = true;
         }
+        if (this.stackedHeader && this.allowResizing) {
+            for (let i = 0; i < this.columns.length; i++) {
+                if (!isNullOrUndefined(this.columns[parseInt(i.toString(), 10)].columns)) {
+                    for (let j = 0; j < this.columns[parseInt(i.toString(), 10)].columns.length; j++) {
+                        const stackedColumn = this.columns[parseInt(i.toString(), 10)].columns[parseInt(j.toString(), 10)];
+                        const currentColumn = this.grid.getColumnByField(stackedColumn.field);
+                        stackedColumn.width = currentColumn.width;
+                    }
+                }
+                else if (!isNullOrUndefined(this.columns[parseInt(i.toString(), 10)].field)) {
+                    const 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);
         }
@@ -6135,7 +6150,11 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
                 }
             }
             if (isCountRequired(this) && action === 'expand') {
-                this.dataResults.result = this.getCurrentViewRecords();
+                const currentData = this.getCurrentViewRecords();
+                const visibleRecords = currentData.filter((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');
@@ -10409,7 +10428,7 @@ class BatchEdit {
         this.batchAddedRecords = this.batchRecords = this.batchAddRowRecord = this.batchDeletedRecords = this.currentViewRecords = [];
     }
     cellSaved(args) {
-        let actualCellIndex = args.cell.cellIndex;
+        let actualCellIndex = args.column.index;
         const frozenCols = this.parent.frozenColumns || this.parent.getFrozenColumns();
         if (frozenCols && args.columnObject.index > frozenCols) {
             actualCellIndex = actualCellIndex + frozenCols;
@@ -10420,13 +10439,13 @@ class BatchEdit {
             const 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') {
@@ -13168,10 +13187,6 @@ class Freeze$1 {
                 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)
@@ -13203,14 +13218,15 @@ class Freeze$1 {
             rows = args.detailrows;
         }
         for (let i = 0; i < rows.length; i++) {
-            const 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;
+            let row = rows[parseInt(i.toString(), 10)];
+            const 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;
             const 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)) {
                 const cRow = [];
                 for (let i = 0; i < movableRows.length; i++) {
                     if (movableRows[parseInt(i.toString(), 10)].querySelector('.e-gridrowindex' + rData.index + 'level' + (rData.level + 1))) {