@syncfusion/ej2-treegrid 19.4.56 → 20.1.51

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 19.4.56
+*  version : 20.1.51
 *  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.4.55",
+  "_id": "@syncfusion/ej2-treegrid@20.1.48",
   "_inBundle": false,
-  "_integrity": "sha512-f5xJV2acBAMJnQ/C9b+HxofLqJ3odAXUN/kaRyqz+3sMlYdAaIW1f77i7Z8FUY7e9Gl5M5BgPtTr2WQXAH/mmQ==",
+  "_integrity": "sha512-8wPx7RsFAoz5CZKwde0HxmCx1MYBUtZGrzI/e+at8zwvQlxMLvVJnhERqJFFhdPoZcdQga4D6tx0vGHCrfM/+Q==",
   "_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-19.4.55.tgz",
-  "_shasum": "e711adbf22a3859e37b6d823c0914732c323754d",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.1.48.tgz",
+  "_shasum": "e7bd8249c5a14245b20a6295bc7a8668f094da53",
   "_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.4.52",
-    "@syncfusion/ej2-data": "~19.4.54",
-    "@syncfusion/ej2-grids": "~19.4.56",
-    "@syncfusion/ej2-popups": "~19.4.53"
+    "@syncfusion/ej2-base": "~20.1.50",
+    "@syncfusion/ej2-data": "~20.1.47",
+    "@syncfusion/ej2-grids": "~20.1.51",
+    "@syncfusion/ej2-popups": "~20.1.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.4.56",
+  "version": "20.1.51",
   "sideEffects": false
 }

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

@@ -4,6 +4,7 @@ import { DataManager } from '@syncfusion/ej2-data';
 import { findChildrenRecords, getParentData, extendArray } from '../utils';
 import { getUid } from '@syncfusion/ej2-grids';
 import { updateParentRow, editAction } from './crud-actions';
