@legendapp/list 1.0.11 → 1.0.13

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.0.13
+- Fix: Missing React import in ListHeaderComponentContainer crashing some environments
+- Fix: `initialScrollIndex` was off by padding if using "padding" or "paddingVertical" props
+
+## 1.0.12
+- Fix: Initial scroll index and scrollTo were not compensating for top padding
+- Fix: Removed an overly aggressive optimization that was sometimes causing blank spaces after scrolling
+- Fix: Adding a lot of items to the end with maintainScrollAtEnd could result in a large blank space
+- Fix: ListHeaderComponent sometimes not positioned correctly with maintainVisibleContentPosition
+- Fix: Gap styles not working with maintainVisibleContentPosition
+
+## 1.0.11
+- Fix: scrollTo was sometimes showing gaps at the bottom or bottom after reaching the destination
+
 ## 1.0.10
 - Fix: Removed an optimization that only checked newly visible items, which could sometimes cause gaps in lists
 - Fix: Scroll history resets properly during scroll operations, which was causing gaps after scroll

package/index.d.mts

@@ -244,6 +244,7 @@ interface InternalState {
     startNoBuffer: number;
     endBuffered: number;
     endNoBuffer: number;
+    scrollPending: number;
     scroll: number;
     scrollTime: number;
     scrollPrev: number;
@@ -278,6 +279,7 @@ interface InternalState {
     ignoreScrollFromCalcTotal?: boolean;
     disableScrollJumpsFrom?: number;
     scrollingToOffset?: number | undefined;
+    previousTotalSize?: number;
     averageSizes: Record<string, {
         num: number;
         avg: number;

package/index.d.ts

@@ -244,6 +244,7 @@ interface InternalState {
     startNoBuffer: number;
     endBuffered: number;
     endNoBuffer: number;
+    scrollPending: number;
     scroll: number;
     scrollTime: number;
     scrollPrev: number;
@@ -278,6 +279,7 @@ interface InternalState {
     ignoreScrollFromCalcTotal?: boolean;
     disableScrollJumpsFrom?: number;
     scrollingToOffset?: number | undefined;
+    previousTotalSize?: number;
     averageSizes: Record<string, {
         num: number;
         avg: number;

package/index.js

@@ -206,6 +206,13 @@ function comparatorByDistance(a, b) {
 function comparatorDefault(a, b) {
   return a - b;
 }
+function getPadding(s) {
+  var _a, _b, _c;
+  return (_c = (_b = (_a = s.paddingTop) != null ? _a : s.paddingVertical) != null ? _b : s.padding) != null ? _c : 0;
+}
+function extractPaddingTop(style, contentContainerStyle) {
+  return getPadding(style) + getPadding(contentContainerStyle);
+}
 var symbolFirst = Symbol();
 function useInit(cb) {
   const refValue = React2.useRef(symbolFirst);
@@ -449,7 +456,7 @@ var Container = ({
       anchorStyle.borderColor = position.type === "top" ? "red" : "blue";
       anchorStyle.borderWidth = 1;
     }
-    return /* @__PURE__ */ React2__namespace.default.createElement(LeanView, { style }, /* @__PURE__ */ React2__namespace.default.createElement(LeanView, { style: anchorStyle, onLayout, ref }, contentFragment, __DEV__ && ENABLE_DEVMODE && /* @__PURE__ */ React2__namespace.default.createElement(reactNative.Text, { style: { position: "absolute", top: 0, left: 0, zIndex: 1e3 } }, position.top)));
+    return /* @__PURE__ */ React2__namespace.default.createElement(LeanView, { style }, /* @__PURE__ */ React2__namespace.default.createElement(LeanView, { style: [anchorStyle, paddingStyles], onLayout, ref }, contentFragment, __DEV__ && ENABLE_DEVMODE && /* @__PURE__ */ React2__namespace.default.createElement(reactNative.Text, { style: { position: "absolute", top: 0, left: 0, zIndex: 1e3 } }, position.top)));
   }
   return /* @__PURE__ */ React2__namespace.default.createElement(LeanView, { style, onLayout, ref }, contentFragment);
 };
@@ -535,6 +542,31 @@ var Containers = typedMemo(function Containers2({
   }
   return /* @__PURE__ */ React2__namespace.createElement(reactNative.Animated.View, { style }, containers);
 });
+function ListHeaderComponentContainer({
+  children,
+  style,
+  ctx,
+  horizontal,
+  waitForInitialLayout
+}) {
+  const scrollAdjust = useValue$("scrollAdjust", (v) => v, true);
+  const animOpacity = waitForInitialLayout ? useValue$("containersDidLayout", (value) => value ? 1 : 0) : void 0;
+  const additionalSize = {
+    transform: [{ translateY: reactNative.Animated.multiply(scrollAdjust, -1) }],
+    opacity: animOpacity
+  };
+  return /* @__PURE__ */ React2__namespace.createElement(
+    reactNative.Animated.View,
+    {
+      style: [style, additionalSize],
+      onLayout: (event) => {
+        const size = event.nativeEvent.layout[horizontal ? "width" : "height"];
+        set$(ctx, "headerSize", size);
+      }
+    },
+    children
+  );
+}
 
 // src/ListComponent.tsx
 var getComponent = (Component) => {
@@ -648,13 +680,12 @@ var ListComponent = typedMemo(function ListComponent2({
     },
     !ListEmptyComponent && (ENABLE_DEVMODE ? /* @__PURE__ */ React2__namespace.createElement(PaddingAndAdjustDevMode, null) : /* @__PURE__ */ React2__namespace.createElement(PaddingAndAdjust, null)),
     ListHeaderComponent && /* @__PURE__ */ React2__namespace.createElement(
-      reactNative.View,
+      ListHeaderComponentContainer,
       {
         style: ListHeaderComponentStyle,
-        onLayout: (event) => {
-          const size = event.nativeEvent.layout[horizontal ? "width" : "height"];
-          set$(ctx, "headerSize", size);
-        }
+        ctx,
+        horizontal,
+        waitForInitialLayout
       },
       getComponent(ListHeaderComponent)
     ),
@@ -1003,7 +1034,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   callbacks.current.onEndReached = rest.onEndReached;
   const contentContainerStyle = { ...reactNative.StyleSheet.flatten(contentContainerStyleProp) };
   const style = { ...reactNative.StyleSheet.flatten(styleProp) };
-  const stylePaddingTopState = ((style == null ? void 0 : style.paddingTop) || 0) + ((contentContainerStyle == null ? void 0 : contentContainerStyle.paddingTop) || 0);
+  const stylePaddingTopState = extractPaddingTop(style, contentContainerStyle);
   if (style == null ? void 0 : style.paddingTop) {
     style.paddingTop = void 0;
   }
@@ -1052,8 +1083,10 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     state.sizes.set(key, size);
     return size;
   };
-  const calculateOffsetForIndex = (index = initialScrollIndex) => {
+  const calculateOffsetForIndex = (indexParam) => {
     var _a;
+    const isFromInit = indexParam === void 0;
+    const index = isFromInit ? initialScrollIndex : indexParam;
     const data = dataProp;
     if (index !== void 0) {
       let offset = 0;
@@ -1072,11 +1105,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         offset = index * estimatedItemSize;
       }
       const adjust = peek$(ctx, "containersDidLayout") ? ((_a = refState.current) == null ? void 0 : _a.scrollAdjustHandler.getAppliedAdjust()) || 0 : 0;
-      return offset / numColumnsProp - adjust;
+      const stylePaddingTop = isFromInit ? stylePaddingTopState : peek$(ctx, "stylePaddingTop");
+      const topPad = (stylePaddingTop != null ? stylePaddingTop : 0) + peek$(ctx, "headerSize");
+      return offset / numColumnsProp - adjust + topPad;
     }
     return 0;
   };
-  const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : React2.useMemo(calculateOffsetForIndex, []);
+  const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : React2.useMemo(() => calculateOffsetForIndex(void 0), []);
   if (!refState.current) {
     const initialScrollLength = reactNative.Dimensions.get("window")[horizontal ? "width" : "height"];
     refState.current = {
@@ -1105,6 +1140,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       scrollPrev: 0,
       scrollPrevTime: 0,
       scrollTime: 0,
+      scrollPending: 0,
       indexByKey: /* @__PURE__ */ new Map(),
       scrollHistory: [],
       scrollVelocity: 0,
@@ -1173,11 +1209,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     const firstIndexOffset = calculateOffsetForIndex(index);
     let firstIndexScrollPostion = firstIndexOffset - viewOffset;
     const diff = Math.abs(state.scroll - firstIndexScrollPostion);
+    const topPad = peek$(ctx, "stylePaddingTop") + peek$(ctx, "headerSize");
     const needsReanchoring = maintainVisibleContentPosition && diff > 100;
     state.scrollForNextCalculateItemsInView = void 0;
     if (needsReanchoring) {
       const id = getId(index);
-      state.anchorElement = { id, coordinate: firstIndexOffset };
+      state.anchorElement = { id, coordinate: firstIndexOffset - topPad };
       (_a = state.belowAnchorElementPositions) == null ? void 0 : _a.clear();
       state.positions.clear();
       calcTotalSizesAndPositions({ forgetPositions: true });
@@ -1297,6 +1334,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       state.scrollHistory.length = 0;
       setTimeout(() => {
         state.disableScrollJumpsFrom = void 0;
+        if (state.scrollPending !== void 0 && state.scrollPending !== state.scroll) {
+          updateScroll(state.scrollPending);
+        }
       }, timeout);
     }
   };
@@ -1410,7 +1450,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     const numColumns = peek$(ctx, "numColumns");
     const previousScrollAdjust = scrollAdjustHandler.getAppliedAdjust();
     let scrollState = state.scroll;
-    const scrollExtra = Math.max(-16, Math.min(16, speed)) * 24;
+    const scrollExtra = 0;
     const useAverageSize = !state.disableScrollJumpsFrom && speed >= 0 && peek$(ctx, "containersDidLayout");
     if (!state.queuedInitialLayout && initialScrollIndex) {
       const updatedOffset = calculateOffsetForIndex(initialScrollIndex);
@@ -1719,6 +1759,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       if (paddingTop > 0) {
         state.scroll = 0;
       }
+      state.disableScrollJumpsFrom = void 0;
       requestAnimationFrame(() => {
         var _a;
         state.maintainingScrollAtEnd = true;
@@ -1808,8 +1849,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     if (state) {
       state.data = dataProp;
       if (!isFirst2) {
-        disableScrollJumps(2e3);
-        refState.current.scrollForNextCalculateItemsInView = void 0;
+        const totalSizeBefore = state.previousTotalSize;
+        const totalSizeAfter = state.totalSize;
+        const scrollDiff = state.scroll - state.scrollPrev;
+        const sizeDiff = totalSizeAfter - totalSizeBefore;
+        if (Math.abs(scrollDiff - sizeDiff) < 10) {
+          disableScrollJumps(1e3);
+        }
         const numContainers = peek$(ctx, "numContainers");
         for (let i = 0; i < numContainers; i++) {
           const itemKey = peek$(ctx, `containerItemKey${i}`);
@@ -2020,6 +2066,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       refState.current.sizes.clear();
       refState.current.positions.clear();
     }
+    refState.current.previousTotalSize = peek$(ctx, "totalSize");
     calcTotalSizesAndPositions({ forgetPositions: false });
   }
   React2.useEffect(() => {
@@ -2227,73 +2274,76 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
   }, []);
   const handleScroll = React2.useCallback(
-    (event, fromSelf) => {
+    (event) => {
       var _a, _b, _c, _d;
       if (((_b = (_a = event.nativeEvent) == null ? void 0 : _a.contentSize) == null ? void 0 : _b.height) === 0 && ((_c = event.nativeEvent.contentSize) == null ? void 0 : _c.width) === 0) {
         return;
       }
       const state = refState.current;
-      const scrollingToOffset = state.scrollingToOffset;
       const newScroll = event.nativeEvent.contentOffset[horizontal ? "x" : "y"];
+      state.scrollPending = newScroll;
       if (state.ignoreScrollFromCalcTotal && newScroll !== 0) {
         return;
       }
-      if (scrollingToOffset !== void 0 && Math.abs(newScroll - scrollingToOffset) < 10) {
-        finishScrollTo();
-      }
-      if (state.disableScrollJumpsFrom !== void 0) {
-        const scrollMinusAdjust = newScroll - state.scrollAdjustHandler.getAppliedAdjust();
-        if (Math.abs(scrollMinusAdjust - state.disableScrollJumpsFrom) > 200) {
-          return;
-        }
-        state.disableScrollJumpsFrom = void 0;
+      updateScroll(newScroll);
+      (_d = state.onScroll) == null ? void 0 : _d.call(state, event);
+    },
+    []
+  );
+  const updateScroll = React2.useCallback((newScroll) => {
+    const state = refState.current;
+    const scrollingToOffset = state.scrollingToOffset;
+    if (scrollingToOffset !== void 0 && Math.abs(newScroll - scrollingToOffset) < 10) {
+      finishScrollTo();
+    }
+    if (state.disableScrollJumpsFrom !== void 0) {
+      const scrollMinusAdjust = newScroll - state.scrollAdjustHandler.getAppliedAdjust();
+      if (Math.abs(scrollMinusAdjust - state.disableScrollJumpsFrom) > 200) {
+        return;
       }
-      state.hasScrolled = true;
-      state.lastBatchingAction = Date.now();
-      const currentTime = performance.now();
-      if (scrollingToOffset === void 0 && !(state.scrollHistory.length === 0 && newScroll === initialContentOffset)) {
-        state.scrollHistory.push({ scroll: newScroll, time: currentTime });
-      }
-      if (state.scrollHistory.length > 5) {
-        state.scrollHistory.shift();
-      }
-      if (state.scrollTimer !== void 0) {
-        clearTimeout(state.scrollTimer);
-      }
-      state.scrollTimer = setTimeout(() => {
-        state.scrollVelocity = 0;
-      }, 500);
-      let velocity = 0;
-      if (state.scrollHistory.length >= 2) {
-        const newest = state.scrollHistory[state.scrollHistory.length - 1];
-        let oldest;
-        for (let i = 0; i < state.scrollHistory.length - 1; i++) {
-          const entry = state.scrollHistory[i];
-          if (newest.time - entry.time <= 100) {
-            oldest = entry;
-            break;
-          }
-        }
-        if (oldest) {
-          const scrollDiff = newest.scroll - oldest.scroll;
-          const timeDiff = newest.time - oldest.time;
-          velocity = timeDiff > 0 ? scrollDiff / timeDiff : 0;
+      state.disableScrollJumpsFrom = void 0;
+    }
+    state.hasScrolled = true;
+    state.lastBatchingAction = Date.now();
+    const currentTime = performance.now();
+    if (scrollingToOffset === void 0 && !(state.scrollHistory.length === 0 && newScroll === initialContentOffset)) {
+      state.scrollHistory.push({ scroll: newScroll, time: currentTime });
+    }
+    if (state.scrollHistory.length > 5) {
+      state.scrollHistory.shift();
+    }
+    if (state.scrollTimer !== void 0) {
+      clearTimeout(state.scrollTimer);
+    }
+    state.scrollTimer = setTimeout(() => {
+      state.scrollVelocity = 0;
+    }, 500);
+    let velocity = 0;
+    if (state.scrollHistory.length >= 2) {
+      const newest = state.scrollHistory[state.scrollHistory.length - 1];
+      let oldest;
+      for (let i = 0; i < state.scrollHistory.length - 1; i++) {
+        const entry = state.scrollHistory[i];
+        if (newest.time - entry.time <= 100) {
+          oldest = entry;
+          break;
         }
       }
-      state.scrollPrev = state.scroll;
-      state.scrollPrevTime = state.scrollTime;
-      state.scroll = newScroll;
-      state.scrollTime = currentTime;
-      state.scrollVelocity = velocity;
-      calculateItemsInView();
-      checkAtBottom();
-      checkAtTop();
-      if (!fromSelf) {
-        (_d = state.onScroll) == null ? void 0 : _d.call(state, event);
+      if (oldest) {
+        const scrollDiff = newest.scroll - oldest.scroll;
+        const timeDiff = newest.time - oldest.time;
+        velocity = timeDiff > 0 ? scrollDiff / timeDiff : 0;
       }
-    },
-    []
-  );
+    }
+    state.scrollPrev = state.scroll;
+    state.scrollPrevTime = state.scrollTime;
+    state.scroll = newScroll;
+    state.scrollTime = currentTime;
+    state.scrollVelocity = velocity;
+    calculateItemsInView();
+    checkAtBottom();
+    checkAtTop();
+  }, []);
   React2.useImperativeHandle(
     forwardedRef,
     () => {

package/index.mjs

@@ -185,6 +185,13 @@ function comparatorByDistance(a, b) {
 function comparatorDefault(a, b) {
   return a - b;
 }
+function getPadding(s) {
+  var _a, _b, _c;
+  return (_c = (_b = (_a = s.paddingTop) != null ? _a : s.paddingVertical) != null ? _b : s.padding) != null ? _c : 0;
+}
+function extractPaddingTop(style, contentContainerStyle) {
+  return getPadding(style) + getPadding(contentContainerStyle);
+}
 var symbolFirst = Symbol();
 function useInit(cb) {
   const refValue = useRef(symbolFirst);
@@ -428,7 +435,7 @@ var Container = ({
       anchorStyle.borderColor = position.type === "top" ? "red" : "blue";
       anchorStyle.borderWidth = 1;
     }
-    return /* @__PURE__ */ React2__default.createElement(LeanView, { style }, /* @__PURE__ */ React2__default.createElement(LeanView, { style: anchorStyle, onLayout, ref }, contentFragment, __DEV__ && ENABLE_DEVMODE && /* @__PURE__ */ React2__default.createElement(Text, { style: { position: "absolute", top: 0, left: 0, zIndex: 1e3 } }, position.top)));
+    return /* @__PURE__ */ React2__default.createElement(LeanView, { style }, /* @__PURE__ */ React2__default.createElement(LeanView, { style: [anchorStyle, paddingStyles], onLayout, ref }, contentFragment, __DEV__ && ENABLE_DEVMODE && /* @__PURE__ */ React2__default.createElement(Text, { style: { position: "absolute", top: 0, left: 0, zIndex: 1e3 } }, position.top)));
   }
   return /* @__PURE__ */ React2__default.createElement(LeanView, { style, onLayout, ref }, contentFragment);
 };
@@ -514,6 +521,31 @@ var Containers = typedMemo(function Containers2({
   }
   return /* @__PURE__ */ React2.createElement(Animated.View, { style }, containers);
 });
+function ListHeaderComponentContainer({
+  children,
+  style,
+  ctx,
+  horizontal,
+  waitForInitialLayout
+}) {
+  const scrollAdjust = useValue$("scrollAdjust", (v) => v, true);
+  const animOpacity = waitForInitialLayout ? useValue$("containersDidLayout", (value) => value ? 1 : 0) : void 0;
+  const additionalSize = {
+    transform: [{ translateY: Animated.multiply(scrollAdjust, -1) }],
+    opacity: animOpacity
+  };
+  return /* @__PURE__ */ React2.createElement(
+    Animated.View,
+    {
+      style: [style, additionalSize],
+      onLayout: (event) => {
+        const size = event.nativeEvent.layout[horizontal ? "width" : "height"];
+        set$(ctx, "headerSize", size);
+      }
+    },
+    children
+  );
+}
 
 // src/ListComponent.tsx
 var getComponent = (Component) => {
@@ -627,13 +659,12 @@ var ListComponent = typedMemo(function ListComponent2({
     },
     !ListEmptyComponent && (ENABLE_DEVMODE ? /* @__PURE__ */ React2.createElement(PaddingAndAdjustDevMode, null) : /* @__PURE__ */ React2.createElement(PaddingAndAdjust, null)),
     ListHeaderComponent && /* @__PURE__ */ React2.createElement(
-      View,
+      ListHeaderComponentContainer,
       {
         style: ListHeaderComponentStyle,
-        onLayout: (event) => {
-          const size = event.nativeEvent.layout[horizontal ? "width" : "height"];
-          set$(ctx, "headerSize", size);
-        }
+        ctx,
+        horizontal,
+        waitForInitialLayout
       },
       getComponent(ListHeaderComponent)
     ),
@@ -982,7 +1013,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   callbacks.current.onEndReached = rest.onEndReached;
   const contentContainerStyle = { ...StyleSheet.flatten(contentContainerStyleProp) };
   const style = { ...StyleSheet.flatten(styleProp) };
-  const stylePaddingTopState = ((style == null ? void 0 : style.paddingTop) || 0) + ((contentContainerStyle == null ? void 0 : contentContainerStyle.paddingTop) || 0);
+  const stylePaddingTopState = extractPaddingTop(style, contentContainerStyle);
   if (style == null ? void 0 : style.paddingTop) {
     style.paddingTop = void 0;
   }
@@ -1031,8 +1062,10 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     state.sizes.set(key, size);
     return size;
   };
-  const calculateOffsetForIndex = (index = initialScrollIndex) => {
+  const calculateOffsetForIndex = (indexParam) => {
     var _a;
+    const isFromInit = indexParam === void 0;
+    const index = isFromInit ? initialScrollIndex : indexParam;
     const data = dataProp;
     if (index !== void 0) {
       let offset = 0;
@@ -1051,11 +1084,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         offset = index * estimatedItemSize;
       }
       const adjust = peek$(ctx, "containersDidLayout") ? ((_a = refState.current) == null ? void 0 : _a.scrollAdjustHandler.getAppliedAdjust()) || 0 : 0;
-      return offset / numColumnsProp - adjust;
+      const stylePaddingTop = isFromInit ? stylePaddingTopState : peek$(ctx, "stylePaddingTop");
+      const topPad = (stylePaddingTop != null ? stylePaddingTop : 0) + peek$(ctx, "headerSize");
+      return offset / numColumnsProp - adjust + topPad;
     }
     return 0;
   };
-  const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : useMemo(calculateOffsetForIndex, []);
+  const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : useMemo(() => calculateOffsetForIndex(void 0), []);
   if (!refState.current) {
     const initialScrollLength = Dimensions.get("window")[horizontal ? "width" : "height"];
     refState.current = {
@@ -1084,6 +1119,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       scrollPrev: 0,
       scrollPrevTime: 0,
       scrollTime: 0,
+      scrollPending: 0,
       indexByKey: /* @__PURE__ */ new Map(),
       scrollHistory: [],
       scrollVelocity: 0,
@@ -1152,11 +1188,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     const firstIndexOffset = calculateOffsetForIndex(index);
     let firstIndexScrollPostion = firstIndexOffset - viewOffset;
     const diff = Math.abs(state.scroll - firstIndexScrollPostion);
+    const topPad = peek$(ctx, "stylePaddingTop") + peek$(ctx, "headerSize");
     const needsReanchoring = maintainVisibleContentPosition && diff > 100;
     state.scrollForNextCalculateItemsInView = void 0;
     if (needsReanchoring) {
       const id = getId(index);
-      state.anchorElement = { id, coordinate: firstIndexOffset };
+      state.anchorElement = { id, coordinate: firstIndexOffset - topPad };
       (_a = state.belowAnchorElementPositions) == null ? void 0 : _a.clear();
       state.positions.clear();
       calcTotalSizesAndPositions({ forgetPositions: true });
@@ -1276,6 +1313,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       state.scrollHistory.length = 0;
       setTimeout(() => {
         state.disableScrollJumpsFrom = void 0;
+        if (state.scrollPending !== void 0 && state.scrollPending !== state.scroll) {
+          updateScroll(state.scrollPending);
+        }
       }, timeout);
     }
   };
@@ -1389,7 +1429,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     const numColumns = peek$(ctx, "numColumns");
     const previousScrollAdjust = scrollAdjustHandler.getAppliedAdjust();
     let scrollState = state.scroll;
-    const scrollExtra = Math.max(-16, Math.min(16, speed)) * 24;
+    const scrollExtra = 0;
     const useAverageSize = !state.disableScrollJumpsFrom && speed >= 0 && peek$(ctx, "containersDidLayout");
     if (!state.queuedInitialLayout && initialScrollIndex) {
       const updatedOffset = calculateOffsetForIndex(initialScrollIndex);
@@ -1698,6 +1738,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       if (paddingTop > 0) {
         state.scroll = 0;
       }
+      state.disableScrollJumpsFrom = void 0;
       requestAnimationFrame(() => {
         var _a;
         state.maintainingScrollAtEnd = true;
@@ -1787,8 +1828,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     if (state) {
       state.data = dataProp;
       if (!isFirst2) {
-        disableScrollJumps(2e3);
-        refState.current.scrollForNextCalculateItemsInView = void 0;
+        const totalSizeBefore = state.previousTotalSize;
+        const totalSizeAfter = state.totalSize;
+        const scrollDiff = state.scroll - state.scrollPrev;
+        const sizeDiff = totalSizeAfter - totalSizeBefore;
+        if (Math.abs(scrollDiff - sizeDiff) < 10) {
+          disableScrollJumps(1e3);
+        }
         const numContainers = peek$(ctx, "numContainers");
         for (let i = 0; i < numContainers; i++) {
           const itemKey = peek$(ctx, `containerItemKey${i}`);
@@ -1999,6 +2045,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       refState.current.sizes.clear();
       refState.current.positions.clear();
     }
+    refState.current.previousTotalSize = peek$(ctx, "totalSize");
     calcTotalSizesAndPositions({ forgetPositions: false });
   }
   useEffect(() => {
@@ -2206,73 +2253,76 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
   }, []);
   const handleScroll = useCallback(
-    (event, fromSelf) => {
+    (event) => {
       var _a, _b, _c, _d;
       if (((_b = (_a = event.nativeEvent) == null ? void 0 : _a.contentSize) == null ? void 0 : _b.height) === 0 && ((_c = event.nativeEvent.contentSize) == null ? void 0 : _c.width) === 0) {
         return;
       }
       const state = refState.current;
-      const scrollingToOffset = state.scrollingToOffset;
       const newScroll = event.nativeEvent.contentOffset[horizontal ? "x" : "y"];
+      state.scrollPending = newScroll;
       if (state.ignoreScrollFromCalcTotal && newScroll !== 0) {
         return;
       }
-      if (scrollingToOffset !== void 0 && Math.abs(newScroll - scrollingToOffset) < 10) {
-        finishScrollTo();
-      }
-      if (state.disableScrollJumpsFrom !== void 0) {
-        const scrollMinusAdjust = newScroll - state.scrollAdjustHandler.getAppliedAdjust();
-        if (Math.abs(scrollMinusAdjust - state.disableScrollJumpsFrom) > 200) {
-          return;
-        }
-        state.disableScrollJumpsFrom = void 0;
+      updateScroll(newScroll);
+      (_d = state.onScroll) == null ? void 0 : _d.call(state, event);
+    },
+    []
+  );
+  const updateScroll = useCallback((newScroll) => {
+    const state = refState.current;
+    const scrollingToOffset = state.scrollingToOffset;
+    if (scrollingToOffset !== void 0 && Math.abs(newScroll - scrollingToOffset) < 10) {
+      finishScrollTo();
+    }
+    if (state.disableScrollJumpsFrom !== void 0) {
+      const scrollMinusAdjust = newScroll - state.scrollAdjustHandler.getAppliedAdjust();
+      if (Math.abs(scrollMinusAdjust - state.disableScrollJumpsFrom) > 200) {
+        return;
       }
-      state.hasScrolled = true;
-      state.lastBatchingAction = Date.now();
-      const currentTime = performance.now();
-      if (scrollingToOffset === void 0 && !(state.scrollHistory.length === 0 && newScroll === initialContentOffset)) {
-        state.scrollHistory.push({ scroll: newScroll, time: currentTime });
-      }
-      if (state.scrollHistory.length > 5) {
-        state.scrollHistory.shift();
-      }
-      if (state.scrollTimer !== void 0) {
-        clearTimeout(state.scrollTimer);
-      }
-      state.scrollTimer = setTimeout(() => {
-        state.scrollVelocity = 0;
-      }, 500);
-      let velocity = 0;
-      if (state.scrollHistory.length >= 2) {
-        const newest = state.scrollHistory[state.scrollHistory.length - 1];
-        let oldest;
-        for (let i = 0; i < state.scrollHistory.length - 1; i++) {
-          const entry = state.scrollHistory[i];
-          if (newest.time - entry.time <= 100) {
-            oldest = entry;
-            break;
-          }
-        }
-        if (oldest) {
-          const scrollDiff = newest.scroll - oldest.scroll;
-          const timeDiff = newest.time - oldest.time;
-          velocity = timeDiff > 0 ? scrollDiff / timeDiff : 0;
+      state.disableScrollJumpsFrom = void 0;
+    }
+    state.hasScrolled = true;
+    state.lastBatchingAction = Date.now();
+    const currentTime = performance.now();
+    if (scrollingToOffset === void 0 && !(state.scrollHistory.length === 0 && newScroll === initialContentOffset)) {
+      state.scrollHistory.push({ scroll: newScroll, time: currentTime });
+    }
+    if (state.scrollHistory.length > 5) {
+      state.scrollHistory.shift();
+    }
+    if (state.scrollTimer !== void 0) {
+      clearTimeout(state.scrollTimer);
+    }
+    state.scrollTimer = setTimeout(() => {
+      state.scrollVelocity = 0;
+    }, 500);
+    let velocity = 0;
+    if (state.scrollHistory.length >= 2) {
+      const newest = state.scrollHistory[state.scrollHistory.length - 1];
+      let oldest;
+      for (let i = 0; i < state.scrollHistory.length - 1; i++) {
+        const entry = state.scrollHistory[i];
+        if (newest.time - entry.time <= 100) {
+          oldest = entry;
+          break;
         }
       }
-      state.scrollPrev = state.scroll;
-      state.scrollPrevTime = state.scrollTime;
-      state.scroll = newScroll;
-      state.scrollTime = currentTime;
-      state.scrollVelocity = velocity;
-      calculateItemsInView();
-      checkAtBottom();
-      checkAtTop();
-      if (!fromSelf) {
-        (_d = state.onScroll) == null ? void 0 : _d.call(state, event);
+      if (oldest) {
+        const scrollDiff = newest.scroll - oldest.scroll;
+        const timeDiff = newest.time - oldest.time;
+        velocity = timeDiff > 0 ? scrollDiff / timeDiff : 0;
       }
-    },
-    []
-  );
+    }
+    state.scrollPrev = state.scroll;
+    state.scrollPrevTime = state.scrollTime;
+    state.scroll = newScroll;
+    state.scrollTime = currentTime;
+    state.scrollVelocity = velocity;
+    calculateItemsInView();
+    checkAtBottom();
+    checkAtTop();
+  }, []);
   useImperativeHandle(
     forwardedRef,
     () => {

package/package.json

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