DataGrid: Fix cell focus after column reordering when previously the data cell was focused (DevExpress#29941)

Co-authored-by: Alyar <>

Author: Alyar666

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

@@ -258,6 +258,36 @@ safeSizeTest('The context menu should not have items for column reordering when
   });
 });
 
+test('The cell focus should be correct after column reordering when previously the data cell was focused', async (t) => {
+  const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
+  const dataGrid = new DataGrid(DATA_GRID_SELECTOR);
+  const firstDataCell = dataGrid.getDataCell(0, 0);
+
+  await t
+    .click(firstDataCell.element)
+    .pressKey('shift+tab')
+    .pressKey('ctrl+left');
+
+  await takeScreenshot(
+    'cell_focus_after_column_reordering_when_data_cell_was_focused.png',
+    dataGrid.element,
+  );
+
+  await t
+    .expect(compareResults.isValid())
+    .ok(compareResults.errorMessages());
+}).before(async () => {
+  await createWidget('dxDataGrid', {
+    allowColumnReordering: true,
+    dataSource: [{
+      field1: 'test1',
+      field2: 'test2',
+      field3: 'test3',
+      field4: 'test4',
+    }],
+  });
+});
+
 // Fixed columns
 test('reorder fixed left column to right', async (t) => {
   const { takeScreenshot, compareResults } = createScreenshotsComparer(t);

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

@@ -232,8 +232,16 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo
     }
   }
 
-  protected focusOutHandler(): void {
+  protected focusOutHandler(e): void {
+    const { relatedTarget } = e;
+
     this._toggleInertAttr(false);
+
+    if (relatedTarget && !this.isInsideFocusedView($(relatedTarget))) {
+      this._isNeedFocus = false;
+      this._isHiddenFocus = false;
+      this._isNeedScroll = false;
+    }
   }
 
   protected subscribeToRowsViewFocusEvent(): void {
@@ -1459,10 +1467,8 @@ export class KeyboardNavigationController extends KeyboardNavigationControllerCo
     }
   }
 
-  private _getFocusedViewByElement($element) {
-    const $view = $(this._focusedView?.element());
-
-    return $element?.closest($view).length !== 0;
+  private isInsideFocusedView($element: dxElementWrapper): boolean {
+    return $element.closest(this._focusedView?.element()).length !== 0;
   }
 
   private _focusView() {

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

@@ -28,8 +28,8 @@ export const keyboardNavigationScrollableA11yExtender = (Base: ModuleType<Keyboa
     super.focusinHandler(event);
   }
 
-  protected focusOutHandler(): void {
-    super.focusOutHandler();
+  protected focusOutHandler(e): void {
+    super.focusOutHandler(e);
     this.makeScrollableFocusableIfNeed();
   }