@legendapp/list 2.0.0 → 2.0.1

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,152 +938,6 @@ function getItemSize(state, key, index, data, useAverageSize) {
   return size;
 }
 
-// src/core/calculateOffsetWithOffsetPosition.ts
-function calculateOffsetWithOffsetPosition(state, offsetParam, params) {
-  const { index, viewOffset, viewPosition } = params;
-  let offset = offsetParam;
-  if (viewOffset) {
-    offset -= viewOffset;
-  }
-  if (viewPosition !== void 0 && index !== void 0) {
-    offset -= viewPosition * (state.scrollLength - getItemSize(state, getId(state, index), index, state.props.data[index]));
-  }
-  return offset;
-}
-
-// src/core/finishScrollTo.ts
-var finishScrollTo = (state) => {
-  if (state) {
-    state.scrollingTo = void 0;
-    state.scrollHistory.length = 0;
-  }
-};
-
-// src/core/scrollTo.ts
-function scrollTo(state, params = {}) {
-  var _a;
-  const { animated, noScrollingTo } = params;
-  const {
-    refScroller,
-    props: { horizontal }
-  } = state;
-  const offset = calculateOffsetWithOffsetPosition(state, params.offset, params);
-  state.scrollHistory.length = 0;
-  if (!noScrollingTo) {
-    state.scrollingTo = params;
-  }
-  state.scrollPending = offset;
-  (_a = refScroller.current) == null ? void 0 : _a.scrollTo({
-    animated: !!animated,
-    x: horizontal ? offset : 0,
-    y: horizontal ? 0 : offset
-  });
-  if (!animated) {
-    state.scroll = offset;
-    setTimeout(() => finishScrollTo(state), 100);
-  }
-}
-
-// src/utils/requestAdjust.ts
-function requestAdjust(ctx, state, positionDiff, dataChanged) {
-  if (Math.abs(positionDiff) > 0.1) {
-    const needsScrollWorkaround = reactNative.Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
-    const doit = () => {
-      if (needsScrollWorkaround) {
-        scrollTo(state, {
-          noScrollingTo: true,
-          offset: state.scroll
-        });
-      } else {
-        state.scrollAdjustHandler.requestAdjust(positionDiff);
-      }
-    };
-    state.scroll += positionDiff;
-    state.scrollForNextCalculateItemsInView = void 0;
-    const didLayout = peek$(ctx, "containersDidLayout");
-    if (didLayout) {
-      doit();
-      const threshold = state.scroll - positionDiff / 2;
-      if (!state.ignoreScrollFromMVCP) {
-        state.ignoreScrollFromMVCP = {};
-      }
-      if (positionDiff > 0) {
-        state.ignoreScrollFromMVCP.lt = threshold;
-      } else {
-        state.ignoreScrollFromMVCP.gt = threshold;
-      }
-      if (state.ignoreScrollFromMVCPTimeout) {
-        clearTimeout(state.ignoreScrollFromMVCPTimeout);
-      }
-      state.ignoreScrollFromMVCPTimeout = setTimeout(
-        () => {
-          state.ignoreScrollFromMVCP = void 0;
-        },
-        needsScrollWorkaround ? 250 : 100
-      );
-    } else {
-      requestAnimationFrame(doit);
-    }
-  }
-}
-
-// src/core/mvcp.ts
-function prepareMVCP(ctx, state, dataChanged) {
-  const {
-    idsInView,
-    positions,
-    scrollingTo,
-    props: { maintainVisibleContentPosition }
-  } = state;
-  let prevPosition;
-  let targetId;
-  const idsInViewWithPositions = [];
-  const scrollTarget = scrollingTo == null ? void 0 : scrollingTo.index;
-  if (maintainVisibleContentPosition) {
-    const indexByKey = state.indexByKey;
-    if (scrollTarget !== void 0) {
-      targetId = getId(state, scrollTarget);
-    } else if (idsInView.length > 0 && peek$(ctx, "containersDidLayout")) {
-      if (dataChanged) {
-        for (let i = 0; i < idsInView.length; i++) {
-          const id = idsInView[i];
-          const index = indexByKey.get(id);
-          if (index !== void 0) {
-            idsInViewWithPositions.push({ id, position: positions.get(id) });
-          }
-        }
-      } else {
-        targetId = state.idsInView.find((id) => indexByKey.get(id) !== void 0);
-      }
-    }
-    if (targetId !== void 0) {
-      prevPosition = positions.get(targetId);
-    }
-  }
-  return () => {
-    let positionDiff;
-    if (dataChanged && targetId === void 0) {
-      for (let i = 0; i < idsInViewWithPositions.length; i++) {
-        const { id, position } = idsInViewWithPositions[i];
-        const newPosition = positions.get(id);
-        if (newPosition !== void 0) {
-          positionDiff = newPosition - position;
-          break;
-        }
-      }
-    }
-    if (targetId !== void 0 && prevPosition !== void 0) {
-      const newPosition = positions.get(targetId);
-      if (newPosition !== void 0) {
-        positionDiff = newPosition - prevPosition;
-      }
-    }
-    if (positionDiff !== void 0 && Math.abs(positionDiff) > 0.1) {
-      requestAdjust(ctx, state, positionDiff, dataChanged);
-    }
-  };
-}
-
 // src/utils/setPaddingTop.ts
 function setPaddingTop(ctx, state, { stylePaddingTop, alignItemsPaddingTop }) {
   if (stylePaddingTop !== void 0) {
@@ -1139,15 +976,15 @@ function updateAlignItemsPaddingTop(ctx, state) {
 // 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);
+    const lastIndex = data.length - 1;
+    const lastId = getId(state, lastIndex);
     if (lastId !== void 0) {
-      const lastPosition = positions.get(lastId);
+      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) {
@@ -1176,21 +1013,60 @@ function addTotalSize(ctx, state, key, add) {
 // 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);
+    snapToOffsets[i] = getPositionByIndex(ctx, state, idx) || 0;
   }
   set$(ctx, "snapToOffsets", snapToOffsets);
 }
 
-// src/core/updateAllPositions.ts
-function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
-  var _a, _b, _c, _d, _e, _f;
+// 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;
   const {
     columns,
     indexByKey,
@@ -1222,6 +1098,11 @@ function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
   }
   const needsIndexByKey = dataChanged || indexByKey.size === 0;
   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 actualEndReached = startIndex;
   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);
@@ -1251,6 +1132,26 @@ function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
     } else {
       currentRowTop += size;
     }
+    actualEndReached = i;
+    if (shouldOptimize && i >= actualEndIndex && (!((_g = state.scrollingTo) == null ? void 0 : _g.index) || i >= state.scrollingTo.index)) {
+      break;
+    }
+  }
+  if (!state.positionRange) {
+    state.positionRange = { end: -1, start: 0, valid: false };
+  }
+  if (dataChanged) {
+    state.positionRange = {
+      end: actualEndReached,
+      start: startIndex,
+      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 : startIndex, startIndex),
+      valid: true
+    };
   }
   updateTotalSize(ctx, state);
   if (snapToIndices) {
@@ -1258,6 +1159,189 @@ function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
   }
 }
 
