@legendapp/list 3.0.0-beta.13 → 3.0.0-beta.15

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 - Feat: Web support
 - Breaking: Some of the maintainVisibleContentPosition behavior for preventing jumping while scrolling is now core behavior, and the behavior for maintaining scroll position when adding data is controlled by the prop, which is now disabled by default.
 
+## 2.0.18
+- Improvement: KeyboardAvoidingLegendList now supports KeyboardGestureArea with improved interactive behavior
+
+## 2.0.17
+- Feat: Add stickyHeaderOffset property to control sticky header positioning
+- Feat: Add sticky header backdrop component support
+- Fix: Improve KeyboardAvoidingLegendList quality by using animated contentOffset y instead of reanimated scrollTo
+- Fix: Initial scroll could sometimes be out of range beyond the ScrollView if some items are much larger than the estimated size
+- Fix: Item layout updates now work correctly when container is the exact same size as previous item on old arch
+
+## 2.0.16
+- Feat: Add KeyboardAvoidingLegendList component for better keyboard handling integration
+- Fix: Stale containers are not being removed and overlap with new data when using getItemType #335
+- Fix: Suppress keyExtractor warning when using lazy list mode #330
+
+## 2.0.15
+- Fix: Container allocation for sticky headers could duplicate containers, causing rendering issues
+- Fix: Sticky positioned components scrolling out of viewport after scrolling distance exceeded 5000
+
 ## 2.0.14
 - Feat: Add dataVersion prop to trigger re-render when mutating the data array in place
 

package/README.md

@@ -27,7 +27,7 @@ Beyond standard `FlatList` capabilities:
     *   `true`: Reuses item components for optimal performance. Be cautious if your item components contain local state, as it might be reused unexpectedly.
     *   `false` (default): Creates new item components every time. Less performant but safer if items have complex internal state.
 *   `maintainScrollAtEnd`: (boolean) If `true` and the user is scrolled near the bottom (within `maintainScrollAtEndThreshold * screen height`), the list automatically scrolls to the end when items are added or heights change. Useful for chat interfaces.
-*   `maintainVisibleContentPosition`: Keeps visible content steady during size/layout changes while scrolling (default). Pass `true` or `{ dataChanged: true }` to also anchor during data updates; pass `false` to disable; pass `{ scroll: false }` to opt out of scroll-time stabilization.
+*   `maintainVisibleContentPosition`: Keeps visible content steady during size/layout changes while scrolling up or when items resize above the viewport (default). Pass `true` or `{ data: true }` to also anchor during data updates; pass `false` to disable; pass `{ size: false }` to opt out of scroll-time stabilization.
 *   `alignItemsAtEnd`: (boolean) Useful for chat UIs, content smaller than the View will be aligned to the bottom of the list.
 
 ---

package/index.d.mts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Dispatch, SetStateAction } from 'react';
-import { L as LegendListProps, a as LegendListRef, V as ViewabilityCallback, b as ViewabilityAmountCallback, c as LegendListRecyclingState } from './types-BSoW8ni4.mjs';
-export { C as ColumnWrapperStyle, w as GetRenderedItem, G as GetRenderedItemResult, v as InitialScrollAnchor, I as InternalState, d as LegendListPropsBase, h as LegendListRenderItemProps, i as LegendListState, f as MaintainScrollAtEndOptions, M as MaintainVisibleContentPositionConfig, e as MaintainVisibleContentPositionNormalized, O as OnViewableItemsChanged, r as ScrollIndexWithOffset, u as ScrollIndexWithOffsetAndContentOffset, s as ScrollIndexWithOffsetPosition, S as ScrollTarget, T as ThresholdSnapshot, o as TypedForwardRef, p as TypedMemo, k as ViewAmountToken, j as ViewToken, n as ViewabilityConfig, l as ViewabilityConfigCallbackPair, m as ViewabilityConfigCallbackPairs, g as ViewableRange, t as typedForwardRef, q as typedMemo } from './types-BSoW8ni4.mjs';
+import { L as LegendListProps, a as LegendListRef, V as ViewabilityCallback, b as ViewabilityAmountCallback, c as LegendListRecyclingState } from './types-Dj2MEm9V.mjs';
+export { C as ColumnWrapperStyle, x as GetRenderedItem, G as GetRenderedItemResult, w as InitialScrollAnchor, I as InternalState, d as LegendListPropsBase, i as LegendListRenderItemProps, j as LegendListState, f as MaintainScrollAtEndOptions, M as MaintainVisibleContentPositionConfig, e as MaintainVisibleContentPositionNormalized, O as OnViewableItemsChanged, s as ScrollIndexWithOffset, v as ScrollIndexWithOffsetAndContentOffset, u as ScrollIndexWithOffsetPosition, g as ScrollTarget, S as StickyHeaderConfig, T as ThresholdSnapshot, p as TypedForwardRef, q as TypedMemo, l as ViewAmountToken, k as ViewToken, o as ViewabilityConfig, m as ViewabilityConfigCallbackPair, n as ViewabilityConfigCallbackPairs, h as ViewableRange, t as typedForwardRef, r as typedMemo } from './types-Dj2MEm9V.mjs';
 import 'react-native';
 import 'react-native-reanimated';
 

