@syncfusion/ej2-treegrid 20.2.39 → 20.2.44

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

@@ -497,6 +497,8 @@ var rowdraging = 'row-draging';
 var rowDropped = 'row-dropped';
 /** @hidden */
 var autoCol = 'auto-col';
+/** @hidden */
+var rowDeselecting = 'rowDeselecting';
 
 var __extends$4 = (undefined && undefined.__extends) || (function () {
     var extendStatics = function (d, b) {
@@ -797,7 +799,7 @@ function findChildrenRecords(records) {
         return [];
     }
     if (!isNullOrUndefined(records.childRecords)) {
-        var childRecords = records.childRecords;
+        var childRecords = records.childRecords.filter(function (item) { return !item.isSummaryRow; });
         var keys = Object.keys(childRecords);
         for (var i = 0, len = keys.length; i < len; i++) {
             datas.push(childRecords[i]);
@@ -1314,7 +1316,7 @@ var Selection = /** @__PURE__ @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);
                             }
@@ -1733,7 +1735,7 @@ var Render = /** @__PURE__ @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;
@@ -3925,16 +3927,23 @@ var TreeGrid = /** @__PURE__ @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(rowSelecting, args);
         };
+        this.grid.rowDeselecting = function (args) {
+            _this.IsExpandCollapseClicked(args);
+            _this.trigger(rowDeselecting, args);
+        };
         this.grid.rowSelected = function (args) {
             if (_this.enableVirtualization && args.isHeaderCheckboxClicked &&
                 _this.grid.currentViewData.length !== _this.grid.selectionModule.selectedRowIndexes.length) {
@@ -5719,7 +5728,7 @@ var TreeGrid = /** @__PURE__ @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];
@@ -5997,7 +6006,7 @@ var TreeGrid = /** @__PURE__ @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');
@@ -7402,7 +7411,7 @@ var RowDD$1 = /** @__PURE__ @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;
@@ -7421,7 +7430,7 @@ var RowDD$1 = /** @__PURE__ @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;
@@ -7441,7 +7450,7 @@ var RowDD$1 = /** @__PURE__ @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');
@@ -7449,7 +7458,7 @@ var RowDD$1 = /** @__PURE__ @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');
@@ -8075,7 +8084,7 @@ var RowDD$1 = /** @__PURE__ @class */ (function () {
         }
     };
     RowDD$$1.prototype.getTargetIdx = function (targetRow) {
-        return targetRow ? parseInt(targetRow.getAttribute('aria-rowindex'), 10) : 0;
+        return targetRow ? parseInt(targetRow.getAttribute('data-rowindex'), 10) : 0;
     };
     RowDD$$1.prototype.getParentData = function (record, data) {
         var parentItem = record.parentItem;
@@ -8876,7 +8885,8 @@ var Filter$1 = /** @__PURE__ @class */ (function () {
                     }
                 }
                 else {
-                    if (parent['expanded'] === false && this.parent.getVisibleRecords().indexOf(record) === -1 && isNullOrUndefined(this.parent['dataResults']['action'])) {
+                    if ((!this.parent.enableCollapseAll || !this.parent.initialRender && isNullOrUndefined(this.parent['dataResults']['result']))
+                        && parent['expanded'] === false && this.parent.getVisibleRecords().indexOf(record) === -1) {
                         this.parent.expandRow(this.parent.getRows()[parent['index']], parent);
                     }
                     this.addParentRecord(parent);
@@ -10161,6 +10171,7 @@ var ContextMenu$1 = /** @__PURE__ @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') {
@@ -10432,10 +10443,12 @@ var BatchEdit = /** @__PURE__ @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;
@@ -10482,6 +10495,11 @@ var BatchEdit = /** @__PURE__ @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) {
@@ -10507,7 +10525,7 @@ var BatchEdit = /** @__PURE__ @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;
@@ -10544,7 +10562,7 @@ var BatchEdit = /** @__PURE__ @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;
@@ -10552,9 +10570,9 @@ var BatchEdit = /** @__PURE__ @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());
                 }
             }
         }
@@ -10614,7 +10632,9 @@ var BatchEdit = /** @__PURE__ @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]
@@ -10680,9 +10700,12 @@ 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.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) {
@@ -10702,6 +10725,9 @@ var BatchEdit = /** @__PURE__ @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;
@@ -10714,6 +10740,11 @@ var BatchEdit = /** @__PURE__ @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)) {
@@ -10753,15 +10784,18 @@ var BatchEdit = /** @__PURE__ @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();
@@ -10831,6 +10865,7 @@ var Edit$1 = /** @__PURE__ @class */ (function () {
         this.deletedRecords = 'deletedRecords';
         this.prevAriaRowIndex = '-1';
         this.isAddedRowByMethod = false;
+        this.isAddedRowByContextMenu = false;
         Grid.Inject(Edit);
         this.parent = parent;
         this.isSelfReference = !isNullOrUndefined(parent.parentIdMapping);
@@ -10881,7 +10916,7 @@ var Edit$1 = /** @__PURE__ @class */ (function () {
     Edit$$1.prototype.getRowPosition = function (addArgs) {
         addArgs.newRowPosition = this.parent.editSettings.newRowPosition;
         addArgs.addRowIndex = this.addRowIndex;
-        addArgs.ariaRowIndex = +this.prevAriaRowIndex;
+        addArgs.dataRowIndex = +this.prevAriaRowIndex;
     };
     Edit$$1.prototype.beforeStartEdit = function (args) {
         this.parent.trigger(actionBegin, args);
@@ -11037,7 +11072,7 @@ var Edit$1 = /** @__PURE__ @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) {
@@ -11045,8 +11080,8 @@ var Edit$1 = /** @__PURE__ @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');
         }
@@ -11086,7 +11121,7 @@ var Edit$1 = /** @__PURE__ @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') {
@@ -11422,8 +11457,8 @@ var Edit$1 = /** @__PURE__ @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') {
@@ -11493,20 +11528,27 @@ var Edit$1 = /** @__PURE__ @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 {
@@ -11573,7 +11615,7 @@ var Edit$1 = /** @__PURE__ @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') {
@@ -11583,7 +11625,7 @@ var Edit$1 = /** @__PURE__ @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;
                     }
@@ -11642,10 +11684,16 @@ var Edit$1 = /** @__PURE__ @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_');
@@ -11658,7 +11706,7 @@ var Edit$1 = /** @__PURE__ @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];
@@ -12023,7 +12071,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
         return new TreeVirtualRowModelGenerator(this.parent);
     };
     VirtualTreeContentRenderer.prototype.getRowByIndex = function (index) {
-        return this.parent.getDataRows().filter(function (e) { return parseInt(e.getAttribute('aria-rowindex'), 10) === index; })[0];
+        return this.parent.getDataRows().filter(function (e) { return parseInt(e.getAttribute('data-rowindex'), 10) === index; })[0];
     };
     VirtualTreeContentRenderer.prototype.addEventListener = function () {
         this.parent.on(virtualActionArgs, this.virtualOtherAction, this);
@@ -12202,7 +12250,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
         return new Cell(opt);
     };
     VirtualTreeContentRenderer.prototype.beginEdit = function (e) {
-        var selector = '.e-row[aria-rowindex="' + e.index + '"]';
+        var selector = '.e-row[data-rowindex="' + e.index + '"]';
         var index = this.parent.getContent().querySelector(selector).rowIndex;
         var rowData = this.parent.getCurrentViewRecords()[index];
         e.data = rowData;
@@ -12210,14 +12258,14 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
     VirtualTreeContentRenderer.prototype.beginAdd = function (args) {
         var addAction = 'addActionBegin';
         var isAdd = 'isAdd';
-        var addArgs = { newRowPosition: this.rowPosition, addRowIndex: this.addRowIndex, ariaRowIndex: this.ariaRowIndex };
+        var addArgs = { newRowPosition: this.rowPosition, addRowIndex: this.addRowIndex, dataRowIndex: this.dataRowIndex };
         this.parent.notify('get-row-position', addArgs);
         this.rowPosition = addArgs.newRowPosition;
         this.addRowIndex = addArgs.addRowIndex;
-        this.ariaRowIndex = addArgs.ariaRowIndex;
+        this.dataRowIndex = addArgs.dataRowIndex;
         var rows = this.parent.getRows();
-        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.parent.selectedRowIndex >= firstAriaIndex && this.parent.selectedRowIndex <= lastAriaIndex;
         if (!(this.rowPosition === 'Top' || this.rowPosition === 'Bottom')) {
             this[isAdd] = true;
@@ -12268,11 +12316,11 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
     };
     VirtualTreeContentRenderer.prototype.onActionComplete = function (args) {
         if (args.requestType === 'add') {
-            var addArgs = { newRowPosition: this.rowPosition, addRowIndex: this.addRowIndex, ariaRowIndex: this.ariaRowIndex };
+            var addArgs = { newRowPosition: this.rowPosition, addRowIndex: this.addRowIndex, dataRowIndex: this.dataRowIndex };
             this.parent.notify('get-row-position', addArgs);
             this.rowPosition = addArgs.newRowPosition;
             this.addRowIndex = addArgs.addRowIndex;
-            this.ariaRowIndex = addArgs.ariaRowIndex;
+            this.dataRowIndex = addArgs.dataRowIndex;
         }
         var actionComplete$$1 = 'actionComplete';
         _super.prototype[actionComplete$$1].call(this, args);
@@ -12335,7 +12383,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
                 !isNullOrUndefined(this.parent.getContent().querySelectorAll('.e-content tr')[rowPt])) {
                 var attr = this.parent.getContent().querySelectorAll('.e-content tr')[rowPt]
                     .querySelector('td').getAttribute('index');
-                firsttdinx = +attr; // this.parent.getContent().querySelector('.e-content tr').getAttribute('aria-rowindex');
+                firsttdinx = +attr; // this.parent.getContent().querySelector('.e-content tr').getAttribute('data-rowindex');
             }
             if (firsttdinx === 0) {
                 if (this.parent.allowRowDragAndDrop) {
@@ -12434,7 +12482,7 @@ var VirtualTreeContentRenderer = /** @__PURE__ @class */ (function (_super) {
             var isAdd = 'isAdd';
             if (this[isAdd] && !this.parent.getContent().querySelector('.e-content').querySelector('.e-addedrow')) {
                 if (!(this.rowPosition === 'Top' || this.rowPosition === 'Bottom')) {
-                    if (this.ariaRowIndex >= this.startIndex) {
+                    if (this.dataRowIndex >= this.startIndex) {
                         this.restoreNewRow();
                     }
                     else if (this.addRowIndex && this.addRowIndex > -1) {
@@ -13037,6 +13085,9 @@ var InfiniteScroll$1 = /** @__PURE__ @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;
@@ -13051,8 +13102,8 @@ var InfiniteScroll$1 = /** @__PURE__ @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);
@@ -13070,7 +13121,7 @@ var InfiniteScroll$1 = /** @__PURE__ @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);
                 }
@@ -13242,5 +13293,5 @@ var InfiniteScroll$1 = /** @__PURE__ @class */ (function () {
  * Export TreeGrid component
  */
 
-export { TreeGrid, load, rowDataBound, dataBound, queryCellInfo, beforeDataBound, actionBegin, dataStateChange, actionComplete, rowSelecting, rowSelected, checkboxChange, rowDeselected, toolbarClick, beforeExcelExport, beforePdfExport, resizeStop, expanded, expanding, collapsed, collapsing, remoteExpand, localPagedExpandCollapse, pagingActions, printGridInit, contextMenuOpen, contextMenuClick, beforeCopy, beforePaste, savePreviousRowPosition, crudAction, beginEdit, beginAdd, recordDoubleClick, cellSave, cellSaved, cellEdit, batchDelete, batchCancel, batchAdd, beforeBatchDelete, beforeBatchAdd, beforeBatchSave, batchSave, keyPressed, updateData, doubleTap, virtualColumnIndex, virtualActionArgs, destroy, dataListener, indexModifier, beforeStartEdit, beforeBatchCancel, batchEditFormRendered, detailDataBound, rowDrag, rowDragStartHelper, rowDrop, rowDragStart, rowsAdd, rowsRemove, rowdraging, rowDropped, autoCol, DataManipulation, Reorder$1 as Reorder, Resize$1 as Resize, RowDD$1 as RowDD, Column, EditSettings, Predicate$1 as Predicate, FilterSettings, PageSettings, SearchSettings, SelectionSettings, AggregateColumn, AggregateRow, SortDescriptor, SortSettings, RowDropSettings$1 as RowDropSettings, InfiniteScrollSettings, Render, TreeVirtualRowModelGenerator, isRemoteData, isCountRequired, isCheckboxcolumn, isFilterChildHierarchy, findParentRecords, getExpandStatus, findChildrenRecords, isOffline, extendArray, getPlainData, getParentData, isHidden, ToolbarItem, ContextMenuItems, Filter$1 as Filter, ExcelExport$1 as ExcelExport, PdfExport$1 as PdfExport, Page$1 as Page, Toolbar$1 as Toolbar, Aggregate$1 as Aggregate, Sort$1 as Sort, TreeClipboard, ColumnMenu$1 as ColumnMenu, ContextMenu$1 as ContextMenu, Edit$1 as Edit, CommandColumn$1 as CommandColumn, Selection, DetailRow$1 as DetailRow, VirtualScroll$1 as VirtualScroll, TreeVirtual, Freeze$1 as Freeze, ColumnChooser$1 as ColumnChooser, Logger$1 as Logger, treeGridDetails, InfiniteScroll$1 as InfiniteScroll };
+export { TreeGrid, load, rowDataBound, dataBound, queryCellInfo, beforeDataBound, actionBegin, dataStateChange, actionComplete, rowSelecting, rowSelected, checkboxChange, rowDeselected, toolbarClick, beforeExcelExport, beforePdfExport, resizeStop, expanded, expanding, collapsed, collapsing, remoteExpand, localPagedExpandCollapse, pagingActions, printGridInit, contextMenuOpen, contextMenuClick, beforeCopy, beforePaste, savePreviousRowPosition, crudAction, beginEdit, beginAdd, recordDoubleClick, cellSave, cellSaved, cellEdit, batchDelete, batchCancel, batchAdd, beforeBatchDelete, beforeBatchAdd, beforeBatchSave, batchSave, keyPressed, updateData, doubleTap, virtualColumnIndex, virtualActionArgs, destroy, dataListener, indexModifier, beforeStartEdit, beforeBatchCancel, batchEditFormRendered, detailDataBound, rowDrag, rowDragStartHelper, rowDrop, rowDragStart, rowsAdd, rowsRemove, rowdraging, rowDropped, autoCol, rowDeselecting, DataManipulation, Reorder$1 as Reorder, Resize$1 as Resize, RowDD$1 as RowDD, Column, EditSettings, Predicate$1 as Predicate, FilterSettings, PageSettings, SearchSettings, SelectionSettings, AggregateColumn, AggregateRow, SortDescriptor, SortSettings, RowDropSettings$1 as RowDropSettings, InfiniteScrollSettings, Render, TreeVirtualRowModelGenerator, isRemoteData, isCountRequired, isCheckboxcolumn, isFilterChildHierarchy, findParentRecords, getExpandStatus, findChildrenRecords, isOffline, extendArray, getPlainData, getParentData, isHidden, ToolbarItem, ContextMenuItems, Filter$1 as Filter, ExcelExport$1 as ExcelExport, PdfExport$1 as PdfExport, Page$1 as Page, Toolbar$1 as Toolbar, Aggregate$1 as Aggregate, Sort$1 as Sort, TreeClipboard, ColumnMenu$1 as ColumnMenu, ContextMenu$1 as ContextMenu, Edit$1 as Edit, CommandColumn$1 as CommandColumn, Selection, DetailRow$1 as DetailRow, VirtualScroll$1 as VirtualScroll, TreeVirtual, Freeze$1 as Freeze, ColumnChooser$1 as ColumnChooser, Logger$1 as Logger, treeGridDetails, InfiniteScroll$1 as InfiniteScroll };
 //# sourceMappingURL=ej2-treegrid.es5.js.map