+// 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;
+  let offset = offsetParam;
+  if (viewOffset) {
+    offset -= viewOffset;
+  }
+  if (viewPosition !== void 0 && index !== void 0) {
+    offset -= viewPosition * (state.scrollLength - getItemSize(state, getId(state, index), index, state.props.data[index]));
+  }
+  return offset;
+}
+
+// src/core/finishScrollTo.ts
+var finishScrollTo = (state) => {
+  if (state) {
+    state.scrollingTo = void 0;
+    state.scrollHistory.length = 0;
+  }
+};
+
+// src/core/scrollTo.ts
+function scrollTo(state, params = {}) {
+  var _a;
+  const { animated, noScrollingTo } = params;
+  const {
+    refScroller,
+    props: { horizontal }
+  } = state;
+  const offset = calculateOffsetWithOffsetPosition(state, params.offset, params);
+  state.scrollHistory.length = 0;
+  if (!noScrollingTo) {
+    state.scrollingTo = params;
+  }
+  state.scrollPending = offset;
+  (_a = refScroller.current) == null ? void 0 : _a.scrollTo({
+    animated: !!animated,
+    x: horizontal ? offset : 0,
+    y: horizontal ? 0 : offset
+  });
+  if (!animated) {
+    state.scroll = offset;
+    setTimeout(() => finishScrollTo(state), 100);
+  }
+}
+
+// src/utils/requestAdjust.ts
+function requestAdjust(ctx, state, positionDiff, dataChanged) {
+  if (Math.abs(positionDiff) > 0.1) {
+    const needsScrollWorkaround = reactNative.Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
+    const doit = () => {
+      if (needsScrollWorkaround) {
+        scrollTo(state, {
+          noScrollingTo: true,
+          offset: state.scroll
+        });
+      } else {
+        state.scrollAdjustHandler.requestAdjust(positionDiff);
+      }
+    };
+    state.scroll += positionDiff;
+    state.scrollForNextCalculateItemsInView = void 0;
+    const didLayout = peek$(ctx, "containersDidLayout");
+    if (didLayout) {
+      doit();
+      const threshold = state.scroll - positionDiff / 2;
+      if (!state.ignoreScrollFromMVCP) {
+        state.ignoreScrollFromMVCP = {};
+      }
+      if (positionDiff > 0) {
+        state.ignoreScrollFromMVCP.lt = threshold;
+      } else {
+        state.ignoreScrollFromMVCP.gt = threshold;
+      }
+      if (state.ignoreScrollFromMVCPTimeout) {
+        clearTimeout(state.ignoreScrollFromMVCPTimeout);
+      }
+      state.ignoreScrollFromMVCPTimeout = setTimeout(
+        () => {
+          state.ignoreScrollFromMVCP = void 0;
+        },
+        needsScrollWorkaround ? 250 : 100
+      );
+    } else {
+      requestAnimationFrame(doit);
+    }
+  }
+}
+
+// src/core/mvcp.ts
+function prepareMVCP(ctx, state, dataChanged) {
+  const {
+    idsInView,
+    scrollingTo,
+    props: { maintainVisibleContentPosition }
+  } = state;
+  let prevPosition;
+  let targetId;
+  const idsInViewWithPositions = [];
+  const scrollTarget = scrollingTo == null ? void 0 : scrollingTo.index;
+  if (maintainVisibleContentPosition) {
+    const indexByKey = state.indexByKey;
+    if (scrollTarget !== void 0) {
+      targetId = getId(state, scrollTarget);
+    } else if (idsInView.length > 0 && peek$(ctx, "containersDidLayout")) {
+      if (dataChanged) {
+        for (let i = 0; i < idsInView.length; i++) {
+          const id = idsInView[i];
+          const index = indexByKey.get(id);
+          if (index !== void 0) {
+            const position = getPositionById(ctx, state, id);
+            if (position !== void 0) {
+              idsInViewWithPositions.push({ id, position });
+            }
+          }
+        }
+      } else {
+        targetId = state.idsInView.find((id) => indexByKey.get(id) !== void 0);
+      }
+    }
+    if (targetId !== void 0) {
+      const pos = getPositionById(ctx, state, targetId);
+      if (pos !== void 0) {
+        prevPosition = pos;
+      }
+    }
+  }
+  return () => {
+    let positionDiff;
+    if (dataChanged && targetId === void 0) {
+      for (let i = 0; i < idsInViewWithPositions.length; i++) {
+        const { id, position } = idsInViewWithPositions[i];
+        const newPosition = getPositionById(ctx, state, id);
+        if (newPosition !== void 0) {
+          positionDiff = newPosition - position;
+          break;
+        }
+      }
+    }
+    if (targetId !== void 0 && prevPosition !== void 0) {
+      const newPosition = getPositionById(ctx, state, targetId);
+      if (newPosition !== void 0) {
+        positionDiff = newPosition - prevPosition;
+      }
+    }
+    if (positionDiff !== void 0 && Math.abs(positionDiff) > 0.1) {
+      requestAdjust(ctx, state, positionDiff, dataChanged);
+    }
+  };
+}
+
 // src/core/viewability.ts
 function ensureViewabilityState(ctx, configId) {
   let map = ctx.mapViewabilityConfigStates;
@@ -1838,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;
       }
