@pdanpdan/virtual-scroll 0.4.0 → 0.5.0

package/src/utils/virtual-scroll-logic.ts

@@ -12,43 +12,422 @@ import type {
   TotalSizeParams,
 } from '../types';
 
-import { isScrollToIndexOptions } from './scroll';
+import { BROWSER_MAX_SIZE, isScrollToIndexOptions } from './scroll';
+
+// --- Internal Helper Types ---
+
+interface GenericRangeParams {
+  scrollPos: number;
+  containerSize: number;
+  count: number;
+  bufferBefore: number;
+  bufferAfter: number;
+  gap: number;
+  fixedSize: number | null;
+  findLowerBound: (offset: number) => number;
+  query: (index: number) => number;
+}
+
+interface AxisAlignmentParams {
+  align: ScrollAlignment;
+  targetPos: number;
+  itemSize: number;
+  scrollPos: number;
+  viewSize: number;
+  stickyOffsetStart: number;
+  stickyOffsetEnd: number;
+}
+
+// --- Internal Helpers ---
+
+/**
+ * Generic range calculation for a single axis (row or column).
+ *
+ * @param params - Range parameters.
+ * @param params.scrollPos - Virtual scroll position.
+ * @param params.containerSize - Usable viewport size.
+ * @param params.count - Total item count.
+ * @param params.bufferBefore - Buffer items before.
+ * @param params.bufferAfter - Buffer items after.
+ * @param params.gap - Item gap.
+ * @param params.fixedSize - Fixed item size.
+ * @param params.findLowerBound - Binary search for index.
+ * @param params.query - Prefix sum for index.
+ * @returns Start and end indices.
+ */
+function calculateGenericRange({
+  scrollPos,
+  containerSize,
+  count,
+  bufferBefore,
+  bufferAfter,
+  gap,
+  fixedSize,
+  findLowerBound,
+  query,
+}: GenericRangeParams) {
+  let start = 0;
+  let end = count;
+  const endOffset = scrollPos + containerSize;
+
+  if (fixedSize !== null) {
+    const step = fixedSize + gap;
+    start = Math.floor(scrollPos / step);
+    end = Math.ceil(endOffset / step);
+  } else {
+    start = findLowerBound(scrollPos);
+    end = findLowerBound(endOffset);
+    if (end < count && query(end) < endOffset) {
+      end++;
+    }
+  }
+
+  return {
+    start: Math.max(0, start - bufferBefore),
+    end: Math.min(count, end + bufferAfter),
+  };
+}
+
+/**
+ * Binary search for the next sticky index after the current index.
+ *
+ * @param stickyIndices - Sorted array of sticky indices.
+ * @param index - Current index.
+ * @returns Next sticky index or undefined.
+ */
+function findNextStickyIndex(stickyIndices: number[], index: number): number | undefined {
+  let low = 0;
+  let high = stickyIndices.length - 1;
+  let nextStickyIdx: number | undefined;
+
+  while (low <= high) {
+    const mid = (low + high) >>> 1;
+    if (stickyIndices[ mid ]! > index) {
+      nextStickyIdx = stickyIndices[ mid ];
+      high = mid - 1;
+    } else {
+      low = mid + 1;
+    }
+  }
+  return nextStickyIdx;
+}
+
+/**
+ * Binary search for the previous sticky index before the current index.
+ *
+ * @param stickyIndices - Sorted array of sticky indices.
+ * @param index - Current index.
+ * @returns Previous sticky index or undefined.
+ */
+export function findPrevStickyIndex(stickyIndices: number[], index: number): number | undefined {
+  let low = 0;
+  let high = stickyIndices.length - 1;
+  let prevStickyIdx: number | undefined;
+
+  while (low <= high) {
+    const mid = (low + high) >>> 1;
+    if (stickyIndices[ mid ]! < index) {
+      prevStickyIdx = stickyIndices[ mid ];
+      low = mid + 1;
+    } else {
+      high = mid - 1;
+    }
+  }
+  return prevStickyIdx;
+}
+
+/**
+ * Generic alignment calculation for a single axis.
+ *
+ * @param params - Alignment parameters.
+ * @param params.align - Desired alignment.
+ * @param params.targetPos - Virtual item position.
+ * @param params.itemSize - Virtual item size.
+ * @param params.scrollPos - Virtual scroll position.
+ * @param params.viewSize - Full viewport size.
+ * @param params.stickyOffsetStart - Dynamic sticky offset at start.
+ * @param params.stickyOffsetEnd - Sticky offset at end.
+ * @returns Target scroll position and effective alignment.
+ */
+function calculateAxisAlignment({
+  align,
+  targetPos,
+  itemSize,
+  scrollPos,
+  viewSize,
+  stickyOffsetStart,
+  stickyOffsetEnd,
+}: AxisAlignmentParams) {
+  const targetStart = targetPos - stickyOffsetStart;
+  const targetEnd = targetPos - (viewSize - stickyOffsetEnd - itemSize);
+
+  if (align === 'start') {
+    return { target: targetStart, effectiveAlign: 'start' as const };
+  }
+  if (align === 'center') {
+    return {
+      target: targetPos - stickyOffsetStart - (viewSize - stickyOffsetStart - stickyOffsetEnd - itemSize) / 2,
+      effectiveAlign: 'center' as const,
+    };
+  }
+  if (align === 'end') {
+    return { target: targetEnd, effectiveAlign: 'end' as const };
+  }
+
+  if (isItemVisible(targetPos, itemSize, scrollPos, viewSize, stickyOffsetStart, stickyOffsetEnd)) {
+    return { target: scrollPos, effectiveAlign: 'auto' as const };
+  }
+
+  const usableSize = viewSize - stickyOffsetStart - stickyOffsetEnd;
+
+  if (itemSize <= usableSize) {
+    return targetPos < scrollPos + stickyOffsetStart
+      ? {
+        target: targetStart,
+        effectiveAlign: 'start' as const,
+      }
+      : {
+        target: targetEnd,
+        effectiveAlign: 'end' as const,
+      };
+  }
+
+  return Math.abs(targetStart - scrollPos) < Math.abs(targetEnd - scrollPos)
+    ? {
+      target: targetStart,
+      effectiveAlign: 'start' as const,
+    }
+    : {
+      target: targetEnd,
+      effectiveAlign: 'end' as const,
+    };
+}
+
+/**
+ * Helper to calculate total size for a single axis.
+ *
+ * @param count - Item count.
+ * @param fixedSize - Fixed size if any.
+ * @param gap - Gap size.
+ * @param query - Prefix sum resolver.
+ * @returns Total size.
+ */
+function calculateAxisSize(
+  count: number,
+  fixedSize: number | null,
+  gap: number,
+  query: (index: number) => number,
+): number {
+  if (count <= 0) {
+    return 0;
+  }
+  if (fixedSize !== null) {
+    return Math.max(0, count * (fixedSize + gap) - gap);
+  }
+  return Math.max(0, query(count) - gap);
+}
+
+/**
+ * Helper to calculate target scroll position for a single axis.
+ *
+ * @param params - Axis target parameters.
+ * @param params.index - Row/column index.
+ * @param params.align - Desired alignment.
+ * @param params.viewSize - Full viewport size.
+ * @param params.scrollPos - Virtual scroll position.
+ * @param params.fixedSize - Fixed item size.
+ * @param params.gap - Item gap.
+ * @param params.query - Prefix sum resolver.
+ * @param params.getSize - Item size resolver.
+ * @param params.stickyIndices - Sticky indices.
+ * @param params.stickyStart - Sticky start element size.
+ * @param params.stickyEnd - Sticky end element size.
+ * @returns Target position, item size and effective alignment.
+ */
+function calculateAxisTarget({
+  index,
+  align,
+  viewSize,
+  scrollPos,
+  fixedSize,
+  gap,
+  query,
+  getSize,
+  stickyIndices,
+  stickyStart,
+  stickyEnd = 0,
+}: {
+  index: number;
+  align: ScrollAlignment;
+  viewSize: number;
+  scrollPos: number;
+  fixedSize: number | null;
+  gap: number;
+  query: (idx: number) => number;
+  getSize: (idx: number) => number;
+  stickyIndices?: number[] | undefined;
+  stickyStart: number;
+  stickyEnd?: number;
+}) {
+  let stickyOffsetStart = stickyStart;
+  if (stickyIndices && stickyIndices.length > 0) {
+    const activeStickyIdx = findPrevStickyIndex(stickyIndices, index);
+    if (activeStickyIdx !== undefined) {
+      stickyOffsetStart += calculateAxisSize(1, fixedSize, 0, () => getSize(activeStickyIdx));
+    }
+  }
+
+  const itemPos = (fixedSize !== null ? index * (fixedSize + gap) : query(index));
+  const itemSize = fixedSize !== null ? fixedSize : getSize(index) - gap;
+
+  const { target, effectiveAlign } = calculateAxisAlignment({
+    align,
+    targetPos: itemPos,
+    itemSize,
+    scrollPos,
+    viewSize,
+    stickyOffsetStart,
+    stickyOffsetEnd: stickyEnd,
+  });
+
+  return { target, itemSize, effectiveAlign };
+}
+
+// --- Exported Functions ---
+
+/**
+ * Determines if an item is visible within the usable viewport.
+ *
+ * @param itemPos - Virtual start position of the item (VU).
+ * @param itemSize - Virtual size of the item (VU).
+ * @param scrollPos - Virtual scroll position (VU).
+ * @param viewSize - Full size of the viewport (VU).
+ * @param stickyOffsetStart - Dynamic offset from sticky items at start (VU).
+ * @param stickyOffsetEnd - Offset from sticky items at end (VU).
+ * @returns True if visible.
+ */
+export function isItemVisible(
+  itemPos: number,
+  itemSize: number,
+  scrollPos: number,
+  viewSize: number,
+  stickyOffsetStart: number = 0,
+  stickyOffsetEnd: number = 0,
+): boolean {
+  const usableStart = scrollPos + stickyOffsetStart;
+  const usableEnd = scrollPos + viewSize - stickyOffsetEnd;
+  const usableSize = viewSize - stickyOffsetStart - stickyOffsetEnd;
+
+  if (itemSize <= usableSize) {
+    return itemPos >= usableStart - 0.5 && (itemPos + itemSize) <= usableEnd + 0.5;
+  }
+  return itemPos <= usableStart + 0.5 && (itemPos + itemSize) >= usableEnd - 0.5;
+}
+
+/**
+ * Maps a display scroll position to a virtual content position.
+ *
+ * @param displayPos - Display pixel position (DU).
+ * @param hostOffset - Offset of the host element in display pixels (DU).
+ * @param scale - Coordinate scaling factor (VU/DU).
+ * @returns Virtual content position (VU).
+ */
+export function displayToVirtual(displayPos: number, hostOffset: number, scale: number): number {
+  return (displayPos - hostOffset) * scale;
+}
+
+/**
+ * Maps a virtual content position to a display scroll position.
+ *
+ * @param virtualPos - Virtual content position (VU).
+ * @param hostOffset - Offset of the host element in display pixels (DU).
+ * @param scale - Coordinate scaling factor (VU/DU).
+ * @returns Display pixel position (DU).
+ */
+export function virtualToDisplay(virtualPos: number, hostOffset: number, scale: number): number {
+  return virtualPos / scale + hostOffset;
+}
 
 /**
  * Calculates the target scroll position (relative to content) for a given row/column index and alignment.
  *
- * @param params - The parameters for calculation.
- * @returns The target X and Y positions and item dimensions.
+ * @param params - Scroll target parameters.
+ * @param params.rowIndex - Row index to target.
+ * @param params.colIndex - Column index to target.
+ * @param params.options - Scroll options including alignment.
+ * @param params.direction - Current scroll direction.
+ * @param params.viewportWidth - Full viewport width (DU).
+ * @param params.viewportHeight - Full viewport height (DU).
+ * @param params.totalWidth - Total estimated width (VU).
+ * @param params.totalHeight - Total estimated height (VU).
+ * @param params.gap - Item gap (VU).
+ * @param params.columnGap - Column gap (VU).
+ * @param params.fixedSize - Fixed item size (VU).
+ * @param params.fixedWidth - Fixed column width (VU).
+ * @param params.relativeScrollX - Current relative X scroll (VU).
+ * @param params.relativeScrollY - Current relative Y scroll (VU).
+ * @param params.getItemSizeY - Resolver for item height (VU).
+ * @param params.getItemSizeX - Resolver for item width (VU).
+ * @param params.getItemQueryY - Prefix sum resolver for item height (VU).
+ * @param params.getItemQueryX - Prefix sum resolver for item width (VU).
+ * @param params.getColumnSize - Resolver for column size (VU).
+ * @param params.getColumnQuery - Prefix sum resolver for column width (VU).
+ * @param params.scaleX - Coordinate scaling factor for X axis.
+ * @param params.scaleY - Coordinate scaling factor for Y axis.
+ * @param params.hostOffsetX - Display pixels offset of items wrapper on X axis (DU).
+ * @param params.hostOffsetY - Display pixels offset of items wrapper on Y axis (DU).
+ * @param params.flowPaddingStartX - Display pixels padding at flow start on X axis (DU).
+ * @param params.flowPaddingStartY - Display pixels padding at flow start on Y axis (DU).
+ * @param params.paddingStartX - Display pixels padding at scroll start on X axis (DU).
+ * @param params.paddingStartY - Display pixels padding at scroll start on Y axis (DU).
+ * @param params.paddingEndX - Display pixels padding at scroll end on X axis (DU).
+ * @param params.paddingEndY - Display pixels padding at scroll end on Y axis (DU).
+ * @param params.stickyIndices - List of sticky indices.
+ * @param params.stickyStartX - Sticky start offset on X axis (DU).
+ * @param params.stickyStartY - Sticky start offset on Y axis (DU).
+ * @param params.stickyEndX - Sticky end offset on X axis (DU).
+ * @param params.stickyEndY - Sticky end offset on Y axis (DU).
+ * @returns The target X and Y positions (VU) and item dimensions (VU).
  * @see ScrollTargetParams
  * @see ScrollTargetResult
  */
