revise resolution

DevExpress · Dec 5, 2024 · 5617c46 · 5617c46
1 parent f70c816
commit 5617c46
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts
@@ -1536,19 +1536,6 @@ export class DataController extends DataHelperMixin(modules.Controller) {
     }
   }
 
-  public getLoadedKeyByRowIndex(rowIndex) {
-    const items = this.items();
-    while (rowIndex < items.length) {
-      const item = items[rowIndex];
-
-      if (item && !item.isNewRow) {
-        return item.key;
-      }
-      rowIndex++;
-    }
-    return undefined;
-  }
-
   public getRowIndexByKey(key, byLoaded?) {
     return gridCoreUtils.getIndexByKey(key, this.items(byLoaded));
   }

diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts
@@ -945,7 +945,7 @@ class EditingControllerImpl extends modules.ViewController {
           visibleItemIndex++;
         }
 
-        const insertKey = dataController.getLoadedKeyByRowIndex(visibleItemIndex);
+        const insertKey = dataController.getKeyByRowIndex(visibleItemIndex);
 
         if (isDefined(insertKey)) {
           change.insertBeforeKey = insertKey;
@@ -1699,6 +1699,23 @@ class EditingControllerImpl extends modules.ViewController {
         }
       } else if (this._processRemove(changes, editIndex, cancel)) {
         hasSavedData = !cancel;
+        if (!cancel && change && change.type === DATA_EDIT_DATA_INSERT_TYPE) {
+          const tmpKey = results[i].key;
+
+          const savedRows = this._dataController.items().filter((item) => !item.isNewRow);
+          const topSavedRowKey = savedRows.length ? savedRows[0].key : null;
+
+          if (topSavedRowKey) {
+            changes.forEach((unsavedChange) => {
+              if (
+                unsavedChange.type === DATA_EDIT_DATA_INSERT_TYPE
+                      && unsavedChange.insertBeforeKey === tmpKey
+              ) {
+                unsavedChange.insertBeforeKey = topSavedRowKey;
+              }
+            });
+          }
+        }
       }
     }