fix(lists): fix lists not working properly with few elements with sti…

…ck-to-start
bamlab · Apr 30, 2024 · bd9d139 · bd9d139
1 parent 4018d5d
commit bd9d139
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/packages/lib/src/spatial-navigation/components/virtualizedList/helpers/getLastItemIndex.ts b/packages/lib/src/spatial-navigation/components/virtualizedList/helpers/getLastItemIndex.ts
@@ -41,7 +41,13 @@ export const getLastLeftItemIndex = <T>(
 
     return 0;
   }
-  return data.length - Math.floor(listSizeInPx / itemSizeInPx);
+
+  const result = data.length - Math.floor(listSizeInPx / itemSizeInPx);
+
+  if (result < 0) {
+    return 0;
+  }
+  return result;
 };
 
 /**
@@ -88,6 +94,11 @@ export const getLastRightItemIndex = <T>(
 
     return data.length - 1;
   }
-  // We substract 1 because index starts from 0
-  return Math.floor(listSizeInPx / itemSizeInPx) - 1;
+  const result = Math.floor(listSizeInPx / itemSizeInPx) - 1;
+
+  if (result > data.length - 1) {
+    // We substract 1 because index starts from 0
+    return data.length - 1;
+  }
+  return result;
 };