refactor: improving readability of computeTranslation function

bamlab · Feb 9, 2024 · 91d4e6a · 91d4e6a
1 parent a02f671
commit 91d4e6a
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/packages/lib/src/spatial-navigation/components/virtualizedList/helpers/computeTranslation.ts b/packages/lib/src/spatial-navigation/components/virtualizedList/helpers/computeTranslation.ts
@@ -32,15 +32,22 @@ const computeStickToEndTranslation = <T>({
   listSizeInPx: number;
   maxPossibleRightAlignedIndex: number;
 }) => {
-  const scrollOffset =
-    currentlyFocusedItemIndex > maxPossibleRightAlignedIndex
-      ? getSizeInPxFromOneItemToAnother(data, itemSizeInPx, 0, currentlyFocusedItemIndex) +
-        (typeof itemSizeInPx === 'function'
-          ? itemSizeInPx(data[currentlyFocusedItemIndex])
-          : itemSizeInPx) -
-        listSizeInPx
-      : 0;
+  if (currentlyFocusedItemIndex <= maxPossibleRightAlignedIndex) return -0;
+
+  const currentlyFocusedItemSize =
+    typeof itemSizeInPx === 'function'
+      ? itemSizeInPx(data[currentlyFocusedItemIndex])
+      : itemSizeInPx;
 
+  const sizeOfListFromStartToCurrentlyFocusedItem = getSizeInPxFromOneItemToAnother(
+    data,
+    itemSizeInPx,
+    0,
+    currentlyFocusedItemIndex,
+  );
+
+  const scrollOffset =
+    sizeOfListFromStartToCurrentlyFocusedItem + currentlyFocusedItemSize - listSizeInPx;
   return -scrollOffset;
 };