@legendapp/list 2.0.1 → 2.0.3

package/index.d.mts

@@ -345,11 +345,6 @@ interface InternalState {
         animated?: boolean;
     } | undefined;
     needsOtherAxisSize?: boolean;
-    positionRange: {
-        start: number;
-        end: number;
-        valid: boolean;
-    };
     averageSizes: Record<string, {
         num: number;
         avg: number;
@@ -413,17 +408,18 @@ interface LegendListRenderItemProps<ItemT, TItemType extends string | number | u
     extraData: any;
 }
 type ScrollState = {
+    activeStickyIndex: number | undefined;
     contentLength: number;
     data: readonly any[];
     end: number;
     endBuffered: number;
     isAtEnd: boolean;
     isAtStart: boolean;
-    positionAtIndex: (index: number) => number | undefined;
+    positionAtIndex: (index: number) => number;
     positions: Map<string, number>;
     scroll: number;
     scrollLength: number;
-    sizeAtIndex: (index: number) => number | undefined;
+    sizeAtIndex: (index: number) => number;
     sizes: Map<string, number>;
     start: number;
     startBuffered: number;

package/index.d.ts

@@ -345,11 +345,6 @@ interface InternalState {
         animated?: boolean;
     } | undefined;
     needsOtherAxisSize?: boolean;
-    positionRange: {
-        start: number;
-        end: number;
-        valid: boolean;
-    };
     averageSizes: Record<string, {
         num: number;
         avg: number;
@@ -413,17 +408,18 @@ interface LegendListRenderItemProps<ItemT, TItemType extends string | number | u
     extraData: any;
 }
 type ScrollState = {
+    activeStickyIndex: number | undefined;
     contentLength: number;
     data: readonly any[];
     end: number;
     endBuffered: number;
     isAtEnd: boolean;
     isAtStart: boolean;
-    positionAtIndex: (index: number) => number | undefined;
+    positionAtIndex: (index: number) => number;
     positions: Map<string, number>;
     scroll: number;
     scrollLength: number;
-    sizeAtIndex: (index: number) => number | undefined;
+    sizeAtIndex: (index: number) => number;
     sizes: Map<string, number>;
     start: number;
     startBuffered: number;

package/index.js

@@ -897,6 +897,23 @@ 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;
@@ -938,6 +955,152 @@ 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) {
@@ -976,15 +1139,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 lastIndex = data.length - 1;
-    const lastId = getId(state, lastIndex);
+    const lastId = getId(state, data.length - 1);
     if (lastId !== void 0) {
-      const lastPosition = getPositionByIndex(ctx, state, lastIndex);
+      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) {
@@ -1013,60 +1176,21 @@ 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];
-    snapToOffsets[i] = getPositionByIndex(ctx, state, idx) || 0;
+    const key = getId(state, idx);
+    snapToOffsets[i] = positions.get(key);
   }
   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;
+// src/core/updateAllPositions.ts
+function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
+  var _a, _b, _c, _d, _e, _f;
   const {
     columns,
     indexByKey,
@@ -1098,11 +1222,6 @@ function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex)
   }
   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);
@@ -1132,26 +1251,6 @@ function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex)
     } 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) {
@@ -1159,189 +1258,6 @@ function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex)
   }
 }
 
