@syncfusion/ej2-treegrid 19.3.44 → 19.3.48

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 19.3.44
+*  version : 19.3.48
 *  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@19.2.60",
+  "_id": "@syncfusion/ej2-treegrid@19.3.47",
   "_inBundle": false,
-  "_integrity": "sha512-h13n1ZIdP6P7txIaEJU3Vmqn/9ExBdBTC1QDNFHzrV0ZTBPJGom7GAJThNLx3fg0vDMpfXmRtHb4W1LFepAxzw==",
+  "_integrity": "sha512-1qAa8qD3pixiqbAaV3Iqu5V6+3NzXa8G+EHL6QLhJF0fo/Fgj4DOuEUXSnQCy602s3YVzqSSPSAboKUvBNe4gg==",
   "_location": "/@syncfusion/ej2-treegrid",
   "_phantomChildren": {},
   "_requested": {
@@ -24,8 +24,8 @@
     "/@syncfusion/ej2-react-treegrid",
     "/@syncfusion/ej2-vue-treegrid"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix/@syncfusion/ej2-treegrid/-/ej2-treegrid-19.2.60.tgz",
-  "_shasum": "7a315c14592fdf929f3496ad698415c9eab540b5",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix/@syncfusion/ej2-treegrid/-/ej2-treegrid-19.3.47.tgz",
+  "_shasum": "9d3509b03b5ef89e7c2517ecea267f4908255bb6",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -36,10 +36,10 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~19.3.43",
-    "@syncfusion/ej2-data": "~19.3.44",
-    "@syncfusion/ej2-grids": "~19.3.44",
-    "@syncfusion/ej2-popups": "~19.3.43"
+    "@syncfusion/ej2-base": "~19.3.47",
+    "@syncfusion/ej2-data": "~19.3.47",
+    "@syncfusion/ej2-grids": "~19.3.48",
+    "@syncfusion/ej2-popups": "~19.3.47"
   },
   "deprecated": false,
   "description": "Essential JS 2 TreeGrid Component",
@@ -60,6 +60,6 @@
     "url": "git+https://github.com/syncfusion/ej2-treegrid.git"
   },
   "typings": "index.d.ts",
-  "version": "19.3.44",
+  "version": "19.3.48",
   "sideEffects": false
 }

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

