DataGrid: Editing - fix duplication of an undeleted row while creating a new row (T1293181) (#31934)

Author: dmirgaev

packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts

@@ -1346,13 +1346,17 @@ class EditingControllerImpl extends modules.ViewController {
   protected _removeChange(index) {
     if (index >= 0) {
       const changes = [...this.getChanges()];
-      const { key } = changes[index];
+      const { key, type } = changes[index];
 
       this._removeInternalData(key);
 
-      this._updateInsertAfterOrBeforeKeys(changes, index);
+      if (type !== DATA_EDIT_DATA_REMOVE_TYPE) {
+        this._updateInsertAfterOrBeforeKeys(changes, index);
+      }
+
       changes.splice(index, 1);
       this._silentOption(EDITING_CHANGES_OPTION_NAME, changes);
+
       if (equalByValue(this.option(EDITING_EDITROWKEY_OPTION_NAME), key)) {
         this._resetEditIndices();
       }

packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js

@@ -4941,6 +4941,33 @@ QUnit.module('Editing with real dataController', {
         assert.equal(this.array.length, 7, 'items count not changed');
     });
 
+    QUnit.test('Recovered row should have correct data when placed before inserted row in batch editing (T1293181)', function(assert) {
+        const testElement = $('#container');
+
+        $.extend(this.options.editing, {
+            mode: 'batch',
+            allowDeleting: true,
+            allowAdding: true,
+            newRowPosition: 'pageBottom',
+            texts: {
+                deleteRow: 'Delete',
+                undeleteRow: 'Undelete',
+            }
+        });
+
+        this.rowsView.render(testElement);
+        this.editingController.init();
+
+        this.addRow();
+        this.click(testElement.find('tbody > tr').eq(6), 'a:contains(Delete)');
+        this.click(testElement.find('tbody > tr').eq(6), '.dx-link-undelete');
+
+        const rows = this.getVisibleRows();
+
+        assert.strictEqual(rows.length, 8, 'items count is correct');
+        assert.deepEqual(rows[6].data, this.array[6], 'recovered row data is correct');
+    });
+
     QUnit.test('Remove row when set onRowRemoving', function(assert) {
         // arrange
         const that = this;