package/index.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Dispatch, SetStateAction } from 'react';
-import { L as LegendListProps, a as LegendListRef, V as ViewabilityCallback, b as ViewabilityAmountCallback, c as LegendListRecyclingState } from './types-BSoW8ni4.js';
-export { C as ColumnWrapperStyle, w as GetRenderedItem, G as GetRenderedItemResult, v as InitialScrollAnchor, I as InternalState, d as LegendListPropsBase, h as LegendListRenderItemProps, i as LegendListState, f as MaintainScrollAtEndOptions, M as MaintainVisibleContentPositionConfig, e as MaintainVisibleContentPositionNormalized, O as OnViewableItemsChanged, r as ScrollIndexWithOffset, u as ScrollIndexWithOffsetAndContentOffset, s as ScrollIndexWithOffsetPosition, S as ScrollTarget, T as ThresholdSnapshot, o as TypedForwardRef, p as TypedMemo, k as ViewAmountToken, j as ViewToken, n as ViewabilityConfig, l as ViewabilityConfigCallbackPair, m as ViewabilityConfigCallbackPairs, g as ViewableRange, t as typedForwardRef, q as typedMemo } from './types-BSoW8ni4.js';
+import { L as LegendListProps, a as LegendListRef, V as ViewabilityCallback, b as ViewabilityAmountCallback, c as LegendListRecyclingState } from './types-Dj2MEm9V.js';
+export { C as ColumnWrapperStyle, x as GetRenderedItem, G as GetRenderedItemResult, w as InitialScrollAnchor, I as InternalState, d as LegendListPropsBase, i as LegendListRenderItemProps, j as LegendListState, f as MaintainScrollAtEndOptions, M as MaintainVisibleContentPositionConfig, e as MaintainVisibleContentPositionNormalized, O as OnViewableItemsChanged, s as ScrollIndexWithOffset, v as ScrollIndexWithOffsetAndContentOffset, u as ScrollIndexWithOffsetPosition, g as ScrollTarget, S as StickyHeaderConfig, T as ThresholdSnapshot, p as TypedForwardRef, q as TypedMemo, l as ViewAmountToken, k as ViewToken, o as ViewabilityConfig, m as ViewabilityConfigCallbackPair, n as ViewabilityConfigCallbackPairs, h as ViewableRange, t as typedForwardRef, r as typedMemo } from './types-Dj2MEm9V.js';
 import 'react-native';
 import 'react-native-reanimated';
 

package/index.js

