@legendapp/list 3.0.0-beta.51 → 3.0.0-beta.52

package/index.js

@@ -5326,13 +5326,12 @@ function maybeUpdateAnchoredEndSpace(ctx) {
       nextSize = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
     }
   }
-  if (previousSize === nextSize) {
-    return nextSize;
-  }
-  set$(ctx, "anchoredEndSpaceSize", nextSize);
-  (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-  if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-    updateScroll(ctx, state.scroll, true);
+  if (previousSize !== nextSize) {
+    set$(ctx, "anchoredEndSpaceSize", nextSize);
+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
+      updateScroll(ctx, state.scroll, true);
+    }
   }
   return nextSize;
 }
@@ -5561,14 +5560,14 @@ function createImperativeHandle(ctx) {
   const IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES = 2;
   let imperativeScrollToken = 0;
   const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.queuedMVCPRecalculate !== void 0 || state.ignoreScrollFromMVCP !== void 0;
-  const runWhenSettled = (token, run) => {
+  const runWhenReady = (token, run, isReady) => {
     const startedAt = Date.now();
     let stableFrames = 0;
     const check = () => {
       if (token !== imperativeScrollToken) {
         return;
       }
-      if (isSettlingAfterDataChange()) {
+      if (isSettlingAfterDataChange() || !isReady()) {
         stableFrames = 0;
       } else {
         stableFrames += 1;
@@ -5583,10 +5582,10 @@ function createImperativeHandle(ctx) {
     requestAnimationFrame(check);
   };
   const runScrollWithPromise = (run, options) => new Promise((resolve) => {
-    var _a3;
+    var _a3, _b;
     const token = ++imperativeScrollToken;
-    const shouldWaitOneFrame = !!(options == null ? void 0 : options.shouldWaitOneFrame);
-    (_a3 = state.pendingScrollResolve) == null ? void 0 : _a3.call(state);
+    const isReady = (_a3 = options == null ? void 0 : options.isReady) != null ? _a3 : (() => true);
+    (_b = state.pendingScrollResolve) == null ? void 0 : _b.call(state);
     state.pendingScrollResolve = resolve;
     const runNow = () => {
       if (token !== imperativeScrollToken) {
@@ -5600,11 +5599,10 @@ function createImperativeHandle(ctx) {
         resolve();
       }
     };
-    const execute = shouldWaitOneFrame ? () => requestAnimationFrame(runNow) : runNow;
-    if (isSettlingAfterDataChange()) {
-      runWhenSettled(token, execute);
+    if (isSettlingAfterDataChange() || !isReady()) {
+      runWhenReady(token, runNow, isReady);
     } else {
-      execute();
+      runNow();
     }
   });
   const scrollIndexIntoView = (options) => {
@@ -5715,15 +5713,24 @@ function createImperativeHandle(ctx) {
       }
       return false;
     }),
-    scrollToIndex: (params) => runScrollWithPromise(
-      () => {
+    scrollToIndex: (params) => {
+      const shouldWaitForOutOfRangeTarget = params.index >= 0 && params.index >= state.props.data.length;
+      const options = shouldWaitForOutOfRangeTarget ? {
+        isReady: () => {
+          var _a3;
+          const props = state.props;
+          const anchorIndex = (_a3 = props.anchoredEndSpace) == null ? void 0 : _a3.anchorIndex;
+          const lastIndex = props.data.length - 1;
+          const isInRange = params.index < props.data.length;
+          const shouldWaitForAnchorSize = isInRange && anchorIndex !== void 0 && anchorIndex >= 0 && params.index >= anchorIndex && !props.getFixedItemSize && !state.sizesKnown.has(getId(state, lastIndex));
+          return isInRange && !shouldWaitForAnchorSize;
+        }
+      } : void 0;
+      return runScrollWithPromise(() => {
         scrollToIndex(ctx, params);
         return true;
-      },
-      {
-        shouldWaitOneFrame: params.index >= 0 && params.index >= state.props.data.length
-      }
-    ),
+      }, options);
+    },
     scrollToItem: ({ item, ...props }) => runScrollWithPromise(() => {
       const data = state.props.data;
       const index = data.indexOf(item);

package/index.mjs

@@ -5305,13 +5305,12 @@ function maybeUpdateAnchoredEndSpace(ctx) {
       nextSize = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
     }
   }
-  if (previousSize === nextSize) {
-    return nextSize;
-  }
-  set$(ctx, "anchoredEndSpaceSize", nextSize);
-  (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-  if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-    updateScroll(ctx, state.scroll, true);
+  if (previousSize !== nextSize) {
+    set$(ctx, "anchoredEndSpaceSize", nextSize);
+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
+      updateScroll(ctx, state.scroll, true);
+    }
   }
   return nextSize;
 }
@@ -5540,14 +5539,14 @@ function createImperativeHandle(ctx) {
   const IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES = 2;
   let imperativeScrollToken = 0;
   const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.queuedMVCPRecalculate !== void 0 || state.ignoreScrollFromMVCP !== void 0;
-  const runWhenSettled = (token, run) => {
+  const runWhenReady = (token, run, isReady) => {
     const startedAt = Date.now();
     let stableFrames = 0;
     const check = () => {
       if (token !== imperativeScrollToken) {
         return;
       }
-      if (isSettlingAfterDataChange()) {
+      if (isSettlingAfterDataChange() || !isReady()) {
         stableFrames = 0;
       } else {
         stableFrames += 1;
@@ -5562,10 +5561,10 @@ function createImperativeHandle(ctx) {
     requestAnimationFrame(check);
   };
   const runScrollWithPromise = (run, options) => new Promise((resolve) => {
-    var _a3;
+    var _a3, _b;
     const token = ++imperativeScrollToken;
-    const shouldWaitOneFrame = !!(options == null ? void 0 : options.shouldWaitOneFrame);
-    (_a3 = state.pendingScrollResolve) == null ? void 0 : _a3.call(state);
+    const isReady = (_a3 = options == null ? void 0 : options.isReady) != null ? _a3 : (() => true);
+    (_b = state.pendingScrollResolve) == null ? void 0 : _b.call(state);
     state.pendingScrollResolve = resolve;
     const runNow = () => {
       if (token !== imperativeScrollToken) {
@@ -5579,11 +5578,10 @@ function createImperativeHandle(ctx) {
         resolve();
       }
     };
-    const execute = shouldWaitOneFrame ? () => requestAnimationFrame(runNow) : runNow;
-    if (isSettlingAfterDataChange()) {
-      runWhenSettled(token, execute);
+    if (isSettlingAfterDataChange() || !isReady()) {
+      runWhenReady(token, runNow, isReady);
     } else {
-      execute();
+      runNow();
     }
   });
   const scrollIndexIntoView = (options) => {
@@ -5694,15 +5692,24 @@ function createImperativeHandle(ctx) {
       }
       return false;
     }),
-    scrollToIndex: (params) => runScrollWithPromise(
-      () => {
+    scrollToIndex: (params) => {
+      const shouldWaitForOutOfRangeTarget = params.index >= 0 && params.index >= state.props.data.length;
+      const options = shouldWaitForOutOfRangeTarget ? {
+        isReady: () => {
+          var _a3;
+          const props = state.props;
+          const anchorIndex = (_a3 = props.anchoredEndSpace) == null ? void 0 : _a3.anchorIndex;
+          const lastIndex = props.data.length - 1;
+          const isInRange = params.index < props.data.length;
+          const shouldWaitForAnchorSize = isInRange && anchorIndex !== void 0 && anchorIndex >= 0 && params.index >= anchorIndex && !props.getFixedItemSize && !state.sizesKnown.has(getId(state, lastIndex));
+          return isInRange && !shouldWaitForAnchorSize;
+        }
+      } : void 0;
+      return runScrollWithPromise(() => {
         scrollToIndex(ctx, params);
         return true;
-      },
-      {
-        shouldWaitOneFrame: params.index >= 0 && params.index >= state.props.data.length
-      }
-    ),
+      }, options);
+    },
     scrollToItem: ({ item, ...props }) => runScrollWithPromise(() => {
       const data = state.props.data;
       const index = data.indexOf(item);

package/index.native.js

@@ -4796,13 +4796,12 @@ function maybeUpdateAnchoredEndSpace(ctx) {
       nextSize = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
     }
   }
-  if (previousSize === nextSize) {
-    return nextSize;
-  }
-  set$(ctx, "anchoredEndSpaceSize", nextSize);
-  (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-  if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-    updateScroll(ctx, state.scroll, true);
+  if (previousSize !== nextSize) {
+    set$(ctx, "anchoredEndSpaceSize", nextSize);
+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
+      updateScroll(ctx, state.scroll, true);
+    }
   }
   return nextSize;
 }
@@ -5046,14 +5045,14 @@ function createImperativeHandle(ctx) {
   const IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES = 2;
   let imperativeScrollToken = 0;
   const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.queuedMVCPRecalculate !== void 0 || state.ignoreScrollFromMVCP !== void 0;
-  const runWhenSettled = (token, run) => {
+  const runWhenReady = (token, run, isReady) => {
     const startedAt = Date.now();
     let stableFrames = 0;
     const check = () => {
       if (token !== imperativeScrollToken) {
         return;
       }
-      if (isSettlingAfterDataChange()) {
+      if (isSettlingAfterDataChange() || !isReady()) {
         stableFrames = 0;
       } else {
         stableFrames += 1;
@@ -5068,10 +5067,10 @@ function createImperativeHandle(ctx) {
     requestAnimationFrame(check);
   };
   const runScrollWithPromise = (run, options) => new Promise((resolve) => {
-    var _a3;
+    var _a3, _b;
     const token = ++imperativeScrollToken;
-    const shouldWaitOneFrame = !!(options == null ? void 0 : options.shouldWaitOneFrame);
-    (_a3 = state.pendingScrollResolve) == null ? void 0 : _a3.call(state);
+    const isReady = (_a3 = options == null ? void 0 : options.isReady) != null ? _a3 : (() => true);
+    (_b = state.pendingScrollResolve) == null ? void 0 : _b.call(state);
     state.pendingScrollResolve = resolve;
     const runNow = () => {
       if (token !== imperativeScrollToken) {
@@ -5085,11 +5084,10 @@ function createImperativeHandle(ctx) {
         resolve();
       }
     };
-    const execute = shouldWaitOneFrame ? () => requestAnimationFrame(runNow) : runNow;
-    if (isSettlingAfterDataChange()) {
-      runWhenSettled(token, execute);
+    if (isSettlingAfterDataChange() || !isReady()) {
+      runWhenReady(token, runNow, isReady);
     } else {
-      execute();
+      runNow();
     }
   });
   const scrollIndexIntoView = (options) => {
@@ -5200,15 +5198,24 @@ function createImperativeHandle(ctx) {
       }
       return false;
     }),
-    scrollToIndex: (params) => runScrollWithPromise(
-      () => {
+    scrollToIndex: (params) => {
+      const shouldWaitForOutOfRangeTarget = params.index >= 0 && params.index >= state.props.data.length;
+      const options = shouldWaitForOutOfRangeTarget ? {
+        isReady: () => {
+          var _a3;
+          const props = state.props;
+          const anchorIndex = (_a3 = props.anchoredEndSpace) == null ? void 0 : _a3.anchorIndex;
+          const lastIndex = props.data.length - 1;
+          const isInRange = params.index < props.data.length;
+          const shouldWaitForAnchorSize = isInRange && anchorIndex !== void 0 && anchorIndex >= 0 && params.index >= anchorIndex && !props.getFixedItemSize && !state.sizesKnown.has(getId(state, lastIndex));
+          return isInRange && !shouldWaitForAnchorSize;
+        }
+      } : void 0;
+      return runScrollWithPromise(() => {
         scrollToIndex(ctx, params);
         return true;
-      },
-      {
-        shouldWaitOneFrame: params.index >= 0 && params.index >= state.props.data.length
-      }
-    ),
+      }, options);
+    },
     scrollToItem: ({ item, ...props }) => runScrollWithPromise(() => {
       const data = state.props.data;
       const index = data.indexOf(item);

package/index.native.mjs

@@ -4775,13 +4775,12 @@ function maybeUpdateAnchoredEndSpace(ctx) {
       nextSize = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
     }
   }
-  if (previousSize === nextSize) {
-    return nextSize;
-  }
-  set$(ctx, "anchoredEndSpaceSize", nextSize);
-  (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-  if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-    updateScroll(ctx, state.scroll, true);
+  if (previousSize !== nextSize) {
+    set$(ctx, "anchoredEndSpaceSize", nextSize);
+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
+      updateScroll(ctx, state.scroll, true);
+    }
   }
   return nextSize;
 }
@@ -5025,14 +5024,14 @@ function createImperativeHandle(ctx) {
   const IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES = 2;
   let imperativeScrollToken = 0;
   const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.queuedMVCPRecalculate !== void 0 || state.ignoreScrollFromMVCP !== void 0;
-  const runWhenSettled = (token, run) => {
+  const runWhenReady = (token, run, isReady) => {
     const startedAt = Date.now();
     let stableFrames = 0;
     const check = () => {
       if (token !== imperativeScrollToken) {
         return;
       }
-      if (isSettlingAfterDataChange()) {
+      if (isSettlingAfterDataChange() || !isReady()) {
         stableFrames = 0;
       } else {
         stableFrames += 1;
@@ -5047,10 +5046,10 @@ function createImperativeHandle(ctx) {
     requestAnimationFrame(check);
   };
   const runScrollWithPromise = (run, options) => new Promise((resolve) => {
-    var _a3;
+    var _a3, _b;
     const token = ++imperativeScrollToken;
-    const shouldWaitOneFrame = !!(options == null ? void 0 : options.shouldWaitOneFrame);
-    (_a3 = state.pendingScrollResolve) == null ? void 0 : _a3.call(state);
+    const isReady = (_a3 = options == null ? void 0 : options.isReady) != null ? _a3 : (() => true);
+    (_b = state.pendingScrollResolve) == null ? void 0 : _b.call(state);
     state.pendingScrollResolve = resolve;
     const runNow = () => {
       if (token !== imperativeScrollToken) {
@@ -5064,11 +5063,10 @@ function createImperativeHandle(ctx) {
         resolve();
       }
     };
-    const execute = shouldWaitOneFrame ? () => requestAnimationFrame(runNow) : runNow;
-    if (isSettlingAfterDataChange()) {
-      runWhenSettled(token, execute);
+    if (isSettlingAfterDataChange() || !isReady()) {
+      runWhenReady(token, runNow, isReady);
     } else {
-      execute();
+      runNow();
     }
   });
   const scrollIndexIntoView = (options) => {
@@ -5179,15 +5177,24 @@ function createImperativeHandle(ctx) {
       }
       return false;
     }),
-    scrollToIndex: (params) => runScrollWithPromise(
-      () => {
+    scrollToIndex: (params) => {
+      const shouldWaitForOutOfRangeTarget = params.index >= 0 && params.index >= state.props.data.length;
+      const options = shouldWaitForOutOfRangeTarget ? {
+        isReady: () => {
+          var _a3;
+          const props = state.props;
+          const anchorIndex = (_a3 = props.anchoredEndSpace) == null ? void 0 : _a3.anchorIndex;
+          const lastIndex = props.data.length - 1;
+          const isInRange = params.index < props.data.length;
+          const shouldWaitForAnchorSize = isInRange && anchorIndex !== void 0 && anchorIndex >= 0 && params.index >= anchorIndex && !props.getFixedItemSize && !state.sizesKnown.has(getId(state, lastIndex));
+          return isInRange && !shouldWaitForAnchorSize;
+        }
+      } : void 0;
+      return runScrollWithPromise(() => {
         scrollToIndex(ctx, params);
         return true;
-      },
-      {
-        shouldWaitOneFrame: params.index >= 0 && params.index >= state.props.data.length
-      }
-    ),
+      }, options);
+    },
     scrollToItem: ({ item, ...props }) => runScrollWithPromise(() => {
       const data = state.props.data;
       const index = data.indexOf(item);

package/keyboard-chat.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { ScrollViewComponent, ScrollResponderMixin, Insets as Insets$1, ScrollViewProps } from 'react-native';
 import { KeyboardChatScrollViewProps } from 'react-native-keyboard-controller';
+import { SharedValue } from 'react-native-reanimated';
 import { AnimatedLegendListProps } from '@legendapp/list/reanimated';
 
 interface MaintainVisibleContentPositionNormalized<ItemT = any> {
@@ -221,8 +222,27 @@ type LegendListRef = Omit<LegendListRef$1, "getNativeScrollRef" | "getScrollResp
 };
 
 type KeyboardChatScrollViewPropsUnique = Omit<KeyboardChatScrollViewProps, keyof ScrollViewProps | "inverted" | "ScrollViewComponent" | "blankSpace" | "onContentInsetChange">;
+type ScrollMessageToEndOptions = {
+    animated: boolean;
+    closeKeyboard: boolean;
+};
+type KeyboardScrollToEndListRef = {
+    current: {
+        scrollToEnd(params?: {
+            animated?: boolean;
+        }): Promise<void>;
+    } | null;
+};
+type UseKeyboardScrollToEndOptions = {
+    freeze?: SharedValue<boolean>;
+    listRef: KeyboardScrollToEndListRef;
+};
+declare function useKeyboardScrollToEnd({ freeze: freezeProp, listRef }: UseKeyboardScrollToEndOptions): {
+    freeze: SharedValue<boolean>;
+    scrollMessageToEnd: ({ animated, closeKeyboard }: ScrollMessageToEndOptions) => Promise<void>;
+};
 declare const KeyboardChatLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "anchoredEndSpace" | "renderScrollComponent"> & KeyboardChatScrollViewPropsUnique & {
     anchoredEndSpace?: AnchoredEndSpaceConfig;
 } & React.RefAttributes<LegendListRef>) => React.ReactElement | null;
 
-export { KeyboardChatLegendList };
+export { KeyboardChatLegendList, useKeyboardScrollToEnd };

package/keyboard-chat.js

@@ -28,6 +28,27 @@ var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 // src/integrations/keyboard-chat.tsx
 var { typedForwardRef, useCombinedRef } = reactNative.internal;
+function useKeyboardScrollToEnd({ freeze: freezeProp, listRef }) {
+  const internalFreeze = reactNativeReanimated.useSharedValue(false);
+  const freeze = freezeProp != null ? freezeProp : internalFreeze;
+  const scrollMessageToEnd = React.useCallback(
+    async ({ animated, closeKeyboard }) => {
+      const listRefCurrent = listRef.current;
+      if (listRefCurrent) {
+        freeze.set(true);
+        const dismissPromise = closeKeyboard && reactNativeKeyboardController.KeyboardController.dismiss();
+        const scrollPromise = listRefCurrent.scrollToEnd({ animated });
+        await Promise.all([scrollPromise, dismissPromise]);
+        freeze.set(false);
+      }
+    },
+    [freeze, listRef]
+  );
+  return {
+    freeze,
+    scrollMessageToEnd
+  };
+}
 var KeyboardChatLegendList = typedForwardRef(function KeyboardChatLegendList2(props, forwardedRef) {
   const {
     anchoredEndSpace,
@@ -73,7 +94,6 @@ var KeyboardChatLegendList = typedForwardRef(function KeyboardChatLegendList2(pr
           applyWorkaroundForContentInsetHitTestBug,
           blankSpace,
           extraContentPadding,
-          freeze,
           keyboardLiftBehavior,
           offset,
           onContentInsetChange
@@ -103,3 +123,4 @@ var KeyboardChatLegendList = typedForwardRef(function KeyboardChatLegendList2(pr
 });
 
 exports.KeyboardChatLegendList = KeyboardChatLegendList;
+exports.useKeyboardScrollToEnd = useKeyboardScrollToEnd;

package/keyboard-chat.mjs

@@ -1,12 +1,33 @@
 import * as React from 'react';
 import { useRef, useEffect, useMemo, useCallback } from 'react';
-import { KeyboardChatScrollView } from 'react-native-keyboard-controller';
+import { KeyboardChatScrollView, KeyboardController } from 'react-native-keyboard-controller';
 import { useSharedValue } from 'react-native-reanimated';
 import { internal } from '@legendapp/list/react-native';
 import { AnimatedLegendList } from '@legendapp/list/reanimated';
 
 // src/integrations/keyboard-chat.tsx
 var { typedForwardRef, useCombinedRef } = internal;
+function useKeyboardScrollToEnd({ freeze: freezeProp, listRef }) {
+  const internalFreeze = useSharedValue(false);
+  const freeze = freezeProp != null ? freezeProp : internalFreeze;
+  const scrollMessageToEnd = useCallback(
+    async ({ animated, closeKeyboard }) => {
+      const listRefCurrent = listRef.current;
+      if (listRefCurrent) {
+        freeze.set(true);
+        const dismissPromise = closeKeyboard && KeyboardController.dismiss();
+        const scrollPromise = listRefCurrent.scrollToEnd({ animated });
+        await Promise.all([scrollPromise, dismissPromise]);
+        freeze.set(false);
+      }
+    },
+    [freeze, listRef]
+  );
+  return {
+    freeze,
+    scrollMessageToEnd
+  };
+}
 var KeyboardChatLegendList = typedForwardRef(function KeyboardChatLegendList2(props, forwardedRef) {
   const {
     anchoredEndSpace,
@@ -52,7 +73,6 @@ var KeyboardChatLegendList = typedForwardRef(function KeyboardChatLegendList2(pr
           applyWorkaroundForContentInsetHitTestBug,
           blankSpace,
           extraContentPadding,
-          freeze,
           keyboardLiftBehavior,
           offset,
           onContentInsetChange
@@ -81,4 +101,4 @@ var KeyboardChatLegendList = typedForwardRef(function KeyboardChatLegendList2(pr
   );
 });
 
-export { KeyboardChatLegendList };
+export { KeyboardChatLegendList, useKeyboardScrollToEnd };

package/keyboard-test.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { ScrollViewComponent, ScrollResponderMixin, Insets as Insets$1, ScrollViewProps } from 'react-native';
 import { KeyboardChatScrollViewProps } from 'react-native-keyboard-controller';
+export { useKeyboardScrollToEnd } from '@legendapp/list/keyboard-chat';
 import { AnimatedLegendListProps } from '@legendapp/list/reanimated';
 
 interface MaintainVisibleContentPositionNormalized<ItemT = any> {

package/keyboard-test.js

@@ -2,6 +2,7 @@
 
 var React = require('react');
 var reactNativeKeyboardController = require('react-native-keyboard-controller');
+var keyboardChat = require('@legendapp/list/keyboard-chat');
 var reactNative = require('@legendapp/list/react-native');
 var reanimated = require('@legendapp/list/reanimated');
 
@@ -49,4 +50,8 @@ var KeyboardAvoidingLegendList = typedForwardRef(function KeyboardAvoidingLegend
   return /* @__PURE__ */ React__namespace.createElement(reanimated.AnimatedLegendList, { ref: combinedRef, renderScrollComponent: memoList, ...rest });
 });
 
+Object.defineProperty(exports, "useKeyboardScrollToEnd", {
+  enumerable: true,
+  get: function () { return keyboardChat.useKeyboardScrollToEnd; }
+});
 exports.KeyboardAvoidingLegendList = KeyboardAvoidingLegendList;

package/keyboard-test.mjs

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { useRef, useCallback } from 'react';
 import { KeyboardChatScrollView } from 'react-native-keyboard-controller';
+export { useKeyboardScrollToEnd } from '@legendapp/list/keyboard-chat';
 import { internal } from '@legendapp/list/react-native';
 import { AnimatedLegendList } from '@legendapp/list/reanimated';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/list",
-  "version": "3.0.0-beta.51",
+  "version": "3.0.0-beta.52",
   "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

@@ -4796,13 +4796,12 @@ function maybeUpdateAnchoredEndSpace(ctx) {
       nextSize = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
     }
   }
-  if (previousSize === nextSize) {
-    return nextSize;
-  }
-  set$(ctx, "anchoredEndSpaceSize", nextSize);
-  (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-  if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-    updateScroll(ctx, state.scroll, true);
+  if (previousSize !== nextSize) {
+    set$(ctx, "anchoredEndSpaceSize", nextSize);
+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
+      updateScroll(ctx, state.scroll, true);
+    }
   }
   return nextSize;
 }
@@ -5046,14 +5045,14 @@ function createImperativeHandle(ctx) {
   const IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES = 2;
   let imperativeScrollToken = 0;
   const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.queuedMVCPRecalculate !== void 0 || state.ignoreScrollFromMVCP !== void 0;
-  const runWhenSettled = (token, run) => {
+  const runWhenReady = (token, run, isReady) => {
     const startedAt = Date.now();
     let stableFrames = 0;
     const check = () => {
       if (token !== imperativeScrollToken) {
         return;
       }
-      if (isSettlingAfterDataChange()) {
+      if (isSettlingAfterDataChange() || !isReady()) {
         stableFrames = 0;
       } else {
         stableFrames += 1;
@@ -5068,10 +5067,10 @@ function createImperativeHandle(ctx) {
     requestAnimationFrame(check);
   };
   const runScrollWithPromise = (run, options) => new Promise((resolve) => {
-    var _a3;
+    var _a3, _b;
     const token = ++imperativeScrollToken;
-    const shouldWaitOneFrame = !!(options == null ? void 0 : options.shouldWaitOneFrame);
-    (_a3 = state.pendingScrollResolve) == null ? void 0 : _a3.call(state);
+    const isReady = (_a3 = options == null ? void 0 : options.isReady) != null ? _a3 : (() => true);
+    (_b = state.pendingScrollResolve) == null ? void 0 : _b.call(state);
     state.pendingScrollResolve = resolve;
     const runNow = () => {
       if (token !== imperativeScrollToken) {
@@ -5085,11 +5084,10 @@ function createImperativeHandle(ctx) {
         resolve();
       }
     };
-    const execute = shouldWaitOneFrame ? () => requestAnimationFrame(runNow) : runNow;
-    if (isSettlingAfterDataChange()) {
-      runWhenSettled(token, execute);
+    if (isSettlingAfterDataChange() || !isReady()) {
+      runWhenReady(token, runNow, isReady);
     } else {
-      execute();
+      runNow();
     }
   });
   const scrollIndexIntoView = (options) => {
@@ -5200,15 +5198,24 @@ function createImperativeHandle(ctx) {
       }
       return false;
     }),
-    scrollToIndex: (params) => runScrollWithPromise(
-      () => {
+    scrollToIndex: (params) => {
+      const shouldWaitForOutOfRangeTarget = params.index >= 0 && params.index >= state.props.data.length;
+      const options = shouldWaitForOutOfRangeTarget ? {
+        isReady: () => {
+          var _a3;
+          const props = state.props;
+          const anchorIndex = (_a3 = props.anchoredEndSpace) == null ? void 0 : _a3.anchorIndex;
+          const lastIndex = props.data.length - 1;
+          const isInRange = params.index < props.data.length;
+          const shouldWaitForAnchorSize = isInRange && anchorIndex !== void 0 && anchorIndex >= 0 && params.index >= anchorIndex && !props.getFixedItemSize && !state.sizesKnown.has(getId(state, lastIndex));
+          return isInRange && !shouldWaitForAnchorSize;
+        }
+      } : void 0;
+      return runScrollWithPromise(() => {
         scrollToIndex(ctx, params);
         return true;
-      },
-      {
-        shouldWaitOneFrame: params.index >= 0 && params.index >= state.props.data.length
-      }
-    ),
+      }, options);
+    },
     scrollToItem: ({ item, ...props }) => runScrollWithPromise(() => {
       const data = state.props.data;
       const index = data.indexOf(item);

package/react-native.mjs

@@ -4775,13 +4775,12 @@ function maybeUpdateAnchoredEndSpace(ctx) {
       nextSize = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
     }
   }
-  if (previousSize === nextSize) {
-    return nextSize;
-  }
-  set$(ctx, "anchoredEndSpaceSize", nextSize);
-  (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-  if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-    updateScroll(ctx, state.scroll, true);
+  if (previousSize !== nextSize) {
+    set$(ctx, "anchoredEndSpaceSize", nextSize);
+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
+      updateScroll(ctx, state.scroll, true);
+    }
   }
   return nextSize;
 }
@@ -5025,14 +5024,14 @@ function createImperativeHandle(ctx) {
   const IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES = 2;
   let imperativeScrollToken = 0;
   const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.queuedMVCPRecalculate !== void 0 || state.ignoreScrollFromMVCP !== void 0;
-  const runWhenSettled = (token, run) => {
+  const runWhenReady = (token, run, isReady) => {
     const startedAt = Date.now();
     let stableFrames = 0;
     const check = () => {
       if (token !== imperativeScrollToken) {
         return;
       }
-      if (isSettlingAfterDataChange()) {
+      if (isSettlingAfterDataChange() || !isReady()) {
         stableFrames = 0;
       } else {
         stableFrames += 1;
@@ -5047,10 +5046,10 @@ function createImperativeHandle(ctx) {
     requestAnimationFrame(check);
   };
   const runScrollWithPromise = (run, options) => new Promise((resolve) => {
-    var _a3;
+    var _a3, _b;
     const token = ++imperativeScrollToken;
-    const shouldWaitOneFrame = !!(options == null ? void 0 : options.shouldWaitOneFrame);
-    (_a3 = state.pendingScrollResolve) == null ? void 0 : _a3.call(state);
+    const isReady = (_a3 = options == null ? void 0 : options.isReady) != null ? _a3 : (() => true);
+    (_b = state.pendingScrollResolve) == null ? void 0 : _b.call(state);
     state.pendingScrollResolve = resolve;
     const runNow = () => {
       if (token !== imperativeScrollToken) {
@@ -5064,11 +5063,10 @@ function createImperativeHandle(ctx) {
         resolve();
       }
     };
-    const execute = shouldWaitOneFrame ? () => requestAnimationFrame(runNow) : runNow;
-    if (isSettlingAfterDataChange()) {
-      runWhenSettled(token, execute);
+    if (isSettlingAfterDataChange() || !isReady()) {
+      runWhenReady(token, runNow, isReady);
     } else {
-      execute();
+      runNow();
     }
   });
   const scrollIndexIntoView = (options) => {
@@ -5179,15 +5177,24 @@ function createImperativeHandle(ctx) {
       }
       return false;
     }),
-    scrollToIndex: (params) => runScrollWithPromise(
-      () => {
+    scrollToIndex: (params) => {
+      const shouldWaitForOutOfRangeTarget = params.index >= 0 && params.index >= state.props.data.length;
+      const options = shouldWaitForOutOfRangeTarget ? {
+        isReady: () => {
+          var _a3;
+          const props = state.props;
+          const anchorIndex = (_a3 = props.anchoredEndSpace) == null ? void 0 : _a3.anchorIndex;
+          const lastIndex = props.data.length - 1;
+          const isInRange = params.index < props.data.length;
+          const shouldWaitForAnchorSize = isInRange && anchorIndex !== void 0 && anchorIndex >= 0 && params.index >= anchorIndex && !props.getFixedItemSize && !state.sizesKnown.has(getId(state, lastIndex));
+          return isInRange && !shouldWaitForAnchorSize;
+        }
+      } : void 0;
+      return runScrollWithPromise(() => {
         scrollToIndex(ctx, params);
         return true;
-      },
-      {
-        shouldWaitOneFrame: params.index >= 0 && params.index >= state.props.data.length
-      }
-    ),
+      }, options);
+    },
     scrollToItem: ({ item, ...props }) => runScrollWithPromise(() => {
       const data = state.props.data;
       const index = data.indexOf(item);

package/react-native.web.js

@@ -5329,13 +5329,12 @@ function maybeUpdateAnchoredEndSpace(ctx) {
       nextSize = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
     }
   }
-  if (previousSize === nextSize) {
-    return nextSize;
-  }
-  set$(ctx, "anchoredEndSpaceSize", nextSize);
-  (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-  if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-    updateScroll(ctx, state.scroll, true);
+  if (previousSize !== nextSize) {
+    set$(ctx, "anchoredEndSpaceSize", nextSize);
+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
+      updateScroll(ctx, state.scroll, true);
+    }
   }
   return nextSize;
 }
@@ -5564,14 +5563,14 @@ function createImperativeHandle(ctx) {
   const IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES = 2;
   let imperativeScrollToken = 0;
   const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.queuedMVCPRecalculate !== void 0 || state.ignoreScrollFromMVCP !== void 0;
-  const runWhenSettled = (token, run) => {
+  const runWhenReady = (token, run, isReady) => {
     const startedAt = Date.now();
     let stableFrames = 0;
     const check = () => {
       if (token !== imperativeScrollToken) {
         return;
       }
-      if (isSettlingAfterDataChange()) {
+      if (isSettlingAfterDataChange() || !isReady()) {
         stableFrames = 0;
       } else {
         stableFrames += 1;
@@ -5586,10 +5585,10 @@ function createImperativeHandle(ctx) {
     requestAnimationFrame(check);
   };
   const runScrollWithPromise = (run, options) => new Promise((resolve) => {
-    var _a3;
+    var _a3, _b;
     const token = ++imperativeScrollToken;
-    const shouldWaitOneFrame = !!(options == null ? void 0 : options.shouldWaitOneFrame);
-    (_a3 = state.pendingScrollResolve) == null ? void 0 : _a3.call(state);
+    const isReady = (_a3 = options == null ? void 0 : options.isReady) != null ? _a3 : (() => true);
+    (_b = state.pendingScrollResolve) == null ? void 0 : _b.call(state);
     state.pendingScrollResolve = resolve;
     const runNow = () => {
       if (token !== imperativeScrollToken) {
@@ -5603,11 +5602,10 @@ function createImperativeHandle(ctx) {
         resolve();
       }
     };
-    const execute = shouldWaitOneFrame ? () => requestAnimationFrame(runNow) : runNow;
-    if (isSettlingAfterDataChange()) {
-      runWhenSettled(token, execute);
+    if (isSettlingAfterDataChange() || !isReady()) {
+      runWhenReady(token, runNow, isReady);
     } else {
-      execute();
+      runNow();
     }
   });
   const scrollIndexIntoView = (options) => {
@@ -5718,15 +5716,24 @@ function createImperativeHandle(ctx) {
       }
       return false;
     }),
-    scrollToIndex: (params) => runScrollWithPromise(
-      () => {
+    scrollToIndex: (params) => {
+      const shouldWaitForOutOfRangeTarget = params.index >= 0 && params.index >= state.props.data.length;
+      const options = shouldWaitForOutOfRangeTarget ? {
+        isReady: () => {
+          var _a3;
+          const props = state.props;
+          const anchorIndex = (_a3 = props.anchoredEndSpace) == null ? void 0 : _a3.anchorIndex;
+          const lastIndex = props.data.length - 1;
+          const isInRange = params.index < props.data.length;
+          const shouldWaitForAnchorSize = isInRange && anchorIndex !== void 0 && anchorIndex >= 0 && params.index >= anchorIndex && !props.getFixedItemSize && !state.sizesKnown.has(getId(state, lastIndex));
+          return isInRange && !shouldWaitForAnchorSize;
+        }
+      } : void 0;
+      return runScrollWithPromise(() => {
         scrollToIndex(ctx, params);
         return true;
-      },
-      {
-        shouldWaitOneFrame: params.index >= 0 && params.index >= state.props.data.length
-      }
-    ),
+      }, options);
+    },
     scrollToItem: ({ item, ...props }) => runScrollWithPromise(() => {
       const data = state.props.data;
       const index = data.indexOf(item);

package/react-native.web.mjs

@@ -5308,13 +5308,12 @@ function maybeUpdateAnchoredEndSpace(ctx) {
       nextSize = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
     }
   }
-  if (previousSize === nextSize) {
-    return nextSize;
-  }
-  set$(ctx, "anchoredEndSpaceSize", nextSize);
-  (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-  if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-    updateScroll(ctx, state.scroll, true);
+  if (previousSize !== nextSize) {
+    set$(ctx, "anchoredEndSpaceSize", nextSize);
+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
+      updateScroll(ctx, state.scroll, true);
+    }
   }
   return nextSize;
 }
@@ -5543,14 +5542,14 @@ function createImperativeHandle(ctx) {
   const IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES = 2;
   let imperativeScrollToken = 0;
   const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.queuedMVCPRecalculate !== void 0 || state.ignoreScrollFromMVCP !== void 0;
-  const runWhenSettled = (token, run) => {
+  const runWhenReady = (token, run, isReady) => {
     const startedAt = Date.now();
     let stableFrames = 0;
     const check = () => {
       if (token !== imperativeScrollToken) {
         return;
       }
-      if (isSettlingAfterDataChange()) {
+      if (isSettlingAfterDataChange() || !isReady()) {
         stableFrames = 0;
       } else {
         stableFrames += 1;
@@ -5565,10 +5564,10 @@ function createImperativeHandle(ctx) {
     requestAnimationFrame(check);
   };
   const runScrollWithPromise = (run, options) => new Promise((resolve) => {
-    var _a3;
+    var _a3, _b;
     const token = ++imperativeScrollToken;
-    const shouldWaitOneFrame = !!(options == null ? void 0 : options.shouldWaitOneFrame);
-    (_a3 = state.pendingScrollResolve) == null ? void 0 : _a3.call(state);
+    const isReady = (_a3 = options == null ? void 0 : options.isReady) != null ? _a3 : (() => true);
+    (_b = state.pendingScrollResolve) == null ? void 0 : _b.call(state);
     state.pendingScrollResolve = resolve;
     const runNow = () => {
       if (token !== imperativeScrollToken) {
@@ -5582,11 +5581,10 @@ function createImperativeHandle(ctx) {
         resolve();
       }
     };
-    const execute = shouldWaitOneFrame ? () => requestAnimationFrame(runNow) : runNow;
-    if (isSettlingAfterDataChange()) {
-      runWhenSettled(token, execute);
+    if (isSettlingAfterDataChange() || !isReady()) {
+      runWhenReady(token, runNow, isReady);
     } else {
-      execute();
+      runNow();
     }
   });
   const scrollIndexIntoView = (options) => {
@@ -5697,15 +5695,24 @@ function createImperativeHandle(ctx) {
       }
       return false;
     }),
-    scrollToIndex: (params) => runScrollWithPromise(
-      () => {
+    scrollToIndex: (params) => {
+      const shouldWaitForOutOfRangeTarget = params.index >= 0 && params.index >= state.props.data.length;
+      const options = shouldWaitForOutOfRangeTarget ? {
+        isReady: () => {
+          var _a3;
+          const props = state.props;
+          const anchorIndex = (_a3 = props.anchoredEndSpace) == null ? void 0 : _a3.anchorIndex;
+          const lastIndex = props.data.length - 1;
+          const isInRange = params.index < props.data.length;
+          const shouldWaitForAnchorSize = isInRange && anchorIndex !== void 0 && anchorIndex >= 0 && params.index >= anchorIndex && !props.getFixedItemSize && !state.sizesKnown.has(getId(state, lastIndex));
+          return isInRange && !shouldWaitForAnchorSize;
+        }
+      } : void 0;
+      return runScrollWithPromise(() => {
         scrollToIndex(ctx, params);
         return true;
-      },
-      {
-        shouldWaitOneFrame: params.index >= 0 && params.index >= state.props.data.length
-      }
-    ),
+      }, options);
+    },
     scrollToItem: ({ item, ...props }) => runScrollWithPromise(() => {
       const data = state.props.data;
       const index = data.indexOf(item);

package/react.js

@@ -5329,13 +5329,12 @@ function maybeUpdateAnchoredEndSpace(ctx) {
       nextSize = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
     }
   }
-  if (previousSize === nextSize) {
-    return nextSize;
-  }
-  set$(ctx, "anchoredEndSpaceSize", nextSize);
-  (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-  if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-    updateScroll(ctx, state.scroll, true);
+  if (previousSize !== nextSize) {
+    set$(ctx, "anchoredEndSpaceSize", nextSize);
+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
+      updateScroll(ctx, state.scroll, true);
+    }
   }
   return nextSize;
 }
@@ -5564,14 +5563,14 @@ function createImperativeHandle(ctx) {
   const IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES = 2;
   let imperativeScrollToken = 0;
   const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.queuedMVCPRecalculate !== void 0 || state.ignoreScrollFromMVCP !== void 0;
-  const runWhenSettled = (token, run) => {
+  const runWhenReady = (token, run, isReady) => {
     const startedAt = Date.now();
     let stableFrames = 0;
     const check = () => {
       if (token !== imperativeScrollToken) {
         return;
       }
-      if (isSettlingAfterDataChange()) {
+      if (isSettlingAfterDataChange() || !isReady()) {
         stableFrames = 0;
       } else {
         stableFrames += 1;
@@ -5586,10 +5585,10 @@ function createImperativeHandle(ctx) {
     requestAnimationFrame(check);
   };
   const runScrollWithPromise = (run, options) => new Promise((resolve) => {
-    var _a3;
+    var _a3, _b;
     const token = ++imperativeScrollToken;
-    const shouldWaitOneFrame = !!(options == null ? void 0 : options.shouldWaitOneFrame);
-    (_a3 = state.pendingScrollResolve) == null ? void 0 : _a3.call(state);
+    const isReady = (_a3 = options == null ? void 0 : options.isReady) != null ? _a3 : (() => true);
+    (_b = state.pendingScrollResolve) == null ? void 0 : _b.call(state);
     state.pendingScrollResolve = resolve;
     const runNow = () => {
       if (token !== imperativeScrollToken) {
@@ -5603,11 +5602,10 @@ function createImperativeHandle(ctx) {
         resolve();
       }
     };
-    const execute = shouldWaitOneFrame ? () => requestAnimationFrame(runNow) : runNow;
-    if (isSettlingAfterDataChange()) {
-      runWhenSettled(token, execute);
+    if (isSettlingAfterDataChange() || !isReady()) {
+      runWhenReady(token, runNow, isReady);
     } else {
-      execute();
+      runNow();
     }
   });
   const scrollIndexIntoView = (options) => {
@@ -5718,15 +5716,24 @@ function createImperativeHandle(ctx) {
       }
       return false;
     }),
-    scrollToIndex: (params) => runScrollWithPromise(
-      () => {
+    scrollToIndex: (params) => {
+      const shouldWaitForOutOfRangeTarget = params.index >= 0 && params.index >= state.props.data.length;
+      const options = shouldWaitForOutOfRangeTarget ? {
+        isReady: () => {
+          var _a3;
+          const props = state.props;
+          const anchorIndex = (_a3 = props.anchoredEndSpace) == null ? void 0 : _a3.anchorIndex;
+          const lastIndex = props.data.length - 1;
+          const isInRange = params.index < props.data.length;
+          const shouldWaitForAnchorSize = isInRange && anchorIndex !== void 0 && anchorIndex >= 0 && params.index >= anchorIndex && !props.getFixedItemSize && !state.sizesKnown.has(getId(state, lastIndex));
+          return isInRange && !shouldWaitForAnchorSize;
+        }
+      } : void 0;
+      return runScrollWithPromise(() => {
         scrollToIndex(ctx, params);
         return true;
-      },
-      {
-        shouldWaitOneFrame: params.index >= 0 && params.index >= state.props.data.length
-      }
-    ),
+      }, options);
+    },
     scrollToItem: ({ item, ...props }) => runScrollWithPromise(() => {
       const data = state.props.data;
       const index = data.indexOf(item);

package/react.mjs

@@ -5308,13 +5308,12 @@ function maybeUpdateAnchoredEndSpace(ctx) {
       nextSize = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
     }
   }
-  if (previousSize === nextSize) {
-    return nextSize;
-  }
-  set$(ctx, "anchoredEndSpaceSize", nextSize);
-  (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-  if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-    updateScroll(ctx, state.scroll, true);
+  if (previousSize !== nextSize) {
+    set$(ctx, "anchoredEndSpaceSize", nextSize);
+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
+      updateScroll(ctx, state.scroll, true);
+    }
   }
   return nextSize;
 }
@@ -5543,14 +5542,14 @@ function createImperativeHandle(ctx) {
   const IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES = 2;
   let imperativeScrollToken = 0;
   const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.queuedMVCPRecalculate !== void 0 || state.ignoreScrollFromMVCP !== void 0;
-  const runWhenSettled = (token, run) => {
+  const runWhenReady = (token, run, isReady) => {
     const startedAt = Date.now();
     let stableFrames = 0;
     const check = () => {
       if (token !== imperativeScrollToken) {
         return;
       }
-      if (isSettlingAfterDataChange()) {
+      if (isSettlingAfterDataChange() || !isReady()) {
         stableFrames = 0;
       } else {
         stableFrames += 1;
@@ -5565,10 +5564,10 @@ function createImperativeHandle(ctx) {
     requestAnimationFrame(check);
   };
   const runScrollWithPromise = (run, options) => new Promise((resolve) => {
-    var _a3;
+    var _a3, _b;
     const token = ++imperativeScrollToken;
-    const shouldWaitOneFrame = !!(options == null ? void 0 : options.shouldWaitOneFrame);
-    (_a3 = state.pendingScrollResolve) == null ? void 0 : _a3.call(state);
+    const isReady = (_a3 = options == null ? void 0 : options.isReady) != null ? _a3 : (() => true);
+    (_b = state.pendingScrollResolve) == null ? void 0 : _b.call(state);
     state.pendingScrollResolve = resolve;
     const runNow = () => {
       if (token !== imperativeScrollToken) {
@@ -5582,11 +5581,10 @@ function createImperativeHandle(ctx) {
         resolve();
       }
     };
-    const execute = shouldWaitOneFrame ? () => requestAnimationFrame(runNow) : runNow;
-    if (isSettlingAfterDataChange()) {
-      runWhenSettled(token, execute);
+    if (isSettlingAfterDataChange() || !isReady()) {
+      runWhenReady(token, runNow, isReady);
     } else {
-      execute();
+      runNow();
     }
   });
   const scrollIndexIntoView = (options) => {
@@ -5697,15 +5695,24 @@ function createImperativeHandle(ctx) {
       }
       return false;
     }),
-    scrollToIndex: (params) => runScrollWithPromise(
-      () => {
+    scrollToIndex: (params) => {
+      const shouldWaitForOutOfRangeTarget = params.index >= 0 && params.index >= state.props.data.length;
+      const options = shouldWaitForOutOfRangeTarget ? {
+        isReady: () => {
+          var _a3;
+          const props = state.props;
+          const anchorIndex = (_a3 = props.anchoredEndSpace) == null ? void 0 : _a3.anchorIndex;
+          const lastIndex = props.data.length - 1;
+          const isInRange = params.index < props.data.length;
+          const shouldWaitForAnchorSize = isInRange && anchorIndex !== void 0 && anchorIndex >= 0 && params.index >= anchorIndex && !props.getFixedItemSize && !state.sizesKnown.has(getId(state, lastIndex));
+          return isInRange && !shouldWaitForAnchorSize;
+        }
+      } : void 0;
+      return runScrollWithPromise(() => {
         scrollToIndex(ctx, params);
         return true;
-      },
-      {
-        shouldWaitOneFrame: params.index >= 0 && params.index >= state.props.data.length
-      }
-    ),
+      }, options);
+    },
     scrollToItem: ({ item, ...props }) => runScrollWithPromise(() => {
       const data = state.props.data;
       const index = data.indexOf(item);