@syncfusion/ej2-treegrid 19.4.56 → 20.1.51

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

@@ -1,4 +1,4 @@
-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 { 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, setStyleAttribute, setValue } from '@syncfusion/ej2-base';
 import { Aggregate, Cell, CellRenderer, 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';
@@ -77,12 +77,12 @@ var Column = /** @__PURE__ @class */ (function () {
         merge(this, options);
     }
     /**
-     * Update the State changes reflected for TreeGrid columndirective in react platform.
-     *
-     * @param {Column} column - specifies the column
-     * @returns {void}
-     * @hidden
-     */
+    * Update the State changes reflected for TreeGrid columndirective in react platform.
+    *
+    * @param {Column} column - specifies the column
+    * @returns {void}
+    * @hidden
+    */
     Column.prototype.setProperties = function (column) {
         //Angular two way binding
         var keys = Object.keys(column);
@@ -91,7 +91,7 @@ var Column = /** @__PURE__ @class */ (function () {
             //Refresh the react columnTemplates on state change
             if (this.parent && this.parent['isReact'] && keys[i] === 'template') {
                 var refreshReactColumnTemplateByUid = 'refreshReactColumnTemplateByUid';
-                this.parent.clipboardModule['treeGridParent'][refreshReactColumnTemplateByUid](this.uid);
+                this.parent.clipboardModule['treeGridParent'].renderModule[refreshReactColumnTemplateByUid](this.uid);
             }
         }
     };
@@ -1774,6 +1774,32 @@ var Render = /** @__PURE__ @class */ (function () {
             args.cell.innerHTML = '';
         }
     };
+    /**
+    * @param {string} columnUid - Defines column uid
+    * @returns {void}
+    * @hidden
+    */
+    Render.prototype.refreshReactColumnTemplateByUid = function (columnUid) {
+        var _this = this;
+        if (this.parent.isReact) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            this.parent.clearTemplate(['columnTemplate'], undefined, function () {
+                var cells = 'cells';
+                var rowIdx = 'index';
+                var rowsObj = _this.parent.grid.getRowsObject();
+                var indent = _this.parent.grid.getIndentCount();
+                var cellIndex = _this.parent.grid.getNormalizedColumnIndex(columnUid);
+                for (var j = 0; j < rowsObj.length; j++) {
+                    if (rowsObj[j].isDataRow && !isNullOrUndefined(rowsObj[j].index)) {
+                        var cell = rowsObj[j][cells][cellIndex];
+                        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] });
+                    }
+                }
+            });
+        }
+    };
     Render.prototype.columnTemplateResult = function (args) {
         this.templateResult = args.template;
     };
