@legendapp/list 3.0.0-beta.16 → 3.0.0-beta.18

package/index.js

@@ -1403,7 +1403,7 @@ function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize) {
     }
   }
   if (getFixedItemSize) {
-    size = getFixedItemSize(index, data, itemType);
+    size = getFixedItemSize(data, index, itemType);
     if (size !== void 0) {
       sizesKnown.set(key, size);
     }
@@ -1421,7 +1421,7 @@ function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize) {
     }
   }
   if (size === void 0) {
-    size = getEstimatedItemSize ? getEstimatedItemSize(index, data, itemType) : estimatedItemSize;
+    size = getEstimatedItemSize ? getEstimatedItemSize(data, index, itemType) : estimatedItemSize;
   }
   setSize(ctx, key, size);
   return size;
@@ -1592,7 +1592,7 @@ function scrollTo(ctx, params) {
 
 // src/utils/checkThreshold.ts
 var HYSTERESIS_MULTIPLIER = 1.3;
-var checkThreshold = (distance, atThreshold, threshold, wasReached, snapshot, context, onReached, setSnapshot) => {
+var checkThreshold = (distance, atThreshold, threshold, wasReached, snapshot, context, onReached, setSnapshot, allowReentryOnChange) => {
   const absDistance = Math.abs(distance);
   const within = atThreshold || threshold > 0 && absDistance <= threshold;
   if (wasReached === null) {
@@ -1602,7 +1602,7 @@ var checkThreshold = (distance, atThreshold, threshold, wasReached, snapshot, co
     return null;
   }
   const updateSnapshot = () => {
-    setSnapshot == null ? void 0 : setSnapshot({
+    setSnapshot({
       atThreshold,
       contentSize: context.contentSize,
       dataLength: context.dataLength,
@@ -1613,19 +1613,21 @@ var checkThreshold = (distance, atThreshold, threshold, wasReached, snapshot, co
     if (!within) {
       return false;
     }
-    onReached == null ? void 0 : onReached(distance);
+    onReached(distance);
     updateSnapshot();
     return true;
   }
   const reset = !atThreshold && threshold > 0 && absDistance >= threshold * HYSTERESIS_MULTIPLIER || !atThreshold && threshold <= 0 && absDistance > 0;
   if (reset) {
-    setSnapshot == null ? void 0 : setSnapshot(void 0);
+    setSnapshot(void 0);
     return false;
   }
   if (within) {
     const changed = !snapshot || snapshot.atThreshold !== atThreshold || snapshot.contentSize !== context.contentSize || snapshot.dataLength !== context.dataLength;
     if (changed) {
-      onReached == null ? void 0 : onReached(distance);
+      if (allowReentryOnChange) {
+        onReached(distance);
+      }
       updateSnapshot();
     }
   }
@@ -1668,7 +1670,8 @@ function checkAtBottom(ctx) {
       },
       (snapshot) => {
         state.endReachedSnapshot = snapshot;
-      }
+      },
+      true
     );
   }
 }
@@ -1703,7 +1706,8 @@ function checkAtTop(state) {
     },
     (snapshot) => {
       state.startReachedSnapshot = snapshot;
-    }
+    },
+    false
   );
 }
 
@@ -1782,7 +1786,7 @@ function prepareMVCP(ctx, dataChanged) {
   const state = ctx.state;
   const { idsInView, positions, props } = state;
   const {
-    maintainVisibleContentPosition: { data: mvcpData, size: mvcpScroll }
+    maintainVisibleContentPosition: { data: mvcpData, size: mvcpScroll, shouldRestorePosition }
   } = props;
   const scrollingTo = state.scrollingTo;
   let prevPosition;
@@ -1814,8 +1818,16 @@ function prepareMVCP(ctx, dataChanged) {
     return () => {
       let positionDiff = 0;
       if (dataChanged && targetId === void 0 && mvcpData) {
+        const data = state.props.data;
         for (let i = 0; i < idsInViewWithPositions.length; i++) {
           const { id, position } = idsInViewWithPositions[i];
+          const index = indexByKey.get(id);
+          if (index !== void 0 && shouldRestorePosition) {
+            const item = data[index];
+            if (item === void 0 || !shouldRestorePosition(item, index, data)) {
+              continue;
+            }
+          }
           const newPosition = positions.get(id);
           if (newPosition !== void 0) {
             positionDiff = newPosition - position;
@@ -2471,9 +2483,13 @@ function setDidLayout(ctx) {
       onLoad({ elapsedTimeInMs: Date.now() - loadStartTime });
     }
   };
-  {
-    setIt();
+  if ((initialScroll == null ? void 0 : initialScroll.index) !== void 0) {
+    const target = initialScroll;
+    const runScroll = () => scrollToIndex(ctx, { ...target, animated: false });
+    runScroll();
+    requestAnimationFrame(runScroll);
   }
+  setIt();
 }
 
 // src/core/calculateItemsInView.ts
@@ -3080,7 +3096,7 @@ function doInitialAllocateContainers(ctx) {
         const item = data[i];
         if (item !== void 0) {
           const itemType = (_a3 = getItemType == null ? void 0 : getItemType(item, i)) != null ? _a3 : "";
-          totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(i, item, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(i, item, itemType)) != null ? _c : estimatedItemSize;
+          totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(item, i, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(item, i, itemType)) != null ? _c : estimatedItemSize;
         }
       }
       averageItemSize = totalSize / num;
@@ -3267,7 +3283,7 @@ function updateItemSize(ctx, itemKey, sizeObj) {
       return;
     }
     const type = getItemType ? (_a3 = getItemType(itemData, index)) != null ? _a3 : "" : "";
-    const size2 = getFixedItemSize(index, itemData, type);
+    const size2 = getFixedItemSize(itemData, index, type);
     if (size2 !== void 0 && size2 === sizesKnown.get(itemKey)) {
       return;
     }
@@ -3546,7 +3562,8 @@ function normalizeMaintainVisibleContentPosition(value) {
   if (value && typeof value === "object") {
     return {
       data: (_a3 = value.data) != null ? _a3 : false,
-      size: (_b = value.size) != null ? _b : true
+      size: (_b = value.size) != null ? _b : true,
+      shouldRestorePosition: value.shouldRestorePosition
     };
   }
   if (value === false) {
@@ -3691,7 +3708,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     maintainVisibleContentPositionProp
   );
   const [renderNum, setRenderNum] = React3.useState(0);
-  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? { index: initialScrollIndexProp.index || 0, viewOffset: initialScrollIndexProp.viewOffset || 0 } : { index: initialScrollIndexProp || 0, viewOffset: initialScrollOffsetProp || 0 } : void 0;
+  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState, viewPosition: 1 } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? { index: initialScrollIndexProp.index || 0, viewOffset: initialScrollIndexProp.viewOffset || 0 } : { index: initialScrollIndexProp || 0, viewOffset: initialScrollOffsetProp || 0 } : void 0;
   const [canRender, setCanRender] = React3__namespace.useState(!IsNewArchitecture);
   const ctx = useStateContext();
   ctx.columnWrapperStyle = columnWrapperStyle || (contentContainerStyle ? createColumnWrapperStyle(contentContainerStyle) : void 0);
@@ -3905,8 +3922,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
   }, []);
   const doInitialScroll = React3.useCallback(() => {
-    const initialScroll = state.initialScroll;
-    if (initialScroll) {
+    const { initialScroll, didFinishInitialScroll, queuedInitialLayout, scrollingTo } = state;
+    if (initialScroll && !queuedInitialLayout && !didFinishInitialScroll && !scrollingTo) {
       scrollTo(ctx, {
         animated: false,
         index: initialScroll == null ? void 0 : initialScroll.index,
@@ -4026,6 +4043,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
 });
 
 exports.LegendList = LegendList;
+exports.typedForwardRef = typedForwardRef;
+exports.typedMemo = typedMemo;
 exports.useIsLastItem = useIsLastItem;
 exports.useListScrollSize = useListScrollSize;
 exports.useRecyclingEffect = useRecyclingEffect;

package/index.mjs

@@ -1382,7 +1382,7 @@ function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize) {
     }
   }
   if (getFixedItemSize) {
-    size = getFixedItemSize(index, data, itemType);
+    size = getFixedItemSize(data, index, itemType);
     if (size !== void 0) {
       sizesKnown.set(key, size);
     }
@@ -1400,7 +1400,7 @@ function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize) {
     }
   }
   if (size === void 0) {
-    size = getEstimatedItemSize ? getEstimatedItemSize(index, data, itemType) : estimatedItemSize;
+    size = getEstimatedItemSize ? getEstimatedItemSize(data, index, itemType) : estimatedItemSize;
   }
   setSize(ctx, key, size);
   return size;
@@ -1571,7 +1571,7 @@ function scrollTo(ctx, params) {
 
 // src/utils/checkThreshold.ts
 var HYSTERESIS_MULTIPLIER = 1.3;
-var checkThreshold = (distance, atThreshold, threshold, wasReached, snapshot, context, onReached, setSnapshot) => {
+var checkThreshold = (distance, atThreshold, threshold, wasReached, snapshot, context, onReached, setSnapshot, allowReentryOnChange) => {
   const absDistance = Math.abs(distance);
   const within = atThreshold || threshold > 0 && absDistance <= threshold;
   if (wasReached === null) {
@@ -1581,7 +1581,7 @@ var checkThreshold = (distance, atThreshold, threshold, wasReached, snapshot, co
     return null;
   }
   const updateSnapshot = () => {
-    setSnapshot == null ? void 0 : setSnapshot({
+    setSnapshot({
       atThreshold,
       contentSize: context.contentSize,
       dataLength: context.dataLength,
@@ -1592,19 +1592,21 @@ var checkThreshold = (distance, atThreshold, threshold, wasReached, snapshot, co
     if (!within) {
       return false;
     }
-    onReached == null ? void 0 : onReached(distance);
+    onReached(distance);
     updateSnapshot();
     return true;
   }
   const reset = !atThreshold && threshold > 0 && absDistance >= threshold * HYSTERESIS_MULTIPLIER || !atThreshold && threshold <= 0 && absDistance > 0;
   if (reset) {
-    setSnapshot == null ? void 0 : setSnapshot(void 0);
+    setSnapshot(void 0);
     return false;
   }
   if (within) {
     const changed = !snapshot || snapshot.atThreshold !== atThreshold || snapshot.contentSize !== context.contentSize || snapshot.dataLength !== context.dataLength;
     if (changed) {
-      onReached == null ? void 0 : onReached(distance);
+      if (allowReentryOnChange) {
+        onReached(distance);
+      }
       updateSnapshot();
     }
   }
@@ -1647,7 +1649,8 @@ function checkAtBottom(ctx) {
       },
       (snapshot) => {
         state.endReachedSnapshot = snapshot;
-      }
+      },
+      true
     );
   }
 }
@@ -1682,7 +1685,8 @@ function checkAtTop(state) {
     },
     (snapshot) => {
       state.startReachedSnapshot = snapshot;
-    }
+    },
+    false
   );
 }
 
@@ -1761,7 +1765,7 @@ function prepareMVCP(ctx, dataChanged) {
   const state = ctx.state;
   const { idsInView, positions, props } = state;
   const {
-    maintainVisibleContentPosition: { data: mvcpData, size: mvcpScroll }
+    maintainVisibleContentPosition: { data: mvcpData, size: mvcpScroll, shouldRestorePosition }
   } = props;
   const scrollingTo = state.scrollingTo;
   let prevPosition;
@@ -1793,8 +1797,16 @@ function prepareMVCP(ctx, dataChanged) {
     return () => {
       let positionDiff = 0;
       if (dataChanged && targetId === void 0 && mvcpData) {
+        const data = state.props.data;
         for (let i = 0; i < idsInViewWithPositions.length; i++) {
           const { id, position } = idsInViewWithPositions[i];
+          const index = indexByKey.get(id);
+          if (index !== void 0 && shouldRestorePosition) {
+            const item = data[index];
+            if (item === void 0 || !shouldRestorePosition(item, index, data)) {
+              continue;
+            }
+          }
           const newPosition = positions.get(id);
           if (newPosition !== void 0) {
             positionDiff = newPosition - position;
@@ -2450,9 +2462,13 @@ function setDidLayout(ctx) {
       onLoad({ elapsedTimeInMs: Date.now() - loadStartTime });
     }
   };
-  {
-    setIt();
+  if ((initialScroll == null ? void 0 : initialScroll.index) !== void 0) {
+    const target = initialScroll;
+    const runScroll = () => scrollToIndex(ctx, { ...target, animated: false });
+    runScroll();
+    requestAnimationFrame(runScroll);
   }
+  setIt();
 }
 
 // src/core/calculateItemsInView.ts
@@ -3059,7 +3075,7 @@ function doInitialAllocateContainers(ctx) {
         const item = data[i];
         if (item !== void 0) {
           const itemType = (_a3 = getItemType == null ? void 0 : getItemType(item, i)) != null ? _a3 : "";
-          totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(i, item, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(i, item, itemType)) != null ? _c : estimatedItemSize;
+          totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(item, i, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(item, i, itemType)) != null ? _c : estimatedItemSize;
         }
       }
       averageItemSize = totalSize / num;
@@ -3246,7 +3262,7 @@ function updateItemSize(ctx, itemKey, sizeObj) {
       return;
     }
     const type = getItemType ? (_a3 = getItemType(itemData, index)) != null ? _a3 : "" : "";
-    const size2 = getFixedItemSize(index, itemData, type);
+    const size2 = getFixedItemSize(itemData, index, type);
     if (size2 !== void 0 && size2 === sizesKnown.get(itemKey)) {
       return;
     }
@@ -3525,7 +3541,8 @@ function normalizeMaintainVisibleContentPosition(value) {
   if (value && typeof value === "object") {
     return {
       data: (_a3 = value.data) != null ? _a3 : false,
-      size: (_b = value.size) != null ? _b : true
+      size: (_b = value.size) != null ? _b : true,
+      shouldRestorePosition: value.shouldRestorePosition
     };
   }
   if (value === false) {
@@ -3670,7 +3687,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     maintainVisibleContentPositionProp
   );
   const [renderNum, setRenderNum] = useState(0);
-  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? { index: initialScrollIndexProp.index || 0, viewOffset: initialScrollIndexProp.viewOffset || 0 } : { index: initialScrollIndexProp || 0, viewOffset: initialScrollOffsetProp || 0 } : void 0;
+  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState, viewPosition: 1 } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? { index: initialScrollIndexProp.index || 0, viewOffset: initialScrollIndexProp.viewOffset || 0 } : { index: initialScrollIndexProp || 0, viewOffset: initialScrollOffsetProp || 0 } : void 0;
   const [canRender, setCanRender] = React3.useState(!IsNewArchitecture);
   const ctx = useStateContext();
   ctx.columnWrapperStyle = columnWrapperStyle || (contentContainerStyle ? createColumnWrapperStyle(contentContainerStyle) : void 0);
@@ -3884,8 +3901,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
   }, []);
   const doInitialScroll = useCallback(() => {
-    const initialScroll = state.initialScroll;
-    if (initialScroll) {
+    const { initialScroll, didFinishInitialScroll, queuedInitialLayout, scrollingTo } = state;
+    if (initialScroll && !queuedInitialLayout && !didFinishInitialScroll && !scrollingTo) {
       scrollTo(ctx, {
         animated: false,
         index: initialScroll == null ? void 0 : initialScroll.index,
@@ -4004,4 +4021,4 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   ), IS_DEV && ENABLE_DEBUG_VIEW && /* @__PURE__ */ React3.createElement(DebugView, { state: refState.current }));
 });
 
-export { LegendList, useIsLastItem, useListScrollSize, useRecyclingEffect, useRecyclingState, useSyncLayout, useViewability, useViewabilityAmount };
+export { LegendList, typedForwardRef, typedMemo, useIsLastItem, useListScrollSize, useRecyclingEffect, useRecyclingState, useSyncLayout, useViewability, useViewabilityAmount };

package/index.native.js

@@ -1134,7 +1134,7 @@ function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize) {
     }
   }
   if (getFixedItemSize) {
-    size = getFixedItemSize(index, data, itemType);
+    size = getFixedItemSize(data, index, itemType);
     if (size !== void 0) {
       sizesKnown.set(key, size);
     }
@@ -1152,7 +1152,7 @@ function getItemSize(ctx, key, index, data, useAverageSize, preferCachedSize) {
     }
   }
   if (size === void 0) {
-    size = getEstimatedItemSize ? getEstimatedItemSize(index, data, itemType) : estimatedItemSize;
+    size = getEstimatedItemSize ? getEstimatedItemSize(data, index, itemType) : estimatedItemSize;
   }
   setSize(ctx, key, size);
   return size;
@@ -1322,7 +1322,7 @@ function scrollTo(ctx, params) {
 
 // src/utils/checkThreshold.ts
 var HYSTERESIS_MULTIPLIER = 1.3;
-var checkThreshold = (distance, atThreshold, threshold, wasReached, snapshot, context, onReached, setSnapshot) => {
+var checkThreshold = (distance, atThreshold, threshold, wasReached, snapshot, context, onReached, setSnapshot, allowReentryOnChange) => {
   const absDistance = Math.abs(distance);
   const within = atThreshold || threshold > 0 && absDistance <= threshold;
   if (wasReached === null) {
@@ -1332,7 +1332,7 @@ var checkThreshold = (distance, atThreshold, threshold, wasReached, snapshot, co
     return null;
   }
   const updateSnapshot = () => {
-    setSnapshot == null ? void 0 : setSnapshot({
+    setSnapshot({
       atThreshold,
       contentSize: context.contentSize,
       dataLength: context.dataLength,
@@ -1343,19 +1343,21 @@ var checkThreshold = (distance, atThreshold, threshold, wasReached, snapshot, co
     if (!within) {
       return false;
     }
-    onReached == null ? void 0 : onReached(distance);
+    onReached(distance);
     updateSnapshot();
     return true;
   }
   const reset = !atThreshold && threshold > 0 && absDistance >= threshold * HYSTERESIS_MULTIPLIER || !atThreshold && threshold <= 0 && absDistance > 0;
   if (reset) {
-    setSnapshot == null ? void 0 : setSnapshot(void 0);
+    setSnapshot(void 0);
     return false;
   }
   if (within) {
     const changed = !snapshot || snapshot.atThreshold !== atThreshold || snapshot.contentSize !== context.contentSize || snapshot.dataLength !== context.dataLength;
     if (changed) {
-      onReached == null ? void 0 : onReached(distance);
+      if (allowReentryOnChange) {
+        onReached(distance);
+      }
       updateSnapshot();
     }
   }
@@ -1398,7 +1400,8 @@ function checkAtBottom(ctx) {
       },
       (snapshot) => {
         state.endReachedSnapshot = snapshot;
-      }
+      },
+      true
     );
   }
 }
@@ -1433,7 +1436,8 @@ function checkAtTop(state) {
     },
     (snapshot) => {
       state.startReachedSnapshot = snapshot;
-    }
+    },
+    false
   );
 }
 
@@ -1594,7 +1598,7 @@ function prepareMVCP(ctx, dataChanged) {
   const state = ctx.state;
   const { idsInView, positions, props } = state;
   const {
-    maintainVisibleContentPosition: { data: mvcpData, size: mvcpScroll }
+    maintainVisibleContentPosition: { data: mvcpData, size: mvcpScroll, shouldRestorePosition }
   } = props;
   const scrollingTo = state.scrollingTo;
   let prevPosition;
@@ -1629,8 +1633,16 @@ function prepareMVCP(ctx, dataChanged) {
     return () => {
       let positionDiff = 0;
       if (dataChanged && targetId === void 0 && mvcpData) {
+        const data = state.props.data;
         for (let i = 0; i < idsInViewWithPositions.length; i++) {
           const { id, position } = idsInViewWithPositions[i];
+          const index = indexByKey.get(id);
+          if (index !== void 0 && shouldRestorePosition) {
+            const item = data[index];
+            if (item === void 0 || !shouldRestorePosition(item, index, data)) {
+              continue;
+            }
+          }
           const newPosition = positions.get(id);
           if (newPosition !== void 0) {
             positionDiff = newPosition - position;
@@ -2286,20 +2298,13 @@ function setDidLayout(ctx) {
       onLoad({ elapsedTimeInMs: Date.now() - loadStartTime });
     }
   };
-  if (Platform2.OS === "android" && initialScroll) {
-    if (IsNewArchitecture) {
-      scrollToIndex(ctx, { ...initialScroll, animated: false });
-      requestAnimationFrame(() => {
-        scrollToIndex(ctx, { ...initialScroll, animated: false });
-        setIt();
-      });
-    } else {
-      scrollToIndex(ctx, { ...initialScroll, animated: false });
-      setIt();
-    }
-  } else {
-    setIt();
+  if ((initialScroll == null ? void 0 : initialScroll.index) !== void 0) {
+    const target = initialScroll;
+    const runScroll = () => scrollToIndex(ctx, { ...target, animated: false });
+    runScroll();
+    requestAnimationFrame(runScroll);
   }
+  setIt();
 }
 
 // src/core/calculateItemsInView.ts
@@ -2869,7 +2874,7 @@ function doInitialAllocateContainers(ctx) {
         const item = data[i];
         if (item !== void 0) {
           const itemType = (_a3 = getItemType == null ? void 0 : getItemType(item, i)) != null ? _a3 : "";
-          totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(i, item, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(i, item, itemType)) != null ? _c : estimatedItemSize;
+          totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(item, i, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(item, i, itemType)) != null ? _c : estimatedItemSize;
         }
       }
       averageItemSize = totalSize / num;
@@ -3056,7 +3061,7 @@ function updateItemSize(ctx, itemKey, sizeObj) {
       return;
     }
     const type = getItemType ? (_a3 = getItemType(itemData, index)) != null ? _a3 : "" : "";
-    const size2 = getFixedItemSize(index, itemData, type);
+    const size2 = getFixedItemSize(itemData, index, type);
     if (size2 !== void 0 && size2 === sizesKnown.get(itemKey)) {
       return;
     }
@@ -3354,7 +3359,8 @@ function normalizeMaintainVisibleContentPosition(value) {
   if (value && typeof value === "object") {
     return {
       data: (_a3 = value.data) != null ? _a3 : false,
-      size: (_b = value.size) != null ? _b : true
+      size: (_b = value.size) != null ? _b : true,
+      shouldRestorePosition: value.shouldRestorePosition
     };
   }
   if (value === false) {
@@ -3499,7 +3505,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     maintainVisibleContentPositionProp
   );
   const [renderNum, setRenderNum] = React2.useState(0);
-  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? { index: initialScrollIndexProp.index || 0, viewOffset: initialScrollIndexProp.viewOffset || 0 } : { index: initialScrollIndexProp || 0, viewOffset: initialScrollOffsetProp || 0 } : void 0;
+  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState, viewPosition: 1 } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? { index: initialScrollIndexProp.index || 0, viewOffset: initialScrollIndexProp.viewOffset || 0 } : { index: initialScrollIndexProp || 0, viewOffset: initialScrollOffsetProp || 0 } : void 0;
   const [canRender, setCanRender] = React2__namespace.useState(!IsNewArchitecture);
   const ctx = useStateContext();
   ctx.columnWrapperStyle = columnWrapperStyle || (contentContainerStyle ? createColumnWrapperStyle(contentContainerStyle) : void 0);
@@ -3725,8 +3731,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
   }, []);
   const doInitialScroll = React2.useCallback(() => {
-    const initialScroll = state.initialScroll;
-    if (initialScroll) {
+    const { initialScroll, didFinishInitialScroll, queuedInitialLayout, scrollingTo } = state;
+    if (initialScroll && !queuedInitialLayout && !didFinishInitialScroll && !scrollingTo) {
       scrollTo(ctx, {
         animated: false,
         index: initialScroll == null ? void 0 : initialScroll.index,
@@ -3851,6 +3857,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
 });
 
 exports.LegendList = LegendList;
+exports.typedForwardRef = typedForwardRef;
+exports.typedMemo = typedMemo;
 exports.useIsLastItem = useIsLastItem;
 exports.useListScrollSize = useListScrollSize;
 exports.useRecyclingEffect = useRecyclingEffect;