@syncfusion/ej2-treegrid 20.1.55 → 20.1.56-97113

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);
@@ -140,13 +141,13 @@ var Edit = /** @class */ (function () {
                 var rowIndex = isNullOrUndefined(eventArgs.row) || !Object.keys(eventArgs.row).length ? this.selectedIndex :
                     eventArgs.row.rowIndex - 1;
                 var keyData = (!isNullOrUndefined(rowIndex) && rowIndex !== -1) ?
-                    treeObj.getCurrentViewRecords()[rowIndex][treeObj.getPrimaryKeyFieldNames()[0]] : -1;
+                    treeObj.getCurrentViewRecords()[parseInt(rowIndex.toString(), 10)][treeObj.getPrimaryKeyFieldNames()[0]] : -1;
                 treeObj.grid.query.addParams('relationalKey', keyData);
             }
             else if (eventName === 'actionComplete') {
                 var paramsLength = treeObj.grid.query.params.length;
                 for (var i = 0; i < paramsLength; i++) {
-                    if (treeObj.grid.query.params[i].key === 'relationalKey') {
+                    if (treeObj.grid.query.params[parseInt(i.toString(), 10)].key === 'relationalKey') {
                         treeObj.grid.query.params.splice(i);
                     }
                 }
@@ -196,9 +197,9 @@ var Edit = /** @class */ (function () {
         var size = Math.ceil(newRowIndex / this.parent.grid.pageSettings.pageSize);
         var page = size > 0 ? size : 1;
         var dataIndex = newRowIndex - ((page - 1) * this.parent.pageSettings.pageSize);
-        var infiniteCurrentViewData = this.parent.grid.infiniteScrollModule[infiniteData];
+        var infiniteCurrentViewData = this.parent.grid.infiniteScrollModule["" + infiniteData];
         infiniteCurrentViewData[1].splice(0, 1);
-        var data = infiniteCurrentViewData[page];
+        var data = infiniteCurrentViewData[parseInt(page.toString(), 10)];
         if (!isNullOrUndefined(this.addRowRecord)) {
             data.filter(function (e, index) {
                 if (e.uniqueID === _this.addRowRecord.uniqueID) {
@@ -212,12 +213,12 @@ var Edit = /** @class */ (function () {
         }
         if (dataIndex >= this.parent.pageSettings.pageSize) {
             page += 1;
-            data = infiniteCurrentViewData[page];
+            data = infiniteCurrentViewData[parseInt(page.toString(), 10)];
             dataIndex = dataIndex - this.parent.pageSettings.pageSize >= 0 ? dataIndex - this.parent.pageSettings.pageSize : 0;
         }
         dataIndex = this.parent.editSettings.newRowPosition === 'Below' ? dataIndex + 1 : dataIndex;
         data.splice(dataIndex, 0, newRecord);
-        this.parent.grid.infiniteScrollModule[updateCurrentViewData]();
+        this.parent.grid.infiniteScrollModule["" + updateCurrentViewData]();
     };
     Edit.prototype.recordDoubleClick = function (args) {
         var target = args.target;
@@ -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,11 +236,15 @@ 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');
         }
+        else if (this.parent.editSettings.mode === 'Cell' && (!column.allowEditing || column.isPrimaryKey)) {
+            this.isOnBatch = true;
+            this.updateGridEditMode('Batch');
+        }
     };
     Edit.prototype.updateGridEditMode = function (mode) {
         this.parent.grid.setProperties({ editSettings: { mode: mode } }, true);
@@ -266,17 +271,17 @@ var Edit = /** @class */ (function () {
     };
     Edit.prototype.deleteUniqueID = function (value) {
         var idFilter = 'uniqueIDFilterCollection';
-        delete this.parent[idFilter][value];
+        delete this.parent["" + idFilter]["" + value];
         var id = 'uniqueIDCollection';
-        delete this.parent[id][value];
+        delete this.parent["" + id]["" + value];
     };
     Edit.prototype.cellEdit = function (args) {
         var _this = this;
         var promise = 'promise';
-        var prom = args[promise];
-        delete args[promise];
+        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') {
@@ -312,6 +317,9 @@ var Edit = /** @class */ (function () {
                 args.cancel = true;
             }
         }
+        if (this.parent.enableVirtualization) {
+            this.parent.grid.contentModule['editedRowIndex'] = this.parent.grid.editModule.editModule['index'];
+        }
         // if (this.isAdd && this.parent.editSettings.mode === 'Batch' && !args.cell.parentElement.classList.contains('e-insertedrow')) {
         //   this.isAdd = false;
         // }
@@ -355,7 +363,7 @@ var Edit = /** @class */ (function () {
             args.rowData[args.columnName] = args.value;
             var row_1;
             if (isNullOrUndefined(args.cell)) {
-                row_1 = this.parent.grid.editModule[editModule].form.parentElement.parentNode;
+                row_1 = this.parent.grid.editModule["" + editModule].form.parentElement.parentNode;
             }
             else {
                 row_1 = args.cell.parentNode;
@@ -406,7 +414,7 @@ var Edit = /** @class */ (function () {
                         var editArgs = { requestType: 'save', data: args.rowData, action: 'edit', row: row_1,
                             rowIndex: rowIndex_1, rowData: args.rowData, columnName: args.columnName,
                             filterChoiceCount: null, excelSearchOperator: null };
-                        this.parent.grid.getDataModule()[eventPromise](editArgs, this.parent.grid.query);
+                        this.parent.grid.getDataModule()["" + eventPromise](editArgs, this.parent.grid.query);
                     }
                     else {
                         this.updateCell(args, rowIndex_1);
@@ -431,6 +439,9 @@ var Edit = /** @class */ (function () {
                 this.parent.grid.isEdit = true;
             }
         }
+        if (this.parent.enableVirtualization) {
+            this.parent.grid.contentModule['virtualData'] = {};
+        }
     };
     Edit.prototype.afterCellSave = function (args, row, rowIndex) {
         var mRow;
@@ -448,23 +459,23 @@ var Edit = /** @class */ (function () {
             this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
         if (freeze) {
             if (args.cell.closest('.e-frozen-left-header') || args.cell.closest('.e-frozen-left-content')) {
-                mRow = this.parent.grid.getRows()[rowIndex];
+                mRow = this.parent.grid.getRows()[parseInt(rowIndex.toString(), 10)];
             }
             else if (args.cell.closest('.e-movableheader') || args.cell.closest('.e-movablecontent')) {
-                mRow = this.parent.grid.getMovableRows()[rowIndex];
+                mRow = this.parent.grid.getMovableRows()[parseInt(rowIndex.toString(), 10)];
             }
             else {
-                mRow = this.parent.grid.getFrozenRightRows()[rowIndex];
+                mRow = this.parent.grid.getFrozenRightRows()[parseInt(rowIndex.toString(), 10)];
             }
             removeClass([mRow], ['e-editedrow', 'e-batchrow']);
             removeClass(mRow.querySelectorAll('.e-rowcell'), ['e-editedbatchcell', 'e-updatedtd']);
         }
         else if (this.parent.getFrozenColumns() > 0) {
             if (args.cell.closest('.e-frozenheader') || args.cell.closest('.e-frozencontent')) {
-                mRow = this.parent.grid.getRows()[rowIndex];
+                mRow = this.parent.grid.getRows()[parseInt(rowIndex.toString(), 10)];
             }
             else {
-                mRow = this.parent.grid.getMovableRows()[rowIndex];
+                mRow = this.parent.grid.getMovableRows()[parseInt(rowIndex.toString(), 10)];
             }
             removeClass([mRow], ['e-editedrow', 'e-batchrow']);
             removeClass(mRow.querySelectorAll('.e-rowcell'), ['e-editedbatchcell', 'e-updatedtd']);
@@ -501,7 +512,7 @@ var Edit = /** @class */ (function () {
     };
     Edit.prototype.updateCell = function (args, rowIndex) {
         this.parent.grid.editModule.updateCell(rowIndex, args.columnName, args.rowData[args.columnName]);
-        this.parent.grid.getRowsObject()[rowIndex].data = args.rowData;
+        this.parent.grid.getRowsObject()[parseInt(rowIndex.toString(), 10)].data = args.rowData;
     };
     Edit.prototype.crudAction = function (details, columnName) {
         editAction(details, this.parent, this.isSelfReference, this.addRowIndex, this.selectedIndex, columnName, this.addRowRecord);
@@ -509,42 +520,46 @@ var Edit = /** @class */ (function () {
         var data = this.parent.grid.dataSource instanceof DataManager ?
             this.parent.grid.dataSource.dataSource.json : this.parent.grid.dataSource;
         for (var i = 0; i < data.length; i++) {
-            data[i].index = i;
+            data[parseInt(i.toString(), 10)].index = i;
             var key = this.parent.grid.getPrimaryKeyFieldNames()[0];
-            if (details.value[key] === data[i][key]) {
+            if (details.value["" + key] === data[parseInt(i.toString(), 10)]["" + key]) {
                 if (details.action === 'add') {
-                    data[i].level = this.internalProperties.level;
-                    data[i].taskData = this.internalProperties.taskData;
-                    data[i].uniqueID = this.internalProperties.uniqueID;
+                    data[parseInt(i.toString(), 10)].level = this.internalProperties.level;
+                    data[parseInt(i.toString(), 10)].taskData = this.internalProperties.taskData;
+                    data[parseInt(i.toString(), 10)].uniqueID = this.internalProperties.uniqueID;
                     if (!isNullOrUndefined(this.internalProperties.parentItem)) {
-                        data[i].parentItem = this.internalProperties.parentItem;
-                        data[i].parentUniqueID = this.internalProperties.parentUniqueID;
+                        data[parseInt(i.toString(), 10)].parentItem = this.internalProperties.parentItem;
+                        data[parseInt(i.toString(), 10)].parentUniqueID = this.internalProperties.parentUniqueID;
                     }
-                    data[i].childRecords = this.internalProperties.childRecords;
+                    data[parseInt(i.toString(), 10)].childRecords = this.internalProperties.childRecords;
                 }
             }
-            setValue('uniqueIDCollection.' + data[i].uniqueID + '.index', i, this.parent);
+            setValue('uniqueIDCollection.' + data[parseInt(i.toString(), 10)].uniqueID + '.index', i, this.parent);
             var adaptor = this.parent.dataSource.adaptor;
             if ((isRemoteData(this.parent) || adaptor instanceof RemoteSaveAdaptor)) {
-                setValue('uniqueIDCollection.' + data[i].uniqueID, data[i], this.parent);
+                setValue('uniqueIDCollection.' + data[parseInt(i.toString(), 10)].uniqueID, data[parseInt(i.toString(), 10)], this.parent);
             }
-            if (!data[i].level) {
-                this.parent.parentData.push(data[i]);
+            if (!data[parseInt(i.toString(), 10)].level) {
+                this.parent.parentData.push(data[parseInt(i.toString(), 10)]);
             }
         }
-        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) {
         for (var j = 0; j < this.parent.getDataRows().length; j++) {
-            var data1 = records[j];
-            var index = getValue('uniqueIDCollection.' + data1.uniqueID + '.index', this.parent);
-            data1.index = index;
-            if (!isNullOrUndefined(data1.parentItem)) {
-                var parentIndex = getValue('uniqueIDCollection.' + data1.parentItem.uniqueID + '.index', this.parent);
-                data1.parentItem.index = parentIndex;
+            var data1 = records[parseInt(j.toString(), 10)];
+            if (!isNullOrUndefined(data1)) {
+                var index = getValue('uniqueIDCollection.' + data1.uniqueID + '.index', this.parent);
+                data1.index = index;
+                if (!isNullOrUndefined(data1.parentItem)) {
+                    var parentIndex = getValue('uniqueIDCollection.' + data1.parentItem.uniqueID + '.index', this.parent);
+                    data1.parentItem.index = parentIndex;
+                }
             }
         }
         var count = -1;
@@ -552,43 +567,45 @@ var Edit = /** @class */ (function () {
         if (this.parent.getFrozenColumns() > 0) {
             var cells = rows[0].querySelectorAll('.e-rowcell');
             for (var l = 0; l < cells.length; l++) {
-                if (cells[l].classList.contains('e-gridrowindex0level0')) {
+                if (cells[parseInt(l.toString(), 10)].classList.contains('e-gridrowindex0level0')) {
                     treeColIndex = l;
                     break;
                 }
             }
         }
         for (var k = 0; k < this.parent.getRows().length; k++) {
-            if (!rows[k].classList.contains('e-detailrow')) {
+            if (!rows[parseInt(k.toString(), 10)].classList.contains('e-detailrow')) {
                 count++;
             }
-            var data2 = records[count];
-            var index = data2.index;
-            var level = data2.level;
-            var row = rows[k];
-            if (!isNullOrUndefined(data2.parentItem)) {
-                index = getValue('uniqueIDCollection.' + data2.parentItem.uniqueID + '.index', this.parent);
-            }
-            var treecell = row.cells[treeColIndex];
-            if (!isNullOrUndefined(treecell)) {
-                for (var l = 0; l < treecell.classList.length; l++) {
-                    var value = treecell.classList[l];
-                    var remove = /e-gridrowindex/i;
-                    var removed = /e-griddetailrowindex/i;
-                    var result = value.match(remove);
-                    var results = value.match(removed);
-                    if (result != null) {
-                        removeClass([treecell], value);
+            var data2 = records[parseInt(count.toString(), 10)];
+            if (!isNullOrUndefined(data2)) {
+                var index = data2.index;
+                var level = data2.level;
+                var row = rows[parseInt(k.toString(), 10)];
+                if (!isNullOrUndefined(data2.parentItem)) {
+                    index = getValue('uniqueIDCollection.' + data2.parentItem.uniqueID + '.index', this.parent);
+                }
+                var treecell = row.cells[parseInt(treeColIndex.toString(), 10)];
+                if (!isNullOrUndefined(treecell)) {
+                    for (var l = 0; l < treecell.classList.length; l++) {
+                        var value = treecell.classList[parseInt(l.toString(), 10)];
+                        var remove = /e-gridrowindex/i;
+                        var removed = /e-griddetailrowindex/i;
+                        var result = value.match(remove);
+                        var results = value.match(removed);
+                        if (result != null) {
+                            removeClass([treecell], value);
+                        }
+                        if (results != null) {
+                            removeClass([treecell], value);
+                        }
                     }
-                    if (results != null) {
-                        removeClass([treecell], value);
+                    if (!rows[parseInt(k.toString(), 10)].classList.contains('e-detailrow')) {
+                        addClass([treecell], 'e-gridrowindex' + index + 'level' + level);
+                    }
+                    else {
+                        addClass([treecell], 'e-griddetailrowindex' + index + 'level' + level);
                     }
-                }
-                if (!rows[k].classList.contains('e-detailrow')) {
-                    addClass([treecell], 'e-gridrowindex' + index + 'level' + level);
-                }
-                else {
-                    addClass([treecell], 'e-griddetailrowindex' + index + 'level' + level);
                 }
             }
         }
@@ -606,8 +623,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') {
@@ -617,17 +634,18 @@ var Edit = /** @class */ (function () {
             else if ((this.parent.editSettings.newRowPosition === 'Below' || this.parent.editSettings.newRowPosition === 'Child')
                 && (this.selectedIndex > -1 || isVirtualization) && withinRange) {
                 position = 'after';
-                if (!isNullOrUndefined(records[index]) && records[index].expanded) {
+                if (!isNullOrUndefined(records[parseInt(index.toString(), 10)]) &&
+                    records[parseInt(index.toString(), 10)].expanded) {
                     if (this.parent.editSettings.mode === 'Batch' && (this.parent.getBatchChanges()[this.addedRecords].length > 1
                         || this.parent.getBatchChanges()[this.deletedRecords].length)) {
-                        index += findChildrenRecords(records[index]).length;
+                        index += findChildrenRecords(records[parseInt(index.toString(), 10)]).length;
                         if (this.parent.editSettings.newRowPosition !== 'Child') {
                             var batchChildCount = this.batchEditModule.getBatchChildCount();
                             index = index + batchChildCount;
                         }
                     }
                     else {
-                        index += findChildrenRecords(records[index]).length;
+                        index += findChildrenRecords(records[parseInt(index.toString(), 10)]).length;
                     }
                 }
             }
@@ -638,14 +656,14 @@ var Edit = /** @class */ (function () {
                     index = rows.length - 2;
                 }
                 var r = 'rows';
-                var newRowObject = this.parent.grid.contentModule[r][0];
+                var newRowObject = this.parent.grid.contentModule["" + r][0];
                 var focussedElement = document.activeElement;
-                rows[index + 1][position](rows[0]);
+                rows[index + 1]["" + position](rows[0]);
                 setValue('batchIndex', index + 1, this.batchEditModule);
                 var rowObjectIndex = this.parent.editSettings.newRowPosition === 'Above' ? index : index + 1;
                 if (this.parent.editSettings.mode === 'Batch') {
-                    this.parent.grid.contentModule[r].splice(0, 1);
-                    this.parent.grid.contentModule[r].splice(rowObjectIndex, 0, newRowObject);
+                    this.parent.grid.contentModule["" + r].splice(0, 1);
+                    this.parent.grid.contentModule["" + r].splice(rowObjectIndex, 0, newRowObject);
                 }
                 var freeze = (this.parent.getFrozenLeftColumnsCount() > 0 ||
                     this.parent.getFrozenRightColumnsCount() > 0) ? true : false;
@@ -653,44 +671,56 @@ var Edit = /** @class */ (function () {
                     var movableRows = this.parent.getMovableDataRows();
                     var frows = 'freezeRows';
                     var newFreezeRowObject = this.parent.grid.getRowsObject()[0];
-                    movableRows[index + 1][position](movableRows[0]);
+                    movableRows[index + 1]["" + position](movableRows[0]);
                     if (freeze) {
                         var rightFrozenRows = this.parent.getFrozenRightDataRows();
-                        rightFrozenRows[index + 1][position](rightFrozenRows[0]);
+                        rightFrozenRows[index + 1]["" + position](rightFrozenRows[0]);
                     }
                     if (this.parent.editSettings.mode === 'Batch') {
-                        this.parent.grid.contentModule[frows].splice(0, 1);
-                        this.parent.grid.contentModule[frows].splice(rowObjectIndex, 0, newFreezeRowObject);
+                        this.parent.grid.contentModule["" + frows].splice(0, 1);
+                        this.parent.grid.contentModule["" + frows].splice(rowObjectIndex, 0, newFreezeRowObject);
                     }
                     setValue('batchIndex', index + 1, this.batchEditModule);
                 }
                 if (this.parent.editSettings.mode === 'Row' || this.parent.editSettings.mode === 'Cell') {
                     var errors = this.parent.grid.getContentTable().querySelectorAll('.e-griderror');
                     for (var i = 0; i < errors.length; i++) {
-                        errors[i].remove();
+                        errors[parseInt(i.toString(), 10)].remove();
                     }
                     setValue('errorRules', [], this.parent.grid.editModule.formObj);
                 }
                 if (isVirtualization) {
                     this.prevAriaRowIndex = '-1';
                 }
-                focussedElement.focus();
+                if (!this.parent.enableVirtualization || this.parent.enableVirtualization && !Object.keys(this.parent.grid.contentModule['emptyRowData']).length) {
+                    focussedElement.focus();
+                }
+                if (this.parent.enableVirtualization && !Object.keys(this.parent.grid.contentModule['emptyRowData']).length) {
+                    this.parent.grid.contentModule['createEmptyRowdata']();
+                }
             }
         }
-        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[parseInt(i.toString(), 10)].uniqueID)) {
+                        newlyAddedRecord = batchAddedRecords[parseInt(i.toString(), 10)];
+                    }
+                }
             }
+            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 {
@@ -732,8 +762,8 @@ var Edit = /** @class */ (function () {
                 var primaryKeys_2 = this.parent.getPrimaryKeyFieldNames();
                 var _loop_1 = function (i) {
                     this_1.parent.flatData.filter(function (e) {
-                        if (e[primaryKeys_2[0]] === args.data[i][primaryKeys_2[0]]) {
-                            data_1[i] = e;
+                        if (e["" + primaryKeys_2[0]] === args.data[parseInt(i.toString(), 10)][primaryKeys_2[0]]) {
+                            data_1[parseInt(i.toString(), 10)] = e;
                         }
                     });
                 };
@@ -743,10 +773,10 @@ var Edit = /** @class */ (function () {
                 }
             }
             for (var i = 0; i < data_1.length; i++) {
-                this.deleteUniqueID(data_1[i].uniqueID);
-                var childs = findChildrenRecords(data_1[i]);
+                this.deleteUniqueID(data_1[parseInt(i.toString(), 10)].uniqueID);
+                var childs = findChildrenRecords(data_1[parseInt(i.toString(), 10)]);
                 for (var c = 0; c < childs.length; c++) {
-                    this.deleteUniqueID(childs[c].uniqueID);
+                    this.deleteUniqueID(childs[parseInt(c.toString(), 10)].uniqueID);
                 }
                 args.data = args.data.concat(childs);
             }
@@ -757,7 +787,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') {
@@ -767,7 +797,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;
                     }
@@ -778,14 +808,22 @@ 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];
+                if (this.parent.enableVirtualization && this.isAddedRowByContextMenu) {
+                    this.addRowRecord = this.parent.getCurrentViewRecords()[this.addRowIndex];
+                }
             }
             else {
                 this.addRowRecord = this.parent.getSelectedRecords()[0];
@@ -821,10 +859,19 @@ 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.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);
+                currentData = this.parent.flatData;
+            }
+            else 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.flatData.indexOf(this.addRowRecord);
+                this.selectedIndex = this.addRowIndex;
             }
             var index = this.addRowIndex;
             value.uniqueID = getUid(this.parent.element.id + '_data_');
@@ -837,8 +884,9 @@ 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 withinRange = this.selectedIndex >= firstAriaIndex && this.selectedIndex <= lastAriaIndex;
+            var lastAriaIndex = rows.length ? +rows[rows.length - 1].getAttribute('data-rowindex') : 0;
+            var withinRange = this.parent.enableVirtualization && args.index !== 0 ? true :
+                this.selectedIndex >= firstAriaIndex && this.selectedIndex <= lastAriaIndex;
             if (currentData.length) {
                 idMapping = currentData[this.addRowIndex][this.parent.idMapping];
                 parentIdMapping = currentData[this.addRowIndex][this.parent.parentIdMapping];
@@ -874,7 +922,12 @@ var Edit = /** @class */ (function () {
                     }
                     index = (childRecordCount1 > 0) ? (currentDataIndex1 + childRecordCount1) : (currentDataIndex1);
                     if (this.isSelfReference) {
-                        value.taskData[this.parent.parentIdMapping] = value[this.parent.parentIdMapping] = idMapping;
+                        if (!this.parent.isLocalData && this.parent.editModule.selectedIndex === -1) {
+                            value.taskData[this.parent.parentIdMapping] = value[this.parent.parentIdMapping] = null;
+                        }
+                        else {
+                            value.taskData[this.parent.parentIdMapping] = value[this.parent.parentIdMapping] = idMapping;
+                        }
                         if (!isNullOrUndefined(value.parentItem)) {
                             updateParentRow(key, value.parentItem, 'add', this.parent, this.isSelfReference, value);
                         }
@@ -919,10 +972,10 @@ var Edit = /** @class */ (function () {
         if (args.requestType === 'delete') {
             var deletedValues = args.data;
             for (var i = 0; i < deletedValues.length; i++) {
-                if (deletedValues[i].parentItem) {
-                    var parentItem = getParentData(this.parent, deletedValues[i].parentItem.uniqueID);
+                if (deletedValues[parseInt(i.toString(), 10)].parentItem) {
+                    var parentItem = getParentData(this.parent, deletedValues[parseInt(i.toString(), 10)].parentItem.uniqueID);
                     if (!isNullOrUndefined(parentItem) && parentItem.hasChildRecords) {
-                        var childIndex = parentItem.childRecords.indexOf(deletedValues[i]);
+                        var childIndex = parentItem.childRecords.indexOf(deletedValues[parseInt(i.toString(), 10)]);
                         parentItem.childRecords.splice(childIndex, 1);
                     }
                 }

package/src/treegrid/actions/excel-export.js

@@ -191,8 +191,8 @@ var ExcelExport = /** @class */ (function () {
     /* eslint-disable-next-line */
     ExcelExport.prototype.finalPageSetup = function (workbook) {
         for (var i = 0; i < workbook.worksheets.length; i++) {
-            if (workbook.worksheets[i].rows) {
-                workbook.worksheets[i].pageSetup = { isSummaryRowBelow: false };
+            if (workbook.worksheets[parseInt(i.toString(), 10)].rows) {
+                workbook.worksheets[parseInt(i.toString(), 10)].pageSetup = { isSummaryRowBelow: false };
             }
         }
     };