@legendapp/list 2.0.7 → 2.0.9

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.0.9
+- Fix: Improve initialScrollIndex accuracy and reliability
+
+## 2.0.8
+- Fix: Data changing sometimes left blank spaces because it was ignoring scroll
+- Fix: Toggling between empty and non-empty causing maintainVisibleContentPosition issues
+
 ## 2.0.7
 - Fix: Layout not working on react-native-macos because of transform instead of position
 

package/index.d.mts

@@ -5,6 +5,7 @@ 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";
 interface StateContext {
+    internalState: InternalState | undefined;
     listeners: Map<ListenerType, Set<(value: any) => void>>;
     values: Map<ListenerType, any>;
     mapViewabilityCallbacks: Map<string, ViewabilityCallback>;
@@ -331,6 +332,7 @@ interface InternalState {
     minIndexSizeChanged: number | undefined;
     queuedInitialLayout?: boolean | undefined;
     queuedCalculateItemsInView: number | undefined;
+    dataChangeNeedsScrollUpdate: boolean;
     lastBatchingAction: number;
     ignoreScrollFromMVCP?: {
         lt?: number;
@@ -343,6 +345,7 @@ interface InternalState {
         viewOffset?: number;
         viewPosition?: number;
         animated?: boolean;
+        isInitialScroll?: boolean;
     } | undefined;
     needsOtherAxisSize?: boolean;
     averageSizes: Record<string, {

package/index.d.ts

@@ -5,6 +5,7 @@ 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";
 interface StateContext {
+    internalState: InternalState | undefined;
     listeners: Map<ListenerType, Set<(value: any) => void>>;
     values: Map<ListenerType, any>;
     mapViewabilityCallbacks: Map<string, ViewabilityCallback>;
@@ -331,6 +332,7 @@ interface InternalState {
     minIndexSizeChanged: number | undefined;
     queuedInitialLayout?: boolean | undefined;
     queuedCalculateItemsInView: number | undefined;
+    dataChangeNeedsScrollUpdate: boolean;
     lastBatchingAction: number;
     ignoreScrollFromMVCP?: {
         lt?: number;
@@ -343,6 +345,7 @@ interface InternalState {
         viewOffset?: number;
         viewPosition?: number;
         animated?: boolean;
+        isInitialScroll?: boolean;
     } | undefined;
     needsOtherAxisSize?: boolean;
     averageSizes: Record<string, {

package/index.js

@@ -30,6 +30,7 @@ function StateProvider({ children }) {
   const [value] = React2__namespace.useState(() => ({
     animatedScrollY: new reactNative.Animated.Value(0),
     columnWrapperStyle: void 0,
+    internalState: void 0,
     listeners: /* @__PURE__ */ new Map(),
     mapViewabilityAmountCallbacks: /* @__PURE__ */ new Map(),
     mapViewabilityAmountValues: /* @__PURE__ */ new Map(),
@@ -219,7 +220,9 @@ function useValue$(key, params) {
         prevValue = newValue;
         if (!didQueueTask) {
           didQueueTask = true;
-          if (delayValue === 0) {
+          if (delayValue === void 0) {
+            fn();
+          } else if (delayValue === 0) {
             queueMicrotask(fn);
           } else {
             setTimeout(fn, delayValue);
@@ -606,7 +609,11 @@ var Containers = typedMemo(function Containers2({
   const [numContainers, numColumns] = useArr$(["numContainersPooled", "numColumns"]);
   const animSize = useValue$("totalSize", {
     // Use a microtask if increasing the size significantly, otherwise use a timeout
-    delay: (value, prevValue) => !prevValue || value - prevValue > 20 ? 0 : 200
+    // If this is the initial scroll, we don't want to delay because we want to update the size immediately
+    delay: (value, prevValue) => {
+      var _a;
+      return !((_a = ctx.internalState) == null ? void 0 : _a.initialScroll) ? !prevValue || value - prevValue > 20 ? 0 : 200 : void 0;
+    }
   });
   const animOpacity = waitForInitialLayout && !IsNewArchitecture ? useValue$("containersDidLayout", { getValue: (value) => value ? 1 : 0 }) : void 0;
   const otherAxisSize = useValue$("otherAxisSize", { delay: 0 });
@@ -820,7 +827,7 @@ var ListComponent = typedMemo(function ListComponent2({
       ],
       contentOffset: initialContentOffset ? horizontal ? { x: initialContentOffset, y: 0 } : { x: 0, y: initialContentOffset } : void 0,
       horizontal,
-      maintainVisibleContentPosition: maintainVisibleContentPosition && !ListEmptyComponent ? { minIndexForVisible: 0 } : void 0,
+      maintainVisibleContentPosition: maintainVisibleContentPosition ? { minIndexForVisible: 0 } : void 0,
       onLayout,
       onScroll: onScroll2,
       ref: refScrollView,
@@ -831,7 +838,7 @@ var ListComponent = typedMemo(function ListComponent2({
     ENABLE_DEVMODE ? /* @__PURE__ */ React2__namespace.createElement(PaddingDevMode, null) : /* @__PURE__ */ React2__namespace.createElement(Padding, null),
     ListHeaderComponent && /* @__PURE__ */ React2__namespace.createElement(reactNative.View, { onLayout: onLayoutHeaderSync, ref: refHeader, style: ListHeaderComponentStyle }, getComponent(ListHeaderComponent)),
     ListEmptyComponent && getComponent(ListEmptyComponent),
-    canRender && /* @__PURE__ */ React2__namespace.createElement(
+    canRender && !ListEmptyComponent && /* @__PURE__ */ React2__namespace.createElement(
       Containers,
       {
         getRenderedItem: getRenderedItem2,
@@ -967,7 +974,7 @@ var finishScrollTo = (state) => {
 // src/core/scrollTo.ts
 function scrollTo(state, params = {}) {
   var _a;
-  const { animated, noScrollingTo } = params;
+  const { animated, noScrollingTo, isInitialScroll } = params;
   const {
     refScroller,
     props: { horizontal }
@@ -978,14 +985,21 @@ function scrollTo(state, params = {}) {
     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 (!params.isInitialScroll || reactNative.Platform.OS === "android") {
+    (_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);
+    if (isInitialScroll) {
+      setTimeout(() => {
+        state.initialScroll = void 0;
+      }, 500);
+    }
   }
 }
 
@@ -1080,7 +1094,16 @@ function prepareMVCP(ctx, state, dataChanged) {
     if (targetId !== void 0 && prevPosition !== void 0) {
       const newPosition = positions.get(targetId);
       if (newPosition !== void 0) {
-        positionDiff = newPosition - prevPosition;
+        const totalSize = peek$(ctx, "totalSize");
+        let diff = newPosition - prevPosition;
+        if (state.scroll + state.scrollLength > totalSize) {
+          if (diff > 0) {
+            diff = Math.max(0, totalSize - state.scroll - state.scrollLength);
+          } else {
+            diff = 0;
+          }
+        }
+        positionDiff = diff;
       }
     }
     if (positionDiff !== void 0 && Math.abs(positionDiff) > 0.1) {
@@ -1148,6 +1171,7 @@ function updateTotalSize(ctx, state) {
 }
 function addTotalSize(ctx, state, key, add) {
   const { alignItemsAtEnd } = state.props;
+  const prevTotalSize = state.totalSize;
   if (key === null) {
     state.totalSize = add;
     if (state.timeoutSetPaddingTop) {
@@ -1157,9 +1181,11 @@ function addTotalSize(ctx, state, key, add) {
   } else {
     state.totalSize += add;
   }
-  set$(ctx, "totalSize", state.totalSize);
-  if (alignItemsAtEnd) {
-    updateAlignItemsPaddingTop(ctx, state);
+  if (prevTotalSize !== state.totalSize) {
+    set$(ctx, "totalSize", state.totalSize);
+    if (alignItemsAtEnd) {
+      updateAlignItemsPaddingTop(ctx, state);
+    }
   }
 }
 
@@ -1721,17 +1747,16 @@ function setDidLayout(ctx, state) {
       onLoad({ elapsedTimeInMs: Date.now() - loadStartTime });
     }
   };
-  if (reactNative.Platform.OS === "android" || !IsNewArchitecture) {
-    if (initialScroll) {
-      queueMicrotask(() => {
+  if (reactNative.Platform.OS === "android" && initialScroll) {
+    if (IsNewArchitecture) {
+      scrollToIndex(ctx, state, { ...initialScroll, animated: false });
+      requestAnimationFrame(() => {
         scrollToIndex(ctx, state, { ...initialScroll, animated: false });
-        requestAnimationFrame(() => {
-          scrollToIndex(ctx, state, { ...initialScroll, animated: false });
-          setIt();
-        });
+        setIt();
       });
     } else {
-      queueMicrotask(setIt);
+      scrollToIndex(ctx, state, { ...initialScroll, animated: false });
+      setIt();
     }
   } else {
     setIt();
@@ -1865,7 +1890,7 @@ function calculateItemsInView(ctx, state, params = {}) {
     const scrollTopBuffered = scroll - scrollBufferTop;
     const scrollBottom = scroll + scrollLength + (scroll < 0 ? -scroll : 0);
     const scrollBottomBuffered = scrollBottom + scrollBufferBottom;
-    if (scrollForNextCalculateItemsInView) {
+    if (!dataChanged && scrollForNextCalculateItemsInView) {
       const { top, bottom } = scrollForNextCalculateItemsInView;
       if (scrollTopBuffered > top && scrollBottomBuffered < bottom) {
         return;
@@ -1888,7 +1913,7 @@ function calculateItemsInView(ctx, state, params = {}) {
     let startBufferedId = null;
     let endNoBuffer = null;
     let endBuffered = null;
-    let loopStart = startBufferedIdOrig ? indexByKey.get(startBufferedIdOrig) || 0 : 0;
+    let loopStart = !dataChanged && startBufferedIdOrig ? indexByKey.get(startBufferedIdOrig) || 0 : 0;
     for (let i = loopStart; i >= 0; i--) {
       const id = (_b = idCache.get(i)) != null ? _b : getId(state, i);
       const top = positions.get(id);
@@ -2367,10 +2392,11 @@ function updateScroll(ctx, state, newScroll) {
   state.scrollPrevTime = state.scrollTime;
   state.scroll = newScroll;
   state.scrollTime = currentTime;
-  if (Math.abs(state.scroll - state.scrollPrev) > 2) {
+  if (state.dataChangeNeedsScrollUpdate || Math.abs(state.scroll - state.scrollPrev) > 2) {
     calculateItemsInView(ctx, state);
     checkAtBottom(ctx, state);
     checkAtTop(state);
+    state.dataChangeNeedsScrollUpdate = false;
   }
 }
 
@@ -2382,7 +2408,7 @@ var ScrollAdjustHandler = class {
     this.context = ctx;
   }
   requestAdjust(add) {
-    const oldAdjustTop = peek$(this.context, "scrollAdjust") || 0;
+    const oldAdjustTop = this.appliedAdjust;
     this.appliedAdjust = add + oldAdjustTop;
     const set = () => set$(this.context, "scrollAdjust", this.appliedAdjust);
     if (this.mounted) {
@@ -2401,7 +2427,7 @@ var ScrollAdjustHandler = class {
 
 // src/core/updateItemSize.ts
 function updateItemSize(ctx, state, itemKey, sizeObj) {
-  var _a, _b;
+  var _a;
   const {
     sizesKnown,
     props: {
@@ -2416,17 +2442,17 @@ function updateItemSize(ctx, state, itemKey, sizeObj) {
     }
   } = state;
   if (!data) return;
+  const index = state.indexByKey.get(itemKey);
   if (getFixedItemSize) {
-    const index2 = state.indexByKey.get(itemKey);
-    if (index2 === void 0) {
+    if (index === void 0) {
       return;
     }
-    const itemData = state.props.data[index2];
+    const itemData = state.props.data[index];
     if (itemData === void 0) {
       return;
     }
-    const type = getItemType ? (_a = getItemType(itemData, index2)) != null ? _a : "" : "";
-    const size2 = getFixedItemSize(index2, itemData, type);
+    const type = getItemType ? (_a = getItemType(itemData, index)) != null ? _a : "" : "";
+    const size2 = getFixedItemSize(index, itemData, type);
     if (size2 !== void 0 && size2 === sizesKnown.get(itemKey)) {
       return;
     }
@@ -2436,15 +2462,11 @@ function updateItemSize(ctx, state, itemKey, sizeObj) {
   let shouldMaintainScrollAtEnd = false;
   let minIndexSizeChanged;
   let maxOtherAxisSize = peek$(ctx, "otherAxisSize") || 0;
-  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) {
@@ -2684,63 +2706,70 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const keyExtractor = keyExtractorProp != null ? keyExtractorProp : (_item, index) => index.toString();
   const refState = React2.useRef();
   if (!refState.current) {
-    const initialScrollLength = (estimatedListSize != null ? estimatedListSize : IsNewArchitecture ? { height: 0, width: 0 } : reactNative.Dimensions.get("window"))[horizontal ? "width" : "height"];
-    refState.current = {
-      activeStickyIndex: void 0,
-      averageSizes: {},
-      columns: /* @__PURE__ */ new Map(),
-      containerItemKeys: /* @__PURE__ */ new Set(),
-      containerItemTypes: /* @__PURE__ */ new Map(),
-      enableScrollForNextCalculateItemsInView: true,
-      endBuffered: -1,
-      endNoBuffer: -1,
-      endReachedBlockedByTimer: false,
-      firstFullyOnScreenIndex: -1,
-      idCache: /* @__PURE__ */ new Map(),
-      idsInView: [],
-      indexByKey: /* @__PURE__ */ new Map(),
-      initialScroll,
-      isAtEnd: false,
-      isAtStart: false,
-      isEndReached: false,
-      isStartReached: false,
-      lastBatchingAction: Date.now(),
-      lastLayout: void 0,
-      loadStartTime: Date.now(),
-      minIndexSizeChanged: 0,
-      nativeMarginTop: 0,
-      positions: /* @__PURE__ */ new Map(),
-      props: {},
-      queuedCalculateItemsInView: 0,
-      refScroller: void 0,
-      scroll: 0,
-      scrollAdjustHandler: new ScrollAdjustHandler(ctx),
-      scrollForNextCalculateItemsInView: void 0,
-      scrollHistory: [],
-      scrollLength: initialScrollLength,
-      scrollPending: 0,
-      scrollPrev: 0,
-      scrollPrevTime: 0,
-      scrollProcessingEnabled: true,
-      scrollTime: 0,
-      sizes: /* @__PURE__ */ new Map(),
-      sizesKnown: /* @__PURE__ */ new Map(),
-      startBuffered: -1,
-      startNoBuffer: -1,
-      startReachedBlockedByTimer: false,
-      stickyContainerPool: /* @__PURE__ */ new Set(),
-      stickyContainers: /* @__PURE__ */ new Map(),
-      timeoutSizeMessage: 0,
-      timeouts: /* @__PURE__ */ new Set(),
-      totalSize: 0,
-      viewabilityConfigCallbackPairs: void 0
-    };
-    set$(ctx, "maintainVisibleContentPosition", maintainVisibleContentPosition);
-    set$(ctx, "extraData", extraData);
+    if (!ctx.internalState) {
+      const initialScrollLength = (estimatedListSize != null ? estimatedListSize : IsNewArchitecture ? { height: 0, width: 0 } : reactNative.Dimensions.get("window"))[horizontal ? "width" : "height"];
+      ctx.internalState = {
+        activeStickyIndex: void 0,
+        averageSizes: {},
+        columns: /* @__PURE__ */ new Map(),
+        containerItemKeys: /* @__PURE__ */ new Set(),
+        containerItemTypes: /* @__PURE__ */ new Map(),
+        dataChangeNeedsScrollUpdate: false,
+        enableScrollForNextCalculateItemsInView: true,
+        endBuffered: -1,
+        endNoBuffer: -1,
+        endReachedBlockedByTimer: false,
+        firstFullyOnScreenIndex: -1,
+        idCache: /* @__PURE__ */ new Map(),
+        idsInView: [],
+        indexByKey: /* @__PURE__ */ new Map(),
+        initialScroll,
+        isAtEnd: false,
+        isAtStart: false,
+        isEndReached: false,
+        isStartReached: false,
+        lastBatchingAction: Date.now(),
+        lastLayout: void 0,
+        loadStartTime: Date.now(),
+        minIndexSizeChanged: 0,
+        nativeMarginTop: 0,
+        positions: /* @__PURE__ */ new Map(),
+        props: {},
+        queuedCalculateItemsInView: 0,
+        refScroller: void 0,
+        scroll: 0,
+        scrollAdjustHandler: new ScrollAdjustHandler(ctx),
+        scrollForNextCalculateItemsInView: void 0,
+        scrollHistory: [],
+        scrollLength: initialScrollLength,
+        scrollPending: 0,
+        scrollPrev: 0,
+        scrollPrevTime: 0,
+        scrollProcessingEnabled: true,
+        scrollTime: 0,
+        sizes: /* @__PURE__ */ new Map(),
+        sizesKnown: /* @__PURE__ */ new Map(),
+        startBuffered: -1,
+        startNoBuffer: -1,
+        startReachedBlockedByTimer: false,
+        stickyContainerPool: /* @__PURE__ */ new Set(),
+        stickyContainers: /* @__PURE__ */ new Map(),
+        timeoutSizeMessage: 0,
+        timeouts: /* @__PURE__ */ new Set(),
+        totalSize: 0,
+        viewabilityConfigCallbackPairs: void 0
+      };
+      set$(ctx, "maintainVisibleContentPosition", maintainVisibleContentPosition);
+      set$(ctx, "extraData", extraData);
+    }
+    refState.current = ctx.internalState;
   }
   const state = refState.current;
   const isFirst = !state.props.renderItem;
   const didDataChange = state.props.data !== dataProp;
+  if (didDataChange) {
+    state.dataChangeNeedsScrollUpdate = true;
+  }
   const throttleScrollFn = scrollEventThrottle && onScrollProp ? useThrottledOnScroll(onScrollProp, scrollEventThrottle) : onScrollProp;
   state.props = {
     alignItemsAtEnd,
@@ -2816,7 +2845,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
       refState.current.isStartReached = initialContentOffset2 < refState.current.scrollLength * onStartReachedThreshold;
       if (initialContentOffset2 > 0) {
-        scrollTo(state, { animated: false, index, offset: initialContentOffset2 });
+        scrollTo(state, {
+          animated: false,
+          index,
+          isInitialScroll: true,
+          offset: initialContentOffset2,
+          viewPosition: index === dataProp.length - 1 ? 1 : 0
+        });
       }
       return initialContentOffset2;
     }

package/index.mjs

@@ -9,6 +9,7 @@ function StateProvider({ children }) {
   const [value] = React2.useState(() => ({
     animatedScrollY: new Animated.Value(0),
     columnWrapperStyle: void 0,
+    internalState: void 0,
     listeners: /* @__PURE__ */ new Map(),
     mapViewabilityAmountCallbacks: /* @__PURE__ */ new Map(),
     mapViewabilityAmountValues: /* @__PURE__ */ new Map(),
@@ -198,7 +199,9 @@ function useValue$(key, params) {
         prevValue = newValue;
         if (!didQueueTask) {
           didQueueTask = true;
-          if (delayValue === 0) {
+          if (delayValue === void 0) {
+            fn();
+          } else if (delayValue === 0) {
             queueMicrotask(fn);
           } else {
             setTimeout(fn, delayValue);
@@ -585,7 +588,11 @@ var Containers = typedMemo(function Containers2({
   const [numContainers, numColumns] = useArr$(["numContainersPooled", "numColumns"]);
   const animSize = useValue$("totalSize", {
     // Use a microtask if increasing the size significantly, otherwise use a timeout
-    delay: (value, prevValue) => !prevValue || value - prevValue > 20 ? 0 : 200
+    // If this is the initial scroll, we don't want to delay because we want to update the size immediately
+    delay: (value, prevValue) => {
+      var _a;
+      return !((_a = ctx.internalState) == null ? void 0 : _a.initialScroll) ? !prevValue || value - prevValue > 20 ? 0 : 200 : void 0;
+    }
   });
   const animOpacity = waitForInitialLayout && !IsNewArchitecture ? useValue$("containersDidLayout", { getValue: (value) => value ? 1 : 0 }) : void 0;
   const otherAxisSize = useValue$("otherAxisSize", { delay: 0 });
@@ -799,7 +806,7 @@ var ListComponent = typedMemo(function ListComponent2({
       ],
       contentOffset: initialContentOffset ? horizontal ? { x: initialContentOffset, y: 0 } : { x: 0, y: initialContentOffset } : void 0,
       horizontal,
-      maintainVisibleContentPosition: maintainVisibleContentPosition && !ListEmptyComponent ? { minIndexForVisible: 0 } : void 0,
+      maintainVisibleContentPosition: maintainVisibleContentPosition ? { minIndexForVisible: 0 } : void 0,
       onLayout,
       onScroll: onScroll2,
       ref: refScrollView,
@@ -810,7 +817,7 @@ var ListComponent = typedMemo(function ListComponent2({
     ENABLE_DEVMODE ? /* @__PURE__ */ React2.createElement(PaddingDevMode, null) : /* @__PURE__ */ React2.createElement(Padding, null),
     ListHeaderComponent && /* @__PURE__ */ React2.createElement(View, { onLayout: onLayoutHeaderSync, ref: refHeader, style: ListHeaderComponentStyle }, getComponent(ListHeaderComponent)),
     ListEmptyComponent && getComponent(ListEmptyComponent),
-    canRender && /* @__PURE__ */ React2.createElement(
+    canRender && !ListEmptyComponent && /* @__PURE__ */ React2.createElement(
       Containers,
       {
         getRenderedItem: getRenderedItem2,
@@ -946,7 +953,7 @@ var finishScrollTo = (state) => {
 // src/core/scrollTo.ts
 function scrollTo(state, params = {}) {
   var _a;
-  const { animated, noScrollingTo } = params;
+  const { animated, noScrollingTo, isInitialScroll } = params;
   const {
     refScroller,
     props: { horizontal }
@@ -957,14 +964,21 @@ function scrollTo(state, params = {}) {
     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 (!params.isInitialScroll || Platform.OS === "android") {
+    (_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);
+    if (isInitialScroll) {
+      setTimeout(() => {
+        state.initialScroll = void 0;
+      }, 500);
+    }
   }
 }
 
@@ -1059,7 +1073,16 @@ function prepareMVCP(ctx, state, dataChanged) {
     if (targetId !== void 0 && prevPosition !== void 0) {
       const newPosition = positions.get(targetId);
       if (newPosition !== void 0) {
-        positionDiff = newPosition - prevPosition;
+        const totalSize = peek$(ctx, "totalSize");
+        let diff = newPosition - prevPosition;
+        if (state.scroll + state.scrollLength > totalSize) {
+          if (diff > 0) {
+            diff = Math.max(0, totalSize - state.scroll - state.scrollLength);
+          } else {
+            diff = 0;
+          }
+        }
+        positionDiff = diff;
       }
     }
     if (positionDiff !== void 0 && Math.abs(positionDiff) > 0.1) {
@@ -1127,6 +1150,7 @@ function updateTotalSize(ctx, state) {
 }
 function addTotalSize(ctx, state, key, add) {
   const { alignItemsAtEnd } = state.props;
+  const prevTotalSize = state.totalSize;
   if (key === null) {
     state.totalSize = add;
     if (state.timeoutSetPaddingTop) {
@@ -1136,9 +1160,11 @@ function addTotalSize(ctx, state, key, add) {
   } else {
     state.totalSize += add;
   }
-  set$(ctx, "totalSize", state.totalSize);
-  if (alignItemsAtEnd) {
-    updateAlignItemsPaddingTop(ctx, state);
+  if (prevTotalSize !== state.totalSize) {
+    set$(ctx, "totalSize", state.totalSize);
+    if (alignItemsAtEnd) {
+      updateAlignItemsPaddingTop(ctx, state);
+    }
   }
 }
 
@@ -1700,17 +1726,16 @@ function setDidLayout(ctx, state) {
       onLoad({ elapsedTimeInMs: Date.now() - loadStartTime });
     }
   };
-  if (Platform.OS === "android" || !IsNewArchitecture) {
-    if (initialScroll) {
-      queueMicrotask(() => {
+  if (Platform.OS === "android" && initialScroll) {
+    if (IsNewArchitecture) {
+      scrollToIndex(ctx, state, { ...initialScroll, animated: false });
+      requestAnimationFrame(() => {
         scrollToIndex(ctx, state, { ...initialScroll, animated: false });
-        requestAnimationFrame(() => {
-          scrollToIndex(ctx, state, { ...initialScroll, animated: false });
-          setIt();
-        });
+        setIt();
       });
     } else {
-      queueMicrotask(setIt);
+      scrollToIndex(ctx, state, { ...initialScroll, animated: false });
+      setIt();
     }
   } else {
     setIt();
@@ -1844,7 +1869,7 @@ function calculateItemsInView(ctx, state, params = {}) {
     const scrollTopBuffered = scroll - scrollBufferTop;
     const scrollBottom = scroll + scrollLength + (scroll < 0 ? -scroll : 0);
     const scrollBottomBuffered = scrollBottom + scrollBufferBottom;
-    if (scrollForNextCalculateItemsInView) {
+    if (!dataChanged && scrollForNextCalculateItemsInView) {
       const { top, bottom } = scrollForNextCalculateItemsInView;
       if (scrollTopBuffered > top && scrollBottomBuffered < bottom) {
         return;
@@ -1867,7 +1892,7 @@ function calculateItemsInView(ctx, state, params = {}) {
     let startBufferedId = null;
     let endNoBuffer = null;
     let endBuffered = null;
-    let loopStart = startBufferedIdOrig ? indexByKey.get(startBufferedIdOrig) || 0 : 0;
+    let loopStart = !dataChanged && startBufferedIdOrig ? indexByKey.get(startBufferedIdOrig) || 0 : 0;
     for (let i = loopStart; i >= 0; i--) {
       const id = (_b = idCache.get(i)) != null ? _b : getId(state, i);
       const top = positions.get(id);
@@ -2346,10 +2371,11 @@ function updateScroll(ctx, state, newScroll) {
   state.scrollPrevTime = state.scrollTime;
   state.scroll = newScroll;
   state.scrollTime = currentTime;
-  if (Math.abs(state.scroll - state.scrollPrev) > 2) {
+  if (state.dataChangeNeedsScrollUpdate || Math.abs(state.scroll - state.scrollPrev) > 2) {
     calculateItemsInView(ctx, state);
     checkAtBottom(ctx, state);
     checkAtTop(state);
+    state.dataChangeNeedsScrollUpdate = false;
   }
 }
 
@@ -2361,7 +2387,7 @@ var ScrollAdjustHandler = class {
     this.context = ctx;
   }
   requestAdjust(add) {
-    const oldAdjustTop = peek$(this.context, "scrollAdjust") || 0;
+    const oldAdjustTop = this.appliedAdjust;
     this.appliedAdjust = add + oldAdjustTop;
     const set = () => set$(this.context, "scrollAdjust", this.appliedAdjust);
     if (this.mounted) {
@@ -2380,7 +2406,7 @@ var ScrollAdjustHandler = class {
 
 // src/core/updateItemSize.ts
 function updateItemSize(ctx, state, itemKey, sizeObj) {
-  var _a, _b;
+  var _a;
   const {
     sizesKnown,
     props: {
@@ -2395,17 +2421,17 @@ function updateItemSize(ctx, state, itemKey, sizeObj) {
     }
   } = state;
   if (!data) return;
+  const index = state.indexByKey.get(itemKey);
   if (getFixedItemSize) {
-    const index2 = state.indexByKey.get(itemKey);
-    if (index2 === void 0) {
+    if (index === void 0) {
       return;
     }
-    const itemData = state.props.data[index2];
+    const itemData = state.props.data[index];
     if (itemData === void 0) {
       return;
     }
-    const type = getItemType ? (_a = getItemType(itemData, index2)) != null ? _a : "" : "";
-    const size2 = getFixedItemSize(index2, itemData, type);
+    const type = getItemType ? (_a = getItemType(itemData, index)) != null ? _a : "" : "";
+    const size2 = getFixedItemSize(index, itemData, type);
     if (size2 !== void 0 && size2 === sizesKnown.get(itemKey)) {
       return;
     }
@@ -2415,15 +2441,11 @@ function updateItemSize(ctx, state, itemKey, sizeObj) {
   let shouldMaintainScrollAtEnd = false;
   let minIndexSizeChanged;
   let maxOtherAxisSize = peek$(ctx, "otherAxisSize") || 0;
-  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) {
@@ -2663,63 +2685,70 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const keyExtractor = keyExtractorProp != null ? keyExtractorProp : (_item, index) => index.toString();
   const refState = useRef();
   if (!refState.current) {
-    const initialScrollLength = (estimatedListSize != null ? estimatedListSize : IsNewArchitecture ? { height: 0, width: 0 } : Dimensions.get("window"))[horizontal ? "width" : "height"];
-    refState.current = {
-      activeStickyIndex: void 0,
-      averageSizes: {},
-      columns: /* @__PURE__ */ new Map(),
-      containerItemKeys: /* @__PURE__ */ new Set(),
-      containerItemTypes: /* @__PURE__ */ new Map(),
-      enableScrollForNextCalculateItemsInView: true,
-      endBuffered: -1,
-      endNoBuffer: -1,
-      endReachedBlockedByTimer: false,
-      firstFullyOnScreenIndex: -1,
-      idCache: /* @__PURE__ */ new Map(),
-      idsInView: [],
-      indexByKey: /* @__PURE__ */ new Map(),
-      initialScroll,
-      isAtEnd: false,
-      isAtStart: false,
-      isEndReached: false,
-      isStartReached: false,
-      lastBatchingAction: Date.now(),
-      lastLayout: void 0,
-      loadStartTime: Date.now(),
-      minIndexSizeChanged: 0,
-      nativeMarginTop: 0,
-      positions: /* @__PURE__ */ new Map(),
-      props: {},
-      queuedCalculateItemsInView: 0,
-      refScroller: void 0,
-      scroll: 0,
-      scrollAdjustHandler: new ScrollAdjustHandler(ctx),
-      scrollForNextCalculateItemsInView: void 0,
-      scrollHistory: [],
-      scrollLength: initialScrollLength,
-      scrollPending: 0,
-      scrollPrev: 0,
-      scrollPrevTime: 0,
-      scrollProcessingEnabled: true,
-      scrollTime: 0,
-      sizes: /* @__PURE__ */ new Map(),
-      sizesKnown: /* @__PURE__ */ new Map(),
-      startBuffered: -1,
-      startNoBuffer: -1,
-      startReachedBlockedByTimer: false,
-      stickyContainerPool: /* @__PURE__ */ new Set(),
-      stickyContainers: /* @__PURE__ */ new Map(),
-      timeoutSizeMessage: 0,
-      timeouts: /* @__PURE__ */ new Set(),
-      totalSize: 0,
-      viewabilityConfigCallbackPairs: void 0
-    };
-    set$(ctx, "maintainVisibleContentPosition", maintainVisibleContentPosition);
-    set$(ctx, "extraData", extraData);
+    if (!ctx.internalState) {
+      const initialScrollLength = (estimatedListSize != null ? estimatedListSize : IsNewArchitecture ? { height: 0, width: 0 } : Dimensions.get("window"))[horizontal ? "width" : "height"];
+      ctx.internalState = {
+        activeStickyIndex: void 0,
+        averageSizes: {},
+        columns: /* @__PURE__ */ new Map(),
+        containerItemKeys: /* @__PURE__ */ new Set(),
+        containerItemTypes: /* @__PURE__ */ new Map(),
+        dataChangeNeedsScrollUpdate: false,
+        enableScrollForNextCalculateItemsInView: true,
+        endBuffered: -1,
+        endNoBuffer: -1,
+        endReachedBlockedByTimer: false,
+        firstFullyOnScreenIndex: -1,
+        idCache: /* @__PURE__ */ new Map(),
+        idsInView: [],
+        indexByKey: /* @__PURE__ */ new Map(),
+        initialScroll,
+        isAtEnd: false,
+        isAtStart: false,
+        isEndReached: false,
+        isStartReached: false,
+        lastBatchingAction: Date.now(),
+        lastLayout: void 0,
+        loadStartTime: Date.now(),
+        minIndexSizeChanged: 0,
+        nativeMarginTop: 0,
+        positions: /* @__PURE__ */ new Map(),
+        props: {},
+        queuedCalculateItemsInView: 0,
+        refScroller: void 0,
+        scroll: 0,
+        scrollAdjustHandler: new ScrollAdjustHandler(ctx),
+        scrollForNextCalculateItemsInView: void 0,
+        scrollHistory: [],
+        scrollLength: initialScrollLength,
+        scrollPending: 0,
+        scrollPrev: 0,
+        scrollPrevTime: 0,
+        scrollProcessingEnabled: true,
+        scrollTime: 0,
+        sizes: /* @__PURE__ */ new Map(),
+        sizesKnown: /* @__PURE__ */ new Map(),
+        startBuffered: -1,
+        startNoBuffer: -1,
+        startReachedBlockedByTimer: false,
+        stickyContainerPool: /* @__PURE__ */ new Set(),
+        stickyContainers: /* @__PURE__ */ new Map(),
+        timeoutSizeMessage: 0,
+        timeouts: /* @__PURE__ */ new Set(),
+        totalSize: 0,
+        viewabilityConfigCallbackPairs: void 0
+      };
+      set$(ctx, "maintainVisibleContentPosition", maintainVisibleContentPosition);
+      set$(ctx, "extraData", extraData);
+    }
+    refState.current = ctx.internalState;
   }
   const state = refState.current;
   const isFirst = !state.props.renderItem;
   const didDataChange = state.props.data !== dataProp;
+  if (didDataChange) {
+    state.dataChangeNeedsScrollUpdate = true;
+  }
   const throttleScrollFn = scrollEventThrottle && onScrollProp ? useThrottledOnScroll(onScrollProp, scrollEventThrottle) : onScrollProp;
   state.props = {
     alignItemsAtEnd,
@@ -2795,7 +2824,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
       refState.current.isStartReached = initialContentOffset2 < refState.current.scrollLength * onStartReachedThreshold;
       if (initialContentOffset2 > 0) {
-        scrollTo(state, { animated: false, index, offset: initialContentOffset2 });
+        scrollTo(state, {
+          animated: false,
+          index,
+          isInitialScroll: true,
+          offset: initialContentOffset2,
+          viewPosition: index === dataProp.length - 1 ? 1 : 0
+        });
       }
       return initialContentOffset2;
     }

package/package.json

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