+import { classList } from '@syncfusion/ej2-base';
 /**
  * `BatchEdit` module is used to handle batch editing actions.
  *
@@ -236,9 +237,17 @@ var BatchEdit = /** @class */ (function () {
             this.parent.editModule[isTabLastRow] = false;
             return;
         }
-        this.selectedIndex = this.parent.grid.selectedRowIndex;
-        this.addRowIndex = this.parent.grid.selectedRowIndex > -1 ? this.parent.grid.selectedRowIndex : 0;
-        this.addRowRecord = this.parent.getSelectedRecords()[0];
+        if (this.parent.editModule['isAddedRowByMethod'] && !isNullOrUndefined(this.parent.editModule['addRowIndex']) && this.parent.grid.selectedRowIndex === -1) {
+            this.selectedIndex = this.parent.editModule['selectedIndex'];
+            this.addRowIndex = this.parent.editModule['addRowIndex'];
+            this.addRowRecord = this.parent.getCurrentViewRecords()[this.selectedIndex];
+        }
+        else {
+            this.selectedIndex = this.parent.grid.selectedRowIndex;
+            this.addRowIndex = this.parent.grid.selectedRowIndex > -1 ? this.parent.grid.selectedRowIndex : 0;
+            this.parent.editModule['addRowIndex'] = this.parent.grid.selectedRowIndex > -1 ? this.parent.grid.selectedRowIndex : 0;
+            this.addRowRecord = this.parent.getSelectedRecords()[0];
+        }
     };
     BatchEdit.prototype.batchAdd = function (e) {
         if (this.parent.editSettings.newRowPosition !== 'Bottom') {
@@ -250,6 +259,9 @@ var BatchEdit = /** @class */ (function () {
                 this.batchRecords = extendArray(this.parent.grid.getCurrentViewRecords());
                 this.currentViewRecords = extendArray(this.parent.grid.getCurrentViewRecords());
             }
+            if (this.parent.editModule['isAddedRowByMethod'] && !isNullOrUndefined(this.parent.editModule['addRowIndex'])) {
+                classList(this.parent.grid.getDataRows()[0], ['e-batchrow'], []);
+            }
             if (this.parent.editSettings.newRowPosition !== 'Top') {
                 var records = this.parent.grid.getCurrentViewRecords();
                 if (this.parent.editSettings.mode === 'Batch' && (this.parent.getBatchChanges()[this.addedRecords].length > 1
@@ -473,6 +485,10 @@ var BatchEdit = /** @class */ (function () {
             }
             if (this.parent.editSettings.newRowPosition !== 'Bottom' && !Object.hasOwnProperty.call(args, 'updatedRecords')) {
                 data.splice(data.length - addRecords.length, addRecords.length);
+                if (this.parent.editModule['isAddedRowByMethod'] && addRecords.length && !isNullOrUndefined(this.parent.editModule['addRowIndex'])) {
+                    var index_1 = parseInt(this.parent.getContentTable().getElementsByClassName('e-insertedrow')[0].getAttribute('aria-rowindex'), 10);
+                    data.splice(index_1, 0, addRecords[0]);
+                }
                 if (!this.parent.allowPaging && data.length !== currentViewRecords.length) {
                     if (currentViewRecords.length > addRecords.length) {
                         currentViewRecords.splice(currentViewRecords.length - addRecords.length, addRecords.length);
@@ -524,7 +540,8 @@ var BatchEdit = /** @class */ (function () {
                 }
                 editAction({ value: addRecords[i], action: 'add' }, this.parent, this.isSelfReference, addRowIndex, selectedIndex, columnName, addRowRecord);
                 selectedIndex = null;
-                if (this.parent.editSettings.newRowPosition === 'Child' && !isNullOrUndefined(addRecords[i][parentItem])) {
+                if (this.parent.editSettings.newRowPosition === 'Child' && !isNullOrUndefined(addRecords[i][parentItem]) &&
+                    (isNullOrUndefined(this.parent.editModule['addRowIndex']) || this.isSelfReference)) {
                     var indexValue = currentViewRecords.map(function (e) { return e[primarykey_1]; })
                         .indexOf(addRecords[i][parentItem][primarykey_1]);
                     var children = currentViewRecords[indexValue][childRecords];

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

@@ -66,7 +66,9 @@ 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);
+                                        if (!control.enableImmutableMode) {
+                                            parentData['childRecords'].splice(p, 1);
+                                        }
                                         childRecords.splice(p, 1);
                                         if (!childRecords.length) {
                                             parentData.hasChildRecords = false;
@@ -364,7 +366,12 @@ export function updateParentRow(key, record, action, control, isSelfReference, c
         control.grid.setRowData(key, record);
         var row = control.getRowByIndex(index_1);
         if (control.editSettings.mode === 'Batch') {
-            row = control.getRows()[control.grid.getRowIndexByPrimaryKey(record[key])];
+            if (action === 'add') {
+                row = control.getRows()[control.grid.getCurrentViewRecords().indexOf(record)];
+            }
+            else {
+                row = control.getRows()[control.grid.getRowIndexByPrimaryKey(record[key])];
+            }
         }
         var movableRow = void 0;
         if (control.frozenRows || control.getFrozenColumns()) {

package/src/treegrid/actions/edit.js

@@ -677,6 +677,21 @@ var Edit = /** @class */ (function () {
                 focussedElement.focus();
             }
         }
+        if (this.parent.editSettings.mode === 'Batch' && !isNullOrUndefined(this.addRowIndex) && this.addRowIndex !== -1) {
+            index = this.batchEditModule.getAddRowIndex();
+            this.selectedIndex = this.batchEditModule.getSelectedIndex();
+            if (this.parent.editModule['isAddedRowByMethod']) {
+                var args = {
+                    action: 'add',
+                    data: this.parent.getBatchChanges()['addedRecords'][0],
+                    index: index,
+                    seletedRow: 0
+                };
+                this.parent.editModule.beginAddEdit(args);
+                this.parent.editModule.batchEditModule['batchAddRowRecord'].push(this.parent.editModule.batchEditModule['addRowRecord']);
+                this.parent.editModule.batchEditModule['batchAddedRecords'].push(args['data']);
+            }
+        }
     };
     // private beforeDataBound(args: BeforeDataBoundArgs): void {
     //   if (this.parent.grid.isEdit && this.parent.dataSource instanceof DataManager &&
@@ -821,7 +836,7 @@ var Edit = /** @class */ (function () {
             var parentIdMapping = void 0;
             var isVirtualization = this.parent.enableVirtualization && this.addRowIndex > -1 && this.prevAriaRowIndex !== '-1';
             var rows = this.parent.getRows();
-            var firstAriaIndex = rows.length ? +rows[0].getAttribute('aria-rowindex') : 0;
+            var firstAriaIndex = rows.length ? currentData.indexOf(currentData[0]) : 0;
             var lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('aria-rowindex') : 0;
             var withinRange = this.selectedIndex >= firstAriaIndex && this.selectedIndex <= lastAriaIndex;
             if (currentData.length) {

package/src/treegrid/actions/filter.js

@@ -155,6 +155,9 @@ var Filter = /** @class */ (function () {
                     }
                 }
                 else {
+                    if (parent['expanded'] === false && this.parent.getVisibleRecords().indexOf(record) === -1 && isNullOrUndefined(this.parent['dataResults']['action'])) {
+                        this.parent.expandRow(this.parent.getRows()[parent['index']], parent);
+                    }
                     this.addParentRecord(parent);
                 }
             }

package/src/treegrid/actions/rowdragdrop.d.ts

@@ -24,7 +24,19 @@ export declare class RowDD {
     /** @hidden */
     isMultipleGrid: string;
     /** @hidden */
+    private modifiedRecords;
+    /** @hidden */
+    private selectedItem;
+    /** @hidden */
+    private selectedRecords;
+    /** @hidden */
+    private selectedRows;
+    /** @hidden */
+    private hasDropItem;
+    /** @hidden */
     isaddtoBottom: boolean;
+    private selectedRecord;
+    private selectedRow;
     /**
      * Constructor for render module
      *
@@ -46,6 +58,8 @@ export declare class RowDD {
      * @param {string} position - Drop position as above or below or child
      */
     reorderRows(fromIndexes: number[], toIndex: number, position: string): void;
+    private indentOutdentAction;
+    private eventTrigger;
     private orderToIndex;
     private rowsAdded;
     private rowsRemoved;
@@ -76,6 +90,7 @@ export declare class RowDD {
     private updateChildRecord;
     private updateChildRecordLevel;
     private removeRecords;
+    private updateModifiedRecords;
     private removeChildItem;
     private getChildCount;
     private ensuredropPosition;

package/src/treegrid/actions/rowdragdrop.js

@@ -1,6 +1,6 @@
 import { Grid, RowDD as GridDragDrop, parentsUntil } from '@syncfusion/ej2-grids';
 import { getObject, Scroll } from '@syncfusion/ej2-grids';
-import { closest, isNullOrUndefined, classList, setValue, extend, getValue, removeClass, addClass } from '@syncfusion/ej2-base';
+import { closest, isNullOrUndefined, classList, setValue, extend, getValue, removeClass, addClass, setStyleAttribute } from '@syncfusion/ej2-base';
 import { DataManager } from '@syncfusion/ej2-data';
 import * as events from '../base/constant';
 import { editAction } from './crud-actions';
@@ -22,6 +22,14 @@ var RowDD = /** @class */ (function () {
         /** @hidden */
         this.isDraggedWithChild = false;
         /** @hidden */
+        this.modifiedRecords = 'modifiedRecords';
+        /** @hidden */
+        this.selectedRecords = 'selectedRecords';
+        /** @hidden */
+        this.selectedRows = 'selectedRows';
+        /** @hidden */
+        this.hasDropItem = true;
+        /** @hidden */
         this.isaddtoBottom = false;
         Grid.Inject(GridDragDrop);
         this.parent = parent;
@@ -61,6 +69,8 @@ var RowDD = /** @class */ (function () {
     RowDD.prototype.reorderRows = function (fromIndexes, toIndex, position) {
         var tObj = this.parent;
         var action = 'action';
+        var dropPosition = 'dropPosition';
+        var updateRowAndCellElements = 'updateRowAndCellElements';
         if (fromIndexes[0] !== toIndex && ['above', 'below', 'child'].indexOf(position) !== -1) {
             if (position === 'above') {
                 this.dropPosition = 'topSegment';
@@ -71,6 +81,7 @@ var RowDD = /** @class */ (function () {
             if (position === 'child') {
                 this.dropPosition = 'middleSegment';
             }
+            this.parent[dropPosition] = this.dropPosition;
             var data = [];
             for (var i = 0; i < fromIndexes.length; i++) {
                 data[i] = this.parent.getCurrentViewRecords()[fromIndexes[i]];
@@ -94,7 +105,13 @@ var RowDD = /** @class */ (function () {
             }
             this.parent.grid.refresh();
             if (this.parent.enableImmutableMode && this.dropPosition === 'middleSegment') {
-                var index = this.parent.treeColumnIndex + 1;
+                var index = void 0;
+                if (this.parent.allowRowDragAndDrop) {
+                    index = this.parent.treeColumnIndex + 1;
+                }
+                else if (this.parent[action] === 'indenting') {
+                    index = this.parent.treeColumnIndex;
+                }
                 var row = this.parent.getRows()[fromIndexes[0]];
                 var dropData = args.data[0];
                 var totalRecord = [];
@@ -106,36 +123,119 @@ var RowDD = /** @class */ (function () {
                 var parentrow = this.parent.getRows()[toIndex];
                 totalRecord.push(parentData);
                 rows.push(parentrow);
-                for (var i = 0; i < totalRecord.length; i++) {
-                    this.parent.renderModule.cellRender({
-                        data: totalRecord[i], cell: rows[i].cells[index],
-                        column: this.parent.grid.getColumns()[this.parent.treeColumnIndex],
-                        requestType: 'rowDragAndDrop'
-                    });
-                    if (this.parent[action] === 'indenting' || this.parent[action] === 'outdenting') {
-                        this.parent.renderModule.RowModifier({
-                            data: totalRecord[i], row: rows[i]
-                        });
-                    }
+                this.parent[updateRowAndCellElements](totalRecord, rows, index);
+            }
+            if (this.parent.enableImmutableMode && this.parent[action] === 'outdenting') {
+                var index = void 0;
+                if (this.parent.allowRowDragAndDrop) {
+                    index = this.parent.treeColumnIndex + 1;
                 }
+                else if (this.parent[action] === 'outdenting') {
+                    index = this.parent.treeColumnIndex;
+                }
+                var record = args.data[0];
+                var row = this.parent.getRows()[fromIndexes[0]];
+                var totalRecord = [];
+                var rows = [];
+                totalRecord.push(record);
+                rows.push(row);
+                this.parent[updateRowAndCellElements](totalRecord, rows, index);
             }
         }
         else {
             return;
         }
     };
+    RowDD.prototype.indentOutdentAction = function (record, request) {
+        var tObj = this.parent;
+        var action = 'action';
+        var droppedIndex = 'dropIndex';
+        var selectedItemIndex = -1;
+        if (isNullOrUndefined(record) && this.parent.selectedRowIndex === -1) {
+            return;
+        }
+        else {
+            if (this.parent.enableVirtualization && this.parent.selectedRowIndex !== -1) {
+                selectedItemIndex = this.parent.getSelectedRows()[0].rowIndex;
+            }
+            else if (this.parent.selectedRowIndex !== -1) {
+                selectedItemIndex = this.parent.selectedRowIndex;
+            }
+            this.selectedItem = isNullOrUndefined(record) ?
+                tObj.getCurrentViewRecords()[selectedItemIndex] : record;
+            var primaryKeyField = this.parent.getPrimaryKeyFieldNames()[0];
+            var rowIndex = this.parent.grid.getRowIndexByPrimaryKey(this.selectedItem[primaryKeyField]);
+            this.selectedRow = this.parent[this.selectedRows] = selectedItemIndex !== -1 ?
+                this.parent.getSelectedRows()[0]
+                : this.parent.grid.getRowByIndex(rowIndex);
+            this.selectedRecord = this.parent[this.selectedRecords] = selectedItemIndex !== -1 ?
+                tObj.getCurrentViewRecords()[selectedItemIndex]
+                : this.selectedItem;
+            if (request === 'indent') {
+                var record_1 = tObj.getCurrentViewRecords()[this.selectedRow.rowIndex - 1];
+                var dropIndex = void 0;
+                if (this.selectedRow.rowIndex === 0 || this.selectedRow.rowIndex === -1 ||
+                    tObj.getCurrentViewRecords()[this.selectedRow.rowIndex].level - record_1.level === 1) {
+                    return;
+                }
+                if (record_1.level > this.selectedRecord.level) {
+                    for (var i = 0; i < tObj.getCurrentViewRecords().length; i++) {
+                        if (tObj.getCurrentViewRecords()[i].taskData === record_1.parentItem.taskData) {
+                            dropIndex = i;
+                        }
+                    }
+                }
+                else {
+                    dropIndex = this.selectedRow.rowIndex - 1;
+                }
+                tObj[action] = 'indenting';
+                tObj[droppedIndex] = dropIndex;
+                this.eventTrigger('indenting', dropIndex);
+            }
+            else if (request === 'outdent') {
+                if (this.selectedRow.rowIndex === -1 || this.selectedRow.rowIndex === 0 ||
+                    tObj.getCurrentViewRecords()[this.selectedRow.rowIndex].level === 0) {
+                    return;
+                }
+                var dropIndex = void 0;
+                var parentItem = this.selectedRecord.parentItem;
+                for (var i = 0; i < tObj.getCurrentViewRecords().length; i++) {
+                    if (tObj.getCurrentViewRecords()[i].taskData === parentItem.taskData) {
+                        dropIndex = i;
+                    }
+                }
+                tObj[action] = 'outdenting';
+                tObj[droppedIndex] = dropIndex;
+                this.eventTrigger('outdenting', dropIndex);
+            }
+        }
+    };
+    RowDD.prototype.eventTrigger = function (action, dropIndex) {
+        var _this = this;
+        var actionArgs = {
+            action: action,
+            cancel: false,
+            data: [this.parent[this.selectedRecords]],
+            row: this.parent[this.selectedRows]
+        };
+        this.parent.trigger(events.actionBegin, actionArgs, function (actionArgs) {
+            if (!actionArgs.cancel) {
+                if (actionArgs.action === 'indenting') {
+                    _this.reorderRows([_this.selectedRow.rowIndex], dropIndex, 'child');
+                }
+                else if (actionArgs.action === 'outdenting') {
+                    _this.reorderRows([_this.selectedRow.rowIndex], dropIndex, 'below');
+                }
+            }
+        });
+    };
     RowDD.prototype.orderToIndex = function (currentData) {
-        var _loop_1 = function (i) {
+        for (var i = 0; i < currentData.length; i++) {
             currentData[i].index = i;
             if (!isNullOrUndefined(currentData[i].parentItem)) {
-                var updatedParent = currentData.filter(function (data) {
-                    return data.uniqueID === currentData[i].parentUniqueID;
-                })[0];
+                var updatedParent = getValue('uniqueIDCollection.' + currentData[i].parentUniqueID, this.parent);
                 currentData[i].parentItem.index = updatedParent.index;
             }
-        };
-        for (var i = 0; i < currentData.length; i++) {
-            _loop_1(i);
         }
         return currentData;
     };
@@ -194,7 +294,8 @@ var RowDD = /** @class */ (function () {
                         }
                     }
                 }
-                if (Object.prototype.hasOwnProperty.call(draggedRecord_1, tObj.parentIdMapping) && draggedRecord_1[tObj.parentIdMapping] != null
+                if (Object.prototype.hasOwnProperty.call(draggedRecord_1, tObj.parentIdMapping)
+                    && draggedRecord_1[tObj.parentIdMapping] !== null
                     && !this.isDraggedWithChild) {
                     draggedRecord_1.taskData[tObj.parentIdMapping] = null;
                     delete draggedRecord_1.parentItem;
@@ -470,13 +571,34 @@ var RowDD = /** @class */ (function () {
             spanContent.innerHTML = content;
             dragelem.querySelector('.e-rowcell').appendChild(ele);
             dragelem.querySelector('.e-rowcell').appendChild(spanContent);
+            var dropItemSpan = document.querySelector('.e-dropitemscount');
+            if (this.hasDropItem && dropItemSpan) {
+                var dropItemLeft = parseInt(dropItemSpan.style.left, 10) + ele.offsetWidth + 16;
+                var spanLeft = !this.parent.enableRtl ? dropItemLeft : 0;
+                dropItemSpan.style.left = spanLeft + "px";
+                this.hasDropItem = false;
+            }
         }
     };
     RowDD.prototype.removeErrorElem = function () {
         var errorelem = document.querySelector('.e-errorelem');
+        var errorValue = document.querySelector('.errorValue');
+        var dropItemSpan = document.querySelector('.e-dropitemscount');
         if (errorelem) {
+            if (dropItemSpan) {
+                var dropItemLeft = parseInt(dropItemSpan.style.left, 10) - errorelem.offsetWidth - 16;
+                setStyleAttribute(errorValue, {
+                    paddingLeft: '0px'
+                });
+                if (!this.parent.enableRtl) {
+                    setStyleAttribute(dropItemSpan, {
+                        left: dropItemLeft + "px"
+                    });
+                }
+            }
             errorelem.remove();
         }
+        this.hasDropItem = true;
     };
     RowDD.prototype.topOrBottomBorder = function (target) {
         var rowElement = [];
@@ -665,7 +787,7 @@ var RowDD = /** @class */ (function () {
                 indexes[i] = records[i].index;
             }
             var data = srcControl.dataSource;
-            if (this.parent.idMapping != null && (isNullOrUndefined(this.dropPosition) || this.dropPosition === 'bottomSegment' || this.dropPosition === 'Invalid') && !(data.length)) {
+            if (this.parent.idMapping !== null && (isNullOrUndefined(this.dropPosition) || this.dropPosition === 'bottomSegment' || this.dropPosition === 'Invalid') && !(data.length)) {
                 var actualData = [];
                 for (var i = 0; i < records.length; i++) {
                     if (records[i].hasChildRecords) {
@@ -713,14 +835,25 @@ var RowDD = /** @class */ (function () {
     RowDD.prototype.getTargetIdx = function (targetRow) {
         return targetRow ? parseInt(targetRow.getAttribute('aria-rowindex'), 10) : 0;
     };
-    RowDD.prototype.getParentData = function (record) {
+    RowDD.prototype.getParentData = function (record, data) {
         var parentItem = record.parentItem;
+        var selectedItemIndex = -1;
+        if (this.parent.enableVirtualization && this.parent.selectedRowIndex !== -1) {
+            selectedItemIndex = this.parent.getSelectedRows()[0].rowIndex;
+        }
+        else if (this.parent.selectedRowIndex !== -1) {
+            selectedItemIndex = this.parent.selectedRowIndex;
+        }
         if (this.dropPosition === 'bottomSegment') {
-            var selectedRecord = this.parent.getSelectedRecords()[0];
+            var primaryKeyField = this.parent.getPrimaryKeyFieldNames()[0];
+            var rowIndex = selectedItemIndex === -1 ?
+                (this.parent.grid.getRowIndexByPrimaryKey(data[0][primaryKeyField])) - 1
+                : this.parent.getSelectedRowIndexes()[0] - 1;
+            var selectedRecord = this.parent.getCurrentViewRecords()[rowIndex];
             this.droppedRecord = getParentData(this.parent, selectedRecord.parentItem.uniqueID);
         }
         if (this.dropPosition === 'middleSegment') {
-            var level = this.parent.getSelectedRecords()[0].level;
+            var level = this.parent.getCurrentViewRecords()[selectedItemIndex].level;
             if (level === parentItem.level) {
                 this.droppedRecord = getParentData(this.parent, parentItem.uniqueID);
             }
@@ -735,9 +868,12 @@ var RowDD = /** @class */ (function () {
             var draggedRecord_2;
             var droppedRecord = void 0;
             if (isNullOrUndefined(args.dropIndex)) {
-                var rowIndex = tObj.getSelectedRowIndexes()[0] - 1;
+                var primaryKeyField = this.parent.getPrimaryKeyFieldNames()[0];
+                var rowIndex = tObj.selectedRowIndex === -1 ?
+                    (this.parent.grid.getRowIndexByPrimaryKey(args.data[0][primaryKeyField])) - 1
+                    : tObj.getSelectedRowIndexes()[0] - 1;
                 var record = tObj.getCurrentViewRecords()[rowIndex];
-                this.getParentData(record);
+                this.getParentData(record, args.data);
             }
             else {
                 args.dropIndex = args.dropIndex === args.fromIndex ? this.getTargetIdx(args.target.parentElement) : args.dropIndex;
@@ -751,6 +887,7 @@ var RowDD = /** @class */ (function () {
             else {
                 dragRecords = args.data;
             }
+            this.parent[this.modifiedRecords].push(args.data[0], droppedRecord);
             var count = 0;
             var multiplegrid = this.parent.rowDropSettings.targetID;
             this.isMultipleGrid = multiplegrid;
@@ -764,7 +901,7 @@ var RowDD = /** @class */ (function () {
             if (!isNullOrUndefined(this.parent.idMapping)) {
                 dragRecords.reverse();
             }
-            var _loop_2 = function (i) {
+            var _loop_1 = function (i) {
                 draggedRecord_2 = dragRecords[i];
                 this_1.draggedRecord = draggedRecord_2;
                 if (this_1.dropPosition !== 'Invalid') {
@@ -804,6 +941,7 @@ var RowDD = /** @class */ (function () {
                         }
                         if (isNullOrUndefined(droppedRecord.parentItem)) {
                             delete draggedRecord_2.parentItem;
+                            delete draggedRecord_2.parentUniqueID;
                             draggedRecord_2.level = 0;
                             if (this_1.parent.parentIdMapping) {
                                 draggedRecord_2[this_1.parent.parentIdMapping] = null;
@@ -850,7 +988,7 @@ var RowDD = /** @class */ (function () {
             };
             var this_1 = this;
             for (var i = 0; i < dragLength; i++) {
-                _loop_2(i);
+                _loop_1(i);
             }
         }
     };
@@ -1018,7 +1156,7 @@ var RowDD = /** @class */ (function () {
                 if (childRecords && childRecords.length > 0) {
                     childIndex = childRecords.indexOf(deletedRow);
                     flatParentData.childRecords.splice(childIndex, 1);
-                    if (!this.parent.parentIdMapping) {
+                    if (!this.parent.parentIdMapping || tObj.enableImmutableMode) {
                         editAction({ value: deletedRow, action: 'delete' }, this.parent, isSelfReference, deletedRow.index, deletedRow.index);
                     }
                 }
@@ -1072,6 +1210,19 @@ var RowDD = /** @class */ (function () {
                 flatParentData.hasChildRecords = false;
                 flatParentData.hasFilteredChildRecords = false;
             }
+            if (this.parent[this.modifiedRecords].indexOf(flatParentData) === -1 && !isNullOrUndefined(flatParentData)) {
+                this.parent[this.modifiedRecords].push(flatParentData);
+            }
+            if (!isNullOrUndefined(flatParentData)) {
+                this.updateModifiedRecords(flatParentData);
+            }
+        }
+    };
+    RowDD.prototype.updateModifiedRecords = function (record) {
+        var parentData = getParentData(this.parent, record.parentUniqueID);
+        if (!isNullOrUndefined(parentData)) {
+            this.parent[this.modifiedRecords].push(parentData);
+            this.updateModifiedRecords(parentData);
         }
     };
     RowDD.prototype.removeChildItem = function (record) {

package/src/treegrid/actions/toolbar.d.ts

@@ -26,7 +26,6 @@ export declare class Toolbar {
     removeEventListener(): void;
     private refreshToolbar;
     private toolbarClickHandler;
-    private eventTrigger;
     /**
      * Gets the toolbar of the TreeGrid.
      *