From a2192adfee0cacc11fdf7773d364270fa07a853b Mon Sep 17 00:00:00 2001
From: Alyar <Alyar666@users.noreply.github.com>
Date: Fri, 19 Jul 2024 18:21:18 +0400
Subject: [PATCH] DataGrid: Fix the onFocusedRowChanged event that does not
 raise when push API is used to remove a focused row (T1233973) (#27808)

---
 .../data_controller/m_data_controller.ts      |  2 +-
 .../grids/grid_core/focus/m_focus.ts          | 15 ++++-
 .../testcafe/tests/dataGrid/focus/focus.ts    | 66 +++++++++++++++++++
 3 files changed, 81 insertions(+), 2 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
index bf62f9981f12..aa264c8ebcda 100644
--- 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
@@ -603,7 +603,7 @@ export class DataController extends DataHelperMixin(modules.Controller) {
     this.dataErrorOccurred.fire(e);
   }
 
-  private _handleDataPushed(changes) {
+  protected _handleDataPushed(changes) {
     this.pushed.fire(changes);
   }
 
diff --git a/packages/devextreme/js/__internal/grids/grid_core/focus/m_focus.ts b/packages/devextreme/js/__internal/grids/grid_core/focus/m_focus.ts
index 40705cbdeef3..bf4a374691c4 100644
--- a/packages/devextreme/js/__internal/grids/grid_core/focus/m_focus.ts
+++ b/packages/devextreme/js/__internal/grids/grid_core/focus/m_focus.ts
@@ -534,6 +534,8 @@ const columns = (Base: ModuleType<ColumnsController>) => class FocusColumnsExten
 };
 
 const data = (Base: ModuleType<DataController>) => class FocusDataControllerExtender extends Base {
+  private _needToUpdateFocusedRowByIndex = false;
+
   protected _applyChange(change) {
     if (change && change.changeType === 'updateFocusedRow') return;
 
@@ -548,7 +550,10 @@ const data = (Base: ModuleType<DataController>) => class FocusDataControllerExte
       const isPartialUpdate = e.changeType === 'update' && e.repaintChangesOnly;
       const isPartialUpdateWithDeleting = isPartialUpdate && e.changeTypes && e.changeTypes.indexOf('remove') >= 0;
 
-      if (e.changeType === 'refresh' && e.items.length || isPartialUpdateWithDeleting) {
+      if (this._needToUpdateFocusedRowByIndex) {
+        this._needToUpdateFocusedRowByIndex = false;
+        this._focusController._focusRowByIndex();
+      } else if (e.changeType === 'refresh' && e.items.length || isPartialUpdateWithDeleting) {
         this._updatePageIndexes();
         this._updateFocusedRow(e);
       } else if (e.changeType === 'append' || e.changeType === 'prepend') {
@@ -559,6 +564,14 @@ const data = (Base: ModuleType<DataController>) => class FocusDataControllerExte
     }
   }
 
+  protected _handleDataPushed(changes) {
+    super._handleDataPushed(changes);
+
+    const focusedRowKey = this.option('focusedRowKey');
+
+    this._needToUpdateFocusedRowByIndex = changes?.some((change) => change.type === 'remove' && equalByValue(change.key, focusedRowKey));
+  }
+
   private _updatePageIndexes() {
     const prevRenderingPageIndex = this._lastRenderingPageIndex || 0;
     const renderingPageIndex = this._rowsScrollController ? this._rowsScrollController.pageIndex() : 0;
diff --git a/packages/devextreme/testing/testcafe/tests/dataGrid/focus/focus.ts b/packages/devextreme/testing/testcafe/tests/dataGrid/focus/focus.ts
index be4183d2acb0..0c203f39acb6 100644
--- a/packages/devextreme/testing/testcafe/tests/dataGrid/focus/focus.ts
+++ b/packages/devextreme/testing/testcafe/tests/dataGrid/focus/focus.ts
@@ -81,4 +81,70 @@ test('Should remove dx-focused class on blur event from the cell', async (t) =>
   }, {
     dependencies: { reshapeOnPush },
   })));
+
+  // T1233973
+  test(`DataGrid should restore focused row by index after row removed via push API' (reshapeOnPush=${reshapeOnPush})`, async (t) => {
+    const dataGrid = new DataGrid(GRID_SELECTOR);
+
+    await t
+      .expect(dataGrid.getDataRow(2).isFocusedRow)
+      .ok()
+      .expect(dataGrid.getDataRow(2).element.textContent)
+      .eql('Item 3')
+      .expect(dataGrid.option('focusedRowKey'))
+      .eql(2)
+      .expect(ClientFunction(() => (window as any).onFocusedRowChangedCounter)())
+      .eql(1);
+
+    await dataGrid.apiPush([{
+      type: 'remove',
+      key: 2,
+    }]);
+
+    await t
+      .expect(dataGrid.getDataRow(2).isFocusedRow)
+      .ok()
+      .expect(dataGrid.getDataRow(2).element.textContent)
+      .eql('Item 4')
+      .expect(dataGrid.option('focusedRowKey'))
+      .eql(3)
+      .expect(ClientFunction(() => (window as any).onFocusedRowChangedCounter)())
+      .eql(2);
+  }).before(async () => createWidget('dxDataGrid', ClientFunction(() => {
+    const { DevExpress } = (window as any);
+    const store = new DevExpress.data.ArrayStore({
+      data: [
+        { id: 0, name: 'Item 1 ' },
+        { id: 1, name: 'Item 2' },
+        { id: 2, name: 'Item 3' },
+        { id: 3, name: 'Item 4' },
+        { id: 4, name: 'Item 5' },
+      ],
+      key: 'id',
+    });
+    const dataSource = new DevExpress.data.DataSource({ store, reshapeOnPush });
+
+    return {
+      columns: ['name'],
+      dataSource,
+      keyExpr: 'id',
+      focusedRowEnabled: true,
+      focusedRowKey: 2,
+      onFocusedRowChanged: () => {
+        const global = window as Window & typeof globalThis
+        & { onFocusedRowChangedCounter: number };
+
+        if (!global.onFocusedRowChangedCounter) {
+          global.onFocusedRowChangedCounter = 0;
+        }
+        global.onFocusedRowChangedCounter += 1;
+      },
+    };
+  }, {
+    dependencies: { reshapeOnPush },
+  }))).after(async () => {
+    await ClientFunction(() => {
+      delete (window as any).onFocusedRowChangedCounter;
+    })();
+  });
 });