Merge branch '24_1' of https://github.com/DevExpress/DevExtreme into …

…24_1

e2e/testcafe-devextreme/tests/dataGrid/keyboardNavigation/keyboardNavigation.functional.ts

@@ -4697,3 +4697,38 @@ test('DataGrid - Data rows are skipped during Tab navigation if the first column
   showBorders: true,
   width: 300,
 }));
+
+test('DataGrid input cell should not put tabindex to incorrect element while on edit mode (T1239462)', async (t) => {
+  const dataGrid = new DataGrid('#container');
+  const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
+
+  await t
+    .click(dataGrid.getToolbar().getItem(0))
+    .pressKey('tab');
+  await takeScreenshot('data-grid_keyboard-navigation-input-text-focused.png', dataGrid.element);
+
+  await t.expect(compareResults.isValid())
+    .ok(compareResults.errorMessages());
+}).before(async () => {
+  await createWidget('dxDataGrid', {
+    showBorders: true,
+    selection: {
+      mode: 'multiple',
+    },
+    editing: {
+      mode: 'form',
+      allowAdding: true,
+    },
+    columns: [
+      'Calculation',
+      'CalculationType',
+      {
+        type: 'buttons',
+        fixed: true,
+      },
+    ],
+    dataSource: {
+      store: [],
+    },
+  });
+});

packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/scrollable_a11y.ts

@@ -86,8 +86,9 @@ export const keyboardNavigationScrollableA11yExtender = (Base: ModuleType<Keyboa
   private getFirstNotFixedCell(): dxElementWrapper | undefined {
     const columns = this._columnsController.getVisibleColumns();
     const columnIndex = columns.findIndex(({ fixed }) => !fixed);
+    const isEditing = this._editingController?.isEditing();
 
-    return columnIndex === -1
+    return columnIndex === -1 || isEditing
       ? undefined
       : this._rowsView._getCellElement(0, columnIndex);
   }