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

package/index.native.js

@@ -339,6 +339,15 @@ function useValue$(key, params) {
 }
 var typedForwardRef = React2.forwardRef;
 var typedMemo = React2.memo;
+var getComponent = (Component) => {
+  if (React2__namespace.isValidElement(Component)) {
+    return Component;
+  }
+  if (Component) {
+    return /* @__PURE__ */ React2__namespace.createElement(Component, null);
+  }
+  return null;
+};
 
 // src/components/PositionView.native.tsx
 var PositionViewState = typedMemo(function PositionViewState2({
@@ -387,22 +396,45 @@ var PositionViewSticky = typedMemo(function PositionViewSticky2({
   animatedScrollY,
   stickyOffset,
   index,
+  stickyHeaderConfig,
+  children,
   ...rest
 }) {
   const [position = POSITION_OUT_OF_VIEW, headerSize] = useArr$([`containerPosition${id}`, "headerSize"]);
   const transform = React2__namespace.useMemo(() => {
+    var _a3;
     if (animatedScrollY && stickyOffset !== void 0) {
+      const stickyConfigOffset = (_a3 = stickyHeaderConfig == null ? void 0 : stickyHeaderConfig.offset) != null ? _a3 : 0;
       const stickyPosition = animatedScrollY.interpolate({
         extrapolateLeft: "clamp",
         extrapolateRight: "extend",
-        inputRange: [position + headerSize, position + 5e3 + headerSize],
+        inputRange: [
+          position + headerSize - stickyConfigOffset - stickyOffset,
+          position + 5e3 + headerSize - stickyConfigOffset - stickyOffset
+        ],
         outputRange: [position, position + 5e3]
       });
       return horizontal ? [{ translateX: stickyPosition }] : [{ translateY: stickyPosition }];
     }
-  }, [animatedScrollY, headerSize, horizontal, stickyOffset, position]);
+  }, [animatedScrollY, headerSize, horizontal, stickyOffset, position, stickyHeaderConfig == null ? void 0 : stickyHeaderConfig.offset]);
   const viewStyle = React2__namespace.useMemo(() => [style, { zIndex: index + 1e3 }, { transform }], [style, transform]);
-  return /* @__PURE__ */ React2__namespace.createElement(reactNative.Animated.View, { ref: refView, style: viewStyle, ...rest });
+  const renderStickyHeaderBackdrop = React2__namespace.useMemo(() => {
+    if (!(stickyHeaderConfig == null ? void 0 : stickyHeaderConfig.backdropComponent)) {
+      return null;
+    }
+    return /* @__PURE__ */ React2__namespace.createElement(
+      reactNative.View,
+      {
+        style: {
+          inset: 0,
+          pointerEvents: "none",
+          position: "absolute"
+        }
+      },
+      getComponent(stickyHeaderConfig == null ? void 0 : stickyHeaderConfig.backdropComponent)
+    );
+  }, [stickyHeaderConfig == null ? void 0 : stickyHeaderConfig.backdropComponent]);
+  return /* @__PURE__ */ React2__namespace.createElement(reactNative.Animated.View, { ref: refView, style: viewStyle, ...rest }, renderStickyHeaderBackdrop, children);
 });
 var PositionView = IsNewArchitecture ? PositionViewState : PositionViewAnimated;
 function useInit(cb) {
@@ -603,7 +635,8 @@ var Container = typedMemo(function Container2({
   horizontal,
   getRenderedItem: getRenderedItem2,
   updateItemSize: updateItemSize2,
-  ItemSeparatorComponent
+  ItemSeparatorComponent,
+  stickyHeaderConfig
 }) {
   const ctx = useStateContext();
   const { columnWrapperStyle, animatedScrollY } = ctx;
@@ -746,6 +779,7 @@ var Container = typedMemo(function Container2({
       key: recycleItems ? void 0 : itemKey,
       onLayout,
       refView: ref,
+      stickyHeaderConfig,
       stickyOffset: isSticky ? stickyOffset : void 0,
       style
     },
@@ -883,15 +917,6 @@ var LayoutView = ({ onLayoutChange, refView, ...rest }) => {
 };
 
 // src/components/ListComponent.tsx
-var getComponent = (Component) => {
-  if (React2__namespace.isValidElement(Component)) {
-    return Component;
-  }
-  if (Component) {
-    return /* @__PURE__ */ React2__namespace.createElement(Component, null);
-  }
-  return null;
-};
 var ListComponent = typedMemo(function ListComponent2({
   canRender,
   style,
@@ -916,6 +941,7 @@ var ListComponent = typedMemo(function ListComponent2({
   scrollAdjustHandler,
   onLayoutHeader,
   snapToIndices,
+  stickyHeaderConfig,
   stickyHeaderIndices,
   ...rest
 }) {
@@ -938,7 +964,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,
@@ -956,6 +982,7 @@ var ListComponent = typedMemo(function ListComponent2({
         horizontal,
         ItemSeparatorComponent,
         recycleItems,
+        stickyHeaderConfig,
         updateItemSize: updateItemSize2,
         waitForInitialLayout
       }
@@ -1152,7 +1179,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);
   }
@@ -1160,6 +1187,7 @@ function clampScrollOffset(ctx, offset) {
   return clampedOffset;
 }
 var Platform2 = reactNative.Platform;
+var PlatformAdjustBreaksScroll = Platform2.OS === "android";
 
 // src/utils/setInitialRenderState.ts
 function setInitialRenderState(ctx, {
@@ -1183,6 +1211,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;
@@ -1193,8 +1222,8 @@ function finishScrollTo(ctx) {
     if ((_a3 = state.props) == null ? void 0 : _a3.data) {
       (_b = state.triggerCalculateItemsInView) == null ? void 0 : _b.call(state, { forceFullItemPositions: true });
     }
-    if (Platform2.OS === "web") {
-      state.scrollAdjustHandler.commitPendingAdjust();
+    if (PlatformAdjustBreaksScroll) {
+      state.scrollAdjustHandler.commitPendingAdjust(scrollingTo);
     }
     setInitialRenderState(ctx, { didInitialScroll: true });
   }
@@ -1565,7 +1594,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;
@@ -1573,7 +1602,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) {
@@ -1599,7 +1628,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);
@@ -1636,7 +1665,7 @@ function prepareMVCP(ctx, dataChanged) {
         }
       }
       if (Math.abs(positionDiff) > 0.1) {
-        requestAdjust(ctx, positionDiff, dataChanged && mvcpdataChanged);
+        requestAdjust(ctx, positionDiff, dataChanged && mvcpData);
       }
     };
   }
@@ -2569,7 +2598,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,
@@ -2838,8 +2867,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 {
@@ -2955,7 +2986,7 @@ var ScrollAdjustHandler = class {
   }
   requestAdjust(add) {
     const scrollingTo = this.ctx.state.scrollingTo;
-    if (Platform2.OS === "web" && (scrollingTo == null ? void 0 : scrollingTo.animated) && !scrollingTo.isInitialScroll) {
+    if (PlatformAdjustBreaksScroll && (scrollingTo == null ? void 0 : scrollingTo.animated) && !scrollingTo.isInitialScroll) {
       this.pendingAdjust += add;
       set$(this.ctx, "scrollAdjustPending", this.pendingAdjust);
     } else {
@@ -2969,17 +3000,28 @@ var ScrollAdjustHandler = class {
   getAdjust() {
     return this.appliedAdjust;
   }
-  commitPendingAdjust() {
-    if (Platform2.OS === "web") {
+  commitPendingAdjust(scrollTarget) {
+    if (PlatformAdjustBreaksScroll) {
       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);
       }
     }
@@ -3120,6 +3162,12 @@ function updateOneItemSize(ctx, itemKey, sizeObj) {
   }
   return 0;
 }
+function useWrapIfItem(fn) {
+  return React2.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 = React2.useCallback((element) => {
     for (const ref of refs) {
@@ -3301,18 +3349,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 = React2.useRef(null);
@@ -3438,6 +3486,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     viewabilityConfig,
     viewabilityConfigCallbackPairs,
     waitForInitialLayout = true,
+    stickyHeaderConfig,
     ...rest
   } = props;
   const animatedPropsInternal = props.animatedPropsInternal;
@@ -3555,13 +3604,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,
@@ -3599,7 +3648,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 && Platform2.OS === "ios") {
+    if (maintainVisibleContentPositionConfig.size && paddingDiff && prevPaddingTop !== void 0 && Platform2.OS === "ios") {
       if (state.scroll < 0) {
         paddingDiff += state.scroll;
       }
@@ -3792,6 +3841,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.mjs

@@ -318,6 +318,15 @@ function useValue$(key, params) {
 }
 var typedForwardRef = forwardRef;
 var typedMemo = memo;
+var getComponent = (Component) => {
+  if (React2.isValidElement(Component)) {
+    return Component;
+  }
+  if (Component) {
+    return /* @__PURE__ */ React2.createElement(Component, null);
+  }
+  return null;
+};
 
 // src/components/PositionView.native.tsx
 var PositionViewState = typedMemo(function PositionViewState2({
@@ -366,22 +375,45 @@ var PositionViewSticky = typedMemo(function PositionViewSticky2({
   animatedScrollY,
   stickyOffset,
   index,
+  stickyHeaderConfig,
+  children,
   ...rest
 }) {
   const [position = POSITION_OUT_OF_VIEW, headerSize] = useArr$([`containerPosition${id}`, "headerSize"]);
   const transform = React2.useMemo(() => {
+    var _a3;
     if (animatedScrollY && stickyOffset !== void 0) {
+      const stickyConfigOffset = (_a3 = stickyHeaderConfig == null ? void 0 : stickyHeaderConfig.offset) != null ? _a3 : 0;
       const stickyPosition = animatedScrollY.interpolate({
         extrapolateLeft: "clamp",
         extrapolateRight: "extend",
-        inputRange: [position + headerSize, position + 5e3 + headerSize],
+        inputRange: [
+          position + headerSize - stickyConfigOffset - stickyOffset,
+          position + 5e3 + headerSize - stickyConfigOffset - stickyOffset
+        ],
         outputRange: [position, position + 5e3]
       });
       return horizontal ? [{ translateX: stickyPosition }] : [{ translateY: stickyPosition }];
     }
-  }, [animatedScrollY, headerSize, horizontal, stickyOffset, position]);
+  }, [animatedScrollY, headerSize, horizontal, stickyOffset, position, stickyHeaderConfig == null ? void 0 : stickyHeaderConfig.offset]);
   const viewStyle = React2.useMemo(() => [style, { zIndex: index + 1e3 }, { transform }], [style, transform]);
-  return /* @__PURE__ */ React2.createElement(Animated.View, { ref: refView, style: viewStyle, ...rest });
+  const renderStickyHeaderBackdrop = React2.useMemo(() => {
+    if (!(stickyHeaderConfig == null ? void 0 : stickyHeaderConfig.backdropComponent)) {
+      return null;
+    }
+    return /* @__PURE__ */ React2.createElement(
+      View$1,
+      {
+        style: {
+          inset: 0,
+          pointerEvents: "none",
+          position: "absolute"
+        }
+      },
+      getComponent(stickyHeaderConfig == null ? void 0 : stickyHeaderConfig.backdropComponent)
+    );
+  }, [stickyHeaderConfig == null ? void 0 : stickyHeaderConfig.backdropComponent]);
+  return /* @__PURE__ */ React2.createElement(Animated.View, { ref: refView, style: viewStyle, ...rest }, renderStickyHeaderBackdrop, children);
 });
 var PositionView = IsNewArchitecture ? PositionViewState : PositionViewAnimated;
 function useInit(cb) {
@@ -582,7 +614,8 @@ var Container = typedMemo(function Container2({
   horizontal,
   getRenderedItem: getRenderedItem2,
   updateItemSize: updateItemSize2,
-  ItemSeparatorComponent
+  ItemSeparatorComponent,
+  stickyHeaderConfig
 }) {
   const ctx = useStateContext();
   const { columnWrapperStyle, animatedScrollY } = ctx;
@@ -725,6 +758,7 @@ var Container = typedMemo(function Container2({
       key: recycleItems ? void 0 : itemKey,
       onLayout,
       refView: ref,
+      stickyHeaderConfig,
       stickyOffset: isSticky ? stickyOffset : void 0,
       style
     },
@@ -862,15 +896,6 @@ var LayoutView = ({ onLayoutChange, refView, ...rest }) => {
 };
 
 // src/components/ListComponent.tsx
-var getComponent = (Component) => {
-  if (React2.isValidElement(Component)) {
-    return Component;
-  }
-  if (Component) {
-    return /* @__PURE__ */ React2.createElement(Component, null);
-  }
-  return null;
-};
 var ListComponent = typedMemo(function ListComponent2({
   canRender,
   style,
@@ -895,6 +920,7 @@ var ListComponent = typedMemo(function ListComponent2({
   scrollAdjustHandler,
   onLayoutHeader,
   snapToIndices,
+  stickyHeaderConfig,
   stickyHeaderIndices,
   ...rest
 }) {
@@ -917,7 +943,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,
@@ -935,6 +961,7 @@ var ListComponent = typedMemo(function ListComponent2({
         horizontal,
         ItemSeparatorComponent,
         recycleItems,
+        stickyHeaderConfig,
         updateItemSize: updateItemSize2,
         waitForInitialLayout
       }
@@ -1131,7 +1158,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);
   }
@@ -1139,6 +1166,7 @@ function clampScrollOffset(ctx, offset) {
   return clampedOffset;
 }
 var Platform2 = Platform;
+var PlatformAdjustBreaksScroll = Platform2.OS === "android";
 
 // src/utils/setInitialRenderState.ts
 function setInitialRenderState(ctx, {
@@ -1162,6 +1190,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;
@@ -1172,8 +1201,8 @@ function finishScrollTo(ctx) {
     if ((_a3 = state.props) == null ? void 0 : _a3.data) {
       (_b = state.triggerCalculateItemsInView) == null ? void 0 : _b.call(state, { forceFullItemPositions: true });
     }
-    if (Platform2.OS === "web") {
-      state.scrollAdjustHandler.commitPendingAdjust();
+    if (PlatformAdjustBreaksScroll) {
+      state.scrollAdjustHandler.commitPendingAdjust(scrollingTo);
     }
     setInitialRenderState(ctx, { didInitialScroll: true });
   }
@@ -1544,7 +1573,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;
@@ -1552,7 +1581,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) {
@@ -1578,7 +1607,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);
@@ -1615,7 +1644,7 @@ function prepareMVCP(ctx, dataChanged) {
         }
       }
       if (Math.abs(positionDiff) > 0.1) {
-        requestAdjust(ctx, positionDiff, dataChanged && mvcpdataChanged);
+        requestAdjust(ctx, positionDiff, dataChanged && mvcpData);
       }
     };
   }
@@ -2548,7 +2577,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,
@@ -2817,8 +2846,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 {
@@ -2934,7 +2965,7 @@ var ScrollAdjustHandler = class {
   }
   requestAdjust(add) {
     const scrollingTo = this.ctx.state.scrollingTo;
-    if (Platform2.OS === "web" && (scrollingTo == null ? void 0 : scrollingTo.animated) && !scrollingTo.isInitialScroll) {
+    if (PlatformAdjustBreaksScroll && (scrollingTo == null ? void 0 : scrollingTo.animated) && !scrollingTo.isInitialScroll) {
       this.pendingAdjust += add;
       set$(this.ctx, "scrollAdjustPending", this.pendingAdjust);
     } else {
@@ -2948,17 +2979,28 @@ var ScrollAdjustHandler = class {
   getAdjust() {
     return this.appliedAdjust;
   }
-  commitPendingAdjust() {
-    if (Platform2.OS === "web") {
+  commitPendingAdjust(scrollTarget) {
+    if (PlatformAdjustBreaksScroll) {
       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);
       }
     }
@@ -3099,6 +3141,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) {
@@ -3280,18 +3328,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);
@@ -3417,6 +3465,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     viewabilityConfig,
     viewabilityConfigCallbackPairs,
     waitForInitialLayout = true,
+    stickyHeaderConfig,
     ...rest
   } = props;
   const animatedPropsInternal = props.animatedPropsInternal;
@@ -3534,13 +3583,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,
@@ -3578,7 +3627,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 && Platform2.OS === "ios") {
+    if (maintainVisibleContentPositionConfig.size && paddingDiff && prevPaddingTop !== void 0 && Platform2.OS === "ios") {
       if (state.scroll < 0) {
         paddingDiff += state.scroll;
       }
@@ -3771,6 +3820,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/list",
-  "version": "3.0.0-beta.13",
+  "version": "3.0.0-beta.15",
   "description": "Legend List is a drop-in replacement for FlatList with much better performance and supporting dynamically sized items.",
   "sideEffects": false,
   "private": false,