@syncfusion/ej2-treegrid 19.3.44 → 19.3.48

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

@@ -1,5 +1,5 @@
-import { Browser, ChildProperty, Collection, Complex, Component, Event, EventHandler, Internationalization, KeyboardEvents, L10n, NotifyPropertyChanges, Property, addClass, classList, closest, compile, createElement, extend, getEnumValue, getValue, isNullOrUndefined, merge, remove, removeClass, select, setValue } from '@syncfusion/ej2-base';
-import { Aggregate, Cell, CellType, Clipboard, ColumnChooser, ColumnMenu, CommandColumn, ContextMenu, DetailRow, Edit, ExcelExport, Filter, Freeze, Grid, InfiniteScroll, InterSectionObserver, Logger, Page, PdfExport, Print, RenderType, Reorder, Resize, RowDD, RowDropSettings, RowRenderer, Scroll, Sort, Toolbar, VirtualContentRenderer, VirtualRowModelGenerator, VirtualScroll, appendChildren, calculateAggregate, detailLists, extend as extend$1, getActualProperties, getObject, getUid, iterateArrayOrObject, parentsUntil, resetRowIndex, templateCompiler } from '@syncfusion/ej2-grids';
+import { Browser, ChildProperty, Collection, Complex, Component, Event, EventHandler, Internationalization, KeyboardEvents, L10n, NotifyPropertyChanges, Property, addClass, classList, closest, compile, createElement, debounce, extend, getEnumValue, getValue, isNullOrUndefined, merge, remove, removeClass, select, setValue } from '@syncfusion/ej2-base';
+import { Aggregate, Cell, CellType, Clipboard, ColumnChooser, ColumnMenu, CommandColumn, ContextMenu, DetailRow, Edit, ExcelExport, Filter, Freeze, Grid, InfiniteScroll, InterSectionObserver, Logger, Page, PdfExport, Print, RenderType, Reorder, Resize, RowDD, RowDropSettings, RowRenderer, Scroll, Sort, Toolbar, VirtualContentRenderer, VirtualHeaderRenderer, VirtualRowModelGenerator, VirtualScroll, appendChildren, calculateAggregate, detailLists, extend as extend$1, getActualProperties, getObject, getUid, iterateArrayOrObject, parentsUntil, resetRowIndex, templateCompiler } from '@syncfusion/ej2-grids';
 import { createCheckBox } from '@syncfusion/ej2-buttons';
 import { CacheAdaptor, DataManager, DataUtil, Deferred, JsonAdaptor, ODataAdaptor, Predicate, Query, RemoteSaveAdaptor, UrlAdaptor, WebApiAdaptor, WebMethodAdaptor } from '@syncfusion/ej2-data';
 import { createSpinner, hideSpinner, showSpinner } from '@syncfusion/ej2-popups';
@@ -447,6 +447,8 @@ var virtualColumnIndex = 'virtualColumnIndex';
 /** @hidden */
 var virtualActionArgs = 'virtual-action-args';
 /** @hidden */
+var destroy = 'destroy';
+/** @hidden */
 var dataListener = 'data-listener';
 /** @hidden */
 var indexModifier = 'index-modifier';
@@ -474,6 +476,8 @@ var rowsRemove = 'rows-remove';
 var rowdraging = 'row-draging';
 /** @hidden */
 var rowDropped = 'row-dropped';
