@syncfusion/ej2-treegrid 20.2.36 → 20.2.40

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.2.36
+*  version : 20.2.40
 *  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.23.3",
+  "_id": "@syncfusion/ej2-treegrid@20.2.39",
   "_inBundle": false,
-  "_integrity": "sha512-MoKO1I4KuhbqhrcUpyBSTMmzWIt3vmYZRD0X+sKPaRR5P7TwWi6FOhn+ZKN4VkOnKNbok9JnGUAFfiQHuz3GcA==",
+  "_integrity": "sha512-5rBNYV7TLamFp9Hc0N6hCtVjsqk1ZxtGLsP49vRZQRTAc2zps0a3OwOVsfGQkh6YTwyojMRNwsiV+GeHUXe+6w==",
   "_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.23.3.tgz",
-  "_shasum": "ffe68795f8136158a761877a163b5f8b0987f200",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-treegrid/-/ej2-treegrid-20.2.39.tgz",
+  "_shasum": "45ce481300501f03d225973a53a749b17c4fab18",
   "_spec": "@syncfusion/ej2-treegrid@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -36,10 +36,10 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.2.36",
-    "@syncfusion/ej2-data": "~20.2.36",
-    "@syncfusion/ej2-grids": "~20.2.36",
-    "@syncfusion/ej2-popups": "~20.2.36"
+    "@syncfusion/ej2-base": "~20.2.39",
+    "@syncfusion/ej2-data": "~20.2.38",
+    "@syncfusion/ej2-grids": "~20.2.40",
+    "@syncfusion/ej2-popups": "~20.2.40"
   },
   "deprecated": false,
   "description": "Essential JS 2 TreeGrid Component",
@@ -60,6 +60,6 @@
     "url": "git+https://github.com/syncfusion/ej2-treegrid.git"
   },
   "typings": "index.d.ts",
-  "version": "20.2.36",
+  "version": "20.2.40",
   "sideEffects": false
 }

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