@@ -2791,7 +2817,9 @@ 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);
+                                        if (!control.enableImmutableMode) {
+                                            parentData['childRecords'].splice(p, 1);
+                                        }
                                         childRecords.splice(p, 1);
                                         if (!childRecords.length) {
                                             parentData.hasChildRecords = false;
@@ -3089,7 +3117,12 @@ function updateParentRow(key, record, action, control, isSelfReference, child) {
         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()) {
@@ -3193,6 +3226,8 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         _this.changedRecords = 'changedRecords';
         _this.deletedRecords = 'deletedRecords';
         _this.addedRecords = 'addedRecords';
+        _this.indentOutdentAction = 'indentOutdentAction';
+        _this.modifiedRecords = [];
         _this.objectEqualityChecker = function (old, current) {
             if (old) {
                 var keys = Object.keys(old);
@@ -3601,7 +3636,14 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         return modules;
     };
     TreeGrid.prototype.extendRequiredModules = function (modules) {
-        if (this.allowRowDragAndDrop) {
+        var IsRowDDInjected = this.injectedModules.filter(function (e) {
+            return e.name === 'RowDD';
+        });
+        if (this.allowRowDragAndDrop || IsRowDDInjected.length) {
+            if ((!isNullOrUndefined(this.toolbar) && (this.toolbar['includes']('Indent') ||
+                this.toolbar['includes']('Outdent')))) {
+                this.isIndentEnabled = true;
+            }
             modules.push({
                 member: 'rowDragAndDrop',
                 args: [this]
@@ -3727,7 +3769,12 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             }
             return modules;
         };
+        var root = 'root';
+        this.grid[root] = this[root] ? this[root] : this;
         this.grid.appendTo(gridContainer);
+        if (this.isIndentEnabled) {
+            this.refreshToolbarItems();
+        }
         this.wireEvents();
         this.renderComplete();
         var destroyTemplate = 'destroyTemplate';
@@ -3741,6 +3788,15 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             }
         };
     };
+    TreeGrid.prototype.refreshToolbarItems = function () {
+        var toolbarElement = this.toolbarModule.getToolbar();
+        var indentID = this.element.id + '_gridcontrol_indent';
+        var outdentID = this.element.id + '_gridcontrol_outdent';
+        var indentElement = toolbarElement.querySelector('#' + indentID).parentElement;
+        var outdentElement = toolbarElement.querySelector('#' + outdentID).parentElement;
+        indentElement.classList.add('e-hidden');
+        outdentElement.classList.add('e-hidden');
+    };
     TreeGrid.prototype.afterGridRender = function () {
         if (!isNullOrUndefined(this.grid.clipboardModule)) {
             this.grid.clipboardModule.destroy();
@@ -4220,14 +4276,24 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             }
             if (_this.action === 'indenting' || _this.action === 'outdenting') {
                 _this.action = _this.action === 'indenting' ? 'indented' : 'outdented';
+                var selectedItem_1 = [_this.selectedRecords];
                 var actionArgs = {
+                    data: selectedItem_1,
+                    dropIndex: _this.dropIndex,
+                    dropPosition: _this.dropPosition,
+                    modifiedRecords: _this.modifiedRecords,
                     requestType: _this.action,
-                    data: _this.selectedRecords,
                     row: _this.selectedRows
                 };
                 _this.trigger(actionComplete, actionArgs);
+                var currentPageItem = _this.getCurrentViewRecords().filter(function (e) {
+                    return e.uniqueID === selectedItem_1[0].uniqueID;
+                });
+                if (!currentPageItem.length) {
+                    _this.refreshToolbarItems();
+                }
                 _this.action = '';
-                _this.selectedRecords = _this.selectedRows = [];
+                _this.selectedRecords = _this.selectedRows = _this.modifiedRecords = [];
             }
             else {
                 _this.trigger(actionComplete, args);
@@ -4431,7 +4497,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                     case ToolbarItem.RowIndent:
                         tooltipText = this.l10n.getConstant('RowIndent');
                         items.push({
-                            text: tooltipText, tooltipText: tooltipText, disabled: true,
+                            text: tooltipText, tooltipText: tooltipText,
                             prefixIcon: 'e-indent', id: this.element.id + '_gridcontrol_indent'
                         });
                         break;
@@ -4439,7 +4505,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                     case ToolbarItem.RowOutdent:
                         tooltipText = this.l10n.getConstant('RowOutdent');
                         items.push({
-                            text: tooltipText, tooltipText: tooltipText, disabled: true,
+                            text: tooltipText, tooltipText: tooltipText,
                             prefixIcon: 'e-outdent', id: this.element.id + '_gridcontrol_outdent'
                         });
                         break;
@@ -4492,6 +4558,15 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 this.columnModel.push(new Column(treeGridColumn));
             }
             gridColumnCollection.push(gridColumn);
+            if (!isNullOrUndefined(this.columnModel[this.treeColumnIndex]) && this.enableRtl) {
+                if (gridColumn.field === this.columnModel[this.treeColumnIndex].field) {
+                    if (isNullOrUndefined(this.treeColumnTextAlign)) {
+                        this.treeColumnTextAlign = this.columnModel[this.treeColumnIndex].textAlign;
+                        this.treeColumnField = this.columnModel[this.treeColumnIndex].field;
+                    }
+                    gridColumn.textAlign = 'Right';
+                }
+            }
         }
         return gridColumnCollection;
     };
@@ -4664,6 +4739,9 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                     this.grid.allowPdfExport = this.allowPdfExport;
                     break;
                 case 'enableRtl':
+                    if (!isNullOrUndefined(this.treeColumnField)) {
+                        this.updateTreeColumnTextAlign();
+                    }
                     this.grid.enableRtl = this.enableRtl;
                     break;
                 case 'allowReordering':
@@ -4704,6 +4782,11 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             }
         }
     };
