@legendapp/list 3.0.0-beta.37 → 3.0.0-beta.38

package/animated.d.ts

@@ -1,4 +1,5 @@
-import { Key, ReactNode, ReactElement } from 'react';
+import * as React from 'react';
+import { Key } from 'react';
 import { ScrollViewProps, NativeSyntheticEvent as NativeSyntheticEvent$1, NativeScrollEvent as NativeScrollEvent$1, ScrollView, StyleProp as StyleProp$1, ViewStyle as ViewStyle$1, ScrollViewComponent, ScrollResponderMixin, Insets as Insets$1, Animated } from 'react-native';
 
 type ListenerType = "activeStickyIndex" | "debugComputedScroll" | "debugRawScroll" | "extraData" | "footerSize" | "headerSize" | "lastItemKeys" | "lastPositionUpdate" | "maintainVisibleContentPosition" | "numColumns" | "numContainers" | "numContainersPooled" | "otherAxisSize" | "readyToRender" | "scrollAdjust" | "scrollAdjustPending" | "scrollAdjustUserOffset" | "scrollSize" | "snapToOffsets" | "stylePaddingTop" | "totalSize" | `containerColumn${number}` | `containerSpan${number}` | `containerItemData${number}` | `containerItemKey${number}` | `containerPosition${number}` | `containerSticky${number}`;
