@syncfusion/ej2-treegrid 20.1.56 → 20.2.36

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.1.56
+*  version : 20.2.36
 *  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/helpers/e2e/index.js

@@ -1,6 +1,8 @@
-"use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./treegridhelper"));
+define(["require", "exports", "./treegridhelper"], function (require, exports, treegridhelper_1) {
+    "use strict";
+    function __export(m) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+    Object.defineProperty(exports, "__esModule", { value: true });
+    __export(treegridhelper_1);
+});

package/helpers/e2e/treegridhelper.js

@@ -1,66 +1,83 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const e2e_1 = require("@syncfusion/ej2-base/helpers/e2e");
-class TreeGridHelper extends e2e_1.TestHelper {
-    constructor(id, wrapperFn) {
-        super();
-        this.id = id;
-        if (wrapperFn !== undefined) {
-            this.wrapperFn = wrapperFn;
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+define(["require", "exports", "@syncfusion/ej2-base/helpers/e2e"], function (require, exports, e2e_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var TreeGridHelper = (function (_super) {
+        __extends(TreeGridHelper, _super);
+        function TreeGridHelper(id, wrapperFn) {
+            var _this = _super.call(this) || this;
+            _this.id = id;
+            if (wrapperFn !== undefined) {
+                _this.wrapperFn = wrapperFn;
+            }
+            return _this;
         }
-        return this;
-    }
-    getDataGridElement() {
-        return this.selector('#' + this.id);
-    }
-    getHeaderElement() {
-        return this.selector('#' + this.id + ' .e-gridheader');
-    }
-    getContentElement() {
-        return this.selector('#' + this.id + ' .e-gridcontent');
-    }
-    getFooterElement() {
-        return this.selector('#' + this.id + ' .e-gridfooter');
-    }
-    getPagerElement() {
-        return this.selector('#' + this.id + ' .e-gridpager');
-    }
-    getDialogElement() {
-        return this.selector('#' + this.id + '_gridcontrol_dialogEdit_wrapper');
-    }
-    getFilterPopupElement() {
-        return this.selector('#' + this.id + ' .e-filter-popup');
-    }
-    getToolbarElement() {
-        return this.selector('#' + this.id + '_gridcontrol_toolbarItems');
-    }
-    getCurrentPagerElement() {
-        return this.selector('#' + this.id + ' .e-numericitem.e-currentitem');
-    }
-    getPagerDropDownElement() {
-        return this.selector('#' + this.id + ' .e-pagerdropdown');
-    }
-    getExpandedElements() {
-        return this.selector('#' + this.id + ' .e-treegridexpand');
-    }
-    getCollapsedElements() {
-        return this.selector('#' + this.id + ' .e-treegridcollapsed');
-    }
-    setModel(property, value) {
-        return cy.get('#' + this.id).then((ele) => {
-            return ele[0].ej2_instances[0][property] = value;
-        });
-    }
-    getModel(property) {
-        return cy.get('#' + this.id).then((ele) => {
-            return ele[0].ej2_instances[0][property];
-        });
-    }
-    invoke(fName, args = []) {
-        return cy.get('#' + this.id).then((ele) => {
-            var inst = ele[0].ej2_instances[0];
-            return inst[fName].apply(inst, args);
-        });
-    }
-}
-exports.TreeGridHelper = TreeGridHelper;
+        TreeGridHelper.prototype.getDataGridElement = function () {
+            return this.selector('#' + this.id);
+        };
+        TreeGridHelper.prototype.getHeaderElement = function () {
+            return this.selector('#' + this.id + ' .e-gridheader');
+        };
+        TreeGridHelper.prototype.getContentElement = function () {
+            return this.selector('#' + this.id + ' .e-gridcontent');
+        };
+        TreeGridHelper.prototype.getFooterElement = function () {
+            return this.selector('#' + this.id + ' .e-gridfooter');
+        };
+        TreeGridHelper.prototype.getPagerElement = function () {
+            return this.selector('#' + this.id + ' .e-gridpager');
+        };
+        TreeGridHelper.prototype.getDialogElement = function () {
+            return this.selector('#' + this.id + '_gridcontrol_dialogEdit_wrapper');
+        };
+        TreeGridHelper.prototype.getFilterPopupElement = function () {
+            return this.selector('#' + this.id + ' .e-filter-popup');
+        };
+        TreeGridHelper.prototype.getToolbarElement = function () {
+            return this.selector('#' + this.id + '_gridcontrol_toolbarItems');
+        };
+        TreeGridHelper.prototype.getCurrentPagerElement = function () {
+            return this.selector('#' + this.id + ' .e-numericitem.e-currentitem');
+        };
+        TreeGridHelper.prototype.getPagerDropDownElement = function () {
+            return this.selector('#' + this.id + ' .e-pagerdropdown');
+        };
+        TreeGridHelper.prototype.getExpandedElements = function () {
+            return this.selector('#' + this.id + ' .e-treegridexpand');
+        };
+        TreeGridHelper.prototype.getCollapsedElements = function () {
+            return this.selector('#' + this.id + ' .e-treegridcollapsed');
+        };
+        TreeGridHelper.prototype.setModel = function (property, value) {
+            return cy.get('#' + this.id).then(function (ele) {
+                return ele[0].ej2_instances[0][property] = value;
+            });
+        };
+        TreeGridHelper.prototype.getModel = function (property) {
+            return cy.get('#' + this.id).then(function (ele) {
+                return ele[0].ej2_instances[0][property];
+            });
+        };
+        TreeGridHelper.prototype.invoke = function (fName, args) {
+            if (args === void 0) { args = []; }
+            return cy.get('#' + this.id).then(function (ele) {
+                var inst = ele[0].ej2_instances[0];
+                return inst[fName].apply(inst, args);
+            });
+        };
+        return TreeGridHelper;
+    }(e2e_1.TestHelper));
+    exports.TreeGridHelper = TreeGridHelper;
+});

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-treegrid@*",
-  "_id": "@syncfusion/ej2-treegrid@20.1.55",
+  "_id": "@syncfusion/ej2-treegrid@18.23.3",
   "_inBundle": false,
-  "_integrity": "sha512-A1EOCEVmqUalNcK4SjlQKCn8lUFDKfEWKUHNw3EqzLQjDxZsUMneiA8ws+zwLgX33Bm6TevapkBRBtoW5jbQzw==",
+  "_integrity": "sha512-MoKO1I4KuhbqhrcUpyBSTMmzWIt3vmYZRD0X+sKPaRR5P7TwWi6FOhn+ZKN4VkOnKNbok9JnGUAFfiQHuz3GcA==",
   "_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-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.1.55.tgz",
-  "_shasum": "ded97a9e20965294cf8792b759e1cdbeba0e8e68",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-release/@syncfusion/ej2-treegrid/-/ej2-treegrid-18.23.3.tgz",
+  "_shasum": "ffe68795f8136158a761877a163b5f8b0987f200",
   "_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": "~20.1.56",
-    "@syncfusion/ej2-data": "~20.1.55",
-    "@syncfusion/ej2-grids": "~20.1.56",
-    "@syncfusion/ej2-popups": "~20.1.55"
+    "@syncfusion/ej2-base": "~20.2.36",
+    "@syncfusion/ej2-data": "~20.2.36",
+    "@syncfusion/ej2-grids": "~20.2.36",
+    "@syncfusion/ej2-popups": "~20.2.36"
   },
   "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": "20.1.56",