-// 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;
@@ -1843,6 +1759,7 @@ function handleStickyActivation(ctx, state, stickyIndices, stickyArray, scroll,
   var _a;
   const activeIndices = getActiveStickyIndices(ctx, state, stickyIndices);
   const currentStickyIdx = findCurrentStickyIndex(stickyArray, scroll, state);
+  state.activeStickyIndex = currentStickyIdx >= 0 ? stickyArray[currentStickyIdx] : void 0;
   for (let offset = 0; offset <= 1; offset++) {
     const idx = currentStickyIdx - offset;
     if (idx < 0 || activeIndices.has(stickyArray[idx])) continue;
@@ -1922,7 +1839,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         positions.clear();
       }
       const startIndex = dataChanged ? 0 : minIndexSizeChanged != null ? minIndexSizeChanged : 0;
-      updateItemPositions(ctx, state, dataChanged, startIndex);
+      updateAllPositions(ctx, state, dataChanged, startIndex);
       if (minIndexSizeChanged !== void 0) {
         state.minIndexSizeChanged = void 0;
       }
@@ -2079,6 +1996,8 @@ function calculateItemsInView(ctx, state, params = {}) {
           startBuffered,
           endBuffered
         );
+      } else {
+        state.activeStickyIndex = void 0;
       }
       if (needNewContainers.length > 0) {
         const requiredItemTypes = getItemType ? needNewContainers.map((i) => {
@@ -2154,7 +2073,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 = getPositionById(ctx, state, id);
+          const position = positions.get(id);
           if (position === void 0) {
             set$(ctx, `containerPosition${i}`, POSITION_OUT_OF_VIEW);
           } else {
@@ -2370,6 +2289,8 @@ 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) {
@@ -2377,8 +2298,6 @@ function updateScroll(ctx, state, newScroll) {
     checkAtBottom(ctx, state);
     checkAtTop(state);
   }
-  state.scrollPrev = state.scroll;
-  state.scrollPrevTime = state.scrollTime;
 }
 
 // src/core/ScrollAdjustHandler.ts
@@ -2767,7 +2686,6 @@ 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,
@@ -2880,7 +2798,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   };
   if (isFirst) {
     initializeStateVars();
-    updateItemPositions(ctx, state);
+    updateAllPositions(ctx, state);
   }
   const initialContentOffset = React3.useMemo(() => {
     if (initialScroll) {
@@ -3008,13 +2926,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       getState: () => {
         const state2 = refState.current;
         return state2 ? {
+          activeStickyIndex: state2.activeStickyIndex,
           contentLength: state2.totalSize,
           data: state2.props.data,
           end: state2.endNoBuffer,
           endBuffered: state2.endBuffered,
           isAtEnd: state2.isAtEnd,
           isAtStart: state2.isAtStart,
-          positionAtIndex: (index) => getPositionByIndex(ctx, state2, index),
+          positionAtIndex: (index) => state2.positions.get(getId(state2, index)),
           positions: state2.positions,
           scroll: state2.scroll,
           scrollLength: state2.scrollLength,

package/index.mjs

@@ -876,6 +876,23 @@ 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;
@@ -917,6 +934,152 @@ 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) {
@@ -955,15 +1118,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 lastIndex = data.length - 1;
-    const lastId = getId(state, lastIndex);
+    const lastId = getId(state, data.length - 1);
     if (lastId !== void 0) {
-      const lastPosition = getPositionByIndex(ctx, state, lastIndex);
+      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) {
@@ -992,60 +1155,21 @@ 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];
-    snapToOffsets[i] = getPositionByIndex(ctx, state, idx) || 0;
+    const key = getId(state, idx);
+    snapToOffsets[i] = positions.get(key);
   }
   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;
+// src/core/updateAllPositions.ts
+function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
+  var _a, _b, _c, _d, _e, _f;
   const {
     columns,
     indexByKey,
@@ -1077,11 +1201,6 @@ function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex)
   }
   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);
@@ -1111,26 +1230,6 @@ function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex)
     } 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) {
@@ -1138,189 +1237,6 @@ function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex)
   }
 }
 
-// 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;
@@ -1822,6 +1738,7 @@ function handleStickyActivation(ctx, state, stickyIndices, stickyArray, scroll,
   var _a;
   const activeIndices = getActiveStickyIndices(ctx, state, stickyIndices);
   const currentStickyIdx = findCurrentStickyIndex(stickyArray, scroll, state);
+  state.activeStickyIndex = currentStickyIdx >= 0 ? stickyArray[currentStickyIdx] : void 0;
   for (let offset = 0; offset <= 1; offset++) {
     const idx = currentStickyIdx - offset;
     if (idx < 0 || activeIndices.has(stickyArray[idx])) continue;
@@ -1901,7 +1818,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         positions.clear();
       }
       const startIndex = dataChanged ? 0 : minIndexSizeChanged != null ? minIndexSizeChanged : 0;
-      updateItemPositions(ctx, state, dataChanged, startIndex);
+      updateAllPositions(ctx, state, dataChanged, startIndex);
       if (minIndexSizeChanged !== void 0) {
         state.minIndexSizeChanged = void 0;
       }
@@ -2058,6 +1975,8 @@ function calculateItemsInView(ctx, state, params = {}) {
           startBuffered,
           endBuffered
         );
+      } else {
+        state.activeStickyIndex = void 0;
       }
       if (needNewContainers.length > 0) {
         const requiredItemTypes = getItemType ? needNewContainers.map((i) => {
@@ -2133,7 +2052,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 = getPositionById(ctx, state, id);
+          const position = positions.get(id);
           if (position === void 0) {
             set$(ctx, `containerPosition${i}`, POSITION_OUT_OF_VIEW);
           } else {
@@ -2349,6 +2268,8 @@ 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) {
@@ -2356,8 +2277,6 @@ function updateScroll(ctx, state, newScroll) {
     checkAtBottom(ctx, state);
     checkAtTop(state);
   }
-  state.scrollPrev = state.scroll;
-  state.scrollPrevTime = state.scrollTime;
 }
 
 // src/core/ScrollAdjustHandler.ts
@@ -2746,7 +2665,6 @@ 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,
@@ -2859,7 +2777,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   };
   if (isFirst) {
     initializeStateVars();
-    updateItemPositions(ctx, state);
+    updateAllPositions(ctx, state);
   }
   const initialContentOffset = useMemo(() => {
     if (initialScroll) {
@@ -2987,13 +2905,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       getState: () => {
         const state2 = refState.current;
         return state2 ? {
+          activeStickyIndex: state2.activeStickyIndex,
           contentLength: state2.totalSize,
           data: state2.props.data,
           end: state2.endNoBuffer,
           endBuffered: state2.endBuffered,
           isAtEnd: state2.isAtEnd,
           isAtStart: state2.isAtStart,
-          positionAtIndex: (index) => getPositionByIndex(ctx, state2, index),
+          positionAtIndex: (index) => state2.positions.get(getId(state2, index)),
           positions: state2.positions,
           scroll: state2.scroll,
           scrollLength: state2.scrollLength,

package/package.json

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