+    TreeGrid.prototype.updateTreeColumnTextAlign = function () {
+        var gridColumn = this.grid.getColumnByField(this.treeColumnField);
+        gridColumn.textAlign = this.enableRtl ? 'Right' : this.treeColumnTextAlign;
+        this.grid.refreshColumns();
+    };
     /**
      * Destroys the component (detaches/removes all event handlers, attributes, classes, and empties the component element).
      *
@@ -5041,10 +5124,13 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         rowData.parentUniqueID = record.parentUniqueID;
         rowData.expanded = record.expanded;
         this.grid.setRowData(key, rowData);
-        var table = this.getContentTable();
-        var sHeight = table.scrollHeight;
-        var clientHeight = this.getContent().clientHeight;
-        this.lastRowBorder(this.getRows()[record.index], sHeight <= clientHeight);
+        var visibleRecords = this.getVisibleRecords();
+        if (visibleRecords.length > 0 && key === (visibleRecords[visibleRecords.length - 1])[primaryKey]) {
+            var table = this.getContentTable();
+            var sHeight = table.scrollHeight;
+            var clientHeight = this.getContent().clientHeight;
+            this.lastRowBorder(this.getRows()[currentRecords.indexOf(record)], sHeight <= clientHeight);
+        }
     };
     /**
      * Navigates to the specified target page.
@@ -5254,32 +5340,6 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         this[merge$$1] = undefined; // Workaround for blazor updateModel
         return this.columnModel;
     };
-    /**
-     * @param {string} columnUid - Defines column uid
-     * @returns {void}
-     * @hidden
-     */
-    TreeGrid.prototype.refreshReactColumnTemplateByUid = function (columnUid) {
-        var _this = this;
-        if (this.isReact) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            this.clearTemplate(['columnTemplate'], undefined, function () {
-                var cells = 'cells';
-                var rowIdx = 'index';
-                var rowsObj = _this.grid.getRowsObject();
-                var indent = _this.grid.getIndentCount();
-                var cellIndex = _this.grid.getNormalizedColumnIndex(columnUid);
-                for (var j = 0; j < rowsObj.length; j++) {
-                    if (rowsObj[j].isDataRow && !isNullOrUndefined(rowsObj[j].index)) {
-                        var cell = rowsObj[j][cells][cellIndex];
-                        var cellRenderer = new CellRenderer(_this.grid, _this.grid.serviceLocator);
-                        var td = _this.getCellFromIndex(rowsObj[j].index, cellIndex - indent);
-                        cellRenderer.refreshTD(td, cell, rowsObj[j].data, { index: rowsObj[j][rowIdx] });
-                    }
-                }
-            });
-        }
-    };
     /**
      * Gets the content div of the TreeGrid.
      *
@@ -5425,8 +5485,14 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
         this.uniqueIDCollection = {};
         this.convertTreeData(this.dataSource);
         if (!isCountRequired(this)) {
-            this.grid.dataSource = !(this.dataSource instanceof DataManager) ? this.flatData :
-                new DataManager(this.dataSource.dataSource, this.dataSource.defaultQuery, this.dataSource.adaptor);
+            if (!(this.dataSource instanceof DataManager)) {
+                this.grid.dataSource = this.flatData;
+            }
+            else {
+                this.grid.setProperties({
+                    dataSource: new DataManager(this.dataSource.dataSource, this.dataSource.defaultQuery, this.dataSource.adaptor)
+                }, true);
+            }
         }
         this.grid.refresh();
     };
@@ -5570,6 +5636,9 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 if (!(isRemoteData(_this) && !isOffline(_this)) && (!isCountRequired(_this) || !isNullOrUndefined(record[children]))) {
                     var collapseArgs = { data: record, row: row };
                     _this.setHeightForFrozenContent();
+                    if (!isNullOrUndefined(_this.expandStateMapping)) {
+                        _this.updateExpandStateMapping(collapseArgs.data, true);
+                    }
                     _this.trigger(expanded, collapseArgs);
                 }
             }
@@ -5632,6 +5701,9 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 var collapseArgs = { data: record, row: row };
                 if (!isRemoteData(_this)) {
                     _this.setHeightForFrozenContent();
+                    if (!isNullOrUndefined(_this.expandStateMapping)) {
+                        _this.updateExpandStateMapping(collapseArgs.data, false);
+                    }
                     _this.trigger(collapsed, collapseArgs);
                     if (_this.enableInfiniteScrolling) {
                         var scrollHeight = _this.grid.getContent().firstElementChild.scrollHeight;
@@ -5644,6 +5716,19 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             }
         });
     };
+    TreeGrid.prototype.updateExpandStateMapping = function (record, state) {
+        var totalRecords = record;
+        if (totalRecords.length) {
+            for (var i = 0; i < totalRecords.length; i++) {
+                totalRecords[i][this.expandStateMapping] = state;
+                editAction({ value: totalRecords[i], action: 'edit' }, this, this.isSelfReference, totalRecords[i].index, this.grid.selectedRowIndex, this.expandStateMapping);
+            }
+        }
+        else {
+            record[this.expandStateMapping] = state;
+            editAction({ value: record, action: 'edit' }, this, this.isSelfReference, record.index, this.grid.selectedRowIndex, this.expandStateMapping);
+        }
+    };
     /**
      * Expands the records at specific hierarchical level
      *
@@ -6086,7 +6171,7 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
                 freezeRightRows[i].style.display = displayAction;
             }
             this.notify('childRowExpand', { row: rows[i] });
-            if (!isNullOrUndefined(childRecords[i].childRecords) && (action !== 'expand' ||
+            if ((!isNullOrUndefined(childRecords[i].childRecords) && childRecords[i].childRecords.length > 0) && (action !== 'expand' ||
                 isNullOrUndefined(childRecords[i].expanded) || childRecords[i].expanded)) {
                 this.expandCollapse(action, rows[i], childRecords[i], true);
                 if (this.frozenColumns <= this.treeColumnIndex && !isNullOrUndefined(movableRows)) {
@@ -6185,6 +6270,28 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
             }
         }
     };
+    /**
+     * Updates the rows and cells
+     *
+     * @param {Object[]} records - Updates the given records
+     * @param {HTMLTableRowElement[]} rows - Updates the given rows
+     * @param {number} index -  Updates the given cell index
+     * @returns {void}
+     */
+    TreeGrid.prototype.updateRowAndCellElements = function (records, rows, index) {
+        for (var i = 0; i < records.length; i++) {
+            this.renderModule.cellRender({
+                data: records[i], cell: rows[i].cells[index],
+                column: this.grid.getColumns()[this.treeColumnIndex],
+                requestType: 'rowDragAndDrop'
+            });
+            if (this['action'] === 'indenting' || this['action'] === 'outdenting') {
+                this.renderModule.RowModifier({
+                    data: records[i], row: rows[i]
+                });
+            }
+        }
+    };
     /**
      * @hidden
      * @returns {void}
@@ -6538,6 +6645,30 @@ var TreeGrid = /** @__PURE__ @class */ (function (_super) {
     TreeGrid.prototype.reorderRows = function (fromIndexes, toIndex, position) {
         this.rowDragAndDropModule.reorderRows(fromIndexes, toIndex, position);
     };
+    /**
+     * Indents the record to one level of hierarchy. Moves the selected row as the last child of its previous row.
+     *
+     * @param {Object} record – specifies the record to do indented
+     * @returns {void}
+     */
+    TreeGrid.prototype.indent = function (record) {
+        if (!isNullOrUndefined(this.rowDragAndDropModule)) {
+            record = record;
+            this.rowDragAndDropModule[this.indentOutdentAction](record, 'indent');
+        }
+    };
+    /**
+     * Outdent the record to one level of hierarchy. Moves the selected row as sibling to its parent row.
+     *
+     * @param {Object} record – specifies the record to do outdented
+     * @returns {void}
+     */
+    TreeGrid.prototype.outdent = function (record) {
+        if (!isNullOrUndefined(this.rowDragAndDropModule)) {
+            record = record;
+            this.rowDragAndDropModule[this.indentOutdentAction](record, 'outdent');
+        }
+    };
     var TreeGrid_1;
     __decorate([
         Property(0)
@@ -7056,6 +7187,14 @@ var RowDD$1 = /** @__PURE__ @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(RowDD);
         this.parent = parent;
@@ -7095,6 +7234,8 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
     RowDD$$1.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';
@@ -7105,6 +7246,7 @@ var RowDD$1 = /** @__PURE__ @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]];
@@ -7128,7 +7270,13 @@ var RowDD$1 = /** @__PURE__ @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 = [];
@@ -7140,36 +7288,119 @@ var RowDD$1 = /** @__PURE__ @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$$1.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$$1.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(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$$1.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;
     };
@@ -7228,7 +7459,8 @@ var RowDD$1 = /** @__PURE__ @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;
@@ -7504,13 +7736,34 @@ var RowDD$1 = /** @__PURE__ @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$$1.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$$1.prototype.topOrBottomBorder = function (target) {
         var rowElement = [];
@@ -7699,7 +7952,7 @@ var RowDD$1 = /** @__PURE__ @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) {
@@ -7747,14 +8000,25 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
     RowDD$$1.prototype.getTargetIdx = function (targetRow) {
         return targetRow ? parseInt(targetRow.getAttribute('aria-rowindex'), 10) : 0;
     };
-    RowDD$$1.prototype.getParentData = function (record) {
+    RowDD$$1.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);
             }
@@ -7769,9 +8033,12 @@ var RowDD$1 = /** @__PURE__ @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;
@@ -7785,6 +8052,7 @@ var RowDD$1 = /** @__PURE__ @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;
@@ -7798,7 +8066,7 @@ var RowDD$1 = /** @__PURE__ @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') {
@@ -7838,6 +8106,7 @@ var RowDD$1 = /** @__PURE__ @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;
@@ -7884,7 +8153,7 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
             };
             var this_1 = this;
             for (var i = 0; i < dragLength; i++) {
-                _loop_2(i);
+                _loop_1(i);
             }
         }
     };
@@ -8052,7 +8321,7 @@ var RowDD$1 = /** @__PURE__ @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);
                     }
                 }
@@ -8106,6 +8375,19 @@ var RowDD$1 = /** @__PURE__ @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$$1.prototype.updateModifiedRecords = function (record) {
+        var parentData = getParentData(this.parent, record.parentUniqueID);
+        if (!isNullOrUndefined(parentData)) {
+            this.parent[this.modifiedRecords].push(parentData);
+            this.updateModifiedRecords(parentData);
         }
     };
     RowDD$$1.prototype.removeChildItem = function (record) {
@@ -8510,6 +8792,9 @@ var Filter$1 = /** @__PURE__ @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);
                 }
             }
@@ -9181,46 +9466,59 @@ var Toolbar$1 = /** @__PURE__ @class */ (function () {
     };
     Toolbar$$1.prototype.refreshToolbar = function (args) {
         var tObj = this.parent;
-        if (args.row.rowIndex === 0 || tObj.getSelectedRecords().length > 1) {
-            this.enableItems([tObj.element.id + '_gridcontrol_indent', tObj.element.id + '_gridcontrol_outdent'], false);
-        }
-        else if (args['name'] !== "rowDeselected") {
-            if (!isNullOrUndefined(tObj.getCurrentViewRecords()[args.row.rowIndex])) {
-                if (!isNullOrUndefined(tObj.getCurrentViewRecords()[args.row.rowIndex]) &&
-                    (tObj.getCurrentViewRecords()[args.row.rowIndex].level >
-                        tObj.getCurrentViewRecords()[args.row.rowIndex - 1].level)) {
-                    this.enableItems([tObj.element.id + '_gridcontrol_indent'], false);
-                }
-                else {
-                    this.enableItems([tObj.element.id + '_gridcontrol_indent'], true);
-                }
-                if (tObj.getCurrentViewRecords()[args.row.rowIndex].level ===
-                    tObj.getCurrentViewRecords()[args.row.rowIndex - 1].level) {
-                    this.enableItems([tObj.element.id + '_gridcontrol_indent'], true);
+        var indentElement;
+        var outdentElement;
+        var indentID = tObj.element.id + '_gridcontrol_indent';
+        var outdentID = tObj.element.id + '_gridcontrol_outdent';
+        var toolbarElement = this.parent.grid.toolbarModule.getToolbar();
+        var indentEle = toolbarElement.querySelector('#' + indentID);
+        var outdentEle = toolbarElement.querySelector('#' + outdentID);
+        var row = args.row;
+        var selectedrow = tObj.getSelectedRows()[0];
+        if (!isNullOrUndefined(row[0])) {
+            row = row[0];
+        }
+        row = (!isNullOrUndefined(selectedrow) && selectedrow.rowIndex !== row.rowIndex) ? selectedrow : row;
+        if (indentEle !== null && outdentEle !== null) {
+            indentElement = toolbarElement.querySelector('#' + indentID).parentElement;
+            outdentElement = toolbarElement.querySelector('#' + outdentID).parentElement;
+            if (row.rowIndex === 0 || tObj.getSelectedRowIndexes().length > 1) {
+                indentElement.classList.add('e-hidden');
+                outdentElement.classList.add('e-hidden');
+            }
+            else if (args['name'] !== 'rowDeselected' || (!isNullOrUndefined(selectedrow) && tObj.grid.isCheckBoxSelection)) {
+                var selectedItem = tObj.getCurrentViewRecords()[row.rowIndex];
+                if (!isNullOrUndefined(selectedItem)) {
+                    if ((selectedItem.level > tObj.getCurrentViewRecords()[row.rowIndex - 1].level)) {
+                        indentElement.classList.add('e-hidden');
+                    }
+                    else {
+                        indentElement.classList.remove('e-hidden');
+                    }
+                    if (selectedItem.level === tObj.getCurrentViewRecords()[row.rowIndex - 1].level) {
+                        indentElement.classList.remove('e-hidden');
+                    }
+                    if (selectedItem.level === 0) {
+                        outdentElement.classList.add('e-hidden');
+                    }
+                    if (selectedItem.level !== 0) {
+                        outdentElement.classList.remove('e-hidden');
+                    }
                 }
-                if (tObj.getCurrentViewRecords()[args.row.rowIndex].level === 0) {
-                    this.enableItems([tObj.element.id + '_gridcontrol_outdent'], false);
+            }
+            if (args['name'] === 'rowDeselected' && isNullOrUndefined(selectedrow) && !tObj.grid.isCheckBoxSelection) {
+                if (this.parent.toolbar['includes']('Indent')) {
+                    indentElement.classList.add('e-hidden');
                 }
-                if (tObj.getCurrentViewRecords()[args.row.rowIndex].level !== 0) {
-                    this.enableItems([tObj.element.id + '_gridcontrol_outdent'], true);
+                if (this.parent.toolbar['includes']('Outdent')) {
+                    outdentElement.classList.add('e-hidden');
                 }
             }
         }
-        if (args['name'] === "rowDeselected") {
-            if (this.parent.toolbar['includes']('Indent')) {
-                this.enableItems([tObj.element.id + '_gridcontrol_indent'], false);
-            }
-            if (this.parent.toolbar['includes']('Outdent')) {
-                this.enableItems([tObj.element.id + '_gridcontrol_outdent'], false);
-            }
-        }
-        if (args.row.rowIndex === 0 && !isNullOrUndefined(args.data.parentItem)) {
-            this.enableItems([tObj.element.id + '_gridcontrol_outdent'], true);
-        }
     };
     Toolbar$$1.prototype.toolbarClickHandler = function (args) {
         var tObj = this.parent;
-        var action = 'action';
+        var indentOutdentAction = 'indentOutdentAction';
         if (this.parent.editSettings.mode === 'Cell' && this.parent.grid.editSettings.mode === 'Batch' &&
             args.item.id === this.parent.grid.element.id + '_update') {
             args.cancel = true;
@@ -9232,57 +9530,15 @@ var Toolbar$1 = /** @__PURE__ @class */ (function () {
         if (args.item.id === this.parent.grid.element.id + '_collapseall') {
             this.parent.collapseAll();
         }
-        if (args.item.id === tObj.grid.element.id + '_indent' && tObj.getSelectedRecords().length) {
-            var record = tObj.getCurrentViewRecords()[tObj.getSelectedRowIndexes()[0] - 1];
-            var dropIndex = void 0;
-            if (record.level > tObj.getSelectedRecords()[0].level) {
-                for (var i = 0; i < tObj.getCurrentViewRecords().length; i++) {
-                    if (tObj.getCurrentViewRecords()[i].taskData === record.parentItem.taskData) {
-                        dropIndex = i;
-                    }
-                }
-            }
-            else {
-                dropIndex = tObj.getSelectedRowIndexes()[0] - 1;
-            }
-            this.parent[action] = 'indenting';
-            this.eventTrigger('indenting', dropIndex);
+        if (args.item.id === tObj.grid.element.id + '_indent' && tObj.getSelectedRecords().length
+            && !isNullOrUndefined(tObj.rowDragAndDropModule)) {
+            this.parent.rowDragAndDropModule[indentOutdentAction](null, 'indent');
         }
-        if (args.item.id === tObj.grid.element.id + '_outdent' && tObj.getSelectedRecords().length) {
-            var dropIndex = void 0;
-            var parentItem = tObj.getSelectedRecords()[0].parentItem;
-            for (var i = 0; i < tObj.getCurrentViewRecords().length; i++) {
-                if (tObj.getCurrentViewRecords()[i].taskData === parentItem.taskData) {
-                    dropIndex = i;
-                }
-            }
-            this.parent[action] = 'outdenting';
-            this.eventTrigger('outdenting', dropIndex);
+        if (args.item.id === tObj.grid.element.id + '_outdent' && tObj.getSelectedRecords().length
+            && !isNullOrUndefined(tObj.rowDragAndDropModule)) {
+            this.parent.rowDragAndDropModule[indentOutdentAction](null, 'outdent');
         }
     };
-    Toolbar$$1.prototype.eventTrigger = function (action, dropIndex) {
-        var _this = this;
-        var selectedRecords = 'selectedRecords';
-        var selectedRows = 'selectedRows';
-        this.parent[selectedRows] = this.parent.getSelectedRows();
-        this.parent[selectedRecords] = this.parent.getSelectedRecords();
-        var actionArgs = {
-            requestType: action,
-            data: this.parent.getSelectedRecords(),
-            row: this.parent.getSelectedRows(),
-            cancel: false
-        };
-        this.parent.trigger(actionBegin, actionArgs, function (actionArgs) {
-            if (!actionArgs.cancel) {
-                if (actionArgs.requestType === 'indenting') {
-                    _this.parent.reorderRows([_this.parent.getSelectedRowIndexes()[0]], dropIndex, 'child');
-                }
-                else if (actionArgs.requestType === 'outdenting') {
-                    _this.parent.reorderRows([_this.parent.getSelectedRowIndexes()[0]], dropIndex, 'below');
-                }
-            }
-        });
-    };
     /**
      * Gets the toolbar of the TreeGrid.
      *
@@ -10020,9 +10276,17 @@ var BatchEdit = /** @__PURE__ @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') {
@@ -10034,6 +10298,9 @@ var BatchEdit = /** @__PURE__ @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
@@ -10257,6 +10524,10 @@ var BatchEdit = /** @__PURE__ @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);
@@ -10308,7 +10579,8 @@ var BatchEdit = /** @__PURE__ @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];
@@ -11054,6 +11326,21 @@ var Edit$1 = /** @__PURE__ @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 &&
@@ -11198,7 +11485,7 @@ var Edit$1 = /** @__PURE__ @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) {
@@ -11649,7 +11936,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
                     getValue('virtualEle', this).setVirtualHeight(this.parent.getRowHeight() * e.count, '100%');
                 }
             }
-            if ((!isNullOrUndefined(e.requestType) && e.requestType.toString() === 'collapseAll') || this.isDataSourceChanged) {
+            if ((!isNullOrUndefined(e.requestType) && e.requestType.toString() === 'collapseAll') || (this.isDataSourceChanged && this.startIndex === -1)) {
                 this.contents.scrollTop = 0;
                 this.isDataSourceChanged = false;
             }
@@ -12193,7 +12480,7 @@ var VirtualScroll$1 = /** @__PURE__ @class */ (function () {
         }
         else {
             var requestType = pageingDetails.actionArgs.requestType;
-            if (requestType === 'filtering' || requestType === 'collapseAll' ||
+            if (requestType === 'filtering' || requestType === 'collapseAll' || requestType === 'searching' ||
                 (requestType === 'refresh' && this.parent.enableCollapseAll && endIndex > visualData.length)) {
                 startIndex = 0;
                 endIndex = this.parent.grid.pageSettings.pageSize - 1;