+/** @hidden */
+var autoCol = 'auto-col';
 
 var __extends$4 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -1111,11 +1115,11 @@ var Selection = /** @__PURE__ @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;
                 }
             }
@@ -1207,6 +1211,9 @@ var Selection = /** @__PURE__ @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);
@@ -1280,11 +1287,31 @@ var Selection = /** @__PURE__ @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();
@@ -1548,7 +1575,15 @@ var Render = /** @__PURE__ @class */ (function () {
         else {
             index = data.index;
         }
-        if (grid.getColumnIndexByUid(args.column.uid) === this.parent.treeColumnIndex && (args.requestType === 'add' || args.requestType
+        var columnIndex;
+        var getVirtualColIndexByUid = 'getVirtualColIndexByUid';
+        if (this.parent.enableColumnVirtualization && !this.parent.initialRender) {
+            columnIndex = this.parent[getVirtualColIndexByUid](args.column.uid);
+        }
+        else {
+            columnIndex = grid.getColumnIndexByUid(args.column.uid);
+        }
+        if (columnIndex === this.parent.treeColumnIndex && (args.requestType === 'add' || args.requestType
             === 'rowDragAndDrop' || args.requestType === 'delete' || isNullOrUndefined(args.cell.querySelector('.e-treecell')))) {
             var container = createElement('div', { className: 'e-treecolumn-container' });
             var emptyExpandIcon = createElement('span', {
@@ -2732,6 +2767,7 @@ function editAction(details, control, isSelfReference, addRowIndex, selectedInde
                                 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;
@@ -3502,7 +3538,8 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 member: 'ExcelExport', args: [this]
             });
         }
-        if (this.frozenColumns || this.frozenRows || this.getFrozenColumns() || this.grid.getFrozenLeftColumnsCount() || this.grid.getFrozenRightColumnsCount()) {
+        if (this.frozenColumns || this.frozenRows || this.getFrozenColumns() ||
+            this.grid.getFrozenLeftColumnsCount() || this.grid.getFrozenRightColumnsCount()) {
             modules.push({
                 member: 'freeze', args: [this]
             });
@@ -3723,6 +3760,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         this.grid.allowSorting = this.allowSorting;
         this.grid.allowFiltering = this.allowFiltering;
         this.grid.enableVirtualization = this.enableVirtualization;
+        this.grid.enableColumnVirtualization = this.enableColumnVirtualization;
         this.grid.enableInfiniteScrolling = this.enableInfiniteScrolling;
         this.grid.infiniteScrollSettings = this.infiniteScrollSettings;
         this.grid.width = this.width;
@@ -4084,6 +4122,10 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 && (_this.grid.filterSettings.columns.length === 0 || _this.grid.searchSettings.key.length === 0)) {
                 _this.notify('clearFilters', { flatData: _this.grid.dataSource });
                 _this.grid.setProperties({ dataSource: _this.dataResults.result }, true);
+                if (isNullOrUndefined(_this.grid['changedProperties'].dataSource)) {
+                    _this.grid.renderModule.data.dataManager = _this.grid.dataSource instanceof DataManager ? _this.grid.dataSource :
+                        (isNullOrUndefined(_this.grid.dataSource) ? new DataManager() : new DataManager(_this.grid.dataSource));
+                }
             }
             var callBackPromise = new Deferred();
             _this.trigger(actionBegin, args, function (actionArgs) {
@@ -4109,7 +4151,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 _this.notify(batchSave, args);
             }
             _this.notify('updateGridActions', args);
-            if (args.requestType === 'save' && _this.aggregates.map(function (ag) { return ag.showChildSummary == true; }).length) {
+            if (args.requestType === 'save' && _this.aggregates.map(function (ag) { return ag.showChildSummary === true; }).length) {
                 _this.grid.refresh();
             }
             _this.trigger(actionComplete, args);
@@ -4405,6 +4447,9 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 case 'enableVirtualization':
                     this.grid.enableVirtualization = this.enableVirtualization;
                     break;
+                case 'enableColumnVirtualization':
+                    this.grid.enableColumnVirtualization = this.enableColumnVirtualization;
+                    break;
                 case 'toolbar':
                     this.grid.toolbar = this.getGridToolbar();
                     break;
@@ -4628,6 +4673,11 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         if (isNullOrUndefined(this.grid)) {
             return;
         }
+        if (!isNullOrUndefined(this.rowDropSettings.targetID) &&
+            isNullOrUndefined(document.getElementById(this.grid.rowDropSettings.targetID))) {
+            document.getElementById(this.rowDropSettings.targetID).id = this.grid.rowDropSettings.targetID;
+            this.rowDropSettings.targetID = this.grid.rowDropSettings.targetID;
+        }
         _super.prototype.dataBind.call(this);
         this.grid.dataBind();
     };
@@ -4639,7 +4689,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
      */
     TreeGrid.prototype.getPersistData = function () {
         var keyEntity = ['pageSettings', 'sortSettings',
-            'filterSettings', 'columns', 'searchSettings', 'selectedRowIndex'];
+            'filterSettings', 'columns', 'searchSettings', 'selectedRowIndex', 'treeColumnIndex'];
         var ignoreOnPersist = {
             pageSettings: ['template', 'pageSizes', 'pageSizeMode', 'enableQueryString', 'totalRecordsCount', 'pageCount'],
             filterSettings: ['type', 'mode', 'showFilterBarStatus', 'immediateModeDelay', 'ignoreAccent', 'hierarchyMode'],
@@ -4650,9 +4700,9 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             'commandTemplate', 'commands', 'dataSource'];
         for (var i = 0; i < keyEntity.length; i++) {
             var currentObject = this[keyEntity[i]];
-            for (var _i = 0, _a = ignoreOnPersist[keyEntity[i]]; _i < _a.length; _i++) {
-                var val = _a[_i];
-                delete currentObject[val];
+            for (var k = 0, val = ignoreOnPersist[keyEntity[i]]; (!isNullOrUndefined(val) && k < val.length); k++) {
+                var objVal = val[k];
+                delete currentObject[objVal];
             }
         }
         this.ignoreInArrays(ignoreOnColumn, this.columns);
@@ -5055,6 +5105,16 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
     TreeGrid.prototype.getColumnIndexByField = function (field) {
         return this.grid.getColumnIndexByField(field);
     };
+    TreeGrid.prototype.getVirtualColIndexByUid = function (uid) {
+        var columnModel = 'columnModel';
+        var index = iterateArrayOrObject(this.grid[columnModel], function (item, index) {
+            if (item.uid === uid) {
+                return index;
+            }
+            return undefined;
+        })[0];
+        return !isNullOrUndefined(index) ? index : -1;
+    };
     /**
      * Gets a column index by UID.
      *
@@ -5083,18 +5143,20 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             temp = this.columnModel[this.treeColumnIndex].template;
             field = this.columnModel[this.treeColumnIndex].field;
         }
-        this.columnModel = [];
         var stackedHeader = false;
         var gridColumn;
-        for (var i = 0; i < gridColumns.length; i++) {
-            gridColumn = {};
-            for (var _i = 0, _a = Object.keys(gridColumns[i]); _i < _a.length; _i++) {
-                var prop = _a[_i];
-                gridColumn[prop] = gridColumns[i][prop];
-            }
-            this.columnModel.push(new Column(gridColumn));
-            if (field === this.columnModel[i].field && (!isNullOrUndefined(temp) && temp !== '')) {
-                this.columnModel[i].template = temp;
+        if (!this.enableColumnVirtualization || (this.enableColumnVirtualization && this.columnModel.length === gridColumns.length)) {
+            this.columnModel = [];
+            for (var i = 0; i < gridColumns.length; i++) {
+                gridColumn = {};
+                for (var _i = 0, _a = Object.keys(gridColumns[i]); _i < _a.length; _i++) {
+                    var prop = _a[_i];
+                    gridColumn[prop] = gridColumns[i][prop];
+                }
+                this.columnModel.push(new Column(gridColumn));
+                if (field === this.columnModel[i].field && (!isNullOrUndefined(temp) && temp !== '')) {
+                    this.columnModel[i].template = temp;
+                }
             }
         }
         var merge$$1 = 'deepMerge';
@@ -5466,7 +5528,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             var row = getObject('rows', rec);
             var record = getObject('records', rec);
             for (var i = 0; i < record.length; i++) {
-                if (record[i].parentItem != undefined) {
+                if (record[i].parentItem !== undefined) {
                     var pindex = this.flatData[record[i].parentItem.index].index;
                     if (this.flatData[pindex].expanded === false) {
                         record.push(this.flatData[pindex]);
@@ -6431,6 +6493,9 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
     __decorate([
         Property(false)
     ], TreeGrid.prototype, "enableVirtualization", void 0);
+    __decorate([
+        Property(false)
+    ], TreeGrid.prototype, "enableColumnVirtualization", void 0);
     __decorate([
         Property(false)
     ], TreeGrid.prototype, "enableInfiniteScrolling", void 0);
@@ -7112,7 +7177,8 @@ var RowDD$1 = /** @__PURE__ @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);
@@ -7339,7 +7405,7 @@ var RowDD$1 = /** @__PURE__ @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(rowDrop, args);
                 if (!args.cancel && tObj.rowDropSettings.targetID) {
@@ -7480,7 +7546,7 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
     RowDD$$1.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;
@@ -7512,76 +7578,93 @@ var RowDD$1 = /** @__PURE__ @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];
                     }
-                    var recordIndex1 = this.treeGridData.indexOf(droppedRecord);
-                    this.dropAtTop(recordIndex1);
-                    if (this.dropPosition === 'bottomSegment') {
+                    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_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);
             }
         }
     };
@@ -7649,6 +7732,11 @@ var RowDD$1 = /** @__PURE__ @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);
             }
@@ -7687,7 +7775,7 @@ var RowDD$1 = /** @__PURE__ @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);
@@ -7709,7 +7797,7 @@ var RowDD$1 = /** @__PURE__ @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);
@@ -7979,7 +8067,19 @@ var TreeVirtualRowModelGenerator = /** @__PURE__ @class */ (function (_super) {
     TreeVirtualRowModelGenerator.prototype.getDatas = function (args) {
         this.visualData = args.data;
     };
+    TreeVirtualRowModelGenerator.prototype.getDataInfo = function () {
+        return _super.prototype.getData.call(this);
+    };
     TreeVirtualRowModelGenerator.prototype.generateRows = function (data, notifyArgs) {
+        var info = this.getDataInfo();
+        if (!isNullOrUndefined(notifyArgs.virtualInfo)) {
+            if (notifyArgs.virtualInfo.direction !== 'right' && notifyArgs.virtualInfo.direction !== 'left') {
+                notifyArgs.virtualInfo.blockIndexes = info.blockIndexes;
+            }
+            else {
+                notifyArgs.virtualInfo.blockIndexes = this.getBlockIndexes(notifyArgs.virtualInfo.page);
+            }
+        }
         if ((this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
             && !this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || isCountRequired(this.parent)) {
             return _super.prototype.generateRows.call(this, data, notifyArgs);
@@ -9529,10 +9629,11 @@ var BatchEdit = /** @__PURE__ @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)
                 });
@@ -9694,7 +9795,7 @@ var BatchEdit = /** @__PURE__ @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());
@@ -9704,9 +9805,19 @@ var BatchEdit = /** @__PURE__ @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;
@@ -9746,7 +9857,8 @@ var BatchEdit = /** @__PURE__ @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();
@@ -10259,7 +10371,7 @@ var Edit$1 = /** @__PURE__ @class */ (function () {
         if (args.action === 'f2') {
             this.recordDoubleClick(args);
         }
-        if (args.action == 'escape') {
+        if (args.action === 'escape') {
             this.parent.closeEdit();
         }
     };
@@ -10370,12 +10482,13 @@ var Edit$1 = /** @__PURE__ @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 {
@@ -10442,7 +10555,8 @@ var Edit$1 = /** @__PURE__ @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];
@@ -10479,7 +10593,7 @@ var Edit$1 = /** @__PURE__ @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(actionComplete, saveArgs);
@@ -10521,6 +10635,10 @@ var Edit$1 = /** @__PURE__ @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]);
             }
@@ -10640,7 +10758,8 @@ var Edit$1 = /** @__PURE__ @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';
@@ -11207,9 +11326,9 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
         if (!(this.parent.dataSource instanceof DataManager && this.parent.dataSource.dataSource.url !== undefined
             && this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || !isCountRequired(this.parent)) {
             this.parent[action]('data-ready', this.onDataReady, this);
-            //this.parent[action]('refresh-virtual-block', this.refreshContentRows, this);
+            this.parent[action]('refresh-virtual-block', this.refreshContentRows, this);
             this.fn = function () {
-                _this.observers.observes(function (scrollArgs) { return _this.scrollListeners(scrollArgs); });
+                _this.observers.observes(function (scrollArgs) { return _this.scrollListeners(scrollArgs); }, _this.onEnteredAction());
                 _this.parent.off('content-ready', _this.fn);
             };
             this.parent.addEventListener('dataBound', this.dataBoundEvent.bind(this));
@@ -11241,7 +11360,9 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
             && this.parent.dataSource.dataSource.offline && this.parent.dataSource.dataSource.url !== '') || !isCountRequired(this.parent)) {
             if (!isNullOrUndefined(e.count)) {
                 this.totalRecords = e.count;
-                getValue('virtualEle', this).setVirtualHeight(this.parent.getRowHeight() * e.count, '100%');
+                if (!this.parent.enableColumnVirtualization) {
+                    getValue('virtualEle', this).setVirtualHeight(this.parent.getRowHeight() * e.count, '100%');
+                }
             }
             if ((!isNullOrUndefined(e.requestType) && e.requestType.toString() === 'collapseAll') || this.isDataSourceChanged) {
                 this.contents.scrollTop = 0;
@@ -11299,6 +11420,10 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
             return;
         }
         var selectVirtualRow = 'selectVirtualRow';
+        var containerRect = 'containerRect';
+        if (isNullOrUndefined(this.observer[containerRect])) {
+            this.observer[containerRect] = this.observers[containerRect];
+        }
         _super.prototype[selectVirtualRow].call(this, args);
     };
     VirtualTreeContentRenderer.prototype.refreshCell = function (rowObj) {
@@ -11405,15 +11530,39 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
         var actionComplete$$1 = 'actionComplete';
         _super.prototype[actionComplete$$1].call(this, args);
     };
+    VirtualTreeContentRenderer.prototype.onEnteredAction = function () {
+        var _this = this;
+        return function (element, current, direction, e, isWheel, check) {
+            var directVirtualRender = 'directVirtualRender';
+            if (!_this.parent[directVirtualRender]) { // with this property, columns are rendered without debouncing on horizontal scroll.
+                var preventEvent = 'preventEvent';
+                if (Browser.isIE && !isWheel && check && !_this[preventEvent]) {
+                    _this.parent.showSpinner();
+                }
+                var xAxis = current.axis === 'X';
+                var x = _this.getColumnOffset(xAxis ? _this.vgenerator.getColumnIndexes()[0] - 1 : _this.prevInfo.columnIndexes[0]
+                    - 1);
+                if (xAxis) {
+                    var idx = Object.keys(_this.vgenerator.cOffsets).length - _this.prevInfo.columnIndexes.length;
+                    var maxLeft = _this.vgenerator.cOffsets[idx - 1];
+                    x = x > maxLeft ? maxLeft : x; //TODO: This fix horizontal scrollbar jumping issue in column virtualization.
+                }
+                _this.virtualEle.adjustTable(x, _this.translateY);
+                if (_this.parent.enableColumnVirtualization) {
+                    _this.header.virtualEle.adjustTable(x, 0);
+                }
+            }
+        };
+    };
     VirtualTreeContentRenderer.prototype.scrollListeners = function (scrollArgs) {
         var info = scrollArgs.sentinel;
-        var outBuffer = 10; //this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 1.5);
+        var outBuffer = this.parent.pageSettings.pageSize - Math.ceil(this.parent.pageSettings.pageSize / 2);
         var content = this.parent.getContent().querySelector('.e-content');
         var scrollHeight = outBuffer * this.parent.getRowHeight();
         var upScroll = (scrollArgs.offset.top - this.translateY) < 0;
         var downScroll = Math.ceil(scrollArgs.offset.top - this.translateY) >= scrollHeight;
         var selectedRowIndex = 'selectedRowIndex';
-        if (upScroll) {
+        if (upScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left')) {
             var vHeight = +(this.parent.height.toString().indexOf('%') < 0 ? this.parent.height :
                 this.parent.element.getBoundingClientRect().height);
             var index = (~~(content.scrollTop / this.parent.getRowHeight())
@@ -11450,7 +11599,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
                     scrollArgs.offset.top - (outBuffer * height) + 10 : 0;
             }
         }
-        else if (downScroll) {
+        else if (downScroll && (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left')) {
             var nextSetResIndex = ~~(content.scrollTop / this.parent.getRowHeight());
             var isLastBlock = (this[selectedRowIndex] + this.parent.pageSettings.pageSize) < this.totalRecords ? false : true;
             if (!isNullOrUndefined(this[selectedRowIndex]) && this[selectedRowIndex] !== -1 &&
@@ -11471,14 +11620,17 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
                 this.translateY = scrollArgs.offset.top;
             }
         }
-        if ((downScroll && (scrollArgs.offset.top < (this.parent.getRowHeight() * this.totalRecords)))
-            || (upScroll)) {
-            var viewInfo = getValue('getInfoFromView', this).apply(this, [scrollArgs.direction, info, scrollArgs.offset]);
+        if (((downScroll && (scrollArgs.offset.top < (this.parent.getRowHeight() * this.totalRecords)))
+            || (upScroll)) || (scrollArgs.direction === 'right' || scrollArgs.direction === 'left')) {
+            var viewInfo = this.currentInfo = getValue('getInfoFromView', this).apply(this, [scrollArgs.direction, info, scrollArgs.offset]);
             this.previousInfo = viewInfo;
+            this.parent.setColumnIndexesInView(this.parent.enableColumnVirtualization ? viewInfo.columnIndexes : []);
             var page = viewInfo.loadNext && !viewInfo.loadSelf ? viewInfo.nextInfo.page : viewInfo.page;
             this.parent.setProperties({ pageSettings: { currentPage: page } }, true);
-            viewInfo.event = viewInfo.event === 'refresh-virtual-block' ? 'model-changed' : viewInfo.event;
-            this.parent.notify(viewInfo.event, { requestType: 'virtualscroll', focusElement: scrollArgs.focusElement });
+            if (scrollArgs.direction !== 'right' && scrollArgs.direction !== 'left') {
+                viewInfo.event = viewInfo.event === 'refresh-virtual-block' ? 'model-changed' : viewInfo.event;
+            }
+            this.parent.notify(viewInfo.event, { requestType: 'virtualscroll', virtualInfo: viewInfo, focusElement: scrollArgs.focusElement });
         }
     };
     VirtualTreeContentRenderer.prototype.appendContent = function (target, newChild, e) {
@@ -11495,7 +11647,14 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
                 getValue('currentInfo', this) : e.virtualInfo;
             var cBlock = (info.columnIndexes[0]) - 1;
             var cOffset = this.getColumnOffset(cBlock);
-            this.virtualEle.setWrapperWidth(null, (Browser.isIE || Browser.info.name === 'edge'));
+            var width = void 0;
+            if (this.parent.enableColumnVirtualization) {
+                this.header.virtualEle.adjustTable(cOffset, 0);
+                var cIndex = info.columnIndexes;
+                width = this.getColumnOffset(cIndex[cIndex.length - 1]) - this.getColumnOffset(cIndex[0] - 1) + '';
+                this.header.virtualEle.setWrapperWidth(width);
+            }
+            this.virtualEle.setWrapperWidth(width, (Browser.isIE || Browser.info.name === 'edge'));
             target = this.parent.createElement('tbody');
             target.appendChild(newChild);
             var replace = 'replaceWith';
@@ -11507,8 +11666,12 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
                 this.isExpandCollapse = false;
             }
             setValue('prevInfo', this.previousInfo ? this.previousInfo : info, this);
+            if (e.requestType === 'virtualscroll' && e.virtualInfo.sentinelInfo.axis === 'X') {
+                this.parent.notify(autoCol, {});
+            }
             var focusCell = 'focusCell';
             var restoreAdd = 'restoreAdd';
+            var ensureSelectedRowPosition = 'ensureSelectedRowPosition';
             _super.prototype[focusCell].call(this, e);
             var isAdd = 'isAdd';
             if (this[isAdd] && !this.parent.getContent().querySelector('.e-content').querySelector('.e-addedrow')) {
@@ -11524,6 +11687,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
             }
             this.restoreEditState();
             _super.prototype[restoreAdd].call(this);
+            _super.prototype[ensureSelectedRowPosition].call(this);
         }
     };
     VirtualTreeContentRenderer.prototype.removeEventListener = function () {
@@ -11559,28 +11723,34 @@ var TreeInterSectionObserver = /** @__PURE__ @class */ (function (_super) {
         _this.timer = 0;
         return _this;
     }
-    TreeInterSectionObserver.prototype.observes = function (callback) {
+    TreeInterSectionObserver.prototype.observes = function (callback, onEnterCallback) {
         var containerRect = 'containerRect';
         _super.prototype[containerRect] = getValue('options', this).container.getBoundingClientRect();
-        EventHandler.add(getValue('options', this).container, 'scroll', this.virtualScrollHandlers(callback), this);
+        EventHandler.add(getValue('options', this).container, 'scroll', this.virtualScrollHandlers(callback, onEnterCallback), this);
     };
     TreeInterSectionObserver.prototype.clear = function () {
         this.lastPos = null;
     };
-    TreeInterSectionObserver.prototype.virtualScrollHandlers = function (callback) {
+    TreeInterSectionObserver.prototype.virtualScrollHandlers = function (callback, onEnterCallback) {
         var _this = this;
-        var prevTop = 0;
-        var prevLeft = 0;
+        var delay = Browser.info.name === 'chrome' ? 200 : 100;
+        var options = 'options';
+        var movableEle = 'movableEle';
+        var element = 'element';
+        var fromWheel = 'fromWheel';
+        var debounced100 = debounce(callback, delay);
+        var debounced50 = debounce(callback, 50);
+        this[options].prevTop = this[options].prevLeft = 0;
         return function (e) {
-            var scrollTop = e.target.scrollTop;
-            var scrollLeft = e.target.scrollLeft;
-            var direction = prevTop < scrollTop ? 'down' : 'up';
-            direction = prevLeft === scrollLeft ? direction : prevLeft < scrollLeft ? 'right' : 'left';
-            prevTop = scrollTop;
-            prevLeft = scrollLeft;
-            var current = getValue('sentinelInfo', _this)[direction];
+            var top = _this[options].movableContainer ? _this[options].container.scrollTop : e.target.scrollTop;
+            var left = _this[options].movableContainer ? _this[options].scrollbar.scrollLeft : e.target.scrollLeft;
+            var direction = _this[options].prevTop < top ? 'down' : 'up';
+            direction = _this[options].prevLeft === left ? direction : _this[options].prevLeft < left ? 'right' : 'left';
+            _this[options].prevTop = top;
+            _this[options].prevLeft = left;
+            var current = _this.sentinelInfo[direction];
             var delta = 0;
-            _this.newPos = scrollTop;
+            _this.newPos = top;
             if (_this.lastPos != null) { // && newPos < maxScroll
                 delta = _this.newPos - _this.lastPos;
             }
@@ -11589,19 +11759,35 @@ var TreeInterSectionObserver = /** @__PURE__ @class */ (function (_super) {
                 clearTimeout(_this.timer);
             }
             _this.timer = setTimeout(_this.clear, 0);
-            /*if (this.options.axes.indexOf(current.axis) === -1) {
-            return;
-        }*/
-            /*if(delta > 45 || delta < -45){
-          this.isWheeling = true;
-        }*/
             if ((delta > 100 || delta < -100) && (e && e.preventDefault)) {
                 e.returnValue = false;
                 e.preventDefault();
             }
-            callback({ direction: direction, isWheel: _this.isWheeling,
-                sentinel: current, offset: { top: scrollTop, left: scrollLeft },
-                focusElement: document.activeElement });
+            if (_this[options].axes.indexOf(current.axis) === -1) {
+                return;
+            }
+            var check = _this.check(direction);
+            if (current.entered && current.axis === 'X') {
+                if (_this[movableEle] && (direction === 'right' || direction === 'left')) {
+                    onEnterCallback(_this[movableEle], current, direction, { top: top, left: left }, _this[fromWheel], check);
+                }
+                else {
+                    onEnterCallback(_this[element], current, direction, { top: top, left: left }, _this[fromWheel], check);
+                }
+            }
+            if (check) {
+                var fn = debounced100;
+                if (current.axis === 'X') {
+                    fn = debounced50;
+                    fn({ direction: direction, sentinel: current, offset: { top: top, left: left },
+                        focusElement: document.activeElement });
+                }
+                else {
+                    callback({ direction: direction, sentinel: current, offset: { top: top, left: left },
+                        focusElement: document.activeElement });
+                }
+            }
+            _this[fromWheel] = false;
         };
     };
     return TreeInterSectionObserver;
@@ -11655,8 +11841,12 @@ var VirtualScroll$1 = /** @__PURE__ @class */ (function () {
      * @returns {void}
      */
     VirtualScroll$$1.prototype.addEventListener = function () {
+        if (this.parent.isDestroyed) {
+            return;
+        }
         this.parent.on(localPagedExpandCollapse, this.collapseExpandVirtualchilds, this);
         this.parent.on(pagingActions, this.virtualPageAction, this);
+        this.parent.on(destroy, this.destroy, this);
     };
     /**
      * @hidden
@@ -11668,6 +11858,7 @@ var VirtualScroll$1 = /** @__PURE__ @class */ (function () {
         }
         this.parent.off(localPagedExpandCollapse, this.collapseExpandVirtualchilds);
         this.parent.off(pagingActions, this.virtualPageAction);
+        this.parent.off(destroy, this.destroy);
     };
     VirtualScroll$$1.prototype.collapseExpandVirtualchilds = function (row) {
         this.parent.grid.notify(virtualActionArgs, { isExpandCollapse: true });
@@ -11723,7 +11914,7 @@ var VirtualScroll$1 = /** @__PURE__ @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;
@@ -11734,17 +11925,17 @@ var VirtualScroll$1 = /** @__PURE__ @class */ (function () {
                     endIndex = this.parent.grid.pageSettings.pageSize - 1;
                     this.parent.grid.notify(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;
@@ -11774,8 +11965,13 @@ var TreeVirtual = /** @__PURE__ @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)));
@@ -11831,7 +12027,8 @@ var Freeze$1 = /** @__PURE__ @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));
@@ -12257,5 +12454,5 @@ var InfiniteScroll$1 = /** @__PURE__ @class */ (function () {
  * Export TreeGrid component
  */
 
-export { TreeGrid, load, rowDataBound, dataBound, queryCellInfo, beforeDataBound, actionBegin, dataStateChange, actionComplete, rowSelecting, rowSelected, checkboxChange, rowDeselected, toolbarClick, beforeExcelExport, beforePdfExport, resizeStop, expanded, expanding, collapsed, collapsing, remoteExpand, localPagedExpandCollapse, pagingActions, printGridInit, contextMenuOpen, contextMenuClick, beforeCopy, beforePaste, savePreviousRowPosition, crudAction, beginEdit, beginAdd, recordDoubleClick, cellSave, cellSaved, cellEdit, batchDelete, batchCancel, batchAdd, beforeBatchDelete, beforeBatchAdd, beforeBatchSave, batchSave, keyPressed, updateData, doubleTap, virtualColumnIndex, virtualActionArgs, dataListener, indexModifier, beforeStartEdit, beforeBatchCancel, batchEditFormRendered, detailDataBound, rowDrag, rowDragStartHelper, rowDrop, rowDragStart, rowsAdd, rowsRemove, rowdraging, rowDropped, DataManipulation, Reorder$1 as Reorder, Resize$1 as Resize, RowDD$1 as RowDD, Column, EditSettings, Predicate$1 as Predicate, FilterSettings, PageSettings, SearchSettings, SelectionSettings, AggregateColumn, AggregateRow, SortDescriptor, SortSettings, RowDropSettings$1 as RowDropSettings, InfiniteScrollSettings, Render, TreeVirtualRowModelGenerator, isRemoteData, isCountRequired, isCheckboxcolumn, isFilterChildHierarchy, findParentRecords, getExpandStatus, findChildrenRecords, isOffline, extendArray, getPlainData, getParentData, isHidden, ToolbarItem, ContextMenuItems, Filter$1 as Filter, ExcelExport$1 as ExcelExport, PdfExport$1 as PdfExport, Page$1 as Page, Toolbar$1 as Toolbar, Aggregate$1 as Aggregate, Sort$1 as Sort, TreeClipboard, ColumnMenu$1 as ColumnMenu, ContextMenu$1 as ContextMenu, Edit$1 as Edit, CommandColumn$1 as CommandColumn, Selection, DetailRow$1 as DetailRow, VirtualScroll$1 as VirtualScroll, TreeVirtual, Freeze$1 as Freeze, ColumnChooser$1 as ColumnChooser, Logger$1 as Logger, treeGridDetails, InfiniteScroll$1 as InfiniteScroll };
+export { TreeGrid, load, rowDataBound, dataBound, queryCellInfo, beforeDataBound, actionBegin, dataStateChange, actionComplete, rowSelecting, rowSelected, checkboxChange, rowDeselected, toolbarClick, beforeExcelExport, beforePdfExport, resizeStop, expanded, expanding, collapsed, collapsing, remoteExpand, localPagedExpandCollapse, pagingActions, printGridInit, contextMenuOpen, contextMenuClick, beforeCopy, beforePaste, savePreviousRowPosition, crudAction, beginEdit, beginAdd, recordDoubleClick, cellSave, cellSaved, cellEdit, batchDelete, batchCancel, batchAdd, beforeBatchDelete, beforeBatchAdd, beforeBatchSave, batchSave, keyPressed, updateData, doubleTap, virtualColumnIndex, virtualActionArgs, destroy, dataListener, indexModifier, beforeStartEdit, beforeBatchCancel, batchEditFormRendered, detailDataBound, rowDrag, rowDragStartHelper, rowDrop, rowDragStart, rowsAdd, rowsRemove, rowdraging, rowDropped, autoCol, DataManipulation, Reorder$1 as Reorder, Resize$1 as Resize, RowDD$1 as RowDD, Column, EditSettings, Predicate$1 as Predicate, FilterSettings, PageSettings, SearchSettings, SelectionSettings, AggregateColumn, AggregateRow, SortDescriptor, SortSettings, RowDropSettings$1 as RowDropSettings, InfiniteScrollSettings, Render, TreeVirtualRowModelGenerator, isRemoteData, isCountRequired, isCheckboxcolumn, isFilterChildHierarchy, findParentRecords, getExpandStatus, findChildrenRecords, isOffline, extendArray, getPlainData, getParentData, isHidden, ToolbarItem, ContextMenuItems, Filter$1 as Filter, ExcelExport$1 as ExcelExport, PdfExport$1 as PdfExport, Page$1 as Page, Toolbar$1 as Toolbar, Aggregate$1 as Aggregate, Sort$1 as Sort, TreeClipboard, ColumnMenu$1 as ColumnMenu, ContextMenu$1 as ContextMenu, Edit$1 as Edit, CommandColumn$1 as CommandColumn, Selection, DetailRow$1 as DetailRow, VirtualScroll$1 as VirtualScroll, TreeVirtual, Freeze$1 as Freeze, ColumnChooser$1 as ColumnChooser, Logger$1 as Logger, treeGridDetails, InfiniteScroll$1 as InfiniteScroll };
 //# sourceMappingURL=ej2-treegrid.es5.js.map