@legendapp/list 3.0.0-beta.48 → 3.0.0-beta.49

package/index.d.ts

@@ -236,6 +236,7 @@ interface InternalState$1 {
         dataChanged?: boolean;
         forceFullItemPositions?: boolean;
     }) => void;
+    userScrollAnchorResetKeys?: Set<string>;
     viewabilityConfigCallbackPairs: ViewabilityConfigCallbackPairs$1<any> | undefined;
     props: {
         alignItemsAtEnd: boolean;

package/index.js

@@ -2080,7 +2080,7 @@ function getId(state, index) {
 }
 
 // src/core/addTotalSize.ts
-function addTotalSize(ctx, key, add) {
+function addTotalSize(ctx, key, add, notifyTotalSize = true) {
   const state = ctx.state;
   const prevTotalSize = state.totalSize;
   let totalSize = state.totalSize;
@@ -2097,25 +2097,29 @@ function addTotalSize(ctx, key, add) {
     {
       state.pendingTotalSize = void 0;
       state.totalSize = totalSize;
-      set$(ctx, "totalSize", totalSize);
+      if (notifyTotalSize) {
+        set$(ctx, "totalSize", totalSize);
+      }
     }
+  } else if (notifyTotalSize && ctx.values.get("totalSize") !== totalSize) {
+    set$(ctx, "totalSize", totalSize);
   }
 }
 
 // src/core/setSize.ts
-function setSize(ctx, itemKey, size) {
+function setSize(ctx, itemKey, size, notifyTotalSize = true) {
   const state = ctx.state;
   const { sizes } = state;
   const previousSize = sizes.get(itemKey);
   const diff = previousSize !== void 0 ? size - previousSize : size;
   if (diff !== 0) {
-    addTotalSize(ctx, itemKey, diff);
+    addTotalSize(ctx, itemKey, diff, notifyTotalSize);
   }
   sizes.set(itemKey, size);
 }
 
 // src/utils/getItemSize.ts
-function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize) {
+function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize, notifyTotalSize) {
   var _a3, _b, _c;
   const state = ctx.state;
   const {
@@ -2161,7 +2165,7 @@ function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize) {
   if (size === void 0) {
     size = getEstimatedItemSize ? getEstimatedItemSize(data, index, itemType) : estimatedItemSize;
   }
-  setSize(ctx, key, size);
+  setSize(ctx, key, size, notifyTotalSize);
   return size;
 }
 function getItemSizeAtIndex(ctx, index) {
@@ -2600,10 +2604,10 @@ function getMountedBufferedIndices(state) {
 function getMountedNoBufferIndices(state) {
   return getMountedIndicesInRange(state, state.startNoBuffer, state.endNoBuffer);
 }
-function checkAllSizesKnown(state, indices = getMountedBufferedIndices(state)) {
+function checkAllSizesKnown(state, indices) {
   return indices.length > 0 && indices.every((index) => {
     const key = getId(state, index);
-    return state.sizesKnown.has(key);
+    return key !== void 0 && state.sizesKnown.has(key);
   });
 }
 
@@ -3913,6 +3917,7 @@ function updateItemPositions(ctx, dataChanged, { startIndex, scrollBottomBuffere
   const maxVisibleArea = scrollBottomBuffered + 1e3;
   const useAverageSize = !getEstimatedItemSize;
   const preferCachedSize = !doMVCP || dataChanged || state.scrollAdjustHandler.getAdjust() !== 0 || ((_b = peek$(ctx, "scrollAdjustPending")) != null ? _b : 0) !== 0;
+  const notifyTotalSizeWhileCachingSizes = false;
   let currentRowTop = 0;
   let column = 1;
   let maxSizeInRow = 0;
@@ -3940,7 +3945,15 @@ function updateItemPositions(ctx, dataChanged, { startIndex, scrollBottomBuffere
       const prevIndex = startIndex - 1;
       const prevId = getId(state, prevIndex);
       const prevPosition = (_c = positions[prevIndex]) != null ? _c : 0;
-      const prevSize = (_d = sizesKnown.get(prevId)) != null ? _d : getItemSize(ctx, prevId, prevIndex, data[prevIndex], useAverageSize, preferCachedSize);
+      const prevSize = (_d = sizesKnown.get(prevId)) != null ? _d : getItemSize(
+        ctx,
+        prevId,
+        prevIndex,
+        data[prevIndex],
+        useAverageSize,
+        preferCachedSize,
+        notifyTotalSizeWhileCachingSizes
+      );
       currentRowTop = prevPosition + prevSize;
     }
   }
@@ -3973,7 +3986,7 @@ function updateItemPositions(ctx, dataChanged, { startIndex, scrollBottomBuffere
       maxSizeInRow = 0;
     }
     const knownSize = sizesKnown.get(id);
-    const size = knownSize !== void 0 ? knownSize : getItemSize(ctx, id, i, data[i], useAverageSize, preferCachedSize);
+    const size = knownSize !== void 0 ? knownSize : getItemSize(ctx, id, i, data[i], useAverageSize, preferCachedSize, notifyTotalSizeWhileCachingSizes);
     if (IS_DEV && needsIndexByKey) {
       if (indexByKeyForChecking.has(id)) {
         console.error(
@@ -4448,7 +4461,7 @@ function handleStickyRecycling(ctx, stickyArray, scroll, drawDistance, currentSt
 function calculateItemsInView(ctx, params = {}) {
   const state = ctx.state;
   batchedUpdates(() => {
-    var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+    var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
     const {
       columns,
       columnSpans,
@@ -4737,6 +4750,7 @@ function calculateItemsInView(ctx, params = {}) {
             state.containerItemTypes.set(containerIndex, requiredItemTypes[idx]);
           }
           containerItemKeys.set(id, containerIndex);
+          (_p = state.userScrollAnchorResetKeys) == null ? void 0 : _p.add(id);
           const containerSticky = `containerSticky${containerIndex}`;
           const isSticky = stickyIndicesSet.has(i);
           const isAlwaysRender = alwaysRenderSet.has(i);
@@ -4764,10 +4778,13 @@ function calculateItemsInView(ctx, params = {}) {
           }
         }
       }
+      if (((_q = state.userScrollAnchorResetKeys) == null ? void 0 : _q.size) === 0) {
+        state.userScrollAnchorResetKeys = void 0;
+      }
       if (alwaysRenderArr.length > 0) {
         for (const index of alwaysRenderArr) {
           if (index < 0 || index >= dataLength) continue;
-          const id = (_p = idCache[index]) != null ? _p : getId(state, index);
+          const id = (_r = idCache[index]) != null ? _r : getId(state, index);
           const containerIndex = containerItemKeys.get(id);
           if (containerIndex !== void 0) {
             state.stickyContainerPool.add(containerIndex);
@@ -5128,7 +5145,14 @@ function updateScroll(ctx, newScroll, forceUpdate) {
       (_a4 = state.triggerCalculateItemsInView) == null ? void 0 : _a4.call(state, { doMVCP: scrollingTo !== void 0 });
       checkThresholds(ctx);
     };
-    if (scrollLength > 0 && scrollingTo === void 0 && scrollDelta > scrollLength) {
+    if (scrollLength > 0 && scrollingTo === void 0 && scrollDelta > scrollLength && !state.pendingNativeMVCPAdjust) {
+      state.mvcpAnchorLock = void 0;
+      state.pendingNativeMVCPAdjust = void 0;
+      state.userScrollAnchorResetKeys = /* @__PURE__ */ new Set();
+      if (state.queuedMVCPRecalculate !== void 0) {
+        cancelAnimationFrame(state.queuedMVCPRecalculate);
+        state.queuedMVCPRecalculate = void 0;
+      }
       ReactDOM.flushSync(runCalculateItems);
     } else {
       runCalculateItems();
@@ -5311,6 +5335,20 @@ function maybeUpdateAnchoredEndSpace(ctx) {
 // src/core/updateItemSize.ts
 function runOrScheduleMVCPRecalculate(ctx) {
   const state = ctx.state;
+  if (state.userScrollAnchorResetKeys !== void 0) {
+    if (state.queuedMVCPRecalculate !== void 0) {
+      return;
+    }
+    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+      var _a3;
+      state.queuedMVCPRecalculate = void 0;
+      calculateItemsInView(ctx);
+      if (((_a3 = state.userScrollAnchorResetKeys) == null ? void 0 : _a3.size) === 0) {
+        state.userScrollAnchorResetKeys = void 0;
+      }
+    });
+    return;
+  }
   {
     if (!state.mvcpAnchorLock) {
       if (state.queuedMVCPRecalculate !== void 0) {
@@ -5332,6 +5370,8 @@ function runOrScheduleMVCPRecalculate(ctx) {
 function updateItemSize(ctx, itemKey, sizeObj) {
   var _a3;
   const state = ctx.state;
+  const userScrollAnchorResetKeys = state.userScrollAnchorResetKeys;
+  const didMeasureUserScrollAnchorResetItem = !!(userScrollAnchorResetKeys == null ? void 0 : userScrollAnchorResetKeys.delete(itemKey));
   const {
     didContainersLayout,
     sizesKnown,
@@ -5410,10 +5450,12 @@ function updateItemSize(ctx, itemKey, sizeObj) {
   if (!cur || maxOtherAxisSize > cur) {
     set$(ctx, "otherAxisSize", maxOtherAxisSize);
   }
-  if (didContainersLayout || checkAllSizesKnown(state)) {
+  if (didContainersLayout || checkAllSizesKnown(state, getMountedBufferedIndices(state))) {
     if (needsRecalculate) {
       state.scrollForNextCalculateItemsInView = void 0;
       runOrScheduleMVCPRecalculate(ctx);
+    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorResetKeys == null ? void 0 : userScrollAnchorResetKeys.size) === 0) {
+      state.userScrollAnchorResetKeys = void 0;
     }
     if (shouldMaintainScrollAtEnd) {
       if (maintainScrollAtEnd == null ? void 0 : maintainScrollAtEnd.onItemLayout) {

package/index.mjs

@@ -2059,7 +2059,7 @@ function getId(state, index) {
 }
 
 // src/core/addTotalSize.ts
-function addTotalSize(ctx, key, add) {
+function addTotalSize(ctx, key, add, notifyTotalSize = true) {
   const state = ctx.state;
   const prevTotalSize = state.totalSize;
   let totalSize = state.totalSize;
@@ -2076,25 +2076,29 @@ function addTotalSize(ctx, key, add) {
     {
       state.pendingTotalSize = void 0;
       state.totalSize = totalSize;
-      set$(ctx, "totalSize", totalSize);
+      if (notifyTotalSize) {
+        set$(ctx, "totalSize", totalSize);
+      }
     }
+  } else if (notifyTotalSize && ctx.values.get("totalSize") !== totalSize) {
+    set$(ctx, "totalSize", totalSize);
   }
 }
 
 // src/core/setSize.ts
-function setSize(ctx, itemKey, size) {
+function setSize(ctx, itemKey, size, notifyTotalSize = true) {
   const state = ctx.state;
   const { sizes } = state;
   const previousSize = sizes.get(itemKey);
   const diff = previousSize !== void 0 ? size - previousSize : size;
   if (diff !== 0) {
-    addTotalSize(ctx, itemKey, diff);
+    addTotalSize(ctx, itemKey, diff, notifyTotalSize);
   }
   sizes.set(itemKey, size);
 }
 
 // src/utils/getItemSize.ts
-function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize) {
+function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize, notifyTotalSize) {
   var _a3, _b, _c;
   const state = ctx.state;
   const {
@@ -2140,7 +2144,7 @@ function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize) {
   if (size === void 0) {
     size = getEstimatedItemSize ? getEstimatedItemSize(data, index, itemType) : estimatedItemSize;
   }
-  setSize(ctx, key, size);
+  setSize(ctx, key, size, notifyTotalSize);
   return size;
 }
 function getItemSizeAtIndex(ctx, index) {
@@ -2579,10 +2583,10 @@ function getMountedBufferedIndices(state) {
 function getMountedNoBufferIndices(state) {
   return getMountedIndicesInRange(state, state.startNoBuffer, state.endNoBuffer);
 }
-function checkAllSizesKnown(state, indices = getMountedBufferedIndices(state)) {
+function checkAllSizesKnown(state, indices) {
   return indices.length > 0 && indices.every((index) => {
     const key = getId(state, index);
-    return state.sizesKnown.has(key);
+    return key !== void 0 && state.sizesKnown.has(key);
   });
 }
 
@@ -3892,6 +3896,7 @@ function updateItemPositions(ctx, dataChanged, { startIndex, scrollBottomBuffere
   const maxVisibleArea = scrollBottomBuffered + 1e3;
   const useAverageSize = !getEstimatedItemSize;
   const preferCachedSize = !doMVCP || dataChanged || state.scrollAdjustHandler.getAdjust() !== 0 || ((_b = peek$(ctx, "scrollAdjustPending")) != null ? _b : 0) !== 0;
+  const notifyTotalSizeWhileCachingSizes = false;
   let currentRowTop = 0;
   let column = 1;
   let maxSizeInRow = 0;
@@ -3919,7 +3924,15 @@ function updateItemPositions(ctx, dataChanged, { startIndex, scrollBottomBuffere
       const prevIndex = startIndex - 1;
       const prevId = getId(state, prevIndex);
       const prevPosition = (_c = positions[prevIndex]) != null ? _c : 0;
-      const prevSize = (_d = sizesKnown.get(prevId)) != null ? _d : getItemSize(ctx, prevId, prevIndex, data[prevIndex], useAverageSize, preferCachedSize);
+      const prevSize = (_d = sizesKnown.get(prevId)) != null ? _d : getItemSize(
+        ctx,
+        prevId,
+        prevIndex,
+        data[prevIndex],
+        useAverageSize,
+        preferCachedSize,
+        notifyTotalSizeWhileCachingSizes
+      );
       currentRowTop = prevPosition + prevSize;
     }
   }
@@ -3952,7 +3965,7 @@ function updateItemPositions(ctx, dataChanged, { startIndex, scrollBottomBuffere
       maxSizeInRow = 0;
     }
     const knownSize = sizesKnown.get(id);
-    const size = knownSize !== void 0 ? knownSize : getItemSize(ctx, id, i, data[i], useAverageSize, preferCachedSize);
+    const size = knownSize !== void 0 ? knownSize : getItemSize(ctx, id, i, data[i], useAverageSize, preferCachedSize, notifyTotalSizeWhileCachingSizes);
     if (IS_DEV && needsIndexByKey) {
       if (indexByKeyForChecking.has(id)) {
         console.error(
@@ -4427,7 +4440,7 @@ function handleStickyRecycling(ctx, stickyArray, scroll, drawDistance, currentSt
 function calculateItemsInView(ctx, params = {}) {
   const state = ctx.state;
   batchedUpdates(() => {
-    var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+    var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
     const {
       columns,
       columnSpans,
@@ -4716,6 +4729,7 @@ function calculateItemsInView(ctx, params = {}) {
             state.containerItemTypes.set(containerIndex, requiredItemTypes[idx]);
           }
           containerItemKeys.set(id, containerIndex);
+          (_p = state.userScrollAnchorResetKeys) == null ? void 0 : _p.add(id);
           const containerSticky = `containerSticky${containerIndex}`;
           const isSticky = stickyIndicesSet.has(i);
           const isAlwaysRender = alwaysRenderSet.has(i);
@@ -4743,10 +4757,13 @@ function calculateItemsInView(ctx, params = {}) {
           }
         }
       }
+      if (((_q = state.userScrollAnchorResetKeys) == null ? void 0 : _q.size) === 0) {
+        state.userScrollAnchorResetKeys = void 0;
+      }
       if (alwaysRenderArr.length > 0) {
         for (const index of alwaysRenderArr) {
           if (index < 0 || index >= dataLength) continue;
-          const id = (_p = idCache[index]) != null ? _p : getId(state, index);
+          const id = (_r = idCache[index]) != null ? _r : getId(state, index);
           const containerIndex = containerItemKeys.get(id);
           if (containerIndex !== void 0) {
             state.stickyContainerPool.add(containerIndex);
@@ -5107,7 +5124,14 @@ function updateScroll(ctx, newScroll, forceUpdate) {
       (_a4 = state.triggerCalculateItemsInView) == null ? void 0 : _a4.call(state, { doMVCP: scrollingTo !== void 0 });
       checkThresholds(ctx);
     };
-    if (scrollLength > 0 && scrollingTo === void 0 && scrollDelta > scrollLength) {
+    if (scrollLength > 0 && scrollingTo === void 0 && scrollDelta > scrollLength && !state.pendingNativeMVCPAdjust) {
+      state.mvcpAnchorLock = void 0;
+      state.pendingNativeMVCPAdjust = void 0;
+      state.userScrollAnchorResetKeys = /* @__PURE__ */ new Set();
+      if (state.queuedMVCPRecalculate !== void 0) {
+        cancelAnimationFrame(state.queuedMVCPRecalculate);
+        state.queuedMVCPRecalculate = void 0;
+      }
       flushSync(runCalculateItems);
     } else {
       runCalculateItems();
@@ -5290,6 +5314,20 @@ function maybeUpdateAnchoredEndSpace(ctx) {
 // src/core/updateItemSize.ts
 function runOrScheduleMVCPRecalculate(ctx) {
   const state = ctx.state;
+  if (state.userScrollAnchorResetKeys !== void 0) {
+    if (state.queuedMVCPRecalculate !== void 0) {
+      return;
+    }
+    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+      var _a3;
+      state.queuedMVCPRecalculate = void 0;
+      calculateItemsInView(ctx);
+      if (((_a3 = state.userScrollAnchorResetKeys) == null ? void 0 : _a3.size) === 0) {
+        state.userScrollAnchorResetKeys = void 0;
+      }
+    });
+    return;
+  }
   {
     if (!state.mvcpAnchorLock) {
       if (state.queuedMVCPRecalculate !== void 0) {
@@ -5311,6 +5349,8 @@ function runOrScheduleMVCPRecalculate(ctx) {
 function updateItemSize(ctx, itemKey, sizeObj) {
   var _a3;
   const state = ctx.state;
+  const userScrollAnchorResetKeys = state.userScrollAnchorResetKeys;
+  const didMeasureUserScrollAnchorResetItem = !!(userScrollAnchorResetKeys == null ? void 0 : userScrollAnchorResetKeys.delete(itemKey));
   const {
     didContainersLayout,
     sizesKnown,
@@ -5389,10 +5429,12 @@ function updateItemSize(ctx, itemKey, sizeObj) {
   if (!cur || maxOtherAxisSize > cur) {
     set$(ctx, "otherAxisSize", maxOtherAxisSize);
   }
-  if (didContainersLayout || checkAllSizesKnown(state)) {
+  if (didContainersLayout || checkAllSizesKnown(state, getMountedBufferedIndices(state))) {
     if (needsRecalculate) {
       state.scrollForNextCalculateItemsInView = void 0;
       runOrScheduleMVCPRecalculate(ctx);
+    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorResetKeys == null ? void 0 : userScrollAnchorResetKeys.size) === 0) {
+      state.userScrollAnchorResetKeys = void 0;
     }
     if (shouldMaintainScrollAtEnd) {
       if (maintainScrollAtEnd == null ? void 0 : maintainScrollAtEnd.onItemLayout) {

package/index.native.js

@@ -1557,7 +1557,7 @@ function getId(state, index) {
 }
 
 // src/core/addTotalSize.ts
-function addTotalSize(ctx, key, add) {
+function addTotalSize(ctx, key, add, notifyTotalSize = true) {
   const state = ctx.state;
   const prevTotalSize = state.totalSize;
   let totalSize = state.totalSize;
@@ -1576,25 +1576,29 @@ function addTotalSize(ctx, key, add) {
     } else {
       state.pendingTotalSize = void 0;
       state.totalSize = totalSize;
-      set$(ctx, "totalSize", totalSize);
+      if (notifyTotalSize) {
+        set$(ctx, "totalSize", totalSize);
+      }
     }
+  } else if (notifyTotalSize && ctx.values.get("totalSize") !== totalSize) {
+    set$(ctx, "totalSize", totalSize);
   }
 }
 
 // src/core/setSize.ts
-function setSize(ctx, itemKey, size) {
+function setSize(ctx, itemKey, size, notifyTotalSize = true) {
   const state = ctx.state;
   const { sizes } = state;
   const previousSize = sizes.get(itemKey);
   const diff = previousSize !== void 0 ? size - previousSize : size;
   if (diff !== 0) {
-    addTotalSize(ctx, itemKey, diff);
+    addTotalSize(ctx, itemKey, diff, notifyTotalSize);
   }
   sizes.set(itemKey, size);
 }
 
 // src/utils/getItemSize.ts
-function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize) {
+function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize, notifyTotalSize) {
   var _a3, _b, _c;
   const state = ctx.state;
   const {
@@ -1640,7 +1644,7 @@ function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize) {
   if (size === void 0) {
     size = getEstimatedItemSize ? getEstimatedItemSize(data, index, itemType) : estimatedItemSize;
   }
-  setSize(ctx, key, size);
+  setSize(ctx, key, size, notifyTotalSize);
   return size;
 }
 function getItemSizeAtIndex(ctx, index) {
@@ -2163,10 +2167,10 @@ function getMountedBufferedIndices(state) {
 function getMountedNoBufferIndices(state) {
   return getMountedIndicesInRange(state, state.startNoBuffer, state.endNoBuffer);
 }
-function checkAllSizesKnown(state, indices = getMountedBufferedIndices(state)) {
+function checkAllSizesKnown(state, indices) {
   return indices.length > 0 && indices.every((index) => {
     const key = getId(state, index);
-    return state.sizesKnown.has(key);
+    return key !== void 0 && state.sizesKnown.has(key);
   });
 }
 
@@ -3385,6 +3389,7 @@ function updateItemPositions(ctx, dataChanged, { startIndex, scrollBottomBuffere
   const maxVisibleArea = scrollBottomBuffered + 1e3;
   const useAverageSize = !getEstimatedItemSize;
   const preferCachedSize = !doMVCP || dataChanged || state.scrollAdjustHandler.getAdjust() !== 0 || ((_b = peek$(ctx, "scrollAdjustPending")) != null ? _b : 0) !== 0;
+  const notifyTotalSizeWhileCachingSizes = false;
   let currentRowTop = 0;
   let column = 1;
   let maxSizeInRow = 0;
@@ -3412,7 +3417,15 @@ function updateItemPositions(ctx, dataChanged, { startIndex, scrollBottomBuffere
       const prevIndex = startIndex - 1;
       const prevId = getId(state, prevIndex);
       const prevPosition = (_c = positions[prevIndex]) != null ? _c : 0;
-      const prevSize = (_d = sizesKnown.get(prevId)) != null ? _d : getItemSize(ctx, prevId, prevIndex, data[prevIndex], useAverageSize, preferCachedSize);
+      const prevSize = (_d = sizesKnown.get(prevId)) != null ? _d : getItemSize(
+        ctx,
+        prevId,
+        prevIndex,
+        data[prevIndex],
+        useAverageSize,
+        preferCachedSize,
+        notifyTotalSizeWhileCachingSizes
+      );
       currentRowTop = prevPosition + prevSize;
     }
   }
@@ -3445,7 +3458,7 @@ function updateItemPositions(ctx, dataChanged, { startIndex, scrollBottomBuffere
       maxSizeInRow = 0;
     }
     const knownSize = sizesKnown.get(id);
-    const size = knownSize !== void 0 ? knownSize : getItemSize(ctx, id, i, data[i], useAverageSize, preferCachedSize);
+    const size = knownSize !== void 0 ? knownSize : getItemSize(ctx, id, i, data[i], useAverageSize, preferCachedSize, notifyTotalSizeWhileCachingSizes);
     if (IS_DEV && needsIndexByKey) {
       if (indexByKeyForChecking.has(id)) {
         console.error(
@@ -3920,7 +3933,7 @@ function handleStickyRecycling(ctx, stickyArray, scroll, drawDistance, currentSt
 function calculateItemsInView(ctx, params = {}) {
   const state = ctx.state;
   batchedUpdates(() => {
-    var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+    var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
     const {
       columns,
       columnSpans,
@@ -4209,6 +4222,7 @@ function calculateItemsInView(ctx, params = {}) {
             state.containerItemTypes.set(containerIndex, requiredItemTypes[idx]);
           }
           containerItemKeys.set(id, containerIndex);
+          (_p = state.userScrollAnchorResetKeys) == null ? void 0 : _p.add(id);
           const containerSticky = `containerSticky${containerIndex}`;
           const isSticky = stickyIndicesSet.has(i);
           const isAlwaysRender = alwaysRenderSet.has(i);
@@ -4236,10 +4250,13 @@ function calculateItemsInView(ctx, params = {}) {
           }
         }
       }
+      if (((_q = state.userScrollAnchorResetKeys) == null ? void 0 : _q.size) === 0) {
+        state.userScrollAnchorResetKeys = void 0;
+      }
       if (alwaysRenderArr.length > 0) {
         for (const index of alwaysRenderArr) {
           if (index < 0 || index >= dataLength) continue;
-          const id = (_p = idCache[index]) != null ? _p : getId(state, index);
+          const id = (_r = idCache[index]) != null ? _r : getId(state, index);
           const containerIndex = containerItemKeys.get(id);
           if (containerIndex !== void 0) {
             state.stickyContainerPool.add(containerIndex);
@@ -4601,7 +4618,14 @@ function updateScroll(ctx, newScroll, forceUpdate) {
       (_a4 = state.triggerCalculateItemsInView) == null ? void 0 : _a4.call(state, { doMVCP: scrollingTo !== void 0 });
       checkThresholds(ctx);
     };
-    if (Platform.OS === "web" && scrollLength > 0 && scrollingTo === void 0 && scrollDelta > scrollLength) {
+    if (scrollLength > 0 && scrollingTo === void 0 && scrollDelta > scrollLength && !state.pendingNativeMVCPAdjust) {
+      state.mvcpAnchorLock = void 0;
+      state.pendingNativeMVCPAdjust = void 0;
+      state.userScrollAnchorResetKeys = /* @__PURE__ */ new Set();
+      if (state.queuedMVCPRecalculate !== void 0) {
+        cancelAnimationFrame(state.queuedMVCPRecalculate);
+        state.queuedMVCPRecalculate = void 0;
+      }
       flushSync(runCalculateItems);
     } else {
       runCalculateItems();
@@ -4784,6 +4808,20 @@ function maybeUpdateAnchoredEndSpace(ctx) {
 // src/core/updateItemSize.ts
 function runOrScheduleMVCPRecalculate(ctx) {
   const state = ctx.state;
+  if (state.userScrollAnchorResetKeys !== void 0) {
+    if (state.queuedMVCPRecalculate !== void 0) {
+      return;
+    }
+    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+      var _a3;
+      state.queuedMVCPRecalculate = void 0;
+      calculateItemsInView(ctx);
+      if (((_a3 = state.userScrollAnchorResetKeys) == null ? void 0 : _a3.size) === 0) {
+        state.userScrollAnchorResetKeys = void 0;
+      }
+    });
+    return;
+  }
   if (Platform.OS === "web") {
     if (!state.mvcpAnchorLock) {
       if (state.queuedMVCPRecalculate !== void 0) {
@@ -4807,6 +4845,8 @@ function runOrScheduleMVCPRecalculate(ctx) {
 function updateItemSize(ctx, itemKey, sizeObj) {
   var _a3;
   const state = ctx.state;
+  const userScrollAnchorResetKeys = state.userScrollAnchorResetKeys;
+  const didMeasureUserScrollAnchorResetItem = !!(userScrollAnchorResetKeys == null ? void 0 : userScrollAnchorResetKeys.delete(itemKey));
   const {
     didContainersLayout,
     sizesKnown,
@@ -4885,10 +4925,12 @@ function updateItemSize(ctx, itemKey, sizeObj) {
   if (!cur || maxOtherAxisSize > cur) {
     set$(ctx, "otherAxisSize", maxOtherAxisSize);
   }
-  if (didContainersLayout || checkAllSizesKnown(state)) {
+  if (didContainersLayout || checkAllSizesKnown(state, getMountedBufferedIndices(state))) {
     if (needsRecalculate) {
       state.scrollForNextCalculateItemsInView = void 0;
       runOrScheduleMVCPRecalculate(ctx);
+    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorResetKeys == null ? void 0 : userScrollAnchorResetKeys.size) === 0) {
+      state.userScrollAnchorResetKeys = void 0;
     }
     if (shouldMaintainScrollAtEnd) {
       if (maintainScrollAtEnd == null ? void 0 : maintainScrollAtEnd.onItemLayout) {