fix: layout grid arrow down and end problem

jwplayer · Feb 22, 2024 · 6a291a7 · 6a291a7
1 parent a6305ef
commit 6a291a7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/packages/ui-react/src/components/LayoutGrid/LayoutGrid.tsx b/packages/ui-react/src/components/LayoutGrid/LayoutGrid.tsx
@@ -70,17 +70,17 @@ const LayoutGrid = <Item extends object>({ className, columnCount, data, renderC
       case 'ArrowUp':
         return focusGridCell(previousRowIndex, currentColumnIndex);
       case 'ArrowDown':
-        return focusGridCell(nextRowIndex, currentColumnIndex);
+        return focusGridCell(nextRowIndex, nextRowIndex === maxRow ? Math.min(currentColumnIndex, maxRightLastRow) : currentColumnIndex);
       case 'Home':
         if (ctrlKey) {
           return focusGridCell(0, 0);
         }
         return focusGridCell(currentRowIndex, 0);
       case 'End':
         if (ctrlKey) {
-          return focusGridCell(maxRight, maxRightLastRow);
+          return focusGridCell(maxRow, maxRightLastRow);
         }
-        return focusGridCell(currentRowIndex, maxRow);
+        return focusGridCell(currentRowIndex, maxRight);
       case 'PageUp':
         return focusGridCell(previousRowIndex, currentColumnIndex);
       case 'PageDown':