@@ -237,10 +237,11 @@ var BatchEdit = /** @class */ (function () {
             this.parent.editModule[isTabLastRow] = false;
             return;
         }
-        if (this.parent.editModule['isAddedRowByMethod'] && !isNullOrUndefined(this.parent.editModule['addRowIndex']) && this.parent.grid.selectedRowIndex === -1) {
+        if (this.parent.editModule['isAddedRowByMethod'] && !isNullOrUndefined(this.parent.editModule['addRowIndex']) &&
+            !this.parent.editModule['isAddedRowByContextMenu'] && (this.parent.grid.selectedRowIndex === -1 || this.parent.editModule['batchEditModule'].isAdd)) {
             this.selectedIndex = this.parent.editModule['selectedIndex'];
             this.addRowIndex = this.parent.editModule['addRowIndex'];
-            this.addRowRecord = this.parent.getCurrentViewRecords()[this.selectedIndex];
+            this.addRowRecord = this.batchRecords.length ? this.batchRecords[this.selectedIndex] : this.parent.getCurrentViewRecords()[this.selectedIndex];
         }
         else {
             this.selectedIndex = this.parent.grid.selectedRowIndex;
@@ -287,6 +288,11 @@ var BatchEdit = /** @class */ (function () {
                 // }
             }
             focusModule.getContent().matrix.current = [actualIndex, focusModule.getContent().matrix.current[1]];
+            if (this.parent.editModule['isAddedRowByMethod'] && !isNullOrUndefined(this.parent.editModule['addRowIndex']) && !this.parent.editModule['isAddedRowByContextMenu']) {
+                var newlyAddedRecords = this.parent.getBatchChanges()['addedRecords'];
+                var index = parseInt(this.parent.getContentTable().getElementsByClassName('e-insertedrow')[newlyAddedRecords.length - 1].getAttribute('data-rowindex'), 10);
+                this.batchRecords.splice(index, 0, newlyAddedRecords[newlyAddedRecords.length - 1]);
+            }
         }
     };
     BatchEdit.prototype.beforeBatchDelete = function (args) {
@@ -312,7 +318,7 @@ var BatchEdit = /** @class */ (function () {
             childs = findChildrenRecords(data);
             uid = this.parent.getSelectedRows()[0].getAttribute('data-uid');
         }
-        var parentRowIndex = parseInt(this.parent.grid.getRowElementByUID(uid).getAttribute('aria-rowindex'), 10);
+        var parentRowIndex = parseInt(this.parent.grid.getRowElementByUID(uid).getAttribute('data-rowindex'), 10);
         if (childs.length) {
             var totalCount = parentRowIndex + childs.length;
             var firstChildIndex = parentRowIndex + 1;
@@ -349,7 +355,7 @@ var BatchEdit = /** @class */ (function () {
     BatchEdit.prototype.updateRowIndex = function () {
         var rows = this.parent.grid.getDataRows();
         for (var i = 0; i < rows.length; i++) {
-            rows[i].setAttribute('aria-rowindex', i.toString());
+            rows[i].setAttribute('data-rowindex', i.toString());
         }
         var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
             this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
@@ -357,9 +363,9 @@ var BatchEdit = /** @class */ (function () {
             var mRows = this.parent.grid.getMovableDataRows();
             var freezeRightRows = this.parent.grid.getFrozenRightDataRows();
             for (var i = 0; i < mRows.length; i++) {
-                mRows[i].setAttribute('aria-rowindex', i.toString());
+                mRows[i].setAttribute('data-rowindex', i.toString());
                 if (freeze) {
-                    freezeRightRows[i].setAttribute('aria-rowindex', i.toString());
+                    freezeRightRows[i].setAttribute('data-rowindex', i.toString());
                 }
             }
         }
@@ -419,7 +425,9 @@ var BatchEdit = /** @class */ (function () {
         if (!isNullOrUndefined(this.batchAddedRecords)) {
             for (var i = 0; i < this.batchAddedRecords.length; i++) {
                 index = data.map(function (e) { return e[primaryKey]; }).indexOf(this.batchAddedRecords[i][primaryKey]);
-                data.splice(index, 1);
+                if (index !== -1) {
+                    data.splice(index, 1);
+                }
                 if (this.parent.editSettings.newRowPosition === 'Child') {
                     index = currentViewRecords.map(function (e) { return e[primaryKey]; })
                         .indexOf(this.batchAddedRecords[i][parentItem] ? this.batchAddedRecords[i][parentItem][primaryKey]
@@ -485,9 +493,12 @@ 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.editModule['isAddedRowByMethod'] && addRecords.length && !isNullOrUndefined(this.parent.editModule['addRowIndex']) && !this.parent.editModule['isAddedRowByContextMenu']) {
+                    addRecords.reverse();
+                    for (var i_1 = 0; i_1 < addRecords.length; i_1++) {
+                        var index_1 = parseInt(this.parent.getContentTable().getElementsByClassName('e-insertedrow')[i_1].getAttribute('data-rowindex'), 10);
+                        data.splice(index_1, 0, addRecords[i_1]);
+                    }
                 }
                 if (!this.parent.allowPaging && data.length !== currentViewRecords.length) {
                     if (currentViewRecords.length > addRecords.length) {
@@ -507,6 +518,9 @@ var BatchEdit = /** @class */ (function () {
             if (this.batchAddRowRecord.length === 0) {
                 this.batchAddRowRecord.push(this.parent.flatData[args.index]);
             }
+            if (this.parent.editModule['isAddedRowByContextMenu']) {
+                addRecords.reverse();
+            }
             for (i = 0; i < addRecords.length; i++) {
                 var taskData = extend({}, addRecords[i]);
                 delete taskData.parentItem;
@@ -519,6 +533,11 @@ var BatchEdit = /** @class */ (function () {
                 if (!isNullOrUndefined(taskData.primaryParent)) {
                     delete taskData.primaryParent;
                 }
+                if (addRecords.length > 1 && this.parent.editModule['isAddedRowByContextMenu']) {
+                    var rowPosition = this.parent.editSettings.newRowPosition;
+                    this.parent.editSettings.newRowPosition = this.parent.editModule['previousNewRowPosition'];
+                    this.parent.editModule['previousNewRowPosition'] = rowPosition;
+                }
                 addRecords[i].taskData = taskData;
                 addRowRecord = this.batchAddRowRecord[i];
                 if (isNullOrUndefined(addRowRecord)) {
@@ -558,15 +577,18 @@ var BatchEdit = /** @class */ (function () {
                 }
             }
             this.parent.parentData = [];
-            for (var i_1 = 0; i_1 < data.length; i_1++) {
-                data[i_1][index] = i_1;
-                setValue('uniqueIDCollection.' + data[i_1][uniqueID] + '.index', i_1, this.parent);
-                if (!data[i_1][level]) {
-                    this.parent.parentData.push(data[i_1]);
+            for (var i_2 = 0; i_2 < data.length; i_2++) {
+                data[i_2][index] = i_2;
+                setValue('uniqueIDCollection.' + data[i_2][uniqueID] + '.index', i_2, this.parent);
+                if (!data[i_2][level]) {
+                    this.parent.parentData.push(data[i_2]);
                 }
             }
         }
         this.batchAddRowRecord = this.batchAddedRecords = this.batchRecords = this.batchDeletedRecords = this.currentViewRecords = [];
+        if (this.parent.editModule['isAddedRowByContextMenu']) {
+            this.parent.editModule['isAddedRowByContextMenu'] = false;
+        }
     };
     BatchEdit.prototype.getActualRowObjectIndex = function (index) {
         var rows = this.parent.grid.getDataRows();

package/src/treegrid/actions/context-menu.js

@@ -93,6 +93,7 @@ var ContextMenu = /** @class */ (function () {
         if (args.item.id === 'Above' || args.item.id === 'Below' || args.item.id === 'Child') {
             this.parent.notify('savePreviousRowPosition', args);
             this.parent.setProperties({ editSettings: { newRowPosition: args.item.id } }, true);
+            this.parent.editModule['isAddedRowByContextMenu'] = true;
             this.parent.addRecord();
         }
         if (args.item.id === this.parent.element.id + '_gridcontrol_cmenu_Indent' || args.item.id === this.parent.element.id + '_gridcontrol_cmenu_Outdent') {

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

@@ -22,6 +22,7 @@ export declare class Edit {
     private isTabLastRow;
     private prevAriaRowIndex;
     private isAddedRowByMethod;
+    private isAddedRowByContextMenu;
     /**
      * Constructor for Edit module
      *

package/src/treegrid/actions/edit.js

@@ -21,6 +21,7 @@ var Edit = /** @class */ (function () {
         this.deletedRecords = 'deletedRecords';
         this.prevAriaRowIndex = '-1';
         this.isAddedRowByMethod = false;
+        this.isAddedRowByContextMenu = false;
         Grid.Inject(GridEdit);
         this.parent = parent;
         this.isSelfReference = !isNullOrUndefined(parent.parentIdMapping);
@@ -71,7 +72,7 @@ var Edit = /** @class */ (function () {
     Edit.prototype.getRowPosition = function (addArgs) {
         addArgs.newRowPosition = this.parent.editSettings.newRowPosition;
         addArgs.addRowIndex = this.addRowIndex;
-        addArgs.ariaRowIndex = +this.prevAriaRowIndex;
+        addArgs.dataRowIndex = +this.prevAriaRowIndex;
     };
     Edit.prototype.beforeStartEdit = function (args) {
         this.parent.trigger(events.actionBegin, args);
@@ -227,7 +228,7 @@ var Edit = /** @class */ (function () {
         if (!(this.parent.grid.editSettings.allowEditing) || this.parent.grid.isEdit) {
             return;
         }
-        var column = this.parent.grid.getColumnByIndex(+target.closest('td.e-rowcell').getAttribute('aria-colindex'));
+        var column = this.parent.grid.getColumnByIndex(+target.closest('td.e-rowcell').getAttribute('data-colindex'));
         if (this.parent.editSettings.mode === 'Cell' && !this.isOnBatch && column && !column.isPrimaryKey &&
             this.parent.editSettings.allowEditing && column.allowEditing && !(target.classList.contains('e-treegridexpand') ||
             target.classList.contains('e-treegridcollapse')) && this.parent.editSettings.allowEditOnDblClick) {
@@ -235,8 +236,8 @@ var Edit = /** @class */ (function () {
             this.parent.grid.setProperties({ selectedRowIndex: args.rowIndex }, true);
             if (this.parent.enableVirtualization) {
                 var tr = parentsUntil(args.target, 'e-row');
-                this.prevAriaRowIndex = tr.getAttribute('aria-rowindex');
-                tr.setAttribute('aria-rowindex', tr.rowIndex + '');
+                this.prevAriaRowIndex = tr.getAttribute('data-rowindex');
+                tr.setAttribute('data-rowindex', tr.rowIndex + '');
             }
             this.updateGridEditMode('Batch');
         }
@@ -276,7 +277,7 @@ var Edit = /** @class */ (function () {
         var prom = args[promise];
         delete args[promise];
         if (this.parent.enableVirtualization && !isNullOrUndefined(this.prevAriaRowIndex) && this.prevAriaRowIndex !== '-1') {
-            args.row.setAttribute('aria-rowindex', this.prevAriaRowIndex);
+            args.row.setAttribute('data-rowindex', this.prevAriaRowIndex);
             this.prevAriaRowIndex = undefined;
         }
         if (this.keyPress !== 'enter') {
@@ -532,9 +533,11 @@ var Edit = /** @class */ (function () {
                 this.parent.parentData.push(data[i]);
             }
         }
-        if (details.action === 'add' && this.previousNewRowPosition != null) {
-            this.parent.setProperties({ editSettings: { newRowPosition: this.previousNewRowPosition } }, true);
-            this.previousNewRowPosition = null;
+        if (!this.parent.enableInfiniteScrolling) {
+            if (details.action === 'add' && this.previousNewRowPosition != null) {
+                this.parent.setProperties({ editSettings: { newRowPosition: this.previousNewRowPosition } }, true);
+                this.previousNewRowPosition = null;
+            }
         }
     };
     Edit.prototype.updateIndex = function (data, rows, records) {
@@ -610,8 +613,8 @@ var Edit = /** @class */ (function () {
             }
         }
         var rows = this.parent.grid.getDataRows();
-        var firstAriaIndex = rows.length ? +rows[0].getAttribute('aria-rowindex') : 0;
-        var lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('aria-rowindex') : 0;
+        var firstAriaIndex = rows.length ? +rows[0].getAttribute('data-rowindex') : 0;
+        var lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('data-rowindex') : 0;
         var withinRange = this.selectedIndex >= firstAriaIndex && this.selectedIndex <= lastAriaIndex;
         var isVirtualization = this.parent.enableVirtualization && this.addRowIndex > -1 && this.prevAriaRowIndex !== '-1';
         if (this.parent.editSettings.mode !== 'Dialog') {
@@ -681,20 +684,27 @@ var Edit = /** @class */ (function () {
                 focussedElement.focus();
             }
         }
-        if (this.parent.editSettings.mode === 'Batch' && !isNullOrUndefined(this.addRowIndex) && this.addRowIndex !== -1) {
+        if (this.parent.editSettings.mode === 'Batch' && !isNullOrUndefined(this.addRowIndex) && this.addRowIndex !== -1 && this['isAddedRowByMethod'] && !this.isAddedRowByContextMenu) {
             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']);
+            var batchAddedRecords = this.parent.getBatchChanges()['addedRecords'];
+            var newlyAddedRecord = void 0;
+            if (batchAddedRecords.length) {
+                for (var i = 0; i < batchAddedRecords.length; i++) {
+                    if (isNullOrUndefined(batchAddedRecords[i].uniqueID)) {
+                        newlyAddedRecord = batchAddedRecords[i];
+                    }
+                }
             }
+            var args = {
+                action: 'add',
+                data: newlyAddedRecord,
+                index: index,
+                seletedRow: 0
+            };
+            this.beginAddEdit(args);
+            this.batchEditModule['batchAddRowRecord'].push(this.batchEditModule['addRowRecord']);
+            this.batchEditModule['batchAddedRecords'].push(args['data']);
         }
     };
     // private beforeDataBound(args: BeforeDataBoundArgs): void {
@@ -761,7 +771,7 @@ var Edit = /** @class */ (function () {
                 this.selectedIndex = this.parent.grid.selectedRowIndex;
             }
             if (this.parent.enableVirtualization) {
-                var selector = '.e-row[aria-rowindex="' + this.selectedIndex + '"]';
+                var selector = '.e-row[data-rowindex="' + this.selectedIndex + '"]';
                 var row = void 0;
                 if (this.selectedIndex > -1 && this.parent.editSettings.newRowPosition !== 'Top' &&
                     this.parent.editSettings.newRowPosition !== 'Bottom') {
@@ -771,7 +781,7 @@ var Edit = /** @class */ (function () {
                 }
                 else {
                     if (this.prevAriaRowIndex && this.prevAriaRowIndex !== '-1') {
-                        selector = '.e-row[aria-rowindex="' + this.prevAriaRowIndex + '"]';
+                        selector = '.e-row[data-rowindex="' + this.prevAriaRowIndex + '"]';
                         row = this.parent.getContent().querySelector(selector);
                         this.addRowIndex = row ? row.rowIndex : 0;
                     }
@@ -782,14 +792,19 @@ var Edit = /** @class */ (function () {
             }
             else {
                 if (this.isAddedRowByMethod && (this.parent.enableVirtualization || this.parent.enableInfiniteScrolling)) {
-                    this.addRowIndex = args.index;
+                    if (args.index !== 0) {
+                        this.addRowIndex = args.index;
+                    }
+                    else {
+                        this.addRowIndex = this.parent.grid.selectedRowIndex;
+                    }
                 }
                 else {
                     this.addRowIndex = this.parent.grid.selectedRowIndex > -1 ? this.parent.grid.selectedRowIndex : 0;
                 }
             }
             if (this.isAddedRowByMethod && (this.parent.enableVirtualization || this.parent.enableInfiniteScrolling)) {
-                this.addRowRecord = this.parent.flatData[args.index];
+                this.addRowRecord = this.parent.flatData[this.parent.grid.selectedRowIndex];
             }
             else {
                 this.addRowRecord = this.parent.getSelectedRecords()[0];
@@ -825,10 +840,16 @@ var Edit = /** @class */ (function () {
             var key = this.parent.grid.getPrimaryKeyFieldNames()[0];
             var position = null;
             value.taskData = isNullOrUndefined(value.taskData) ? extend({}, args.data) : value.taskData;
-            var currentData = this.parent.grid.getCurrentViewRecords();
+            var currentData = void 0;
+            if (this.parent.editSettings.mode === 'Batch' && this['isAddedRowByMethod'] && !isNullOrUndefined(this.addRowIndex)) {
+                currentData = this.batchEditModule['batchRecords'];
+            }
+            else {
+                currentData = this.parent.grid.getCurrentViewRecords();
+            }
             if (this.parent.enableVirtualization && args.index !== 0) {
                 this.addRowIndex = this.parent.grid.getCurrentViewRecords().indexOf(this.addRowRecord);
-                this.selectedIndex = parseInt(this.parent.getRows()[this.addRowIndex].getAttribute('aria-rowindex'), 10);
+                this.selectedIndex = parseInt(this.parent.getRows()[this.addRowIndex].getAttribute('data-rowindex'), 10);
             }
             var index = this.addRowIndex;
             value.uniqueID = getUid(this.parent.element.id + '_data_');
@@ -841,7 +862,7 @@ var Edit = /** @class */ (function () {
             var isVirtualization = this.parent.enableVirtualization && this.addRowIndex > -1 && this.prevAriaRowIndex !== '-1';
             var rows = this.parent.getRows();
             var firstAriaIndex = rows.length ? currentData.indexOf(currentData[0]) : 0;
-            var lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('aria-rowindex') : 0;
+            var lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('data-rowindex') : 0;
             var withinRange = this.selectedIndex >= firstAriaIndex && this.selectedIndex <= lastAriaIndex;
             if (currentData.length) {
                 idMapping = currentData[this.addRowIndex][this.parent.idMapping];

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

@@ -137,6 +137,9 @@ var InfiniteScroll = /** @class */ (function () {
         });
         var actionArgs = getValue('actionArgs', pageingDetails.actionArgs);
         var actions = getValue('actions', this.parent.grid.infiniteScrollModule);
+        if (this.parent.grid.infiniteScrollModule['isInitialRender'] && !this.parent.initialRender) {
+            this.parent.grid.pageSettings.currentPage = 1;
+        }
         var initial = actions.some(function (value) { return value === actionArgs.requestType; });
         var initialRender = initial ? true : this.parent.initialRender ? true : false;
         this.visualData = visualData;
@@ -151,8 +154,8 @@ var InfiniteScroll = /** @class */ (function () {
                 this.parent.infiniteScrollSettings.initialBlocks = this.parent.infiniteScrollSettings.maxBlocks;
             }
             var size = initialRender ?
-                this.parent.pageSettings.pageSize * this.parent.infiniteScrollSettings.initialBlocks :
-                this.parent.pageSettings.pageSize;
+                this.parent.grid.pageSettings.pageSize * this.parent.infiniteScrollSettings.initialBlocks :
+                this.parent.grid.pageSettings.pageSize;
             var current = this.parent.grid.pageSettings.currentPage;
             if (!isNullOrUndefined(actionArgs)) {
                 var lastIndex = getValue('lastIndex', this.parent.grid.infiniteScrollModule);
@@ -170,7 +173,7 @@ var InfiniteScroll = /** @class */ (function () {
                 else {
                     if ((pageingDetails.actionArgs['action'] === 'expand' || pageingDetails.actionArgs['action'] === 'collapse') && this.parent.grid.pageSettings.currentPage !== 1) {
                         current = 1;
-                        size = this.parent.pageSettings.pageSize * this.parent.grid.pageSettings.currentPage;
+                        size = this.parent.grid.pageSettings.pageSize * this.parent.grid.pageSettings.currentPage;
                     }
                     query = query.page(current, size);
                 }

package/src/treegrid/actions/rowdragdrop.js

@@ -190,7 +190,7 @@ var RowDD = /** @class */ (function () {
                     dropIndex = this.selectedRow.rowIndex - 1;
                 }
                 if (this.parent.enableVirtualization && this.parent.allowRowDragAndDrop && this.selectedRecord) {
-                    dropIndex = parseInt(this.selectedRow.getAttribute('aria-rowindex'), 10) - 1;
+                    dropIndex = parseInt(this.selectedRow.getAttribute('data-rowindex'), 10) - 1;
                 }
                 tObj[action] = 'indenting';
                 tObj[droppedIndex] = dropIndex;
@@ -209,7 +209,7 @@ var RowDD = /** @class */ (function () {
                     }
                 }
                 if (this.parent.enableVirtualization && this.parent.allowRowDragAndDrop && this.selectedRecord) {
-                    dropIndex = parseInt(this.parent.getRows()[dropIndex].getAttribute('aria-rowindex'), 10);
+                    dropIndex = parseInt(this.parent.getRows()[dropIndex].getAttribute('data-rowindex'), 10);
                 }
                 tObj[action] = 'outdenting';
                 tObj[droppedIndex] = dropIndex;
@@ -229,7 +229,7 @@ var RowDD = /** @class */ (function () {
             if (!actionArgs.cancel) {
                 if (actionArgs.action === 'indenting') {
                     if (_this.parent.enableVirtualization && _this.parent.allowRowDragAndDrop) {
-                        _this.reorderRows([parseInt(_this.selectedRow.getAttribute('aria-rowindex'), 10)], dropIndex, 'child');
+                        _this.reorderRows([parseInt(_this.selectedRow.getAttribute('data-rowindex'), 10)], dropIndex, 'child');
                     }
                     else {
                         _this.reorderRows([_this.selectedRow.rowIndex], dropIndex, 'child');
@@ -237,7 +237,7 @@ var RowDD = /** @class */ (function () {
                 }
                 else if (actionArgs.action === 'outdenting') {
                     if (_this.parent.enableVirtualization && _this.parent.allowRowDragAndDrop) {
-                        _this.reorderRows([parseInt(_this.selectedRow.getAttribute('aria-rowindex'), 10)], dropIndex, 'below');
+                        _this.reorderRows([parseInt(_this.selectedRow.getAttribute('data-rowindex'), 10)], dropIndex, 'below');
                     }
                     else {
                         _this.reorderRows([_this.selectedRow.rowIndex], dropIndex, 'below');
@@ -863,7 +863,7 @@ var RowDD = /** @class */ (function () {
         }
     };
     RowDD.prototype.getTargetIdx = function (targetRow) {
-        return targetRow ? parseInt(targetRow.getAttribute('aria-rowindex'), 10) : 0;
+        return targetRow ? parseInt(targetRow.getAttribute('data-rowindex'), 10) : 0;
     };
     RowDD.prototype.getParentData = function (record, data) {
         var parentItem = record.parentItem;

package/src/treegrid/actions/selection.js

@@ -245,7 +245,12 @@ var Selection = /** @class */ (function () {
             if (indeter > 0 || (checkChildRecords > 0 && checkChildRecords !== length)) {
                 record.checkboxState = 'indeterminate';
             }
-            else if (checkChildRecords === 0 && indeter === 0) {
+            else if (checkChildRecords === 0 && (!record.hasFilteredChildRecords || isNullOrUndefined(record.hasFilteredChildRecords)) && !isNullOrUndefined(this.parent['dataResults']['actionArgs']) &&
+                (this.parent['dataResults']['actionArgs'].requestType === 'searching' || this.parent['dataResults']['actionArgs'].requestType === 'filtering') && record.checkboxState === 'check') {
+                record.checkboxState = 'check';
+            }
+            else if ((checkChildRecords === 0 && indeter === 0) || (checkChildRecords === 0 && record.hasFilteredChildRecords && !isNullOrUndefined(this.parent['dataResults']['actionArgs']) &&
+                (this.parent['dataResults']['actionArgs'].requestType === 'searching' || this.parent['dataResults']['actionArgs'].requestType === 'filtering') && record.checkboxState === 'check')) {
                 record.checkboxState = 'uncheck';
             }
             else {
@@ -435,7 +440,7 @@ var Selection = /** @class */ (function () {
                     childData = (!isNullOrUndefined(this.parent.filterModule) && this.parent.filterModule.filteredResult.length > 0) ?
                         this.parent.getCurrentViewRecords() : this.parent.flatData;
                     childData.forEach(function (record) {
-                        if (_this.parent.enableVirtualization) {
+                        if (_this.parent.enableVirtualization && record.childRecords.length > 0) {
                             if (record.hasChildRecords) {
                                 _this.updateParentSelection(record);
                             }

package/src/treegrid/base/constant.d.ts

@@ -128,3 +128,5 @@ export declare const rowdraging: string;
 export declare const rowDropped: string;
 /** @hidden */
 export declare const autoCol: string;
+/** @hidden */
+export declare const rowDeselecting: string;

package/src/treegrid/base/constant.js

@@ -128,3 +128,5 @@ export var rowdraging = 'row-draging';
 export var rowDropped = 'row-dropped';
 /** @hidden */
 export var autoCol = 'auto-col';
+/** @hidden */
+export var rowDeselecting = 'rowDeselecting';

package/src/treegrid/base/data.js

@@ -377,8 +377,8 @@ var DataManipulation = /** @class */ (function () {
             if (!Object.prototype.hasOwnProperty.call(currentData, 'index')) {
                 currentData.index = this.storedIndex;
             }
-            if (!isNullOrUndefined(currentData[this.parent.childMapping]) ||
-                (currentData[this.parent.hasChildMapping] && isCountRequired(this.parent))) {
+            if ((!isNullOrUndefined(currentData[this.parent.childMapping]) && !isCountRequired(this.parent)) ||
+                ((currentData[this.parent.hasChildMapping]) && isCountRequired(this.parent) && this.parent.initialRender)) {
                 currentData.hasChildRecords = true;
                 if (this.parent.enableCollapseAll || !isNullOrUndefined(this.parent.dataStateChange)
                     && isNullOrUndefined(currentData[this.parent.childMapping])) {

package/src/treegrid/base/treegrid.d.ts

@@ -1222,6 +1222,7 @@ export declare class TreeGrid extends Component<HTMLElement> implements INotifyP
     private convertTreeData;
     private bindGridProperties;
     private triggerEvents;
+    private IsExpandCollapseClicked;
     private bindGridEvents;
     private lastRowBorder;
     private isPixelHeight;

package/src/treegrid/base/treegrid.js

@@ -743,16 +743,23 @@ var TreeGrid = /** @class */ (function (_super) {
     TreeGrid.prototype.triggerEvents = function (args) {
         this.trigger(getObject('name', args), args);
     };
+    TreeGrid.prototype.IsExpandCollapseClicked = function (args) {
+        if (!isNullOrUndefined(args.target) && (args.target.classList.contains('e-treegridexpand')
+            || args.target.classList.contains('e-treegridcollapse') || args.target.classList.contains('e-summarycell'))) {
+            args.cancel = true;
+            return;
+        }
+    };
     TreeGrid.prototype.bindGridEvents = function () {
         var _this = this;
         this.grid.rowSelecting = function (args) {
-            if (!isNullOrUndefined(args.target) && (args.target.classList.contains('e-treegridexpand')
-                || args.target.classList.contains('e-treegridcollapse') || args.target.classList.contains('e-summarycell'))) {
-                args.cancel = true;
-                return;
-            }
+            _this.IsExpandCollapseClicked(args);
             _this.trigger(events.rowSelecting, args);
         };
+        this.grid.rowDeselecting = function (args) {
+            _this.IsExpandCollapseClicked(args);
+            _this.trigger(events.rowDeselecting, args);
+        };
         this.grid.rowSelected = function (args) {
             if (_this.enableVirtualization && args.isHeaderCheckboxClicked &&
                 _this.grid.currentViewData.length !== _this.grid.selectionModule.selectedRowIndexes.length) {
@@ -2537,7 +2544,7 @@ var TreeGrid = /** @class */ (function (_super) {
         }
         else if (isNullOrUndefined(record)) {
             if (this.detailTemplate) {
-                record = this.grid.getCurrentViewRecords()[row.getAttribute('aria-rowindex')];
+                record = this.grid.getCurrentViewRecords()[row.getAttribute('data-rowindex')];
             }
             else {
                 record = this.grid.getCurrentViewRecords()[row.rowIndex];
@@ -2815,7 +2822,7 @@ var TreeGrid = /** @class */ (function (_super) {
             row = gridRows[rowIndex];
         }
         else {
-            rowIndex = +row.getAttribute('aria-rowindex');
+            rowIndex = +row.getAttribute('data-rowindex');
         }
         if (!isNullOrUndefined(row)) {
             row.setAttribute('aria-expanded', action === 'expand' ? 'true' : 'false');
@@ -2969,7 +2976,7 @@ var TreeGrid = /** @class */ (function (_super) {
         var args = { data: record, row: row };
         var rows = [];
         rows = gridRows.filter(function (r) {
-            return r.querySelector('.e-gridrowindex' + record.index + 'level' + (record.level + 1));
+            return ((r.querySelector('.e-gridrowindex' + record.index + 'level' + (record.level + 1))) || (r.querySelector('.e-gridrowindex' + record.index + 'level0' + '.e-summarycell')));
         });
         if (action === 'expand') {
             this.notify(events.remoteExpand, { record: record, rows: rows, parentRow: row });

package/src/treegrid/renderer/render.js

@@ -47,7 +47,7 @@ var Render = /** @class */ (function () {
             var parentrec = this.parent.getCurrentViewRecords().filter(function (rec) {
                 return getValue(proxy_1.idMapping, rec) === getValue(proxy_1.parentIdMapping, data);
             });
-            if (parentrec.length > 0) {
+            if (parentrec.length > 0 && !parentrec[0].isSummaryRow) {
                 var display = parentrec[0].expanded ? 'table-row' : 'none';
                 args.row.setAttribute('style', 'display: ' + display + ';');
             }
@@ -227,7 +227,7 @@ var Render = /** @class */ (function () {
         var templateFn = 'templateFn';
         var colindex = args.column.index;
         if (isNullOrUndefined(treeColumn.field)) {
-            args.cell.setAttribute('aria-colindex', colindex + '');
+            args.cell.setAttribute('data-colindex', colindex + '');
         }
         if (treeColumn.field === args.column.field && !isNullOrUndefined(treeColumn.template)) {
             args.column.template = treeColumn.template;

package/src/treegrid/renderer/virtual-tree-content-render.d.ts

@@ -11,7 +11,7 @@ export declare class VirtualTreeContentRenderer extends VirtualContentRenderer {
     private maxiPage;
     private rowPosition;
     private addRowIndex;
-    private ariaRowIndex;
+    private dataRowIndex;
     private recordAdded;
     /** @hidden */
     startIndex: number;