@legendapp/list 2.0.0 → 2.0.2

package/index.d.mts

@@ -345,6 +345,11 @@ interface InternalState {
         animated?: boolean;
     } | undefined;
     needsOtherAxisSize?: boolean;
+    positionRange: {
+        start: number;
+        end: number;
+        valid: boolean;
+    };
     averageSizes: Record<string, {
         num: number;
         avg: number;
@@ -414,11 +419,11 @@ type ScrollState = {
     endBuffered: number;
     isAtEnd: boolean;
     isAtStart: boolean;
-    positionAtIndex: (index: number) => number;
+    positionAtIndex: (index: number) => number | undefined;
     positions: Map<string, number>;
     scroll: number;
     scrollLength: number;
-    sizeAtIndex: (index: number) => number;
+    sizeAtIndex: (index: number) => number | undefined;
     sizes: Map<string, number>;
     start: number;
     startBuffered: number;

package/index.d.ts

@@ -345,6 +345,11 @@ interface InternalState {
         animated?: boolean;
     } | undefined;
     needsOtherAxisSize?: boolean;
+    positionRange: {
+        start: number;
+        end: number;
+        valid: boolean;
+    };
     averageSizes: Record<string, {
         num: number;
         avg: number;
@@ -414,11 +419,11 @@ type ScrollState = {
     endBuffered: number;
     isAtEnd: boolean;
     isAtStart: boolean;
-    positionAtIndex: (index: number) => number;
+    positionAtIndex: (index: number) => number | undefined;
     positions: Map<string, number>;
     scroll: number;
     scrollLength: number;
-    sizeAtIndex: (index: number) => number;
+    sizeAtIndex: (index: number) => number | undefined;
     sizes: Map<string, number>;
     start: number;
     startBuffered: number;

package/index.js

@@ -897,23 +897,6 @@ function getId(state, index) {
   return id;
 }
 
-// src/core/calculateOffsetForIndex.ts
-function calculateOffsetForIndex(ctx, state, index) {
-  let position = 0;
-  if (index !== void 0) {
-    position = (state == null ? void 0 : state.positions.get(getId(state, index))) || 0;
-    const paddingTop = peek$(ctx, "stylePaddingTop");
-    if (paddingTop) {
-      position += paddingTop;
-    }
-    const headerSize = peek$(ctx, "headerSize");
-    if (headerSize) {
-      position += headerSize;
-    }
-  }
-  return position;
-}
-
 // src/utils/getItemSize.ts
 function getItemSize(state, key, index, data, useAverageSize) {
   var _a, _b;
@@ -955,6 +938,280 @@ function getItemSize(state, key, index, data, useAverageSize) {
   return size;
 }
 
+// src/utils/setPaddingTop.ts
+function setPaddingTop(ctx, state, { stylePaddingTop, alignItemsPaddingTop }) {
+  if (stylePaddingTop !== void 0) {
+    const prevStylePaddingTop = peek$(ctx, "stylePaddingTop") || 0;
+    if (stylePaddingTop < prevStylePaddingTop) {
+      let prevTotalSize = peek$(ctx, "totalSize") || 0;
+      set$(ctx, "totalSize", prevTotalSize + prevStylePaddingTop);
+      state.timeoutSetPaddingTop = setTimeout(() => {
+        prevTotalSize = peek$(ctx, "totalSize") || 0;
+        set$(ctx, "totalSize", prevTotalSize - prevStylePaddingTop);
+      }, 16);
+    }
+    set$(ctx, "stylePaddingTop", stylePaddingTop);
+  }
+  if (alignItemsPaddingTop !== void 0) {
+    set$(ctx, "alignItemsPaddingTop", alignItemsPaddingTop);
+  }
+}
+
+// src/utils/updateAlignItemsPaddingTop.ts
+function updateAlignItemsPaddingTop(ctx, state) {
+  const {
+    scrollLength,
+    props: { alignItemsAtEnd, data }
+  } = state;
+  if (alignItemsAtEnd) {
+    let alignItemsPaddingTop = 0;
+    if ((data == null ? void 0 : data.length) > 0) {
+      const contentSize = getContentSize(ctx);
+      alignItemsPaddingTop = Math.max(0, Math.floor(scrollLength - contentSize));
+    }
+    setPaddingTop(ctx, state, { alignItemsPaddingTop });
+  }
+}
+
+// src/core/updateTotalSize.ts
+function updateTotalSize(ctx, state) {
+  const {
+    props: { data }
+  } = state;
+  if (data.length === 0) {
+    addTotalSize(ctx, state, null, 0);
+  } else {
+    const lastIndex = data.length - 1;
+    const lastId = getId(state, lastIndex);
+    if (lastId !== void 0) {
+      const lastPosition = getPositionByIndex(ctx, state, lastIndex);
+      if (lastPosition !== void 0) {
+        const lastSize = getItemSize(state, lastId, data.length - 1, data[data.length - 1]);
+        if (lastSize !== void 0) {
+          const totalSize = lastPosition + lastSize;
+          addTotalSize(ctx, state, null, totalSize);
+        }
+      }
+    }
+  }
+}
+function addTotalSize(ctx, state, key, add) {
+  const { alignItemsAtEnd } = state.props;
+  {
+    state.totalSize = add;
+    if (state.timeoutSetPaddingTop) {
+      clearTimeout(state.timeoutSetPaddingTop);
+      state.timeoutSetPaddingTop = void 0;
+    }
+  }
+  set$(ctx, "totalSize", state.totalSize);
+  if (alignItemsAtEnd) {
+    updateAlignItemsPaddingTop(ctx, state);
+  }
+}
+
+// src/utils/updateSnapToOffsets.ts
+function updateSnapToOffsets(ctx, state) {
+  const {
+    props: { snapToIndices }
+  } = state;
+  const snapToOffsets = Array(snapToIndices.length);
+  for (let i = 0; i < snapToIndices.length; i++) {
+    const idx = snapToIndices[i];
+    snapToOffsets[i] = getPositionByIndex(ctx, state, idx) || 0;
+  }
+  set$(ctx, "snapToOffsets", snapToOffsets);
+}
+
+// src/core/updateItemPositions.ts
+function getRequiredRange(_ctx, state) {
+  var _a;
+  const bufferSize = 10;
+  const dataLength = state.props.data.length;
+  let minIndex = 0;
+  let maxIndex = dataLength - 1;
+  if (dataLength < 500) {
+    return { end: maxIndex, start: 0 };
+  }
+  const hasVisibleRange = state.startBuffered >= 0 && state.endBuffered >= 0;
+  if (hasVisibleRange) {
+    minIndex = state.startBuffered;
+    maxIndex = state.endBuffered;
+  }
+  if (((_a = state.scrollingTo) == null ? void 0 : _a.index) !== void 0) {
+    if (hasVisibleRange) {
+      minIndex = Math.min(minIndex, state.scrollingTo.index);
+      maxIndex = Math.max(maxIndex, state.scrollingTo.index);
+    } else {
+      minIndex = state.scrollingTo.index;
+      maxIndex = state.scrollingTo.index;
+    }
+  }
+  minIndex = Math.max(0, minIndex - bufferSize);
+  maxIndex = Math.min(dataLength - 1, maxIndex + bufferSize);
+  return { end: maxIndex, start: minIndex };
+}
+function ensurePositionCalculated(ctx, state, index) {
+  if (!state.positionRange) {
+    state.positionRange = { end: -1, start: 0, valid: false };
+  }
+  if (state.positionRange.valid && index >= state.positionRange.start && index <= state.positionRange.end) {
+    return;
+  }
+  const newStart = state.positionRange.valid ? Math.min(state.positionRange.start, index) : 0;
+  const newEnd = Math.min(
+    state.props.data.length - 1,
+    Math.max(state.positionRange.valid ? state.positionRange.end : 0, index + 50)
+  );
+  updateItemPositions(ctx, state, false, newStart, newEnd);
+}
+function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex) {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const {
+    columns,
+    indexByKey,
+    positions,
+    idCache,
+    sizesKnown,
+    props: { getEstimatedItemSize, snapToIndices, enableAverages }
+  } = state;
+  const data = state.props.data;
+  const numColumns = peek$(ctx, "numColumns");
+  const indexByKeyForChecking = __DEV__ ? /* @__PURE__ */ new Map() : void 0;
+  const useAverageSize = enableAverages && !getEstimatedItemSize;
+  let currentRowTop = 0;
+  let column = 1;
+  let maxSizeInRow = 0;
+  const hasColumns = numColumns > 1;
+  const dataLength = data.length;
+  const requiredRange = getRequiredRange(ctx, state);
+  const shouldOptimize = dataLength >= 500;
+  const optimizedEndIndex = shouldOptimize ? Math.min(dataLength - 1, requiredRange.end) : dataLength - 1;
+  const actualEndIndex = endIndex !== void 0 ? Math.min(endIndex, dataLength - 1) : optimizedEndIndex;
+  let adjustedStartIndex = startIndex;
+  let adjustedEndIndex = actualEndIndex;
+  if (((_a = state.positionRange) == null ? void 0 : _a.valid) && !dataChanged && shouldOptimize) {
+    const existingStart = state.positionRange.start;
+    const existingEnd = state.positionRange.end;
+    const requiredStart = requiredRange.start;
+    const requiredEnd = requiredRange.end;
+    if (requiredStart <= existingEnd + 1 && requiredEnd >= existingStart - 1) {
+      adjustedStartIndex = Math.min(startIndex, Math.min(existingStart, requiredStart));
+      adjustedEndIndex = Math.max(actualEndIndex, Math.max(existingEnd, requiredEnd));
+    } else if (requiredStart > existingEnd + 1) {
+      adjustedStartIndex = Math.min(startIndex, existingEnd + 1);
+      adjustedEndIndex = Math.max(actualEndIndex, requiredEnd);
+    } else if (requiredEnd < existingStart - 1) {
+      adjustedStartIndex = Math.min(startIndex, requiredStart);
+      adjustedEndIndex = Math.max(actualEndIndex, existingStart - 1);
+    }
+  }
+  if (adjustedStartIndex > 0) {
+    const prevIndex = adjustedStartIndex - 1;
+    const prevId = (_b = idCache.get(prevIndex)) != null ? _b : getId(state, prevIndex);
+    const prevPosition = (_c = positions.get(prevId)) != null ? _c : 0;
+    if (hasColumns) {
+      const prevColumn = (_d = columns.get(prevId)) != null ? _d : 1;
+      currentRowTop = prevPosition;
+      column = prevColumn % numColumns + 1;
+    } else {
+      const prevSize = (_e = sizesKnown.get(prevId)) != null ? _e : getItemSize(state, prevId, prevIndex, data[prevIndex], useAverageSize);
+      currentRowTop = prevPosition + prevSize;
+    }
+  }
+  const needsIndexByKey = dataChanged || indexByKey.size === 0;
+  let actualEndReached = adjustedStartIndex;
+  for (let i = adjustedStartIndex; i < dataLength; i++) {
+    const id = (_f = idCache.get(i)) != null ? _f : getId(state, i);
+    const size = (_g = sizesKnown.get(id)) != null ? _g : getItemSize(state, id, i, data[i], useAverageSize);
+    if (__DEV__ && needsIndexByKey) {
+      if (indexByKeyForChecking.has(id)) {
+        console.error(
+          `[legend-list] Error: Detected overlapping key (${id}) which causes missing items and gaps and other terrrible things. Check that keyExtractor returns unique values.`
+        );
+      }
+      indexByKeyForChecking.set(id, i);
+    }
+    positions.set(id, currentRowTop);
+    if (needsIndexByKey) {
+      indexByKey.set(id, i);
+    }
+    columns.set(id, column);
+    if (hasColumns) {
+      if (size > maxSizeInRow) {
+        maxSizeInRow = size;
+      }
+      column++;
+      if (column > numColumns) {
+        currentRowTop += maxSizeInRow;
+        column = 1;
+        maxSizeInRow = 0;
+      }
+    } else {
+      currentRowTop += size;
+    }
+    actualEndReached = i;
+    if (shouldOptimize && i >= adjustedEndIndex && (!((_h = state.scrollingTo) == null ? void 0 : _h.index) || i >= state.scrollingTo.index)) {
+      break;
+    }
+  }
+  if (!state.positionRange) {
+    state.positionRange = { end: -1, start: 0, valid: false };
+  }
+  if (dataChanged) {
+    state.positionRange = {
+      end: actualEndReached,
+      start: adjustedStartIndex,
+      valid: true
+    };
+  } else {
+    state.positionRange = {
+      end: Math.max(state.positionRange.valid ? state.positionRange.end : actualEndReached, actualEndReached),
+      start: Math.min(
+        state.positionRange.valid ? state.positionRange.start : adjustedStartIndex,
+        adjustedStartIndex
+      ),
+      valid: true
+    };
+  }
+  updateTotalSize(ctx, state);
+  if (snapToIndices) {
+    updateSnapToOffsets(ctx, state);
+  }
+}
+
+// src/utils/getPosition.ts
+function getPositionByIndex(ctx, state, index) {
+  ensurePositionCalculated(ctx, state, index);
+  const id = getId(state, index);
+  return id ? state.positions.get(id) : void 0;
+}
+function getPositionById(ctx, state, id) {
+  const index = state.indexByKey.get(id);
+  if (index === void 0) {
+    return state.positions.get(id);
+  }
+  ensurePositionCalculated(ctx, state, index);
+  return state.positions.get(id);
+}
+
+// src/core/calculateOffsetForIndex.ts
+function calculateOffsetForIndex(ctx, state, index) {
+  let position = 0;
+  if (index !== void 0) {
+    position = getPositionByIndex(ctx, state, index) || 0;
+    const paddingTop = peek$(ctx, "stylePaddingTop");
+    if (paddingTop) {
+      position += paddingTop;
+    }
+    const headerSize = peek$(ctx, "headerSize");
+    if (headerSize) {
+      position += headerSize;
+    }
+  }
+  return position;
+}
+
 // src/core/calculateOffsetWithOffsetPosition.ts
 function calculateOffsetWithOffsetPosition(state, offsetParam, params) {
   const { index, viewOffset, viewPosition } = params;
@@ -1048,7 +1305,6 @@ function requestAdjust(ctx, state, positionDiff, dataChanged) {
 function prepareMVCP(ctx, state, dataChanged) {
   const {
     idsInView,
-    positions,
     scrollingTo,
     props: { maintainVisibleContentPosition }
   } = state;
@@ -1066,7 +1322,10 @@ function prepareMVCP(ctx, state, dataChanged) {
           const id = idsInView[i];
           const index = indexByKey.get(id);
           if (index !== void 0) {
-            idsInViewWithPositions.push({ id, position: positions.get(id) });
+            const position = getPositionById(ctx, state, id);
+            if (position !== void 0) {
+              idsInViewWithPositions.push({ id, position });
+            }
           }
         }
       } else {
@@ -1074,7 +1333,10 @@ function prepareMVCP(ctx, state, dataChanged) {
       }
     }
     if (targetId !== void 0) {
-      prevPosition = positions.get(targetId);
+      const pos = getPositionById(ctx, state, targetId);
+      if (pos !== void 0) {
+        prevPosition = pos;
+      }
     }
   }
   return () => {
@@ -1082,7 +1344,7 @@ function prepareMVCP(ctx, state, dataChanged) {
     if (dataChanged && targetId === void 0) {
       for (let i = 0; i < idsInViewWithPositions.length; i++) {
         const { id, position } = idsInViewWithPositions[i];
-        const newPosition = positions.get(id);
+        const newPosition = getPositionById(ctx, state, id);
         if (newPosition !== void 0) {
           positionDiff = newPosition - position;
           break;
@@ -1090,7 +1352,7 @@ function prepareMVCP(ctx, state, dataChanged) {
       }
     }
     if (targetId !== void 0 && prevPosition !== void 0) {
-      const newPosition = positions.get(targetId);
+      const newPosition = getPositionById(ctx, state, targetId);
       if (newPosition !== void 0) {
         positionDiff = newPosition - prevPosition;
       }
@@ -1101,163 +1363,6 @@ function prepareMVCP(ctx, state, dataChanged) {
   };
 }
 
-// src/utils/setPaddingTop.ts
-function setPaddingTop(ctx, state, { stylePaddingTop, alignItemsPaddingTop }) {
-  if (stylePaddingTop !== void 0) {
-    const prevStylePaddingTop = peek$(ctx, "stylePaddingTop") || 0;
-    if (stylePaddingTop < prevStylePaddingTop) {
-      let prevTotalSize = peek$(ctx, "totalSize") || 0;
-      set$(ctx, "totalSize", prevTotalSize + prevStylePaddingTop);
-      state.timeoutSetPaddingTop = setTimeout(() => {
-        prevTotalSize = peek$(ctx, "totalSize") || 0;
-        set$(ctx, "totalSize", prevTotalSize - prevStylePaddingTop);
-      }, 16);
-    }
-    set$(ctx, "stylePaddingTop", stylePaddingTop);
-  }
-  if (alignItemsPaddingTop !== void 0) {
-    set$(ctx, "alignItemsPaddingTop", alignItemsPaddingTop);
-  }
-}
-
-// src/utils/updateAlignItemsPaddingTop.ts
-function updateAlignItemsPaddingTop(ctx, state) {
-  const {
-    scrollLength,
-    props: { alignItemsAtEnd, data }
-  } = state;
-  if (alignItemsAtEnd) {
-    let alignItemsPaddingTop = 0;
-    if ((data == null ? void 0 : data.length) > 0) {
-      const contentSize = getContentSize(ctx);
-      alignItemsPaddingTop = Math.max(0, Math.floor(scrollLength - contentSize));
-    }
-    setPaddingTop(ctx, state, { alignItemsPaddingTop });
-  }
-}
-
-// src/core/updateTotalSize.ts
-function updateTotalSize(ctx, state) {
-  const {
-    positions,
-    props: { data }
-  } = state;
-  if (data.length === 0) {
-    addTotalSize(ctx, state, null, 0);
-  } else {
-    const lastId = getId(state, data.length - 1);
-    if (lastId !== void 0) {
-      const lastPosition = positions.get(lastId);
-      if (lastPosition !== void 0) {
-        const lastSize = getItemSize(state, lastId, data.length - 1, data[data.length - 1]);
-        if (lastSize !== void 0) {
-          const totalSize = lastPosition + lastSize;
-          addTotalSize(ctx, state, null, totalSize);
-        }
-      }
-    }
-  }
-}
-function addTotalSize(ctx, state, key, add) {
-  const { alignItemsAtEnd } = state.props;
-  {
-    state.totalSize = add;
-    if (state.timeoutSetPaddingTop) {
-      clearTimeout(state.timeoutSetPaddingTop);
-      state.timeoutSetPaddingTop = void 0;
-    }
-  }
-  set$(ctx, "totalSize", state.totalSize);
-  if (alignItemsAtEnd) {
-    updateAlignItemsPaddingTop(ctx, state);
-  }
-}
-
-// src/utils/updateSnapToOffsets.ts
-function updateSnapToOffsets(ctx, state) {
-  const {
-    positions,
-    props: { snapToIndices }
-  } = state;
-  const snapToOffsets = Array(snapToIndices.length);
-  for (let i = 0; i < snapToIndices.length; i++) {
-    const idx = snapToIndices[i];
-    const key = getId(state, idx);
-    snapToOffsets[i] = positions.get(key);
-  }
-  set$(ctx, "snapToOffsets", snapToOffsets);
-}
-
-// src/core/updateAllPositions.ts
-function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
-  var _a, _b, _c, _d, _e, _f;
-  const {
-    columns,
-    indexByKey,
-    positions,
-    idCache,
-    sizesKnown,
-    props: { getEstimatedItemSize, snapToIndices, enableAverages }
-  } = state;
-  const data = state.props.data;
-  const numColumns = peek$(ctx, "numColumns");
-  const indexByKeyForChecking = __DEV__ ? /* @__PURE__ */ new Map() : void 0;
-  const useAverageSize = enableAverages && !getEstimatedItemSize;
-  let currentRowTop = 0;
-  let column = 1;
-  let maxSizeInRow = 0;
-  const hasColumns = numColumns > 1;
-  if (startIndex > 0) {
-    const prevIndex = startIndex - 1;
-    const prevId = (_a = idCache.get(prevIndex)) != null ? _a : getId(state, prevIndex);
-    const prevPosition = (_b = positions.get(prevId)) != null ? _b : 0;
-    if (hasColumns) {
-      const prevColumn = (_c = columns.get(prevId)) != null ? _c : 1;
-      currentRowTop = prevPosition;
-      column = prevColumn % numColumns + 1;
-    } else {
-      const prevSize = (_d = sizesKnown.get(prevId)) != null ? _d : getItemSize(state, prevId, prevIndex, data[prevIndex], useAverageSize);
-      currentRowTop = prevPosition + prevSize;
-    }
-  }
-  const needsIndexByKey = dataChanged || indexByKey.size === 0;
-  const dataLength = data.length;
-  for (let i = startIndex; i < dataLength; i++) {
-    const id = (_e = idCache.get(i)) != null ? _e : getId(state, i);
-    const size = (_f = sizesKnown.get(id)) != null ? _f : getItemSize(state, id, i, data[i], useAverageSize);
-    if (__DEV__ && needsIndexByKey) {
-      if (indexByKeyForChecking.has(id)) {
-        console.error(
-          `[legend-list] Error: Detected overlapping key (${id}) which causes missing items and gaps and other terrrible things. Check that keyExtractor returns unique values.`
-        );
-      }
-      indexByKeyForChecking.set(id, i);
-    }
-    positions.set(id, currentRowTop);
-    if (needsIndexByKey) {
-      indexByKey.set(id, i);
-    }
-    columns.set(id, column);
-    if (hasColumns) {
-      if (size > maxSizeInRow) {
-        maxSizeInRow = size;
-      }
-      column++;
-      if (column > numColumns) {
-        currentRowTop += maxSizeInRow;
-        column = 1;
-        maxSizeInRow = 0;
-      }
-    } else {
-      currentRowTop += size;
-    }
-  }
-  updateTotalSize(ctx, state);
-  if (snapToIndices) {
-    updateSnapToOffsets(ctx, state);
-  }
-}
-
 // src/core/viewability.ts
 function ensureViewabilityState(ctx, configId) {
   let map = ctx.mapViewabilityConfigStates;
@@ -1838,7 +1943,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         positions.clear();
       }
       const startIndex = dataChanged ? 0 : minIndexSizeChanged != null ? minIndexSizeChanged : 0;
-      updateAllPositions(ctx, state, dataChanged, startIndex);
+      updateItemPositions(ctx, state, dataChanged, startIndex);
       if (minIndexSizeChanged !== void 0) {
         state.minIndexSizeChanged = void 0;
       }
@@ -1890,7 +1995,8 @@ function calculateItemsInView(ctx, state, params = {}) {
     let loopStart = startBufferedIdOrig ? indexByKey.get(startBufferedIdOrig) || 0 : 0;
     for (let i = loopStart; i >= 0; i--) {
       const id = (_a = idCache.get(i)) != null ? _a : getId(state, i);
-      const top = positions.get(id);
+      const top = getPositionById(ctx, state, id);
+      if (top === void 0) break;
       const size = (_b = sizes.get(id)) != null ? _b : getItemSize(state, id, i, data[i]);
       const bottom = top + size;
       if (bottom > scroll - scrollBuffer) {
@@ -1919,7 +2025,7 @@ function calculateItemsInView(ctx, state, params = {}) {
     for (let i = Math.max(0, loopStart); i < dataLength && (!foundEnd || i <= maxIndexRendered); i++) {
       const id = (_c = idCache.get(i)) != null ? _c : getId(state, i);
       const size = (_d = sizes.get(id)) != null ? _d : getItemSize(state, id, i, data[i]);
-      const top = positions.get(id);
+      const top = getPositionById(ctx, state, id);
       if (!foundEnd) {
         if (startNoBuffer === null && top + size > scroll) {
           startNoBuffer = i;
@@ -2070,7 +2176,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         const item = data[itemIndex];
         if (item !== void 0) {
           const id = (_h = idCache.get(itemIndex)) != null ? _h : getId(state, itemIndex);
-          const position = positions.get(id);
+          const position = getPositionById(ctx, state, id);
           if (position === void 0) {
             set$(ctx, `containerPosition${i}`, POSITION_OUT_OF_VIEW);
           } else {
@@ -2286,8 +2392,6 @@ function updateScroll(ctx, state, newScroll) {
   if (state.scrollHistory.length > 5) {
     state.scrollHistory.shift();
   }
-  state.scrollPrev = state.scroll;
-  state.scrollPrevTime = state.scrollTime;
   state.scroll = newScroll;
   state.scrollTime = currentTime;
   if (Math.abs(state.scroll - state.scrollPrev) > 2) {
@@ -2295,6 +2399,8 @@ function updateScroll(ctx, state, newScroll) {
     checkAtBottom(ctx, state);
     checkAtTop(state);
   }
+  state.scrollPrev = state.scroll;
+  state.scrollPrevTime = state.scrollTime;
 }
 
 // src/core/ScrollAdjustHandler.ts
@@ -2683,6 +2789,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       loadStartTime: Date.now(),
       minIndexSizeChanged: 0,
       nativeMarginTop: 0,
+      positionRange: { end: -1, start: -1, valid: false },
       positions: /* @__PURE__ */ new Map(),
       props: {},
       queuedCalculateItemsInView: 0,
@@ -2795,7 +2902,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   };
   if (isFirst) {
     initializeStateVars();
-    updateAllPositions(ctx, state);
+    updateItemPositions(ctx, state);
   }
   const initialContentOffset = React3.useMemo(() => {
     if (initialScroll) {
@@ -2929,7 +3036,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
           endBuffered: state2.endBuffered,
           isAtEnd: state2.isAtEnd,
           isAtStart: state2.isAtStart,
-          positionAtIndex: (index) => state2.positions.get(getId(state2, index)),
+          positionAtIndex: (index) => getPositionByIndex(ctx, state2, index),
           positions: state2.positions,
           scroll: state2.scroll,
           scrollLength: state2.scrollLength,

package/index.mjs

@@ -876,23 +876,6 @@ function getId(state, index) {
   return id;
 }
 
-// src/core/calculateOffsetForIndex.ts
-function calculateOffsetForIndex(ctx, state, index) {
-  let position = 0;
-  if (index !== void 0) {
-    position = (state == null ? void 0 : state.positions.get(getId(state, index))) || 0;
-    const paddingTop = peek$(ctx, "stylePaddingTop");
-    if (paddingTop) {
-      position += paddingTop;
-    }
-    const headerSize = peek$(ctx, "headerSize");
-    if (headerSize) {
-      position += headerSize;
-    }
-  }
-  return position;
-}
-
 // src/utils/getItemSize.ts
 function getItemSize(state, key, index, data, useAverageSize) {
   var _a, _b;
@@ -934,6 +917,280 @@ function getItemSize(state, key, index, data, useAverageSize) {
   return size;
 }
 
+// src/utils/setPaddingTop.ts
+function setPaddingTop(ctx, state, { stylePaddingTop, alignItemsPaddingTop }) {
+  if (stylePaddingTop !== void 0) {
+    const prevStylePaddingTop = peek$(ctx, "stylePaddingTop") || 0;
+    if (stylePaddingTop < prevStylePaddingTop) {
+      let prevTotalSize = peek$(ctx, "totalSize") || 0;
+      set$(ctx, "totalSize", prevTotalSize + prevStylePaddingTop);
+      state.timeoutSetPaddingTop = setTimeout(() => {
+        prevTotalSize = peek$(ctx, "totalSize") || 0;
+        set$(ctx, "totalSize", prevTotalSize - prevStylePaddingTop);
+      }, 16);
+    }
+    set$(ctx, "stylePaddingTop", stylePaddingTop);
+  }
+  if (alignItemsPaddingTop !== void 0) {
+    set$(ctx, "alignItemsPaddingTop", alignItemsPaddingTop);
+  }
+}
+
+// src/utils/updateAlignItemsPaddingTop.ts
+function updateAlignItemsPaddingTop(ctx, state) {
+  const {
+    scrollLength,
+    props: { alignItemsAtEnd, data }
+  } = state;
+  if (alignItemsAtEnd) {
+    let alignItemsPaddingTop = 0;
+    if ((data == null ? void 0 : data.length) > 0) {
+      const contentSize = getContentSize(ctx);
+      alignItemsPaddingTop = Math.max(0, Math.floor(scrollLength - contentSize));
+    }
+    setPaddingTop(ctx, state, { alignItemsPaddingTop });
+  }
+}
+
+// src/core/updateTotalSize.ts
+function updateTotalSize(ctx, state) {
+  const {
+    props: { data }
+  } = state;
+  if (data.length === 0) {
+    addTotalSize(ctx, state, null, 0);
+  } else {
+    const lastIndex = data.length - 1;
+    const lastId = getId(state, lastIndex);
+    if (lastId !== void 0) {
+      const lastPosition = getPositionByIndex(ctx, state, lastIndex);
+      if (lastPosition !== void 0) {
+        const lastSize = getItemSize(state, lastId, data.length - 1, data[data.length - 1]);
+        if (lastSize !== void 0) {
+          const totalSize = lastPosition + lastSize;
+          addTotalSize(ctx, state, null, totalSize);
+        }
+      }
+    }
+  }
+}
+function addTotalSize(ctx, state, key, add) {
+  const { alignItemsAtEnd } = state.props;
+  {
+    state.totalSize = add;
+    if (state.timeoutSetPaddingTop) {
+      clearTimeout(state.timeoutSetPaddingTop);
+      state.timeoutSetPaddingTop = void 0;
+    }
+  }
+  set$(ctx, "totalSize", state.totalSize);
+  if (alignItemsAtEnd) {
+    updateAlignItemsPaddingTop(ctx, state);
+  }
+}
+
+// src/utils/updateSnapToOffsets.ts
+function updateSnapToOffsets(ctx, state) {
+  const {
+    props: { snapToIndices }
+  } = state;
+  const snapToOffsets = Array(snapToIndices.length);
+  for (let i = 0; i < snapToIndices.length; i++) {
+    const idx = snapToIndices[i];
+    snapToOffsets[i] = getPositionByIndex(ctx, state, idx) || 0;
+  }
+  set$(ctx, "snapToOffsets", snapToOffsets);
+}
+
+// src/core/updateItemPositions.ts
+function getRequiredRange(_ctx, state) {
+  var _a;
+  const bufferSize = 10;
+  const dataLength = state.props.data.length;
+  let minIndex = 0;
+  let maxIndex = dataLength - 1;
+  if (dataLength < 500) {
+    return { end: maxIndex, start: 0 };
+  }
+  const hasVisibleRange = state.startBuffered >= 0 && state.endBuffered >= 0;
+  if (hasVisibleRange) {
+    minIndex = state.startBuffered;
+    maxIndex = state.endBuffered;
+  }
+  if (((_a = state.scrollingTo) == null ? void 0 : _a.index) !== void 0) {
+    if (hasVisibleRange) {
+      minIndex = Math.min(minIndex, state.scrollingTo.index);
+      maxIndex = Math.max(maxIndex, state.scrollingTo.index);
+    } else {
+      minIndex = state.scrollingTo.index;
+      maxIndex = state.scrollingTo.index;
+    }
+  }
+  minIndex = Math.max(0, minIndex - bufferSize);
+  maxIndex = Math.min(dataLength - 1, maxIndex + bufferSize);
+  return { end: maxIndex, start: minIndex };
+}
+function ensurePositionCalculated(ctx, state, index) {
+  if (!state.positionRange) {
+    state.positionRange = { end: -1, start: 0, valid: false };
+  }
+  if (state.positionRange.valid && index >= state.positionRange.start && index <= state.positionRange.end) {
+    return;
+  }
+  const newStart = state.positionRange.valid ? Math.min(state.positionRange.start, index) : 0;
+  const newEnd = Math.min(
+    state.props.data.length - 1,
+    Math.max(state.positionRange.valid ? state.positionRange.end : 0, index + 50)
+  );
+  updateItemPositions(ctx, state, false, newStart, newEnd);
+}
+function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex) {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const {
+    columns,
+    indexByKey,
+    positions,
+    idCache,
+    sizesKnown,
+    props: { getEstimatedItemSize, snapToIndices, enableAverages }
+  } = state;
+  const data = state.props.data;
+  const numColumns = peek$(ctx, "numColumns");
+  const indexByKeyForChecking = __DEV__ ? /* @__PURE__ */ new Map() : void 0;
+  const useAverageSize = enableAverages && !getEstimatedItemSize;
+  let currentRowTop = 0;
+  let column = 1;
+  let maxSizeInRow = 0;
+  const hasColumns = numColumns > 1;
+  const dataLength = data.length;
+  const requiredRange = getRequiredRange(ctx, state);
+  const shouldOptimize = dataLength >= 500;
+  const optimizedEndIndex = shouldOptimize ? Math.min(dataLength - 1, requiredRange.end) : dataLength - 1;
+  const actualEndIndex = endIndex !== void 0 ? Math.min(endIndex, dataLength - 1) : optimizedEndIndex;
+  let adjustedStartIndex = startIndex;
+  let adjustedEndIndex = actualEndIndex;
+  if (((_a = state.positionRange) == null ? void 0 : _a.valid) && !dataChanged && shouldOptimize) {
+    const existingStart = state.positionRange.start;
+    const existingEnd = state.positionRange.end;
+    const requiredStart = requiredRange.start;
+    const requiredEnd = requiredRange.end;
+    if (requiredStart <= existingEnd + 1 && requiredEnd >= existingStart - 1) {
+      adjustedStartIndex = Math.min(startIndex, Math.min(existingStart, requiredStart));
+      adjustedEndIndex = Math.max(actualEndIndex, Math.max(existingEnd, requiredEnd));
+    } else if (requiredStart > existingEnd + 1) {
+      adjustedStartIndex = Math.min(startIndex, existingEnd + 1);
+      adjustedEndIndex = Math.max(actualEndIndex, requiredEnd);
+    } else if (requiredEnd < existingStart - 1) {
+      adjustedStartIndex = Math.min(startIndex, requiredStart);
+      adjustedEndIndex = Math.max(actualEndIndex, existingStart - 1);
+    }
+  }
+  if (adjustedStartIndex > 0) {
+    const prevIndex = adjustedStartIndex - 1;
+    const prevId = (_b = idCache.get(prevIndex)) != null ? _b : getId(state, prevIndex);
+    const prevPosition = (_c = positions.get(prevId)) != null ? _c : 0;
+    if (hasColumns) {
+      const prevColumn = (_d = columns.get(prevId)) != null ? _d : 1;
+      currentRowTop = prevPosition;
+      column = prevColumn % numColumns + 1;
+    } else {
+      const prevSize = (_e = sizesKnown.get(prevId)) != null ? _e : getItemSize(state, prevId, prevIndex, data[prevIndex], useAverageSize);
+      currentRowTop = prevPosition + prevSize;
+    }
+  }
+  const needsIndexByKey = dataChanged || indexByKey.size === 0;
+  let actualEndReached = adjustedStartIndex;
+  for (let i = adjustedStartIndex; i < dataLength; i++) {
+    const id = (_f = idCache.get(i)) != null ? _f : getId(state, i);
+    const size = (_g = sizesKnown.get(id)) != null ? _g : getItemSize(state, id, i, data[i], useAverageSize);
+    if (__DEV__ && needsIndexByKey) {
+      if (indexByKeyForChecking.has(id)) {
+        console.error(
+          `[legend-list] Error: Detected overlapping key (${id}) which causes missing items and gaps and other terrrible things. Check that keyExtractor returns unique values.`
+        );
+      }
+      indexByKeyForChecking.set(id, i);
+    }
+    positions.set(id, currentRowTop);
+    if (needsIndexByKey) {
+      indexByKey.set(id, i);
+    }
+    columns.set(id, column);
+    if (hasColumns) {
+      if (size > maxSizeInRow) {
+        maxSizeInRow = size;
+      }
+      column++;
+      if (column > numColumns) {
+        currentRowTop += maxSizeInRow;
+        column = 1;
+        maxSizeInRow = 0;
+      }
+    } else {
+      currentRowTop += size;
+    }
+    actualEndReached = i;
+    if (shouldOptimize && i >= adjustedEndIndex && (!((_h = state.scrollingTo) == null ? void 0 : _h.index) || i >= state.scrollingTo.index)) {
+      break;
+    }
+  }
+  if (!state.positionRange) {
+    state.positionRange = { end: -1, start: 0, valid: false };
+  }
+  if (dataChanged) {
+    state.positionRange = {
+      end: actualEndReached,
+      start: adjustedStartIndex,
+      valid: true
+    };
+  } else {
+    state.positionRange = {
+      end: Math.max(state.positionRange.valid ? state.positionRange.end : actualEndReached, actualEndReached),
+      start: Math.min(
+        state.positionRange.valid ? state.positionRange.start : adjustedStartIndex,
+        adjustedStartIndex
+      ),
+      valid: true
+    };
+  }
+  updateTotalSize(ctx, state);
+  if (snapToIndices) {
+    updateSnapToOffsets(ctx, state);
+  }
+}
+
+// src/utils/getPosition.ts
+function getPositionByIndex(ctx, state, index) {
+  ensurePositionCalculated(ctx, state, index);
+  const id = getId(state, index);
+  return id ? state.positions.get(id) : void 0;
+}
+function getPositionById(ctx, state, id) {
+  const index = state.indexByKey.get(id);
+  if (index === void 0) {
+    return state.positions.get(id);
+  }
+  ensurePositionCalculated(ctx, state, index);
+  return state.positions.get(id);
+}
+
+// src/core/calculateOffsetForIndex.ts
+function calculateOffsetForIndex(ctx, state, index) {
+  let position = 0;
+  if (index !== void 0) {
+    position = getPositionByIndex(ctx, state, index) || 0;
+    const paddingTop = peek$(ctx, "stylePaddingTop");
+    if (paddingTop) {
+      position += paddingTop;
+    }
+    const headerSize = peek$(ctx, "headerSize");
+    if (headerSize) {
+      position += headerSize;
+    }
+  }
+  return position;
+}
+
 // src/core/calculateOffsetWithOffsetPosition.ts
 function calculateOffsetWithOffsetPosition(state, offsetParam, params) {
   const { index, viewOffset, viewPosition } = params;
@@ -1027,7 +1284,6 @@ function requestAdjust(ctx, state, positionDiff, dataChanged) {
 function prepareMVCP(ctx, state, dataChanged) {
   const {
     idsInView,
-    positions,
     scrollingTo,
     props: { maintainVisibleContentPosition }
   } = state;
@@ -1045,7 +1301,10 @@ function prepareMVCP(ctx, state, dataChanged) {
           const id = idsInView[i];
           const index = indexByKey.get(id);
           if (index !== void 0) {
-            idsInViewWithPositions.push({ id, position: positions.get(id) });
+            const position = getPositionById(ctx, state, id);
+            if (position !== void 0) {
+              idsInViewWithPositions.push({ id, position });
+            }
           }
         }
       } else {
@@ -1053,7 +1312,10 @@ function prepareMVCP(ctx, state, dataChanged) {
       }
     }
     if (targetId !== void 0) {
-      prevPosition = positions.get(targetId);
+      const pos = getPositionById(ctx, state, targetId);
+      if (pos !== void 0) {
+        prevPosition = pos;
+      }
     }
   }
   return () => {
@@ -1061,7 +1323,7 @@ function prepareMVCP(ctx, state, dataChanged) {
     if (dataChanged && targetId === void 0) {
       for (let i = 0; i < idsInViewWithPositions.length; i++) {
         const { id, position } = idsInViewWithPositions[i];
-        const newPosition = positions.get(id);
+        const newPosition = getPositionById(ctx, state, id);
         if (newPosition !== void 0) {
           positionDiff = newPosition - position;
           break;
@@ -1069,7 +1331,7 @@ function prepareMVCP(ctx, state, dataChanged) {
       }
     }
     if (targetId !== void 0 && prevPosition !== void 0) {
-      const newPosition = positions.get(targetId);
+      const newPosition = getPositionById(ctx, state, targetId);
       if (newPosition !== void 0) {
         positionDiff = newPosition - prevPosition;
       }
@@ -1080,163 +1342,6 @@ function prepareMVCP(ctx, state, dataChanged) {
   };
 }
 
-// src/utils/setPaddingTop.ts
-function setPaddingTop(ctx, state, { stylePaddingTop, alignItemsPaddingTop }) {
-  if (stylePaddingTop !== void 0) {
-    const prevStylePaddingTop = peek$(ctx, "stylePaddingTop") || 0;
-    if (stylePaddingTop < prevStylePaddingTop) {
-      let prevTotalSize = peek$(ctx, "totalSize") || 0;
-      set$(ctx, "totalSize", prevTotalSize + prevStylePaddingTop);
-      state.timeoutSetPaddingTop = setTimeout(() => {
-        prevTotalSize = peek$(ctx, "totalSize") || 0;
-        set$(ctx, "totalSize", prevTotalSize - prevStylePaddingTop);
-      }, 16);
-    }
-    set$(ctx, "stylePaddingTop", stylePaddingTop);
-  }
-  if (alignItemsPaddingTop !== void 0) {
-    set$(ctx, "alignItemsPaddingTop", alignItemsPaddingTop);
-  }
-}
-
-// src/utils/updateAlignItemsPaddingTop.ts
-function updateAlignItemsPaddingTop(ctx, state) {
-  const {
-    scrollLength,
-    props: { alignItemsAtEnd, data }
-  } = state;
-  if (alignItemsAtEnd) {
-    let alignItemsPaddingTop = 0;
-    if ((data == null ? void 0 : data.length) > 0) {
-      const contentSize = getContentSize(ctx);
-      alignItemsPaddingTop = Math.max(0, Math.floor(scrollLength - contentSize));
-    }
-    setPaddingTop(ctx, state, { alignItemsPaddingTop });
-  }
-}
-
-// src/core/updateTotalSize.ts
-function updateTotalSize(ctx, state) {
-  const {
-    positions,
-    props: { data }
-  } = state;
-  if (data.length === 0) {
-    addTotalSize(ctx, state, null, 0);
-  } else {
-    const lastId = getId(state, data.length - 1);
-    if (lastId !== void 0) {
-      const lastPosition = positions.get(lastId);
-      if (lastPosition !== void 0) {
-        const lastSize = getItemSize(state, lastId, data.length - 1, data[data.length - 1]);
-        if (lastSize !== void 0) {
-          const totalSize = lastPosition + lastSize;
-          addTotalSize(ctx, state, null, totalSize);
-        }
-      }
-    }
-  }
-}
-function addTotalSize(ctx, state, key, add) {
-  const { alignItemsAtEnd } = state.props;
-  {
-    state.totalSize = add;
-    if (state.timeoutSetPaddingTop) {
-      clearTimeout(state.timeoutSetPaddingTop);
-      state.timeoutSetPaddingTop = void 0;
-    }
-  }
-  set$(ctx, "totalSize", state.totalSize);
-  if (alignItemsAtEnd) {
-    updateAlignItemsPaddingTop(ctx, state);
-  }
-}
-
-// src/utils/updateSnapToOffsets.ts
-function updateSnapToOffsets(ctx, state) {
-  const {
-    positions,
-    props: { snapToIndices }
-  } = state;
-  const snapToOffsets = Array(snapToIndices.length);
-  for (let i = 0; i < snapToIndices.length; i++) {
-    const idx = snapToIndices[i];
-    const key = getId(state, idx);
-    snapToOffsets[i] = positions.get(key);
-  }
-  set$(ctx, "snapToOffsets", snapToOffsets);
-}
-
-// src/core/updateAllPositions.ts
-function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
-  var _a, _b, _c, _d, _e, _f;
-  const {
-    columns,
-    indexByKey,
-    positions,
-    idCache,
-    sizesKnown,
-    props: { getEstimatedItemSize, snapToIndices, enableAverages }
-  } = state;
-  const data = state.props.data;
-  const numColumns = peek$(ctx, "numColumns");
-  const indexByKeyForChecking = __DEV__ ? /* @__PURE__ */ new Map() : void 0;
-  const useAverageSize = enableAverages && !getEstimatedItemSize;
-  let currentRowTop = 0;
-  let column = 1;
-  let maxSizeInRow = 0;
-  const hasColumns = numColumns > 1;
-  if (startIndex > 0) {
-    const prevIndex = startIndex - 1;
-    const prevId = (_a = idCache.get(prevIndex)) != null ? _a : getId(state, prevIndex);
-    const prevPosition = (_b = positions.get(prevId)) != null ? _b : 0;
-    if (hasColumns) {
-      const prevColumn = (_c = columns.get(prevId)) != null ? _c : 1;
-      currentRowTop = prevPosition;
-      column = prevColumn % numColumns + 1;
-    } else {
-      const prevSize = (_d = sizesKnown.get(prevId)) != null ? _d : getItemSize(state, prevId, prevIndex, data[prevIndex], useAverageSize);
-      currentRowTop = prevPosition + prevSize;
-    }
-  }
-  const needsIndexByKey = dataChanged || indexByKey.size === 0;
-  const dataLength = data.length;
-  for (let i = startIndex; i < dataLength; i++) {
-    const id = (_e = idCache.get(i)) != null ? _e : getId(state, i);
-    const size = (_f = sizesKnown.get(id)) != null ? _f : getItemSize(state, id, i, data[i], useAverageSize);
-    if (__DEV__ && needsIndexByKey) {
-      if (indexByKeyForChecking.has(id)) {
-        console.error(
-          `[legend-list] Error: Detected overlapping key (${id}) which causes missing items and gaps and other terrrible things. Check that keyExtractor returns unique values.`
-        );
-      }
-      indexByKeyForChecking.set(id, i);
-    }
-    positions.set(id, currentRowTop);
-    if (needsIndexByKey) {
-      indexByKey.set(id, i);
-    }
-    columns.set(id, column);
-    if (hasColumns) {
-      if (size > maxSizeInRow) {
-        maxSizeInRow = size;
-      }
-      column++;
-      if (column > numColumns) {
-        currentRowTop += maxSizeInRow;
-        column = 1;
-        maxSizeInRow = 0;
-      }
-    } else {
-      currentRowTop += size;
-    }
-  }
-  updateTotalSize(ctx, state);
-  if (snapToIndices) {
-    updateSnapToOffsets(ctx, state);
-  }
-}
-
 // src/core/viewability.ts
 function ensureViewabilityState(ctx, configId) {
   let map = ctx.mapViewabilityConfigStates;
@@ -1817,7 +1922,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         positions.clear();
       }
       const startIndex = dataChanged ? 0 : minIndexSizeChanged != null ? minIndexSizeChanged : 0;
-      updateAllPositions(ctx, state, dataChanged, startIndex);
+      updateItemPositions(ctx, state, dataChanged, startIndex);
       if (minIndexSizeChanged !== void 0) {
         state.minIndexSizeChanged = void 0;
       }
@@ -1869,7 +1974,8 @@ function calculateItemsInView(ctx, state, params = {}) {
     let loopStart = startBufferedIdOrig ? indexByKey.get(startBufferedIdOrig) || 0 : 0;
     for (let i = loopStart; i >= 0; i--) {
       const id = (_a = idCache.get(i)) != null ? _a : getId(state, i);
-      const top = positions.get(id);
+      const top = getPositionById(ctx, state, id);
+      if (top === void 0) break;
       const size = (_b = sizes.get(id)) != null ? _b : getItemSize(state, id, i, data[i]);
       const bottom = top + size;
       if (bottom > scroll - scrollBuffer) {
@@ -1898,7 +2004,7 @@ function calculateItemsInView(ctx, state, params = {}) {
     for (let i = Math.max(0, loopStart); i < dataLength && (!foundEnd || i <= maxIndexRendered); i++) {
       const id = (_c = idCache.get(i)) != null ? _c : getId(state, i);
       const size = (_d = sizes.get(id)) != null ? _d : getItemSize(state, id, i, data[i]);
-      const top = positions.get(id);
+      const top = getPositionById(ctx, state, id);
       if (!foundEnd) {
         if (startNoBuffer === null && top + size > scroll) {
           startNoBuffer = i;
@@ -2049,7 +2155,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         const item = data[itemIndex];
         if (item !== void 0) {
           const id = (_h = idCache.get(itemIndex)) != null ? _h : getId(state, itemIndex);
-          const position = positions.get(id);
+          const position = getPositionById(ctx, state, id);
           if (position === void 0) {
             set$(ctx, `containerPosition${i}`, POSITION_OUT_OF_VIEW);
           } else {
@@ -2265,8 +2371,6 @@ function updateScroll(ctx, state, newScroll) {
   if (state.scrollHistory.length > 5) {
     state.scrollHistory.shift();
   }
-  state.scrollPrev = state.scroll;
-  state.scrollPrevTime = state.scrollTime;
   state.scroll = newScroll;
   state.scrollTime = currentTime;
   if (Math.abs(state.scroll - state.scrollPrev) > 2) {
@@ -2274,6 +2378,8 @@ function updateScroll(ctx, state, newScroll) {
     checkAtBottom(ctx, state);
     checkAtTop(state);
   }
+  state.scrollPrev = state.scroll;
+  state.scrollPrevTime = state.scrollTime;
 }
 
 // src/core/ScrollAdjustHandler.ts
@@ -2662,6 +2768,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       loadStartTime: Date.now(),
       minIndexSizeChanged: 0,
       nativeMarginTop: 0,
+      positionRange: { end: -1, start: -1, valid: false },
       positions: /* @__PURE__ */ new Map(),
       props: {},
       queuedCalculateItemsInView: 0,
@@ -2774,7 +2881,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   };
   if (isFirst) {
     initializeStateVars();
-    updateAllPositions(ctx, state);
+    updateItemPositions(ctx, state);
   }
   const initialContentOffset = useMemo(() => {
     if (initialScroll) {
@@ -2908,7 +3015,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
           endBuffered: state2.endBuffered,
           isAtEnd: state2.isAtEnd,
           isAtStart: state2.isAtStart,
-          positionAtIndex: (index) => state2.positions.get(getId(state2, index)),
+          positionAtIndex: (index) => getPositionByIndex(ctx, state2, index),
           positions: state2.positions,
           scroll: state2.scroll,
           scrollLength: state2.scrollLength,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/list",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Legend List is a drop-in replacement for FlatList with much better performance and supporting dynamically sized items.",
   "sideEffects": false,
   "private": false,