DataGrid - Fix focusedRowKey with grouping, when grouped by 'null' - T1282925 (#30643)

Author: Tucchhaa

e2e/testcafe-devextreme/tests/dataGrid/common/focus/focusedRow/etalons/focused-row_under_group=-1.png

@@ -1,3 +1,4 @@
+import { createScreenshotsComparer } from 'devextreme-screenshot-comparer';
 import { ClientFunction } from 'testcafe';
 import DataGrid from 'devextreme-testcafe-models/dataGrid';
 import url from '../../../../../helpers/getPageUrl';
@@ -919,3 +920,70 @@ test('It is possible to focus row that was added via push method if previously r
     },
   ],
 }));
+
+[null, undefined, -1, 'test'].forEach((groupValue) => {
+  test(`Group should expand when focusedRowKey is set - group: ${groupValue}`, async (t) => {
+    const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
+    const dataGrid = new DataGrid('#container');
+
+    await dataGrid.apiOption('focusedRowKey', 1);
+
+    await takeScreenshot(`focused-row_under_group=${groupValue}.png`, dataGrid.element);
+
+    await t
+      .expect(compareResults.isValid())
+      .ok(compareResults.errorMessages());
+  }).before(async () => createWidget('dxDataGrid', {
+    dataSource: [
+      { id: 1, group: groupValue, name: 'Item 1' },
+      { id: 2, group: groupValue, name: 'Item 2' },
+      { id: 3, group: 'A', name: 'Item 3' },
+      { id: 4, group: 'A', name: 'Item 4' },
+    ],
+    keyExpr: 'id',
+    grouping: {
+      autoExpandAll: false,
+    },
+    columns: [
+      { dataField: 'id' },
+      { dataField: 'group', groupIndex: 0 },
+      { dataField: 'name' },
+    ],
+    height: 400,
+    focusedRowEnabled: true,
+  }));
+});
+
+test('Group should expand when focusedRowKey is set and data items have \'items\' property', async (t) => {
+  const { takeScreenshot, compareResults } = createScreenshotsComparer(t);
+  const dataGrid = new DataGrid('#container');
+
+  await dataGrid.apiOption('focusedRowKey', 1);
+
+  await takeScreenshot('focused-row_under_group_when_data-items_have_items-property.png', dataGrid.element);
+
+  await t
+    .expect(compareResults.isValid())
+    .ok(compareResults.errorMessages());
+}).before(async () => createWidget('dxDataGrid', {
+  dataSource: [
+    {
+      id: 1, group: 'A', name: 'Item 1', items: 1,
+    },
+    {
+      id: 2, group: 'A', name: 'Item 2', items: 2,
+    },
+  ],
+  keyExpr: 'id',
+  grouping: {
+    autoExpandAll: false,
+  },
+  columns: [
+    { dataField: 'id' },
+    { dataField: 'group', groupIndex: 0 },
+    { dataField: 'name' },
+    { dataField: 'items' },
+  ],
+  height: 400,
+  focusedRowEnabled: true,
+}));

e2e/testcafe-devextreme/tests/dataGrid/common/focus/focusedRow/etalons/focused-row_under_group=null.png

@@ -56,18 +56,15 @@ const data = (Base: DataControllerBase) => class FocusDataControllerExtender ext
     return true;
   }
 
-  private _getGroupPath(groupItem, groupCount) {
+  private _getGroupPath(groupItems, groupCount): any[] {
     const groupPath: any[] = [];
-    let items = [groupItem];
+    let groupItem = groupItems[0];
 
-    while (items && items[0] && groupCount) {
-      const item = items[0];
-      if (item.key !== undefined) {
-        groupPath.push(item.key);
-      }
-      items = item.items;
-      groupCount--;
+    while (groupItem && groupPath.length < groupCount) {
+      groupPath.push(groupItem.key);
+      groupItem = groupItem.items?.[0];
     }
+
     return groupPath;
   }
 
@@ -114,11 +111,13 @@ const data = (Base: DataControllerBase) => class FocusDataControllerExtender ext
       filter: that._concatWithCombinedFilter(filter),
       group,
     }).done((data) => {
-      if (!data || data.length === 0 || !isDefined(data[0].key) || data[0].key === -1) {
+      const hasData = isDefined(data) && data.length > 0;
+
+      if (!hasData) {
         return deferred.resolve(-1).promise();
       }
 
-      const groupPath = that._getGroupPath(data[0], group.length);
+      const groupPath = that._getGroupPath(data, group.length);
 
       that._expandGroupByPath(that, groupPath, 0).done(() => {
         that._calculateExpandedRowGlobalIndex(deferred, key, groupPath, group);