[terra-worklist-data-grid] Fixes column index out of range for displa…

…yed columns (#2071) Co-authored-by: Sugan G <[email protected]>
cerner · Mar 8, 2024 · 18ea76a · 18ea76a
1 parent a8ab03a
commit 18ea76a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/terra-data-grid/CHANGELOG.md b/packages/terra-data-grid/CHANGELOG.md
@@ -5,6 +5,9 @@
 * Added
   * Added support for orange and green column highlighting.
 
+* Fixed
+  * Fixes column index out of bounds in row selection mode.
+
 ## 1.18.0 - (March 5, 2024)
 
 * Changed

diff --git a/packages/terra-data-grid/src/DataGrid.jsx b/packages/terra-data-grid/src/DataGrid.jsx
@@ -247,10 +247,12 @@ const DataGrid = forwardRef((props, ref) => {
     setFocusedRow(newRowIndex);
     setFocusedCol(newColIndex);
 
-    focusedCellRef.current = {
-      rowId: grid.current.rows[newRowIndex].getAttribute('data-row-id'),
-      columnId: displayedColumns[newColIndex].id,
-    };
+    if (newColIndex < displayedColumns.length) {
+      focusedCellRef.current = {
+        rowId: grid.current.rows[newRowIndex].getAttribute('data-row-id'),
+        columnId: displayedColumns[newColIndex].id,
+      };
+    }
 
     if (makeActiveElement) {
       let focusedCell;