DataGrid - A new row is added above the existing row if the data source is empty or contains only one record and newRowPosition is set to "pageBottom" (T1287287) (DevExpress#29810)

Author: tongsonbarbs

e2e/testcafe-devextreme/tests/dataGrid/common/editing.ts

@@ -2736,3 +2736,34 @@ test('Focus behavior should be correct when editing cells', async (t) => {
     mode: 'batch',
   },
 }));
+
+test('DataGrid - A new row is added above the existing row if the data source is empty or contains only one record and newRowPosition is set to "pageBottom" (T1287287)', async (t) => {
+  const dataGrid = new DataGrid('#container');
+  const addRowButton = dataGrid.getHeaderPanel().getAddRowButton();
+  const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
+
+  await t
+    .click(addRowButton)
+    .click(addRowButton);
+
+  await t
+    .expect(dataGrid.getDataRow(1).isInserted)
+    .ok()
+    .expect(await takeScreenshot('newRowPosition-pageBottom-add-row-to-bottom.png', dataGrid.element))
+    .ok()
+    .expect(compareResults.isValid())
+    .ok(compareResults.errorMessages());
+}).before(async () => createWidget('dxDataGrid', {
+  dataSource: [],
+  keyExpr: 'ID',
+  editing: {
+    mode: 'batch',
+    allowAdding: true,
+    newRowPosition: 'pageBottom',
+  },
+  columns: [
+    {
+      dataField: 'A',
+    },
+  ],
+}));

e2e/testcafe-devextreme/tests/dataGrid/common/etalons/newRowPosition-pageBottom-add-row-to-bottom.png

@@ -928,11 +928,13 @@ class EditingControllerImpl extends modules.ViewController {
       case LAST_NEW_ROW_POSITION:
         break;
       case PAGE_TOP_NEW_ROW_POSITION:
+        if (allItems.length) {
+          change.insertBeforeKey = allItems[0].key;
+        }
+        break;
       case PAGE_BOTTOM_NEW_ROW_POSITION:
         if (allItems.length) {
-          const itemIndex = newRowPosition === PAGE_TOP_NEW_ROW_POSITION ? 0 : allItems.length - 1;
-
-          change[itemIndex === 0 ? 'insertBeforeKey' : 'insertAfterKey'] = allItems[itemIndex].key;
+          change.insertAfterKey = allItems[allItems.length - 1].key;
         }
         break;
       default: {