@legendapp/list 2.0.0-beta.3 → 2.0.0-beta.4

package/index.d.mts

@@ -1,6 +1,6 @@
 import * as React$1 from 'react';
 import { ComponentProps, ReactNode, Dispatch, SetStateAction } from 'react';
-import { View, Animated, ScrollView, LayoutRectangle, ScrollViewComponent, ScrollResponderMixin, StyleProp, ViewStyle, ScrollViewProps } from 'react-native';
+import { View, Animated, ScrollView, LayoutRectangle, ScrollViewComponent, ScrollResponderMixin, StyleProp, ViewStyle, NativeSyntheticEvent, NativeScrollEvent, ScrollViewProps } from 'react-native';
 import Animated$1 from 'react-native-reanimated';
 
 type ListenerType = "numContainers" | "numContainersPooled" | `containerItemKey${number}` | `containerItemData${number}` | `containerPosition${number}` | `containerColumn${number}` | `containerSticky${number}` | `containerStickyOffset${number}` | "containersDidLayout" | "extraData" | "numColumns" | "lastItemKeys" | "totalSize" | "alignItemsPaddingTop" | "stylePaddingTop" | "scrollAdjust" | "scrollAdjustUserOffset" | "headerSize" | "footerSize" | "maintainVisibleContentPosition" | "debugRawScroll" | "debugComputedScroll" | "otherAxisSize" | "snapToOffsets" | "scrollSize";
@@ -30,9 +30,10 @@ declare class ScrollAdjustHandler {
     constructor(ctx: StateContext);
     requestAdjust(add: number): void;
     setMounted(): void;
+    getAdjust(): number;
 }
 