+  "version": "20.2.36",
   "sideEffects": false
 }

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

@@ -611,7 +611,12 @@ var BatchEdit = /** @class */ (function () {
     BatchEdit.prototype.nextCellIndex = function (args) {
         var index = 'index';
         var rowIndex = 'rowIndex';
-        args[index] = this.parent.getSelectedRows()[0][rowIndex];
+        if (this.parent.getSelectedRows().length) {
+            args[index] = this.parent.getSelectedRows()[0][rowIndex];
+        }
+        else {
+            args[index] = this.batchIndex;
+        }
     };
     return BatchEdit;
 }());

package/src/treegrid/actions/edit.js

@@ -540,11 +540,13 @@ var Edit = /** @class */ (function () {
     Edit.prototype.updateIndex = function (data, rows, records) {
         for (var j = 0; j < this.parent.getDataRows().length; j++) {
             var data1 = records[j];
-            var index = getValue('uniqueIDCollection.' + data1.uniqueID + '.index', this.parent);
-            data1.index = index;
-            if (!isNullOrUndefined(data1.parentItem)) {
-                var parentIndex = getValue('uniqueIDCollection.' + data1.parentItem.uniqueID + '.index', this.parent);
-                data1.parentItem.index = parentIndex;
+            if (!isNullOrUndefined(data1)) {
+                var index = getValue('uniqueIDCollection.' + data1.uniqueID + '.index', this.parent);
+                data1.index = index;
+                if (!isNullOrUndefined(data1.parentItem)) {
+                    var parentIndex = getValue('uniqueIDCollection.' + data1.parentItem.uniqueID + '.index', this.parent);
+                    data1.parentItem.index = parentIndex;
+                }
             }
         }
         var count = -1;
@@ -563,32 +565,34 @@ var Edit = /** @class */ (function () {
                 count++;
             }
             var data2 = records[count];
-            var index = data2.index;
-            var level = data2.level;
-            var row = rows[k];
-            if (!isNullOrUndefined(data2.parentItem)) {
-                index = getValue('uniqueIDCollection.' + data2.parentItem.uniqueID + '.index', this.parent);
-            }
-            var treecell = row.cells[treeColIndex];
-            if (!isNullOrUndefined(treecell)) {
-                for (var l = 0; l < treecell.classList.length; l++) {
-                    var value = treecell.classList[l];
-                    var remove = /e-gridrowindex/i;
-                    var removed = /e-griddetailrowindex/i;
-                    var result = value.match(remove);
-                    var results = value.match(removed);
-                    if (result != null) {
-                        removeClass([treecell], value);
+            if (!isNullOrUndefined(data2)) {
+                var index = data2.index;
+                var level = data2.level;
+                var row = rows[k];
+                if (!isNullOrUndefined(data2.parentItem)) {
+                    index = getValue('uniqueIDCollection.' + data2.parentItem.uniqueID + '.index', this.parent);
+                }
+                var treecell = row.cells[treeColIndex];
+                if (!isNullOrUndefined(treecell)) {
+                    for (var l = 0; l < treecell.classList.length; l++) {
+                        var value = treecell.classList[l];
+                        var remove = /e-gridrowindex/i;
+                        var removed = /e-griddetailrowindex/i;
+                        var result = value.match(remove);
+                        var results = value.match(removed);
+                        if (result != null) {
+                            removeClass([treecell], value);
+                        }
+                        if (results != null) {
+                            removeClass([treecell], value);
+                        }
                     }
-                    if (results != null) {
-                        removeClass([treecell], value);
+                    if (!rows[k].classList.contains('e-detailrow')) {
+                        addClass([treecell], 'e-gridrowindex' + index + 'level' + level);
+                    }
+                    else {
+                        addClass([treecell], 'e-griddetailrowindex' + index + 'level' + level);
                     }
-                }
-                if (!rows[k].classList.contains('e-detailrow')) {
-                    addClass([treecell], 'e-gridrowindex' + index + 'level' + level);
-                }
-                else {
-                    addClass([treecell], 'e-griddetailrowindex' + index + 'level' + level);
                 }
             }
         }

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

@@ -294,7 +294,7 @@ var InfiniteScroll = /** @class */ (function () {
                 if (getValue('selectedIndex', this.parent.editModule) !== -1 && this.parent.editSettings.newRowPosition !== 'Top') {
                     if (this.parent.editSettings.newRowPosition === 'Below' || this.parent.editSettings.newRowPosition === 'Child') {
                         position = 'after';
-                        newRowIndex += findChildrenRecords(currentData[newRowIndex + 1]).length;
+                        newRowIndex += findChildrenRecords(currentData[newRowIndex]).length;
                         if (this.parent.editSettings.newRowPosition === 'Child') {
                             newRowIndex -= 1; //// for child position already child record is added in childRecords so subtracting 1
                         }

package/src/treegrid/actions/rowdragdrop.js

@@ -84,7 +84,8 @@ var RowDD = /** @class */ (function () {
             this.parent[dropPosition] = this.dropPosition;
             var data = [];
             for (var i = 0; i < fromIndexes.length; i++) {
-                data[i] = this.parent.getCurrentViewRecords()[fromIndexes[i]];
+                var index = this.parent.getRowByIndex(fromIndexes[i]).rowIndex;
+                data[i] = this.parent.getCurrentViewRecords()[index];
             }
             var isByMethod = true;
             var args = {
@@ -188,6 +189,9 @@ var RowDD = /** @class */ (function () {
                 else {
                     dropIndex = this.selectedRow.rowIndex - 1;
                 }
+                if (this.parent.enableVirtualization && this.parent.allowRowDragAndDrop && this.selectedRecord) {
+                    dropIndex = parseInt(this.selectedRow.getAttribute('aria-rowindex'), 10) - 1;
+                }
                 tObj[action] = 'indenting';
                 tObj[droppedIndex] = dropIndex;
                 this.eventTrigger('indenting', dropIndex);
@@ -204,6 +208,9 @@ var RowDD = /** @class */ (function () {
                         dropIndex = i;
                     }
                 }
+                if (this.parent.enableVirtualization && this.parent.allowRowDragAndDrop && this.selectedRecord) {
+                    dropIndex = parseInt(this.parent.getRows()[dropIndex].getAttribute('aria-rowindex'), 10);
+                }
                 tObj[action] = 'outdenting';
                 tObj[droppedIndex] = dropIndex;
                 this.eventTrigger('outdenting', dropIndex);
@@ -221,10 +228,20 @@ var RowDD = /** @class */ (function () {
         this.parent.trigger(events.actionBegin, actionArgs, function (actionArgs) {
             if (!actionArgs.cancel) {
                 if (actionArgs.action === 'indenting') {
-                    _this.reorderRows([_this.selectedRow.rowIndex], dropIndex, 'child');
+                    if (_this.parent.enableVirtualization && _this.parent.allowRowDragAndDrop) {
+                        _this.reorderRows([parseInt(_this.selectedRow.getAttribute('aria-rowindex'), 10)], dropIndex, 'child');
+                    }
+                    else {
+                        _this.reorderRows([_this.selectedRow.rowIndex], dropIndex, 'child');
+                    }
                 }
                 else if (actionArgs.action === 'outdenting') {
-                    _this.reorderRows([_this.selectedRow.rowIndex], dropIndex, 'below');
+                    if (_this.parent.enableVirtualization && _this.parent.allowRowDragAndDrop) {
+                        _this.reorderRows([parseInt(_this.selectedRow.getAttribute('aria-rowindex'), 10)], dropIndex, 'below');
+                    }
+                    else {
+                        _this.reorderRows([_this.selectedRow.rowIndex], dropIndex, 'below');
+                    }
                 }
             }
         });
@@ -419,9 +436,17 @@ var RowDD = /** @class */ (function () {
     RowDD.prototype.removeLastrowBorder = function (element) {
         var isEmptyRow = element && (element.classList.contains('e-emptyrow') || element.classList.contains('e-columnheader')
             || element.classList.contains('e-detailrow'));
-        var islastRowIndex = element && !isEmptyRow &&
-            this.parent.getRowByIndex(this.parent.getCurrentViewRecords().length - 1).getAttribute('data-uid') !==
-                element.getAttribute('data-uid');
+        var islastRowIndex;
+        if (this.parent.enableVirtualization) {
+            islastRowIndex = element && !isEmptyRow &&
+                this.parent.getRows()[this.parent.getCurrentViewRecords().length - 1].getAttribute('data-uid') !==
+                    element.getAttribute('data-uid');
+        }
+        else {
+            islastRowIndex = element && !isEmptyRow &&
+                this.parent.getRowByIndex(this.parent.getCurrentViewRecords().length - 1).getAttribute('data-uid') !==
+                    element.getAttribute('data-uid');
+        }
         var canremove = islastRowIndex || this.dropPosition === 'topSegment';
         if (this.parent.element.getElementsByClassName('e-lastrow-border').length > 0 && element && (islastRowIndex || canremove)) {
             this.parent.element.getElementsByClassName('e-lastrow-border')[0].remove();
@@ -455,7 +480,12 @@ var RowDD = /** @class */ (function () {
             rowPositionHeight = rowEle.offsetTop - scrollTop;
         }
         // let scrollTop = (tObj.grid.scrollModule as any).content.scrollTop;
-        rowTop = rowPositionHeight + contentHeight + roundOff;
+        if (this.parent.enableVirtualization) {
+            rowTop = rowEle.getBoundingClientRect().top;
+        }
+        else {
+            rowTop = rowPositionHeight + contentHeight + roundOff;
+        }
         var rowBottom = rowTop + row[0].offsetHeight;
         var difference = rowBottom - rowTop;
         var divide = difference / 3;
@@ -535,7 +565,7 @@ var RowDD = /** @class */ (function () {
     RowDD.prototype.addLastRowborder = function (trElement) {
         var isEmptyRow = trElement && (trElement.classList.contains('e-emptyrow') ||
             trElement.classList.contains('e-columnheader') || trElement.classList.contains('e-detailrow'));
-        if (trElement && !isEmptyRow && this.parent.getRowByIndex(this.parent.getCurrentViewRecords().length - 1).getAttribute('data-uid') ===
+        if (trElement && !isEmptyRow && this.parent.getRows()[this.parent.getCurrentViewRecords().length - 1].getAttribute('data-uid') ===
             trElement.getAttribute('data-uid')) {
             var bottomborder = this.parent.createElement('div', { className: 'e-lastrow-border' });
             var gridcontentEle = this.parent.getContent();
@@ -877,7 +907,13 @@ var RowDD = /** @class */ (function () {
             }
             else {
                 args.dropIndex = args.dropIndex === args.fromIndex ? this.getTargetIdx(args.target.parentElement) : args.dropIndex;
-                this.droppedRecord = tObj.getCurrentViewRecords()[args.dropIndex];
+                if (this.parent.enableVirtualization) {
+                    var index = this.parent.getRowByIndex(args.dropIndex).rowIndex;
+                    this.droppedRecord = tObj.getCurrentViewRecords()[index];
+                }
+                else {
+                    this.droppedRecord = tObj.getCurrentViewRecords()[args.dropIndex];
+                }
             }
             var dragRecords = [];
             droppedRecord = this.droppedRecord;
@@ -954,6 +990,7 @@ var RowDD = /** @class */ (function () {
                             childRecords.splice(droppedRecordIndex, 0, draggedRecord_2);
                             draggedRecord_2.parentItem = droppedRecord.parentItem;
                             draggedRecord_2.parentUniqueID = droppedRecord.parentUniqueID;
+                            draggedRecord_2.level = droppedRecord.level;
                             if (this_1.parent.parentIdMapping) {
                                 draggedRecord_2[this_1.parent.parentIdMapping] = droppedRecord[this_1.parent.parentIdMapping];
                                 draggedRecord_2.parentItem = droppedRecord.parentItem;

package/src/treegrid/actions/selection.js

@@ -85,7 +85,7 @@ var Selection = /** @class */ (function () {
     Selection.prototype.getCheckboxcolumnIndex = function () {
         var mappingUid;
         var columnIndex;
-        var stackedHeader = "stackedHeader";
+        var stackedHeader = 'stackedHeader';
         var columnModel = 'columnModel';
         var columns = this.parent[stackedHeader] ? this.parent[columnModel] : (this.parent.columns);
         for (var col = 0; col < columns.length; col++) {

package/src/treegrid/actions/sort.js

@@ -66,6 +66,17 @@ var Sort = /** @class */ (function () {
             }
             if (data[d].hasChildRecords) {
                 var childSort = (new DataManager(data[d].childRecords).executeLocal(srtQry));
+                if (this.parent.allowRowDragAndDrop && data[d].childRecords.indexOf(this.parent.rowDragAndDropModule['draggedRecord']) !== -1 && this.parent.rowDragAndDropModule['dropPosition'] !== 'middleSegment') {
+                    var dragdIndex = childSort.indexOf(this.parent.rowDragAndDropModule['draggedRecord']);
+                    childSort.splice(dragdIndex, 1);
+                    var dropdIndex = childSort.indexOf(this.parent.rowDragAndDropModule['droppedRecord']);
+                    if (this.parent.rowDragAndDropModule['dropPosition'] === 'topSegment') {
+                        childSort.splice(dropdIndex, 0, this.parent.rowDragAndDropModule['draggedRecord']);
+                    }
+                    else if (this.parent.rowDragAndDropModule['dropPosition'] === 'bottomSegment') {
+                        childSort.splice(dropdIndex + 1, 0, this.parent.rowDragAndDropModule['draggedRecord']);
+                    }
+                }
                 this.iterateSort(childSort, srtQry);
             }
         }

package/src/treegrid/base/data.js

@@ -530,6 +530,18 @@ var DataManipulation = /** @class */ (function () {
                 srtQry.sortBy(this.parent.grid.sortSettings.columns[srt].field, compFun);
             }
             var modifiedData = new DataManager(parentData).executeLocal(srtQry);
+            if (this.parent.allowRowDragAndDrop && !isNullOrUndefined(this.parent.rowDragAndDropModule['draggedRecord']) &&
+                this.parent.rowDragAndDropModule['droppedRecord'].hasChildRecords && this.parent.rowDragAndDropModule['dropPosition'] !== 'middleSegment') {
+                var dragdIndex = modifiedData.indexOf(this.parent.rowDragAndDropModule['draggedRecord']);
+                modifiedData.splice(dragdIndex, 1);
+                var dropdIndex = modifiedData.indexOf(this.parent.rowDragAndDropModule['droppedRecord']);
+                if (this.parent.rowDragAndDropModule['droppedRecord'].hasChildRecords && this.parent.rowDragAndDropModule['dropPosition'] === 'topSegment') {
+                    modifiedData.splice(dropdIndex, 0, this.parent.rowDragAndDropModule['draggedRecord']);
+                }
+                else if (this.parent.rowDragAndDropModule['dropPosition'] === 'bottomSegment') {
+                    modifiedData.splice(dropdIndex + 1, 0, this.parent.rowDragAndDropModule['draggedRecord']);
+                }
+            }
             var sortArgs = { modifiedData: modifiedData, filteredData: results, srtQry: srtQry };
             this.parent.notify('createSort', sortArgs);
             results = sortArgs.modifiedData;

package/src/treegrid/base/treegrid.js

@@ -448,8 +448,11 @@ var TreeGrid = /** @class */ (function (_super) {
                 member: 'ExcelExport', args: [this]
             });
         }
+        var freezePresent = this.injectedModules.filter(function (e) {
+            return e.prototype.getModuleName() === 'freeze';
+        });
         if (this.frozenColumns || this.frozenRows || this.getFrozenColumns() ||
-            this.grid.getFrozenLeftColumnsCount() || this.grid.getFrozenRightColumnsCount()) {
+            this.grid.getFrozenLeftColumnsCount() || this.grid.getFrozenRightColumnsCount() || freezePresent.length) {
             modules.push({
                 member: 'freeze', args: [this]
             });
@@ -1402,6 +1405,9 @@ var TreeGrid = /** @class */ (function (_super) {
                         gridColumn[prop] = this.getGridColumns(column[i][prop], false, index);
                         treeGridColumn[prop] = column[i][prop];
                     }
+                    else if (this.initialRender && !isNullOrUndefined(treeColumn) && this.enablePersistence && prop === 'edit') {
+                        gridColumn[prop] = treeGridColumn[prop] = treeColumn[prop];
+                    }
                     else if (!(treeColumn) || prop !== 'sortComparer') {
                         gridColumn[prop] = treeGridColumn[prop] = column[i][prop];
                     }

package/src/treegrid/renderer/render.js

@@ -296,6 +296,8 @@ var Render = /** @class */ (function () {
                         var cellRenderer = new CellRenderer(_this.parent.grid, _this.parent.grid.serviceLocator);
                         var td = _this.parent.getCellFromIndex(rowsObj[j].index, cellIndex - indent);
                         cellRenderer.refreshTD(td, cell, rowsObj[j].data, { index: rowsObj[j][rowIdx] });
+                        var treecell = _this.parent.getRows()[j].cells[cellIndex];
+                        _this.cellRender({ data: rowsObj[j].data, cell: treecell, column: cell.column });
                     }
                 }
             });

package/src/treegrid/renderer/virtual-tree-content-render.js

@@ -356,7 +356,12 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 firsttdinx = +attr; // this.parent.getContent().querySelector('.e-content tr').getAttribute('aria-rowindex');
             }
             if (firsttdinx === 0) {
-                this.translateY = scrollArgs.offset.top;
+                if (this.parent.allowRowDragAndDrop) {
+                    this.translateY = scrollArgs.offset.top - this.parent.getRowHeight() * 2;
+                }
+                else {
+                    this.translateY = scrollArgs.offset.top;
+                }
             }
             else {
                 var height = this.parent.getRowHeight();
@@ -382,7 +387,12 @@ var VirtualTreeContentRenderer = /** @class */ (function (_super) {
                 this.translateY = this.getTranslateY(scrollArgs.offset.top, content.getBoundingClientRect().height);
             }
             else {
-                this.translateY = scrollArgs.offset.top;
+                if (this.parent.allowRowDragAndDrop) {
+                    this.translateY = scrollArgs.offset.top - this.parent.getRowHeight() * 2;
+                }
+                else {
+                    this.translateY = scrollArgs.offset.top;
+                }
             }
         }
         if (((downScroll && (scrollArgs.offset.top < (this.parent.getRowHeight() * this.totalRecords)))

package/styles/bootstrap-dark.css

@@ -119,6 +119,15 @@
     transform: rotate(360deg);
   }
 }
+.e-treegrid .e-indent::before,
+.e-grid-menu .e-indent::before {
+  content: "\e33f";
+}
+.e-treegrid .e-outdent::before,
+.e-grid-menu .e-outdent::before {
+  content: "\e35d";
+}
+
 .e-treegrid .e-treegridexpand::before,
 .e-treegrid .e-treegridcollapse::before {
   content: "\e22f";

package/styles/bootstrap.css

@@ -120,6 +120,15 @@
   }
 }
 /*! component's theme wise override definitions and variables */
+.e-treegrid .e-indent::before,
+.e-grid-menu .e-indent::before {
+  content: "\e33f";
+}
+.e-treegrid .e-outdent::before,
+.e-grid-menu .e-outdent::before {
+  content: "\e35d";
+}
+
 .e-treegrid .e-treegridexpand::before,
 .e-treegrid .e-treegridcollapse::before {
   content: "\e22f";

package/styles/bootstrap4.css

@@ -161,6 +161,15 @@
     transform: rotate(360deg);
   }
 }
+.e-treegrid .e-indent::before,
+.e-grid-menu .e-indent::before {
+  content: "\e702";
+}
+.e-treegrid .e-outdent::before,
+.e-grid-menu .e-outdent::before {
+  content: "\e722";
+}
+
 .e-treegrid .e-treegridexpand::before,
 .e-treegrid .e-treegridcollapse::before {
   content: "\e70b";

package/styles/bootstrap5-dark.css

@@ -161,6 +161,15 @@
   }
 }
 /*! Toolbar's bootstrap5 theme wise override definitions and variables */
+.e-treegrid .e-indent::before,
+.e-grid-menu .e-indent::before {
+  content: "\e810";
+}
+.e-treegrid .e-outdent::before,
+.e-grid-menu .e-outdent::before {
+  content: "\e72a";
+}
+
 .e-treegrid .e-treegridexpand::before,
 .e-treegrid .e-treegridcollapse::before {
   content: "\e75c";