Update packages/grid/x-data-grid/src/components/GridRow.tsx

Co-authored-by: Andrew Cherniavskii <andrew.cherniavskii@gmail.com> Signed-off-by: Rom Grk <romgrk@users.noreply.github.com>
mui · Jul 21, 2023 · 22ce1e5 · 22ce1e5
1 parent b9c7537
commit 22ce1e5
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/packages/grid/x-data-grid/src/components/GridRow.tsx b/packages/grid/x-data-grid/src/components/GridRow.tsx
@@ -398,14 +398,12 @@ const GridRow = React.forwardRef<HTMLDivElement, GridRowProps>(function GridRow(
 
     let indexRelativeToAllColumns = firstColumnToRender + i;
 
-    if (
-      focusedCellColumnIndexNotInRange !== undefined &&
-      visibleColumns[focusedCellColumnIndexNotInRange].field === column.field &&
-      focusedCell
-    ) {
-      indexRelativeToAllColumns = focusedCellColumnIndexNotInRange;
-    } else if (focusedCellColumnIndexNotInRange !== undefined && focusedCell) {
-      indexRelativeToAllColumns -= 1;
+    if (focusedCellColumnIndexNotInRange !== undefined && focusedCell) {
+      if (visibleColumns[focusedCellColumnIndexNotInRange].field === column.field) {
+        indexRelativeToAllColumns = focusedCellColumnIndexNotInRange;
+      } else {
+        indexRelativeToAllColumns -= 1;
+      }
     }
 
     const cellColSpanInfo = apiRef.current.unstable_getCellColSpanInfo(