@@ -622,7 +622,8 @@ var Container = typedMemo(function Container2({
   horizontal,
   getRenderedItem: getRenderedItem2,
   updateItemSize: updateItemSize2,
-  ItemSeparatorComponent
+  ItemSeparatorComponent,
+  stickyHeaderConfig
 }) {
   const ctx = useStateContext();
   const { columnWrapperStyle, animatedScrollY } = ctx;
@@ -736,6 +737,7 @@ var Container = typedMemo(function Container2({
       key: recycleItems ? void 0 : itemKey,
       onLayout,
       refView: ref,
+      stickyHeaderConfig,
       stickyOffset: isSticky ? stickyOffset : void 0,
       style
     },
@@ -895,7 +897,8 @@ var Containers = typedMemo(function Containers2({
   ItemSeparatorComponent,
   waitForInitialLayout,
   updateItemSize: updateItemSize2,
-  getRenderedItem: getRenderedItem2
+  getRenderedItem: getRenderedItem2,
+  stickyHeaderConfig
 }) {
   const [numContainers, numColumns] = useArr$(["numContainersPooled", "numColumns"]);
   const containers = [];
@@ -910,6 +913,7 @@ var Containers = typedMemo(function Containers2({
           id: i,
           key: i,
           recycleItems,
+          stickyHeaderConfig,
           updateItemSize: updateItemSize2
         }
       )
@@ -1173,8 +1177,6 @@ var LayoutView = ({ onLayoutChange, refView, children, ...rest }) => {
   useOnLayoutSync({ onLayoutChange, ref });
   return /* @__PURE__ */ React3__namespace.createElement("div", { ...rest, ref }, children);
 };
-
-// src/components/ListComponent.tsx
 var getComponent = (Component) => {
   if (React3__namespace.isValidElement(Component)) {
     return Component;
@@ -1184,6 +1186,8 @@ var getComponent = (Component) => {
   }
   return null;
 };
+
+// src/components/ListComponent.tsx
 var ListComponent = typedMemo(function ListComponent2({
   canRender,
   style,
@@ -1208,6 +1212,7 @@ var ListComponent = typedMemo(function ListComponent2({
   scrollAdjustHandler,
   onLayoutHeader,
   snapToIndices,
+  stickyHeaderConfig,
   stickyHeaderIndices,
   ...rest
 }) {
@@ -1230,7 +1235,7 @@ var ListComponent = typedMemo(function ListComponent2({
       ],
       contentOffset: initialContentOffset ? horizontal ? { x: initialContentOffset, y: 0 } : { x: 0, y: initialContentOffset } : void 0,
       horizontal,
-      maintainVisibleContentPosition: maintainVisibleContentPosition.scroll || maintainVisibleContentPosition.dataChanged ? { minIndexForVisible: 0 } : void 0,
+      maintainVisibleContentPosition: maintainVisibleContentPosition.size || maintainVisibleContentPosition.data ? { minIndexForVisible: 0 } : void 0,
       onLayout,
       onScroll: onScroll2,
       ref: refScrollView,
@@ -1248,6 +1253,7 @@ var ListComponent = typedMemo(function ListComponent2({
         horizontal,
         ItemSeparatorComponent,
         recycleItems,
+        stickyHeaderConfig,
         updateItemSize: updateItemSize2,
         waitForInitialLayout
       }
@@ -1442,7 +1448,7 @@ function clampScrollOffset(ctx, offset) {
   const state = ctx.state;
   const contentSize = getContentSize(ctx);
   let clampedOffset = offset;
-  if (Number.isFinite(contentSize) && Number.isFinite(state.scrollLength)) {
+  if (Number.isFinite(contentSize) && Number.isFinite(state.scrollLength) && state.lastLayout) {
     const maxOffset = Math.max(0, contentSize - state.scrollLength);
     clampedOffset = Math.min(offset, maxOffset);
   }
@@ -1472,6 +1478,7 @@ function finishScrollTo(ctx) {
   var _a3, _b;
   const state = ctx.state;
   if (state == null ? void 0 : state.scrollingTo) {
+    const scrollingTo = state.scrollingTo;
     state.scrollHistory.length = 0;
     state.initialScroll = void 0;
     state.initialAnchor = void 0;
@@ -1483,7 +1490,7 @@ function finishScrollTo(ctx) {
       (_b = state.triggerCalculateItemsInView) == null ? void 0 : _b.call(state, { forceFullItemPositions: true });
     }
     {
-      state.scrollAdjustHandler.commitPendingAdjust();
+      state.scrollAdjustHandler.commitPendingAdjust(scrollingTo);
     }
     setInitialRenderState(ctx, { didInitialScroll: true });
   }
@@ -1775,7 +1782,7 @@ function prepareMVCP(ctx, dataChanged) {
   const state = ctx.state;
   const { idsInView, positions, props } = state;
   const {
-    maintainVisibleContentPosition: { dataChanged: mvcpdataChanged, scroll: mvcpScroll }
+    maintainVisibleContentPosition: { data: mvcpData, size: mvcpScroll }
   } = props;
   const scrollingTo = state.scrollingTo;
   let prevPosition;
@@ -1783,7 +1790,7 @@ function prepareMVCP(ctx, dataChanged) {
   const idsInViewWithPositions = [];
   const scrollTarget = scrollingTo == null ? void 0 : scrollingTo.index;
   const scrollingToViewPosition = scrollingTo == null ? void 0 : scrollingTo.viewPosition;
-  const shouldMVCP = dataChanged ? mvcpdataChanged : mvcpScroll;
+  const shouldMVCP = dataChanged ? mvcpData : mvcpScroll;
   const indexByKey = state.indexByKey;
   if (shouldMVCP) {
     if (scrollTarget !== void 0) {
@@ -1806,7 +1813,7 @@ function prepareMVCP(ctx, dataChanged) {
     }
     return () => {
       let positionDiff = 0;
-      if (dataChanged && targetId === void 0 && mvcpdataChanged) {
+      if (dataChanged && targetId === void 0 && mvcpData) {
         for (let i = 0; i < idsInViewWithPositions.length; i++) {
           const { id, position } = idsInViewWithPositions[i];
           const newPosition = positions.get(id);
@@ -2759,7 +2766,7 @@ function calculateItemsInView(ctx, params = {}) {
       if (needNewContainers.length > 0) {
         const requiredItemTypes = getItemType ? needNewContainers.map((i) => {
           const itemType = getItemType(data[i], i);
-          return itemType ? String(itemType) : "";
+          return itemType !== void 0 ? String(itemType) : "";
         }) : void 0;
         const availableContainers = findAvailableContainers(
           ctx,
@@ -3071,8 +3078,10 @@ function doInitialAllocateContainers(ctx) {
       const num = Math.min(20, data.length);
       for (let i = 0; i < num; i++) {
         const item = data[i];
-        const itemType = getItemType ? (_a3 = getItemType(item, i)) != null ? _a3 : "" : "";
-        totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(i, item, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(i, item, itemType)) != null ? _c : estimatedItemSize;
+        if (item !== void 0) {
+          const itemType = (_a3 = getItemType == null ? void 0 : getItemType(item, i)) != null ? _a3 : "";
+          totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(i, item, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(i, item, itemType)) != null ? _c : estimatedItemSize;
+        }
       }
       averageItemSize = totalSize / num;
     } else {
@@ -3202,17 +3211,28 @@ var ScrollAdjustHandler = class {
   getAdjust() {
     return this.appliedAdjust;
   }
-  commitPendingAdjust() {
+  commitPendingAdjust(scrollTarget) {
     {
       const state = this.ctx.state;
       const pending = this.pendingAdjust;
+      this.pendingAdjust = 0;
       if (pending !== 0) {
-        this.pendingAdjust = 0;
-        this.appliedAdjust += pending;
-        state.scroll += pending;
-        state.scrollForNextCalculateItemsInView = void 0;
+        let targetScroll;
+        if ((scrollTarget == null ? void 0 : scrollTarget.index) !== void 0) {
+          const currentOffset = calculateOffsetForIndex(this.ctx, scrollTarget.index);
+          targetScroll = calculateOffsetWithOffsetPosition(this.ctx, currentOffset, scrollTarget);
+          targetScroll = clampScrollOffset(this.ctx, targetScroll);
+        } else {
+          targetScroll = clampScrollOffset(this.ctx, state.scroll + pending);
+        }
+        const adjustment = targetScroll - state.scroll;
+        if (Math.abs(adjustment) > 0.1 || Math.abs(pending) > 0.1) {
+          this.appliedAdjust += adjustment;
+          state.scroll = targetScroll;
+          state.scrollForNextCalculateItemsInView = void 0;
+          set$(this.ctx, "scrollAdjust", this.appliedAdjust);
+        }
         set$(this.ctx, "scrollAdjustPending", 0);
-        set$(this.ctx, "scrollAdjust", this.appliedAdjust);
         calculateItemsInView(this.ctx);
       }
     }
@@ -3353,6 +3373,12 @@ function updateOneItemSize(ctx, itemKey, sizeObj) {
   }
   return 0;
 }
+function useWrapIfItem(fn) {
+  return React3.useMemo(
+    () => fn ? (arg1, arg2, arg3) => arg1 !== void 0 && arg2 !== void 0 ? fn(arg1, arg2, arg3) : void 0 : void 0,
+    [fn]
+  );
+}
 var useCombinedRef = (...refs) => {
   const callback = React3.useCallback((element) => {
     for (const ref of refs) {
@@ -3515,18 +3541,18 @@ function getRenderedItem(ctx, key) {
 function normalizeMaintainVisibleContentPosition(value) {
   var _a3, _b;
   if (value === true) {
-    return { dataChanged: true, scroll: true };
+    return { data: true, size: true };
   }
   if (value && typeof value === "object") {
     return {
-      dataChanged: (_a3 = value.dataChanged) != null ? _a3 : false,
-      scroll: (_b = value.scroll) != null ? _b : true
+      data: (_a3 = value.data) != null ? _a3 : false,
+      size: (_b = value.size) != null ? _b : true
     };
   }
   if (value === false) {
-    return { dataChanged: false, scroll: false };
+    return { data: false, size: false };
   }
-  return { dataChanged: false, scroll: true };
+  return { data: false, size: true };
 }
 function useThrottleDebounce(mode) {
   const timeoutRef = React3.useRef(null);
@@ -3652,6 +3678,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     viewabilityConfig,
     viewabilityConfigCallbackPairs,
     waitForInitialLayout = true,
+    stickyHeaderConfig,
     ...rest
   } = props;
   const animatedPropsInternal = props.animatedPropsInternal;
@@ -3769,13 +3796,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     data: dataProp,
     dataVersion,
     estimatedItemSize,
-    getEstimatedItemSize,
-    getFixedItemSize,
-    getItemType,
+    getEstimatedItemSize: useWrapIfItem(getEstimatedItemSize),
+    getFixedItemSize: useWrapIfItem(getFixedItemSize),
+    getItemType: useWrapIfItem(getItemType),
     horizontal: !!horizontal,
     initialContainerPoolRatio,
     itemsAreEqual,
-    keyExtractor,
+    keyExtractor: useWrapIfItem(keyExtractor),
     maintainScrollAtEnd,
     maintainScrollAtEndThreshold,
     maintainVisibleContentPosition: maintainVisibleContentPositionConfig,
@@ -3813,7 +3840,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     setPaddingTop(ctx, { stylePaddingTop: stylePaddingTopState });
     refState.current.props.stylePaddingBottom = stylePaddingBottomState;
     let paddingDiff = stylePaddingTopState - prevPaddingTop;
-    if (maintainVisibleContentPositionConfig.scroll && paddingDiff && prevPaddingTop !== void 0 && Platform.OS === "ios") {
+    if (maintainVisibleContentPositionConfig.size && paddingDiff && prevPaddingTop !== void 0 && Platform.OS === "ios") {
       if (state.scroll < 0) {
         paddingDiff += state.scroll;
       }
@@ -3989,6 +4016,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       scrollAdjustHandler: (_b = refState.current) == null ? void 0 : _b.scrollAdjustHandler,
       scrollEventThrottle: 0,
       snapToIndices,
+      stickyHeaderConfig,
       stickyHeaderIndices,
       style,
       updateItemSize: fns.updateItemSize,

package/index.mjs

@@ -601,7 +601,8 @@ var Container = typedMemo(function Container2({
   horizontal,
   getRenderedItem: getRenderedItem2,
   updateItemSize: updateItemSize2,
-  ItemSeparatorComponent
+  ItemSeparatorComponent,
+  stickyHeaderConfig
 }) {
   const ctx = useStateContext();
   const { columnWrapperStyle, animatedScrollY } = ctx;
@@ -715,6 +716,7 @@ var Container = typedMemo(function Container2({
       key: recycleItems ? void 0 : itemKey,
       onLayout,
       refView: ref,
+      stickyHeaderConfig,
       stickyOffset: isSticky ? stickyOffset : void 0,
       style
     },
@@ -874,7 +876,8 @@ var Containers = typedMemo(function Containers2({
   ItemSeparatorComponent,
   waitForInitialLayout,
   updateItemSize: updateItemSize2,
-  getRenderedItem: getRenderedItem2
+  getRenderedItem: getRenderedItem2,
+  stickyHeaderConfig
 }) {
   const [numContainers, numColumns] = useArr$(["numContainersPooled", "numColumns"]);
   const containers = [];
@@ -889,6 +892,7 @@ var Containers = typedMemo(function Containers2({
           id: i,
           key: i,
           recycleItems,
+          stickyHeaderConfig,
           updateItemSize: updateItemSize2
         }
       )
@@ -1152,8 +1156,6 @@ var LayoutView = ({ onLayoutChange, refView, children, ...rest }) => {
   useOnLayoutSync({ onLayoutChange, ref });
   return /* @__PURE__ */ React3.createElement("div", { ...rest, ref }, children);
 };
-
-// src/components/ListComponent.tsx
 var getComponent = (Component) => {
   if (React3.isValidElement(Component)) {
     return Component;
@@ -1163,6 +1165,8 @@ var getComponent = (Component) => {
   }
   return null;
 };
+
+// src/components/ListComponent.tsx
 var ListComponent = typedMemo(function ListComponent2({
   canRender,
   style,
@@ -1187,6 +1191,7 @@ var ListComponent = typedMemo(function ListComponent2({
   scrollAdjustHandler,
   onLayoutHeader,
   snapToIndices,
+  stickyHeaderConfig,
   stickyHeaderIndices,
   ...rest
 }) {
@@ -1209,7 +1214,7 @@ var ListComponent = typedMemo(function ListComponent2({
       ],
       contentOffset: initialContentOffset ? horizontal ? { x: initialContentOffset, y: 0 } : { x: 0, y: initialContentOffset } : void 0,
       horizontal,
-      maintainVisibleContentPosition: maintainVisibleContentPosition.scroll || maintainVisibleContentPosition.dataChanged ? { minIndexForVisible: 0 } : void 0,
+      maintainVisibleContentPosition: maintainVisibleContentPosition.size || maintainVisibleContentPosition.data ? { minIndexForVisible: 0 } : void 0,
       onLayout,
       onScroll: onScroll2,
       ref: refScrollView,
@@ -1227,6 +1232,7 @@ var ListComponent = typedMemo(function ListComponent2({
         horizontal,
         ItemSeparatorComponent,
         recycleItems,
+        stickyHeaderConfig,
         updateItemSize: updateItemSize2,
         waitForInitialLayout
       }
@@ -1421,7 +1427,7 @@ function clampScrollOffset(ctx, offset) {
   const state = ctx.state;
   const contentSize = getContentSize(ctx);
   let clampedOffset = offset;
-  if (Number.isFinite(contentSize) && Number.isFinite(state.scrollLength)) {
+  if (Number.isFinite(contentSize) && Number.isFinite(state.scrollLength) && state.lastLayout) {
     const maxOffset = Math.max(0, contentSize - state.scrollLength);
     clampedOffset = Math.min(offset, maxOffset);
   }
@@ -1451,6 +1457,7 @@ function finishScrollTo(ctx) {
   var _a3, _b;
   const state = ctx.state;
   if (state == null ? void 0 : state.scrollingTo) {
+    const scrollingTo = state.scrollingTo;
     state.scrollHistory.length = 0;
     state.initialScroll = void 0;
     state.initialAnchor = void 0;
@@ -1462,7 +1469,7 @@ function finishScrollTo(ctx) {
       (_b = state.triggerCalculateItemsInView) == null ? void 0 : _b.call(state, { forceFullItemPositions: true });
     }
     {
-      state.scrollAdjustHandler.commitPendingAdjust();
+      state.scrollAdjustHandler.commitPendingAdjust(scrollingTo);
     }
     setInitialRenderState(ctx, { didInitialScroll: true });
   }
@@ -1754,7 +1761,7 @@ function prepareMVCP(ctx, dataChanged) {
   const state = ctx.state;
   const { idsInView, positions, props } = state;
   const {
-    maintainVisibleContentPosition: { dataChanged: mvcpdataChanged, scroll: mvcpScroll }
+    maintainVisibleContentPosition: { data: mvcpData, size: mvcpScroll }
   } = props;
   const scrollingTo = state.scrollingTo;
   let prevPosition;
@@ -1762,7 +1769,7 @@ function prepareMVCP(ctx, dataChanged) {
   const idsInViewWithPositions = [];
   const scrollTarget = scrollingTo == null ? void 0 : scrollingTo.index;
   const scrollingToViewPosition = scrollingTo == null ? void 0 : scrollingTo.viewPosition;
-  const shouldMVCP = dataChanged ? mvcpdataChanged : mvcpScroll;
+  const shouldMVCP = dataChanged ? mvcpData : mvcpScroll;
   const indexByKey = state.indexByKey;
   if (shouldMVCP) {
     if (scrollTarget !== void 0) {
@@ -1785,7 +1792,7 @@ function prepareMVCP(ctx, dataChanged) {
     }
     return () => {
       let positionDiff = 0;
-      if (dataChanged && targetId === void 0 && mvcpdataChanged) {
+      if (dataChanged && targetId === void 0 && mvcpData) {
         for (let i = 0; i < idsInViewWithPositions.length; i++) {
           const { id, position } = idsInViewWithPositions[i];
           const newPosition = positions.get(id);
@@ -2738,7 +2745,7 @@ function calculateItemsInView(ctx, params = {}) {
       if (needNewContainers.length > 0) {
         const requiredItemTypes = getItemType ? needNewContainers.map((i) => {
           const itemType = getItemType(data[i], i);
-          return itemType ? String(itemType) : "";
+          return itemType !== void 0 ? String(itemType) : "";
         }) : void 0;
         const availableContainers = findAvailableContainers(
           ctx,
@@ -3050,8 +3057,10 @@ function doInitialAllocateContainers(ctx) {
       const num = Math.min(20, data.length);
       for (let i = 0; i < num; i++) {
         const item = data[i];
-        const itemType = getItemType ? (_a3 = getItemType(item, i)) != null ? _a3 : "" : "";
-        totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(i, item, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(i, item, itemType)) != null ? _c : estimatedItemSize;
+        if (item !== void 0) {
+          const itemType = (_a3 = getItemType == null ? void 0 : getItemType(item, i)) != null ? _a3 : "";
+          totalSize += (_c = (_b = getFixedItemSize == null ? void 0 : getFixedItemSize(i, item, itemType)) != null ? _b : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(i, item, itemType)) != null ? _c : estimatedItemSize;
+        }
       }
       averageItemSize = totalSize / num;
     } else {
@@ -3181,17 +3190,28 @@ var ScrollAdjustHandler = class {
   getAdjust() {
     return this.appliedAdjust;
   }
-  commitPendingAdjust() {
+  commitPendingAdjust(scrollTarget) {
     {
       const state = this.ctx.state;
       const pending = this.pendingAdjust;
+      this.pendingAdjust = 0;
       if (pending !== 0) {
-        this.pendingAdjust = 0;
-        this.appliedAdjust += pending;
-        state.scroll += pending;
-        state.scrollForNextCalculateItemsInView = void 0;
+        let targetScroll;
+        if ((scrollTarget == null ? void 0 : scrollTarget.index) !== void 0) {
+          const currentOffset = calculateOffsetForIndex(this.ctx, scrollTarget.index);
+          targetScroll = calculateOffsetWithOffsetPosition(this.ctx, currentOffset, scrollTarget);
+          targetScroll = clampScrollOffset(this.ctx, targetScroll);
+        } else {
+          targetScroll = clampScrollOffset(this.ctx, state.scroll + pending);
+        }
+        const adjustment = targetScroll - state.scroll;
+        if (Math.abs(adjustment) > 0.1 || Math.abs(pending) > 0.1) {
+          this.appliedAdjust += adjustment;
+          state.scroll = targetScroll;
+          state.scrollForNextCalculateItemsInView = void 0;
+          set$(this.ctx, "scrollAdjust", this.appliedAdjust);
+        }
         set$(this.ctx, "scrollAdjustPending", 0);
-        set$(this.ctx, "scrollAdjust", this.appliedAdjust);
         calculateItemsInView(this.ctx);
       }
     }
@@ -3332,6 +3352,12 @@ function updateOneItemSize(ctx, itemKey, sizeObj) {
   }
   return 0;
 }
+function useWrapIfItem(fn) {
+  return useMemo(
+    () => fn ? (arg1, arg2, arg3) => arg1 !== void 0 && arg2 !== void 0 ? fn(arg1, arg2, arg3) : void 0 : void 0,
+    [fn]
+  );
+}
 var useCombinedRef = (...refs) => {
   const callback = useCallback((element) => {
     for (const ref of refs) {
@@ -3494,18 +3520,18 @@ function getRenderedItem(ctx, key) {
 function normalizeMaintainVisibleContentPosition(value) {
   var _a3, _b;
   if (value === true) {
-    return { dataChanged: true, scroll: true };
+    return { data: true, size: true };
   }
   if (value && typeof value === "object") {
     return {
-      dataChanged: (_a3 = value.dataChanged) != null ? _a3 : false,
-      scroll: (_b = value.scroll) != null ? _b : true
+      data: (_a3 = value.data) != null ? _a3 : false,
+      size: (_b = value.size) != null ? _b : true
     };
   }
   if (value === false) {
-    return { dataChanged: false, scroll: false };
+    return { data: false, size: false };
   }
-  return { dataChanged: false, scroll: true };
+  return { data: false, size: true };
 }
 function useThrottleDebounce(mode) {
   const timeoutRef = useRef(null);
@@ -3631,6 +3657,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     viewabilityConfig,
     viewabilityConfigCallbackPairs,
     waitForInitialLayout = true,
+    stickyHeaderConfig,
     ...rest
   } = props;
   const animatedPropsInternal = props.animatedPropsInternal;
@@ -3748,13 +3775,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     data: dataProp,
     dataVersion,
     estimatedItemSize,
-    getEstimatedItemSize,
-    getFixedItemSize,
-    getItemType,
+    getEstimatedItemSize: useWrapIfItem(getEstimatedItemSize),
+    getFixedItemSize: useWrapIfItem(getFixedItemSize),
+    getItemType: useWrapIfItem(getItemType),
     horizontal: !!horizontal,
     initialContainerPoolRatio,
     itemsAreEqual,
-    keyExtractor,
+    keyExtractor: useWrapIfItem(keyExtractor),
     maintainScrollAtEnd,
     maintainScrollAtEndThreshold,
     maintainVisibleContentPosition: maintainVisibleContentPositionConfig,
@@ -3792,7 +3819,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     setPaddingTop(ctx, { stylePaddingTop: stylePaddingTopState });
     refState.current.props.stylePaddingBottom = stylePaddingBottomState;
     let paddingDiff = stylePaddingTopState - prevPaddingTop;
-    if (maintainVisibleContentPositionConfig.scroll && paddingDiff && prevPaddingTop !== void 0 && Platform.OS === "ios") {
+    if (maintainVisibleContentPositionConfig.size && paddingDiff && prevPaddingTop !== void 0 && Platform.OS === "ios") {
       if (state.scroll < 0) {
         paddingDiff += state.scroll;
       }
@@ -3968,6 +3995,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       scrollAdjustHandler: (_b = refState.current) == null ? void 0 : _b.scrollAdjustHandler,
       scrollEventThrottle: 0,
       snapToIndices,
+      stickyHeaderConfig,
       stickyHeaderIndices,
       style,
       updateItemSize: fns.updateItemSize,

package/index.native.d.mts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Dispatch, SetStateAction } from 'react';
-import { L as LegendListProps, a as LegendListRef, V as ViewabilityCallback, b as ViewabilityAmountCallback, c as LegendListRecyclingState } from './types-BSoW8ni4.mjs';
-export { C as ColumnWrapperStyle, w as GetRenderedItem, G as GetRenderedItemResult, v as InitialScrollAnchor, I as InternalState, d as LegendListPropsBase, h as LegendListRenderItemProps, i as LegendListState, f as MaintainScrollAtEndOptions, M as MaintainVisibleContentPositionConfig, e as MaintainVisibleContentPositionNormalized, O as OnViewableItemsChanged, r as ScrollIndexWithOffset, u as ScrollIndexWithOffsetAndContentOffset, s as ScrollIndexWithOffsetPosition, S as ScrollTarget, T as ThresholdSnapshot, o as TypedForwardRef, p as TypedMemo, k as ViewAmountToken, j as ViewToken, n as ViewabilityConfig, l as ViewabilityConfigCallbackPair, m as ViewabilityConfigCallbackPairs, g as ViewableRange, t as typedForwardRef, q as typedMemo } from './types-BSoW8ni4.mjs';
+import { L as LegendListProps, a as LegendListRef, V as ViewabilityCallback, b as ViewabilityAmountCallback, c as LegendListRecyclingState } from './types-Dj2MEm9V.mjs';
+export { C as ColumnWrapperStyle, x as GetRenderedItem, G as GetRenderedItemResult, w as InitialScrollAnchor, I as InternalState, d as LegendListPropsBase, i as LegendListRenderItemProps, j as LegendListState, f as MaintainScrollAtEndOptions, M as MaintainVisibleContentPositionConfig, e as MaintainVisibleContentPositionNormalized, O as OnViewableItemsChanged, s as ScrollIndexWithOffset, v as ScrollIndexWithOffsetAndContentOffset, u as ScrollIndexWithOffsetPosition, g as ScrollTarget, S as StickyHeaderConfig, T as ThresholdSnapshot, p as TypedForwardRef, q as TypedMemo, l as ViewAmountToken, k as ViewToken, o as ViewabilityConfig, m as ViewabilityConfigCallbackPair, n as ViewabilityConfigCallbackPairs, h as ViewableRange, t as typedForwardRef, r as typedMemo } from './types-Dj2MEm9V.mjs';
 import 'react-native';
 import 'react-native-reanimated';
 

package/index.native.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { Dispatch, SetStateAction } from 'react';
-import { L as LegendListProps, a as LegendListRef, V as ViewabilityCallback, b as ViewabilityAmountCallback, c as LegendListRecyclingState } from './types-BSoW8ni4.js';
-export { C as ColumnWrapperStyle, w as GetRenderedItem, G as GetRenderedItemResult, v as InitialScrollAnchor, I as InternalState, d as LegendListPropsBase, h as LegendListRenderItemProps, i as LegendListState, f as MaintainScrollAtEndOptions, M as MaintainVisibleContentPositionConfig, e as MaintainVisibleContentPositionNormalized, O as OnViewableItemsChanged, r as ScrollIndexWithOffset, u as ScrollIndexWithOffsetAndContentOffset, s as ScrollIndexWithOffsetPosition, S as ScrollTarget, T as ThresholdSnapshot, o as TypedForwardRef, p as TypedMemo, k as ViewAmountToken, j as ViewToken, n as ViewabilityConfig, l as ViewabilityConfigCallbackPair, m as ViewabilityConfigCallbackPairs, g as ViewableRange, t as typedForwardRef, q as typedMemo } from './types-BSoW8ni4.js';
+import { L as LegendListProps, a as LegendListRef, V as ViewabilityCallback, b as ViewabilityAmountCallback, c as LegendListRecyclingState } from './types-Dj2MEm9V.js';
+export { C as ColumnWrapperStyle, x as GetRenderedItem, G as GetRenderedItemResult, w as InitialScrollAnchor, I as InternalState, d as LegendListPropsBase, i as LegendListRenderItemProps, j as LegendListState, f as MaintainScrollAtEndOptions, M as MaintainVisibleContentPositionConfig, e as MaintainVisibleContentPositionNormalized, O as OnViewableItemsChanged, s as ScrollIndexWithOffset, v as ScrollIndexWithOffsetAndContentOffset, u as ScrollIndexWithOffsetPosition, g as ScrollTarget, S as StickyHeaderConfig, T as ThresholdSnapshot, p as TypedForwardRef, q as TypedMemo, l as ViewAmountToken, k as ViewToken, o as ViewabilityConfig, m as ViewabilityConfigCallbackPair, n as ViewabilityConfigCallbackPairs, h as ViewableRange, t as typedForwardRef, r as typedMemo } from './types-Dj2MEm9V.js';
 import 'react-native';
 import 'react-native-reanimated';