@syncfusion/ej2-treegrid 20.2.36 → 20.2.40

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

@@ -438,6 +438,8 @@ const rowdraging = 'row-draging';
 const rowDropped = 'row-dropped';
 /** @hidden */
 const autoCol = 'auto-col';
+/** @hidden */
+const rowDeselecting = 'rowDeselecting';
 
 /**
  * The `Clipboard` module is used to handle clipboard copy action.
@@ -722,7 +724,7 @@ function findChildrenRecords(records) {
         return [];
     }
     if (!isNullOrUndefined(records.childRecords)) {
-        const childRecords = records.childRecords;
+        const childRecords = records.childRecords.filter(items => !items.isSummaryRow);
         const keys = Object.keys(childRecords);
         for (let i = 0, len = keys.length; i < len; i++) {
             datas.push(childRecords[i]);
@@ -1043,7 +1045,12 @@ class Selection {
             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 {
@@ -1231,7 +1238,7 @@ class Selection {
                     childData = (!isNullOrUndefined(this.parent.filterModule) && this.parent.filterModule.filteredResult.length > 0) ?
                         this.parent.getCurrentViewRecords() : this.parent.flatData;
                     childData.forEach((record) => {
-                        if (this.parent.enableVirtualization) {
+                        if (this.parent.enableVirtualization && record.childRecords.length > 0) {
                             if (record.hasChildRecords) {
                                 this.updateParentSelection(record);
                             }
@@ -1432,7 +1439,7 @@ class Render {
             const parentrec = this.parent.getCurrentViewRecords().filter((rec) => {
                 return getValue(proxy.idMapping, rec) === getValue(proxy.parentIdMapping, data);
             });
-            if (parentrec.length > 0) {
+            if (parentrec.length > 0 && !parentrec[0].isSummaryRow) {
                 const display = parentrec[0].expanded ? 'table-row' : 'none';
                 args.row.setAttribute('style', 'display: ' + display + ';');
             }
@@ -1612,7 +1619,7 @@ class Render {
         const templateFn = 'templateFn';
         const 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;
@@ -2072,8 +2079,8 @@ class DataManipulation {
             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])) {
@@ -2227,9 +2234,9 @@ class DataManipulation {
             const modifiedData = new DataManager(parentData).executeLocal(srtQry);
             if (this.parent.allowRowDragAndDrop && !isNullOrUndefined(this.parent.rowDragAndDropModule['draggedRecord']) &&
                 this.parent.rowDragAndDropModule['droppedRecord'].hasChildRecords && this.parent.rowDragAndDropModule['dropPosition'] !== 'middleSegment') {
-                var dragdIndex = modifiedData.indexOf(this.parent.rowDragAndDropModule['draggedRecord']);
+                const dragdIndex = modifiedData.indexOf(this.parent.rowDragAndDropModule['draggedRecord']);
                 modifiedData.splice(dragdIndex, 1);
-                var dropdIndex = modifiedData.indexOf(this.parent.rowDragAndDropModule['droppedRecord']);
+                const dropdIndex = modifiedData.indexOf(this.parent.rowDragAndDropModule['droppedRecord']);
                 if (this.parent.rowDragAndDropModule['droppedRecord'].hasChildRecords && this.parent.rowDragAndDropModule['dropPosition'] === 'topSegment') {
                     modifiedData.splice(dropdIndex, 0, this.parent.rowDragAndDropModule['draggedRecord']);
                 }
@@ -3673,15 +3680,22 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
     triggerEvents(args) {
         this.trigger(getObject('name', args), args);
     }
+    IsExpandCollapseClicked(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;
+        }
+    }
     bindGridEvents() {
         this.grid.rowSelecting = (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 = (args) => {
+            this.IsExpandCollapseClicked(args);
+            this.trigger(rowDeselecting, args);
+        };
         this.grid.rowSelected = (args) => {
             if (this.enableVirtualization && args.isHeaderCheckboxClicked &&
                 this.grid.currentViewData.length !== this.grid.selectionModule.selectedRowIndexes.length) {
@@ -5453,7 +5467,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         }
         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];
@@ -5724,7 +5738,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
             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');
@@ -5874,7 +5888,7 @@ let TreeGrid = TreeGrid_1 = class TreeGrid extends Component {
         }
         const args = { data: record, row: row };
         let rows = [];
-        rows = gridRows.filter((r) => r.querySelector('.e-gridrowindex' + record.index + 'level' + (record.level + 1)));
+        rows = gridRows.filter((r) => ((r.querySelector('.e-gridrowindex' + record.index + 'level' + (record.level + 1))) || (r.querySelector('.e-gridrowindex' + record.index + 'level0' + '.e-summarycell'))));
         if (action === 'expand') {
             this.notify(remoteExpand, { record: record, rows: rows, parentRow: row });
             const args = { row: row, data: record };
@@ -7110,7 +7124,7 @@ class RowDD$1 {
                     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;
@@ -7129,7 +7143,7 @@ class RowDD$1 {
                     }
                 }
                 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;
@@ -7148,7 +7162,7 @@ class RowDD$1 {
             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');
@@ -7156,7 +7170,7 @@ class RowDD$1 {
                 }
                 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');
@@ -7372,7 +7386,7 @@ class RowDD$1 {
         }
     }
     updateIcon(row, index, args) {
-        let rowEle = args.target ? closest(args.target, 'tr') : null;
+        const rowEle = args.target ? closest(args.target, 'tr') : null;
         this.dropPosition = undefined;
         let rowPositionHeight = 0;
         this.removeFirstrowBorder(rowEle);
@@ -7782,7 +7796,7 @@ class RowDD$1 {
         }
     }
     getTargetIdx(targetRow) {
-        return targetRow ? parseInt(targetRow.getAttribute('aria-rowindex'), 10) : 0;
+        return targetRow ? parseInt(targetRow.getAttribute('data-rowindex'), 10) : 0;
     }
     getParentData(record, data) {
         const parentItem = record.parentItem;
@@ -9624,11 +9638,11 @@ class Sort$1 {
                 this.flatSortedData[this.storedIndex] = data[d];
             }
             if (data[d].hasChildRecords) {
-                let childSort = (new DataManager(data[d].childRecords).executeLocal(srtQry));
+                const childSort = (new DataManager(data[d].childRecords).executeLocal(srtQry));
                 if (this.parent.allowRowDragAndDrop && data[d].childRecords.indexOf(this.parent.rowDragAndDropModule['draggedRecord']) !== -1 && this.parent.rowDragAndDropModule['dropPosition'] !== 'middleSegment') {
-                    var dragdIndex = childSort.indexOf(this.parent.rowDragAndDropModule['draggedRecord']);
+                    const dragdIndex = childSort.indexOf(this.parent.rowDragAndDropModule['draggedRecord']);
                     childSort.splice(dragdIndex, 1);
-                    var dropdIndex = childSort.indexOf(this.parent.rowDragAndDropModule['droppedRecord']);
+                    const dropdIndex = childSort.indexOf(this.parent.rowDragAndDropModule['droppedRecord']);
                     if (this.parent.rowDragAndDropModule['dropPosition'] === 'topSegment') {
                         childSort.splice(dropdIndex, 0, this.parent.rowDragAndDropModule['draggedRecord']);
                     }
@@ -9808,6 +9822,7 @@ class ContextMenu$1 {
         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') {
@@ -10078,10 +10093,11 @@ class BatchEdit {
             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;
@@ -10128,6 +10144,11 @@ class BatchEdit {
                 // }
             }
             focusModule.getContent().matrix.current = [actualIndex, focusModule.getContent().matrix.current[1]];
+            if (this.parent.editModule['isAddedRowByMethod'] && !isNullOrUndefined(this.parent.editModule['addRowIndex']) && !this.parent.editModule['isAddedRowByContextMenu']) {
+                const newlyAddedRecords = this.parent.getBatchChanges()['addedRecords'];
+                const index = parseInt(this.parent.getContentTable().getElementsByClassName('e-insertedrow')[newlyAddedRecords.length - 1].getAttribute('data-rowindex'), 10);
+                this.batchRecords.splice(index, 0, newlyAddedRecords[newlyAddedRecords.length - 1]);
+            }
         }
     }
     beforeBatchDelete(args) {
@@ -10153,7 +10174,7 @@ class BatchEdit {
             childs = findChildrenRecords(data);
             uid = this.parent.getSelectedRows()[0].getAttribute('data-uid');
         }
-        const parentRowIndex = parseInt(this.parent.grid.getRowElementByUID(uid).getAttribute('aria-rowindex'), 10);
+        const parentRowIndex = parseInt(this.parent.grid.getRowElementByUID(uid).getAttribute('data-rowindex'), 10);
         if (childs.length) {
             const totalCount = parentRowIndex + childs.length;
             const firstChildIndex = parentRowIndex + 1;
@@ -10190,7 +10211,7 @@ class BatchEdit {
     updateRowIndex() {
         const rows = this.parent.grid.getDataRows();
         for (let i = 0; i < rows.length; i++) {
-            rows[i].setAttribute('aria-rowindex', i.toString());
+            rows[i].setAttribute('data-rowindex', i.toString());
         }
         const freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
             this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
@@ -10198,9 +10219,9 @@ class BatchEdit {
             const mRows = this.parent.grid.getMovableDataRows();
             const freezeRightRows = this.parent.grid.getFrozenRightDataRows();
             for (let 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());
                 }
             }
         }
@@ -10260,7 +10281,9 @@ class BatchEdit {
         if (!isNullOrUndefined(this.batchAddedRecords)) {
             for (let i = 0; i < this.batchAddedRecords.length; i++) {
                 index = data.map((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((e) => { return e[primaryKey]; })
                         .indexOf(this.batchAddedRecords[i][parentItem] ? this.batchAddedRecords[i][parentItem][primaryKey]
@@ -10326,9 +10349,12 @@ class BatchEdit {
             }
             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'])) {
-                    const index = parseInt(this.parent.getContentTable().getElementsByClassName('e-insertedrow')[0].getAttribute('aria-rowindex'), 10);
-                    data.splice(index, 0, addRecords[0]);
+                if (this.parent.editModule['isAddedRowByMethod'] && addRecords.length && !isNullOrUndefined(this.parent.editModule['addRowIndex']) && !this.parent.editModule['isAddedRowByContextMenu']) {
+                    addRecords.reverse();
+                    for (let i = 0; i < addRecords.length; i++) {
+                        const index = parseInt(this.parent.getContentTable().getElementsByClassName('e-insertedrow')[i].getAttribute('data-rowindex'), 10);
+                        data.splice(index, 0, addRecords[i]);
+                    }
                 }
                 if (!this.parent.allowPaging && data.length !== currentViewRecords.length) {
                     if (currentViewRecords.length > addRecords.length) {
@@ -10348,6 +10374,9 @@ class BatchEdit {
             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++) {
                 const taskData = extend({}, addRecords[i]);
                 delete taskData.parentItem;
@@ -10360,6 +10389,11 @@ class BatchEdit {
                 if (!isNullOrUndefined(taskData.primaryParent)) {
                     delete taskData.primaryParent;
                 }
+                if (addRecords.length > 1 && this.parent.editModule['isAddedRowByContextMenu']) {
+                    const 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)) {
@@ -10408,6 +10442,9 @@ class BatchEdit {
             }
         }
         this.batchAddRowRecord = this.batchAddedRecords = this.batchRecords = this.batchDeletedRecords = this.currentViewRecords = [];
+        if (this.parent.editModule['isAddedRowByContextMenu']) {
+            this.parent.editModule['isAddedRowByContextMenu'] = false;
+        }
     }
     getActualRowObjectIndex(index) {
         const rows = this.parent.grid.getDataRows();
@@ -10476,6 +10513,7 @@ class Edit$1 {
         this.deletedRecords = 'deletedRecords';
         this.prevAriaRowIndex = '-1';
         this.isAddedRowByMethod = false;
+        this.isAddedRowByContextMenu = false;
         Grid.Inject(Edit);
         this.parent = parent;
         this.isSelfReference = !isNullOrUndefined(parent.parentIdMapping);
@@ -10526,7 +10564,7 @@ class Edit$1 {
     getRowPosition(addArgs) {
         addArgs.newRowPosition = this.parent.editSettings.newRowPosition;
         addArgs.addRowIndex = this.addRowIndex;
-        addArgs.ariaRowIndex = +this.prevAriaRowIndex;
+        addArgs.dataRowIndex = +this.prevAriaRowIndex;
     }
     beforeStartEdit(args) {
         this.parent.trigger(actionBegin, args);
@@ -10681,7 +10719,7 @@ class Edit$1 {
         if (!(this.parent.grid.editSettings.allowEditing) || this.parent.grid.isEdit) {
             return;
         }
-        const column = this.parent.grid.getColumnByIndex(+target.closest('td.e-rowcell').getAttribute('aria-colindex'));
+        const 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) {
@@ -10689,8 +10727,8 @@ class Edit$1 {
             this.parent.grid.setProperties({ selectedRowIndex: args.rowIndex }, true);
             if (this.parent.enableVirtualization) {
                 const 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');
         }
@@ -10729,7 +10767,7 @@ class Edit$1 {
         const 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') {
@@ -10984,9 +11022,11 @@ class Edit$1 {
                 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;
+            }
         }
     }
     updateIndex(data, rows, records) {
@@ -11062,8 +11102,8 @@ class Edit$1 {
             }
         }
         const rows = this.parent.grid.getDataRows();
-        const firstAriaIndex = rows.length ? +rows[0].getAttribute('aria-rowindex') : 0;
-        const lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('aria-rowindex') : 0;
+        const firstAriaIndex = rows.length ? +rows[0].getAttribute('data-rowindex') : 0;
+        const lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('data-rowindex') : 0;
         const withinRange = this.selectedIndex >= firstAriaIndex && this.selectedIndex <= lastAriaIndex;
         const isVirtualization = this.parent.enableVirtualization && this.addRowIndex > -1 && this.prevAriaRowIndex !== '-1';
         if (this.parent.editSettings.mode !== 'Dialog') {
@@ -11133,20 +11173,27 @@ class Edit$1 {
                 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']) {
-                const 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']);
+            const batchAddedRecords = this.parent.getBatchChanges()['addedRecords'];
+            let newlyAddedRecord;
+            if (batchAddedRecords.length) {
+                for (let i = 0; i < batchAddedRecords.length; i++) {
+                    if (isNullOrUndefined(batchAddedRecords[i].uniqueID)) {
+                        newlyAddedRecord = batchAddedRecords[i];
+                    }
+                }
             }
+            const 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 {
@@ -11209,7 +11256,7 @@ class Edit$1 {
                 this.selectedIndex = this.parent.grid.selectedRowIndex;
             }
             if (this.parent.enableVirtualization) {
-                let selector = '.e-row[aria-rowindex="' + this.selectedIndex + '"]';
+                let selector = '.e-row[data-rowindex="' + this.selectedIndex + '"]';
                 let row;
                 if (this.selectedIndex > -1 && this.parent.editSettings.newRowPosition !== 'Top' &&
                     this.parent.editSettings.newRowPosition !== 'Bottom') {
@@ -11219,7 +11266,7 @@ class Edit$1 {
                 }
                 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;
                     }
@@ -11230,14 +11277,19 @@ class Edit$1 {
             }
             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];
@@ -11273,10 +11325,16 @@ class Edit$1 {
             const key = this.parent.grid.getPrimaryKeyFieldNames()[0];
             let position = null;
             value.taskData = isNullOrUndefined(value.taskData) ? extend({}, args.data) : value.taskData;
-            const currentData = this.parent.grid.getCurrentViewRecords();
+            let currentData;
+            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);
             }
             let index = this.addRowIndex;
             value.uniqueID = getUid(this.parent.element.id + '_data_');
@@ -11289,7 +11347,7 @@ class Edit$1 {
             const isVirtualization = this.parent.enableVirtualization && this.addRowIndex > -1 && this.prevAriaRowIndex !== '-1';
             const rows = this.parent.getRows();
             const firstAriaIndex = rows.length ? currentData.indexOf(currentData[0]) : 0;
-            const lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('aria-rowindex') : 0;
+            const lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('data-rowindex') : 0;
             const withinRange = this.selectedIndex >= firstAriaIndex && this.selectedIndex <= lastAriaIndex;
             if (currentData.length) {
                 idMapping = currentData[this.addRowIndex][this.parent.idMapping];
@@ -11636,7 +11694,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
         return new TreeVirtualRowModelGenerator(this.parent);
     }
     getRowByIndex(index) {
-        return this.parent.getDataRows().filter((e) => parseInt(e.getAttribute('aria-rowindex'), 10) === index)[0];
+        return this.parent.getDataRows().filter((e) => parseInt(e.getAttribute('data-rowindex'), 10) === index)[0];
     }
     addEventListener() {
         this.parent.on(virtualActionArgs, this.virtualOtherAction, this);
@@ -11720,7 +11778,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                     getValue('virtualEle', this).setVirtualHeight(this.parent.getRowHeight() * e.count, '100%');
                 }
             }
-            if ((!isNullOrUndefined(e.requestType) && e.requestType.toString() === 'collapseAll') || (this.isDataSourceChanged && this.startIndex === -1)) {
+            if ((!isNullOrUndefined(e.requestType) && e.requestType.toString() === 'collapseAll') || (this.isDataSourceChanged && (this.startIndex === -1 || this.startIndex === 0 && this['preStartIndex'] === 0))) {
                 this.contents.scrollTop = 0;
                 this.isDataSourceChanged = false;
             }
@@ -11814,7 +11872,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
         return new Cell(opt);
     }
     beginEdit(e) {
-        const selector = '.e-row[aria-rowindex="' + e.index + '"]';
+        const selector = '.e-row[data-rowindex="' + e.index + '"]';
         const index = this.parent.getContent().querySelector(selector).rowIndex;
         const rowData = this.parent.getCurrentViewRecords()[index];
         e.data = rowData;
@@ -11822,14 +11880,14 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
     beginAdd(args) {
         const addAction = 'addActionBegin';
         const isAdd = 'isAdd';
-        const addArgs = { newRowPosition: this.rowPosition, addRowIndex: this.addRowIndex, ariaRowIndex: this.ariaRowIndex };
+        const 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;
         const rows = this.parent.getRows();
-        const firstAriaIndex = rows.length ? +rows[0].getAttribute('aria-rowindex') : 0;
-        const lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('aria-rowindex') : 0;
+        const firstAriaIndex = rows.length ? +rows[0].getAttribute('data-rowindex') : 0;
+        const lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('data-rowindex') : 0;
         const withInRange = this.parent.selectedRowIndex >= firstAriaIndex && this.parent.selectedRowIndex <= lastAriaIndex;
         if (!(this.rowPosition === 'Top' || this.rowPosition === 'Bottom')) {
             this[isAdd] = true;
@@ -11880,11 +11938,11 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
     }
     onActionComplete(args) {
         if (args.requestType === 'add') {
-            const addArgs = { newRowPosition: this.rowPosition, addRowIndex: this.addRowIndex, ariaRowIndex: this.ariaRowIndex };
+            const 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;
         }
         const actionComplete$$1 = 'actionComplete';
         super[actionComplete$$1](args);
@@ -11946,7 +12004,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
                 !isNullOrUndefined(this.parent.getContent().querySelectorAll('.e-content tr')[rowPt])) {
                 const 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) {
@@ -12045,7 +12103,7 @@ class VirtualTreeContentRenderer extends VirtualContentRenderer {
             const 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) {
@@ -12618,6 +12676,9 @@ class InfiniteScroll$1 {
         });
         const actionArgs = getValue('actionArgs', pageingDetails.actionArgs);
         const actions = getValue('actions', this.parent.grid.infiniteScrollModule);
+        if (this.parent.grid.infiniteScrollModule['isInitialRender'] && !this.parent.initialRender) {
+            this.parent.grid.pageSettings.currentPage = 1;
+        }
         const initial = actions.some((value) => { return value === actionArgs.requestType; });
         const initialRender = initial ? true : this.parent.initialRender ? true : false;
         this.visualData = visualData;
@@ -12632,8 +12693,8 @@ class InfiniteScroll$1 {
                 this.parent.infiniteScrollSettings.initialBlocks = this.parent.infiniteScrollSettings.maxBlocks;
             }
             let 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;
             let current = this.parent.grid.pageSettings.currentPage;
             if (!isNullOrUndefined(actionArgs)) {
                 const lastIndex = getValue('lastIndex', this.parent.grid.infiniteScrollModule);
@@ -12651,7 +12712,7 @@ class InfiniteScroll$1 {
                 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);
                 }
@@ -12818,5 +12879,5 @@ class InfiniteScroll$1 {
  * 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.es2015.js.map