@@ -2070,7 +2154,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 +2370,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 +2377,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 +2767,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 +2880,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 +3014,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,152 +917,6 @@ function getItemSize(state, key, index, data, useAverageSize) {
   return size;
 }
 
-// src/core/calculateOffsetWithOffsetPosition.ts
-function calculateOffsetWithOffsetPosition(state, offsetParam, params) {
-  const { index, viewOffset, viewPosition } = params;
-  let offset = offsetParam;
-  if (viewOffset) {
-    offset -= viewOffset;
-  }
-  if (viewPosition !== void 0 && index !== void 0) {
-    offset -= viewPosition * (state.scrollLength - getItemSize(state, getId(state, index), index, state.props.data[index]));
-  }
-  return offset;
-}
-
-// src/core/finishScrollTo.ts
-var finishScrollTo = (state) => {
-  if (state) {
-    state.scrollingTo = void 0;
-    state.scrollHistory.length = 0;
-  }
-};
-
-// src/core/scrollTo.ts
-function scrollTo(state, params = {}) {
-  var _a;
-  const { animated, noScrollingTo } = params;
-  const {
-    refScroller,
-    props: { horizontal }
-  } = state;
-  const offset = calculateOffsetWithOffsetPosition(state, params.offset, params);
-  state.scrollHistory.length = 0;
-  if (!noScrollingTo) {
-    state.scrollingTo = params;
-  }
-  state.scrollPending = offset;
-  (_a = refScroller.current) == null ? void 0 : _a.scrollTo({
-    animated: !!animated,
-    x: horizontal ? offset : 0,
-    y: horizontal ? 0 : offset
-  });
-  if (!animated) {
-    state.scroll = offset;
-    setTimeout(() => finishScrollTo(state), 100);
-  }
-}
-
-// src/utils/requestAdjust.ts
-function requestAdjust(ctx, state, positionDiff, dataChanged) {
-  if (Math.abs(positionDiff) > 0.1) {
-    const needsScrollWorkaround = Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
-    const doit = () => {
-      if (needsScrollWorkaround) {
-        scrollTo(state, {
-          noScrollingTo: true,
-          offset: state.scroll
-        });
-      } else {
-        state.scrollAdjustHandler.requestAdjust(positionDiff);
-      }
-    };
-    state.scroll += positionDiff;
-    state.scrollForNextCalculateItemsInView = void 0;
-    const didLayout = peek$(ctx, "containersDidLayout");
-    if (didLayout) {
-      doit();
-      const threshold = state.scroll - positionDiff / 2;
-      if (!state.ignoreScrollFromMVCP) {
-        state.ignoreScrollFromMVCP = {};
-      }
-      if (positionDiff > 0) {
-        state.ignoreScrollFromMVCP.lt = threshold;
-      } else {
-        state.ignoreScrollFromMVCP.gt = threshold;
-      }
-      if (state.ignoreScrollFromMVCPTimeout) {
-        clearTimeout(state.ignoreScrollFromMVCPTimeout);
-      }
-      state.ignoreScrollFromMVCPTimeout = setTimeout(
-        () => {
-          state.ignoreScrollFromMVCP = void 0;
-        },
-        needsScrollWorkaround ? 250 : 100
-      );
-    } else {
-      requestAnimationFrame(doit);
-    }
-  }
-}
-
-// src/core/mvcp.ts
-function prepareMVCP(ctx, state, dataChanged) {
-  const {
-    idsInView,
-    positions,
-    scrollingTo,
-    props: { maintainVisibleContentPosition }
-  } = state;
-  let prevPosition;
-  let targetId;
-  const idsInViewWithPositions = [];
-  const scrollTarget = scrollingTo == null ? void 0 : scrollingTo.index;
-  if (maintainVisibleContentPosition) {
-    const indexByKey = state.indexByKey;
-    if (scrollTarget !== void 0) {
-      targetId = getId(state, scrollTarget);
-    } else if (idsInView.length > 0 && peek$(ctx, "containersDidLayout")) {
-      if (dataChanged) {
-        for (let i = 0; i < idsInView.length; i++) {
-          const id = idsInView[i];
-          const index = indexByKey.get(id);
-          if (index !== void 0) {
-            idsInViewWithPositions.push({ id, position: positions.get(id) });
-          }
-        }
-      } else {
-        targetId = state.idsInView.find((id) => indexByKey.get(id) !== void 0);
-      }
-    }
-    if (targetId !== void 0) {
-      prevPosition = positions.get(targetId);
-    }
-  }
-  return () => {
-    let positionDiff;
-    if (dataChanged && targetId === void 0) {
-      for (let i = 0; i < idsInViewWithPositions.length; i++) {
-        const { id, position } = idsInViewWithPositions[i];
-        const newPosition = positions.get(id);
-        if (newPosition !== void 0) {
-          positionDiff = newPosition - position;
-          break;
-        }
-      }
-    }
-    if (targetId !== void 0 && prevPosition !== void 0) {
-      const newPosition = positions.get(targetId);
-      if (newPosition !== void 0) {
-        positionDiff = newPosition - prevPosition;
-      }
-    }
-    if (positionDiff !== void 0 && Math.abs(positionDiff) > 0.1) {
-      requestAdjust(ctx, state, positionDiff, dataChanged);
-    }
-  };
-}
-
 // src/utils/setPaddingTop.ts
 function setPaddingTop(ctx, state, { stylePaddingTop, alignItemsPaddingTop }) {
   if (stylePaddingTop !== void 0) {
@@ -1118,15 +955,15 @@ function updateAlignItemsPaddingTop(ctx, state) {
 // 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);
+    const lastIndex = data.length - 1;
+    const lastId = getId(state, lastIndex);
     if (lastId !== void 0) {
-      const lastPosition = positions.get(lastId);
+      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) {
@@ -1155,21 +992,60 @@ function addTotalSize(ctx, state, key, add) {
 // 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);
+    snapToOffsets[i] = getPositionByIndex(ctx, state, idx) || 0;
   }
   set$(ctx, "snapToOffsets", snapToOffsets);
 }
 
-// src/core/updateAllPositions.ts
-function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
-  var _a, _b, _c, _d, _e, _f;
+// 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;
   const {
     columns,
     indexByKey,
@@ -1201,6 +1077,11 @@ function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
   }
   const needsIndexByKey = dataChanged || indexByKey.size === 0;
   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 actualEndReached = startIndex;
   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);
@@ -1230,6 +1111,26 @@ function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
     } else {
       currentRowTop += size;
     }
+    actualEndReached = i;
+    if (shouldOptimize && i >= actualEndIndex && (!((_g = state.scrollingTo) == null ? void 0 : _g.index) || i >= state.scrollingTo.index)) {
+      break;
+    }
+  }
+  if (!state.positionRange) {
+    state.positionRange = { end: -1, start: 0, valid: false };
+  }
+  if (dataChanged) {
+    state.positionRange = {
+      end: actualEndReached,
+      start: startIndex,
+      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 : startIndex, startIndex),
+      valid: true
+    };
   }
   updateTotalSize(ctx, state);
   if (snapToIndices) {
@@ -1237,6 +1138,189 @@ function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
   }
 }
 