@@ -111,10 +111,11 @@ var BatchEdit = /** @class */ (function () {
         if (frozenCols && args.columnObject.index > frozenCols) {
             actualCellIndex = actualCellIndex + frozenCols;
         }
-        var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 || this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
+        var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
+            this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
         if (freeze) {
             var colCount = this.parent.getFrozenLeftColumnsCount() + actualCellIndex;
-            if (colCount == this.parent.treeColumnIndex) {
+            if (colCount === this.parent.treeColumnIndex) {
                 this.parent.renderModule.cellRender({ data: args.rowData, cell: args.cell,
                     column: this.parent.grid.getColumnByIndex(args.cell.cellIndex)
                 });
@@ -276,7 +277,7 @@ var BatchEdit = /** @class */ (function () {
             focusModule.getContent().matrix.current = [actualIndex, focusModule.getContent().matrix.current[1]];
         }
     };
-    BatchEdit.prototype.beforeBatchDelete = function () {
+    BatchEdit.prototype.beforeBatchDelete = function (args) {
         if (!this.batchRecords.length) {
             this.batchRecords = extendArray(this.parent.grid.getCurrentViewRecords());
             this.currentViewRecords = extendArray(this.parent.grid.getCurrentViewRecords());
@@ -286,9 +287,19 @@ var BatchEdit = /** @class */ (function () {
         var row = [];
         var records = [];
         var primarykey = this.parent.grid.getPrimaryKeyFieldNames()[0];
-        var data = this.parent.grid.getSelectedRecords()[this.parent.grid.getSelectedRecords().length - 1];
-        var childs = findChildrenRecords(data);
-        var uid = this.parent.getSelectedRows()[0].getAttribute('data-uid');
+        var data;
+        var childs;
+        var uid;
+        if (!isNullOrUndefined(args.row) && this.parent.getSelectedRows().indexOf(args.row) === -1) {
+            data = args.rowData;
+            childs = findChildrenRecords(data);
+            uid = args.row.getAttribute('data-uid');
+        }
+        else {
+            data = this.parent.grid.getSelectedRecords()[this.parent.grid.getSelectedRecords().length - 1];
+            childs = findChildrenRecords(data);
+            uid = this.parent.getSelectedRows()[0].getAttribute('data-uid');
+        }
         var parentRowIndex = parseInt(this.parent.grid.getRowElementByUID(uid).getAttribute('aria-rowindex'), 10);
         if (childs.length) {
             var totalCount = parentRowIndex + childs.length;
@@ -328,7 +339,8 @@ var BatchEdit = /** @class */ (function () {
         for (var i = 0; i < rows.length; i++) {
             rows[i].setAttribute('aria-rowindex', i.toString());
         }
-        var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 || this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
+        var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
+            this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
         if (this.parent.frozenRows || this.parent.getFrozenColumns() || this.parent.frozenColumns || freeze) {
             var mRows = this.parent.grid.getMovableDataRows();
             var freezeRightRows = this.parent.grid.getFrozenRightDataRows();

package/src/treegrid/actions/crud-actions.js

@@ -66,6 +66,7 @@ export function editAction(details, control, isSelfReference, addRowIndex, selec
                                 var childRecords = parentData ? parentData[control.childMapping] : [];
                                 for (var p = childRecords.length - 1; p >= 0; p--) {
                                     if (childRecords[p][control.idMapping] === currentData_1[control.idMapping]) {
+                                        parentData['childRecords'].splice(p, 1);
                                         childRecords.splice(p, 1);
                                         if (!childRecords.length) {
                                             parentData.hasChildRecords = false;

package/src/treegrid/actions/edit.js

@@ -260,7 +260,7 @@ var Edit = /** @class */ (function () {
         if (args.action === 'f2') {
             this.recordDoubleClick(args);
         }
-        if (args.action == 'escape') {
+        if (args.action === 'escape') {
             this.parent.closeEdit();
         }
     };
@@ -371,12 +371,13 @@ var Edit = /** @class */ (function () {
                 });
             }
             else {
-                var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 || this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
+                var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
+                    this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
                 if (freeze) {
-                    if (this.parent.getRows().indexOf(row_1) != -1) {
+                    if (this.parent.getRows().indexOf(row_1) !== -1) {
                         rowIndex_1 = this.parent.getRows().indexOf(row_1);
                     }
-                    else if (this.parent.getFrozenRightRows().indexOf(row_1) != -1) {
+                    else if (this.parent.getFrozenRightRows().indexOf(row_1) !== -1) {
                         rowIndex_1 = this.parent.getFrozenRightRows().indexOf(row_1);
                     }
                     else {
@@ -443,7 +444,8 @@ var Edit = /** @class */ (function () {
             this.isOnBatch = false;
         }
         this.enableToolbarItems('save');
-        var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 || this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
+        var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
+            this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
         if (freeze) {
             if (args.cell.closest('.e-frozen-left-header') || args.cell.closest('.e-frozen-left-content')) {
                 mRow = this.parent.grid.getRows()[rowIndex];
@@ -480,7 +482,7 @@ var Edit = /** @class */ (function () {
             type: 'save', column: this.parent.getColumnByField(args.columnName), data: args.rowData,
             previousData: args.previousValue, row: row, target: args.cell
         };
-        if (this.parent.aggregates.map(function (ag) { return ag.showChildSummary == true; }).length) {
+        if (this.parent.aggregates.map(function (ag) { return ag.showChildSummary === true; }).length) {
             this.parent.grid.refresh();
         }
         this.parent.trigger(events.actionComplete, saveArgs);
@@ -522,6 +524,10 @@ var Edit = /** @class */ (function () {
                 }
             }
             setValue('uniqueIDCollection.' + data[i].uniqueID + '.index', i, this.parent);
+            var adaptor = this.parent.dataSource.adaptor;
+            if ((isRemoteData(this.parent) || adaptor instanceof RemoteSaveAdaptor)) {
+                setValue('uniqueIDCollection.' + data[i].uniqueID, data[i], this.parent);
+            }
             if (!data[i].level) {
                 this.parent.parentData.push(data[i]);
             }
@@ -641,7 +647,8 @@ var Edit = /** @class */ (function () {
                     this.parent.grid.contentModule[r].splice(0, 1);
                     this.parent.grid.contentModule[r].splice(rowObjectIndex, 0, newRowObject);
                 }
-                var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 || this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
+                var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
+                    this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
                 if (this.parent.frozenRows || this.parent.getFrozenColumns() || this.parent.frozenColumns || freeze) {
                     var movableRows = this.parent.getMovableDataRows();
                     var frows = 'freezeRows';

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

@@ -35,7 +35,8 @@ var Freeze = /** @class */ (function () {
         var frozenrows = this.parent.getRows();
         var rows;
         var frozenRightRows;
-        var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 || this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
+        var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
+            this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
         if (freeze) {
             frozenRightRows = this.parent.getFrozenRightRows().filter(function (e) {
                 return e.querySelector('.e-gridrowindex' + args.record.index + 'level' + (args.record.level + 1));

package/src/treegrid/actions/rowdragdrop.js

@@ -351,7 +351,8 @@ var RowDD = /** @class */ (function () {
         var bottomRowSegment = middleRowSegment + divide;
         var mouseEvent = getObject('originalEvent.event', args);
         var touchEvent = getObject('originalEvent.event', args);
-        var posy = (mouseEvent.type == "mousemove") ? mouseEvent.pageY : ((!isNullOrUndefined(touchEvent) && !isNullOrUndefined(touchEvent.changedTouches)) ? touchEvent.changedTouches[0].pageY : null);
+        var posy = (mouseEvent.type === 'mousemove') ? mouseEvent.pageY : ((!isNullOrUndefined(touchEvent) &&
+            !isNullOrUndefined(touchEvent.changedTouches)) ? touchEvent.changedTouches[0].pageY : null);
         var isTopSegment = posy <= topRowSegment;
         var isMiddleRowSegment = (posy > topRowSegment && posy <= middleRowSegment);
         var isBottomRowSegment = (posy > middleRowSegment && posy <= bottomRowSegment);
@@ -578,7 +579,7 @@ var RowDD = /** @class */ (function () {
         }
         else {
             if (args.target && closest(args.target, '#' + tObj.rowDropSettings.targetID) || parentsUntil(args.target, 'e-treegrid') &&
-                parentsUntil(args.target, 'e-treegrid').id === tObj.rowDropSettings.targetID) {
+                parentsUntil(args.target, 'e-treegrid').id === tObj.rowDropSettings.targetID || args.target && document.getElementById(tObj.rowDropSettings.targetID)) {
                 setValue('dropPosition', this.dropPosition, args);
                 tObj.trigger(events.rowDrop, args);
                 if (!args.cancel && tObj.rowDropSettings.targetID) {
@@ -719,7 +720,7 @@ var RowDD = /** @class */ (function () {
     RowDD.prototype.dropRows = function (args, isByMethod) {
         if (this.dropPosition !== 'Invalid' && !isRemoteData(this.parent)) {
             var tObj = this.parent;
-            var draggedRecord = void 0;
+            var draggedRecord_2;
             var droppedRecord = void 0;
             if (isNullOrUndefined(args.dropIndex)) {
                 var rowIndex = tObj.getSelectedRowIndexes()[0] - 1;
@@ -751,76 +752,93 @@ var RowDD = /** @class */ (function () {
             if (!isNullOrUndefined(this.parent.idMapping)) {
                 dragRecords.reverse();
             }
-            for (var i = 0; i < dragLength; i++) {
-                draggedRecord = dragRecords[i];
-                this.draggedRecord = draggedRecord;
-                if (this.dropPosition !== 'Invalid') {
+            var _loop_2 = function (i) {
+                draggedRecord_2 = dragRecords[i];
+                this_1.draggedRecord = draggedRecord_2;
+                if (this_1.dropPosition !== 'Invalid') {
                     if (!tObj.rowDropSettings.targetID || isByMethod) {
-                        this.deleteDragRow();
+                        this_1.deleteDragRow();
                     }
-                    if (this.draggedRecord === this.droppedRecord) {
-                        var correctIndex = this.getTargetIdx(args.target.offsetParent.parentElement);
+                    if (this_1.draggedRecord === this_1.droppedRecord) {
+                        var correctIndex = this_1.getTargetIdx(args.target.offsetParent.parentElement);
                         if (isNaN(correctIndex)) {
-                            correctIndex = this.getTargetIdx(args.target.parentElement);
+                            correctIndex = this_1.getTargetIdx(args.target.parentElement);
                         }
                         args.dropIndex = correctIndex;
-                        droppedRecord = this.droppedRecord = this.parent.getCurrentViewRecords()[args.dropIndex];
+                        droppedRecord = this_1.droppedRecord = this_1.parent.getCurrentViewRecords()[args.dropIndex];
+                    }
+                    if (droppedRecord.parentItem || this_1.dropPosition === 'middleSegment') {
+                        var parentRecords = tObj.parentData;
+                        var newParentIndex = parentRecords.indexOf(this_1.draggedRecord);
+                        if (newParentIndex !== -1) {
+                            parentRecords.splice(newParentIndex, 1);
+                        }
                     }
-                    var recordIndex1 = this.treeGridData.indexOf(droppedRecord);
-                    this.dropAtTop(recordIndex1);
-                    if (this.dropPosition === 'bottomSegment') {
+                    var recordIndex1 = this_1.treeGridData.indexOf(droppedRecord);
+                    this_1.dropAtTop(recordIndex1);
+                    if (this_1.dropPosition === 'bottomSegment') {
                         if (!droppedRecord.hasChildRecords) {
-                            if (this.parent.parentIdMapping) {
-                                this.treeData.splice(recordIndex1 + 1, 0, this.draggedRecord.taskData);
+                            if (this_1.parent.parentIdMapping) {
+                                this_1.treeData.splice(recordIndex1 + 1, 0, this_1.draggedRecord.taskData);
                             }
-                            this.treeGridData.splice(recordIndex1 + 1, 0, this.draggedRecord);
+                            this_1.treeGridData.splice(recordIndex1 + 1, 0, this_1.draggedRecord);
                         }
                         else {
-                            count = this.getChildCount(droppedRecord, 0);
-                            if (this.parent.parentIdMapping) {
-                                this.treeData.splice(recordIndex1 + count + 1, 0, this.draggedRecord.taskData);
+                            count = this_1.getChildCount(droppedRecord, 0);
+                            if (this_1.parent.parentIdMapping) {
+                                this_1.treeData.splice(recordIndex1 + count + 1, 0, this_1.draggedRecord.taskData);
                             }
-                            this.treeGridData.splice(recordIndex1 + count + 1, 0, this.draggedRecord);
+                            this_1.treeGridData.splice(recordIndex1 + count + 1, 0, this_1.draggedRecord);
                         }
                         if (isNullOrUndefined(droppedRecord.parentItem)) {
-                            delete draggedRecord.parentItem;
-                            draggedRecord.level = 0;
-                            if (this.parent.parentIdMapping) {
-                                draggedRecord[this.parent.parentIdMapping] = null;
+                            delete draggedRecord_2.parentItem;
+                            draggedRecord_2.level = 0;
+                            if (this_1.parent.parentIdMapping) {
+                                draggedRecord_2[this_1.parent.parentIdMapping] = null;
                             }
                         }
                         if (droppedRecord.parentItem) {
-                            var rec = this.getChildrecordsByParentID(droppedRecord.parentUniqueID);
+                            var rec = this_1.getChildrecordsByParentID(droppedRecord.parentUniqueID);
                             var childRecords = rec[0].childRecords;
                             var droppedRecordIndex = childRecords.indexOf(droppedRecord) + 1;
-                            childRecords.splice(droppedRecordIndex, 0, draggedRecord);
-                            draggedRecord.parentItem = droppedRecord.parentItem;
-                            draggedRecord.parentUniqueID = droppedRecord.parentUniqueID;
-                            if (this.parent.parentIdMapping) {
-                                draggedRecord[this.parent.parentIdMapping] = droppedRecord[this.parent.parentIdMapping];
-                                draggedRecord.parentItem = droppedRecord.parentItem;
-                                draggedRecord.level = droppedRecord.level;
+                            childRecords.splice(droppedRecordIndex, 0, draggedRecord_2);
+                            draggedRecord_2.parentItem = droppedRecord.parentItem;
+                            draggedRecord_2.parentUniqueID = droppedRecord.parentUniqueID;
+                            if (this_1.parent.parentIdMapping) {
+                                draggedRecord_2[this_1.parent.parentIdMapping] = droppedRecord[this_1.parent.parentIdMapping];
+                                draggedRecord_2.parentItem = droppedRecord.parentItem;
+                                draggedRecord_2.level = droppedRecord.level;
                             }
                         }
-                        if (draggedRecord.hasChildRecords) {
+                        if (draggedRecord_2.hasChildRecords) {
                             var level = 1;
-                            this.updateChildRecordLevel(draggedRecord, level);
-                            this.updateChildRecord(draggedRecord, recordIndex1 + count + 1);
+                            this_1.updateChildRecordLevel(draggedRecord_2, level);
+                            this_1.updateChildRecord(draggedRecord_2, recordIndex1 + count + 1);
                         }
                     }
-                    this.dropMiddle(recordIndex1);
+                    this_1.dropMiddle(recordIndex1);
                 }
-                if (isNullOrUndefined(draggedRecord.parentItem)) {
+                if (isNullOrUndefined(draggedRecord_2.parentItem)) {
                     var parentRecords = tObj.parentData;
-                    var newParentIndex = parentRecords.indexOf(this.droppedRecord);
-                    if (this.dropPosition === 'bottomSegment') {
-                        parentRecords.splice(newParentIndex + 1, 0, draggedRecord);
+                    var newParentIndex = parentRecords.indexOf(this_1.droppedRecord);
+                    var nonRepeat_1 = 0;
+                    parentRecords.filter(function (e) {
+                        if (draggedRecord_2.uniqueID === e.uniqueID) {
+                            nonRepeat_1++;
+                        }
+                    });
+                    if (this_1.dropPosition === 'bottomSegment' && nonRepeat_1 === 0) {
+                        parentRecords.splice(newParentIndex + 1, 0, draggedRecord_2);
                     }
-                    else if (this.dropPosition === 'topSegment') {
-                        parentRecords.splice(newParentIndex, 0, draggedRecord);
+                    else if (this_1.dropPosition === 'topSegment' && nonRepeat_1 === 0) {
+                        parentRecords.splice(newParentIndex, 0, draggedRecord_2);
                     }
                 }
                 tObj.rowDragAndDropModule.refreshGridDataSource();
+            };
+            var this_1 = this;
+            for (var i = 0; i < dragLength; i++) {
+                _loop_2(i);
             }
         }
     };
@@ -888,6 +906,11 @@ var RowDD = /** @class */ (function () {
             draggedRecord.parentItem = parentItem;
             draggedRecord.parentUniqueID = droppedRecord.uniqueID;
             droppedRecord.childRecords.splice(droppedRecord.childRecords.length, 0, draggedRecord);
+            var isSelfReference = 'isSelfReference';
+            if (tObj[isSelfReference]) {
+                droppedRecord[tObj.childMapping] = [];
+                droppedRecord[tObj.childMapping].splice(droppedRecord[tObj.childMapping].length, 0, draggedRecord);
+            }
             if (!isNullOrUndefined(draggedRecord) && !tObj.parentIdMapping && !isNullOrUndefined(droppedRecord.taskData[childItem])) {
                 droppedRecord.taskData[tObj.childMapping].splice(droppedRecord.childRecords.length, 0, draggedRecord.taskData);
             }
@@ -926,7 +949,7 @@ var RowDD = /** @class */ (function () {
         }
         length = record.childRecords.length;
         for (var i = 0; i < length; i++) {
-            currentRecord = record.childRecords[i];
+            currentRecord = getValue('uniqueIDCollection.' + record.childRecords[i].uniqueID, tObj);
             count++;
             tObj.flatData.splice(count, 0, currentRecord);
             setValue('uniqueIDCollection.' + currentRecord.uniqueID, currentRecord, this.parent);
@@ -948,7 +971,7 @@ var RowDD = /** @class */ (function () {
         }
         length = record.childRecords.length;
         for (var i = 0; i < length; i++) {
-            currentRecord = record.childRecords[i];
+            currentRecord = getValue('uniqueIDCollection.' + record.childRecords[i].uniqueID, this.parent);
             var parentData = void 0;
             if (record.parentItem) {
                 parentData = getParentData(this.parent, record.parentItem.uniqueID);

package/src/treegrid/actions/selection.js

@@ -2,7 +2,7 @@ import { isNullOrUndefined, removeClass } from '@syncfusion/ej2-base';
 import { createCheckBox } from '@syncfusion/ej2-buttons';
 import { parentsUntil, getObject } from '@syncfusion/ej2-grids';
 import * as events from '../base/constant';
-import { getParentData, isRemoteData, isCheckboxcolumn } from '../utils';
+import { getParentData, isRemoteData, isCheckboxcolumn, findChildrenRecords } from '../utils';
 /**
  * TreeGrid Selection module
  *
@@ -261,11 +261,11 @@ var Selection = /** @class */ (function () {
         var length = 0;
         if (!isNullOrUndefined(this.parent.filterModule) && this.parent.filterModule.filteredResult.length > 0) {
             var filterResult = this.parent.filterModule.filteredResult;
-            if (this.filteredList.length == 0) {
+            if (this.filteredList.length === 0) {
                 this.filteredList = filterResult;
             }
             else {
-                if (this.filteredList != filterResult) {
+                if (this.filteredList !== filterResult) {
                     this.filteredList = filterResult;
                 }
             }
@@ -357,6 +357,9 @@ var Selection = /** @class */ (function () {
                 (!isNullOrUndefined(this.parent.filterModule) && this.parent.filterModule.filteredResult.length > 0))) {
                 this.selectedItems.push(checkedRecord);
             }
+            if (this.selectedItems.indexOf(checkedRecord) === -1 && this.parent.enableVirtualization && ((!isNullOrUndefined(this.parent.filterModule) && this.parent.filterModule.filteredResult.length > 0))) {
+                this.selectedItems.push(checkedRecord);
+            }
             if (this.selectedItems.indexOf(checkedRecord) === -1 && (!isNullOrUndefined(this.parent.filterModule) &&
                 this.parent.filterModule.filteredResult.length === 0)) {
                 this.selectedItems.push(checkedRecord);
@@ -430,11 +433,31 @@ var Selection = /** @class */ (function () {
                     childData = (!isNullOrUndefined(this.parent.filterModule) && this.parent.filterModule.filteredResult.length > 0) ?
                         this.parent.getCurrentViewRecords() : this.parent.flatData;
                     childData.forEach(function (record) {
-                        if (record.hasChildRecords) {
-                            _this.updateParentSelection(record);
+                        if (_this.parent.enableVirtualization) {
+                            if (record.hasChildRecords) {
+                                _this.updateParentSelection(record);
+                            }
+                            else {
+                                _this.updateSelectedItems(record, record.checkboxState);
+                            }
+                            var child = findChildrenRecords(record);
+                            child = _this.getFilteredChildRecords(child);
+                            for (var i = 0; i < child.length; i++) {
+                                if (child[i].hasChildRecords) {
+                                    _this.updateParentSelection(child[i]);
+                                }
+                                else if (!(child[i].hasChildRecords) && !isNullOrUndefined(child[i])) {
+                                    _this.updateSelectedItems(child[i], child[i].checkboxState);
+                                }
+                            }
                         }
                         else {
-                            _this.updateSelectedItems(record, record.checkboxState);
+                            if (record.hasChildRecords) {
+                                _this.updateParentSelection(record);
+                            }
+                            else {
+                                _this.updateSelectedItems(record, record.checkboxState);
+                            }
                         }
                     });
                     this.headerSelection();

package/src/treegrid/actions/virtual-scroll.js

@@ -18,6 +18,7 @@ import * as events from '../base/constant';
 import { DataManager, Predicate, Query } from '@syncfusion/ej2-data';
 import { getExpandStatus } from '../utils';
 import { VirtualTreeContentRenderer } from '../renderer/virtual-tree-content-render';
+import { VirtualHeaderRenderer } from '@syncfusion/ej2-grids';
 /**
  * TreeGrid Virtual Scroll module will handle Virtualization
  *
@@ -53,8 +54,12 @@ var VirtualScroll = /** @class */ (function () {
      * @returns {void}
      */
     VirtualScroll.prototype.addEventListener = function () {
+        if (this.parent.isDestroyed) {
+            return;
+        }
         this.parent.on(events.localPagedExpandCollapse, this.collapseExpandVirtualchilds, this);
         this.parent.on(events.pagingActions, this.virtualPageAction, this);
+        this.parent.on(events.destroy, this.destroy, this);
     };
     /**
      * @hidden
@@ -66,6 +71,7 @@ var VirtualScroll = /** @class */ (function () {
         }
         this.parent.off(events.localPagedExpandCollapse, this.collapseExpandVirtualchilds);
         this.parent.off(events.pagingActions, this.virtualPageAction);
+        this.parent.off(events.destroy, this.destroy);
     };
     VirtualScroll.prototype.collapseExpandVirtualchilds = function (row) {
         this.parent.grid.notify(events.virtualActionArgs, { isExpandCollapse: true });
@@ -121,7 +127,7 @@ var VirtualScroll = /** @class */ (function () {
                 var resourceCount = this.parent.getRows();
                 var sIndex = visualData.indexOf(this.expandCollapseRec);
                 var tempdata = visualData.slice(sIndex, sIndex + resourceCount.length);
-                if (tempdata.length < resourceCount.length && sIndex >= 0) {
+                if (tempdata.length < resourceCount.length && sIndex >= 0 && startIndex !== 0) {
                     sIndex = visualData.length - resourceCount.length;
                     sIndex = sIndex > 0 ? sIndex : 0;
                     startIndex = sIndex;
@@ -132,17 +138,17 @@ var VirtualScroll = /** @class */ (function () {
                     endIndex = this.parent.grid.pageSettings.pageSize - 1;
                     this.parent.grid.notify(events.virtualActionArgs, { setTop: true });
                 }
-                this.expandCollapseRec = null;
             }
             //}
-            if (!isNullOrUndefined(this.expandCollapseRec) && this.parent.enableCollapseAll) {
+            if ((this.parent.enableCollapseAll || this.parent.expandStateMapping) && !isNullOrUndefined(this.expandCollapseRec)) {
                 if (pageingDetails.count < this.parent.getRows()[0].getBoundingClientRect().height) {
-                    startIndex = visualData[0].index;
+                    startIndex = 0;
                 }
                 else {
                     startIndex = this.prevstartIndex === -1 ? 0 : this.prevstartIndex;
                 }
             }
+            this.expandCollapseRec = null;
             pageingDetails.result = visualData.slice(startIndex, endIndex);
             this.prevstartIndex = startIndex;
             this.prevendIndex = endIndex;
@@ -173,8 +179,13 @@ var TreeVirtual = /** @class */ (function (_super) {
         return 'treeVirtualScroll';
     };
     TreeVirtual.prototype.instantiateRenderers = function () {
+        var parentGrid = getValue('parent', this);
         getValue('parent', this).log(['limitation', 'virtual_height'], 'virtualization');
         var renderer = getValue('locator', this).getService('rendererFactory');
+        if (parentGrid.enableColumnVirtualization) {
+            getValue('addRenderer', renderer)
+                .apply(renderer, [RenderType.Header, new VirtualHeaderRenderer(getValue('parent', this), getValue('locator', this))]);
+        }
         getValue('addRenderer', renderer)
             .apply(renderer, [RenderType.Content, new VirtualTreeContentRenderer(getValue('parent', this), getValue('locator', this))]);
         //renderer.addRenderer(RenderType.Content, new VirtualTreeContentRenderer(getValue('parent', this), getValue('locator', this)));

package/src/treegrid/base/constant.d.ts

@@ -97,6 +97,8 @@ export declare const virtualColumnIndex: string;
 /** @hidden */
 export declare const virtualActionArgs: string;
 /** @hidden */
+export declare const destroy: string;
+/** @hidden */
 export declare const dataListener: string;
 /** @hidden */
 export declare const indexModifier: string;
@@ -124,3 +126,5 @@ export declare const rowsRemove: string;
 export declare const rowdraging: string;
 /** @hidden */
 export declare const rowDropped: string;
+/** @hidden */
+export declare const autoCol: string;

package/src/treegrid/base/constant.js

@@ -97,6 +97,8 @@ export var virtualColumnIndex = 'virtualColumnIndex';
 /** @hidden */
 export var virtualActionArgs = 'virtual-action-args';
 /** @hidden */
+export var destroy = 'destroy';
+/** @hidden */
 export var dataListener = 'data-listener';
 /** @hidden */
 export var indexModifier = 'index-modifier';
@@ -124,3 +126,5 @@ export var rowsRemove = 'rows-remove';
 export var rowdraging = 'row-draging';
 /** @hidden */
 export var rowDropped = 'row-dropped';
+/** @hidden */
+export var autoCol = 'auto-col';

package/src/treegrid/base/treegrid-model.d.ts

@@ -462,6 +462,14 @@ export interface TreeGridModel extends ComponentModel{
      */
     enableVirtualization?: boolean;
 
+    /**
+     * If `enableColumnVirtualization` set to true, then the Tree Grid will render only the columns visible within the view-port
+     * and load subsequent columns on horizontal scrolling. This helps to load large dataset of columns in Tree Grid.
+     *
+     * @default false
+     */
+    enableColumnVirtualization?: boolean;
+
     /**
      * If `enableInfiniteScrolling` set to true, then the data will be loaded in TreeGrid when the scrollbar reaches the end.
      * This helps to load large dataset in TreeGrid.

package/src/treegrid/base/treegrid.d.ts

@@ -566,6 +566,13 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
      * @default false
      */
     enableVirtualization: boolean;
+    /**
+     * If `enableColumnVirtualization` set to true, then the Tree Grid will render only the columns visible within the view-port
+     * and load subsequent columns on horizontal scrolling. This helps to load large dataset of columns in Tree Grid.
+     *
+     * @default false
+     */
+    enableColumnVirtualization: boolean;
     /**
      * If `enableInfiniteScrolling` set to true, then the data will be loaded in TreeGrid when the scrollbar reaches the end.
      * This helps to load large dataset in TreeGrid.
@@ -1491,6 +1498,7 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
      * @returns {number} - Returns column index
      */
     getColumnIndexByField(field: string): number;
+    private getVirtualColIndexByUid;
     /**
      * Gets a column index by UID.
      *