@legendapp/list 1.0.12 → 1.0.13

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.13
+- Fix: Missing React import in ListHeaderComponentContainer crashing some environments
+- Fix: `initialScrollIndex` was off by padding if using "padding" or "paddingVertical" props
+
 ## 1.0.12
 - Fix: Initial scroll index and scrollTo were not compensating for top padding
 - Fix: Removed an overly aggressive optimization that was sometimes causing blank spaces after scrolling

package/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var React3 = require('react');
+var React2 = require('react');
 var reactNative = require('react-native');
 var shim = require('use-sync-external-store/shim');
 
@@ -22,12 +22,12 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var React3__namespace = /*#__PURE__*/_interopNamespace(React3);
+var React2__namespace = /*#__PURE__*/_interopNamespace(React2);
 
 // src/LegendList.tsx
-var ContextState = React3__namespace.createContext(null);
+var ContextState = React2__namespace.createContext(null);
 function StateProvider({ children }) {
-  const [value] = React3__namespace.useState(() => ({
+  const [value] = React2__namespace.useState(() => ({
     listeners: /* @__PURE__ */ new Map(),
     values: /* @__PURE__ */ new Map([
       ["paddingTop", 0],
@@ -42,10 +42,10 @@ function StateProvider({ children }) {
     columnWrapperStyle: void 0,
     viewRefs: /* @__PURE__ */ new Map()
   }));
-  return /* @__PURE__ */ React3__namespace.createElement(ContextState.Provider, { value }, children);
+  return /* @__PURE__ */ React2__namespace.createElement(ContextState.Provider, { value }, children);
 }
 function useStateContext() {
-  return React3__namespace.useContext(ContextState);
+  return React2__namespace.useContext(ContextState);
 }
 function createSelectorFunctionsArr(ctx, signalNames) {
   let lastValues = [];
@@ -115,17 +115,17 @@ function getContentSize(ctx) {
   return headerSize + footerSize + totalSize + stylePaddingTop;
 }
 function useArr$(signalNames) {
-  const ctx = React3__namespace.useContext(ContextState);
-  const { subscribe, get } = React3__namespace.useMemo(() => createSelectorFunctionsArr(ctx, signalNames), [ctx, signalNames]);
+  const ctx = React2__namespace.useContext(ContextState);
+  const { subscribe, get } = React2__namespace.useMemo(() => createSelectorFunctionsArr(ctx, signalNames), [ctx, signalNames]);
   const value = shim.useSyncExternalStore(subscribe, get);
   return value;
 }
 
 // src/DebugView.tsx
 var DebugRow = ({ children }) => {
-  return /* @__PURE__ */ React3__namespace.createElement(reactNative.View, { style: { flexDirection: "row", alignItems: "center", justifyContent: "space-between" } }, children);
+  return /* @__PURE__ */ React2__namespace.createElement(reactNative.View, { style: { flexDirection: "row", alignItems: "center", justifyContent: "space-between" } }, children);
 };
-var DebugView = React3__namespace.memo(function DebugView2({ state }) {
+var DebugView = React2__namespace.memo(function DebugView2({ state }) {
   const ctx = useStateContext();
   const [
     totalSize = 0,
@@ -145,11 +145,11 @@ var DebugView = React3__namespace.memo(function DebugView2({ state }) {
     "numContainersPooled"
   ]);
   const contentSize = getContentSize(ctx);
-  const [, forceUpdate] = React3.useReducer((x) => x + 1, 0);
+  const [, forceUpdate] = React2.useReducer((x) => x + 1, 0);
   useInterval(() => {
     forceUpdate();
   }, 100);
-  return /* @__PURE__ */ React3__namespace.createElement(
+  return /* @__PURE__ */ React2__namespace.createElement(
     reactNative.View,
     {
       style: {
@@ -165,19 +165,19 @@ var DebugView = React3__namespace.memo(function DebugView2({ state }) {
       },
       pointerEvents: "none"
     },
-    /* @__PURE__ */ React3__namespace.createElement(DebugRow, null, /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, "TotalSize:"), /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, totalSize.toFixed(2))),
-    /* @__PURE__ */ React3__namespace.createElement(DebugRow, null, /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, "ContentSize:"), /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, contentSize.toFixed(2))),
-    /* @__PURE__ */ React3__namespace.createElement(DebugRow, null, /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, "At end:"), /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, String(state.isAtBottom))),
-    /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null),
-    /* @__PURE__ */ React3__namespace.createElement(DebugRow, null, /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, "ScrollAdjust:"), /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, scrollAdjust.toFixed(2))),
-    /* @__PURE__ */ React3__namespace.createElement(DebugRow, null, /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, "TotalSizeReal: "), /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, totalSizeWithScrollAdjust.toFixed(2))),
-    /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null),
-    /* @__PURE__ */ React3__namespace.createElement(DebugRow, null, /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, "RawScroll: "), /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, rawScroll.toFixed(2))),
-    /* @__PURE__ */ React3__namespace.createElement(DebugRow, null, /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, "ComputedScroll: "), /* @__PURE__ */ React3__namespace.createElement(reactNative.Text, null, scroll.toFixed(2)))
+    /* @__PURE__ */ React2__namespace.createElement(DebugRow, null, /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, "TotalSize:"), /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, totalSize.toFixed(2))),
+    /* @__PURE__ */ React2__namespace.createElement(DebugRow, null, /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, "ContentSize:"), /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, contentSize.toFixed(2))),
+    /* @__PURE__ */ React2__namespace.createElement(DebugRow, null, /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, "At end:"), /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, String(state.isAtBottom))),
+    /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null),
+    /* @__PURE__ */ React2__namespace.createElement(DebugRow, null, /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, "ScrollAdjust:"), /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, scrollAdjust.toFixed(2))),
+    /* @__PURE__ */ React2__namespace.createElement(DebugRow, null, /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, "TotalSizeReal: "), /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, totalSizeWithScrollAdjust.toFixed(2))),
+    /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null),
+    /* @__PURE__ */ React2__namespace.createElement(DebugRow, null, /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, "RawScroll: "), /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, rawScroll.toFixed(2))),
+    /* @__PURE__ */ React2__namespace.createElement(DebugRow, null, /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, "ComputedScroll: "), /* @__PURE__ */ React2__namespace.createElement(reactNative.Text, null, scroll.toFixed(2)))
   );
 });
 function useInterval(callback, delay) {
-  React3.useEffect(() => {
+  React2.useEffect(() => {
     const interval = setInterval(callback, delay);
     return () => clearInterval(interval);
   }, [delay]);
@@ -206,9 +206,16 @@ function comparatorByDistance(a, b) {
 function comparatorDefault(a, b) {
   return a - b;
 }
+function getPadding(s) {
+  var _a, _b, _c;
+  return (_c = (_b = (_a = s.paddingTop) != null ? _a : s.paddingVertical) != null ? _b : s.padding) != null ? _c : 0;
+}
+function extractPaddingTop(style, contentContainerStyle) {
+  return getPadding(style) + getPadding(contentContainerStyle);
+}
 var symbolFirst = Symbol();
 function useInit(cb) {
-  const refValue = React3.useRef(symbolFirst);
+  const refValue = React2.useRef(symbolFirst);
   if (refValue.current === symbolFirst) {
     refValue.current = cb();
   }
@@ -216,10 +223,10 @@ function useInit(cb) {
 }
 
 // src/ContextContainer.ts
-var ContextContainer = React3.createContext(null);
+var ContextContainer = React2.createContext(null);
 function useViewability(callback, configId) {
   const ctx = useStateContext();
-  const { containerId } = React3.useContext(ContextContainer);
+  const { containerId } = React2.useContext(ContextContainer);
   const key = containerId + (configId != null ? configId : "");
   useInit(() => {
     const value = ctx.mapViewabilityValues.get(key);
@@ -228,7 +235,7 @@ function useViewability(callback, configId) {
     }
   });
   ctx.mapViewabilityCallbacks.set(key, callback);
-  React3.useEffect(
+  React2.useEffect(
     () => () => {
       ctx.mapViewabilityCallbacks.delete(key);
     },
@@ -237,7 +244,7 @@ function useViewability(callback, configId) {
 }
 function useViewabilityAmount(callback) {
   const ctx = useStateContext();
-  const { containerId } = React3.useContext(ContextContainer);
+  const { containerId } = React2.useContext(ContextContainer);
   useInit(() => {
     const value = ctx.mapViewabilityAmountValues.get(containerId);
     if (value) {
@@ -245,7 +252,7 @@ function useViewabilityAmount(callback) {
     }
   });
   ctx.mapViewabilityAmountCallbacks.set(containerId, callback);
-  React3.useEffect(
+  React2.useEffect(
     () => () => {
       ctx.mapViewabilityAmountCallbacks.delete(containerId);
     },
@@ -253,12 +260,12 @@ function useViewabilityAmount(callback) {
   );
 }
 function useRecyclingEffect(effect) {
-  const { index, value } = React3.useContext(ContextContainer);
-  const prevValues = React3.useRef({
+  const { index, value } = React2.useContext(ContextContainer);
+  const prevValues = React2.useRef({
     prevIndex: void 0,
     prevItem: void 0
   });
-  React3.useEffect(() => {
+  React2.useEffect(() => {
     let ret = void 0;
     if (prevValues.current.prevIndex !== void 0 && prevValues.current.prevItem !== void 0) {
       ret = effect({
@@ -276,12 +283,12 @@ function useRecyclingEffect(effect) {
   }, [index, value]);
 }
 function useRecyclingState(valueOrFun) {
-  const { index, value, itemKey, triggerLayout } = React3.useContext(ContextContainer);
-  const refState = React3.useRef({
+  const { index, value, itemKey, triggerLayout } = React2.useContext(ContextContainer);
+  const refState = React2.useRef({
     itemKey: null,
     value: null
   });
-  const [_, setRenderNum] = React3.useState(0);
+  const [_, setRenderNum] = React2.useState(0);
   if (refState.current.itemKey !== itemKey) {
     refState.current.itemKey = itemKey;
     refState.current.value = isFunction(valueOrFun) ? valueOrFun({
@@ -291,7 +298,7 @@ function useRecyclingState(valueOrFun) {
       prevItem: void 0
     }) : valueOrFun;
   }
-  const setState = React3.useCallback(
+  const setState = React2.useCallback(
     (newState) => {
       refState.current.value = isFunction(newState) ? newState(refState.current.value) : newState;
       setRenderNum((v) => v + 1);
@@ -301,8 +308,8 @@ function useRecyclingState(valueOrFun) {
   );
   return [refState.current.value, setState];
 }
-var LeanViewComponent = React3__namespace.forwardRef((props, ref) => {
-  return React3__namespace.createElement("RCTView", { ...props, ref });
+var LeanViewComponent = React2__namespace.forwardRef((props, ref) => {
+  return React2__namespace.createElement("RCTView", { ...props, ref });
 });
 LeanViewComponent.displayName = "RCTView";
 var LeanView = reactNative.Platform.OS === "android" || reactNative.Platform.OS === "ios" ? LeanViewComponent : reactNative.View;
@@ -348,9 +355,9 @@ var Container = ({
     `containerItemData${id}`,
     "extraData"
   ]);
-  const refLastSize = React3.useRef();
-  const ref = React3.useRef(null);
-  const [layoutRenderCount, forceLayoutRender] = React3.useState(0);
+  const refLastSize = React2.useRef();
+  const ref = React2.useRef(null);
+  const [layoutRenderCount, forceLayoutRender] = React2.useState(0);
   const otherAxisPos = numColumns > 1 ? `${(column - 1) / numColumns * 100}%` : 0;
   const otherAxisSize = numColumns > 1 ? `${1 / numColumns * 100}%` : void 0;
   let paddingStyles;
@@ -384,12 +391,12 @@ var Container = ({
     top: position.relativeCoordinate,
     ...paddingStyles || {}
   };
-  const renderedItemInfo = React3.useMemo(
+  const renderedItemInfo = React2.useMemo(
     () => itemKey !== void 0 ? getRenderedItem(itemKey) : null,
     [itemKey, data, extraData]
   );
   const { index, renderedItem } = renderedItemInfo || {};
-  const triggerLayout = React3.useCallback(() => {
+  const triggerLayout = React2.useCallback(() => {
     forceLayoutRender((v) => v + 1);
   }, []);
   const onLayout = (event) => {
@@ -412,7 +419,7 @@ var Container = ({
     }
   };
   if (IsNewArchitecture) {
-    React3.useLayoutEffect(() => {
+    React2.useLayoutEffect(() => {
       var _a, _b;
       if (!isNullOrUndefined(itemKey)) {
         const measured = (_b = (_a = ref.current) == null ? void 0 : _a.unstable_getBoundingClientRect) == null ? void 0 : _b.call(_a);
@@ -425,7 +432,7 @@ var Container = ({
       }
     }, [itemKey, layoutRenderCount]);
   } else {
-    React3.useEffect(() => {
+    React2.useEffect(() => {
       if (!isNullOrUndefined(itemKey)) {
         const timeout = setTimeout(() => {
           if (refLastSize.current) {
@@ -438,25 +445,25 @@ var Container = ({
       }
     }, [itemKey]);
   }
-  const contextValue = React3.useMemo(() => {
+  const contextValue = React2.useMemo(() => {
     ctx.viewRefs.set(id, ref);
     return { containerId: id, itemKey, index, value: data, triggerLayout };
   }, [id, itemKey, index, data]);
-  const contentFragment = /* @__PURE__ */ React3__namespace.default.createElement(React3__namespace.default.Fragment, { key: recycleItems ? void 0 : itemKey }, /* @__PURE__ */ React3__namespace.default.createElement(ContextContainer.Provider, { value: contextValue }, renderedItem, renderedItemInfo && ItemSeparatorComponent && !lastItemKeys.includes(itemKey) && /* @__PURE__ */ React3__namespace.default.createElement(ItemSeparatorComponent, { leadingItem: renderedItemInfo.item })));
+  const contentFragment = /* @__PURE__ */ React2__namespace.default.createElement(React2__namespace.default.Fragment, { key: recycleItems ? void 0 : itemKey }, /* @__PURE__ */ React2__namespace.default.createElement(ContextContainer.Provider, { value: contextValue }, renderedItem, renderedItemInfo && ItemSeparatorComponent && !lastItemKeys.includes(itemKey) && /* @__PURE__ */ React2__namespace.default.createElement(ItemSeparatorComponent, { leadingItem: renderedItemInfo.item })));
   if (maintainVisibleContentPosition) {
     const anchorStyle = position.type === "top" ? { position: "absolute", top: 0, left: 0, right: 0 } : { position: "absolute", bottom: 0, left: 0, right: 0 };
     if (__DEV__ && ENABLE_DEVMODE) {
       anchorStyle.borderColor = position.type === "top" ? "red" : "blue";
       anchorStyle.borderWidth = 1;
     }
-    return /* @__PURE__ */ React3__namespace.default.createElement(LeanView, { style }, /* @__PURE__ */ React3__namespace.default.createElement(LeanView, { style: [anchorStyle, paddingStyles], onLayout, ref }, contentFragment, __DEV__ && ENABLE_DEVMODE && /* @__PURE__ */ React3__namespace.default.createElement(reactNative.Text, { style: { position: "absolute", top: 0, left: 0, zIndex: 1e3 } }, position.top)));
+    return /* @__PURE__ */ React2__namespace.default.createElement(LeanView, { style }, /* @__PURE__ */ React2__namespace.default.createElement(LeanView, { style: [anchorStyle, paddingStyles], onLayout, ref }, contentFragment, __DEV__ && ENABLE_DEVMODE && /* @__PURE__ */ React2__namespace.default.createElement(reactNative.Text, { style: { position: "absolute", top: 0, left: 0, zIndex: 1e3 } }, position.top)));
   }
-  return /* @__PURE__ */ React3__namespace.default.createElement(LeanView, { style, onLayout, ref }, contentFragment);
+  return /* @__PURE__ */ React2__namespace.default.createElement(LeanView, { style, onLayout, ref }, contentFragment);
 };
-var typedForwardRef = React3.forwardRef;
-var typedMemo = React3.memo;
+var typedForwardRef = React2.forwardRef;
+var typedMemo = React2.memo;
 var useAnimatedValue = (initialValue) => {
-  return React3.useRef(new reactNative.Animated.Value(initialValue)).current;
+  return React2.useRef(new reactNative.Animated.Value(initialValue)).current;
 };
 
 // src/useValue$.ts
@@ -464,7 +471,7 @@ function useValue$(key, getValue, useMicrotask) {
   var _a;
   const ctx = useStateContext();
   const animValue = useAnimatedValue((_a = getValue ? getValue(peek$(ctx, key)) : peek$(ctx, key)) != null ? _a : 0);
-  React3.useMemo(() => {
+  React2.useMemo(() => {
     let newValue = void 0;
     listen$(ctx, key, (v) => {
       if (useMicrotask && newValue === void 0) {
@@ -504,7 +511,7 @@ var Containers = typedMemo(function Containers2({
   const containers = [];
   for (let i = 0; i < numContainers; i++) {
     containers.push(
-      /* @__PURE__ */ React3__namespace.createElement(
+      /* @__PURE__ */ React2__namespace.createElement(
         Container,
         {
           id: i,
@@ -533,7 +540,7 @@ var Containers = typedMemo(function Containers2({
       }
     }
   }
-  return /* @__PURE__ */ React3__namespace.createElement(reactNative.Animated.View, { style }, containers);
+  return /* @__PURE__ */ React2__namespace.createElement(reactNative.Animated.View, { style }, containers);
 });
 function ListHeaderComponentContainer({
   children,
@@ -548,7 +555,7 @@ function ListHeaderComponentContainer({
     transform: [{ translateY: reactNative.Animated.multiply(scrollAdjust, -1) }],
     opacity: animOpacity
   };
-  return /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ React2__namespace.createElement(
     reactNative.Animated.View,
     {
       style: [style, additionalSize],
@@ -563,11 +570,11 @@ function ListHeaderComponentContainer({
 
 // src/ListComponent.tsx
 var getComponent = (Component) => {
-  if (React3__namespace.isValidElement(Component)) {
+  if (React2__namespace.isValidElement(Component)) {
     return Component;
   }
   if (Component) {
-    return /* @__PURE__ */ React3__namespace.createElement(Component, null);
+    return /* @__PURE__ */ React2__namespace.createElement(Component, null);
   }
   return null;
 };
@@ -575,12 +582,12 @@ var PaddingAndAdjust = () => {
   const animPaddingTop = useValue$("paddingTop", (v) => v, true);
   const animScrollAdjust = useValue$("scrollAdjust", (v) => v, true);
   const additionalSize = { marginTop: animScrollAdjust, paddingTop: animPaddingTop };
-  return /* @__PURE__ */ React3__namespace.createElement(reactNative.Animated.View, { style: additionalSize });
+  return /* @__PURE__ */ React2__namespace.createElement(reactNative.Animated.View, { style: additionalSize });
 };
 var PaddingAndAdjustDevMode = () => {
   const animPaddingTop = useValue$("paddingTop", (v) => v, true);
   const animScrollAdjust = useValue$("scrollAdjust", (v) => v, true);
-  return /* @__PURE__ */ React3__namespace.createElement(React3__namespace.Fragment, null, /* @__PURE__ */ React3__namespace.createElement(reactNative.Animated.View, { style: { marginTop: animScrollAdjust } }), /* @__PURE__ */ React3__namespace.createElement(reactNative.Animated.View, { style: { paddingTop: animPaddingTop } }), /* @__PURE__ */ React3__namespace.createElement(
+  return /* @__PURE__ */ React2__namespace.createElement(React2__namespace.Fragment, null, /* @__PURE__ */ React2__namespace.createElement(reactNative.Animated.View, { style: { marginTop: animScrollAdjust } }), /* @__PURE__ */ React2__namespace.createElement(reactNative.Animated.View, { style: { paddingTop: animPaddingTop } }), /* @__PURE__ */ React2__namespace.createElement(
     reactNative.Animated.View,
     {
       style: {
@@ -592,7 +599,7 @@ var PaddingAndAdjustDevMode = () => {
         backgroundColor: "green"
       }
     }
-  ), /* @__PURE__ */ React3__namespace.createElement(
+  ), /* @__PURE__ */ React2__namespace.createElement(
     reactNative.Animated.View,
     {
       style: {
@@ -604,7 +611,7 @@ var PaddingAndAdjustDevMode = () => {
         backgroundColor: "lightblue"
       }
     }
-  ), /* @__PURE__ */ React3__namespace.createElement(
+  ), /* @__PURE__ */ React2__namespace.createElement(
     reactNative.Animated.View,
     {
       style: {
@@ -649,11 +656,11 @@ var ListComponent = typedMemo(function ListComponent2({
   ...rest
 }) {
   const ctx = useStateContext();
-  const ScrollComponent = renderScrollComponent ? React3.useMemo(
-    () => React3__namespace.forwardRef((props, ref) => renderScrollComponent({ ...props, ref })),
+  const ScrollComponent = renderScrollComponent ? React2.useMemo(
+    () => React2__namespace.forwardRef((props, ref) => renderScrollComponent({ ...props, ref })),
     [renderScrollComponent]
   ) : reactNative.ScrollView;
-  return /* @__PURE__ */ React3__namespace.createElement(
+  return /* @__PURE__ */ React2__namespace.createElement(
     ScrollComponent,
     {
       ...rest,
@@ -671,8 +678,8 @@ var ListComponent = typedMemo(function ListComponent2({
       contentOffset: initialContentOffset ? horizontal ? { x: initialContentOffset, y: 0 } : { x: 0, y: initialContentOffset } : void 0,
       ref: refScrollView
     },
-    !ListEmptyComponent && (ENABLE_DEVMODE ? /* @__PURE__ */ React3__namespace.createElement(PaddingAndAdjustDevMode, null) : /* @__PURE__ */ React3__namespace.createElement(PaddingAndAdjust, null)),
-    ListHeaderComponent && /* @__PURE__ */ React3__namespace.createElement(
+    !ListEmptyComponent && (ENABLE_DEVMODE ? /* @__PURE__ */ React2__namespace.createElement(PaddingAndAdjustDevMode, null) : /* @__PURE__ */ React2__namespace.createElement(PaddingAndAdjust, null)),
+    ListHeaderComponent && /* @__PURE__ */ React2__namespace.createElement(
       ListHeaderComponentContainer,
       {
         style: ListHeaderComponentStyle,
@@ -683,7 +690,7 @@ var ListComponent = typedMemo(function ListComponent2({
       getComponent(ListHeaderComponent)
     ),
     ListEmptyComponent && getComponent(ListEmptyComponent),
-    /* @__PURE__ */ React3__namespace.createElement(
+    /* @__PURE__ */ React2__namespace.createElement(
       Containers,
       {
         horizontal,
@@ -694,7 +701,7 @@ var ListComponent = typedMemo(function ListComponent2({
         updateItemSize
       }
     ),
-    ListFooterComponent && /* @__PURE__ */ React3__namespace.createElement(
+    ListFooterComponent && /* @__PURE__ */ React2__namespace.createElement(
       reactNative.View,
       {
         style: ListFooterComponentStyle,
@@ -757,7 +764,7 @@ var ScrollAdjustHandler = class {
   }
 };
 var useCombinedRef = (...refs) => {
-  const callback = React3.useCallback((element) => {
+  const callback = React2.useCallback((element) => {
     for (const ref of refs) {
       if (!ref) {
         continue;
@@ -976,7 +983,7 @@ function createColumnWrapperStyle(contentContainerStyle) {
   }
 }
 var LegendList = typedForwardRef(function LegendList2(props, forwardedRef) {
-  return /* @__PURE__ */ React3__namespace.createElement(StateProvider, null, /* @__PURE__ */ React3__namespace.createElement(LegendListInner, { ...props, ref: forwardedRef }));
+  return /* @__PURE__ */ React2__namespace.createElement(StateProvider, null, /* @__PURE__ */ React2__namespace.createElement(LegendListInner, { ...props, ref: forwardedRef }));
 });
 var LegendListInner = typedForwardRef(function LegendListInner2(props, forwardedRef) {
   const {
@@ -1019,7 +1026,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     onViewableItemsChanged,
     ...rest
   } = props;
-  const callbacks = React3.useRef({
+  const callbacks = React2.useRef({
     onStartReached: rest.onStartReached,
     onEndReached: rest.onEndReached
   });
@@ -1027,7 +1034,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   callbacks.current.onEndReached = rest.onEndReached;
   const contentContainerStyle = { ...reactNative.StyleSheet.flatten(contentContainerStyleProp) };
   const style = { ...reactNative.StyleSheet.flatten(styleProp) };
-  const stylePaddingTopState = ((style == null ? void 0 : style.paddingTop) || 0) + ((contentContainerStyle == null ? void 0 : contentContainerStyle.paddingTop) || 0);
+  const stylePaddingTopState = extractPaddingTop(style, contentContainerStyle);
   if (style == null ? void 0 : style.paddingTop) {
     style.paddingTop = void 0;
   }
@@ -1036,12 +1043,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   }
   const ctx = useStateContext();
   ctx.columnWrapperStyle = columnWrapperStyle || (contentContainerStyle ? createColumnWrapperStyle(contentContainerStyle) : void 0);
-  const refScroller = React3.useRef(null);
+  const refScroller = React2.useRef(null);
   const combinedRef = useCombinedRef(refScroller, refScrollView);
   const estimatedItemSize = estimatedItemSizeProp != null ? estimatedItemSizeProp : DEFAULT_ITEM_SIZE;
   const scrollBuffer = (drawDistance != null ? drawDistance : DEFAULT_DRAW_DISTANCE) || 1;
   const keyExtractor = keyExtractorProp != null ? keyExtractorProp : (item, index) => index.toString();
-  const refState = React3.useRef();
+  const refState = React2.useRef();
   const getId = (index) => {
     var _a;
     const data = (_a = refState.current) == null ? void 0 : _a.data;
@@ -1076,8 +1083,10 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     state.sizes.set(key, size);
     return size;
   };
-  const calculateOffsetForIndex = (index = initialScrollIndex) => {
+  const calculateOffsetForIndex = (indexParam) => {
     var _a;
+    const isFromInit = indexParam === void 0;
+    const index = isFromInit ? initialScrollIndex : indexParam;
     const data = dataProp;
     if (index !== void 0) {
       let offset = 0;
@@ -1096,12 +1105,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         offset = index * estimatedItemSize;
       }
       const adjust = peek$(ctx, "containersDidLayout") ? ((_a = refState.current) == null ? void 0 : _a.scrollAdjustHandler.getAppliedAdjust()) || 0 : 0;
-      const topPad = peek$(ctx, "stylePaddingTop") + peek$(ctx, "headerSize");
+      const stylePaddingTop = isFromInit ? stylePaddingTopState : peek$(ctx, "stylePaddingTop");
+      const topPad = (stylePaddingTop != null ? stylePaddingTop : 0) + peek$(ctx, "headerSize");
       return offset / numColumnsProp - adjust + topPad;
     }
     return 0;
   };
-  const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : React3.useMemo(calculateOffsetForIndex, []);
+  const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : React2.useMemo(() => calculateOffsetForIndex(void 0), []);
   if (!refState.current) {
     const initialScrollLength = reactNative.Dimensions.get("window")[horizontal ? "width" : "height"];
     refState.current = {
@@ -1236,7 +1246,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       });
     }
   };
-  const addTotalSize = React3.useCallback((key, add, totalSizeBelowAnchor) => {
+  const addTotalSize = React2.useCallback((key, add, totalSizeBelowAnchor) => {
     const state = refState.current;
     const { indexByKey, anchorElement } = state;
     const index = key === null ? 0 : indexByKey.get(key);
@@ -1343,7 +1353,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
     return res;
   };
-  const fixGaps = React3.useCallback(() => {
+  const fixGaps = React2.useCallback(() => {
     var _a;
     const state = refState.current;
     const { data, scrollLength, positions, startBuffered, endBuffered } = state;
@@ -1408,7 +1418,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
     }
   }, []);
-  const checkAllSizesKnown = React3.useCallback(() => {
+  const checkAllSizesKnown = React2.useCallback(() => {
     const { startBuffered, endBuffered, sizesKnown } = refState.current;
     if (endBuffered !== null) {
       let areAllKnown = true;
@@ -1420,7 +1430,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
     return false;
   }, []);
-  const calculateItemsInView = React3.useCallback((isReset) => {
+  const calculateItemsInView = React2.useCallback((isReset) => {
     var _a;
     const state = refState.current;
     const {
@@ -2024,7 +2034,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     return result.sort(comparatorDefault);
   };
   const isFirst = !refState.current.renderItem;
-  const memoizedLastItemKeys = React3.useMemo(() => {
+  const memoizedLastItemKeys = React2.useMemo(() => {
     if (!dataProp.length) return [];
     return Array.from(
       { length: Math.min(numColumnsProp, dataProp.length) },
@@ -2059,7 +2069,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     refState.current.previousTotalSize = peek$(ctx, "totalSize");
     calcTotalSizesAndPositions({ forgetPositions: false });
   }
-  React3.useEffect(() => {
+  React2.useEffect(() => {
     const didAllocateContainers = doInitialAllocateContainers();
     if (!didAllocateContainers) {
       checkResetContainers(
@@ -2068,12 +2078,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       );
     }
   }, [dataProp, numColumnsProp]);
-  React3.useEffect(() => {
+  React2.useEffect(() => {
     set$(ctx, "extraData", extraData);
   }, [extraData]);
   refState.current.renderItem = renderItem;
-  React3.useEffect(initalizeStateVars, [memoizedLastItemKeys.join(","), numColumnsProp, stylePaddingTopState]);
-  const getRenderedItem = React3.useCallback((key) => {
+  React2.useEffect(initalizeStateVars, [memoizedLastItemKeys.join(","), numColumnsProp, stylePaddingTopState]);
+  const getRenderedItem = React2.useCallback((key) => {
     var _a, _b;
     const state = refState.current;
     if (!state) {
@@ -2119,7 +2129,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       return true;
     }
   };
-  React3.useEffect(() => {
+  React2.useEffect(() => {
     const state = refState.current;
     const viewability = setupViewability({
       viewabilityConfig,
@@ -2132,7 +2142,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   useInit(() => {
     doInitialAllocateContainers();
   });
-  const updateItemSize = React3.useCallback((itemKey, size, fromFixGaps) => {
+  const updateItemSize = React2.useCallback((itemKey, size, fromFixGaps) => {
     const state = refState.current;
     const {
       sizes,
@@ -2234,7 +2244,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
     }
   }, []);
-  const onLayout = React3.useCallback((event) => {
+  const onLayout = React2.useCallback((event) => {
     const state = refState.current;
     const scrollLength = event.nativeEvent.layout[horizontal ? "width" : "height"];
     const didChange = scrollLength !== state.scrollLength;
@@ -2263,7 +2273,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       onLayoutProp(event);
     }
   }, []);
-  const handleScroll = React3.useCallback(
+  const handleScroll = React2.useCallback(
     (event) => {
       var _a, _b, _c, _d;
       if (((_b = (_a = event.nativeEvent) == null ? void 0 : _a.contentSize) == null ? void 0 : _b.height) === 0 && ((_c = event.nativeEvent.contentSize) == null ? void 0 : _c.width) === 0) {
@@ -2280,7 +2290,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     },
     []
   );
-  const updateScroll = React3.useCallback((newScroll) => {
+  const updateScroll = React2.useCallback((newScroll) => {
     const state = refState.current;
     const scrollingToOffset = state.scrollingToOffset;
     if (scrollingToOffset !== void 0 && Math.abs(newScroll - scrollingToOffset) < 10) {
@@ -2334,7 +2344,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     checkAtBottom();
     checkAtTop();
   }, []);
-  React3.useImperativeHandle(
+  React2.useImperativeHandle(
     forwardedRef,
     () => {
       const scrollIndexIntoView = (options) => {
@@ -2395,7 +2405,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     []
   );
   if (reactNative.Platform.OS === "web") {
-    React3.useEffect(() => {
+    React2.useEffect(() => {
       var _a;
       if (initialContentOffset) {
         (_a = refState.current) == null ? void 0 : _a.scrollAdjustHandler.setDisableAdjust(true);
@@ -2407,7 +2417,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
     }, []);
   }
-  return /* @__PURE__ */ React3__namespace.createElement(React3__namespace.Fragment, null, /* @__PURE__ */ React3__namespace.createElement(
+  return /* @__PURE__ */ React2__namespace.createElement(React2__namespace.Fragment, null, /* @__PURE__ */ React2__namespace.createElement(
     ListComponent,
     {
       ...rest,
@@ -2446,7 +2456,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       maintainVisibleContentPosition,
       scrollEventThrottle: reactNative.Platform.OS === "web" ? 16 : void 0,
       waitForInitialLayout,
-      refreshControl: refreshControl != null ? refreshControl : onRefresh && /* @__PURE__ */ React3__namespace.createElement(
+      refreshControl: refreshControl != null ? refreshControl : onRefresh && /* @__PURE__ */ React2__namespace.createElement(
         reactNative.RefreshControl,
         {
           refreshing: !!refreshing,
@@ -2457,7 +2467,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       style,
       contentContainerStyle
     }
-  ), __DEV__ && ENABLE_DEBUG_VIEW && /* @__PURE__ */ React3__namespace.createElement(DebugView, { state: refState.current }));
+  ), __DEV__ && ENABLE_DEBUG_VIEW && /* @__PURE__ */ React2__namespace.createElement(DebugView, { state: refState.current }));
 });
 
 exports.LegendList = LegendList;

package/index.mjs

@@ -1,12 +1,12 @@
-import * as React3 from 'react';
-import React3__default, { useReducer, useEffect, createContext, useMemo, useRef, useCallback, useImperativeHandle, useContext, useState, forwardRef, memo, useLayoutEffect } from 'react';
+import * as React2 from 'react';
+import React2__default, { useReducer, useEffect, createContext, useMemo, useRef, useCallback, useImperativeHandle, useContext, useState, forwardRef, memo, useLayoutEffect } from 'react';
 import { View, Text, Platform, Animated, ScrollView, StyleSheet, Dimensions, RefreshControl } from 'react-native';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 // src/LegendList.tsx
-var ContextState = React3.createContext(null);
+var ContextState = React2.createContext(null);
 function StateProvider({ children }) {
-  const [value] = React3.useState(() => ({
+  const [value] = React2.useState(() => ({
     listeners: /* @__PURE__ */ new Map(),
     values: /* @__PURE__ */ new Map([
       ["paddingTop", 0],
@@ -21,10 +21,10 @@ function StateProvider({ children }) {
     columnWrapperStyle: void 0,
     viewRefs: /* @__PURE__ */ new Map()
   }));
-  return /* @__PURE__ */ React3.createElement(ContextState.Provider, { value }, children);
+  return /* @__PURE__ */ React2.createElement(ContextState.Provider, { value }, children);
 }
 function useStateContext() {
-  return React3.useContext(ContextState);
+  return React2.useContext(ContextState);
 }
 function createSelectorFunctionsArr(ctx, signalNames) {
   let lastValues = [];
@@ -94,17 +94,17 @@ function getContentSize(ctx) {
   return headerSize + footerSize + totalSize + stylePaddingTop;
 }
 function useArr$(signalNames) {
-  const ctx = React3.useContext(ContextState);
-  const { subscribe, get } = React3.useMemo(() => createSelectorFunctionsArr(ctx, signalNames), [ctx, signalNames]);
+  const ctx = React2.useContext(ContextState);
+  const { subscribe, get } = React2.useMemo(() => createSelectorFunctionsArr(ctx, signalNames), [ctx, signalNames]);
   const value = useSyncExternalStore(subscribe, get);
   return value;
 }
 
 // src/DebugView.tsx
 var DebugRow = ({ children }) => {
-  return /* @__PURE__ */ React3.createElement(View, { style: { flexDirection: "row", alignItems: "center", justifyContent: "space-between" } }, children);
+  return /* @__PURE__ */ React2.createElement(View, { style: { flexDirection: "row", alignItems: "center", justifyContent: "space-between" } }, children);
 };
-var DebugView = React3.memo(function DebugView2({ state }) {
+var DebugView = React2.memo(function DebugView2({ state }) {
   const ctx = useStateContext();
   const [
     totalSize = 0,
@@ -128,7 +128,7 @@ var DebugView = React3.memo(function DebugView2({ state }) {
   useInterval(() => {
     forceUpdate();
   }, 100);
-  return /* @__PURE__ */ React3.createElement(
+  return /* @__PURE__ */ React2.createElement(
     View,
     {
       style: {
@@ -144,15 +144,15 @@ var DebugView = React3.memo(function DebugView2({ state }) {
       },
       pointerEvents: "none"
     },
-    /* @__PURE__ */ React3.createElement(DebugRow, null, /* @__PURE__ */ React3.createElement(Text, null, "TotalSize:"), /* @__PURE__ */ React3.createElement(Text, null, totalSize.toFixed(2))),
-    /* @__PURE__ */ React3.createElement(DebugRow, null, /* @__PURE__ */ React3.createElement(Text, null, "ContentSize:"), /* @__PURE__ */ React3.createElement(Text, null, contentSize.toFixed(2))),
-    /* @__PURE__ */ React3.createElement(DebugRow, null, /* @__PURE__ */ React3.createElement(Text, null, "At end:"), /* @__PURE__ */ React3.createElement(Text, null, String(state.isAtBottom))),
-    /* @__PURE__ */ React3.createElement(Text, null),
-    /* @__PURE__ */ React3.createElement(DebugRow, null, /* @__PURE__ */ React3.createElement(Text, null, "ScrollAdjust:"), /* @__PURE__ */ React3.createElement(Text, null, scrollAdjust.toFixed(2))),
-    /* @__PURE__ */ React3.createElement(DebugRow, null, /* @__PURE__ */ React3.createElement(Text, null, "TotalSizeReal: "), /* @__PURE__ */ React3.createElement(Text, null, totalSizeWithScrollAdjust.toFixed(2))),
-    /* @__PURE__ */ React3.createElement(Text, null),
-    /* @__PURE__ */ React3.createElement(DebugRow, null, /* @__PURE__ */ React3.createElement(Text, null, "RawScroll: "), /* @__PURE__ */ React3.createElement(Text, null, rawScroll.toFixed(2))),
-    /* @__PURE__ */ React3.createElement(DebugRow, null, /* @__PURE__ */ React3.createElement(Text, null, "ComputedScroll: "), /* @__PURE__ */ React3.createElement(Text, null, scroll.toFixed(2)))
+    /* @__PURE__ */ React2.createElement(DebugRow, null, /* @__PURE__ */ React2.createElement(Text, null, "TotalSize:"), /* @__PURE__ */ React2.createElement(Text, null, totalSize.toFixed(2))),
+    /* @__PURE__ */ React2.createElement(DebugRow, null, /* @__PURE__ */ React2.createElement(Text, null, "ContentSize:"), /* @__PURE__ */ React2.createElement(Text, null, contentSize.toFixed(2))),
+    /* @__PURE__ */ React2.createElement(DebugRow, null, /* @__PURE__ */ React2.createElement(Text, null, "At end:"), /* @__PURE__ */ React2.createElement(Text, null, String(state.isAtBottom))),
+    /* @__PURE__ */ React2.createElement(Text, null),
+    /* @__PURE__ */ React2.createElement(DebugRow, null, /* @__PURE__ */ React2.createElement(Text, null, "ScrollAdjust:"), /* @__PURE__ */ React2.createElement(Text, null, scrollAdjust.toFixed(2))),
+    /* @__PURE__ */ React2.createElement(DebugRow, null, /* @__PURE__ */ React2.createElement(Text, null, "TotalSizeReal: "), /* @__PURE__ */ React2.createElement(Text, null, totalSizeWithScrollAdjust.toFixed(2))),
+    /* @__PURE__ */ React2.createElement(Text, null),
+    /* @__PURE__ */ React2.createElement(DebugRow, null, /* @__PURE__ */ React2.createElement(Text, null, "RawScroll: "), /* @__PURE__ */ React2.createElement(Text, null, rawScroll.toFixed(2))),
+    /* @__PURE__ */ React2.createElement(DebugRow, null, /* @__PURE__ */ React2.createElement(Text, null, "ComputedScroll: "), /* @__PURE__ */ React2.createElement(Text, null, scroll.toFixed(2)))
   );
 });
 function useInterval(callback, delay) {
@@ -185,6 +185,13 @@ function comparatorByDistance(a, b) {
 function comparatorDefault(a, b) {
   return a - b;
 }
+function getPadding(s) {
+  var _a, _b, _c;
+  return (_c = (_b = (_a = s.paddingTop) != null ? _a : s.paddingVertical) != null ? _b : s.padding) != null ? _c : 0;
+}
+function extractPaddingTop(style, contentContainerStyle) {
+  return getPadding(style) + getPadding(contentContainerStyle);
+}
 var symbolFirst = Symbol();
 function useInit(cb) {
   const refValue = useRef(symbolFirst);
@@ -280,8 +287,8 @@ function useRecyclingState(valueOrFun) {
   );
   return [refState.current.value, setState];
 }
-var LeanViewComponent = React3.forwardRef((props, ref) => {
-  return React3.createElement("RCTView", { ...props, ref });
+var LeanViewComponent = React2.forwardRef((props, ref) => {
+  return React2.createElement("RCTView", { ...props, ref });
 });
 LeanViewComponent.displayName = "RCTView";
 var LeanView = Platform.OS === "android" || Platform.OS === "ios" ? LeanViewComponent : View;
@@ -421,16 +428,16 @@ var Container = ({
     ctx.viewRefs.set(id, ref);
     return { containerId: id, itemKey, index, value: data, triggerLayout };
   }, [id, itemKey, index, data]);
-  const contentFragment = /* @__PURE__ */ React3__default.createElement(React3__default.Fragment, { key: recycleItems ? void 0 : itemKey }, /* @__PURE__ */ React3__default.createElement(ContextContainer.Provider, { value: contextValue }, renderedItem, renderedItemInfo && ItemSeparatorComponent && !lastItemKeys.includes(itemKey) && /* @__PURE__ */ React3__default.createElement(ItemSeparatorComponent, { leadingItem: renderedItemInfo.item })));
+  const contentFragment = /* @__PURE__ */ React2__default.createElement(React2__default.Fragment, { key: recycleItems ? void 0 : itemKey }, /* @__PURE__ */ React2__default.createElement(ContextContainer.Provider, { value: contextValue }, renderedItem, renderedItemInfo && ItemSeparatorComponent && !lastItemKeys.includes(itemKey) && /* @__PURE__ */ React2__default.createElement(ItemSeparatorComponent, { leadingItem: renderedItemInfo.item })));
   if (maintainVisibleContentPosition) {
     const anchorStyle = position.type === "top" ? { position: "absolute", top: 0, left: 0, right: 0 } : { position: "absolute", bottom: 0, left: 0, right: 0 };
     if (__DEV__ && ENABLE_DEVMODE) {
       anchorStyle.borderColor = position.type === "top" ? "red" : "blue";
       anchorStyle.borderWidth = 1;
     }
-    return /* @__PURE__ */ React3__default.createElement(LeanView, { style }, /* @__PURE__ */ React3__default.createElement(LeanView, { style: [anchorStyle, paddingStyles], onLayout, ref }, contentFragment, __DEV__ && ENABLE_DEVMODE && /* @__PURE__ */ React3__default.createElement(Text, { style: { position: "absolute", top: 0, left: 0, zIndex: 1e3 } }, position.top)));
+    return /* @__PURE__ */ React2__default.createElement(LeanView, { style }, /* @__PURE__ */ React2__default.createElement(LeanView, { style: [anchorStyle, paddingStyles], onLayout, ref }, contentFragment, __DEV__ && ENABLE_DEVMODE && /* @__PURE__ */ React2__default.createElement(Text, { style: { position: "absolute", top: 0, left: 0, zIndex: 1e3 } }, position.top)));
   }
-  return /* @__PURE__ */ React3__default.createElement(LeanView, { style, onLayout, ref }, contentFragment);
+  return /* @__PURE__ */ React2__default.createElement(LeanView, { style, onLayout, ref }, contentFragment);
 };
 var typedForwardRef = forwardRef;
 var typedMemo = memo;
@@ -483,7 +490,7 @@ var Containers = typedMemo(function Containers2({
   const containers = [];
   for (let i = 0; i < numContainers; i++) {
     containers.push(
-      /* @__PURE__ */ React3.createElement(
+      /* @__PURE__ */ React2.createElement(
         Container,
         {
           id: i,
@@ -512,7 +519,7 @@ var Containers = typedMemo(function Containers2({
       }
     }
   }
-  return /* @__PURE__ */ React3.createElement(Animated.View, { style }, containers);
+  return /* @__PURE__ */ React2.createElement(Animated.View, { style }, containers);
 });
 function ListHeaderComponentContainer({
   children,
@@ -527,7 +534,7 @@ function ListHeaderComponentContainer({
     transform: [{ translateY: Animated.multiply(scrollAdjust, -1) }],
     opacity: animOpacity
   };
-  return /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ React2.createElement(
     Animated.View,
     {
       style: [style, additionalSize],
@@ -542,11 +549,11 @@ function ListHeaderComponentContainer({
 
 // src/ListComponent.tsx
 var getComponent = (Component) => {
-  if (React3.isValidElement(Component)) {
+  if (React2.isValidElement(Component)) {
     return Component;
   }
   if (Component) {
-    return /* @__PURE__ */ React3.createElement(Component, null);
+    return /* @__PURE__ */ React2.createElement(Component, null);
   }
   return null;
 };
@@ -554,12 +561,12 @@ var PaddingAndAdjust = () => {
   const animPaddingTop = useValue$("paddingTop", (v) => v, true);
   const animScrollAdjust = useValue$("scrollAdjust", (v) => v, true);
   const additionalSize = { marginTop: animScrollAdjust, paddingTop: animPaddingTop };
-  return /* @__PURE__ */ React3.createElement(Animated.View, { style: additionalSize });
+  return /* @__PURE__ */ React2.createElement(Animated.View, { style: additionalSize });
 };
 var PaddingAndAdjustDevMode = () => {
   const animPaddingTop = useValue$("paddingTop", (v) => v, true);
   const animScrollAdjust = useValue$("scrollAdjust", (v) => v, true);
-  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(Animated.View, { style: { marginTop: animScrollAdjust } }), /* @__PURE__ */ React3.createElement(Animated.View, { style: { paddingTop: animPaddingTop } }), /* @__PURE__ */ React3.createElement(
+  return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(Animated.View, { style: { marginTop: animScrollAdjust } }), /* @__PURE__ */ React2.createElement(Animated.View, { style: { paddingTop: animPaddingTop } }), /* @__PURE__ */ React2.createElement(
     Animated.View,
     {
       style: {
@@ -571,7 +578,7 @@ var PaddingAndAdjustDevMode = () => {
         backgroundColor: "green"
       }
     }
-  ), /* @__PURE__ */ React3.createElement(
+  ), /* @__PURE__ */ React2.createElement(
     Animated.View,
     {
       style: {
@@ -583,7 +590,7 @@ var PaddingAndAdjustDevMode = () => {
         backgroundColor: "lightblue"
       }
     }
-  ), /* @__PURE__ */ React3.createElement(
+  ), /* @__PURE__ */ React2.createElement(
     Animated.View,
     {
       style: {
@@ -629,10 +636,10 @@ var ListComponent = typedMemo(function ListComponent2({
 }) {
   const ctx = useStateContext();
   const ScrollComponent = renderScrollComponent ? useMemo(
-    () => React3.forwardRef((props, ref) => renderScrollComponent({ ...props, ref })),
+    () => React2.forwardRef((props, ref) => renderScrollComponent({ ...props, ref })),
     [renderScrollComponent]
   ) : ScrollView;
-  return /* @__PURE__ */ React3.createElement(
+  return /* @__PURE__ */ React2.createElement(
     ScrollComponent,
     {
       ...rest,
@@ -650,8 +657,8 @@ var ListComponent = typedMemo(function ListComponent2({
       contentOffset: initialContentOffset ? horizontal ? { x: initialContentOffset, y: 0 } : { x: 0, y: initialContentOffset } : void 0,
       ref: refScrollView
     },
-    !ListEmptyComponent && (ENABLE_DEVMODE ? /* @__PURE__ */ React3.createElement(PaddingAndAdjustDevMode, null) : /* @__PURE__ */ React3.createElement(PaddingAndAdjust, null)),
-    ListHeaderComponent && /* @__PURE__ */ React3.createElement(
+    !ListEmptyComponent && (ENABLE_DEVMODE ? /* @__PURE__ */ React2.createElement(PaddingAndAdjustDevMode, null) : /* @__PURE__ */ React2.createElement(PaddingAndAdjust, null)),
+    ListHeaderComponent && /* @__PURE__ */ React2.createElement(
       ListHeaderComponentContainer,
       {
         style: ListHeaderComponentStyle,
@@ -662,7 +669,7 @@ var ListComponent = typedMemo(function ListComponent2({
       getComponent(ListHeaderComponent)
     ),
     ListEmptyComponent && getComponent(ListEmptyComponent),
-    /* @__PURE__ */ React3.createElement(
+    /* @__PURE__ */ React2.createElement(
       Containers,
       {
         horizontal,
@@ -673,7 +680,7 @@ var ListComponent = typedMemo(function ListComponent2({
         updateItemSize
       }
     ),
-    ListFooterComponent && /* @__PURE__ */ React3.createElement(
+    ListFooterComponent && /* @__PURE__ */ React2.createElement(
       View,
       {
         style: ListFooterComponentStyle,
@@ -955,7 +962,7 @@ function createColumnWrapperStyle(contentContainerStyle) {
   }
 }
 var LegendList = typedForwardRef(function LegendList2(props, forwardedRef) {
-  return /* @__PURE__ */ React3.createElement(StateProvider, null, /* @__PURE__ */ React3.createElement(LegendListInner, { ...props, ref: forwardedRef }));
+  return /* @__PURE__ */ React2.createElement(StateProvider, null, /* @__PURE__ */ React2.createElement(LegendListInner, { ...props, ref: forwardedRef }));
 });
 var LegendListInner = typedForwardRef(function LegendListInner2(props, forwardedRef) {
   const {
@@ -1006,7 +1013,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   callbacks.current.onEndReached = rest.onEndReached;
   const contentContainerStyle = { ...StyleSheet.flatten(contentContainerStyleProp) };
   const style = { ...StyleSheet.flatten(styleProp) };
-  const stylePaddingTopState = ((style == null ? void 0 : style.paddingTop) || 0) + ((contentContainerStyle == null ? void 0 : contentContainerStyle.paddingTop) || 0);
+  const stylePaddingTopState = extractPaddingTop(style, contentContainerStyle);
   if (style == null ? void 0 : style.paddingTop) {
     style.paddingTop = void 0;
   }
@@ -1055,8 +1062,10 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     state.sizes.set(key, size);
     return size;
   };
-  const calculateOffsetForIndex = (index = initialScrollIndex) => {
+  const calculateOffsetForIndex = (indexParam) => {
     var _a;
+    const isFromInit = indexParam === void 0;
+    const index = isFromInit ? initialScrollIndex : indexParam;
     const data = dataProp;
     if (index !== void 0) {
       let offset = 0;
@@ -1075,12 +1084,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         offset = index * estimatedItemSize;
       }
       const adjust = peek$(ctx, "containersDidLayout") ? ((_a = refState.current) == null ? void 0 : _a.scrollAdjustHandler.getAppliedAdjust()) || 0 : 0;
-      const topPad = peek$(ctx, "stylePaddingTop") + peek$(ctx, "headerSize");
+      const stylePaddingTop = isFromInit ? stylePaddingTopState : peek$(ctx, "stylePaddingTop");
+      const topPad = (stylePaddingTop != null ? stylePaddingTop : 0) + peek$(ctx, "headerSize");
       return offset / numColumnsProp - adjust + topPad;
     }
     return 0;
   };
-  const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : useMemo(calculateOffsetForIndex, []);
+  const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : useMemo(() => calculateOffsetForIndex(void 0), []);
   if (!refState.current) {
     const initialScrollLength = Dimensions.get("window")[horizontal ? "width" : "height"];
     refState.current = {
@@ -2386,7 +2396,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
     }, []);
   }
-  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(
+  return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(
     ListComponent,
     {
       ...rest,
@@ -2425,7 +2435,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       maintainVisibleContentPosition,
       scrollEventThrottle: Platform.OS === "web" ? 16 : void 0,
       waitForInitialLayout,
-      refreshControl: refreshControl != null ? refreshControl : onRefresh && /* @__PURE__ */ React3.createElement(
+      refreshControl: refreshControl != null ? refreshControl : onRefresh && /* @__PURE__ */ React2.createElement(
         RefreshControl,
         {
           refreshing: !!refreshing,
@@ -2436,7 +2446,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       style,
       contentContainerStyle
     }
-  ), __DEV__ && ENABLE_DEBUG_VIEW && /* @__PURE__ */ React3.createElement(DebugView, { state: refState.current }));
+  ), __DEV__ && ENABLE_DEBUG_VIEW && /* @__PURE__ */ React2.createElement(DebugView, { state: refState.current }));
 });
 
 export { LegendList, useRecyclingEffect, useRecyclingState, useViewability, useViewabilityAmount };

package/package.json

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