+// 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;
+  let offset = offsetParam;
+  if (viewOffset) {
+    offset -= viewOffset;
+  }
+  if (viewPosition !== void 0 && index !== void 0) {
+    offset -= viewPosition * (state.scrollLength - getItemSize(state, getId(state, index), index, state.props.data[index]));
+  }
+  return offset;
+}
+
+// src/core/finishScrollTo.ts
+var finishScrollTo = (state) => {
+  if (state) {
+    state.scrollingTo = void 0;
+    state.scrollHistory.length = 0;
+  }
+};
+
+// src/core/scrollTo.ts
+function scrollTo(state, params = {}) {
+  var _a;
+  const { animated, noScrollingTo } = params;
+  const {
+    refScroller,
+    props: { horizontal }
+  } = state;
+  const offset = calculateOffsetWithOffsetPosition(state, params.offset, params);
+  state.scrollHistory.length = 0;
+  if (!noScrollingTo) {
+    state.scrollingTo = params;
+  }
+  state.scrollPending = offset;
+  (_a = refScroller.current) == null ? void 0 : _a.scrollTo({
+    animated: !!animated,
+    x: horizontal ? offset : 0,
+    y: horizontal ? 0 : offset
+  });
+  if (!animated) {
+    state.scroll = offset;
+    setTimeout(() => finishScrollTo(state), 100);
+  }
+}
+
+// src/utils/requestAdjust.ts
+function requestAdjust(ctx, state, positionDiff, dataChanged) {
+  if (Math.abs(positionDiff) > 0.1) {
+    const needsScrollWorkaround = Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
+    const doit = () => {
+      if (needsScrollWorkaround) {
+        scrollTo(state, {
+          noScrollingTo: true,
+          offset: state.scroll
+        });
+      } else {
+        state.scrollAdjustHandler.requestAdjust(positionDiff);
+      }
+    };
+    state.scroll += positionDiff;
+    state.scrollForNextCalculateItemsInView = void 0;
+    const didLayout = peek$(ctx, "containersDidLayout");
+    if (didLayout) {
+      doit();
+      const threshold = state.scroll - positionDiff / 2;
+      if (!state.ignoreScrollFromMVCP) {
+        state.ignoreScrollFromMVCP = {};
+      }
+      if (positionDiff > 0) {
+        state.ignoreScrollFromMVCP.lt = threshold;
+      } else {
+        state.ignoreScrollFromMVCP.gt = threshold;
+      }
+      if (state.ignoreScrollFromMVCPTimeout) {
+        clearTimeout(state.ignoreScrollFromMVCPTimeout);
+      }
+      state.ignoreScrollFromMVCPTimeout = setTimeout(
+        () => {
+          state.ignoreScrollFromMVCP = void 0;
+        },
+        needsScrollWorkaround ? 250 : 100
+      );
+    } else {
+      requestAnimationFrame(doit);
+    }
+  }
+}
+
+// src/core/mvcp.ts
+function prepareMVCP(ctx, state, dataChanged) {
+  const {
+    idsInView,
+    scrollingTo,
+    props: { maintainVisibleContentPosition }
+  } = state;
+  let prevPosition;
+  let targetId;
+  const idsInViewWithPositions = [];
+  const scrollTarget = scrollingTo == null ? void 0 : scrollingTo.index;
+  if (maintainVisibleContentPosition) {
+    const indexByKey = state.indexByKey;
+    if (scrollTarget !== void 0) {
+      targetId = getId(state, scrollTarget);
+    } else if (idsInView.length > 0 && peek$(ctx, "containersDidLayout")) {
+      if (dataChanged) {
+        for (let i = 0; i < idsInView.length; i++) {
+          const id = idsInView[i];
+          const index = indexByKey.get(id);
+          if (index !== void 0) {
+            const position = getPositionById(ctx, state, id);
+            if (position !== void 0) {
+              idsInViewWithPositions.push({ id, position });
+            }
+          }
+        }
+      } else {
+        targetId = state.idsInView.find((id) => indexByKey.get(id) !== void 0);
+      }
+    }
+    if (targetId !== void 0) {
+      const pos = getPositionById(ctx, state, targetId);
+      if (pos !== void 0) {
+        prevPosition = pos;
+      }
+    }
+  }
+  return () => {
+    let positionDiff;
+    if (dataChanged && targetId === void 0) {
+      for (let i = 0; i < idsInViewWithPositions.length; i++) {
+        const { id, position } = idsInViewWithPositions[i];
+        const newPosition = getPositionById(ctx, state, id);
+        if (newPosition !== void 0) {
+          positionDiff = newPosition - position;
+          break;
+        }
+      }
+    }
+    if (targetId !== void 0 && prevPosition !== void 0) {
+      const newPosition = getPositionById(ctx, state, targetId);
+      if (newPosition !== void 0) {
+        positionDiff = newPosition - prevPosition;
+      }
+    }
+    if (positionDiff !== void 0 && Math.abs(positionDiff) > 0.1) {
+      requestAdjust(ctx, state, positionDiff, dataChanged);
+    }
+  };
+}
+
 // src/core/viewability.ts
 function ensureViewabilityState(ctx, configId) {
   let map = ctx.mapViewabilityConfigStates;
@@ -1817,7 +1901,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;
       }
@@ -2049,7 +2133,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 +2349,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 +2356,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 +2746,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 +2859,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   };
   if (isFirst) {
     initializeStateVars();
-    updateAllPositions(ctx, state);
+    updateItemPositions(ctx, state);
   }
   const initialContentOffset = useMemo(() => {
     if (initialScroll) {
@@ -2908,7 +2993,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.1",
   "description": "Legend List is a drop-in replacement for FlatList with much better performance and supporting dynamically sized items.",
   "sideEffects": false,
   "private": false,