@syncfusion/ej2-treegrid 20.1.47 → 20.1.52

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.1.47
+*  version : 20.1.52
 *  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@18.16.3",
+  "_id": "@syncfusion/ej2-treegrid@20.1.51",
   "_inBundle": false,
-  "_integrity": "sha512-OaaaeQK1Wag332oQTxhdgffuJg+IQA9aBRYfHc5OgYGw+FgdJAu4y/XBVY3LTgkZ0Z1qKxZIU2KxTjs/m0n7vg==",
+  "_integrity": "sha512-9awiYCeU9G5d700L+2nhTh0/F/31+EWJZawEtrU7qxpGyoFxb3EICIFVb51oO9+BQphSS3Xnp204Vk9xQV511g==",
   "_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-release/@syncfusion/ej2-treegrid/-/ej2-treegrid-18.16.3.tgz",
-  "_shasum": "348932505ec2558f8d30b8ffead3f508749563e8",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.1.51.tgz",
+  "_shasum": "24c27866fd177d1a5bf5b2c11bd29aa74c005f69",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -36,9 +36,9 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.1.47",
+    "@syncfusion/ej2-base": "~20.1.50",
     "@syncfusion/ej2-data": "~20.1.47",
-    "@syncfusion/ej2-grids": "~20.1.47",
+    "@syncfusion/ej2-grids": "~20.1.52",
     "@syncfusion/ej2-popups": "~20.1.47"
   },
   "deprecated": false,
@@ -60,6 +60,6 @@
     "url": "git+https://github.com/syncfusion/ej2-treegrid.git"
   },
   "typings": "index.d.ts",
-  "version": "20.1.47",
+  "version": "20.1.52",
   "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

@@ -366,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,9 +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
      *
@@ -48,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;
@@ -78,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

@@ -22,6 +22,12 @@ 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;
@@ -63,6 +69,7 @@ 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') {
@@ -74,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]];
@@ -138,18 +146,96 @@ var RowDD = /** @class */ (function () {
             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;
     };
@@ -208,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;
@@ -700,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) {
@@ -748,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);
             }
@@ -770,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;
@@ -786,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;
@@ -799,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') {
@@ -886,7 +988,7 @@ var RowDD = /** @class */ (function () {
             };
             var this_1 = this;
             for (var i = 0; i < dragLength; i++) {
-                _loop_2(i);
+                _loop_1(i);
             }
         }
     };
@@ -1108,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/selection.js

@@ -85,10 +85,12 @@ var Selection = /** @class */ (function () {
     Selection.prototype.getCheckboxcolumnIndex = function () {
         var mappingUid;
         var columnIndex;
-        var columns = (this.parent.columns);
+        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++) {
             if (columns[col].showCheckbox) {
-                mappingUid = this.parent.columns[col].uid;
+                mappingUid = columns[col].uid;
             }
         }
         var headerCelllength = this.parent.getHeaderContent().querySelectorAll('.e-headercelldiv').length;

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.
      *

package/src/treegrid/actions/toolbar.js

@@ -44,46 +44,59 @@ var Toolbar = /** @class */ (function () {
     };
     Toolbar.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);
+        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];
         }
-        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);
+        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.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;
@@ -95,57 +108,15 @@ var Toolbar = /** @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.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(events.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.
      *

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

@@ -117,7 +117,7 @@ var VirtualScroll = /** @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;