fix: grid navigation class methods

dhis2 · Feb 21, 2025 · 20aa21f · 20aa21f
1 parent 0909318
commit 20aa21f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/components/header-bar/src/command-palette/utils/grid-navigation.js b/components/header-bar/src/command-palette/utils/grid-navigation.js
@@ -50,8 +50,9 @@ class GridNavigation {
     getLastIndexOfActiveRow = (highlightedIndex, gridSize) => {
         const activeRow = this.getActiveRow(highlightedIndex)
         const lastIndexPerRowArray = this.getLastIndexPerRow(gridSize)
+        const lastIndexOfActiveRow = lastIndexPerRowArray[activeRow]
 
-        return lastIndexPerRowArray[activeRow]
+        return lastIndexOfActiveRow || highlightedIndex
     }
 
     getFirstIndexOfLastRow = () => {
@@ -83,9 +84,10 @@ class GridNavigation {
         const firstIndexOfActiveRow =
             this.getFirstIndexOfActiveRow(highlightedIndex)
 
-        const lastIndexOfActiveRow =
-            this.getLastIndexOfActiveRow(highlightedIndex, gridSize) ||
-            highlightedIndex
+        const lastIndexOfActiveRow = this.getLastIndexOfActiveRow(
+            highlightedIndex,
+            gridSize
+        )
 
         return highlightedIndex > firstIndexOfActiveRow
             ? highlightedIndex - 1
@@ -95,16 +97,17 @@ class GridNavigation {
     getNextRightIndex = (highlightedIndex, gridSize) => {
         const firstIndexOfActiveRow =
             this.getFirstIndexOfActiveRow(highlightedIndex)
-        const lastIndexOfActiveRow =
-            this.getLastIndexOfActiveRow(highlightedIndex, gridSize) ||
-            highlightedIndex
+        const lastIndexOfActiveRow = this.getLastIndexOfActiveRow(
+            highlightedIndex,
+            gridSize
+        )
 
         return highlightedIndex >= lastIndexOfActiveRow
             ? firstIndexOfActiveRow
             : highlightedIndex + 1
     }
 
-    getNextUpperIndex = ({
+    static getNextUpperIndex = ({
         isTopIndexInCurrentSection,
         lastIndexInNextSection,
         verticalGap,
@@ -117,7 +120,7 @@ class GridNavigation {
         }
     }
 
-    getNextLowerIndex = ({
+    static getNextLowerIndex = ({
         isLastIndexInCurrentSection,
         verticalGap,
         highlightedIndex,

diff --git a/components/header-bar/src/command-palette/utils/home-navigation.js b/components/header-bar/src/command-palette/utils/home-navigation.js
@@ -58,7 +58,7 @@ export const handleHomeNavigation = ({
                 ? actionsListLength - 1
                 : grid.getFirstIndexOfLastRow()
 
-        const nextTopIndex = grid.getNextUpperIndex({
+        const nextTopIndex = GridNavigation.getNextUpperIndex({
             isTopIndexInCurrentSection: isTopIndex,
             lastIndexInNextSection,
             verticalGap,
@@ -78,7 +78,7 @@ export const handleHomeNavigation = ({
                 ? grid.isInLastRow(highlightedIndex, gridSize)
                 : isLastListIndex(highlightedIndex, actionsListLength)
 
-        const nextLowerIndex = grid.getNextLowerIndex({
+        const nextLowerIndex = GridNavigation.getNextLowerIndex({
             isLastIndexInCurrentSection: isLastIndex,
             verticalGap,
             highlightedIndex,