@legendapp/list 2.0.9 → 2.0.11

package/index.js

@@ -182,11 +182,6 @@ function useInterval(callback, delay) {
     return () => clearInterval(interval);
   }, [delay]);
 }
-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;
 
 // src/constants.ts
 var POSITION_OUT_OF_VIEW = -1e7;
@@ -248,7 +243,7 @@ var PositionViewState = typedMemo(function PositionView({
 }) {
   const [position = POSITION_OUT_OF_VIEW] = useArr$([`containerPosition${id}`]);
   return /* @__PURE__ */ React2__namespace.createElement(
-    LeanView,
+    reactNative.View,
     {
       ref: refView,
       style: [
@@ -289,7 +284,7 @@ var PositionViewSticky = typedMemo(function PositionViewSticky2({
 }) {
   const [position = POSITION_OUT_OF_VIEW, headerSize] = useArr$([`containerPosition${id}`, "headerSize"]);
   const transform = React2__namespace.useMemo(() => {
-    if (animatedScrollY && stickyOffset) {
+    if (animatedScrollY && stickyOffset !== void 0) {
       const stickyPosition = animatedScrollY.interpolate({
         extrapolate: "clamp",
         inputRange: [position + headerSize, position + 5e3 + headerSize],
@@ -454,6 +449,29 @@ function Separator({ ItemSeparatorComponent, leadingItem }) {
   const isLastItem = useIsLastItem();
   return isLastItem ? null : /* @__PURE__ */ React2__namespace.createElement(ItemSeparatorComponent, { leadingItem });
 }
+function useOnLayoutSync({
+  ref,
+  onLayoutProp,
+  onLayoutChange
+}, deps = []) {
+  const onLayout = React2.useCallback(
+    (event) => {
+      onLayoutChange(event.nativeEvent.layout, false);
+      onLayoutProp == null ? void 0 : onLayoutProp(event);
+    },
+    [onLayoutChange]
+  );
+  if (IsNewArchitecture) {
+    React2.useLayoutEffect(() => {
+      if (ref.current) {
+        ref.current.measure((x, y, width, height) => {
+          onLayoutChange({ height, width, x, y }, true);
+        });
+      }
+    }, deps);
+  }
+  return { onLayout };
+}
 
 // src/components/Container.tsx
 var Container = typedMemo(function Container2({
@@ -480,7 +498,7 @@ var Container = typedMemo(function Container2({
   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 didLayout = false;
+  const didLayoutRef = React2.useRef(false);
   const style = React2.useMemo(() => {
     let paddingStyles;
     if (columnWrapperStyle) {
@@ -530,15 +548,16 @@ var Container = typedMemo(function Container2({
       value: data
     };
   }, [id, itemKey, index, data]);
-  const onLayout = (event) => {
+  const onLayoutChange = (rectangle) => {
     var _a, _b;
     if (!isNullOrUndefined(itemKey)) {
-      didLayout = true;
-      let layout = event.nativeEvent.layout;
-      const size = layout[horizontal ? "width" : "height"];
+      didLayoutRef.current = true;
+      let layout = rectangle;
+      const size = Math.floor(rectangle[horizontal ? "width" : "height"] * 8) / 8;
       const doUpdate = () => {
         refLastSize.current = { height: layout.height, width: layout.width };
         updateItemSize2(itemKey, layout);
+        didLayoutRef.current = true;
       };
       if (IsNewArchitecture || size > 0) {
         doUpdate();
@@ -550,25 +569,20 @@ var Container = typedMemo(function Container2({
       }
     }
   };
-  if (IsNewArchitecture) {
-    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);
-        if (measured) {
-          const size = Math.floor(measured[horizontal ? "width" : "height"] * 8) / 8;
-          if (size) {
-            updateItemSize2(itemKey, measured);
-          }
-        }
-      }
-    }, [itemKey, layoutRenderCount]);
-  } else {
+  const { onLayout } = useOnLayoutSync(
+    {
+      onLayoutChange,
+      ref
+    },
+    [itemKey, layoutRenderCount]
+  );
+  if (!IsNewArchitecture) {
     React2.useEffect(() => {
       if (!isNullOrUndefined(itemKey)) {
         const timeout = setTimeout(() => {
-          if (!didLayout && refLastSize.current) {
+          if (!didLayoutRef.current && refLastSize.current) {
             updateItemSize2(itemKey, refLastSize.current);
+            didLayoutRef.current = true;
           }
         }, 16);
         return () => {
@@ -657,6 +671,11 @@ var Containers = typedMemo(function Containers2({
   }
   return /* @__PURE__ */ React2__namespace.createElement(reactNative.Animated.View, { style }, containers);
 });
+var LayoutView = ({ onLayoutChange, refView, ...rest }) => {
+  const ref = refView != null ? refView : React2.useRef();
+  const { onLayout } = useOnLayoutSync({ onLayoutChange, ref });
+  return /* @__PURE__ */ React2__namespace.createElement(reactNative.View, { ...rest, onLayout, ref });
+};
 function ScrollAdjust() {
   const bias = 1e7;
   const [scrollAdjust, scrollAdjustUserOffset] = useArr$(["scrollAdjust", "scrollAdjustUserOffset"]);
@@ -678,68 +697,6 @@ function SnapWrapper({ ScrollComponent, ...props }) {
   const [snapToOffsets] = useArr$(["snapToOffsets"]);
   return /* @__PURE__ */ React2__namespace.default.createElement(ScrollComponent, { ...props, snapToOffsets });
 }
-function useThrottleDebounce(mode) {
-  const timeoutRef = React2.useRef(null);
-  const lastCallTimeRef = React2.useRef(0);
-  const lastArgsRef = React2.useRef(null);
-  const clearTimeoutRef = () => {
-    if (timeoutRef.current) {
-      clearTimeout(timeoutRef.current);
-      timeoutRef.current = null;
-    }
-  };
-  const execute = React2.useCallback(
-    (callback, delay, ...args) => {
-      {
-        const now = Date.now();
-        lastArgsRef.current = args;
-        if (now - lastCallTimeRef.current >= delay) {
-          lastCallTimeRef.current = now;
-          callback(...args);
-          clearTimeoutRef();
-        } else {
-          clearTimeoutRef();
-          timeoutRef.current = setTimeout(
-            () => {
-              if (lastArgsRef.current) {
-                lastCallTimeRef.current = Date.now();
-                callback(...lastArgsRef.current);
-                timeoutRef.current = null;
-                lastArgsRef.current = null;
-              }
-            },
-            delay - (now - lastCallTimeRef.current)
-          );
-        }
-      }
-    },
-    [mode]
-  );
-  return execute;
-}
-
-// src/hooks/useSyncLayout.tsx
-function useSyncLayout2({
-  onChange
-}) {
-  const ref = React2.useRef(null);
-  const onLayout = React2.useCallback(
-    (event) => {
-      onChange(event.nativeEvent.layout, false);
-    },
-    [onChange]
-  );
-  if (IsNewArchitecture) {
-    React2.useLayoutEffect(() => {
-      if (ref.current) {
-        ref.current.measure((x, y, width, height) => {
-          onChange({ height, width, x, y }, true);
-        });
-      }
-    }, []);
-  }
-  return { onLayout, ref };
-}
 
 // src/components/ListComponent.tsx
 var getComponent = (Component) => {
@@ -800,9 +757,6 @@ var ListComponent = typedMemo(function ListComponent2({
   ...rest
 }) {
   const ctx = useStateContext();
-  const { onLayout: onLayoutHeaderSync, ref: refHeader } = useSyncLayout2({
-    onChange: onLayoutHeader
-  });
   const ScrollComponent = renderScrollComponent ? React2.useMemo(
     () => React2__namespace.forwardRef((props, ref) => renderScrollComponent({ ...props, ref })),
     [renderScrollComponent]
@@ -836,7 +790,7 @@ var ListComponent = typedMemo(function ListComponent2({
     },
     maintainVisibleContentPosition && /* @__PURE__ */ React2__namespace.createElement(ScrollAdjust, null),
     ENABLE_DEVMODE ? /* @__PURE__ */ React2__namespace.createElement(PaddingDevMode, null) : /* @__PURE__ */ React2__namespace.createElement(Padding, null),
-    ListHeaderComponent && /* @__PURE__ */ React2__namespace.createElement(reactNative.View, { onLayout: onLayoutHeaderSync, ref: refHeader, style: ListHeaderComponentStyle }, getComponent(ListHeaderComponent)),
+    ListHeaderComponent && /* @__PURE__ */ React2__namespace.createElement(LayoutView, { onLayoutChange: onLayoutHeader, style: ListHeaderComponentStyle }, getComponent(ListHeaderComponent)),
     ListEmptyComponent && getComponent(ListEmptyComponent),
     canRender && !ListEmptyComponent && /* @__PURE__ */ React2__namespace.createElement(
       Containers,
@@ -850,10 +804,10 @@ var ListComponent = typedMemo(function ListComponent2({
       }
     ),
     ListFooterComponent && /* @__PURE__ */ React2__namespace.createElement(
-      reactNative.View,
+      LayoutView,
       {
-        onLayout: (event) => {
-          const size = event.nativeEvent.layout[horizontal ? "width" : "height"];
+        onLayoutChange: (layout) => {
+          const size = layout[horizontal ? "width" : "height"];
           set$(ctx, "footerSize", size);
         },
         style: ListFooterComponentStyle
@@ -888,7 +842,7 @@ function getId(state, index) {
   }
   const ret = index < data.length ? keyExtractor ? keyExtractor(data[index], index) : index : null;
   const id = ret;
-  state.idCache.set(index, id);
+  state.idCache[index] = id;
   return id;
 }
 
@@ -1112,6 +1066,68 @@ function prepareMVCP(ctx, state, dataChanged) {
   };
 }
 
+// src/core/prepareColumnStartState.ts
+function prepareColumnStartState(ctx, state, startIndex, useAverageSize) {
+  var _a;
+  const numColumns = peek$(ctx, "numColumns");
+  let rowStartIndex = startIndex;
+  const columnAtStart = state.columns.get(state.idCache[startIndex]);
+  if (columnAtStart !== 1) {
+    rowStartIndex = findRowStartIndex(state, numColumns, startIndex);
+  }
+  let currentRowTop = 0;
+  const curId = state.idCache[rowStartIndex];
+  const column = state.columns.get(curId);
+  if (rowStartIndex > 0) {
+    const prevIndex = rowStartIndex - 1;
+    const prevId = state.idCache[prevIndex];
+    const prevPosition = (_a = state.positions.get(prevId)) != null ? _a : 0;
+    const prevRowStart = findRowStartIndex(state, numColumns, prevIndex);
+    const prevRowHeight = calculateRowMaxSize(state, prevRowStart, prevIndex, useAverageSize);
+    currentRowTop = prevPosition + prevRowHeight;
+  }
+  return {
+    column,
+    currentRowTop,
+    startIndex: rowStartIndex
+  };
+}
+function findRowStartIndex(state, numColumns, index) {
+  if (numColumns <= 1) {
+    return Math.max(0, index);
+  }
+  let rowStart = Math.max(0, index);
+  while (rowStart > 0) {
+    const columnForIndex = state.columns.get(state.idCache[rowStart]);
+    if (columnForIndex === 1) {
+      break;
+    }
+    rowStart--;
+  }
+  return rowStart;
+}
+function calculateRowMaxSize(state, startIndex, endIndex, useAverageSize) {
+  if (endIndex < startIndex) {
+    return 0;
+  }
+  const { data } = state.props;
+  if (!data) {
+    return 0;
+  }
+  let maxSize = 0;
+  for (let i = startIndex; i <= endIndex; i++) {
+    if (i < 0 || i >= data.length) {
+      continue;
+    }
+    const id = state.idCache[i];
+    const size = getItemSize(state, id, i, data[i], useAverageSize);
+    if (size > maxSize) {
+      maxSize = size;
+    }
+  }
+  return maxSize;
+}
+
 // src/utils/setPaddingTop.ts
 function setPaddingTop(ctx, state, { stylePaddingTop, alignItemsPaddingTop }) {
   if (stylePaddingTop !== void 0) {
@@ -1206,7 +1222,7 @@ function updateSnapToOffsets(ctx, state) {
 
 // src/core/updateItemPositions.ts
 function updateItemPositions(ctx, state, dataChanged, { startIndex, scrollBottomBuffered } = { scrollBottomBuffered: -1, startIndex: 0 }) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d;
   const {
     columns,
     indexByKey,
@@ -1216,41 +1232,47 @@ function updateItemPositions(ctx, state, dataChanged, { startIndex, scrollBottom
     props: { getEstimatedItemSize, snapToIndices, enableAverages }
   } = state;
   const data = state.props.data;
+  const dataLength = data.length;
   const numColumns = peek$(ctx, "numColumns");
+  const hasColumns = numColumns > 1;
   const indexByKeyForChecking = __DEV__ ? /* @__PURE__ */ new Map() : void 0;
   const maxVisibleArea = scrollBottomBuffered + 1e3;
   const useAverageSize = enableAverages && !getEstimatedItemSize;
   let currentRowTop = 0;
   let column = 1;
   let maxSizeInRow = 0;
-  const hasColumns = numColumns > 1;
   if (startIndex > 0) {
-    const prevIndex = startIndex - 1;
-    const prevId = (_a = idCache.get(prevIndex)) != null ? _a : getId(state, prevIndex);
-    const prevPosition = (_b = positions.get(prevId)) != null ? _b : 0;
     if (hasColumns) {
-      const prevColumn = (_c = columns.get(prevId)) != null ? _c : 1;
-      currentRowTop = prevPosition;
-      column = prevColumn % numColumns + 1;
-    } else {
-      const prevSize = (_d = sizesKnown.get(prevId)) != null ? _d : getItemSize(state, prevId, prevIndex, data[prevIndex], useAverageSize);
+      const { startIndex: processedStartIndex, currentRowTop: initialRowTop } = prepareColumnStartState(
+        ctx,
+        state,
+        startIndex,
+        useAverageSize
+      );
+      startIndex = processedStartIndex;
+      currentRowTop = initialRowTop;
+    } else if (startIndex < dataLength) {
+      const prevIndex = startIndex - 1;
+      const prevId = getId(state, prevIndex);
+      const prevPosition = (_a = positions.get(prevId)) != null ? _a : 0;
+      const prevSize = (_b = sizesKnown.get(prevId)) != null ? _b : getItemSize(state, prevId, prevIndex, data[prevIndex], useAverageSize);
       currentRowTop = prevPosition + prevSize;
     }
   }
   const needsIndexByKey = dataChanged || indexByKey.size === 0;
   let didBreakEarly = false;
   let breakAt;
-  const dataLength = data.length;
   for (let i = startIndex; i < dataLength; i++) {
     if (breakAt && i > breakAt) {
       didBreakEarly = true;
       break;
     }
-    if (!dataChanged && currentRowTop > maxVisibleArea) {
-      breakAt = i + 10;
+    if (breakAt === void 0 && !dataChanged && currentRowTop > maxVisibleArea) {
+      const itemsPerRow = hasColumns ? numColumns : 1;
+      breakAt = i + itemsPerRow + 10;
     }
-    const id = (_e = idCache.get(i)) != null ? _e : getId(state, i);
-    const size = (_f = sizesKnown.get(id)) != null ? _f : getItemSize(state, id, i, data[i], useAverageSize);
+    const id = (_c = idCache[i]) != null ? _c : getId(state, i);
+    const size = (_d = sizesKnown.get(id)) != null ? _d : getItemSize(state, id, i, data[i], useAverageSize);
     if (__DEV__ && needsIndexByKey) {
       if (indexByKeyForChecking.has(id)) {
         console.error(
@@ -1487,9 +1509,12 @@ function maybeUpdateViewabilityCallback(ctx, configId, containerId, viewToken) {
 var batchedUpdates = reactNative.unstable_batchedUpdates || ((callback) => callback());
 
 // src/utils/checkAllSizesKnown.ts
+function isNullOrUndefined2(value) {
+  return value === null || value === void 0;
+}
 function checkAllSizesKnown(state) {
   const { startBuffered, endBuffered, sizesKnown } = state;
-  if (endBuffered !== null) {
+  if (!isNullOrUndefined2(endBuffered) && !isNullOrUndefined2(startBuffered) && startBuffered >= 0 && endBuffered >= 0) {
     let areAllKnown = true;
     for (let i = startBuffered; areAllKnown && i <= endBuffered; i++) {
       const key = getId(state, i);
@@ -1506,6 +1531,8 @@ function findAvailableContainers(ctx, state, numNeeded, startBuffered, endBuffer
   const { stickyContainerPool, containerItemTypes } = state;
   const result = [];
   const availableContainers = [];
+  const pendingRemovalSet = new Set(pendingRemoval);
+  let pendingRemovalChanged = false;
   const stickyIndicesSet = state.props.stickyIndicesSet;
   const stickyItemIndices = (needNewContainers == null ? void 0 : needNewContainers.filter((index) => stickyIndicesSet.has(index))) || [];
   const canReuseContainer = (containerIndex, requiredType) => {
@@ -1521,12 +1548,11 @@ function findAvailableContainers(ctx, state, numNeeded, startBuffered, endBuffer
     let foundContainer = false;
     for (const containerIndex of stickyContainerPool) {
       const key = peek$(ctx, `containerItemKey${containerIndex}`);
-      const isPendingRemoval = pendingRemoval.includes(containerIndex);
+      const isPendingRemoval = pendingRemovalSet.has(containerIndex);
       if ((key === void 0 || isPendingRemoval) && canReuseContainer(containerIndex, requiredType)) {
         result.push(containerIndex);
-        if (isPendingRemoval) {
-          const index = pendingRemoval.indexOf(containerIndex);
-          pendingRemoval.splice(index, 1);
+        if (isPendingRemoval && pendingRemovalSet.delete(containerIndex)) {
+          pendingRemovalChanged = true;
         }
         foundContainer = true;
         if (requiredItemTypes) typeIndex++;
@@ -1546,13 +1572,11 @@ function findAvailableContainers(ctx, state, numNeeded, startBuffered, endBuffer
     }
     const key = peek$(ctx, `containerItemKey${u}`);
     let isOk = key === void 0;
-    if (!isOk) {
-      const index = pendingRemoval.indexOf(u);
-      if (index !== -1) {
-        pendingRemoval.splice(index, 1);
-        const requiredType = neededTypes[typeIndex];
-        isOk = canReuseContainer(u, requiredType);
-      }
+    if (!isOk && pendingRemovalSet.has(u)) {
+      pendingRemovalSet.delete(u);
+      pendingRemovalChanged = true;
+      const requiredType = neededTypes[typeIndex];
+      isOk = canReuseContainer(u, requiredType);
     }
     if (isOk) {
       result.push(u);
@@ -1610,6 +1634,12 @@ function findAvailableContainers(ctx, state, numNeeded, startBuffered, endBuffer
       }
     }
   }
+  if (pendingRemovalChanged) {
+    pendingRemoval.length = 0;
+    for (const value of pendingRemovalSet) {
+      pendingRemoval.push(value);
+    }
+  }
   return result.sort(comparatorDefault);
 }
 function comparatorByDistance(a, b) {
@@ -1769,7 +1799,8 @@ function findCurrentStickyIndex(stickyArray, scroll, state) {
   const idCache = state.idCache;
   const positions = state.positions;
   for (let i = stickyArray.length - 1; i >= 0; i--) {
-    const stickyId = (_a = idCache.get(stickyArray[i])) != null ? _a : getId(state, stickyArray[i]);
+    const stickyIndex = stickyArray[i];
+    const stickyId = (_a = idCache[stickyIndex]) != null ? _a : getId(state, stickyIndex);
     const stickyPos = stickyId ? positions.get(stickyId) : void 0;
     if (stickyPos !== void 0 && scroll >= stickyPos) {
       return i;
@@ -1782,40 +1813,43 @@ function getActiveStickyIndices(ctx, state, stickyIndices) {
     Array.from(state.stickyContainerPool).map((i) => peek$(ctx, `containerItemKey${i}`)).map((key) => key ? state.indexByKey.get(key) : void 0).filter((idx) => idx !== void 0 && stickyIndices.has(idx))
   );
 }
-function handleStickyActivation(ctx, state, stickyIndices, stickyArray, scroll, needNewContainers, startBuffered, endBuffered) {
+function handleStickyActivation(ctx, state, stickyIndices, stickyArray, currentStickyIdx, needNewContainers, startBuffered, endBuffered) {
   var _a;
   const activeIndices = getActiveStickyIndices(ctx, state, stickyIndices);
-  const currentStickyIdx = findCurrentStickyIndex(stickyArray, scroll, state);
   state.activeStickyIndex = currentStickyIdx >= 0 ? stickyArray[currentStickyIdx] : void 0;
   for (let offset = 0; offset <= 1; offset++) {
     const idx = currentStickyIdx - offset;
     if (idx < 0 || activeIndices.has(stickyArray[idx])) continue;
     const stickyIndex = stickyArray[idx];
-    const stickyId = (_a = state.idCache.get(stickyIndex)) != null ? _a : getId(state, stickyIndex);
+    const stickyId = (_a = state.idCache[stickyIndex]) != null ? _a : getId(state, stickyIndex);
     if (stickyId && !state.containerItemKeys.has(stickyId) && (stickyIndex < startBuffered || stickyIndex > endBuffered)) {
       needNewContainers.push(stickyIndex);
     }
   }
 }
-function handleStickyRecycling(ctx, state, stickyArray, scroll, scrollBuffer, pendingRemoval) {
+function handleStickyRecycling(ctx, state, stickyArray, scroll, scrollBuffer, currentStickyIdx, pendingRemoval) {
   var _a, _b, _c;
-  const currentStickyIdx = findCurrentStickyIndex(stickyArray, scroll, state);
   for (const containerIndex of state.stickyContainerPool) {
     const itemKey = peek$(ctx, `containerItemKey${containerIndex}`);
     const itemIndex = itemKey ? state.indexByKey.get(itemKey) : void 0;
     if (itemIndex === void 0) continue;
     const arrayIdx = stickyArray.indexOf(itemIndex);
-    if (arrayIdx === -1) continue;
+    if (arrayIdx === -1) {
+      state.stickyContainerPool.delete(containerIndex);
+      set$(ctx, `containerSticky${containerIndex}`, false);
+      set$(ctx, `containerStickyOffset${containerIndex}`, void 0);
+      continue;
+    }
     const isRecentSticky = arrayIdx >= currentStickyIdx - 1 && arrayIdx <= currentStickyIdx + 1;
     if (isRecentSticky) continue;
     const nextIndex = stickyArray[arrayIdx + 1];
     let shouldRecycle = false;
     if (nextIndex) {
-      const nextId = (_a = state.idCache.get(nextIndex)) != null ? _a : getId(state, nextIndex);
+      const nextId = (_a = state.idCache[nextIndex]) != null ? _a : getId(state, nextIndex);
       const nextPos = nextId ? state.positions.get(nextId) : void 0;
       shouldRecycle = nextPos !== void 0 && scroll > nextPos + scrollBuffer * 2;
     } else {
-      const currentId = (_b = state.idCache.get(itemIndex)) != null ? _b : getId(state, itemIndex);
+      const currentId = (_b = state.idCache[itemIndex]) != null ? _b : getId(state, itemIndex);
       if (currentId) {
         const currentPos = state.positions.get(currentId);
         const currentSize = (_c = state.sizes.get(currentId)) != null ? _c : getItemSize(state, currentId, itemIndex, state.props.data[itemIndex]);
@@ -1843,7 +1877,7 @@ function calculateItemsInView(ctx, state, params = {}) {
       sizes,
       startBufferedId: startBufferedIdOrig,
       viewabilityConfigCallbackPairs,
-      props: { getItemType, initialScroll, itemsAreEqual, keyExtractor, scrollBuffer }
+      props: { getItemType, initialScroll, itemsAreEqual, keyExtractor, onStickyHeaderChange, scrollBuffer }
     } = state;
     const { data } = state.props;
     const stickyIndicesArr = state.props.stickyIndicesArr || [];
@@ -1878,6 +1912,10 @@ function calculateItemsInView(ctx, state, params = {}) {
       set$(ctx, "debugRawScroll", scrollState);
       set$(ctx, "debugComputedScroll", scroll);
     }
+    const previousStickyIndex = state.activeStickyIndex;
+    const currentStickyIdx = stickyIndicesArr.length > 0 ? findCurrentStickyIndex(stickyIndicesArr, scroll, state) : -1;
+    const nextActiveStickyIndex = currentStickyIdx >= 0 ? stickyIndicesArr[currentStickyIdx] : void 0;
+    state.activeStickyIndex = nextActiveStickyIndex;
     let scrollBufferTop = scrollBuffer;
     let scrollBufferBottom = scrollBuffer;
     if (speed > 0 || speed === 0 && scroll < Math.max(50, scrollBuffer)) {
@@ -1899,7 +1937,7 @@ function calculateItemsInView(ctx, state, params = {}) {
     const checkMVCP = doMVCP ? prepareMVCP(ctx, state, dataChanged) : void 0;
     if (dataChanged) {
       indexByKey.clear();
-      idCache.clear();
+      idCache.length = 0;
       positions.clear();
     }
     const startIndex = dataChanged ? 0 : (_a = minIndexSizeChanged != null ? minIndexSizeChanged : state.startBuffered) != null ? _a : 0;
@@ -1915,7 +1953,7 @@ function calculateItemsInView(ctx, state, params = {}) {
     let endBuffered = null;
     let loopStart = !dataChanged && startBufferedIdOrig ? indexByKey.get(startBufferedIdOrig) || 0 : 0;
     for (let i = loopStart; i >= 0; i--) {
-      const id = (_b = idCache.get(i)) != null ? _b : getId(state, i);
+      const id = (_b = idCache[i]) != null ? _b : getId(state, i);
       const top = positions.get(id);
       const size = (_c = sizes.get(id)) != null ? _c : getItemSize(state, id, i, data[i]);
       const bottom = top + size;
@@ -1943,7 +1981,7 @@ function calculateItemsInView(ctx, state, params = {}) {
     let firstFullyOnScreenIndex;
     const dataLength = data.length;
     for (let i = Math.max(0, loopStart); i < dataLength && (!foundEnd || i <= maxIndexRendered); i++) {
-      const id = (_d = idCache.get(i)) != null ? _d : getId(state, i);
+      const id = (_d = idCache[i]) != null ? _d : getId(state, i);
       const size = (_e = sizes.get(id)) != null ? _e : getItemSize(state, id, i, data[i]);
       const top = positions.get(id);
       if (!foundEnd) {
@@ -1973,7 +2011,7 @@ function calculateItemsInView(ctx, state, params = {}) {
     }
     const idsInView = [];
     for (let i = firstFullyOnScreenIndex; i <= endNoBuffer; i++) {
-      const id = (_f = idCache.get(i)) != null ? _f : getId(state, i);
+      const id = (_f = idCache[i]) != null ? _f : getId(state, i);
       idsInView.push(id);
     }
     Object.assign(state, {
@@ -2005,7 +2043,7 @@ function calculateItemsInView(ctx, state, params = {}) {
       let numContainers2 = prevNumContainers;
       const needNewContainers = [];
       for (let i = startBuffered; i <= endBuffered; i++) {
-        const id = (_g = idCache.get(i)) != null ? _g : getId(state, i);
+        const id = (_g = idCache[i]) != null ? _g : getId(state, i);
         if (!containerItemKeys.has(id)) {
           needNewContainers.push(i);
         }
@@ -2016,7 +2054,7 @@ function calculateItemsInView(ctx, state, params = {}) {
           state,
           stickyIndicesSet,
           stickyIndicesArr,
-          scroll,
+          currentStickyIdx,
           needNewContainers,
           startBuffered,
           endBuffered
@@ -2042,7 +2080,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         for (let idx = 0; idx < needNewContainers.length; idx++) {
           const i = needNewContainers[idx];
           const containerIndex = availableContainers[idx];
-          const id = (_h = idCache.get(i)) != null ? _h : getId(state, i);
+          const id = (_h = idCache[i]) != null ? _h : getId(state, i);
           const oldKey = peek$(ctx, `containerItemKey${containerIndex}`);
           if (oldKey && oldKey !== id) {
             containerItemKeys.delete(oldKey);
@@ -2056,7 +2094,7 @@ function calculateItemsInView(ctx, state, params = {}) {
           if (stickyIndicesSet.has(i)) {
             set$(ctx, `containerSticky${containerIndex}`, true);
             const topPadding = (peek$(ctx, "stylePaddingTop") || 0) + (peek$(ctx, "headerSize") || 0);
-            set$(ctx, `containerStickyOffset${containerIndex}`, new reactNative.Animated.Value(topPadding));
+            set$(ctx, `containerStickyOffset${containerIndex}`, topPadding);
             state.stickyContainerPool.add(containerIndex);
           } else {
             set$(ctx, `containerSticky${containerIndex}`, false);
@@ -2075,7 +2113,7 @@ function calculateItemsInView(ctx, state, params = {}) {
       }
     }
     if (stickyIndicesArr.length > 0) {
-      handleStickyRecycling(ctx, state, stickyIndicesArr, scroll, scrollBuffer, pendingRemoval);
+      handleStickyRecycling(ctx, state, stickyIndicesArr, scroll, scrollBuffer, currentStickyIdx, pendingRemoval);
     }
     for (let i = 0; i < numContainers; i++) {
       const itemKey = peek$(ctx, `containerItemKey${i}`);
@@ -2097,7 +2135,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         const itemIndex = indexByKey.get(itemKey);
         const item = data[itemIndex];
         if (item !== void 0) {
-          const id = (_i = idCache.get(itemIndex)) != null ? _i : getId(state, itemIndex);
+          const id = (_i = idCache[itemIndex]) != null ? _i : getId(state, itemIndex);
           const position = positions.get(id);
           if (position === void 0) {
             set$(ctx, `containerPosition${i}`, POSITION_OUT_OF_VIEW);
@@ -2127,6 +2165,12 @@ function calculateItemsInView(ctx, state, params = {}) {
     if (viewabilityConfigCallbackPairs) {
       updateViewableItems(state, ctx, viewabilityConfigCallbackPairs, scrollLength, startNoBuffer, endNoBuffer);
     }
+    if (onStickyHeaderChange && stickyIndicesArr.length > 0 && nextActiveStickyIndex !== void 0 && nextActiveStickyIndex !== previousStickyIndex) {
+      const item = data[nextActiveStickyIndex];
+      if (item !== void 0) {
+        onStickyHeaderChange({ index: nextActiveStickyIndex, item });
+      }
+    }
   });
 }
 
@@ -2285,7 +2329,9 @@ function doInitialAllocateContainers(ctx, state) {
       let totalSize = 0;
       const num = Math.min(20, data.length);
       for (let i = 0; i < num; i++) {
-        totalSize += fn(0, data[0], getItemType ? (_a = getItemType(data[0], 0)) != null ? _a : "" : "");
+        const item = data[i];
+        const itemType = getItemType ? (_a = getItemType(item, i)) != null ? _a : "" : "";
+        totalSize += fn(i, item, itemType);
       }
       averageItemSize = totalSize / num;
     } else {
@@ -2314,7 +2360,9 @@ function doInitialAllocateContainers(ctx, state) {
 // src/core/handleLayout.ts
 function handleLayout(ctx, state, layout, setCanRender) {
   const { maintainScrollAtEnd } = state.props;
-  const scrollLength = layout[state.props.horizontal ? "width" : "height"];
+  const measuredLength = layout[state.props.horizontal ? "width" : "height"];
+  const previousLength = state.scrollLength;
+  const scrollLength = measuredLength > 0 ? measuredLength : previousLength;
   const otherAxisSize = layout[state.props.horizontal ? "height" : "width"];
   const needsCalculate = !state.lastLayout || scrollLength > state.scrollLength || state.lastLayout.x !== layout.x || state.lastLayout.y !== layout.y;
   state.lastLayout = layout;
@@ -2325,7 +2373,9 @@ function handleLayout(ctx, state, layout, setCanRender) {
     state.otherAxisSize = otherAxisSize;
     state.lastBatchingAction = Date.now();
     state.scrollForNextCalculateItemsInView = void 0;
-    doInitialAllocateContainers(ctx, state);
+    if (scrollLength > 0) {
+      doInitialAllocateContainers(ctx, state);
+    }
     if (needsCalculate) {
       calculateItemsInView(ctx, state, { doMVCP: true });
     }
@@ -2341,14 +2391,14 @@ function handleLayout(ctx, state, layout, setCanRender) {
     if (state) {
       state.needsOtherAxisSize = otherAxisSize - (state.props.stylePaddingTop || 0) < 10;
     }
-    if (__DEV__ && scrollLength === 0) {
+    if (__DEV__ && measuredLength === 0) {
       warnDevOnce(
         "height0",
         `List ${state.props.horizontal ? "width" : "height"} is 0. You may need to set a style or \`flex: \` for the list, because children are absolutely positioned.`
       );
     }
-    setCanRender(true);
   }
+  setCanRender(true);
 }
 
 // src/core/onScroll.ts
@@ -2598,18 +2648,59 @@ function getRenderedItem(ctx, state, key) {
     return null;
   }
   let renderedItem = null;
-  if (renderItem && data[index]) {
+  const extraData = peek$(ctx, "extraData");
+  const item = data[index];
+  if (renderItem && !isNullOrUndefined(item)) {
     const itemProps = {
       data,
-      extraData: peek$(ctx, "extraData"),
+      extraData,
       index,
-      item: data[index],
-      type: getItemType ? (_a = getItemType(data[index], index)) != null ? _a : "" : ""
+      item,
+      type: getItemType ? (_a = getItemType(item, index)) != null ? _a : "" : ""
     };
     renderedItem = isFunction(renderItem) ? renderItem(itemProps) : React2__namespace.default.createElement(renderItem, itemProps);
   }
   return { index, item: data[index], renderedItem };
 }
+function useThrottleDebounce(mode) {
+  const timeoutRef = React2.useRef(null);
+  const lastCallTimeRef = React2.useRef(0);
+  const lastArgsRef = React2.useRef(null);
+  const clearTimeoutRef = () => {
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current);
+      timeoutRef.current = null;
+    }
+  };
+  const execute = React2.useCallback(
+    (callback, delay, ...args) => {
+      {
+        const now = Date.now();
+        lastArgsRef.current = args;
+        if (now - lastCallTimeRef.current >= delay) {
+          lastCallTimeRef.current = now;
+          callback(...args);
+          clearTimeoutRef();
+        } else {
+          clearTimeoutRef();
+          timeoutRef.current = setTimeout(
+            () => {
+              if (lastArgsRef.current) {
+                lastCallTimeRef.current = Date.now();
+                callback(...lastArgsRef.current);
+                timeoutRef.current = null;
+                lastArgsRef.current = null;
+              }
+            },
+            delay - (now - lastCallTimeRef.current)
+          );
+        }
+      }
+    },
+    [mode]
+  );
+  return execute;
+}
 
 // src/utils/throttledOnScroll.ts
 function useThrottledOnScroll(originalHandler, scrollEventThrottle) {
@@ -2673,6 +2764,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     onScroll: onScrollProp,
     onStartReached,
     onStartReachedThreshold = 0.5,
+    onStickyHeaderChange,
     onViewableItemsChanged,
     progressViewOffset,
     recycleItems = false,
@@ -2720,7 +2812,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         endNoBuffer: -1,
         endReachedBlockedByTimer: false,
         firstFullyOnScreenIndex: -1,
-        idCache: /* @__PURE__ */ new Map(),
+        idCache: [],
         idsInView: [],
         indexByKey: /* @__PURE__ */ new Map(),
         initialScroll,
@@ -2795,6 +2887,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     onScroll: throttleScrollFn,
     onStartReached,
     onStartReachedThreshold,
+    onStickyHeaderChange,
     recycleItems: !!recycleItems,
     renderItem,
     scrollBuffer,
@@ -2889,7 +2982,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
   }, [snapToIndices]);
   React2.useLayoutEffect(() => {
-    const didAllocateContainers = dataProp.length > 0 && doInitialAllocateContainersCallback();
+    const didAllocateContainers = dataProp.length > 0 && doInitialAllocateContainers(ctx, state);
     if (!didAllocateContainers) {
       checkResetContainers(
         ctx,
@@ -2903,30 +2996,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   React2.useLayoutEffect(() => {
     set$(ctx, "extraData", extraData);
   }, [extraData]);
-  React2.useLayoutEffect(() => {
-    var _a2;
-    if (IsNewArchitecture) {
-      let measured;
-      (_a2 = refScroller.current) == null ? void 0 : _a2.measure((x, y, width, height) => {
-        measured = { height, width, x, y };
-      });
-      if (measured) {
-        const size = Math.floor(measured[horizontal ? "width" : "height"] * 8) / 8;
-        if (size) {
-          handleLayout(ctx, state, measured, setCanRender);
-        }
-      }
-    }
-  }, []);
   React2.useLayoutEffect(initializeStateVars, [
     memoizedLastItemKeys.join(","),
     numColumnsProp,
     stylePaddingTopState,
     stylePaddingBottomState
   ]);
-  const doInitialAllocateContainersCallback = () => {
-    return doInitialAllocateContainers(ctx, state);
-  };
   React2.useEffect(() => {
     const viewability = setupViewability({
       onViewableItemsChanged,
@@ -2938,16 +3013,18 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   }, [viewabilityConfig, viewabilityConfigCallbackPairs, onViewableItemsChanged]);
   if (!IsNewArchitecture) {
     useInit(() => {
-      doInitialAllocateContainersCallback();
+      doInitialAllocateContainers(ctx, state);
     });
   }
-  const onLayout = React2.useCallback((event) => {
-    const layout = event.nativeEvent.layout;
+  const onLayoutChange = React2.useCallback((layout) => {
     handleLayout(ctx, state, layout, setCanRender);
-    if (onLayoutProp) {
-      onLayoutProp(event);
-    }
   }, []);
+  const { onLayout } = useOnLayoutSync({
+    onLayoutChange,
+    onLayoutProp,
+    ref: refScroller
+    // the type of ScrollView doesn't include measure?
+  });
   React2.useImperativeHandle(forwardedRef, () => {
     const scrollIndexIntoView = (options) => {
       const state2 = refState.current;