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

package/keyboard-chat.mjs

@@ -1,12 +1,12 @@
 import * as React from 'react';
-import { useEffect, useMemo, useCallback } from 'react';
+import { useRef, useEffect, useMemo, useCallback } from 'react';
 import { KeyboardChatScrollView } 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 } = internal;
+var { typedForwardRef, useCombinedRef } = internal;
 var KeyboardChatLegendList = typedForwardRef(function KeyboardChatLegendList2(props, forwardedRef) {
   const {
     anchoredEndSpace,
@@ -17,6 +17,8 @@ var KeyboardChatLegendList = typedForwardRef(function KeyboardChatLegendList2(pr
     offset,
     ...rest
   } = props;
+  const refLegendList = useRef(null);
+  const combinedRef = useCombinedRef(forwardedRef, refLegendList);
   const blankSpace = useSharedValue(0);
   useEffect(() => {
     if (!anchoredEndSpace) {
@@ -37,6 +39,10 @@ var KeyboardChatLegendList = typedForwardRef(function KeyboardChatLegendList2(pr
       }
     };
   }, [anchoredEndSpace, blankSpace]);
+  const onContentInsetChange = useCallback((insets) => {
+    var _a;
+    (_a = refLegendList.current) == null ? void 0 : _a.reportContentInset(insets);
+  }, []);
   const memoList = useCallback(
     (scrollProps) => {
       return /* @__PURE__ */ React.createElement(
@@ -48,7 +54,8 @@ var KeyboardChatLegendList = typedForwardRef(function KeyboardChatLegendList2(pr
           extraContentPadding,
           freeze,
           keyboardLiftBehavior,
-          offset
+          offset,
+          onContentInsetChange
         }
       );
     },
@@ -58,6 +65,7 @@ var KeyboardChatLegendList = typedForwardRef(function KeyboardChatLegendList2(pr
       extraContentPadding,
       freeze,
       keyboardLiftBehavior,
+      onContentInsetChange,
       offset
     ]
   );
@@ -66,7 +74,7 @@ var KeyboardChatLegendList = typedForwardRef(function KeyboardChatLegendList2(pr
     AnimatedLegendListInternal,
     {
       anchoredEndSpace: anchoredEndSpaceWithBlankSpace,
-      ref: forwardedRef,
+      ref: combinedRef,
       renderScrollComponent: memoList,
       ...rest
     }

package/keyboard-test.d.ts

@@ -210,7 +210,7 @@ type LegendListRef = Omit<LegendListRef$1, "getNativeScrollRef" | "getScrollResp
     reportContentInset(inset?: Partial<Insets$1> | null): void;
 };
 
-type KeyboardChatScrollViewPropsUnique = Omit<KeyboardChatScrollViewProps, keyof ScrollViewProps | "inverted" | "ScrollViewComponent">;
+type KeyboardChatScrollViewPropsUnique = Omit<KeyboardChatScrollViewProps, keyof ScrollViewProps | "inverted" | "ScrollViewComponent" | "onContentInsetChange">;
 declare const KeyboardAvoidingLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "renderScrollComponent"> & KeyboardChatScrollViewPropsUnique & React.RefAttributes<LegendListRef>) => React.ReactElement | null;
 
 export { KeyboardAvoidingLegendList };

package/keyboard-test.js

@@ -26,14 +26,27 @@ function _interopNamespace(e) {
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 // src/integrations/keyboard-test.tsx
-var { typedForwardRef } = reactNative.internal;
+var { typedForwardRef, useCombinedRef } = reactNative.internal;
 var KeyboardAvoidingLegendList = typedForwardRef(function KeyboardAvoidingLegendList2(props, forwardedRef) {
   const { extraContentPadding, ...rest } = props;
+  const refLegendList = React.useRef(null);
+  const combinedRef = useCombinedRef(forwardedRef, refLegendList);
+  const onContentInsetChange = React.useCallback((insets) => {
+    var _a;
+    (_a = refLegendList.current) == null ? void 0 : _a.reportContentInset(insets);
+  }, []);
   const memoList = React.useCallback(
-    (listProps) => /* @__PURE__ */ React__namespace.createElement(reactNativeKeyboardController.KeyboardChatScrollView, { ...listProps, extraContentPadding }),
-    [extraContentPadding]
+    (listProps) => /* @__PURE__ */ React__namespace.createElement(
+      reactNativeKeyboardController.KeyboardChatScrollView,
+      {
+        ...listProps,
+        extraContentPadding,
+        onContentInsetChange
+      }
+    ),
+    [extraContentPadding, onContentInsetChange]
   );
-  return /* @__PURE__ */ React__namespace.createElement(reanimated.AnimatedLegendList, { ref: forwardedRef, renderScrollComponent: memoList, ...rest });
+  return /* @__PURE__ */ React__namespace.createElement(reanimated.AnimatedLegendList, { ref: combinedRef, renderScrollComponent: memoList, ...rest });
 });
 
 exports.KeyboardAvoidingLegendList = KeyboardAvoidingLegendList;

package/keyboard-test.mjs

@@ -1,18 +1,31 @@
 import * as React from 'react';
-import { useCallback } from 'react';
+import { useRef, useCallback } from 'react';
 import { KeyboardChatScrollView } from 'react-native-keyboard-controller';
 import { internal } from '@legendapp/list/react-native';
 import { AnimatedLegendList } from '@legendapp/list/reanimated';
 
 // src/integrations/keyboard-test.tsx
-var { typedForwardRef } = internal;
+var { typedForwardRef, useCombinedRef } = internal;
 var KeyboardAvoidingLegendList = typedForwardRef(function KeyboardAvoidingLegendList2(props, forwardedRef) {
   const { extraContentPadding, ...rest } = props;
+  const refLegendList = useRef(null);
+  const combinedRef = useCombinedRef(forwardedRef, refLegendList);
+  const onContentInsetChange = useCallback((insets) => {
+    var _a;
+    (_a = refLegendList.current) == null ? void 0 : _a.reportContentInset(insets);
+  }, []);
   const memoList = useCallback(
-    (listProps) => /* @__PURE__ */ React.createElement(KeyboardChatScrollView, { ...listProps, extraContentPadding }),
-    [extraContentPadding]
+    (listProps) => /* @__PURE__ */ React.createElement(
+      KeyboardChatScrollView,
+      {
+        ...listProps,
+        extraContentPadding,
+        onContentInsetChange
+      }
+    ),
+    [extraContentPadding, onContentInsetChange]
   );
-  return /* @__PURE__ */ React.createElement(AnimatedLegendList, { ref: forwardedRef, renderScrollComponent: memoList, ...rest });
+  return /* @__PURE__ */ React.createElement(AnimatedLegendList, { ref: combinedRef, renderScrollComponent: memoList, ...rest });
 });
 
 export { KeyboardAvoidingLegendList };

package/package.json

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

@@ -4570,12 +4570,14 @@ var flushSync = (fn) => {
 };
 
 // src/core/updateScroll.ts
-function updateScroll(ctx, newScroll, forceUpdate) {
+function updateScroll(ctx, newScroll, forceUpdate, options) {
   var _a3;
   const state = ctx.state;
   const { ignoreScrollFromMVCP, lastScrollAdjustForHistory, scrollAdjustHandler, scrollHistory, scrollingTo } = state;
   const prevScroll = state.scroll;
-  state.hasScrolled = true;
+  if ((options == null ? void 0 : options.markHasScrolled) !== false) {
+    state.hasScrolled = true;
+  }
   state.lastBatchingAction = Date.now();
   const currentTime = Date.now();
   const adjust = scrollAdjustHandler.getAdjust();
@@ -5169,7 +5171,7 @@ function createImperativeHandle(ctx) {
     }),
     reportContentInset: (inset) => {
       state.contentInsetOverride = inset != null ? inset : void 0;
-      updateScroll(ctx, state.scroll, true);
+      updateScroll(ctx, state.scroll, true, { markHasScrolled: false });
     },
     scrollIndexIntoView: (options) => runScrollWithPromise(() => scrollIndexIntoView(options)),
     scrollItemIntoView: ({ item, ...props }) => runScrollWithPromise(() => {
@@ -5238,32 +5240,32 @@ var addIndex = (result, dataLength, index) => {
     result.add(index);
   }
 };
-function getAlwaysRenderIndices(config, data, keyExtractor) {
+function getAlwaysRenderIndices(config, data, keyExtractor, anchoredEndSpaceAnchorIndex) {
   var _a3, _b;
-  if (!config || data.length === 0) {
+  if (data.length === 0) {
     return [];
   }
   const result = /* @__PURE__ */ new Set();
   const dataLength = data.length;
-  const topCount = toCount(config.top);
+  const topCount = toCount(config == null ? void 0 : config.top);
   if (topCount > 0) {
     for (let i = 0; i < Math.min(topCount, dataLength); i++) {
       addIndex(result, dataLength, i);
     }
   }
-  const bottomCount = toCount(config.bottom);
+  const bottomCount = toCount(config == null ? void 0 : config.bottom);
   if (bottomCount > 0) {
     for (let i = Math.max(0, dataLength - bottomCount); i < dataLength; i++) {
       addIndex(result, dataLength, i);
     }
   }
-  if ((_a3 = config.indices) == null ? void 0 : _a3.length) {
+  if ((_a3 = config == null ? void 0 : config.indices) == null ? void 0 : _a3.length) {
     for (const index of config.indices) {
       if (!Number.isFinite(index)) continue;
       addIndex(result, dataLength, Math.floor(index));
     }
   }
-  if ((_b = config.keys) == null ? void 0 : _b.length) {
+  if ((_b = config == null ? void 0 : config.keys) == null ? void 0 : _b.length) {
     const keys = new Set(config.keys);
     for (let i = 0; i < dataLength && keys.size > 0; i++) {
       const key = keyExtractor(data[i], i);
@@ -5273,6 +5275,12 @@ function getAlwaysRenderIndices(config, data, keyExtractor) {
       }
     }
   }
+  if (anchoredEndSpaceAnchorIndex !== void 0 && Number.isFinite(anchoredEndSpaceAnchorIndex)) {
+    const anchorIndex = Math.floor(anchoredEndSpaceAnchorIndex);
+    for (let i = anchorIndex >= 0 ? anchorIndex : dataLength; i < dataLength; i++) {
+      addIndex(result, dataLength, i);
+    }
+  }
   const indices = Array.from(result);
   indices.sort(sortAsc);
   return indices;
@@ -5436,7 +5444,7 @@ var LegendList = typedMemo(
   })
 );
 var LegendListInner = typedForwardRef(function LegendListInner2(props, forwardedRef) {
-  var _a3, _b, _c, _d, _e, _f, _g, _h;
+  var _a3, _b, _c, _d, _e, _f, _g, _h, _i;
   const noopOnScroll = React2.useCallback((_event) => {
   }, []);
   if (props.recycleItems === void 0) {
@@ -5565,9 +5573,10 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const keyExtractor = keyExtractorProp != null ? keyExtractorProp : ((_item, index) => index.toString());
   const stickyHeaderIndices = stickyHeaderIndicesProp != null ? stickyHeaderIndicesProp : stickyIndicesDeprecated;
   const alwaysRenderIndices = React2.useMemo(() => {
-    const indices = getAlwaysRenderIndices(alwaysRender, dataProp, keyExtractor);
+    const indices = getAlwaysRenderIndices(alwaysRender, dataProp, keyExtractor, anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex);
     return { arr: indices, set: new Set(indices) };
   }, [
+    anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex,
     alwaysRender == null ? void 0 : alwaysRender.top,
     alwaysRender == null ? void 0 : alwaysRender.bottom,
     (_d = alwaysRender == null ? void 0 : alwaysRender.indices) == null ? void 0 : _d.join(","),
@@ -5673,6 +5682,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const throttledOnScroll = useThrottledOnScroll(onScrollProp != null ? onScrollProp : noopOnScroll, scrollEventThrottle != null ? scrollEventThrottle : 0);
   const throttleScrollFn = scrollEventThrottle && onScrollProp ? throttledOnScroll : onScrollProp;
   const anchoredEndSpaceResolved = Platform.OS === "web" && anchoredEndSpace ? { ...anchoredEndSpace, includeInEndInset: true } : anchoredEndSpace;
+  const didAnchoredEndSpaceAnchorIndexChange = !isFirstLocal && !didDataChangeLocal && ((_g = state.props.anchoredEndSpace) == null ? void 0 : _g.anchorIndex) !== (anchoredEndSpaceResolved == null ? void 0 : anchoredEndSpaceResolved.anchorIndex);
   state.props = {
     alignItemsAtEnd,
     alwaysRender,
@@ -5787,6 +5797,11 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     });
   }, [dataProp.length, didDataChangeLocal, initialScrollAtEnd, stylePaddingBottomState, usesBootstrapInitialScroll]);
   React2.useLayoutEffect(() => {
+    var _a4;
+    if (didAnchoredEndSpaceAnchorIndexChange) {
+      state.scrollForNextCalculateItemsInView = void 0;
+      (_a4 = state.triggerCalculateItemsInView) == null ? void 0 : _a4.call(state);
+    }
     maybeUpdateAnchoredEndSpace(ctx);
   }, [
     ctx,
@@ -5795,6 +5810,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex,
     anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorMaxSize,
     anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorOffset,
+    didAnchoredEndSpaceAnchorIndexChange,
     numColumnsProp
   ]);
   const onLayoutFooter = React2.useCallback(
@@ -5951,7 +5967,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       onScroll: onScrollHandler,
       recycleItems,
       refreshControl: refreshControlElement ? stylePaddingTopState > 0 ? React2__namespace.cloneElement(refreshControlElement, {
-        progressViewOffset: ((_g = refreshControlElement.props.progressViewOffset) != null ? _g : 0) + stylePaddingTopState
+        progressViewOffset: ((_h = refreshControlElement.props.progressViewOffset) != null ? _h : 0) + stylePaddingTopState
       }) : refreshControlElement : onRefresh && /* @__PURE__ */ React2__namespace.createElement(
         ReactNative.RefreshControl,
         {
@@ -5962,7 +5978,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       ),
       refScrollView: combinedRef,
       renderScrollComponent,
-      scrollAdjustHandler: (_h = refState.current) == null ? void 0 : _h.scrollAdjustHandler,
+      scrollAdjustHandler: (_i = refState.current) == null ? void 0 : _i.scrollAdjustHandler,
       scrollEventThrottle: 0,
       snapToIndices,
       stickyHeaderIndices,

package/react-native.mjs

@@ -4549,12 +4549,14 @@ var flushSync = (fn) => {
 };
 
 // src/core/updateScroll.ts
-function updateScroll(ctx, newScroll, forceUpdate) {
+function updateScroll(ctx, newScroll, forceUpdate, options) {
   var _a3;
   const state = ctx.state;
   const { ignoreScrollFromMVCP, lastScrollAdjustForHistory, scrollAdjustHandler, scrollHistory, scrollingTo } = state;
   const prevScroll = state.scroll;
-  state.hasScrolled = true;
+  if ((options == null ? void 0 : options.markHasScrolled) !== false) {
+    state.hasScrolled = true;
+  }
   state.lastBatchingAction = Date.now();
   const currentTime = Date.now();
   const adjust = scrollAdjustHandler.getAdjust();
@@ -5148,7 +5150,7 @@ function createImperativeHandle(ctx) {
     }),
     reportContentInset: (inset) => {
       state.contentInsetOverride = inset != null ? inset : void 0;
-      updateScroll(ctx, state.scroll, true);
+      updateScroll(ctx, state.scroll, true, { markHasScrolled: false });
     },
     scrollIndexIntoView: (options) => runScrollWithPromise(() => scrollIndexIntoView(options)),
     scrollItemIntoView: ({ item, ...props }) => runScrollWithPromise(() => {
@@ -5217,32 +5219,32 @@ var addIndex = (result, dataLength, index) => {
     result.add(index);
   }
 };
-function getAlwaysRenderIndices(config, data, keyExtractor) {
+function getAlwaysRenderIndices(config, data, keyExtractor, anchoredEndSpaceAnchorIndex) {
   var _a3, _b;
-  if (!config || data.length === 0) {
+  if (data.length === 0) {
     return [];
   }
   const result = /* @__PURE__ */ new Set();
   const dataLength = data.length;
-  const topCount = toCount(config.top);
+  const topCount = toCount(config == null ? void 0 : config.top);
   if (topCount > 0) {
     for (let i = 0; i < Math.min(topCount, dataLength); i++) {
       addIndex(result, dataLength, i);
     }
   }
-  const bottomCount = toCount(config.bottom);
+  const bottomCount = toCount(config == null ? void 0 : config.bottom);
   if (bottomCount > 0) {
     for (let i = Math.max(0, dataLength - bottomCount); i < dataLength; i++) {
       addIndex(result, dataLength, i);
     }
   }
-  if ((_a3 = config.indices) == null ? void 0 : _a3.length) {
+  if ((_a3 = config == null ? void 0 : config.indices) == null ? void 0 : _a3.length) {
     for (const index of config.indices) {
       if (!Number.isFinite(index)) continue;
       addIndex(result, dataLength, Math.floor(index));
     }
   }
-  if ((_b = config.keys) == null ? void 0 : _b.length) {
+  if ((_b = config == null ? void 0 : config.keys) == null ? void 0 : _b.length) {
     const keys = new Set(config.keys);
     for (let i = 0; i < dataLength && keys.size > 0; i++) {
       const key = keyExtractor(data[i], i);
@@ -5252,6 +5254,12 @@ function getAlwaysRenderIndices(config, data, keyExtractor) {
       }
     }
   }
+  if (anchoredEndSpaceAnchorIndex !== void 0 && Number.isFinite(anchoredEndSpaceAnchorIndex)) {
+    const anchorIndex = Math.floor(anchoredEndSpaceAnchorIndex);
+    for (let i = anchorIndex >= 0 ? anchorIndex : dataLength; i < dataLength; i++) {
+      addIndex(result, dataLength, i);
+    }
+  }
   const indices = Array.from(result);
   indices.sort(sortAsc);
   return indices;
@@ -5415,7 +5423,7 @@ var LegendList = typedMemo(
   })
 );
 var LegendListInner = typedForwardRef(function LegendListInner2(props, forwardedRef) {
-  var _a3, _b, _c, _d, _e, _f, _g, _h;
+  var _a3, _b, _c, _d, _e, _f, _g, _h, _i;
   const noopOnScroll = useCallback((_event) => {
   }, []);
   if (props.recycleItems === void 0) {
@@ -5544,9 +5552,10 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const keyExtractor = keyExtractorProp != null ? keyExtractorProp : ((_item, index) => index.toString());
   const stickyHeaderIndices = stickyHeaderIndicesProp != null ? stickyHeaderIndicesProp : stickyIndicesDeprecated;
   const alwaysRenderIndices = useMemo(() => {
-    const indices = getAlwaysRenderIndices(alwaysRender, dataProp, keyExtractor);
+    const indices = getAlwaysRenderIndices(alwaysRender, dataProp, keyExtractor, anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex);
     return { arr: indices, set: new Set(indices) };
   }, [
+    anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex,
     alwaysRender == null ? void 0 : alwaysRender.top,
     alwaysRender == null ? void 0 : alwaysRender.bottom,
     (_d = alwaysRender == null ? void 0 : alwaysRender.indices) == null ? void 0 : _d.join(","),
@@ -5652,6 +5661,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const throttledOnScroll = useThrottledOnScroll(onScrollProp != null ? onScrollProp : noopOnScroll, scrollEventThrottle != null ? scrollEventThrottle : 0);
   const throttleScrollFn = scrollEventThrottle && onScrollProp ? throttledOnScroll : onScrollProp;
   const anchoredEndSpaceResolved = Platform.OS === "web" && anchoredEndSpace ? { ...anchoredEndSpace, includeInEndInset: true } : anchoredEndSpace;
+  const didAnchoredEndSpaceAnchorIndexChange = !isFirstLocal && !didDataChangeLocal && ((_g = state.props.anchoredEndSpace) == null ? void 0 : _g.anchorIndex) !== (anchoredEndSpaceResolved == null ? void 0 : anchoredEndSpaceResolved.anchorIndex);
   state.props = {
     alignItemsAtEnd,
     alwaysRender,
@@ -5766,6 +5776,11 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     });
   }, [dataProp.length, didDataChangeLocal, initialScrollAtEnd, stylePaddingBottomState, usesBootstrapInitialScroll]);
   useLayoutEffect(() => {
+    var _a4;
+    if (didAnchoredEndSpaceAnchorIndexChange) {
+      state.scrollForNextCalculateItemsInView = void 0;
+      (_a4 = state.triggerCalculateItemsInView) == null ? void 0 : _a4.call(state);
+    }
     maybeUpdateAnchoredEndSpace(ctx);
   }, [
     ctx,
@@ -5774,6 +5789,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex,
     anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorMaxSize,
     anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorOffset,
+    didAnchoredEndSpaceAnchorIndexChange,
     numColumnsProp
   ]);
   const onLayoutFooter = useCallback(
@@ -5930,7 +5946,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       onScroll: onScrollHandler,
       recycleItems,
       refreshControl: refreshControlElement ? stylePaddingTopState > 0 ? React2.cloneElement(refreshControlElement, {
-        progressViewOffset: ((_g = refreshControlElement.props.progressViewOffset) != null ? _g : 0) + stylePaddingTopState
+        progressViewOffset: ((_h = refreshControlElement.props.progressViewOffset) != null ? _h : 0) + stylePaddingTopState
       }) : refreshControlElement : onRefresh && /* @__PURE__ */ React2.createElement(
         RefreshControl,
         {
@@ -5941,7 +5957,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       ),
       refScrollView: combinedRef,
       renderScrollComponent,
-      scrollAdjustHandler: (_h = refState.current) == null ? void 0 : _h.scrollAdjustHandler,
+      scrollAdjustHandler: (_i = refState.current) == null ? void 0 : _i.scrollAdjustHandler,
       scrollEventThrottle: 0,
       snapToIndices,
       stickyHeaderIndices,

package/react-native.web.js

@@ -5103,12 +5103,14 @@ function handleLayout(ctx, layoutParam, setCanRender) {
 }
 
 // src/core/updateScroll.ts
-function updateScroll(ctx, newScroll, forceUpdate) {
+function updateScroll(ctx, newScroll, forceUpdate, options) {
   var _a3;
   const state = ctx.state;
   const { ignoreScrollFromMVCP, lastScrollAdjustForHistory, scrollAdjustHandler, scrollHistory, scrollingTo } = state;
   const prevScroll = state.scroll;
-  state.hasScrolled = true;
+  if ((options == null ? void 0 : options.markHasScrolled) !== false) {
+    state.hasScrolled = true;
+  }
   state.lastBatchingAction = Date.now();
   const currentTime = Date.now();
   const adjust = scrollAdjustHandler.getAdjust();
@@ -5687,7 +5689,7 @@ function createImperativeHandle(ctx) {
     }),
     reportContentInset: (inset) => {
       state.contentInsetOverride = inset != null ? inset : void 0;
-      updateScroll(ctx, state.scroll, true);
+      updateScroll(ctx, state.scroll, true, { markHasScrolled: false });
     },
     scrollIndexIntoView: (options) => runScrollWithPromise(() => scrollIndexIntoView(options)),
     scrollItemIntoView: ({ item, ...props }) => runScrollWithPromise(() => {
@@ -5756,32 +5758,32 @@ var addIndex = (result, dataLength, index) => {
     result.add(index);
   }
 };
-function getAlwaysRenderIndices(config, data, keyExtractor) {
+function getAlwaysRenderIndices(config, data, keyExtractor, anchoredEndSpaceAnchorIndex) {
   var _a3, _b;
-  if (!config || data.length === 0) {
+  if (data.length === 0) {
     return [];
   }
   const result = /* @__PURE__ */ new Set();
   const dataLength = data.length;
-  const topCount = toCount(config.top);
+  const topCount = toCount(config == null ? void 0 : config.top);
   if (topCount > 0) {
     for (let i = 0; i < Math.min(topCount, dataLength); i++) {
       addIndex(result, dataLength, i);
     }
   }
-  const bottomCount = toCount(config.bottom);
+  const bottomCount = toCount(config == null ? void 0 : config.bottom);
   if (bottomCount > 0) {
     for (let i = Math.max(0, dataLength - bottomCount); i < dataLength; i++) {
       addIndex(result, dataLength, i);
     }
   }
-  if ((_a3 = config.indices) == null ? void 0 : _a3.length) {
+  if ((_a3 = config == null ? void 0 : config.indices) == null ? void 0 : _a3.length) {
     for (const index of config.indices) {
       if (!Number.isFinite(index)) continue;
       addIndex(result, dataLength, Math.floor(index));
     }
   }
-  if ((_b = config.keys) == null ? void 0 : _b.length) {
+  if ((_b = config == null ? void 0 : config.keys) == null ? void 0 : _b.length) {
     const keys = new Set(config.keys);
     for (let i = 0; i < dataLength && keys.size > 0; i++) {
       const key = keyExtractor(data[i], i);
@@ -5791,6 +5793,12 @@ function getAlwaysRenderIndices(config, data, keyExtractor) {
       }
     }
   }
+  if (anchoredEndSpaceAnchorIndex !== void 0 && Number.isFinite(anchoredEndSpaceAnchorIndex)) {
+    const anchorIndex = Math.floor(anchoredEndSpaceAnchorIndex);
+    for (let i = anchorIndex >= 0 ? anchorIndex : dataLength; i < dataLength; i++) {
+      addIndex(result, dataLength, i);
+    }
+  }
   const indices = Array.from(result);
   indices.sort(sortAsc);
   return indices;
@@ -5954,7 +5962,7 @@ var LegendList = typedMemo(
   })
 );
 var LegendListInner = typedForwardRef(function LegendListInner2(props, forwardedRef) {
-  var _a3, _b, _c, _d, _e, _f, _g, _h;
+  var _a3, _b, _c, _d, _e, _f, _g, _h, _i;
   const noopOnScroll = React3.useCallback((_event) => {
   }, []);
   if (props.recycleItems === void 0) {
@@ -6083,9 +6091,10 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const keyExtractor = keyExtractorProp != null ? keyExtractorProp : ((_item, index) => index.toString());
   const stickyHeaderIndices = stickyHeaderIndicesProp != null ? stickyHeaderIndicesProp : stickyIndicesDeprecated;
   const alwaysRenderIndices = React3.useMemo(() => {
-    const indices = getAlwaysRenderIndices(alwaysRender, dataProp, keyExtractor);
+    const indices = getAlwaysRenderIndices(alwaysRender, dataProp, keyExtractor, anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex);
     return { arr: indices, set: new Set(indices) };
   }, [
+    anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex,
     alwaysRender == null ? void 0 : alwaysRender.top,
     alwaysRender == null ? void 0 : alwaysRender.bottom,
     (_d = alwaysRender == null ? void 0 : alwaysRender.indices) == null ? void 0 : _d.join(","),
@@ -6191,6 +6200,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const throttledOnScroll = useThrottledOnScroll(onScrollProp != null ? onScrollProp : noopOnScroll, scrollEventThrottle != null ? scrollEventThrottle : 0);
   const throttleScrollFn = scrollEventThrottle && onScrollProp ? throttledOnScroll : onScrollProp;
   const anchoredEndSpaceResolved = anchoredEndSpace ? { ...anchoredEndSpace, includeInEndInset: true } : anchoredEndSpace;
+  const didAnchoredEndSpaceAnchorIndexChange = !isFirstLocal && !didDataChangeLocal && ((_g = state.props.anchoredEndSpace) == null ? void 0 : _g.anchorIndex) !== (anchoredEndSpaceResolved == null ? void 0 : anchoredEndSpaceResolved.anchorIndex);
   state.props = {
     alignItemsAtEnd,
     alwaysRender,
@@ -6300,6 +6310,11 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     });
   }, [dataProp.length, didDataChangeLocal, initialScrollAtEnd, stylePaddingBottomState, usesBootstrapInitialScroll]);
   React3.useLayoutEffect(() => {
+    var _a4;
+    if (didAnchoredEndSpaceAnchorIndexChange) {
+      state.scrollForNextCalculateItemsInView = void 0;
+      (_a4 = state.triggerCalculateItemsInView) == null ? void 0 : _a4.call(state);
+    }
     maybeUpdateAnchoredEndSpace(ctx);
   }, [
     ctx,
@@ -6308,6 +6323,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex,
     anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorMaxSize,
     anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorOffset,
+    didAnchoredEndSpaceAnchorIndexChange,
     numColumnsProp
   ]);
   const onLayoutFooter = React3.useCallback(
@@ -6461,7 +6477,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       onScroll: onScrollHandler,
       recycleItems,
       refreshControl: refreshControlElement ? stylePaddingTopState > 0 ? React3__namespace.cloneElement(refreshControlElement, {
-        progressViewOffset: ((_g = refreshControlElement.props.progressViewOffset) != null ? _g : 0) + stylePaddingTopState
+        progressViewOffset: ((_h = refreshControlElement.props.progressViewOffset) != null ? _h : 0) + stylePaddingTopState
       }) : refreshControlElement : onRefresh && /* @__PURE__ */ React3__namespace.createElement(
         RefreshControl,
         {
@@ -6472,7 +6488,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       ),
       refScrollView: combinedRef,
       renderScrollComponent,
-      scrollAdjustHandler: (_h = refState.current) == null ? void 0 : _h.scrollAdjustHandler,
+      scrollAdjustHandler: (_i = refState.current) == null ? void 0 : _i.scrollAdjustHandler,
       scrollEventThrottle: 0,
       snapToIndices,
       stickyHeaderIndices,