@@ -84,7 +85,7 @@ interface DataModeProps<ItemT, TItemType extends string | undefined> {
      * - A React component: React.ComponentType<LegendListRenderItemProps<ItemT>>
      * @required when using data mode
      */
-    renderItem: ((props: LegendListRenderItemProps<ItemT, TItemType>) => ReactNode) | React.ComponentType<LegendListRenderItemProps<ItemT, TItemType>>;
+    renderItem: ((props: LegendListRenderItemProps<ItemT, TItemType>) => React.ReactNode) | React.ComponentType<LegendListRenderItemProps<ItemT, TItemType>>;
     children?: never;
 }
 interface ChildrenModeProps {
@@ -93,7 +94,7 @@ interface ChildrenModeProps {
      * Each child will be treated as an individual list item.
      * @required when using children mode
      */
-    children: ReactNode;
+    children: React.ReactNode;
     data?: never;
     renderItem?: never;
 }
@@ -591,7 +592,7 @@ interface ViewabilityConfig {
 type LegendListPropsOverrides<ItemT, TItemType extends string | undefined> = Omit<LegendListPropsBase<ItemT, ScrollViewProps, TItemType>, "onScroll" | "refScrollView" | "renderScrollComponent" | "ListHeaderComponentStyle" | "ListFooterComponentStyle"> & {
     onScroll?: (event: NativeSyntheticEvent$1<NativeScrollEvent$1>) => void;
     refScrollView?: React.Ref<ScrollView>;
-    renderScrollComponent?: (props: ScrollViewProps) => ReactElement<ScrollViewProps>;
+    renderScrollComponent?: (props: ScrollViewProps) => React.ReactElement<ScrollViewProps>;
     ListHeaderComponentStyle?: StyleProp$1<ViewStyle$1> | undefined;
     ListFooterComponentStyle?: StyleProp$1<ViewStyle$1> | undefined;
 };

package/index.d.ts

@@ -1,5 +1,5 @@
-import * as React$1 from 'react';
-import { Key, ReactNode, ComponentType, CSSProperties, Ref, ReactElement, JSXElementConstructor, RefAttributes, Dispatch, SetStateAction } from 'react';
+import * as React from 'react';
+import { Key, ComponentType, ReactNode, CSSProperties, Ref, ReactElement, JSXElementConstructor, RefAttributes, Dispatch, SetStateAction } from 'react';
 
 type AnimatedValue = number;
 
@@ -68,7 +68,7 @@ interface StateContext {
     positionListeners: Map<string, Set<(value: any) => void>>;
     state: InternalState$1;
     values: Map<ListenerType, any>;
-    viewRefs: Map<number, React$1.RefObject<LooseView>>;
+    viewRefs: Map<number, React.RefObject<LooseView | null>>;
 }
 
 declare class ScrollAdjustHandler {
@@ -158,7 +158,7 @@ interface DataModeProps<ItemT, TItemType extends string | undefined> {
      * - A React component: React.ComponentType<LegendListRenderItemProps<ItemT>>
      * @required when using data mode
      */
-    renderItem: ((props: LegendListRenderItemProps$1<ItemT, TItemType>) => ReactNode) | React.ComponentType<LegendListRenderItemProps$1<ItemT, TItemType>>;
+    renderItem: ((props: LegendListRenderItemProps$1<ItemT, TItemType>) => React.ReactNode) | React.ComponentType<LegendListRenderItemProps$1<ItemT, TItemType>>;
     children?: never;
 }
 interface ChildrenModeProps {
@@ -167,7 +167,7 @@ interface ChildrenModeProps {
      * Each child will be treated as an individual list item.
      * @required when using children mode
      */
-    children: ReactNode;
+    children: React.ReactNode;
     data?: never;
     renderItem?: never;
 }
@@ -571,10 +571,6 @@ interface InternalState$1 {
     scrollLastCalculate?: number;
     scrollLength: number;
     scrollPending: number;
-    stableTarget?: {
-        scroll: number;
-        target: number;
-    };
     scrollPrev: number;
     scrollPrevTime: number;
     scrollProcessingEnabled: boolean;
@@ -853,9 +849,9 @@ interface LegendListRecyclingState$1<T> {
     prevIndex: number | undefined;
     prevItem: T | undefined;
 }
-type TypedForwardRef$1 = <T, P = {}>(render: (props: P, ref: React.Ref<T>) => React.ReactNode) => (props: P & React.RefAttributes<T>) => React.ReactNode;
+type TypedForwardRef$1 = <T, P = {}>(render: (props: P, ref: React.Ref<T>) => React.ReactElement | null) => (props: P & React.RefAttributes<T>) => React.ReactElement | null;
 declare const typedForwardRef: TypedForwardRef$1;
-type TypedMemo$1 = <T extends React.ComponentType<any>>(Component: T, propsAreEqual?: (prevProps: Readonly<React.JSXElementConstructor<T>>, nextProps: Readonly<React.JSXElementConstructor<T>>) => boolean) => T & {
+type TypedMemo$1 = <T extends React.ComponentType<any>>(Component: T, propsAreEqual?: (prevProps: Readonly<React.ComponentProps<T>>, nextProps: Readonly<React.ComponentProps<T>>) => boolean) => T & {
     displayName?: string;
 };
 declare const typedMemo: TypedMemo$1;

package/index.js

@@ -252,8 +252,8 @@ var IS_DEV = (_a2 = processDev != null ? processDev : metroDev) != null ? _a2 :
 var POSITION_OUT_OF_VIEW = -1e7;
 var ENABLE_DEVMODE = IS_DEV && false;
 var ENABLE_DEBUG_VIEW = IS_DEV && false;
-var typedForwardRef = React3.forwardRef;
-var typedMemo = React3.memo;
+var typedForwardRef = React3__namespace.forwardRef;
+var typedMemo = React3__namespace.memo;
 
 // src/utils/helpers.ts
 function isFunction(obj) {
@@ -368,7 +368,16 @@ var PositionViewSticky = typedMemo(function PositionViewSticky2({
     }
     return styleBase;
   }, [composed, horizontal, position, index, activeStickyIndex, stickyHeaderConfig == null ? void 0 : stickyHeaderConfig.offset]);
-  return /* @__PURE__ */ React3__namespace.createElement("div", { "data-index": index, ref: refView, style: viewStyle, ...webProps }, children);
+  return /* @__PURE__ */ React3__namespace.createElement(
+    "div",
+    {
+      "data-index": index,
+      ref: refView,
+      style: viewStyle,
+      ...webProps
+    },
+    children
+  );
 });
 var PositionView = PositionViewState;
 function useInit(cb) {
@@ -634,13 +643,22 @@ var Platform = {
   OS: "web"
 };
 
-// src/utils/isInMVCPActiveMode.ts
-function isInMVCPActiveMode(state) {
+// src/utils/hasActiveMVCPAnchorLock.ts
+function hasActiveMVCPAnchorLock(state) {
   const lock = state.mvcpAnchorLock;
-  if (lock && Date.now() > lock.expiresAt) {
+  if (!lock) {
+    return false;
+  }
+  if (Date.now() > lock.expiresAt) {
     state.mvcpAnchorLock = void 0;
+    return false;
   }
-  return state.dataChangeNeedsScrollUpdate || !!state.mvcpAnchorLock;
+  return true;
+}
+
+// src/utils/isInMVCPActiveMode.ts
+function isInMVCPActiveMode(state) {
+  return state.dataChangeNeedsScrollUpdate || hasActiveMVCPAnchorLock(state);
 }
 
 // src/components/Container.tsx
@@ -1347,7 +1365,7 @@ function SnapWrapper({ ScrollComponent, ...props }) {
   return /* @__PURE__ */ React3__namespace.createElement(ScrollComponent, { ...props, snapToOffsets });
 }
 var LayoutView = ({ onLayoutChange, refView, children, ...rest }) => {
-  const ref = refView != null ? refView : React3.useRef();
+  const ref = refView != null ? refView : React3.useRef(null);
   useOnLayoutSync({ onLayoutChange, ref });
   return /* @__PURE__ */ React3__namespace.createElement("div", { ...rest, ref }, children);
 };
@@ -1791,7 +1809,6 @@ function finishScrollTo(ctx) {
     state.initialScroll = void 0;
     state.initialAnchor = void 0;
     state.scrollingTo = void 0;
-    state.stableTarget = void 0;
     if (state.pendingTotalSize !== void 0) {
       addTotalSize(ctx, null, state.pendingTotalSize);
     }
@@ -1908,9 +1925,8 @@ function scrollTo(ctx, params) {
   let offset = precomputedWithViewOffset ? scrollTargetOffset : calculateOffsetWithOffsetPosition(ctx, scrollTargetOffset, scrollTarget);
   offset = clampScrollOffset(ctx, offset, scrollTarget);
   state.scrollHistory.length = 0;
-  state.stableTarget = void 0;
   if (!noScrollingTo) {
-    state.scrollingTo = { ...scrollTarget, offset };
+    state.scrollingTo = scrollTarget;
   }
   state.scrollPending = offset;
   if (forceScroll || !isInitialScroll || Platform.OS === "android") {
@@ -3351,14 +3367,6 @@ function checkActualChange(state, dataProp, previousData) {
 }
 
 // src/core/checkFinishedScroll.ts
-function getCurrentTargetOffset(ctx, scrollingTo) {
-  if (scrollingTo.index !== void 0) {
-    const baseOffset = calculateOffsetForIndex(ctx, scrollingTo.index);
-    const resolvedOffset = calculateOffsetWithOffsetPosition(ctx, baseOffset, scrollingTo);
-    return clampScrollOffset(ctx, resolvedOffset, scrollingTo);
-  }
-  return clampScrollOffset(ctx, scrollingTo.offset, scrollingTo);
-}
 function checkFinishedScroll(ctx) {
   ctx.state.animFrameCheckFinishedScroll = requestAnimationFrame(() => checkFinishedScrollFrame(ctx));
 }
@@ -3368,30 +3376,20 @@ function checkFinishedScrollFrame(ctx) {
     const { state } = ctx;
     state.animFrameCheckFinishedScroll = void 0;
     const scroll = state.scrollPending;
-    const clampedTargetOffset = getCurrentTargetOffset(ctx, scrollingTo);
-    if (Math.abs(scrollingTo.offset - clampedTargetOffset) >= 1) {
-      state.scrollingTo = { ...scrollingTo, offset: clampedTargetOffset };
-    }
+    const adjust = state.scrollAdjustHandler.getAdjust();
+    const clampedTargetOffset = clampScrollOffset(
+      ctx,
+      scrollingTo.offset - (scrollingTo.viewOffset || 0),
+      scrollingTo
+    );
     const maxOffset = clampScrollOffset(ctx, scroll, scrollingTo);
     const diff1 = Math.abs(scroll - clampedTargetOffset);
+    const diff2 = Math.abs(diff1 - adjust);
     const isNotOverscrolled = Math.abs(scroll - maxOffset) < 1;
-    const isAtTarget = diff1 < 1;
-    const previousStableTarget = state.stableTarget;
-    const hasStableTargetFrame = !!previousStableTarget && Math.abs(previousStableTarget.target - clampedTargetOffset) < 1 && Math.abs(previousStableTarget.scroll - scroll) < 1;
-    if (isAtTarget && !hasStableTargetFrame) {
-      state.stableTarget = { scroll, target: clampedTargetOffset };
-      state.animFrameCheckFinishedScroll = requestAnimationFrame(() => checkFinishedScrollFrame(ctx));
-      return;
-    }
-    if (!isAtTarget) {
-      state.stableTarget = void 0;
-    }
+    const isAtTarget = diff1 < 1 || !scrollingTo.animated && diff2 < 1;
     if (isNotOverscrolled && isAtTarget) {
-      state.stableTarget = void 0;
       finishScrollTo(ctx);
     }
-  } else {
-    ctx.state.stableTarget = void 0;
   }
 }
 function checkFinishedScrollFallback(ctx) {
@@ -3919,17 +3917,53 @@ function createColumnWrapperStyle(contentContainerStyle) {
 // src/utils/createImperativeHandle.ts
 function createImperativeHandle(ctx) {
   const state = ctx.state;
+  const IMPERATIVE_SCROLL_SETTLE_MAX_WAIT_MS = 800;
+  const IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES = 2;
+  let imperativeScrollToken = 0;
+  const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.queuedMVCPRecalculate !== void 0 || state.ignoreScrollFromMVCP !== void 0 || hasActiveMVCPAnchorLock(state);
+  const runWhenSettled = (token, run) => {
+    const startedAt = Date.now();
+    let stableFrames = 0;
+    const check = () => {
+      if (token !== imperativeScrollToken) {
+        return;
+      }
+      if (isSettlingAfterDataChange()) {
+        stableFrames = 0;
+      } else {
+        stableFrames += 1;
+      }
+      const timedOut = Date.now() - startedAt >= IMPERATIVE_SCROLL_SETTLE_MAX_WAIT_MS;
+      if (stableFrames >= IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES || timedOut) {
+        run();
+        return;
+      }
+      requestAnimationFrame(check);
+    };
+    requestAnimationFrame(check);
+  };
   const runScrollWithPromise = (run) => new Promise((resolve) => {
     var _a3;
+    const token = ++imperativeScrollToken;
     (_a3 = state.pendingScrollResolve) == null ? void 0 : _a3.call(state);
     state.pendingScrollResolve = resolve;
-    const didStartScroll = run();
-    if (!didStartScroll || !state.scrollingTo) {
-      if (state.pendingScrollResolve === resolve) {
-        state.pendingScrollResolve = void 0;
+    const runNow = () => {
+      if (token !== imperativeScrollToken) {
+        return;
+      }
+      const didStartScroll = run();
+      if (!didStartScroll || !state.scrollingTo) {
+        if (state.pendingScrollResolve === resolve) {
+          state.pendingScrollResolve = void 0;
+        }
+        resolve();
       }
-      resolve();
+    };
+    if (isSettlingAfterDataChange()) {
+      runWhenSettled(token, runNow);
+      return;
     }
+    runNow();
   });
   const scrollIndexIntoView = (options) => {
     if (state) {
@@ -4239,7 +4273,7 @@ var LegendList = typedMemo(
   })
 );
 var LegendListInner = typedForwardRef(function LegendListInner2(props, forwardedRef) {
-  var _a3, _b, _c, _d;
+  var _a3, _b, _c, _d, _e;
   const {
     alignItemsAtEnd = false,
     alwaysRender,
@@ -4368,7 +4402,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     );
   }
   const useWindowScrollResolved = !!useWindowScroll && !renderScrollComponent;
-  const refState = React3.useRef();
+  const refState = React3.useRef(void 0);
   const hasOverrideItemLayout = !!overrideItemLayout;
   const prevHasOverrideItemLayout = React3.useRef(hasOverrideItemLayout);
   if (!refState.current) {
@@ -4700,6 +4734,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     []
   );
   const onScrollHandler = useStickyScrollHandler(stickyHeaderIndices, horizontal, ctx, fns.onScroll);
+  const refreshControlElement = refreshControl;
   return /* @__PURE__ */ React3__namespace.createElement(React3__namespace.Fragment, null, /* @__PURE__ */ React3__namespace.createElement(
     ListComponent,
     {
@@ -4718,9 +4753,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       onMomentumScrollEnd: fns.onMomentumScrollEnd,
       onScroll: onScrollHandler,
       recycleItems,
-      refreshControl: refreshControl ? stylePaddingTopState > 0 ? React3__namespace.cloneElement(refreshControl, {
-        progressViewOffset: (refreshControl.props.progressViewOffset || 0) + stylePaddingTopState
-      }) : refreshControl : onRefresh && /* @__PURE__ */ React3__namespace.createElement(
+      refreshControl: refreshControlElement ? stylePaddingTopState > 0 ? React3__namespace.cloneElement(refreshControlElement, {
+        progressViewOffset: ((_d = refreshControlElement.props.progressViewOffset) != null ? _d : 0) + stylePaddingTopState
+      }) : refreshControlElement : onRefresh && /* @__PURE__ */ React3__namespace.createElement(
         RefreshControl,
         {
           onRefresh,
@@ -4730,7 +4765,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       ),
       refScrollView: combinedRef,
       renderScrollComponent,
-      scrollAdjustHandler: (_d = refState.current) == null ? void 0 : _d.scrollAdjustHandler,
+      scrollAdjustHandler: (_e = refState.current) == null ? void 0 : _e.scrollAdjustHandler,
       scrollEventThrottle: 0,
       snapToIndices,
       stickyHeaderIndices,

package/index.mjs

@@ -1,5 +1,5 @@
 import * as React3 from 'react';
-import React3__default, { forwardRef, useReducer, useEffect, createContext, useRef, useState, useMemo, useCallback, useImperativeHandle, useLayoutEffect, memo, useContext } from 'react';
+import React3__default, { forwardRef, useReducer, useEffect, createContext, useRef, useState, useMemo, useCallback, useImperativeHandle, useLayoutEffect, useContext } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 import * as ReactDOM from 'react-dom';
 import { flushSync } from 'react-dom';
@@ -231,8 +231,8 @@ var IS_DEV = (_a2 = processDev != null ? processDev : metroDev) != null ? _a2 :
 var POSITION_OUT_OF_VIEW = -1e7;
 var ENABLE_DEVMODE = IS_DEV && false;
 var ENABLE_DEBUG_VIEW = IS_DEV && false;
-var typedForwardRef = forwardRef;
-var typedMemo = memo;
+var typedForwardRef = React3.forwardRef;
+var typedMemo = React3.memo;
 
 // src/utils/helpers.ts
 function isFunction(obj) {
@@ -347,7 +347,16 @@ var PositionViewSticky = typedMemo(function PositionViewSticky2({
     }
     return styleBase;
   }, [composed, horizontal, position, index, activeStickyIndex, stickyHeaderConfig == null ? void 0 : stickyHeaderConfig.offset]);
-  return /* @__PURE__ */ React3.createElement("div", { "data-index": index, ref: refView, style: viewStyle, ...webProps }, children);
+  return /* @__PURE__ */ React3.createElement(
+    "div",
+    {
+      "data-index": index,
+      ref: refView,
+      style: viewStyle,
+      ...webProps
+    },
+    children
+  );
 });
 var PositionView = PositionViewState;
 function useInit(cb) {
@@ -613,13 +622,22 @@ var Platform = {
   OS: "web"
 };
 
-// src/utils/isInMVCPActiveMode.ts
-function isInMVCPActiveMode(state) {
+// src/utils/hasActiveMVCPAnchorLock.ts
+function hasActiveMVCPAnchorLock(state) {
   const lock = state.mvcpAnchorLock;
-  if (lock && Date.now() > lock.expiresAt) {
+  if (!lock) {
+    return false;
+  }
+  if (Date.now() > lock.expiresAt) {
     state.mvcpAnchorLock = void 0;
+    return false;
   }
-  return state.dataChangeNeedsScrollUpdate || !!state.mvcpAnchorLock;
+  return true;
+}
+
+// src/utils/isInMVCPActiveMode.ts
+function isInMVCPActiveMode(state) {
+  return state.dataChangeNeedsScrollUpdate || hasActiveMVCPAnchorLock(state);
 }
 
 // src/components/Container.tsx
@@ -1326,7 +1344,7 @@ function SnapWrapper({ ScrollComponent, ...props }) {
   return /* @__PURE__ */ React3.createElement(ScrollComponent, { ...props, snapToOffsets });
 }
 var LayoutView = ({ onLayoutChange, refView, children, ...rest }) => {
-  const ref = refView != null ? refView : useRef();
+  const ref = refView != null ? refView : useRef(null);
   useOnLayoutSync({ onLayoutChange, ref });
   return /* @__PURE__ */ React3.createElement("div", { ...rest, ref }, children);
 };
@@ -1770,7 +1788,6 @@ function finishScrollTo(ctx) {
     state.initialScroll = void 0;
     state.initialAnchor = void 0;
     state.scrollingTo = void 0;
-    state.stableTarget = void 0;
     if (state.pendingTotalSize !== void 0) {
       addTotalSize(ctx, null, state.pendingTotalSize);
     }
@@ -1887,9 +1904,8 @@ function scrollTo(ctx, params) {
   let offset = precomputedWithViewOffset ? scrollTargetOffset : calculateOffsetWithOffsetPosition(ctx, scrollTargetOffset, scrollTarget);
   offset = clampScrollOffset(ctx, offset, scrollTarget);
   state.scrollHistory.length = 0;
-  state.stableTarget = void 0;
   if (!noScrollingTo) {
-    state.scrollingTo = { ...scrollTarget, offset };
+    state.scrollingTo = scrollTarget;
   }
   state.scrollPending = offset;
   if (forceScroll || !isInitialScroll || Platform.OS === "android") {
@@ -3330,14 +3346,6 @@ function checkActualChange(state, dataProp, previousData) {
 }
 
 // src/core/checkFinishedScroll.ts
-function getCurrentTargetOffset(ctx, scrollingTo) {
-  if (scrollingTo.index !== void 0) {
-    const baseOffset = calculateOffsetForIndex(ctx, scrollingTo.index);
-    const resolvedOffset = calculateOffsetWithOffsetPosition(ctx, baseOffset, scrollingTo);
-    return clampScrollOffset(ctx, resolvedOffset, scrollingTo);
-  }
-  return clampScrollOffset(ctx, scrollingTo.offset, scrollingTo);
-}
 function checkFinishedScroll(ctx) {
   ctx.state.animFrameCheckFinishedScroll = requestAnimationFrame(() => checkFinishedScrollFrame(ctx));
 }
@@ -3347,30 +3355,20 @@ function checkFinishedScrollFrame(ctx) {
     const { state } = ctx;
     state.animFrameCheckFinishedScroll = void 0;
     const scroll = state.scrollPending;
-    const clampedTargetOffset = getCurrentTargetOffset(ctx, scrollingTo);
-    if (Math.abs(scrollingTo.offset - clampedTargetOffset) >= 1) {
-      state.scrollingTo = { ...scrollingTo, offset: clampedTargetOffset };
-    }
+    const adjust = state.scrollAdjustHandler.getAdjust();
+    const clampedTargetOffset = clampScrollOffset(
+      ctx,
+      scrollingTo.offset - (scrollingTo.viewOffset || 0),
+      scrollingTo
+    );
     const maxOffset = clampScrollOffset(ctx, scroll, scrollingTo);
     const diff1 = Math.abs(scroll - clampedTargetOffset);
+    const diff2 = Math.abs(diff1 - adjust);
     const isNotOverscrolled = Math.abs(scroll - maxOffset) < 1;
-    const isAtTarget = diff1 < 1;
-    const previousStableTarget = state.stableTarget;
-    const hasStableTargetFrame = !!previousStableTarget && Math.abs(previousStableTarget.target - clampedTargetOffset) < 1 && Math.abs(previousStableTarget.scroll - scroll) < 1;
-    if (isAtTarget && !hasStableTargetFrame) {
-      state.stableTarget = { scroll, target: clampedTargetOffset };
-      state.animFrameCheckFinishedScroll = requestAnimationFrame(() => checkFinishedScrollFrame(ctx));
-      return;
-    }
-    if (!isAtTarget) {
-      state.stableTarget = void 0;
-    }
+    const isAtTarget = diff1 < 1 || !scrollingTo.animated && diff2 < 1;
     if (isNotOverscrolled && isAtTarget) {
-      state.stableTarget = void 0;
       finishScrollTo(ctx);
     }
-  } else {
-    ctx.state.stableTarget = void 0;
   }
 }
 function checkFinishedScrollFallback(ctx) {
@@ -3898,17 +3896,53 @@ function createColumnWrapperStyle(contentContainerStyle) {
 // src/utils/createImperativeHandle.ts
 function createImperativeHandle(ctx) {
   const state = ctx.state;
+  const IMPERATIVE_SCROLL_SETTLE_MAX_WAIT_MS = 800;
+  const IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES = 2;
+  let imperativeScrollToken = 0;
+  const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.queuedMVCPRecalculate !== void 0 || state.ignoreScrollFromMVCP !== void 0 || hasActiveMVCPAnchorLock(state);
+  const runWhenSettled = (token, run) => {
+    const startedAt = Date.now();
+    let stableFrames = 0;
+    const check = () => {
+      if (token !== imperativeScrollToken) {
+        return;
+      }
+      if (isSettlingAfterDataChange()) {
+        stableFrames = 0;
+      } else {
+        stableFrames += 1;
+      }
+      const timedOut = Date.now() - startedAt >= IMPERATIVE_SCROLL_SETTLE_MAX_WAIT_MS;
+      if (stableFrames >= IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES || timedOut) {
+        run();
+        return;
+      }
+      requestAnimationFrame(check);
+    };
+    requestAnimationFrame(check);
+  };
   const runScrollWithPromise = (run) => new Promise((resolve) => {
     var _a3;
+    const token = ++imperativeScrollToken;
     (_a3 = state.pendingScrollResolve) == null ? void 0 : _a3.call(state);
     state.pendingScrollResolve = resolve;
-    const didStartScroll = run();
-    if (!didStartScroll || !state.scrollingTo) {
-      if (state.pendingScrollResolve === resolve) {
-        state.pendingScrollResolve = void 0;
+    const runNow = () => {
+      if (token !== imperativeScrollToken) {
+        return;
+      }
+      const didStartScroll = run();
+      if (!didStartScroll || !state.scrollingTo) {
+        if (state.pendingScrollResolve === resolve) {
+          state.pendingScrollResolve = void 0;
+        }
+        resolve();
       }
-      resolve();
+    };
+    if (isSettlingAfterDataChange()) {
+      runWhenSettled(token, runNow);
+      return;
     }
+    runNow();
   });
   const scrollIndexIntoView = (options) => {
     if (state) {
@@ -4218,7 +4252,7 @@ var LegendList = typedMemo(
   })
 );
 var LegendListInner = typedForwardRef(function LegendListInner2(props, forwardedRef) {
-  var _a3, _b, _c, _d;
+  var _a3, _b, _c, _d, _e;
   const {
     alignItemsAtEnd = false,
     alwaysRender,
@@ -4347,7 +4381,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     );
   }
   const useWindowScrollResolved = !!useWindowScroll && !renderScrollComponent;
-  const refState = useRef();
+  const refState = useRef(void 0);
   const hasOverrideItemLayout = !!overrideItemLayout;
   const prevHasOverrideItemLayout = useRef(hasOverrideItemLayout);
   if (!refState.current) {
@@ -4679,6 +4713,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     []
   );
   const onScrollHandler = useStickyScrollHandler(stickyHeaderIndices, horizontal, ctx, fns.onScroll);
+  const refreshControlElement = refreshControl;
   return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(
     ListComponent,
     {
@@ -4697,9 +4732,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       onMomentumScrollEnd: fns.onMomentumScrollEnd,
       onScroll: onScrollHandler,
       recycleItems,
-      refreshControl: refreshControl ? stylePaddingTopState > 0 ? React3.cloneElement(refreshControl, {
-        progressViewOffset: (refreshControl.props.progressViewOffset || 0) + stylePaddingTopState
-      }) : refreshControl : onRefresh && /* @__PURE__ */ React3.createElement(
+      refreshControl: refreshControlElement ? stylePaddingTopState > 0 ? React3.cloneElement(refreshControlElement, {
+        progressViewOffset: ((_d = refreshControlElement.props.progressViewOffset) != null ? _d : 0) + stylePaddingTopState
+      }) : refreshControlElement : onRefresh && /* @__PURE__ */ React3.createElement(
         RefreshControl,
         {
           onRefresh,
@@ -4709,7 +4744,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       ),
       refScrollView: combinedRef,
       renderScrollComponent,
-      scrollAdjustHandler: (_d = refState.current) == null ? void 0 : _d.scrollAdjustHandler,
+      scrollAdjustHandler: (_e = refState.current) == null ? void 0 : _e.scrollAdjustHandler,
       scrollEventThrottle: 0,
       snapToIndices,
       stickyHeaderIndices,