[terra-data-grid] refactor setFocusedRowCol method in DataGrid.jsx

package.json

@@ -72,8 +72,8 @@
     "terra-enzyme-intl": "3",
     "webpack": "5",
     "webpack-cli": "4",
-    "webpack-dev-server": "^4",
-    "webpack-merge": "^5",
+    "webpack-dev-server": "4",
+    "webpack-merge": "5",
     "xfc": "1"
   },
   "scripts": {

packages/terra-data-grid/src/DataGrid.jsx

@@ -254,30 +254,38 @@ const DataGrid = forwardRef((props, ref) => {
       };
     }
 
-    if (makeActiveElement) {
-      let focusedCell;
-      if (isSection(newRowIndex)) {
-        [focusedCell] = grid.current.rows[newRowIndex].cells;
+    if (!makeActiveElement) {
+      return;
+    }
 
-        if (!focusedCell.hasAttribute('tabindex')) {
-          focusedCell = grid.current.rows[newRowIndex].querySelector('button');
-        }
-      } else {
-        // Set focus on input field (checkbox) of row selection cells.
-        focusedCell = grid.current.rows[newRowIndex].cells[newColIndex];
-        if (isRowSelectionCell(newColIndex) && focusedCell.getElementsByTagName('input').length > 0) {
-          [focusedCell] = focusedCell.getElementsByTagName('input');
-        }
+    let focusedCell;
+    if (isSection(newRowIndex)) {
+      [focusedCell] = grid.current.rows[newRowIndex].cells;
 
-        // Set focus to column header button, if it exists
-        const isHeaderRow = (newRowIndex === 0 || (hasColumnHeaderActions && newRowIndex === 1));
-        if (isHeaderRow && !focusedCell.hasAttribute('tabindex')) {
-          focusedCell = focusedCell.querySelector('[role="button"]') || focusedCell.querySelector('button');
-        }
+      if (!focusedCell.hasAttribute('tabindex')) {
+        focusedCell = grid.current.rows[newRowIndex].querySelector('button');
       }
+      focusedCell?.focus();
+      return;
+    }
 
+    // Set focus on input field (checkbox) of row selection cells.
+    focusedCell = grid.current.rows[newRowIndex].cells[newColIndex];
+    if (isRowSelectionCell(newColIndex) && focusedCell.getElementsByTagName('input').length > 0) {
+      [focusedCell] = focusedCell.getElementsByTagName('input');
       focusedCell?.focus();
+      return;
     }
+
+    // Set focus to column header button, if it exists
+    const isHeaderRow = (newRowIndex === 0 || (hasColumnHeaderActions && newRowIndex === 1));
+    if (isHeaderRow && !focusedCell.hasAttribute('tabindex')) {
+      focusedCell = focusedCell.querySelector('[role="button"]') || focusedCell.querySelector('button');
+      focusedCell?.focus();
+      return;
+    }
+
+    focusedCell?.focus();
   }, [displayedColumns, isSection, isRowSelectionCell, hasColumnHeaderActions]);
 
   // The focus is handled by the DataGrid. However, there are times