-type BaseScrollViewProps<TScrollView> = Omit<TScrollView, "contentOffset" | "contentInset" | "maintainVisibleContentPosition" | "stickyHeaderIndices" | "removeClippedSubviews" | "children">;
+type BaseScrollViewProps<TScrollView> = Omit<TScrollView, "contentOffset" | "contentInset" | "maintainVisibleContentPosition" | "stickyHeaderIndices" | "removeClippedSubviews" | "children" | "onScroll">;
 interface DataModeProps<ItemT, TItemType extends string | undefined> {
     /**
      * Array of items to render in the list.
@@ -195,6 +196,7 @@ interface LegendListSpecificProps<ItemT, TItemType extends string | undefined> {
      * Function to call when the user pulls to refresh.
      */
     onRefresh?: () => void;
+    onScroll?: (event: NativeSyntheticEvent<NativeScrollEvent>) => void;
     /**
      * Called when scrolling reaches the start within onStartReachedThreshold.
      */
@@ -287,7 +289,6 @@ interface InternalState {
     sizesKnown: Map<string, number>;
     containerItemKeys: Set<string>;
     containerItemTypes: Map<number, string>;
-    pendingAdjust: number;
     isStartReached: boolean;
     isEndReached: boolean;
     isAtEnd: boolean;
@@ -352,14 +353,6 @@ interface InternalState {
     loadStartTime: number;
     initialScroll: ScrollIndexWithOffset | undefined;
     lastLayout: LayoutRectangle | undefined;
-    queuedItemSizeUpdates: {
-        itemKey: string;
-        sizeObj: {
-            width: number;
-            height: number;
-        };
-    }[];
-    queuedItemSizeUpdatesWaiting?: boolean;
     timeoutSetPaddingTop?: any;
     activeStickyIndex: number | undefined;
     stickyContainers: Map<number, number>;

package/index.d.ts

@@ -1,6 +1,6 @@
 import * as React$1 from 'react';
 import { ComponentProps, ReactNode, Dispatch, SetStateAction } from 'react';
-import { View, Animated, ScrollView, LayoutRectangle, ScrollViewComponent, ScrollResponderMixin, StyleProp, ViewStyle, ScrollViewProps } from 'react-native';
+import { View, Animated, ScrollView, LayoutRectangle, ScrollViewComponent, ScrollResponderMixin, StyleProp, ViewStyle, NativeSyntheticEvent, NativeScrollEvent, ScrollViewProps } from 'react-native';
 import Animated$1 from 'react-native-reanimated';
 
 type ListenerType = "numContainers" | "numContainersPooled" | `containerItemKey${number}` | `containerItemData${number}` | `containerPosition${number}` | `containerColumn${number}` | `containerSticky${number}` | `containerStickyOffset${number}` | "containersDidLayout" | "extraData" | "numColumns" | "lastItemKeys" | "totalSize" | "alignItemsPaddingTop" | "stylePaddingTop" | "scrollAdjust" | "scrollAdjustUserOffset" | "headerSize" | "footerSize" | "maintainVisibleContentPosition" | "debugRawScroll" | "debugComputedScroll" | "otherAxisSize" | "snapToOffsets" | "scrollSize";
@@ -30,9 +30,10 @@ declare class ScrollAdjustHandler {
     constructor(ctx: StateContext);
     requestAdjust(add: number): void;
     setMounted(): void;
+    getAdjust(): number;
 }
 
-type BaseScrollViewProps<TScrollView> = Omit<TScrollView, "contentOffset" | "contentInset" | "maintainVisibleContentPosition" | "stickyHeaderIndices" | "removeClippedSubviews" | "children">;
+type BaseScrollViewProps<TScrollView> = Omit<TScrollView, "contentOffset" | "contentInset" | "maintainVisibleContentPosition" | "stickyHeaderIndices" | "removeClippedSubviews" | "children" | "onScroll">;
 interface DataModeProps<ItemT, TItemType extends string | undefined> {
     /**
      * Array of items to render in the list.
@@ -195,6 +196,7 @@ interface LegendListSpecificProps<ItemT, TItemType extends string | undefined> {
      * Function to call when the user pulls to refresh.
      */
     onRefresh?: () => void;
+    onScroll?: (event: NativeSyntheticEvent<NativeScrollEvent>) => void;
     /**
      * Called when scrolling reaches the start within onStartReachedThreshold.
      */
@@ -287,7 +289,6 @@ interface InternalState {
     sizesKnown: Map<string, number>;
     containerItemKeys: Set<string>;
     containerItemTypes: Map<number, string>;
-    pendingAdjust: number;
     isStartReached: boolean;
     isEndReached: boolean;
     isAtEnd: boolean;
@@ -352,14 +353,6 @@ interface InternalState {
     loadStartTime: number;
     initialScroll: ScrollIndexWithOffset | undefined;
     lastLayout: LayoutRectangle | undefined;
-    queuedItemSizeUpdates: {
-        itemKey: string;
-        sizeObj: {
-            width: number;
-            height: number;
-        };
-    }[];
-    queuedItemSizeUpdatesWaiting?: boolean;
     timeoutSetPaddingTop?: any;
     activeStickyIndex: number | undefined;
     stickyContainers: Map<number, number>;

package/index.js

@@ -693,30 +693,33 @@ function useThrottleDebounce(mode) {
       timeoutRef.current = null;
     }
   };
-  const execute = React3.useCallback((callback, delay, ...args) => {
-    {
-      const now = Date.now();
-      lastArgsRef.current = args;
-      if (now - lastCallTimeRef.current >= delay) {
-        lastCallTimeRef.current = now;
-        callback(...args);
-        clearTimeoutRef();
-      } else {
-        clearTimeoutRef();
-        timeoutRef.current = setTimeout(
-          () => {
-            if (lastArgsRef.current) {
-              lastCallTimeRef.current = Date.now();
-              callback(...lastArgsRef.current);
-              timeoutRef.current = null;
-              lastArgsRef.current = null;
-            }
-          },
-          delay - (now - lastCallTimeRef.current)
-        );
+  const execute = React3.useCallback(
+    (callback, delay, ...args) => {
+      {
+        const now = Date.now();
+        lastArgsRef.current = args;
+        if (now - lastCallTimeRef.current >= delay) {
+          lastCallTimeRef.current = now;
+          callback(...args);
+          clearTimeoutRef();
+        } else {
+          clearTimeoutRef();
+          timeoutRef.current = setTimeout(
+            () => {
+              if (lastArgsRef.current) {
+                lastCallTimeRef.current = Date.now();
+                callback(...lastArgsRef.current);
+                timeoutRef.current = null;
+                lastArgsRef.current = null;
+              }
+            },
+            delay - (now - lastCallTimeRef.current)
+          );
+        }
       }
-    }
-  }, [mode]);
+    },
+    [mode]
+  );
   return execute;
 }
 
@@ -912,7 +915,7 @@ function calculateOffsetForIndex(ctx, state, index) {
 }
 
 // src/utils/getItemSize.ts
-function getItemSize(state, key, index, data, useAverageSize, defaultAverageSize, preferRenderedCache) {
+function getItemSize(state, key, index, data, useAverageSize, defaultAverageSize) {
   var _a, _b;
   const {
     sizesKnown,
@@ -933,11 +936,7 @@ function getItemSize(state, key, index, data, useAverageSize, defaultAverageSize
       sizesKnown.set(key, size);
     }
   }
-  const renderedSize = sizes.get(key);
-  if (size === void 0 && preferRenderedCache && renderedSize !== void 0) {
-    return renderedSize;
-  }
-  if (size === void 0 && useAverageSize && !scrollingTo) {
+  if (size === void 0 && useAverageSize && sizeKnown === void 0 && !scrollingTo) {
     if (itemType === "") {
       size = defaultAverageSize;
     } else {
@@ -947,8 +946,11 @@ function getItemSize(state, key, index, data, useAverageSize, defaultAverageSize
       }
     }
   }
-  if (size === void 0 && renderedSize !== void 0) {
-    return renderedSize;
+  if (size === void 0) {
+    size = sizes.get(key);
+    if (size !== void 0) {
+      return size;
+    }
   }
   if (size === void 0) {
     size = getEstimatedItemSize ? getEstimatedItemSize(index, data, itemType) : estimatedItemSize;
@@ -1175,44 +1177,6 @@ function addTotalSize(ctx, state, key, add) {
   }
 }
 
-// src/utils/getScrollVelocity.ts
-var getScrollVelocity = (state) => {
-  const { scrollHistory } = state;
-  let velocity = 0;
-  if (scrollHistory.length >= 1) {
-    const newest = scrollHistory[scrollHistory.length - 1];
-    let oldest;
-    let start = 0;
-    const now = Date.now();
-    for (let i = 0; i < scrollHistory.length - 1; i++) {
-      const entry = scrollHistory[i];
-      const nextEntry = scrollHistory[i + 1];
-      if (i > 0) {
-        const prevEntry = scrollHistory[i - 1];
-        const prevDirection = entry.scroll - prevEntry.scroll;
-        const currentDirection = nextEntry.scroll - entry.scroll;
-        if (prevDirection > 0 && currentDirection < 0 || prevDirection < 0 && currentDirection > 0) {
-          start = i;
-          break;
-        }
-      }
-    }
-    for (let i = start; i < scrollHistory.length - 1; i++) {
-      const entry = scrollHistory[i];
-      if (now - entry.time <= 1e3) {
-        oldest = entry;
-        break;
-      }
-    }
-    if (oldest && oldest !== newest) {
-      const scrollDiff = newest.scroll - oldest.scroll;
-      const timeDiff = newest.time - oldest.time;
-      velocity = timeDiff > 0 ? scrollDiff / timeDiff : 0;
-    }
-  }
-  return velocity;
-};
-
 // src/utils/updateSnapToOffsets.ts
 function updateSnapToOffsets(ctx, state) {
   const {
@@ -1229,14 +1193,13 @@ function updateSnapToOffsets(ctx, state) {
 }
 
 // src/core/updateAllPositions.ts
-function updateAllPositions(ctx, state, dataChanged) {
-  var _a, _b, _c, _d, _e;
+function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
+  var _a, _b, _c, _d, _e, _f, _g;
   const {
     averageSizes,
     columns,
     indexByKey,
     positions,
-    firstFullyOnScreenIndex,
     idCache,
     sizesKnown,
     props: { getEstimatedItemSize, snapToIndices, enableAverages }
@@ -1244,69 +1207,34 @@ function updateAllPositions(ctx, state, dataChanged) {
   const data = state.props.data;
   const numColumns = peek$(ctx, "numColumns");
   const indexByKeyForChecking = __DEV__ ? /* @__PURE__ */ new Map() : void 0;
-  const scrollVelocity = getScrollVelocity(state);
   const useAverageSize = enableAverages && !getEstimatedItemSize;
   const itemType = "";
   let averageSize = (_a = averageSizes[itemType]) == null ? void 0 : _a.avg;
   if (averageSize !== void 0) {
     averageSize = roundSize(averageSize);
   }
-  const shouldUseBackwards = !dataChanged && scrollVelocity < 0 && firstFullyOnScreenIndex > 5 && firstFullyOnScreenIndex < data.length;
-  if (shouldUseBackwards && firstFullyOnScreenIndex !== void 0) {
-    const anchorId = getId(state, firstFullyOnScreenIndex);
-    const anchorPosition = positions.get(anchorId);
-    if (anchorPosition !== void 0) {
-      let currentRowTop2 = anchorPosition;
-      let maxSizeInRow2 = 0;
-      let bailout = false;
-      for (let i = firstFullyOnScreenIndex - 1; i >= 0; i--) {
-        const id = (_b = idCache.get(i)) != null ? _b : getId(state, i);
-        const size = (_c = sizesKnown.get(id)) != null ? _c : getItemSize(
-          state,
-          id,
-          i,
-          data[i],
-          useAverageSize,
-          averageSize,
-          /*preferRenderedCache*/
-          !!dataChanged
-        );
-        const itemColumn = columns.get(id);
-        maxSizeInRow2 = Math.max(maxSizeInRow2, size);
-        if (itemColumn === 1) {
-          currentRowTop2 -= maxSizeInRow2;
-          maxSizeInRow2 = 0;
-        }
-        if (currentRowTop2 < -2e3) {
-          bailout = true;
-          break;
-        }
-        positions.set(id, currentRowTop2);
-      }
-      if (!bailout) {
-        updateTotalSize(ctx, state);
-        return;
-      }
-    }
-  }
   let currentRowTop = 0;
   let column = 1;
   let maxSizeInRow = 0;
   const hasColumns = numColumns > 1;
+  if (startIndex > 0) {
+    const prevIndex = startIndex - 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, averageSize);
+      currentRowTop = prevPosition + prevSize;
+    }
+  }
   const needsIndexByKey = dataChanged || indexByKey.size === 0;
   const dataLength = data.length;
-  for (let i = 0; i < dataLength; i++) {
-    const id = (_d = idCache.get(i)) != null ? _d : getId(state, i);
-    const size = (_e = sizesKnown.get(id)) != null ? _e : getItemSize(
-      state,
-      id,
-      i,
-      data[i],
-      useAverageSize,
-      averageSize,
-      /*preferRenderedCache*/
-      !!dataChanged
-    );
+  for (let i = startIndex; 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, averageSize);
     if (__DEV__ && needsIndexByKey) {
       if (indexByKeyForChecking.has(id)) {
         console.error(
@@ -1669,6 +1597,44 @@ function comparatorByDistance(a, b) {
   return b.distance - a.distance;
 }
 
+// src/utils/getScrollVelocity.ts
+var getScrollVelocity = (state) => {
+  const { scrollHistory } = state;
+  let velocity = 0;
+  if (scrollHistory.length >= 1) {
+    const newest = scrollHistory[scrollHistory.length - 1];
+    let oldest;
+    let start = 0;
+    const now = Date.now();
+    for (let i = 0; i < scrollHistory.length - 1; i++) {
+      const entry = scrollHistory[i];
+      const nextEntry = scrollHistory[i + 1];
+      if (i > 0) {
+        const prevEntry = scrollHistory[i - 1];
+        const prevDirection = entry.scroll - prevEntry.scroll;
+        const currentDirection = nextEntry.scroll - entry.scroll;
+        if (prevDirection > 0 && currentDirection < 0 || prevDirection < 0 && currentDirection > 0) {
+          start = i;
+          break;
+        }
+      }
+    }
+    for (let i = start; i < scrollHistory.length - 1; i++) {
+      const entry = scrollHistory[i];
+      if (now - entry.time <= 1e3) {
+        oldest = entry;
+        break;
+      }
+    }
+    if (oldest && oldest !== newest) {
+      const scrollDiff = newest.scroll - oldest.scroll;
+      const timeDiff = newest.time - oldest.time;
+      velocity = timeDiff > 0 ? scrollDiff / timeDiff : 0;
+    }
+  }
+  return velocity;
+};
+
 // src/core/scrollToIndex.ts
 function scrollToIndex(ctx, state, { index, viewOffset = 0, animated = true, viewPosition }) {
   if (index >= state.props.data.length) {
@@ -1880,7 +1846,11 @@ function calculateItemsInView(ctx, state, params = {}) {
         idCache.clear();
         positions.clear();
       }
-      updateAllPositions(ctx, state, dataChanged);
+      const startIndex = dataChanged ? 0 : minIndexSizeChanged != null ? minIndexSizeChanged : 0;
+      updateAllPositions(ctx, state, dataChanged, startIndex);
+      if (minIndexSizeChanged !== void 0) {
+        state.minIndexSizeChanged = void 0;
+      }
       checkMVCP == null ? void 0 : checkMVCP();
     }
     const scrollExtra = 0;
@@ -1927,10 +1897,6 @@ function calculateItemsInView(ctx, state, params = {}) {
     let endNoBuffer = null;
     let endBuffered = null;
     let loopStart = startBufferedIdOrig ? indexByKey.get(startBufferedIdOrig) || 0 : 0;
-    if (minIndexSizeChanged !== void 0) {
-      loopStart = Math.min(minIndexSizeChanged, loopStart);
-      state.minIndexSizeChanged = void 0;
-    }
     for (let i = loopStart; i >= 0; i--) {
       const id = (_a = idCache.get(i)) != null ? _a : getId(state, i);
       const top = positions.get(id);
@@ -2300,7 +2266,8 @@ function updateScroll(ctx, state, newScroll) {
   state.lastBatchingAction = Date.now();
   const currentTime = Date.now();
   if (scrollingTo === void 0 && !(state.scrollHistory.length === 0 && newScroll === state.scroll)) {
-    state.scrollHistory.push({ scroll: newScroll, time: currentTime });
+    const adjust = state.scrollAdjustHandler.getAdjust();
+    state.scrollHistory.push({ scroll: newScroll - adjust, time: currentTime });
   }
   if (state.scrollHistory.length > 5) {
     state.scrollHistory.shift();
@@ -2336,13 +2303,19 @@ var ScrollAdjustHandler = class {
   setMounted() {
     this.mounted = true;
   }
+  getAdjust() {
+    return this.appliedAdjust;
+  }
 };
 
 // src/core/updateItemSize.ts
-function updateItemSizes(ctx, state, itemUpdates) {
-  var _a;
+function updateItemSize(ctx, state, itemKey, sizeObj) {
+  var _a, _b;
   const {
+    sizesKnown,
     props: {
+      getFixedItemSize,
+      getItemType,
       horizontal,
       maintainVisibleContentPosition,
       suggestEstimatedItemSize,
@@ -2352,47 +2325,60 @@ function updateItemSizes(ctx, state, itemUpdates) {
     }
   } = state;
   if (!data) return;
+  if (getFixedItemSize) {
+    const index2 = state.indexByKey.get(itemKey);
+    if (index2 === void 0) {
+      return;
+    }
+    const itemData = state.props.data[index2];
+    if (itemData === void 0) {
+      return;
+    }
+    const type = getItemType ? (_a = getItemType(itemData, index2)) != null ? _a : "" : "";
+    const size2 = getFixedItemSize(index2, itemData, type);
+    if (size2 !== void 0 && size2 === sizesKnown.get(itemKey)) {
+      return;
+    }
+  }
   const containersDidLayout = peek$(ctx, "containersDidLayout");
   let needsRecalculate = !containersDidLayout;
   let shouldMaintainScrollAtEnd = false;
   let minIndexSizeChanged;
   let maxOtherAxisSize = peek$(ctx, "otherAxisSize") || 0;
-  for (const { itemKey, sizeObj } of itemUpdates) {
-    const index = state.indexByKey.get(itemKey);
-    const prevSizeKnown = state.sizesKnown.get(itemKey);
-    const diff = updateOneItemSize(state, itemKey, sizeObj);
-    const size = Math.floor((horizontal ? sizeObj.width : sizeObj.height) * 8) / 8;
-    if (diff !== 0) {
-      minIndexSizeChanged = minIndexSizeChanged !== void 0 ? Math.min(minIndexSizeChanged, index) : index;
-      if (((_a = state.scrollingTo) == null ? void 0 : _a.viewPosition) && maintainVisibleContentPosition && index === state.scrollingTo.index && diff > 0) {
-        requestAdjust(ctx, state, diff * state.scrollingTo.viewPosition);
-      }
-      const { startBuffered, endBuffered } = state;
-      needsRecalculate || (needsRecalculate = index >= startBuffered && index <= endBuffered);
-      if (!needsRecalculate) {
-        const numContainers = ctx.values.get("numContainers");
-        for (let i = 0; i < numContainers; i++) {
-          if (peek$(ctx, `containerItemKey${i}`) === itemKey) {
-            needsRecalculate = true;
-            break;
-          }
+  const index = state.indexByKey.get(itemKey);
+  const prevSizeKnown = state.sizesKnown.get(itemKey);
+  const diff = updateOneItemSize(state, itemKey, sizeObj);
+  const size = Math.floor((horizontal ? sizeObj.width : sizeObj.height) * 8) / 8;
+  if (diff !== 0) {
+    minIndexSizeChanged = minIndexSizeChanged !== void 0 ? Math.min(minIndexSizeChanged, index) : index;
+    if (((_b = state.scrollingTo) == null ? void 0 : _b.viewPosition) && maintainVisibleContentPosition && index === state.scrollingTo.index && diff > 0) {
+      requestAdjust(ctx, state, diff * state.scrollingTo.viewPosition);
+    }
+    const { startBuffered, endBuffered } = state;
+    needsRecalculate || (needsRecalculate = index >= startBuffered && index <= endBuffered);
+    if (!needsRecalculate) {
+      const numContainers = ctx.values.get("numContainers");
+      for (let i = 0; i < numContainers; i++) {
+        if (peek$(ctx, `containerItemKey${i}`) === itemKey) {
+          needsRecalculate = true;
+          break;
         }
       }
-      if (state.needsOtherAxisSize) {
-        const otherAxisSize = horizontal ? sizeObj.height : sizeObj.width;
-        maxOtherAxisSize = Math.max(maxOtherAxisSize, otherAxisSize);
-      }
-      if (prevSizeKnown !== void 0 && Math.abs(prevSizeKnown - size) > 5) {
-        shouldMaintainScrollAtEnd = true;
-      }
-      onItemSizeChanged == null ? void 0 : onItemSizeChanged({
-        index,
-        itemData: state.props.data[index],
-        itemKey,
-        previous: size - diff,
-        size
-      });
     }
+    if (state.needsOtherAxisSize) {
+      const otherAxisSize = horizontal ? sizeObj.height : sizeObj.width;
+      maxOtherAxisSize = Math.max(maxOtherAxisSize, otherAxisSize);
+    }
+    if (prevSizeKnown !== void 0 && Math.abs(prevSizeKnown - size) > 5) {
+      shouldMaintainScrollAtEnd = true;
+    }
+    onItemSizeChanged == null ? void 0 : onItemSizeChanged({
+      index,
+      itemData: state.props.data[index],
+      itemKey,
+      previous: size - diff,
+      size
+    });
   }
   if (minIndexSizeChanged !== void 0) {
     state.minIndexSizeChanged = state.minIndexSizeChanged !== void 0 ? Math.min(state.minIndexSizeChanged, minIndexSizeChanged) : minIndexSizeChanged;
@@ -2425,45 +2411,6 @@ function updateItemSizes(ctx, state, itemUpdates) {
     }
   }
 }
-function updateItemSize(ctx, state, itemKey, sizeObj) {
-  var _a;
-  const {
-    queuedItemSizeUpdates,
-    queuedItemSizeUpdatesWaiting,
-    sizesKnown,
-    props: { getFixedItemSize, getItemType }
-  } = state;
-  if (getFixedItemSize) {
-    const index = state.indexByKey.get(itemKey);
-    if (index === void 0) {
-      return;
-    }
-    const itemData = state.props.data[index];
-    if (itemData === void 0) {
-      return;
-    }
-    const type = getItemType ? (_a = getItemType(itemData, index)) != null ? _a : "" : "";
-    const size = getFixedItemSize(index, itemData, type);
-    if (size !== void 0 && size === sizesKnown.get(itemKey)) {
-      return;
-    }
-  }
-  const containersDidLayout = peek$(ctx, "containersDidLayout");
-  const speed = getScrollVelocity(state);
-  if (!containersDidLayout || !queuedItemSizeUpdatesWaiting || Math.abs(speed) < 1) {
-    updateItemSizes(ctx, state, [{ itemKey, sizeObj }]);
-    if (containersDidLayout) {
-      state.queuedItemSizeUpdatesWaiting = true;
-      requestAnimationFrame(() => {
-        state.queuedItemSizeUpdatesWaiting = false;
-        updateItemSizes(ctx, state, queuedItemSizeUpdates);
-        queuedItemSizeUpdates.length = 0;
-      });
-    }
-  } else {
-    queuedItemSizeUpdates.push({ itemKey, sizeObj });
-  }
-}
 function updateOneItemSize(state, itemKey, sizeObj) {
   var _a;
   const {
@@ -2551,11 +2498,9 @@ function getRenderedItem(ctx, state, key) {
 }
 
 // src/utils/throttledOnScroll.ts
-function throttledOnScroll(originalHandler, scrollEventThrottle) {
+function useThrottledOnScroll(originalHandler, scrollEventThrottle) {
   const throttle = useThrottleDebounce("throttle");
-  return (event) => {
-    throttle(originalHandler, scrollEventThrottle, event);
-  };
+  return (event) => throttle(originalHandler, scrollEventThrottle, { nativeEvent: event.nativeEvent });
 }
 
 // src/utils/updateAveragesOnDataChange.ts
@@ -2724,11 +2669,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       loadStartTime: Date.now(),
       minIndexSizeChanged: 0,
       nativeMarginTop: 0,
-      pendingAdjust: 0,
       positions: /* @__PURE__ */ new Map(),
       props: {},
       queuedCalculateItemsInView: 0,
-      queuedItemSizeUpdates: [],
       refScroller: void 0,
       scroll: 0,
       scrollAdjustHandler: new ScrollAdjustHandler(ctx),
@@ -2758,6 +2701,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const state = refState.current;
   const isFirst = !state.props.renderItem;
   const didDataChange = state.props.data !== dataProp;
+  const throttleScrollFn = scrollEventThrottle && onScrollProp ? useThrottledOnScroll(onScrollProp, scrollEventThrottle) : onScrollProp;
   state.props = {
     alignItemsAtEnd,
     data: dataProp,
@@ -2779,7 +2723,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     onEndReachedThreshold,
     onItemSizeChanged,
     onLoad,
-    onScroll: onScrollProp,
+    onScroll: throttleScrollFn,
     onStartReached,
     onStartReachedThreshold,
     recycleItems: !!recycleItems,
@@ -3037,8 +2981,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }),
     []
   );
-  const animatedScrollHandler = React3.useMemo(() => {
-    const onScrollFn = scrollEventThrottle && scrollEventThrottle > 0 ? throttledOnScroll(fns.onScroll, scrollEventThrottle) : fns.onScroll;
+  const onScrollHandler = React3.useMemo(() => {
+    const onScrollFn = fns.onScroll;
     if (stickyIndices == null ? void 0 : stickyIndices.length) {
       const { animatedScrollY } = ctx;
       return reactNative.Animated.event([{ nativeEvent: { contentOffset: { [horizontal ? "x" : "y"]: animatedScrollY } } }], {
@@ -3077,7 +3021,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
           onMomentumScrollEnd(event);
         }
       },
-      onScroll: animatedScrollHandler,
+      onScroll: onScrollHandler,
       recycleItems,
       refreshControl: refreshControl ? stylePaddingTopState > 0 ? React3__namespace.cloneElement(refreshControl, {
         progressViewOffset: (refreshControl.props.progressViewOffset || 0) + stylePaddingTopState

package/index.mjs

@@ -672,30 +672,33 @@ function useThrottleDebounce(mode) {
       timeoutRef.current = null;
     }
   };
-  const execute = useCallback((callback, delay, ...args) => {
-    {
-      const now = Date.now();
-      lastArgsRef.current = args;
-      if (now - lastCallTimeRef.current >= delay) {
-        lastCallTimeRef.current = now;
-        callback(...args);
-        clearTimeoutRef();
-      } else {
-        clearTimeoutRef();
-        timeoutRef.current = setTimeout(
-          () => {
-            if (lastArgsRef.current) {
-              lastCallTimeRef.current = Date.now();
-              callback(...lastArgsRef.current);
-              timeoutRef.current = null;
-              lastArgsRef.current = null;
-            }
-          },
-          delay - (now - lastCallTimeRef.current)
-        );
+  const execute = useCallback(
+    (callback, delay, ...args) => {
+      {
+        const now = Date.now();
+        lastArgsRef.current = args;
+        if (now - lastCallTimeRef.current >= delay) {
+          lastCallTimeRef.current = now;
+          callback(...args);
+          clearTimeoutRef();
+        } else {
+          clearTimeoutRef();
+          timeoutRef.current = setTimeout(
+            () => {
+              if (lastArgsRef.current) {
+                lastCallTimeRef.current = Date.now();
+                callback(...lastArgsRef.current);
+                timeoutRef.current = null;
+                lastArgsRef.current = null;
+              }
+            },
+            delay - (now - lastCallTimeRef.current)
+          );
+        }
       }
-    }
-  }, [mode]);
+    },
+    [mode]
+  );
   return execute;
 }
 
@@ -891,7 +894,7 @@ function calculateOffsetForIndex(ctx, state, index) {
 }
 
 // src/utils/getItemSize.ts
-function getItemSize(state, key, index, data, useAverageSize, defaultAverageSize, preferRenderedCache) {
+function getItemSize(state, key, index, data, useAverageSize, defaultAverageSize) {
   var _a, _b;
   const {
     sizesKnown,
@@ -912,11 +915,7 @@ function getItemSize(state, key, index, data, useAverageSize, defaultAverageSize
       sizesKnown.set(key, size);
     }
   }
-  const renderedSize = sizes.get(key);
-  if (size === void 0 && preferRenderedCache && renderedSize !== void 0) {
-    return renderedSize;
-  }
-  if (size === void 0 && useAverageSize && !scrollingTo) {
+  if (size === void 0 && useAverageSize && sizeKnown === void 0 && !scrollingTo) {
     if (itemType === "") {
       size = defaultAverageSize;
     } else {
@@ -926,8 +925,11 @@ function getItemSize(state, key, index, data, useAverageSize, defaultAverageSize
       }
     }
   }
-  if (size === void 0 && renderedSize !== void 0) {
-    return renderedSize;
+  if (size === void 0) {
+    size = sizes.get(key);
+    if (size !== void 0) {
+      return size;
+    }
   }
   if (size === void 0) {
     size = getEstimatedItemSize ? getEstimatedItemSize(index, data, itemType) : estimatedItemSize;
@@ -1154,44 +1156,6 @@ function addTotalSize(ctx, state, key, add) {
   }
 }
 
-// src/utils/getScrollVelocity.ts
-var getScrollVelocity = (state) => {
-  const { scrollHistory } = state;
-  let velocity = 0;
-  if (scrollHistory.length >= 1) {
-    const newest = scrollHistory[scrollHistory.length - 1];
-    let oldest;
-    let start = 0;
-    const now = Date.now();
-    for (let i = 0; i < scrollHistory.length - 1; i++) {
-      const entry = scrollHistory[i];
-      const nextEntry = scrollHistory[i + 1];
-      if (i > 0) {
-        const prevEntry = scrollHistory[i - 1];
-        const prevDirection = entry.scroll - prevEntry.scroll;
-        const currentDirection = nextEntry.scroll - entry.scroll;
-        if (prevDirection > 0 && currentDirection < 0 || prevDirection < 0 && currentDirection > 0) {
-          start = i;
-          break;
-        }
-      }
-    }
-    for (let i = start; i < scrollHistory.length - 1; i++) {
-      const entry = scrollHistory[i];
-      if (now - entry.time <= 1e3) {
-        oldest = entry;
-        break;
-      }
-    }
-    if (oldest && oldest !== newest) {
-      const scrollDiff = newest.scroll - oldest.scroll;
-      const timeDiff = newest.time - oldest.time;
-      velocity = timeDiff > 0 ? scrollDiff / timeDiff : 0;
-    }
-  }
-  return velocity;
-};
-
 // src/utils/updateSnapToOffsets.ts
 function updateSnapToOffsets(ctx, state) {
   const {
@@ -1208,14 +1172,13 @@ function updateSnapToOffsets(ctx, state) {
 }
 
 // src/core/updateAllPositions.ts
-function updateAllPositions(ctx, state, dataChanged) {
-  var _a, _b, _c, _d, _e;
+function updateAllPositions(ctx, state, dataChanged, startIndex = 0) {
+  var _a, _b, _c, _d, _e, _f, _g;
   const {
     averageSizes,
     columns,
     indexByKey,
     positions,
-    firstFullyOnScreenIndex,
     idCache,
     sizesKnown,
     props: { getEstimatedItemSize, snapToIndices, enableAverages }
@@ -1223,69 +1186,34 @@ function updateAllPositions(ctx, state, dataChanged) {
   const data = state.props.data;
   const numColumns = peek$(ctx, "numColumns");
   const indexByKeyForChecking = __DEV__ ? /* @__PURE__ */ new Map() : void 0;
-  const scrollVelocity = getScrollVelocity(state);
   const useAverageSize = enableAverages && !getEstimatedItemSize;
   const itemType = "";
   let averageSize = (_a = averageSizes[itemType]) == null ? void 0 : _a.avg;
   if (averageSize !== void 0) {
     averageSize = roundSize(averageSize);
   }
-  const shouldUseBackwards = !dataChanged && scrollVelocity < 0 && firstFullyOnScreenIndex > 5 && firstFullyOnScreenIndex < data.length;
-  if (shouldUseBackwards && firstFullyOnScreenIndex !== void 0) {
-    const anchorId = getId(state, firstFullyOnScreenIndex);
-    const anchorPosition = positions.get(anchorId);
-    if (anchorPosition !== void 0) {
-      let currentRowTop2 = anchorPosition;
-      let maxSizeInRow2 = 0;
-      let bailout = false;
-      for (let i = firstFullyOnScreenIndex - 1; i >= 0; i--) {
-        const id = (_b = idCache.get(i)) != null ? _b : getId(state, i);
-        const size = (_c = sizesKnown.get(id)) != null ? _c : getItemSize(
-          state,
-          id,
-          i,
-          data[i],
-          useAverageSize,
-          averageSize,
-          /*preferRenderedCache*/
-          !!dataChanged
-        );
-        const itemColumn = columns.get(id);
-        maxSizeInRow2 = Math.max(maxSizeInRow2, size);
-        if (itemColumn === 1) {
-          currentRowTop2 -= maxSizeInRow2;
-          maxSizeInRow2 = 0;
-        }
-        if (currentRowTop2 < -2e3) {
-          bailout = true;
-          break;
-        }
-        positions.set(id, currentRowTop2);
-      }
-      if (!bailout) {
-        updateTotalSize(ctx, state);
-        return;
-      }
-    }
-  }
   let currentRowTop = 0;
   let column = 1;
   let maxSizeInRow = 0;
   const hasColumns = numColumns > 1;
+  if (startIndex > 0) {
+    const prevIndex = startIndex - 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, averageSize);
+      currentRowTop = prevPosition + prevSize;
+    }
+  }
   const needsIndexByKey = dataChanged || indexByKey.size === 0;
   const dataLength = data.length;
-  for (let i = 0; i < dataLength; i++) {
-    const id = (_d = idCache.get(i)) != null ? _d : getId(state, i);
-    const size = (_e = sizesKnown.get(id)) != null ? _e : getItemSize(
-      state,
-      id,
-      i,
-      data[i],
-      useAverageSize,
-      averageSize,
-      /*preferRenderedCache*/
-      !!dataChanged
-    );
+  for (let i = startIndex; 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, averageSize);
     if (__DEV__ && needsIndexByKey) {
       if (indexByKeyForChecking.has(id)) {
         console.error(
@@ -1648,6 +1576,44 @@ function comparatorByDistance(a, b) {
   return b.distance - a.distance;
 }
 
+// src/utils/getScrollVelocity.ts
+var getScrollVelocity = (state) => {
+  const { scrollHistory } = state;
+  let velocity = 0;
+  if (scrollHistory.length >= 1) {
+    const newest = scrollHistory[scrollHistory.length - 1];
+    let oldest;
+    let start = 0;
+    const now = Date.now();
+    for (let i = 0; i < scrollHistory.length - 1; i++) {
+      const entry = scrollHistory[i];
+      const nextEntry = scrollHistory[i + 1];
+      if (i > 0) {
+        const prevEntry = scrollHistory[i - 1];
+        const prevDirection = entry.scroll - prevEntry.scroll;
+        const currentDirection = nextEntry.scroll - entry.scroll;
+        if (prevDirection > 0 && currentDirection < 0 || prevDirection < 0 && currentDirection > 0) {
+          start = i;
+          break;
+        }
+      }
+    }
+    for (let i = start; i < scrollHistory.length - 1; i++) {
+      const entry = scrollHistory[i];
+      if (now - entry.time <= 1e3) {
+        oldest = entry;
+        break;
+      }
+    }
+    if (oldest && oldest !== newest) {
+      const scrollDiff = newest.scroll - oldest.scroll;
+      const timeDiff = newest.time - oldest.time;
+      velocity = timeDiff > 0 ? scrollDiff / timeDiff : 0;
+    }
+  }
+  return velocity;
+};
+
 // src/core/scrollToIndex.ts
 function scrollToIndex(ctx, state, { index, viewOffset = 0, animated = true, viewPosition }) {
   if (index >= state.props.data.length) {
@@ -1859,7 +1825,11 @@ function calculateItemsInView(ctx, state, params = {}) {
         idCache.clear();
         positions.clear();
       }
-      updateAllPositions(ctx, state, dataChanged);
+      const startIndex = dataChanged ? 0 : minIndexSizeChanged != null ? minIndexSizeChanged : 0;
+      updateAllPositions(ctx, state, dataChanged, startIndex);
+      if (minIndexSizeChanged !== void 0) {
+        state.minIndexSizeChanged = void 0;
+      }
       checkMVCP == null ? void 0 : checkMVCP();
     }
     const scrollExtra = 0;
@@ -1906,10 +1876,6 @@ function calculateItemsInView(ctx, state, params = {}) {
     let endNoBuffer = null;
     let endBuffered = null;
     let loopStart = startBufferedIdOrig ? indexByKey.get(startBufferedIdOrig) || 0 : 0;
-    if (minIndexSizeChanged !== void 0) {
-      loopStart = Math.min(minIndexSizeChanged, loopStart);
-      state.minIndexSizeChanged = void 0;
-    }
     for (let i = loopStart; i >= 0; i--) {
       const id = (_a = idCache.get(i)) != null ? _a : getId(state, i);
       const top = positions.get(id);
@@ -2279,7 +2245,8 @@ function updateScroll(ctx, state, newScroll) {
   state.lastBatchingAction = Date.now();
   const currentTime = Date.now();
   if (scrollingTo === void 0 && !(state.scrollHistory.length === 0 && newScroll === state.scroll)) {
-    state.scrollHistory.push({ scroll: newScroll, time: currentTime });
+    const adjust = state.scrollAdjustHandler.getAdjust();
+    state.scrollHistory.push({ scroll: newScroll - adjust, time: currentTime });
   }
   if (state.scrollHistory.length > 5) {
     state.scrollHistory.shift();
@@ -2315,13 +2282,19 @@ var ScrollAdjustHandler = class {
   setMounted() {
     this.mounted = true;
   }
+  getAdjust() {
+    return this.appliedAdjust;
+  }
 };
 
 // src/core/updateItemSize.ts
-function updateItemSizes(ctx, state, itemUpdates) {
-  var _a;
+function updateItemSize(ctx, state, itemKey, sizeObj) {
+  var _a, _b;
   const {
+    sizesKnown,
     props: {
+      getFixedItemSize,
+      getItemType,
       horizontal,
       maintainVisibleContentPosition,
       suggestEstimatedItemSize,
@@ -2331,47 +2304,60 @@ function updateItemSizes(ctx, state, itemUpdates) {
     }
   } = state;
   if (!data) return;
+  if (getFixedItemSize) {
+    const index2 = state.indexByKey.get(itemKey);
+    if (index2 === void 0) {
+      return;
+    }
+    const itemData = state.props.data[index2];
+    if (itemData === void 0) {
+      return;
+    }
+    const type = getItemType ? (_a = getItemType(itemData, index2)) != null ? _a : "" : "";
+    const size2 = getFixedItemSize(index2, itemData, type);
+    if (size2 !== void 0 && size2 === sizesKnown.get(itemKey)) {
+      return;
+    }
+  }
   const containersDidLayout = peek$(ctx, "containersDidLayout");
   let needsRecalculate = !containersDidLayout;
   let shouldMaintainScrollAtEnd = false;
   let minIndexSizeChanged;
   let maxOtherAxisSize = peek$(ctx, "otherAxisSize") || 0;
-  for (const { itemKey, sizeObj } of itemUpdates) {
-    const index = state.indexByKey.get(itemKey);
-    const prevSizeKnown = state.sizesKnown.get(itemKey);
-    const diff = updateOneItemSize(state, itemKey, sizeObj);
-    const size = Math.floor((horizontal ? sizeObj.width : sizeObj.height) * 8) / 8;
-    if (diff !== 0) {
-      minIndexSizeChanged = minIndexSizeChanged !== void 0 ? Math.min(minIndexSizeChanged, index) : index;
-      if (((_a = state.scrollingTo) == null ? void 0 : _a.viewPosition) && maintainVisibleContentPosition && index === state.scrollingTo.index && diff > 0) {
-        requestAdjust(ctx, state, diff * state.scrollingTo.viewPosition);
-      }
-      const { startBuffered, endBuffered } = state;
-      needsRecalculate || (needsRecalculate = index >= startBuffered && index <= endBuffered);
-      if (!needsRecalculate) {
-        const numContainers = ctx.values.get("numContainers");
-        for (let i = 0; i < numContainers; i++) {
-          if (peek$(ctx, `containerItemKey${i}`) === itemKey) {
-            needsRecalculate = true;
-            break;
-          }
+  const index = state.indexByKey.get(itemKey);
+  const prevSizeKnown = state.sizesKnown.get(itemKey);
+  const diff = updateOneItemSize(state, itemKey, sizeObj);
+  const size = Math.floor((horizontal ? sizeObj.width : sizeObj.height) * 8) / 8;
+  if (diff !== 0) {
+    minIndexSizeChanged = minIndexSizeChanged !== void 0 ? Math.min(minIndexSizeChanged, index) : index;
+    if (((_b = state.scrollingTo) == null ? void 0 : _b.viewPosition) && maintainVisibleContentPosition && index === state.scrollingTo.index && diff > 0) {
+      requestAdjust(ctx, state, diff * state.scrollingTo.viewPosition);
+    }
+    const { startBuffered, endBuffered } = state;
+    needsRecalculate || (needsRecalculate = index >= startBuffered && index <= endBuffered);
+    if (!needsRecalculate) {
+      const numContainers = ctx.values.get("numContainers");
+      for (let i = 0; i < numContainers; i++) {
+        if (peek$(ctx, `containerItemKey${i}`) === itemKey) {
+          needsRecalculate = true;
+          break;
         }
       }
-      if (state.needsOtherAxisSize) {
-        const otherAxisSize = horizontal ? sizeObj.height : sizeObj.width;
-        maxOtherAxisSize = Math.max(maxOtherAxisSize, otherAxisSize);
-      }
-      if (prevSizeKnown !== void 0 && Math.abs(prevSizeKnown - size) > 5) {
-        shouldMaintainScrollAtEnd = true;
-      }
-      onItemSizeChanged == null ? void 0 : onItemSizeChanged({
-        index,
-        itemData: state.props.data[index],
-        itemKey,
-        previous: size - diff,
-        size
-      });
     }
+    if (state.needsOtherAxisSize) {
+      const otherAxisSize = horizontal ? sizeObj.height : sizeObj.width;
+      maxOtherAxisSize = Math.max(maxOtherAxisSize, otherAxisSize);
+    }
+    if (prevSizeKnown !== void 0 && Math.abs(prevSizeKnown - size) > 5) {
+      shouldMaintainScrollAtEnd = true;
+    }
+    onItemSizeChanged == null ? void 0 : onItemSizeChanged({
+      index,
+      itemData: state.props.data[index],
+      itemKey,
+      previous: size - diff,
+      size
+    });
   }
   if (minIndexSizeChanged !== void 0) {
     state.minIndexSizeChanged = state.minIndexSizeChanged !== void 0 ? Math.min(state.minIndexSizeChanged, minIndexSizeChanged) : minIndexSizeChanged;
@@ -2404,45 +2390,6 @@ function updateItemSizes(ctx, state, itemUpdates) {
     }
   }
 }
-function updateItemSize(ctx, state, itemKey, sizeObj) {
-  var _a;
-  const {
-    queuedItemSizeUpdates,
-    queuedItemSizeUpdatesWaiting,
-    sizesKnown,
-    props: { getFixedItemSize, getItemType }
-  } = state;
-  if (getFixedItemSize) {
-    const index = state.indexByKey.get(itemKey);
-    if (index === void 0) {
-      return;
-    }
-    const itemData = state.props.data[index];
-    if (itemData === void 0) {
-      return;
-    }
-    const type = getItemType ? (_a = getItemType(itemData, index)) != null ? _a : "" : "";
-    const size = getFixedItemSize(index, itemData, type);
-    if (size !== void 0 && size === sizesKnown.get(itemKey)) {
-      return;
-    }
-  }
-  const containersDidLayout = peek$(ctx, "containersDidLayout");
-  const speed = getScrollVelocity(state);
-  if (!containersDidLayout || !queuedItemSizeUpdatesWaiting || Math.abs(speed) < 1) {
-    updateItemSizes(ctx, state, [{ itemKey, sizeObj }]);
-    if (containersDidLayout) {
-      state.queuedItemSizeUpdatesWaiting = true;
-      requestAnimationFrame(() => {
-        state.queuedItemSizeUpdatesWaiting = false;
-        updateItemSizes(ctx, state, queuedItemSizeUpdates);
-        queuedItemSizeUpdates.length = 0;
-      });
-    }
-  } else {
-    queuedItemSizeUpdates.push({ itemKey, sizeObj });
-  }
-}
 function updateOneItemSize(state, itemKey, sizeObj) {
   var _a;
   const {
@@ -2530,11 +2477,9 @@ function getRenderedItem(ctx, state, key) {
 }
 
 // src/utils/throttledOnScroll.ts
-function throttledOnScroll(originalHandler, scrollEventThrottle) {
+function useThrottledOnScroll(originalHandler, scrollEventThrottle) {
   const throttle = useThrottleDebounce("throttle");
-  return (event) => {
-    throttle(originalHandler, scrollEventThrottle, event);
-  };
+  return (event) => throttle(originalHandler, scrollEventThrottle, { nativeEvent: event.nativeEvent });
 }
 
 // src/utils/updateAveragesOnDataChange.ts
@@ -2703,11 +2648,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       loadStartTime: Date.now(),
       minIndexSizeChanged: 0,
       nativeMarginTop: 0,
-      pendingAdjust: 0,
       positions: /* @__PURE__ */ new Map(),
       props: {},
       queuedCalculateItemsInView: 0,
-      queuedItemSizeUpdates: [],
       refScroller: void 0,
       scroll: 0,
       scrollAdjustHandler: new ScrollAdjustHandler(ctx),
@@ -2737,6 +2680,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const state = refState.current;
   const isFirst = !state.props.renderItem;
   const didDataChange = state.props.data !== dataProp;
+  const throttleScrollFn = scrollEventThrottle && onScrollProp ? useThrottledOnScroll(onScrollProp, scrollEventThrottle) : onScrollProp;
   state.props = {
     alignItemsAtEnd,
     data: dataProp,
@@ -2758,7 +2702,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     onEndReachedThreshold,
     onItemSizeChanged,
     onLoad,
-    onScroll: onScrollProp,
+    onScroll: throttleScrollFn,
     onStartReached,
     onStartReachedThreshold,
     recycleItems: !!recycleItems,
@@ -3016,8 +2960,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }),
     []
   );
-  const animatedScrollHandler = useMemo(() => {
-    const onScrollFn = scrollEventThrottle && scrollEventThrottle > 0 ? throttledOnScroll(fns.onScroll, scrollEventThrottle) : fns.onScroll;
+  const onScrollHandler = useMemo(() => {
+    const onScrollFn = fns.onScroll;
     if (stickyIndices == null ? void 0 : stickyIndices.length) {
       const { animatedScrollY } = ctx;
       return Animated.event([{ nativeEvent: { contentOffset: { [horizontal ? "x" : "y"]: animatedScrollY } } }], {
@@ -3056,7 +3000,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
           onMomentumScrollEnd(event);
         }
       },
-      onScroll: animatedScrollHandler,
+      onScroll: onScrollHandler,
       recycleItems,
       refreshControl: refreshControl ? stylePaddingTopState > 0 ? React3.cloneElement(refreshControl, {
         progressViewOffset: (refreshControl.props.progressViewOffset || 0) + stylePaddingTopState

package/package.json

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