DataGrid: Fix quick navigation when adaptive is enabled (#30192)

Co-authored-by: Alyar <>

Author: Alyar666

e2e/testcafe-devextreme/tests/dataGrid/common/keyboardNavigation/etalons/navigate_to_first_cell_in_row_that_contains_focus_when_adaptivity_is_enabled.png

@@ -262,6 +262,69 @@ test('Navigate to first cell in the row that contains focus when virtual columns
   },
 }));
 
+test('Navigate to last cell in the row that contains focus when adaptivity is enabled', async (t) => {
+  // arrange
+  const dataGrid = new DataGrid('#container');
+  const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
+
+  // act
+  await t
+    .click(dataGrid.getDataCell(0, 0).element)
+    .pressKey('end');
+
+  await takeScreenshot('navigate_to_last_cell_in_row_that_contains_focus_when_adaptivity_is_enabled', dataGrid.element);
+
+  // assert
+  await t
+    .expect(compareResults.isValid())
+    .ok(compareResults.errorMessages());
+}).before(async () => createWidget('dxDataGrid', {
+  dataSource: getData(20, 50),
+  columnWidth: 100,
+  height: 500,
+  width: 800,
+  showBorders: true,
+  customizeColumns(columns) {
+    columns[columns.length - 1].hidingPriority = 0;
+    columns.splice(columns.length - 2, 0, { type: 'adaptive', width: 100 });
+  },
+}));
+
+test('Navigate to first cell in the row that contains focus when adaptivity is enabled', async (t) => {
+  // arrange
+  const dataGrid = new DataGrid('#container');
+  const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
+
+  await dataGrid.scrollTo(t, { x: 4200 });
+
+  // assert
+  await t
+    .expect(dataGrid.getScrollLeft())
+    .eql(4200);
+
+  // act
+  await t
+    .click(dataGrid.getDataCell(0, 50).element)
+    .pressKey('home');
+
+  await takeScreenshot('navigate_to_first_cell_in_row_that_contains_focus_when_adaptivity_is_enabled', dataGrid.element);
+
+  // assert
+  await t
+    .expect(compareResults.isValid())
+    .ok(compareResults.errorMessages());
+}).before(async () => createWidget('dxDataGrid', {
+  dataSource: getData(20, 50),
+  columnWidth: 100,
+  height: 500,
+  width: 800,
+  showBorders: true,
+  customizeColumns(columns) {
+    columns[0].hidingPriority = 0;
+    columns.push({ type: 'adaptive', width: 100 });
+  },
+}));
+
 // Quick navigation through grid rows via Ctrl+Home and Ctrl+End keys
 test('Focus the last cell in the last row when pressing the Ctrl+End key', async (t) => {
   // arrange

e2e/testcafe-devextreme/tests/dataGrid/common/keyboardNavigation/etalons/navigate_to_last_cell_in_row_that_contains_focus_when_adaptivity_is_enabled.png

@@ -851,6 +851,10 @@ const keyboardNavigation = (
     }
   }
 
+  protected isFocusableColumn(column: Column): boolean {
+    return super.isFocusableColumn(column) && column.visibleWidth !== HIDDEN_COLUMNS_WIDTH;
+  }
+
   public _isCellElement($cell) {
     return super._isCellElement($cell) || $cell.hasClass(ADAPTIVE_ITEM_TEXT_CLASS);
   }

e2e/testcafe-devextreme/tests/dataGrid/common/keyboardNavigation/keyboardNavigation.visual.ts

@@ -31,6 +31,7 @@ import type { EditingController } from '@ts/grids/grid_core/editing/m_editing';
 import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view';
 import { memoize } from '@ts/utils/memoize';
 
+import type { Column } from '../columns_controller/m_columns_controller';
 import {
   EDIT_FORM_CLASS,
   EDIT_MODE_BATCH,
@@ -1243,7 +1244,7 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo
 
   private getFirstOrLastColumnIndex(needFirstColumnIndex: boolean): number {
     const allVisibleColumns: any[] = this._columnsController.getVisibleColumns(null, true);
-    const findColumnIndex = (column): boolean => column.type !== DRAG_COLUMN_NAME;
+    const findColumnIndex = (column): boolean => this.isFocusableColumn(column);
 
     return needFirstColumnIndex
       ? allVisibleColumns.findIndex(findColumnIndex)
@@ -1326,6 +1327,10 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo
     originalEvent.preventDefault();
   }
 
+  protected isFocusableColumn(column: Column): boolean {
+    return column.type !== DRAG_COLUMN_NAME;
+  }
+
   public navigateToFirstOrLastCell(needNavigateToFirstCell: boolean, e?: KeyboardEvent): void {
     const firstOrLastColumnIndex = this.getFirstOrLastColumnIndex(needNavigateToFirstCell);