-export function calculateScrollTarget(params: ScrollTargetParams): ScrollTargetResult {
-  const {
-    rowIndex,
-    colIndex,
-    options,
-    itemsLength,
-    columnCount,
-    direction,
-    usableWidth,
-    usableHeight,
-    totalWidth,
-    totalHeight,
-    gap,
-    columnGap,
-    fixedSize,
-    fixedWidth,
-    relativeScrollX,
-    relativeScrollY,
-    getItemSizeY,
-    getItemSizeX,
-    getItemQueryY,
-    getItemQueryX,
-    getColumnSize,
-    getColumnQuery,
-    stickyIndices,
-  } = params;
-
+export function calculateScrollTarget({
+  rowIndex,
+  colIndex,
+  options,
+  direction,
+  viewportWidth,
+  viewportHeight,
+  totalWidth,
+  totalHeight,
+  gap,
+  columnGap,
+  fixedSize,
+  fixedWidth,
+  relativeScrollX,
+  relativeScrollY,
+  getItemSizeY,
+  getItemSizeX,
+  getItemQueryY,
+  getItemQueryX,
+  getColumnSize,
+  getColumnQuery,
+  scaleX,
+  scaleY,
+  hostOffsetX,
+  hostOffsetY,
+  stickyIndices,
+  stickyStartX = 0,
+  stickyStartY = 0,
+  stickyEndX = 0,
+  stickyEndY = 0,
+  flowPaddingStartX = 0,
+  flowPaddingStartY = 0,
+  paddingStartX = 0,
+  paddingStartY = 0,
+  paddingEndX = 0,
+  paddingEndY = 0,
+}: ScrollTargetParams): ScrollTargetResult {
   let align: ScrollAlignment | ScrollAlignmentOptions | ScrollToIndexOptions | undefined;
 
   if (isScrollToIndexOptions(options)) {
@@ -57,167 +436,74 @@ export function calculateScrollTarget(params: ScrollTargetParams): ScrollTargetR
     align = options as ScrollAlignment | ScrollAlignmentOptions;
   }
 
-  const alignX = (typeof align === 'object' ? align.x : align) || 'auto';
-  const alignY = (typeof align === 'object' ? align.y : align) || 'auto';
-
-  const isVertical = direction === 'vertical' || direction === 'both';
-  const isHorizontal = direction === 'horizontal' || direction === 'both';
+  const alignX = (align && typeof align === 'object' ? align.x : align) || 'auto';
+  const alignY = (align && typeof align === 'object' ? align.y : align) || 'auto';
 
   let targetX = relativeScrollX;
   let targetY = relativeScrollY;
   let itemWidth = 0;
   let itemHeight = 0;
-  let effectiveAlignX: ScrollAlignment = alignX === 'auto' ? 'auto' : alignX;
-  let effectiveAlignY: ScrollAlignment = alignY === 'auto' ? 'auto' : alignY;
+  let effectiveAlignX: ScrollAlignment = 'auto';
+  let effectiveAlignY: ScrollAlignment = 'auto';
 
-  // Y calculation
-  if (rowIndex != null) {
-    let stickyOffsetY = 0;
-    if (isVertical && stickyIndices && stickyIndices.length > 0) {
-      let activeStickyIdx: number | undefined;
-      let low = 0;
-      let high = stickyIndices.length - 1;
-      while (low <= high) {
-        const mid = (low + high) >>> 1;
-        if (stickyIndices[ mid ]! < rowIndex) {
-          activeStickyIdx = stickyIndices[ mid ];
-          low = mid + 1;
-        } else {
-          high = mid - 1;
-        }
-      }
+  // Clamp to valid range
+  const rWidth = scaleX === 1 ? totalWidth : BROWSER_MAX_SIZE;
+  const rHeight = scaleY === 1 ? totalHeight : BROWSER_MAX_SIZE;
 
-      if (activeStickyIdx !== undefined) {
-        stickyOffsetY = fixedSize !== null ? fixedSize : getItemSizeY(activeStickyIdx) - gap;
-      }
-    }
+  const maxDisplayX = Math.max(0, hostOffsetX + rWidth - viewportWidth);
+  const maxDisplayY = Math.max(0, hostOffsetY + rHeight - viewportHeight);
 
-    let itemY = 0;
-    if (rowIndex >= itemsLength) {
-      itemY = totalHeight;
-      itemHeight = 0;
-    } else {
-      itemY = fixedSize !== null ? rowIndex * (fixedSize + gap) : getItemQueryY(rowIndex);
-      itemHeight = fixedSize !== null ? fixedSize : getItemSizeY(rowIndex) - gap;
-    }
+  // maxTarget should be in virtual internalScroll coordinates
+  const maxTargetX = (maxDisplayX - hostOffsetX) * scaleX;
+  const maxTargetY = (maxDisplayY - hostOffsetY) * scaleY;
 
-    // Apply Y Alignment
-    if (alignY === 'start') {
-      targetY = itemY - stickyOffsetY;
-    } else if (alignY === 'center') {
-      targetY = itemY - (usableHeight - itemHeight) / 2;
-    } else if (alignY === 'end') {
-      targetY = itemY - (usableHeight - itemHeight);
-    } else {
-      // Auto alignment: stay if visible, otherwise align to nearest edge (minimal movement)
-      const isVisibleY = itemHeight <= (usableHeight - stickyOffsetY)
-        ? (itemY >= relativeScrollY + stickyOffsetY - 0.5 && (itemY + itemHeight) <= (relativeScrollY + usableHeight + 0.5))
-        : (itemY <= relativeScrollY + stickyOffsetY + 0.5 && (itemY + itemHeight) >= (relativeScrollY + usableHeight - 0.5));
-
-      if (!isVisibleY) {
-        const targetStart = itemY - stickyOffsetY;
-        const targetEnd = itemY - (usableHeight - itemHeight);
-
-        if (itemHeight <= usableHeight - stickyOffsetY) {
-          if (itemY < relativeScrollY + stickyOffsetY) {
-            targetY = targetStart;
-            effectiveAlignY = 'start';
-          } else {
-            targetY = targetEnd;
-            effectiveAlignY = 'end';
-          }
-        } else {
-          // Large item: minimal movement
-          if (Math.abs(targetStart - relativeScrollY) < Math.abs(targetEnd - relativeScrollY)) {
-            targetY = targetStart;
-            effectiveAlignY = 'start';
-          } else {
-            targetY = targetEnd;
-            effectiveAlignY = 'end';
-          }
-        }
-      }
-    }
+  const itemsStartVirtualX = flowPaddingStartX + stickyStartX + paddingStartX;
+  const itemsStartVirtualY = flowPaddingStartY + stickyStartY + paddingStartY;
+
+  // Y calculation
+  if (rowIndex != null) {
+    const res = calculateAxisTarget({
+      index: rowIndex,
+      align: alignY as ScrollAlignment,
+      viewSize: viewportHeight,
+      scrollPos: relativeScrollY,
+      fixedSize,
+      gap,
+      query: getItemQueryY,
+      getSize: getItemSizeY,
+      stickyIndices,
+      stickyStart: stickyStartY + paddingStartY,
+      stickyEnd: stickyEndY + paddingEndY,
+    });
+    targetY = res.target + itemsStartVirtualY;
+    itemHeight = res.itemSize;
+    effectiveAlignY = res.effectiveAlign;
   }
 
   // X calculation
   if (colIndex != null) {
-    let stickyOffsetX = 0;
-    if (isHorizontal && stickyIndices && stickyIndices.length > 0 && (direction === 'horizontal' || direction === 'both')) {
-      let activeStickyIdx: number | undefined;
-      let low = 0;
-      let high = stickyIndices.length - 1;
-      while (low <= high) {
-        const mid = (low + high) >>> 1;
-        if (stickyIndices[ mid ]! < colIndex) {
-          activeStickyIdx = stickyIndices[ mid ];
-          low = mid + 1;
-        } else {
-          high = mid - 1;
-        }
-      }
-
-      if (activeStickyIdx !== undefined) {
-        stickyOffsetX = direction === 'horizontal'
-          ? (fixedSize !== null ? fixedSize : getItemSizeX(activeStickyIdx) - columnGap)
-          : (fixedWidth !== null ? fixedWidth : getColumnSize(activeStickyIdx) - columnGap);
-      }
-    }
-
-    let itemX = 0;
-    if (colIndex >= columnCount && columnCount > 0) {
-      itemX = totalWidth;
-      itemWidth = 0;
-    } else if (direction === 'horizontal') {
-      itemX = fixedSize !== null ? colIndex * (fixedSize + columnGap) : getItemQueryX(colIndex);
-      itemWidth = fixedSize !== null ? fixedSize : getItemSizeX(colIndex) - columnGap;
-    } else {
-      itemX = getColumnQuery(colIndex);
-      itemWidth = getColumnSize(colIndex) - columnGap;
-    }
-
-    // Apply X Alignment
-    if (alignX === 'start') {
-      targetX = itemX - stickyOffsetX;
-    } else if (alignX === 'center') {
-      targetX = itemX - (usableWidth - itemWidth) / 2;
-    } else if (alignX === 'end') {
-      targetX = itemX - (usableWidth - itemWidth);
-    } else {
-      // Auto alignment: stay if visible, otherwise align to nearest edge (minimal movement)
-      const isVisibleX = itemWidth <= (usableWidth - stickyOffsetX)
-        ? (itemX >= relativeScrollX + stickyOffsetX - 0.5 && (itemX + itemWidth) <= (relativeScrollX + usableWidth + 0.5))
-        : (itemX <= relativeScrollX + stickyOffsetX + 0.5 && (itemX + itemWidth) >= (relativeScrollX + usableWidth - 0.5));
-
-      if (!isVisibleX) {
-        const targetStart = itemX - stickyOffsetX;
-        const targetEnd = itemX - (usableWidth - itemWidth);
-
-        if (itemWidth <= usableWidth - stickyOffsetX) {
-          if (itemX < relativeScrollX + stickyOffsetX) {
-            targetX = targetStart;
-            effectiveAlignX = 'start';
-          } else {
-            targetX = targetEnd;
-            effectiveAlignX = 'end';
-          }
-        } else {
-          // Large item: minimal movement
-          if (Math.abs(targetStart - relativeScrollX) < Math.abs(targetEnd - relativeScrollX)) {
-            targetX = targetStart;
-            effectiveAlignX = 'start';
-          } else {
-            targetX = targetEnd;
-            effectiveAlignX = 'end';
-          }
-        }
-      }
-    }
+    const isGrid = direction === 'both';
+    const isHorizontal = direction === 'horizontal';
+    const res = calculateAxisTarget({
+      index: colIndex,
+      align: alignX as ScrollAlignment,
+      viewSize: viewportWidth,
+      scrollPos: relativeScrollX,
+      fixedSize: isGrid ? fixedWidth : fixedSize,
+      gap: (isGrid || isHorizontal) ? columnGap : gap,
+      query: isGrid ? getColumnQuery : getItemQueryX,
+      getSize: isGrid ? getColumnSize : getItemSizeX,
+      stickyIndices,
+      stickyStart: stickyStartX + paddingStartX,
+      stickyEnd: stickyEndX + paddingEndX,
+    });
+    targetX = res.target + itemsStartVirtualX;
+    itemWidth = res.itemSize;
+    effectiveAlignX = res.effectiveAlign;
   }
 
-  // Clamp to valid range
-  targetX = Math.max(0, Math.min(targetX, Math.max(0, totalWidth - usableWidth)));
-  targetY = Math.max(0, Math.min(targetY, Math.max(0, totalHeight - usableHeight)));
+  targetX = Math.max(0, Math.min(targetX, maxTargetX));
+  targetY = Math.max(0, Math.min(targetY, maxTargetY));
 
   return { targetX, targetY, itemWidth, itemHeight, effectiveAlignX, effectiveAlignY };
 }
@@ -225,153 +511,160 @@ export function calculateScrollTarget(params: ScrollTargetParams): ScrollTargetR
 /**
  * Calculates the range of items to render based on scroll position and viewport size.
  *
- * @param params - The parameters for calculation.
+ * @param params - Range parameters.
+ * @param params.direction - Scroll direction.
+ * @param params.relativeScrollX - Virtual horizontal position (VU).
+ * @param params.relativeScrollY - Virtual vertical position (VU).
+ * @param params.usableWidth - Usable viewport width (VU).
+ * @param params.usableHeight - Usable viewport height (VU).
+ * @param params.itemsLength - Total item count.
+ * @param params.bufferBefore - Buffer items before.
+ * @param params.bufferAfter - Buffer items after.
+ * @param params.gap - Item gap (VU).
+ * @param params.columnGap - Column gap (VU).
+ * @param params.fixedSize - Fixed item size (VU).
+ * @param params.findLowerBoundY - Resolver for vertical index.
+ * @param params.findLowerBoundX - Resolver for horizontal index.
+ * @param params.queryY - Resolver for vertical offset (VU).
+ * @param params.queryX - Resolver for horizontal offset (VU).
  * @returns The start and end indices of the items to render.
  * @see RangeParams
  */
-export function calculateRange(params: RangeParams) {
-  const {
-    direction,
-    relativeScrollX,
-    relativeScrollY,
-    usableWidth,
-    usableHeight,
-    itemsLength,
+export function calculateRange({
+  direction,
+  relativeScrollX,
+  relativeScrollY,
+  usableWidth,
+  usableHeight,
+  itemsLength,
+  bufferBefore,
+  bufferAfter,
+  gap,
+  columnGap,
+  fixedSize,
+  findLowerBoundY,
+  findLowerBoundX,
+  queryY,
+  queryX,
+}: RangeParams) {
+  const isVertical = direction === 'vertical' || direction === 'both';
+
+  return calculateGenericRange({
+    scrollPos: isVertical ? relativeScrollY : relativeScrollX,
+    containerSize: isVertical ? usableHeight : usableWidth,
+    count: itemsLength,
     bufferBefore,
     bufferAfter,
-    gap,
-    columnGap,
+    gap: isVertical ? gap : columnGap,
     fixedSize,
-    findLowerBoundY,
-    findLowerBoundX,
-    queryY,
-    queryX,
-  } = params;
-
-  const isVertical = direction === 'vertical' || direction === 'both';
-
-  let start = 0;
-  let end = itemsLength;
-
-  if (isVertical) {
-    if (fixedSize !== null) {
-      start = Math.floor(relativeScrollY / (fixedSize + gap));
-      end = Math.ceil((relativeScrollY + usableHeight) / (fixedSize + gap));
-    } else {
-      start = findLowerBoundY(relativeScrollY);
-      const targetY = relativeScrollY + usableHeight;
-      end = findLowerBoundY(targetY);
-      if (end < itemsLength && queryY(end) < targetY) {
-        end++;
-      }
-    }
-  } else {
-    if (fixedSize !== null) {
-      start = Math.floor(relativeScrollX / (fixedSize + columnGap));
-      end = Math.ceil((relativeScrollX + usableWidth) / (fixedSize + columnGap));
-    } else {
-      start = findLowerBoundX(relativeScrollX);
-      const targetX = relativeScrollX + usableWidth;
-      end = findLowerBoundX(targetX);
-      if (end < itemsLength && queryX(end) < targetX) {
-        end++;
-      }
-    }
-  }
-
-  return {
-    start: Math.max(0, start - bufferBefore),
-    end: Math.min(itemsLength, end + bufferAfter),
-  };
+    findLowerBound: isVertical ? findLowerBoundY : findLowerBoundX,
+    query: isVertical ? queryY : queryX,
+  });
 }
 
 /**
  * Calculates the range of columns to render for bidirectional scroll.
  *
- * @param params - The parameters for calculation.
- * @returns The start and end indices and paddings for columns.
+ * @param params - Column range parameters.
+ * @param params.columnCount - Total column count.
+ * @param params.relativeScrollX - Virtual horizontal position (VU).
+ * @param params.usableWidth - Usable viewport width (VU).
+ * @param params.colBuffer - Column buffer size.
+ * @param params.fixedWidth - Fixed column width (VU).
+ * @param params.columnGap - Column gap (VU).
+ * @param params.findLowerBound - Resolver for column index.
+ * @param params.query - Resolver for column offset (VU).
+ * @param params.totalColsQuery - Resolver for total width (VU).
+ * @returns The start and end indices and paddings for columns (VU).
  * @see ColumnRangeParams
  * @see ColumnRange
  */
-export function calculateColumnRange(params: ColumnRangeParams) {
-  const {
-    columnCount,
-    relativeScrollX,
-    usableWidth,
-    colBuffer,
-    fixedWidth,
-    columnGap,
-    findLowerBound,
-    query,
-    totalColsQuery,
-  } = params;
-
+export function calculateColumnRange({
+  columnCount,
+  relativeScrollX,
+  usableWidth,
+  colBuffer,
+  fixedWidth,
+  columnGap,
+  findLowerBound,
+  query,
+  totalColsQuery,
+}: ColumnRangeParams) {
   if (!columnCount) {
     return { start: 0, end: 0, padStart: 0, padEnd: 0 };
   }
 
-  let start = 0;
-  let end = columnCount;
-
-  if (fixedWidth !== null) {
-    start = Math.floor(relativeScrollX / (fixedWidth + columnGap));
-    end = Math.ceil((relativeScrollX + usableWidth) / (fixedWidth + columnGap));
-  } else {
-    start = findLowerBound(relativeScrollX);
-    let currentX = query(start);
-    let i = start;
-    while (i < columnCount && currentX < relativeScrollX + usableWidth) {
-      currentX = query(++i);
-    }
-    end = i;
-  }
+  const { start, end } = calculateGenericRange({
+    scrollPos: relativeScrollX,
+    containerSize: usableWidth,
+    count: columnCount,
+    bufferBefore: colBuffer,
+    bufferAfter: colBuffer,
+    gap: columnGap,
+    fixedSize: fixedWidth,
+    findLowerBound,
+    query,
+  });
 
-  // Add buffer of columns
-  const safeStart = Math.max(0, start - colBuffer);
-  const safeEnd = Math.min(columnCount, end + colBuffer);
+  const safeStart = start;
+  const safeEnd = end;
 
   const padStart = fixedWidth !== null ? safeStart * (fixedWidth + columnGap) : query(safeStart);
   const totalWidth = fixedWidth !== null ? columnCount * (fixedWidth + columnGap) - columnGap : Math.max(0, totalColsQuery() - columnGap);
 
-  const renderedEnd = fixedWidth !== null
-    ? (safeEnd * (fixedWidth + columnGap) - (safeEnd >= columnCount ? columnGap : 0))
-    : (query(safeEnd) - (safeEnd >= columnCount ? columnGap : 0));
+  const contentEnd = fixedWidth !== null
+    ? (safeEnd * (fixedWidth + columnGap) - (safeEnd > 0 ? columnGap : 0))
+    : (query(safeEnd) - (safeEnd > 0 ? columnGap : 0));
 
   return {
     start: safeStart,
     end: safeEnd,
     padStart,
-    padEnd: Math.max(0, totalWidth - renderedEnd),
+    padEnd: Math.max(0, totalWidth - contentEnd),
   };
 }
 
 /**
  * Calculates the sticky state and offset for a single item.
  *
- * @param params - The parameters for calculation.
- * @returns Sticky state and offset.
+ * @param params - Sticky item parameters.
+ * @param params.index - Item index.
+ * @param params.isSticky - If configured as sticky.
+ * @param params.direction - Scroll direction.
+ * @param params.relativeScrollX - Virtual horizontal position (VU).
+ * @param params.relativeScrollY - Virtual vertical position (VU).
+ * @param params.originalX - Virtual original X position (VU).
+ * @param params.originalY - Virtual original Y position (VU).
+ * @param params.width - Virtual item width (VU).
+ * @param params.height - Virtual item height (VU).
+ * @param params.stickyIndices - All sticky indices.
+ * @param params.fixedSize - Fixed item size (VU).
+ * @param params.fixedWidth - Fixed column width (VU).
+ * @param params.gap - Item gap (VU).
+ * @param params.columnGap - Column gap (VU).
+ * @param params.getItemQueryY - Resolver for vertical offset (VU).
+ * @param params.getItemQueryX - Resolver for horizontal offset (VU).
+ * @returns Sticky state and offset (VU).
  * @see StickyParams
  */
-export function calculateStickyItem(params: StickyParams) {
-  const {
-    index,
-    isSticky,
-    direction,
-    relativeScrollX,
-    relativeScrollY,
-    originalX,
-    originalY,
-    width,
-    height,
-    stickyIndices,
-    fixedSize,
-    fixedWidth,
-    gap,
-    columnGap,
-    getItemQueryY,
-    getItemQueryX,
-  } = params;
-
+export function calculateStickyItem({
+  index,
+  isSticky,
+  direction,
+  relativeScrollX,
+  relativeScrollY,
+  originalX,
+  originalY,
+  width,
+  height,
+  stickyIndices,
+  fixedSize,
+  fixedWidth,
+  gap,
+  columnGap,
+  getItemQueryY,
+  getItemQueryX,
+}: StickyParams) {
   let isStickyActive = false;
   const stickyOffset = { x: 0, y: 0 };
 
@@ -379,21 +672,10 @@ export function calculateStickyItem(params: StickyParams) {
     return { isStickyActive, stickyOffset };
   }
 
+  // Y Axis (Sticky Rows)
   if (direction === 'vertical' || direction === 'both') {
     if (relativeScrollY > originalY) {
-      // Check if next sticky item pushes this one
-      let nextStickyIdx: number | undefined;
-      let low = 0;
-      let high = stickyIndices.length - 1;
-      while (low <= high) {
-        const mid = (low + high) >>> 1;
-        if (stickyIndices[ mid ]! > index) {
-          nextStickyIdx = stickyIndices[ mid ];
-          high = mid - 1;
-        } else {
-          low = mid + 1;
-        }
-      }
+      const nextStickyIdx = findNextStickyIndex(stickyIndices, index);
 
       if (nextStickyIdx !== undefined) {
         const nextStickyY = fixedSize !== null ? nextStickyIdx * (fixedSize + gap) : getItemQueryY(nextStickyIdx);
@@ -409,20 +691,10 @@ export function calculateStickyItem(params: StickyParams) {
     }
   }
 
+  // X Axis (Sticky Columns / Items)
   if (direction === 'horizontal' || (direction === 'both' && !isStickyActive)) {
     if (relativeScrollX > originalX) {
-      let nextStickyIdx: number | undefined;
-      let low = 0;
-      let high = stickyIndices.length - 1;
-      while (low <= high) {
-        const mid = (low + high) >>> 1;
-        if (stickyIndices[ mid ]! > index) {
-          nextStickyIdx = stickyIndices[ mid ];
-          high = mid - 1;
-        } else {
-          low = mid + 1;
-        }
-      }
+      const nextStickyIdx = findNextStickyIndex(stickyIndices, index);
 
       if (nextStickyIdx !== undefined) {
         const nextStickyX = direction === 'horizontal'
@@ -447,26 +719,38 @@ export function calculateStickyItem(params: StickyParams) {
 /**
  * Calculates the position and size of a single item.
  *
- * @param params - The parameters for calculation.
- * @returns Item position and size.
+ * @param params - Item position parameters.
+ * @param params.index - Item index.
+ * @param params.direction - Scroll direction.
+ * @param params.fixedSize - Fixed item size (VU).
+ * @param params.gap - Item gap (VU).
+ * @param params.columnGap - Column gap (VU).
+ * @param params.usableWidth - Usable viewport width (VU).
+ * @param params.usableHeight - Usable viewport height (VU).
+ * @param params.totalWidth - Total estimated width (VU).
+ * @param params.queryY - Resolver for vertical offset (VU).
+ * @param params.queryX - Resolver for horizontal offset (VU).
+ * @param params.getSizeY - Resolver for height (VU).
+ * @param params.getSizeX - Resolver for width (VU).
+ * @param params.columnRange - Current column range (for grid mode).
+ * @returns Item position and size (VU).
  * @see ItemPositionParams
  */
-export function calculateItemPosition(params: ItemPositionParams) {
-  const {
-    index,
-    direction,
-    fixedSize,
-    gap,
-    columnGap,
-    usableWidth,
-    usableHeight,
-    totalWidth,
-    queryY,
-    queryX,
-    getSizeY,
-    getSizeX,
-  } = params;
-
+export function calculateItemPosition({
+  index,
+  direction,
+  fixedSize,
+  gap,
+  columnGap,
+  usableWidth,
+  usableHeight,
+  totalWidth,
+  queryY,
+  queryX,
+  getSizeY,
+  getSizeX,
+  columnRange,
+}: ItemPositionParams) {
   let x = 0;
   let y = 0;
   let width = 0;
@@ -476,9 +760,13 @@ export function calculateItemPosition(params: ItemPositionParams) {
     x = fixedSize !== null ? index * (fixedSize + columnGap) : queryX(index);
     width = fixedSize !== null ? fixedSize : getSizeX(index) - columnGap;
     height = usableHeight;
+  } else if (direction === 'both' && columnRange) {
+    y = fixedSize !== null ? index * (fixedSize + gap) : queryY(index);
+    height = fixedSize !== null ? fixedSize : getSizeY(index) - gap;
+    x = columnRange.padStart;
+    width = Math.max(0, totalWidth - columnRange.padStart - columnRange.padEnd);
   } else {
-    // vertical or both
-    y = (direction === 'vertical' || direction === 'both') && fixedSize !== null ? index * (fixedSize + gap) : queryY(index);
+    y = fixedSize !== null ? index * (fixedSize + gap) : queryY(index);
     height = fixedSize !== null ? fixedSize : getSizeY(index) - gap;
     width = direction === 'both' ? totalWidth : usableWidth;
   }
@@ -489,21 +777,28 @@ export function calculateItemPosition(params: ItemPositionParams) {
 /**
  * Calculates the style object for a rendered item.
  *
- * @param params - The parameters for calculation.
+ * @param params - Item style parameters.
+ * @param params.item - Rendered item state.
+ * @param params.direction - Scroll direction.
+ * @param params.itemSize - Virtual item size (VU).
+ * @param params.containerTag - Container HTML tag.
+ * @param params.paddingStartX - Horizontal virtual padding (DU).
+ * @param params.paddingStartY - Vertical virtual padding (DU).
+ * @param params.isHydrated - If mounted and hydrated.
+ * @param params.isRtl - If in RTL mode.
  * @returns Style object.
  * @see ItemStyleParams
  */
-export function calculateItemStyle<T = unknown>(params: ItemStyleParams<T>) {
-  const {
-    item,
-    direction,
-    itemSize,
-    containerTag,
-    paddingStartX,
-    paddingStartY,
-    isHydrated,
-  } = params;
-
+export function calculateItemStyle<T = unknown>({
+  item,
+  direction,
+  itemSize,
+  containerTag,
+  paddingStartX,
+  paddingStartY,
+  isHydrated,
+  isRtl,
+}: ItemStyleParams<T>) {
   const isVertical = direction === 'vertical';
   const isHorizontal = direction === 'horizontal';
   const isBoth = direction === 'both';
@@ -529,18 +824,20 @@ export function calculateItemStyle<T = unknown>(params: ItemStyleParams<T>) {
   }
 
   if (isHydrated) {
+    const tx = isRtl
+      ? -(item.isStickyActive ? item.stickyOffset.x : item.offset.x)
+      : (item.isStickyActive ? item.stickyOffset.x : item.offset.x);
+
     if (item.isStickyActive) {
       if (isVertical || isBoth) {
         style.insetBlockStart = `${ paddingStartY }px`;
       }
-
       if (isHorizontal || isBoth) {
         style.insetInlineStart = `${ paddingStartX }px`;
       }
-
-      style.transform = `translate(${ item.stickyOffset.x }px, ${ item.stickyOffset.y }px)`;
+      style.transform = `translate(${ tx }px, ${ item.stickyOffset.y }px)`;
     } else {
-      style.transform = `translate(${ item.offset.x }px, ${ item.offset.y }px)`;
+      style.transform = `translate(${ tx }px, ${ item.offset.y }px)`;
     }
   }
 
@@ -550,56 +847,55 @@ export function calculateItemStyle<T = unknown>(params: ItemStyleParams<T>) {
 /**
  * Calculates the total width and height of the virtualized content.
  *
- * @param params - The parameters for calculation.
- * @returns Total width and height.
+ * @param params - Total size parameters.
+ * @param params.direction - Scroll direction.
+ * @param params.itemsLength - Total item count.
+ * @param params.columnCount - Column count.
+ * @param params.fixedSize - Fixed item size (VU).
+ * @param params.fixedWidth - Fixed column width (VU).
+ * @param params.gap - Item gap (VU).
+ * @param params.columnGap - Column gap (VU).
+ * @param params.usableWidth - Usable viewport width (VU).
+ * @param params.usableHeight - Usable viewport height (VU).
+ * @param params.queryY - Resolver for vertical offset (VU).
+ * @param params.queryX - Resolver for horizontal offset (VU).
+ * @param params.queryColumn - Resolver for column offset (VU).
+ * @returns Total width and height (VU).
  * @see TotalSizeParams
  */
-export function calculateTotalSize(params: TotalSizeParams) {
-  const {
-    direction,
-    itemsLength,
-    columnCount,
-    fixedSize,
-    fixedWidth,
-    gap,
-    columnGap,
-    usableWidth,
-    usableHeight,
-    queryY,
-    queryX,
-    queryColumn,
-  } = params;
+export function calculateTotalSize({
+  direction,
+  itemsLength,
+  columnCount,
+  fixedSize,
+  fixedWidth,
+  gap,
+  columnGap,
+  usableWidth,
+  usableHeight,
+  queryY,
+  queryX,
+  queryColumn,
+}: TotalSizeParams) {
+  const isBoth = direction === 'both';
+  const isHorizontal = direction === 'horizontal';
 
   let width = 0;
   let height = 0;
 
-  if (direction === 'both') {
-    if (columnCount > 0) {
-      width = fixedWidth !== null ? columnCount * (fixedWidth + columnGap) - columnGap : Math.max(0, queryColumn(columnCount) - columnGap);
-    }
-    if (fixedSize !== null) {
-      height = Math.max(0, itemsLength * (fixedSize + gap) - (itemsLength > 0 ? gap : 0));
-    } else {
-      height = Math.max(0, queryY(itemsLength) - (itemsLength > 0 ? gap : 0));
-    }
-    width = Math.max(width, usableWidth);
-    height = Math.max(height, usableHeight);
-  } else if (direction === 'horizontal') {
-    if (fixedSize !== null) {
-      width = Math.max(0, itemsLength * (fixedSize + columnGap) - (itemsLength > 0 ? columnGap : 0));
-    } else {
-      width = Math.max(0, queryX(itemsLength) - (itemsLength > 0 ? columnGap : 0));
-    }
+  if (isBoth) {
+    width = calculateAxisSize(columnCount, fixedWidth, columnGap, queryColumn);
+    height = calculateAxisSize(itemsLength, fixedSize, gap, queryY);
+  } else if (isHorizontal) {
+    width = calculateAxisSize(itemsLength, fixedSize, columnGap, queryX);
     height = usableHeight;
   } else {
-    // vertical
     width = usableWidth;
-    if (fixedSize !== null) {
-      height = Math.max(0, itemsLength * (fixedSize + gap) - (itemsLength > 0 ? gap : 0));
-    } else {
-      height = Math.max(0, queryY(itemsLength) - (itemsLength > 0 ? gap : 0));
-    }
+    height = calculateAxisSize(itemsLength, fixedSize, gap, queryY);
   }
 
-  return { width, height };
+  return {
+    width: isBoth ? Math.max(width, usableWidth) : width,
+    height: isBoth ? Math.max(height, usableHeight) : height,
+  };
 }