npm - @legendapp/list - Versions diffs - 3.0.1 → 3.0.3 - Mend

@legendapp/list 3.0.1 → 3.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,13 @@
+## 3.0.3
+- Fix: MVCP was getting batched to improve big jumps, but was making scroll worse
+- Fix: On native, ignore one-physical-pixel layout measurement noise, preventing unnecessary item size updates from Fabric and native onLayout rounding differences.
+- Fix: Average item sizes update correctly when getFixedItemSize returns undefined for only some item types.
+## 3.0.2
+- Fix: Using viewability was causing scrolling to end to sometimes not update items in view if the JS thread was slammed
 ## 3.0.1
 - Feat: SectionList now supports getFixedItemSize for items, headers, footers, and separators.

package/package.json CHANGED Viewed

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

package/react-native.js CHANGED Viewed

@@ -743,6 +743,22 @@ function Separator({ ItemSeparatorComponent, leadingItem }) {
   const isLastItem = useIsLastItem();
   return isLastItem ? null : /* @__PURE__ */ React2__namespace.createElement(ItemSeparatorComponent, { leadingItem });
 }
+var PixelRatio = ReactNative.PixelRatio;
+// src/utils/layoutMeasurement.ts
+var FLOATING_POINT_SLACK = 0.01;
+var NATIVE_LAYOUT_MEASUREMENT_EPSILON = 1 / PixelRatio.get() + FLOATING_POINT_SLACK;
+function isWithinEpsilon(delta) {
+  return Math.abs(delta) <= NATIVE_LAYOUT_MEASUREMENT_EPSILON;
+}
+function isNativeLayoutNoise(delta) {
+  return isWithinEpsilon(delta);
+}
+function isNativeLayoutSizeNoise(heightDelta, widthDelta) {
+  return isWithinEpsilon(heightDelta) && isWithinEpsilon(widthDelta);
+}
+// src/hooks/useOnLayoutSync.native.tsx
 function useOnLayoutSync({
   ref,
   onLayoutProp,
@@ -751,11 +767,21 @@ function useOnLayoutSync({
   const lastLayoutRef = React2.useRef(null);
   const onLayout = React2.useCallback(
     (event) => {
-      var _a3, _b;
       const { layout } = event.nativeEvent;
-      if (layout.height !== ((_a3 = lastLayoutRef.current) == null ? void 0 : _a3.height) || layout.width !== ((_b = lastLayoutRef.current) == null ? void 0 : _b.width)) {
+      const lastLayout = lastLayoutRef.current;
+      const didLayoutSizeChange = lastLayout && (layout.height !== lastLayout.height || layout.width !== lastLayout.width);
+      const isMeasuredLayoutNoise = !!didLayoutSizeChange && !!lastLayout.measuredLayout && isNativeLayoutSizeNoise(
+        layout.height - lastLayout.measuredLayout.height,
+        layout.width - lastLayout.measuredLayout.width
+      );
+      if (!lastLayout || didLayoutSizeChange && !isMeasuredLayoutNoise) {
         onLayoutChange(layout, false);
-        lastLayoutRef.current = layout;
+      }
+      if (!lastLayout || didLayoutSizeChange) {
+        lastLayoutRef.current = {
+          ...layout,
+          measuredLayout: isMeasuredLayoutNoise ? lastLayout == null ? void 0 : lastLayout.measuredLayout : void 0
+        };
       }
       onLayoutProp == null ? void 0 : onLayoutProp(event);
     },
@@ -766,7 +792,7 @@ function useOnLayoutSync({
       if (ref.current) {
         ref.current.measure((x, y, width, height) => {
           const layout = { height, width, x, y };
-          lastLayoutRef.current = layout;
+          lastLayoutRef.current = { ...layout, measuredLayout: layout };
           onLayoutChange(layout, true);
         });
       }
@@ -2199,10 +2225,7 @@ function requestAdjust(ctx, positionDiff, dataChanged) {
     const needsScrollWorkaround = Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
     const doit = () => {
       if (needsScrollWorkaround) {
-        scrollTo(ctx, {
-          noScrollingTo: true,
-          offset: state.scroll
-        });
+        doScrollTo(ctx, { horizontal: state.props.horizontal, offset: state.scroll });
       } else {
         state.scrollAdjustHandler.requestAdjust(positionDiff);
         if (state.adjustingFromInitialMount) {
@@ -2598,7 +2621,7 @@ function updateScroll(ctx, newScroll, forceUpdate, options) {
     if (scrollLength > 0 && scrollingTo === void 0 && scrollDelta > scrollLength && !state.pendingNativeMVCPAdjust) {
       state.mvcpAnchorLock = void 0;
       state.pendingNativeMVCPAdjust = void 0;
-      state.userScrollAnchorResetKeys = /* @__PURE__ */ new Set();
+      state.userScrollAnchorReset = { keys: /* @__PURE__ */ new Set() };
       if (state.queuedMVCPRecalculate !== void 0) {
         cancelAnimationFrame(state.queuedMVCPRecalculate);
         state.queuedMVCPRecalculate = void 0;
@@ -4416,7 +4439,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, _q;
+    var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const {
       columns,
       containerItemKeys,
@@ -4511,7 +4534,7 @@ function calculateItemsInView(ctx, params = {}) {
       scrollBottomBuffered = scrollBottom + scrollBufferBottom;
     };
     updateScrollRange();
-    if (!suppressInitialScrollSideEffects && !dataChanged && !forceFullItemPositions && scrollForNextCalculateItemsInView) {
+    if (enableScrollForNextCalculateItemsInView && !suppressInitialScrollSideEffects && !dataChanged && !forceFullItemPositions && scrollForNextCalculateItemsInView) {
       const { top, bottom } = scrollForNextCalculateItemsInView;
       if (top === null && bottom === null) {
         state.scrollForNextCalculateItemsInView = void 0;
@@ -4730,7 +4753,7 @@ function calculateItemsInView(ctx, params = {}) {
             state.containerItemTypes.set(containerIndex, requiredItemTypes[idx]);
           }
           containerItemKeys.set(id, containerIndex);
-          (_o = state.userScrollAnchorResetKeys) == null ? void 0 : _o.add(id);
+          (_o = state.userScrollAnchorReset) == null ? void 0 : _o.keys.add(id);
           const containerSticky = `containerSticky${containerIndex}`;
           const isSticky = stickyHeaderIndicesSet.has(i);
           const isAlwaysRender = alwaysRenderSet.has(i);
@@ -4758,13 +4781,17 @@ function calculateItemsInView(ctx, params = {}) {
           }
         }
       }
-      if (((_p = state.userScrollAnchorResetKeys) == null ? void 0 : _p.size) === 0) {
-        state.userScrollAnchorResetKeys = void 0;
+      if (state.userScrollAnchorReset) {
+        if (state.userScrollAnchorReset.keys.size === 0) {
+          state.userScrollAnchorReset = void 0;
+        } else {
+          state.userScrollAnchorReset.batchSize = state.userScrollAnchorReset.keys.size;
+        }
       }
       if (alwaysRenderArr.length > 0) {
         for (const index of alwaysRenderArr) {
           if (index < 0 || index >= dataLength) continue;
-          const id = (_q = idCache[index]) != null ? _q : getId(state, index);
+          const id = (_p = idCache[index]) != null ? _p : getId(state, index);
           const containerIndex = containerItemKeys.get(id);
           if (containerIndex !== void 0) {
             state.stickyContainerPool.add(containerIndex);
@@ -5218,37 +5245,42 @@ function updateContentInsetEndAdjustment(ctx, previousContentInsetEndAdjustment)
 // src/core/updateItemSize.ts
 function runOrScheduleMVCPRecalculate(ctx) {
+  var _a3, _b;
   const state = ctx.state;
-  if (state.userScrollAnchorResetKeys !== void 0) {
-    if (state.queuedMVCPRecalculate !== void 0) {
-      return;
-    }
-    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
-      var _a3;
-      state.queuedMVCPRecalculate = void 0;
+  if (state.userScrollAnchorReset !== void 0) {
+    const replacementBatchSize = (_a3 = state.userScrollAnchorReset.batchSize) != null ? _a3 : state.userScrollAnchorReset.keys.size;
+    const replacementMeasurementBatchThreshold = 3;
+    const shouldBatchReplacementMeasurements = replacementBatchSize > replacementMeasurementBatchThreshold;
+    if (shouldBatchReplacementMeasurements) {
+      if (state.queuedMVCPRecalculate === void 0) {
+        state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+          var _a4;
+          state.queuedMVCPRecalculate = void 0;
+          calculateItemsInView(ctx);
+          if (((_a4 = state.userScrollAnchorReset) == null ? void 0 : _a4.keys.size) === 0) {
+            state.userScrollAnchorReset = void 0;
+          }
+        });
+      }
+    } else {
       calculateItemsInView(ctx);
-      if (((_a3 = state.userScrollAnchorResetKeys) == null ? void 0 : _a3.size) === 0) {
-        state.userScrollAnchorResetKeys = void 0;
+      if (((_b = state.userScrollAnchorReset) == null ? void 0 : _b.keys.size) === 0) {
+        state.userScrollAnchorReset = void 0;
       }
-    });
-    return;
-  }
-  if (Platform.OS === "web") {
+    }
+  } else if (Platform.OS === "web") {
     if (!state.mvcpAnchorLock) {
       if (state.queuedMVCPRecalculate !== void 0) {
         cancelAnimationFrame(state.queuedMVCPRecalculate);
         state.queuedMVCPRecalculate = void 0;
       }
       calculateItemsInView(ctx, { doMVCP: true });
-      return;
-    }
-    if (state.queuedMVCPRecalculate !== void 0) {
-      return;
+    } else if (state.queuedMVCPRecalculate === void 0) {
+      state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+        state.queuedMVCPRecalculate = void 0;
+        calculateItemsInView(ctx, { doMVCP: true });
+      });
     }
-    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
-      state.queuedMVCPRecalculate = void 0;
-      calculateItemsInView(ctx, { doMVCP: true });
-    });
   } else {
     calculateItemsInView(ctx, { doMVCP: true });
   }
@@ -5266,8 +5298,8 @@ function updateOtherAxisSizeIfNeeded(ctx, sizeObj, horizontal) {
 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 userScrollAnchorReset = state.userScrollAnchorReset;
+  const didMeasureUserScrollAnchorResetItem = !!(userScrollAnchorReset == null ? void 0 : userScrollAnchorReset.keys.delete(itemKey));
   const {
     didContainersLayout,
     sizesKnown,
@@ -5323,8 +5355,8 @@ function updateItemSize(ctx, itemKey, sizeObj) {
     if (needsRecalculate) {
       state.scrollForNextCalculateItemsInView = void 0;
       runOrScheduleMVCPRecalculate(ctx);
-    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorResetKeys == null ? void 0 : userScrollAnchorResetKeys.size) === 0) {
-      state.userScrollAnchorResetKeys = void 0;
+    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorReset == null ? void 0 : userScrollAnchorReset.keys.size) === 0) {
+      state.userScrollAnchorReset = void 0;
     }
     if (shouldMaintainScrollAtEnd) {
       if (maintainScrollAtEnd == null ? void 0 : maintainScrollAtEnd.onItemLayout) {
@@ -5334,7 +5366,7 @@ function updateItemSize(ctx, itemKey, sizeObj) {
   }
 }
 function updateOneItemSize(ctx, itemKey, sizeObj) {
-  var _a3;
+  var _a3, _b;
   const state = ctx.state;
   const {
     indexByKey,
@@ -5344,13 +5376,23 @@ function updateOneItemSize(ctx, itemKey, sizeObj) {
   } = state;
   if (!data) return 0;
   const index = indexByKey.get(itemKey);
-  const prevSize = getItemSize(ctx, itemKey, index, data[index]);
+  const itemData = data[index];
+  let itemType;
+  let fixedItemSize;
+  if (getFixedItemSize) {
+    itemType = getItemType ? (_a3 = getItemType(itemData, index)) != null ? _a3 : "" : "";
+    fixedItemSize = getFixedItemSize(itemData, index, itemType);
+  }
+  const prevSize = getItemSize(ctx, itemKey, index, itemData);
   const rawSize = horizontal ? sizeObj.width : sizeObj.height;
-  const size = Platform.OS === "web" ? Math.round(rawSize) : roundSize(rawSize);
   const prevSizeKnown = sizesKnown.get(itemKey);
+  if (Platform.OS !== "web" && prevSizeKnown !== void 0 && isNativeLayoutNoise(rawSize - prevSizeKnown)) {
+    return 0;
+  }
+  const size = Platform.OS === "web" ? Math.round(rawSize) : roundSize(rawSize);
   sizesKnown.set(itemKey, size);
-  if (!getFixedItemSize && size > 0) {
-    const itemType = getItemType ? (_a3 = getItemType(data[index], index)) != null ? _a3 : "" : "";
+  if (fixedItemSize === void 0 && size > 0) {
+    itemType != null ? itemType : itemType = getItemType ? (_b = getItemType(itemData, index)) != null ? _b : "" : "";
     let averages = averageSizes[itemType];
     if (!averages) {
       averages = averageSizes[itemType] = { avg: 0, num: 0 };
@@ -6367,6 +6409,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     });
     state.viewabilityConfigCallbackPairs = viewability;
     state.enableScrollForNextCalculateItemsInView = !viewability;
+    if (viewability) {
+      state.scrollForNextCalculateItemsInView = void 0;
+    }
   }, [viewabilityConfig, viewabilityConfigCallbackPairs, onViewableItemsChanged]);
   useInit(() => {
     if (!IsNewArchitecture) {

package/react-native.mjs CHANGED Viewed

@@ -1,7 +1,7 @@
 import * as React2 from 'react';
 import { useReducer, useEffect, createContext, useRef, useState, useMemo, useCallback, useLayoutEffect, useImperativeHandle, useContext } from 'react';
 import * as ReactNative from 'react-native';
-import { Animated, Platform as Platform$1, View as View$1, Text as Text$1, StyleSheet as StyleSheet$1, RefreshControl, Dimensions, I18nManager } from 'react-native';
+import { Animated, Platform as Platform$1, View as View$1, Text as Text$1, PixelRatio as PixelRatio$1, StyleSheet as StyleSheet$1, RefreshControl, Dimensions, I18nManager } from 'react-native';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 // src/components/LegendList.tsx
@@ -722,6 +722,22 @@ function Separator({ ItemSeparatorComponent, leadingItem }) {
   const isLastItem = useIsLastItem();
   return isLastItem ? null : /* @__PURE__ */ React2.createElement(ItemSeparatorComponent, { leadingItem });
 }
+var PixelRatio = PixelRatio$1;
+// src/utils/layoutMeasurement.ts
+var FLOATING_POINT_SLACK = 0.01;
+var NATIVE_LAYOUT_MEASUREMENT_EPSILON = 1 / PixelRatio.get() + FLOATING_POINT_SLACK;
+function isWithinEpsilon(delta) {
+  return Math.abs(delta) <= NATIVE_LAYOUT_MEASUREMENT_EPSILON;
+}
+function isNativeLayoutNoise(delta) {
+  return isWithinEpsilon(delta);
+}
+function isNativeLayoutSizeNoise(heightDelta, widthDelta) {
+  return isWithinEpsilon(heightDelta) && isWithinEpsilon(widthDelta);
+}
+// src/hooks/useOnLayoutSync.native.tsx
 function useOnLayoutSync({
   ref,
   onLayoutProp,
@@ -730,11 +746,21 @@ function useOnLayoutSync({
   const lastLayoutRef = useRef(null);
   const onLayout = useCallback(
     (event) => {
-      var _a3, _b;
       const { layout } = event.nativeEvent;
-      if (layout.height !== ((_a3 = lastLayoutRef.current) == null ? void 0 : _a3.height) || layout.width !== ((_b = lastLayoutRef.current) == null ? void 0 : _b.width)) {
+      const lastLayout = lastLayoutRef.current;
+      const didLayoutSizeChange = lastLayout && (layout.height !== lastLayout.height || layout.width !== lastLayout.width);
+      const isMeasuredLayoutNoise = !!didLayoutSizeChange && !!lastLayout.measuredLayout && isNativeLayoutSizeNoise(
+        layout.height - lastLayout.measuredLayout.height,
+        layout.width - lastLayout.measuredLayout.width
+      );
+      if (!lastLayout || didLayoutSizeChange && !isMeasuredLayoutNoise) {
         onLayoutChange(layout, false);
-        lastLayoutRef.current = layout;
+      }
+      if (!lastLayout || didLayoutSizeChange) {
+        lastLayoutRef.current = {
+          ...layout,
+          measuredLayout: isMeasuredLayoutNoise ? lastLayout == null ? void 0 : lastLayout.measuredLayout : void 0
+        };
       }
       onLayoutProp == null ? void 0 : onLayoutProp(event);
     },
@@ -745,7 +771,7 @@ function useOnLayoutSync({
       if (ref.current) {
         ref.current.measure((x, y, width, height) => {
           const layout = { height, width, x, y };
-          lastLayoutRef.current = layout;
+          lastLayoutRef.current = { ...layout, measuredLayout: layout };
           onLayoutChange(layout, true);
         });
       }
@@ -2178,10 +2204,7 @@ function requestAdjust(ctx, positionDiff, dataChanged) {
     const needsScrollWorkaround = Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
     const doit = () => {
       if (needsScrollWorkaround) {
-        scrollTo(ctx, {
-          noScrollingTo: true,
-          offset: state.scroll
-        });
+        doScrollTo(ctx, { horizontal: state.props.horizontal, offset: state.scroll });
       } else {
         state.scrollAdjustHandler.requestAdjust(positionDiff);
         if (state.adjustingFromInitialMount) {
@@ -2577,7 +2600,7 @@ function updateScroll(ctx, newScroll, forceUpdate, options) {
     if (scrollLength > 0 && scrollingTo === void 0 && scrollDelta > scrollLength && !state.pendingNativeMVCPAdjust) {
       state.mvcpAnchorLock = void 0;
       state.pendingNativeMVCPAdjust = void 0;
-      state.userScrollAnchorResetKeys = /* @__PURE__ */ new Set();
+      state.userScrollAnchorReset = { keys: /* @__PURE__ */ new Set() };
       if (state.queuedMVCPRecalculate !== void 0) {
         cancelAnimationFrame(state.queuedMVCPRecalculate);
         state.queuedMVCPRecalculate = void 0;
@@ -4395,7 +4418,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, _q;
+    var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const {
       columns,
       containerItemKeys,
@@ -4490,7 +4513,7 @@ function calculateItemsInView(ctx, params = {}) {
       scrollBottomBuffered = scrollBottom + scrollBufferBottom;
     };
     updateScrollRange();
-    if (!suppressInitialScrollSideEffects && !dataChanged && !forceFullItemPositions && scrollForNextCalculateItemsInView) {
+    if (enableScrollForNextCalculateItemsInView && !suppressInitialScrollSideEffects && !dataChanged && !forceFullItemPositions && scrollForNextCalculateItemsInView) {
       const { top, bottom } = scrollForNextCalculateItemsInView;
       if (top === null && bottom === null) {
         state.scrollForNextCalculateItemsInView = void 0;
@@ -4709,7 +4732,7 @@ function calculateItemsInView(ctx, params = {}) {
             state.containerItemTypes.set(containerIndex, requiredItemTypes[idx]);
           }
           containerItemKeys.set(id, containerIndex);
-          (_o = state.userScrollAnchorResetKeys) == null ? void 0 : _o.add(id);
+          (_o = state.userScrollAnchorReset) == null ? void 0 : _o.keys.add(id);
           const containerSticky = `containerSticky${containerIndex}`;
           const isSticky = stickyHeaderIndicesSet.has(i);
           const isAlwaysRender = alwaysRenderSet.has(i);
@@ -4737,13 +4760,17 @@ function calculateItemsInView(ctx, params = {}) {
           }
         }
       }
-      if (((_p = state.userScrollAnchorResetKeys) == null ? void 0 : _p.size) === 0) {
-        state.userScrollAnchorResetKeys = void 0;
+      if (state.userScrollAnchorReset) {
+        if (state.userScrollAnchorReset.keys.size === 0) {
+          state.userScrollAnchorReset = void 0;
+        } else {
+          state.userScrollAnchorReset.batchSize = state.userScrollAnchorReset.keys.size;
+        }
       }
       if (alwaysRenderArr.length > 0) {
         for (const index of alwaysRenderArr) {
           if (index < 0 || index >= dataLength) continue;
-          const id = (_q = idCache[index]) != null ? _q : getId(state, index);
+          const id = (_p = idCache[index]) != null ? _p : getId(state, index);
           const containerIndex = containerItemKeys.get(id);
           if (containerIndex !== void 0) {
             state.stickyContainerPool.add(containerIndex);
@@ -5197,37 +5224,42 @@ function updateContentInsetEndAdjustment(ctx, previousContentInsetEndAdjustment)
 // src/core/updateItemSize.ts
 function runOrScheduleMVCPRecalculate(ctx) {
+  var _a3, _b;
   const state = ctx.state;
-  if (state.userScrollAnchorResetKeys !== void 0) {
-    if (state.queuedMVCPRecalculate !== void 0) {
-      return;
-    }
-    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
-      var _a3;
-      state.queuedMVCPRecalculate = void 0;
+  if (state.userScrollAnchorReset !== void 0) {
+    const replacementBatchSize = (_a3 = state.userScrollAnchorReset.batchSize) != null ? _a3 : state.userScrollAnchorReset.keys.size;
+    const replacementMeasurementBatchThreshold = 3;
+    const shouldBatchReplacementMeasurements = replacementBatchSize > replacementMeasurementBatchThreshold;
+    if (shouldBatchReplacementMeasurements) {
+      if (state.queuedMVCPRecalculate === void 0) {
+        state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+          var _a4;
+          state.queuedMVCPRecalculate = void 0;
+          calculateItemsInView(ctx);
+          if (((_a4 = state.userScrollAnchorReset) == null ? void 0 : _a4.keys.size) === 0) {
+            state.userScrollAnchorReset = void 0;
+          }
+        });
+      }
+    } else {
       calculateItemsInView(ctx);
-      if (((_a3 = state.userScrollAnchorResetKeys) == null ? void 0 : _a3.size) === 0) {
-        state.userScrollAnchorResetKeys = void 0;
+      if (((_b = state.userScrollAnchorReset) == null ? void 0 : _b.keys.size) === 0) {
+        state.userScrollAnchorReset = void 0;
       }
-    });
-    return;
-  }
-  if (Platform.OS === "web") {
+    }
+  } else if (Platform.OS === "web") {
     if (!state.mvcpAnchorLock) {
       if (state.queuedMVCPRecalculate !== void 0) {
         cancelAnimationFrame(state.queuedMVCPRecalculate);
         state.queuedMVCPRecalculate = void 0;
       }
       calculateItemsInView(ctx, { doMVCP: true });
-      return;
-    }
-    if (state.queuedMVCPRecalculate !== void 0) {
-      return;
+    } else if (state.queuedMVCPRecalculate === void 0) {
+      state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+        state.queuedMVCPRecalculate = void 0;
+        calculateItemsInView(ctx, { doMVCP: true });
+      });
     }
-    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
-      state.queuedMVCPRecalculate = void 0;
-      calculateItemsInView(ctx, { doMVCP: true });
-    });
   } else {
     calculateItemsInView(ctx, { doMVCP: true });
   }
@@ -5245,8 +5277,8 @@ function updateOtherAxisSizeIfNeeded(ctx, sizeObj, horizontal) {
 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 userScrollAnchorReset = state.userScrollAnchorReset;
+  const didMeasureUserScrollAnchorResetItem = !!(userScrollAnchorReset == null ? void 0 : userScrollAnchorReset.keys.delete(itemKey));
   const {
     didContainersLayout,
     sizesKnown,
@@ -5302,8 +5334,8 @@ function updateItemSize(ctx, itemKey, sizeObj) {
     if (needsRecalculate) {
       state.scrollForNextCalculateItemsInView = void 0;
       runOrScheduleMVCPRecalculate(ctx);
-    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorResetKeys == null ? void 0 : userScrollAnchorResetKeys.size) === 0) {
-      state.userScrollAnchorResetKeys = void 0;
+    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorReset == null ? void 0 : userScrollAnchorReset.keys.size) === 0) {
+      state.userScrollAnchorReset = void 0;
     }
     if (shouldMaintainScrollAtEnd) {
       if (maintainScrollAtEnd == null ? void 0 : maintainScrollAtEnd.onItemLayout) {
@@ -5313,7 +5345,7 @@ function updateItemSize(ctx, itemKey, sizeObj) {
   }
 }
 function updateOneItemSize(ctx, itemKey, sizeObj) {
-  var _a3;
+  var _a3, _b;
   const state = ctx.state;
   const {
     indexByKey,
@@ -5323,13 +5355,23 @@ function updateOneItemSize(ctx, itemKey, sizeObj) {
   } = state;
   if (!data) return 0;
   const index = indexByKey.get(itemKey);
-  const prevSize = getItemSize(ctx, itemKey, index, data[index]);
+  const itemData = data[index];
+  let itemType;
+  let fixedItemSize;
+  if (getFixedItemSize) {
+    itemType = getItemType ? (_a3 = getItemType(itemData, index)) != null ? _a3 : "" : "";
+    fixedItemSize = getFixedItemSize(itemData, index, itemType);
+  }
+  const prevSize = getItemSize(ctx, itemKey, index, itemData);
   const rawSize = horizontal ? sizeObj.width : sizeObj.height;
-  const size = Platform.OS === "web" ? Math.round(rawSize) : roundSize(rawSize);
   const prevSizeKnown = sizesKnown.get(itemKey);
+  if (Platform.OS !== "web" && prevSizeKnown !== void 0 && isNativeLayoutNoise(rawSize - prevSizeKnown)) {
+    return 0;
+  }
+  const size = Platform.OS === "web" ? Math.round(rawSize) : roundSize(rawSize);
   sizesKnown.set(itemKey, size);
-  if (!getFixedItemSize && size > 0) {
-    const itemType = getItemType ? (_a3 = getItemType(data[index], index)) != null ? _a3 : "" : "";
+  if (fixedItemSize === void 0 && size > 0) {
+    itemType != null ? itemType : itemType = getItemType ? (_b = getItemType(itemData, index)) != null ? _b : "" : "";
     let averages = averageSizes[itemType];
     if (!averages) {
       averages = averageSizes[itemType] = { avg: 0, num: 0 };
@@ -6346,6 +6388,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     });
     state.viewabilityConfigCallbackPairs = viewability;
     state.enableScrollForNextCalculateItemsInView = !viewability;
+    if (viewability) {
+      state.scrollForNextCalculateItemsInView = void 0;
+    }
   }, [viewabilityConfig, viewabilityConfigCallbackPairs, onViewableItemsChanged]);
   useInit(() => {
     if (!IsNewArchitecture) {

package/react-native.web.js CHANGED Viewed

@@ -3106,7 +3106,7 @@ function updateScroll(ctx, newScroll, forceUpdate, options) {
     if (scrollLength > 0 && scrollingTo === void 0 && scrollDelta > scrollLength && !state.pendingNativeMVCPAdjust) {
       state.mvcpAnchorLock = void 0;
       state.pendingNativeMVCPAdjust = void 0;
-      state.userScrollAnchorResetKeys = /* @__PURE__ */ new Set();
+      state.userScrollAnchorReset = { keys: /* @__PURE__ */ new Set() };
       if (state.queuedMVCPRecalculate !== void 0) {
         cancelAnimationFrame(state.queuedMVCPRecalculate);
         state.queuedMVCPRecalculate = void 0;
@@ -5069,7 +5069,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, _q;
+    var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const {
       columns,
       containerItemKeys,
@@ -5164,7 +5164,7 @@ function calculateItemsInView(ctx, params = {}) {
       scrollBottomBuffered = scrollBottom + scrollBufferBottom;
     };
     updateScrollRange();
-    if (!suppressInitialScrollSideEffects && !dataChanged && !forceFullItemPositions && scrollForNextCalculateItemsInView) {
+    if (enableScrollForNextCalculateItemsInView && !suppressInitialScrollSideEffects && !dataChanged && !forceFullItemPositions && scrollForNextCalculateItemsInView) {
       const { top, bottom } = scrollForNextCalculateItemsInView;
       if (top === null && bottom === null) {
         state.scrollForNextCalculateItemsInView = void 0;
@@ -5383,7 +5383,7 @@ function calculateItemsInView(ctx, params = {}) {
             state.containerItemTypes.set(containerIndex, requiredItemTypes[idx]);
           }
           containerItemKeys.set(id, containerIndex);
-          (_o = state.userScrollAnchorResetKeys) == null ? void 0 : _o.add(id);
+          (_o = state.userScrollAnchorReset) == null ? void 0 : _o.keys.add(id);
           const containerSticky = `containerSticky${containerIndex}`;
           const isSticky = stickyHeaderIndicesSet.has(i);
           const isAlwaysRender = alwaysRenderSet.has(i);
@@ -5411,13 +5411,17 @@ function calculateItemsInView(ctx, params = {}) {
           }
         }
       }
-      if (((_p = state.userScrollAnchorResetKeys) == null ? void 0 : _p.size) === 0) {
-        state.userScrollAnchorResetKeys = void 0;
+      if (state.userScrollAnchorReset) {
+        if (state.userScrollAnchorReset.keys.size === 0) {
+          state.userScrollAnchorReset = void 0;
+        } else {
+          state.userScrollAnchorReset.batchSize = state.userScrollAnchorReset.keys.size;
+        }
       }
       if (alwaysRenderArr.length > 0) {
         for (const index of alwaysRenderArr) {
           if (index < 0 || index >= dataLength) continue;
-          const id = (_q = idCache[index]) != null ? _q : getId(state, index);
+          const id = (_p = idCache[index]) != null ? _p : getId(state, index);
           const containerIndex = containerItemKeys.get(id);
           if (containerIndex !== void 0) {
             state.stickyContainerPool.add(containerIndex);
@@ -5871,37 +5875,42 @@ function updateContentInsetEndAdjustment(ctx, previousContentInsetEndAdjustment)
 // src/core/updateItemSize.ts
 function runOrScheduleMVCPRecalculate(ctx) {
+  var _a3, _b;
   const state = ctx.state;
-  if (state.userScrollAnchorResetKeys !== void 0) {
-    if (state.queuedMVCPRecalculate !== void 0) {
-      return;
-    }
-    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
-      var _a3;
-      state.queuedMVCPRecalculate = void 0;
+  if (state.userScrollAnchorReset !== void 0) {
+    const replacementBatchSize = (_a3 = state.userScrollAnchorReset.batchSize) != null ? _a3 : state.userScrollAnchorReset.keys.size;
+    const replacementMeasurementBatchThreshold = 3;
+    const shouldBatchReplacementMeasurements = replacementBatchSize > replacementMeasurementBatchThreshold;
+    if (shouldBatchReplacementMeasurements) {
+      if (state.queuedMVCPRecalculate === void 0) {
+        state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+          var _a4;
+          state.queuedMVCPRecalculate = void 0;
+          calculateItemsInView(ctx);
+          if (((_a4 = state.userScrollAnchorReset) == null ? void 0 : _a4.keys.size) === 0) {
+            state.userScrollAnchorReset = void 0;
+          }
+        });
+      }
+    } else {
       calculateItemsInView(ctx);
-      if (((_a3 = state.userScrollAnchorResetKeys) == null ? void 0 : _a3.size) === 0) {
-        state.userScrollAnchorResetKeys = void 0;
+      if (((_b = state.userScrollAnchorReset) == null ? void 0 : _b.keys.size) === 0) {
+        state.userScrollAnchorReset = void 0;
       }
-    });
-    return;
-  }
-  {
+    }
+  } else {
     if (!state.mvcpAnchorLock) {
       if (state.queuedMVCPRecalculate !== void 0) {
         cancelAnimationFrame(state.queuedMVCPRecalculate);
         state.queuedMVCPRecalculate = void 0;
       }
       calculateItemsInView(ctx, { doMVCP: true });
-      return;
-    }
-    if (state.queuedMVCPRecalculate !== void 0) {
-      return;
+    } else if (state.queuedMVCPRecalculate === void 0) {
+      state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+        state.queuedMVCPRecalculate = void 0;
+        calculateItemsInView(ctx, { doMVCP: true });
+      });
     }
-    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
-      state.queuedMVCPRecalculate = void 0;
-      calculateItemsInView(ctx, { doMVCP: true });
-    });
   }
 }
 function updateOtherAxisSizeIfNeeded(ctx, sizeObj, horizontal) {
@@ -5917,8 +5926,8 @@ function updateOtherAxisSizeIfNeeded(ctx, sizeObj, horizontal) {
 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 userScrollAnchorReset = state.userScrollAnchorReset;
+  const didMeasureUserScrollAnchorResetItem = !!(userScrollAnchorReset == null ? void 0 : userScrollAnchorReset.keys.delete(itemKey));
   const {
     didContainersLayout,
     sizesKnown,
@@ -5974,8 +5983,8 @@ function updateItemSize(ctx, itemKey, sizeObj) {
     if (needsRecalculate) {
       state.scrollForNextCalculateItemsInView = void 0;
       runOrScheduleMVCPRecalculate(ctx);
-    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorResetKeys == null ? void 0 : userScrollAnchorResetKeys.size) === 0) {
-      state.userScrollAnchorResetKeys = void 0;
+    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorReset == null ? void 0 : userScrollAnchorReset.keys.size) === 0) {
+      state.userScrollAnchorReset = void 0;
     }
     if (shouldMaintainScrollAtEnd) {
       if (maintainScrollAtEnd == null ? void 0 : maintainScrollAtEnd.onItemLayout) {
@@ -5985,7 +5994,7 @@ function updateItemSize(ctx, itemKey, sizeObj) {
   }
 }
 function updateOneItemSize(ctx, itemKey, sizeObj) {
-  var _a3;
+  var _a3, _b;
   const state = ctx.state;
   const {
     indexByKey,
@@ -5995,13 +6004,20 @@ function updateOneItemSize(ctx, itemKey, sizeObj) {
   } = state;
   if (!data) return 0;
   const index = indexByKey.get(itemKey);
-  const prevSize = getItemSize(ctx, itemKey, index, data[index]);
+  const itemData = data[index];
+  let itemType;
+  let fixedItemSize;
+  if (getFixedItemSize) {
+    itemType = getItemType ? (_a3 = getItemType(itemData, index)) != null ? _a3 : "" : "";
+    fixedItemSize = getFixedItemSize(itemData, index, itemType);
+  }
+  const prevSize = getItemSize(ctx, itemKey, index, itemData);
   const rawSize = horizontal ? sizeObj.width : sizeObj.height;
-  const size = Math.round(rawSize) ;
   const prevSizeKnown = sizesKnown.get(itemKey);
+  const size = Math.round(rawSize) ;
   sizesKnown.set(itemKey, size);
-  if (!getFixedItemSize && size > 0) {
-    const itemType = getItemType ? (_a3 = getItemType(data[index], index)) != null ? _a3 : "" : "";
+  if (fixedItemSize === void 0 && size > 0) {
+    itemType != null ? itemType : itemType = getItemType ? (_b = getItemType(itemData, index)) != null ? _b : "" : "";
     let averages = averageSizes[itemType];
     if (!averages) {
       averages = averageSizes[itemType] = { avg: 0, num: 0 };
@@ -7000,6 +7016,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     });
     state.viewabilityConfigCallbackPairs = viewability;
     state.enableScrollForNextCalculateItemsInView = !viewability;
+    if (viewability) {
+      state.scrollForNextCalculateItemsInView = void 0;
+    }
   }, [viewabilityConfig, viewabilityConfigCallbackPairs, onViewableItemsChanged]);
   useInit(() => {
   });

package/react-native.web.mjs CHANGED Viewed

@@ -3085,7 +3085,7 @@ function updateScroll(ctx, newScroll, forceUpdate, options) {
     if (scrollLength > 0 && scrollingTo === void 0 && scrollDelta > scrollLength && !state.pendingNativeMVCPAdjust) {
       state.mvcpAnchorLock = void 0;
       state.pendingNativeMVCPAdjust = void 0;
-      state.userScrollAnchorResetKeys = /* @__PURE__ */ new Set();
+      state.userScrollAnchorReset = { keys: /* @__PURE__ */ new Set() };
       if (state.queuedMVCPRecalculate !== void 0) {
         cancelAnimationFrame(state.queuedMVCPRecalculate);
         state.queuedMVCPRecalculate = void 0;
@@ -5048,7 +5048,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, _q;
+    var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const {
       columns,
       containerItemKeys,
@@ -5143,7 +5143,7 @@ function calculateItemsInView(ctx, params = {}) {
       scrollBottomBuffered = scrollBottom + scrollBufferBottom;
     };
     updateScrollRange();
-    if (!suppressInitialScrollSideEffects && !dataChanged && !forceFullItemPositions && scrollForNextCalculateItemsInView) {
+    if (enableScrollForNextCalculateItemsInView && !suppressInitialScrollSideEffects && !dataChanged && !forceFullItemPositions && scrollForNextCalculateItemsInView) {
       const { top, bottom } = scrollForNextCalculateItemsInView;
       if (top === null && bottom === null) {
         state.scrollForNextCalculateItemsInView = void 0;
@@ -5362,7 +5362,7 @@ function calculateItemsInView(ctx, params = {}) {
             state.containerItemTypes.set(containerIndex, requiredItemTypes[idx]);
           }
           containerItemKeys.set(id, containerIndex);
-          (_o = state.userScrollAnchorResetKeys) == null ? void 0 : _o.add(id);
+          (_o = state.userScrollAnchorReset) == null ? void 0 : _o.keys.add(id);
           const containerSticky = `containerSticky${containerIndex}`;
           const isSticky = stickyHeaderIndicesSet.has(i);
           const isAlwaysRender = alwaysRenderSet.has(i);
@@ -5390,13 +5390,17 @@ function calculateItemsInView(ctx, params = {}) {
           }
         }
       }
-      if (((_p = state.userScrollAnchorResetKeys) == null ? void 0 : _p.size) === 0) {
-        state.userScrollAnchorResetKeys = void 0;
+      if (state.userScrollAnchorReset) {
+        if (state.userScrollAnchorReset.keys.size === 0) {
+          state.userScrollAnchorReset = void 0;
+        } else {
+          state.userScrollAnchorReset.batchSize = state.userScrollAnchorReset.keys.size;
+        }
       }
       if (alwaysRenderArr.length > 0) {
         for (const index of alwaysRenderArr) {
           if (index < 0 || index >= dataLength) continue;
-          const id = (_q = idCache[index]) != null ? _q : getId(state, index);
+          const id = (_p = idCache[index]) != null ? _p : getId(state, index);
           const containerIndex = containerItemKeys.get(id);
           if (containerIndex !== void 0) {
             state.stickyContainerPool.add(containerIndex);
@@ -5850,37 +5854,42 @@ function updateContentInsetEndAdjustment(ctx, previousContentInsetEndAdjustment)
 // src/core/updateItemSize.ts
 function runOrScheduleMVCPRecalculate(ctx) {
+  var _a3, _b;
   const state = ctx.state;
-  if (state.userScrollAnchorResetKeys !== void 0) {
-    if (state.queuedMVCPRecalculate !== void 0) {
-      return;
-    }
-    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
-      var _a3;
-      state.queuedMVCPRecalculate = void 0;
+  if (state.userScrollAnchorReset !== void 0) {
+    const replacementBatchSize = (_a3 = state.userScrollAnchorReset.batchSize) != null ? _a3 : state.userScrollAnchorReset.keys.size;
+    const replacementMeasurementBatchThreshold = 3;
+    const shouldBatchReplacementMeasurements = replacementBatchSize > replacementMeasurementBatchThreshold;
+    if (shouldBatchReplacementMeasurements) {
+      if (state.queuedMVCPRecalculate === void 0) {
+        state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+          var _a4;
+          state.queuedMVCPRecalculate = void 0;
+          calculateItemsInView(ctx);
+          if (((_a4 = state.userScrollAnchorReset) == null ? void 0 : _a4.keys.size) === 0) {
+            state.userScrollAnchorReset = void 0;
+          }
+        });
+      }
+    } else {
       calculateItemsInView(ctx);
-      if (((_a3 = state.userScrollAnchorResetKeys) == null ? void 0 : _a3.size) === 0) {
-        state.userScrollAnchorResetKeys = void 0;
+      if (((_b = state.userScrollAnchorReset) == null ? void 0 : _b.keys.size) === 0) {
+        state.userScrollAnchorReset = void 0;
       }
-    });
-    return;
-  }
-  {
+    }
+  } else {
     if (!state.mvcpAnchorLock) {
       if (state.queuedMVCPRecalculate !== void 0) {
         cancelAnimationFrame(state.queuedMVCPRecalculate);
         state.queuedMVCPRecalculate = void 0;
       }
       calculateItemsInView(ctx, { doMVCP: true });
-      return;
-    }
-    if (state.queuedMVCPRecalculate !== void 0) {
-      return;
+    } else if (state.queuedMVCPRecalculate === void 0) {
+      state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+        state.queuedMVCPRecalculate = void 0;
+        calculateItemsInView(ctx, { doMVCP: true });
+      });
     }
-    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
-      state.queuedMVCPRecalculate = void 0;
-      calculateItemsInView(ctx, { doMVCP: true });
-    });
   }
 }
 function updateOtherAxisSizeIfNeeded(ctx, sizeObj, horizontal) {
@@ -5896,8 +5905,8 @@ function updateOtherAxisSizeIfNeeded(ctx, sizeObj, horizontal) {
 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 userScrollAnchorReset = state.userScrollAnchorReset;
+  const didMeasureUserScrollAnchorResetItem = !!(userScrollAnchorReset == null ? void 0 : userScrollAnchorReset.keys.delete(itemKey));
   const {
     didContainersLayout,
     sizesKnown,
@@ -5953,8 +5962,8 @@ function updateItemSize(ctx, itemKey, sizeObj) {
     if (needsRecalculate) {
       state.scrollForNextCalculateItemsInView = void 0;
       runOrScheduleMVCPRecalculate(ctx);
-    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorResetKeys == null ? void 0 : userScrollAnchorResetKeys.size) === 0) {
-      state.userScrollAnchorResetKeys = void 0;
+    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorReset == null ? void 0 : userScrollAnchorReset.keys.size) === 0) {
+      state.userScrollAnchorReset = void 0;
     }
     if (shouldMaintainScrollAtEnd) {
       if (maintainScrollAtEnd == null ? void 0 : maintainScrollAtEnd.onItemLayout) {
@@ -5964,7 +5973,7 @@ function updateItemSize(ctx, itemKey, sizeObj) {
   }
 }
 function updateOneItemSize(ctx, itemKey, sizeObj) {
-  var _a3;
+  var _a3, _b;
   const state = ctx.state;
   const {
     indexByKey,
@@ -5974,13 +5983,20 @@ function updateOneItemSize(ctx, itemKey, sizeObj) {
   } = state;
   if (!data) return 0;
   const index = indexByKey.get(itemKey);
-  const prevSize = getItemSize(ctx, itemKey, index, data[index]);
+  const itemData = data[index];
+  let itemType;
+  let fixedItemSize;
+  if (getFixedItemSize) {
+    itemType = getItemType ? (_a3 = getItemType(itemData, index)) != null ? _a3 : "" : "";
+    fixedItemSize = getFixedItemSize(itemData, index, itemType);
+  }
+  const prevSize = getItemSize(ctx, itemKey, index, itemData);
   const rawSize = horizontal ? sizeObj.width : sizeObj.height;
-  const size = Math.round(rawSize) ;
   const prevSizeKnown = sizesKnown.get(itemKey);
+  const size = Math.round(rawSize) ;
   sizesKnown.set(itemKey, size);
-  if (!getFixedItemSize && size > 0) {
-    const itemType = getItemType ? (_a3 = getItemType(data[index], index)) != null ? _a3 : "" : "";
+  if (fixedItemSize === void 0 && size > 0) {
+    itemType != null ? itemType : itemType = getItemType ? (_b = getItemType(itemData, index)) != null ? _b : "" : "";
     let averages = averageSizes[itemType];
     if (!averages) {
       averages = averageSizes[itemType] = { avg: 0, num: 0 };
@@ -6979,6 +6995,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     });
     state.viewabilityConfigCallbackPairs = viewability;
     state.enableScrollForNextCalculateItemsInView = !viewability;
+    if (viewability) {
+      state.scrollForNextCalculateItemsInView = void 0;
+    }
   }, [viewabilityConfig, viewabilityConfigCallbackPairs, onViewableItemsChanged]);
   useInit(() => {
   });

package/react.js CHANGED Viewed

@@ -3106,7 +3106,7 @@ function updateScroll(ctx, newScroll, forceUpdate, options) {
     if (scrollLength > 0 && scrollingTo === void 0 && scrollDelta > scrollLength && !state.pendingNativeMVCPAdjust) {
       state.mvcpAnchorLock = void 0;
       state.pendingNativeMVCPAdjust = void 0;
-      state.userScrollAnchorResetKeys = /* @__PURE__ */ new Set();
+      state.userScrollAnchorReset = { keys: /* @__PURE__ */ new Set() };
       if (state.queuedMVCPRecalculate !== void 0) {
         cancelAnimationFrame(state.queuedMVCPRecalculate);
         state.queuedMVCPRecalculate = void 0;
@@ -5069,7 +5069,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, _q;
+    var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const {
       columns,
       containerItemKeys,
@@ -5164,7 +5164,7 @@ function calculateItemsInView(ctx, params = {}) {
       scrollBottomBuffered = scrollBottom + scrollBufferBottom;
     };
     updateScrollRange();
-    if (!suppressInitialScrollSideEffects && !dataChanged && !forceFullItemPositions && scrollForNextCalculateItemsInView) {
+    if (enableScrollForNextCalculateItemsInView && !suppressInitialScrollSideEffects && !dataChanged && !forceFullItemPositions && scrollForNextCalculateItemsInView) {
       const { top, bottom } = scrollForNextCalculateItemsInView;
       if (top === null && bottom === null) {
         state.scrollForNextCalculateItemsInView = void 0;
@@ -5383,7 +5383,7 @@ function calculateItemsInView(ctx, params = {}) {
             state.containerItemTypes.set(containerIndex, requiredItemTypes[idx]);
           }
           containerItemKeys.set(id, containerIndex);
-          (_o = state.userScrollAnchorResetKeys) == null ? void 0 : _o.add(id);
+          (_o = state.userScrollAnchorReset) == null ? void 0 : _o.keys.add(id);
           const containerSticky = `containerSticky${containerIndex}`;
           const isSticky = stickyHeaderIndicesSet.has(i);
           const isAlwaysRender = alwaysRenderSet.has(i);
@@ -5411,13 +5411,17 @@ function calculateItemsInView(ctx, params = {}) {
           }
         }
       }
-      if (((_p = state.userScrollAnchorResetKeys) == null ? void 0 : _p.size) === 0) {
-        state.userScrollAnchorResetKeys = void 0;
+      if (state.userScrollAnchorReset) {
+        if (state.userScrollAnchorReset.keys.size === 0) {
+          state.userScrollAnchorReset = void 0;
+        } else {
+          state.userScrollAnchorReset.batchSize = state.userScrollAnchorReset.keys.size;
+        }
       }
       if (alwaysRenderArr.length > 0) {
         for (const index of alwaysRenderArr) {
           if (index < 0 || index >= dataLength) continue;
-          const id = (_q = idCache[index]) != null ? _q : getId(state, index);
+          const id = (_p = idCache[index]) != null ? _p : getId(state, index);
           const containerIndex = containerItemKeys.get(id);
           if (containerIndex !== void 0) {
             state.stickyContainerPool.add(containerIndex);
@@ -5871,37 +5875,42 @@ function updateContentInsetEndAdjustment(ctx, previousContentInsetEndAdjustment)
 // src/core/updateItemSize.ts
 function runOrScheduleMVCPRecalculate(ctx) {
+  var _a3, _b;
   const state = ctx.state;
-  if (state.userScrollAnchorResetKeys !== void 0) {
-    if (state.queuedMVCPRecalculate !== void 0) {
-      return;
-    }
-    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
-      var _a3;
-      state.queuedMVCPRecalculate = void 0;
+  if (state.userScrollAnchorReset !== void 0) {
+    const replacementBatchSize = (_a3 = state.userScrollAnchorReset.batchSize) != null ? _a3 : state.userScrollAnchorReset.keys.size;
+    const replacementMeasurementBatchThreshold = 3;
+    const shouldBatchReplacementMeasurements = replacementBatchSize > replacementMeasurementBatchThreshold;
+    if (shouldBatchReplacementMeasurements) {
+      if (state.queuedMVCPRecalculate === void 0) {
+        state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+          var _a4;
+          state.queuedMVCPRecalculate = void 0;
+          calculateItemsInView(ctx);
+          if (((_a4 = state.userScrollAnchorReset) == null ? void 0 : _a4.keys.size) === 0) {
+            state.userScrollAnchorReset = void 0;
+          }
+        });
+      }
+    } else {
       calculateItemsInView(ctx);
-      if (((_a3 = state.userScrollAnchorResetKeys) == null ? void 0 : _a3.size) === 0) {
-        state.userScrollAnchorResetKeys = void 0;
+      if (((_b = state.userScrollAnchorReset) == null ? void 0 : _b.keys.size) === 0) {
+        state.userScrollAnchorReset = void 0;
       }
-    });
-    return;
-  }
-  {
+    }
+  } else {
     if (!state.mvcpAnchorLock) {
       if (state.queuedMVCPRecalculate !== void 0) {
         cancelAnimationFrame(state.queuedMVCPRecalculate);
         state.queuedMVCPRecalculate = void 0;
       }
       calculateItemsInView(ctx, { doMVCP: true });
-      return;
-    }
-    if (state.queuedMVCPRecalculate !== void 0) {
-      return;
+    } else if (state.queuedMVCPRecalculate === void 0) {
+      state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+        state.queuedMVCPRecalculate = void 0;
+        calculateItemsInView(ctx, { doMVCP: true });
+      });
     }
-    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
-      state.queuedMVCPRecalculate = void 0;
-      calculateItemsInView(ctx, { doMVCP: true });
-    });
   }
 }
 function updateOtherAxisSizeIfNeeded(ctx, sizeObj, horizontal) {
@@ -5917,8 +5926,8 @@ function updateOtherAxisSizeIfNeeded(ctx, sizeObj, horizontal) {
 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 userScrollAnchorReset = state.userScrollAnchorReset;
+  const didMeasureUserScrollAnchorResetItem = !!(userScrollAnchorReset == null ? void 0 : userScrollAnchorReset.keys.delete(itemKey));
   const {
     didContainersLayout,
     sizesKnown,
@@ -5974,8 +5983,8 @@ function updateItemSize(ctx, itemKey, sizeObj) {
     if (needsRecalculate) {
       state.scrollForNextCalculateItemsInView = void 0;
       runOrScheduleMVCPRecalculate(ctx);
-    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorResetKeys == null ? void 0 : userScrollAnchorResetKeys.size) === 0) {
-      state.userScrollAnchorResetKeys = void 0;
+    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorReset == null ? void 0 : userScrollAnchorReset.keys.size) === 0) {
+      state.userScrollAnchorReset = void 0;
     }
     if (shouldMaintainScrollAtEnd) {
       if (maintainScrollAtEnd == null ? void 0 : maintainScrollAtEnd.onItemLayout) {
@@ -5985,7 +5994,7 @@ function updateItemSize(ctx, itemKey, sizeObj) {
   }
 }
 function updateOneItemSize(ctx, itemKey, sizeObj) {
-  var _a3;
+  var _a3, _b;
   const state = ctx.state;
   const {
     indexByKey,
@@ -5995,13 +6004,20 @@ function updateOneItemSize(ctx, itemKey, sizeObj) {
   } = state;
   if (!data) return 0;
   const index = indexByKey.get(itemKey);
-  const prevSize = getItemSize(ctx, itemKey, index, data[index]);
+  const itemData = data[index];
+  let itemType;
+  let fixedItemSize;
+  if (getFixedItemSize) {
+    itemType = getItemType ? (_a3 = getItemType(itemData, index)) != null ? _a3 : "" : "";
+    fixedItemSize = getFixedItemSize(itemData, index, itemType);
+  }
+  const prevSize = getItemSize(ctx, itemKey, index, itemData);
   const rawSize = horizontal ? sizeObj.width : sizeObj.height;
-  const size = Math.round(rawSize) ;
   const prevSizeKnown = sizesKnown.get(itemKey);
+  const size = Math.round(rawSize) ;
   sizesKnown.set(itemKey, size);
-  if (!getFixedItemSize && size > 0) {
-    const itemType = getItemType ? (_a3 = getItemType(data[index], index)) != null ? _a3 : "" : "";
+  if (fixedItemSize === void 0 && size > 0) {
+    itemType != null ? itemType : itemType = getItemType ? (_b = getItemType(itemData, index)) != null ? _b : "" : "";
     let averages = averageSizes[itemType];
     if (!averages) {
       averages = averageSizes[itemType] = { avg: 0, num: 0 };
@@ -7000,6 +7016,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     });
     state.viewabilityConfigCallbackPairs = viewability;
     state.enableScrollForNextCalculateItemsInView = !viewability;
+    if (viewability) {
+      state.scrollForNextCalculateItemsInView = void 0;
+    }
   }, [viewabilityConfig, viewabilityConfigCallbackPairs, onViewableItemsChanged]);
   useInit(() => {
   });

package/react.mjs CHANGED Viewed

@@ -3085,7 +3085,7 @@ function updateScroll(ctx, newScroll, forceUpdate, options) {
     if (scrollLength > 0 && scrollingTo === void 0 && scrollDelta > scrollLength && !state.pendingNativeMVCPAdjust) {
       state.mvcpAnchorLock = void 0;
       state.pendingNativeMVCPAdjust = void 0;
-      state.userScrollAnchorResetKeys = /* @__PURE__ */ new Set();
+      state.userScrollAnchorReset = { keys: /* @__PURE__ */ new Set() };
       if (state.queuedMVCPRecalculate !== void 0) {
         cancelAnimationFrame(state.queuedMVCPRecalculate);
         state.queuedMVCPRecalculate = void 0;
@@ -5048,7 +5048,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, _q;
+    var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const {
       columns,
       containerItemKeys,
@@ -5143,7 +5143,7 @@ function calculateItemsInView(ctx, params = {}) {
       scrollBottomBuffered = scrollBottom + scrollBufferBottom;
     };
     updateScrollRange();
-    if (!suppressInitialScrollSideEffects && !dataChanged && !forceFullItemPositions && scrollForNextCalculateItemsInView) {
+    if (enableScrollForNextCalculateItemsInView && !suppressInitialScrollSideEffects && !dataChanged && !forceFullItemPositions && scrollForNextCalculateItemsInView) {
       const { top, bottom } = scrollForNextCalculateItemsInView;
       if (top === null && bottom === null) {
         state.scrollForNextCalculateItemsInView = void 0;
@@ -5362,7 +5362,7 @@ function calculateItemsInView(ctx, params = {}) {
             state.containerItemTypes.set(containerIndex, requiredItemTypes[idx]);
           }
           containerItemKeys.set(id, containerIndex);
-          (_o = state.userScrollAnchorResetKeys) == null ? void 0 : _o.add(id);
+          (_o = state.userScrollAnchorReset) == null ? void 0 : _o.keys.add(id);
           const containerSticky = `containerSticky${containerIndex}`;
           const isSticky = stickyHeaderIndicesSet.has(i);
           const isAlwaysRender = alwaysRenderSet.has(i);
@@ -5390,13 +5390,17 @@ function calculateItemsInView(ctx, params = {}) {
           }
         }
       }
-      if (((_p = state.userScrollAnchorResetKeys) == null ? void 0 : _p.size) === 0) {
-        state.userScrollAnchorResetKeys = void 0;
+      if (state.userScrollAnchorReset) {
+        if (state.userScrollAnchorReset.keys.size === 0) {
+          state.userScrollAnchorReset = void 0;
+        } else {
+          state.userScrollAnchorReset.batchSize = state.userScrollAnchorReset.keys.size;
+        }
       }
       if (alwaysRenderArr.length > 0) {
         for (const index of alwaysRenderArr) {
           if (index < 0 || index >= dataLength) continue;
-          const id = (_q = idCache[index]) != null ? _q : getId(state, index);
+          const id = (_p = idCache[index]) != null ? _p : getId(state, index);
           const containerIndex = containerItemKeys.get(id);
           if (containerIndex !== void 0) {
             state.stickyContainerPool.add(containerIndex);
@@ -5850,37 +5854,42 @@ function updateContentInsetEndAdjustment(ctx, previousContentInsetEndAdjustment)
 // src/core/updateItemSize.ts
 function runOrScheduleMVCPRecalculate(ctx) {
+  var _a3, _b;
   const state = ctx.state;
-  if (state.userScrollAnchorResetKeys !== void 0) {
-    if (state.queuedMVCPRecalculate !== void 0) {
-      return;
-    }
-    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
-      var _a3;
-      state.queuedMVCPRecalculate = void 0;
+  if (state.userScrollAnchorReset !== void 0) {
+    const replacementBatchSize = (_a3 = state.userScrollAnchorReset.batchSize) != null ? _a3 : state.userScrollAnchorReset.keys.size;
+    const replacementMeasurementBatchThreshold = 3;
+    const shouldBatchReplacementMeasurements = replacementBatchSize > replacementMeasurementBatchThreshold;
+    if (shouldBatchReplacementMeasurements) {
+      if (state.queuedMVCPRecalculate === void 0) {
+        state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+          var _a4;
+          state.queuedMVCPRecalculate = void 0;
+          calculateItemsInView(ctx);
+          if (((_a4 = state.userScrollAnchorReset) == null ? void 0 : _a4.keys.size) === 0) {
+            state.userScrollAnchorReset = void 0;
+          }
+        });
+      }
+    } else {
       calculateItemsInView(ctx);
-      if (((_a3 = state.userScrollAnchorResetKeys) == null ? void 0 : _a3.size) === 0) {
-        state.userScrollAnchorResetKeys = void 0;
+      if (((_b = state.userScrollAnchorReset) == null ? void 0 : _b.keys.size) === 0) {
+        state.userScrollAnchorReset = void 0;
       }
-    });
-    return;
-  }
-  {
+    }
+  } else {
     if (!state.mvcpAnchorLock) {
       if (state.queuedMVCPRecalculate !== void 0) {
         cancelAnimationFrame(state.queuedMVCPRecalculate);
         state.queuedMVCPRecalculate = void 0;
       }
       calculateItemsInView(ctx, { doMVCP: true });
-      return;
-    }
-    if (state.queuedMVCPRecalculate !== void 0) {
-      return;
+    } else if (state.queuedMVCPRecalculate === void 0) {
+      state.queuedMVCPRecalculate = requestAnimationFrame(() => {
+        state.queuedMVCPRecalculate = void 0;
+        calculateItemsInView(ctx, { doMVCP: true });
+      });
     }
-    state.queuedMVCPRecalculate = requestAnimationFrame(() => {
-      state.queuedMVCPRecalculate = void 0;
-      calculateItemsInView(ctx, { doMVCP: true });
-    });
   }
 }
 function updateOtherAxisSizeIfNeeded(ctx, sizeObj, horizontal) {
@@ -5896,8 +5905,8 @@ function updateOtherAxisSizeIfNeeded(ctx, sizeObj, horizontal) {
 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 userScrollAnchorReset = state.userScrollAnchorReset;
+  const didMeasureUserScrollAnchorResetItem = !!(userScrollAnchorReset == null ? void 0 : userScrollAnchorReset.keys.delete(itemKey));
   const {
     didContainersLayout,
     sizesKnown,
@@ -5953,8 +5962,8 @@ function updateItemSize(ctx, itemKey, sizeObj) {
     if (needsRecalculate) {
       state.scrollForNextCalculateItemsInView = void 0;
       runOrScheduleMVCPRecalculate(ctx);
-    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorResetKeys == null ? void 0 : userScrollAnchorResetKeys.size) === 0) {
-      state.userScrollAnchorResetKeys = void 0;
+    } else if (didMeasureUserScrollAnchorResetItem && (userScrollAnchorReset == null ? void 0 : userScrollAnchorReset.keys.size) === 0) {
+      state.userScrollAnchorReset = void 0;
     }
     if (shouldMaintainScrollAtEnd) {
       if (maintainScrollAtEnd == null ? void 0 : maintainScrollAtEnd.onItemLayout) {
@@ -5964,7 +5973,7 @@ function updateItemSize(ctx, itemKey, sizeObj) {
   }
 }
 function updateOneItemSize(ctx, itemKey, sizeObj) {
-  var _a3;
+  var _a3, _b;
   const state = ctx.state;
   const {
     indexByKey,
@@ -5974,13 +5983,20 @@ function updateOneItemSize(ctx, itemKey, sizeObj) {
   } = state;
   if (!data) return 0;
   const index = indexByKey.get(itemKey);
-  const prevSize = getItemSize(ctx, itemKey, index, data[index]);
+  const itemData = data[index];
+  let itemType;
+  let fixedItemSize;
+  if (getFixedItemSize) {
+    itemType = getItemType ? (_a3 = getItemType(itemData, index)) != null ? _a3 : "" : "";
+    fixedItemSize = getFixedItemSize(itemData, index, itemType);
+  }
+  const prevSize = getItemSize(ctx, itemKey, index, itemData);
   const rawSize = horizontal ? sizeObj.width : sizeObj.height;
-  const size = Math.round(rawSize) ;
   const prevSizeKnown = sizesKnown.get(itemKey);
+  const size = Math.round(rawSize) ;
   sizesKnown.set(itemKey, size);
-  if (!getFixedItemSize && size > 0) {
-    const itemType = getItemType ? (_a3 = getItemType(data[index], index)) != null ? _a3 : "" : "";
+  if (fixedItemSize === void 0 && size > 0) {
+    itemType != null ? itemType : itemType = getItemType ? (_b = getItemType(itemData, index)) != null ? _b : "" : "";
     let averages = averageSizes[itemType];
     if (!averages) {
       averages = averageSizes[itemType] = { avg: 0, num: 0 };
@@ -6979,6 +6995,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     });
     state.viewabilityConfigCallbackPairs = viewability;
     state.enableScrollForNextCalculateItemsInView = !viewability;
+    if (viewability) {
+      state.scrollForNextCalculateItemsInView = void 0;
+    }
   }, [viewabilityConfig, viewabilityConfigCallbackPairs, onViewableItemsChanged]);
   useInit(() => {
   });