@syncfusion/ej2-treegrid 20.4.48 → 20.4.54

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.4.48
+*  version : 20.4.54
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-treegrid@*",
-  "_id": "@syncfusion/ej2-treegrid@20.4.44",
+  "_id": "@syncfusion/ej2-treegrid@20.4.49",
   "_inBundle": false,
-  "_integrity": "sha512-DSCX1PXQAUXdKr+vI6F9nxZ1aBFKpdbWBVVeEkrT17tySdvpD+/sW2zYOcFkOYyEK9Od98pkI+qJwL/zG+P5LQ==",
+  "_integrity": "sha512-E6GBrixReTSh5GUj05zdOX531xJA0oKLhNOJm6lfbEZAEingUnUpxBtZIVdl9I2EXhMaKdOn/IRVjqNMJhlPcw==",
   "_location": "/@syncfusion/ej2-treegrid",
   "_phantomChildren": {},
   "_requested": {
@@ -24,8 +24,8 @@
     "/@syncfusion/ej2-react-treegrid",
     "/@syncfusion/ej2-vue-treegrid"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.4.44.tgz",
-  "_shasum": "58a34bd34717c8d9492bccc5942e03148e0fd960",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.4.49.tgz",
+  "_shasum": "56a1c00a6fd2d3df97ef71db6dc3297e653ef6ec",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/ease-automation_release_19.1.0.1/packages/included",
   "author": {
@@ -36,10 +36,10 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.4.48",
+    "@syncfusion/ej2-base": "~20.4.51",
     "@syncfusion/ej2-data": "~20.4.48",
-    "@syncfusion/ej2-grids": "~20.4.48",
-    "@syncfusion/ej2-popups": "~20.4.48"
+    "@syncfusion/ej2-grids": "~20.4.54",
+    "@syncfusion/ej2-popups": "~20.4.53"
   },
   "deprecated": false,
   "description": "Essential JS 2 TreeGrid Component",
@@ -66,6 +66,6 @@
     "url": "git+https://github.com/syncfusion/ej2-treegrid.git"
   },
   "typings": "index.d.ts",
-  "version": "20.4.48",
+  "version": "20.4.54",
   "sideEffects": false
 }

package/src/treegrid/actions/batch-edit.js

@@ -107,7 +107,7 @@ var BatchEdit = /** @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;
@@ -118,13 +118,13 @@ var BatchEdit = /** @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') {

package/src/treegrid/actions/freeze-column.js

@@ -1,6 +1,6 @@
-import { ColumnFreezeContentRenderer, ColumnFreezeHeaderRenderer, FreezeContentRender, FreezeRender, parentsUntil, RenderType } from '@syncfusion/ej2-grids';
+import { ColumnFreezeContentRenderer, ColumnFreezeHeaderRenderer, FreezeRender, parentsUntil, RenderType } from '@syncfusion/ej2-grids';
 import { Grid, Freeze as FreezeColumn } from '@syncfusion/ej2-grids';
-import { addClass, getValue } from '@syncfusion/ej2-base';
+import { addClass, getValue, isNullOrUndefined } from '@syncfusion/ej2-base';
 import { ColumnVirtualTreeFreezeRenderer, VirtualTreeFreezeRenderer, VirtualTreeFreezeHdrRenderer } from '../renderer/virtual-tree-freeze-render';
 /**
  * TreeGrid Freeze module
@@ -48,10 +48,6 @@ var Freeze = /** @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)
@@ -87,14 +83,15 @@ var Freeze = /** @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))) {

package/src/treegrid/base/data.js

@@ -342,13 +342,13 @@ var DataManipulation = /** @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]);

package/src/treegrid/base/treegrid.js

@@ -2255,6 +2255,21 @@ var TreeGrid = /** @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);
         }
@@ -2858,6 +2873,7 @@ var TreeGrid = /** @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;
@@ -2948,7 +2964,11 @@ var TreeGrid = /** @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');

package/src/treegrid/renderer/render.js

@@ -263,7 +263,7 @@ var Render = /** @class */ (function () {
                 }
                 else {
                     var str = 'isStringTemplate';
-                    var result = args.column["" + templateFn](extend({ 'index': '' }, args.data), this.parent, 'template', tempID, this.parent["" + str]);
+                    var result = args.column["" + templateFn](extend({ 'index': '' }, args.data), this.parent, 'template', tempID, this.parent["" + str], undefined, undefined, this.parent['root']);
                     appendChildren(cellElement, result);
                 }
                 delete args.column.template;