@legendapp/list 0.3.1 → 0.3.3

package/index.mjs

@@ -1,39 +1,36 @@
-import * as React2 from 'react';
-import { forwardRef, useRef, useMemo, useCallback, useEffect } from 'react';
-import { ScrollView, View, StyleSheet, Dimensions } from 'react-native';
+import * as React6 from 'react';
+import { forwardRef, useRef, useMemo, useCallback } from 'react';
+import { ScrollView, View, StyleSheet, Dimensions, unstable_batchedUpdates } from 'react-native';
 
 // src/LegendList.tsx
-var LeanView = React2.forwardRef((props, ref) => {
-  return React2.createElement("RCTView", { ...props, ref });
+var LeanView = React6.forwardRef((props, ref) => {
+  return React6.createElement("RCTView", { ...props, ref });
 });
 LeanView.displayName = "RCTView";
-var ContextListener = React2.createContext(null);
+var ContextListener = React6.createContext(null);
 function StateProvider({ children }) {
-  const [value] = React2.useState(() => ({
+  const [value] = React6.useState(() => ({
     listeners: /* @__PURE__ */ new Map(),
     values: /* @__PURE__ */ new Map()
   }));
-  return /* @__PURE__ */ React2.createElement(ContextListener.Provider, { value }, children);
+  return /* @__PURE__ */ React6.createElement(ContextListener.Provider, { value }, children);
 }
 function useStateContext() {
-  return React2.useContext(ContextListener);
+  return React6.useContext(ContextListener);
 }
 function use$(signalName) {
-  const { listeners, values } = React2.useContext(ContextListener);
-  const [_, setState] = React2.useState(0);
-  React2.useMemo(() => {
-    const render = () => setState((prev) => prev > 1e4 ? 0 : prev + 1);
-    listeners.set(signalName, render);
-  }, []);
+  const { listeners, values } = React6.useContext(ContextListener);
+  const [, forceUpdate] = React6.useReducer((x) => x + 1, 0);
+  listeners.set(signalName, forceUpdate);
   return values.get(signalName);
 }
-function peek$(signalName, ctx) {
-  const { values } = ctx || React2.useContext(ContextListener);
+function peek$(ctx, signalName) {
+  const { values } = ctx;
   return values.get(signalName);
 }
-function set$(signalName, ctx, value) {
+function set$(ctx, signalName, value) {
   var _a;
-  const { listeners, values } = ctx || React2.useContext(ContextListener);
+  const { listeners, values } = ctx;
   if (values.get(signalName) !== value) {
     values.set(signalName, value);
     (_a = listeners.get(signalName)) == null ? void 0 : _a();
@@ -44,7 +41,7 @@ function set$(signalName, ctx, value) {
 function $View({ $key, $style, ...rest }) {
   use$($key);
   const style = $style();
-  return /* @__PURE__ */ React2.createElement(LeanView, { style, ...rest });
+  return /* @__PURE__ */ React6.createElement(LeanView, { style, ...rest });
 }
 function InnerContainer({ id, getRenderedItem, recycleItems, ItemSeparatorComponent }) {
   const itemIndex = use$(`containerIndex${id}`);
@@ -53,7 +50,7 @@ function InnerContainer({ id, getRenderedItem, recycleItems, ItemSeparatorCompon
     return null;
   }
   const renderedItem = getRenderedItem(itemIndex);
-  return /* @__PURE__ */ React2.createElement(React2.Fragment, { key: recycleItems ? void 0 : itemIndex }, renderedItem, ItemSeparatorComponent && itemIndex < numItems - 1 && ItemSeparatorComponent);
+  return /* @__PURE__ */ React6.createElement(React6.Fragment, { key: recycleItems ? void 0 : itemIndex }, renderedItem, ItemSeparatorComponent && itemIndex < numItems - 1 && ItemSeparatorComponent);
 }
 var Container = ({
   id,
@@ -65,7 +62,7 @@ var Container = ({
 }) => {
   const ctx = useStateContext();
   const createStyle = () => {
-    const position = peek$(`containerPosition${id}`, ctx);
+    const position = peek$(ctx, `containerPosition${id}`);
     return horizontal ? {
       flexDirection: "row",
       position: "absolute",
@@ -81,20 +78,20 @@ var Container = ({
       opacity: position < 0 ? 0 : 1
     };
   };
-  return /* @__PURE__ */ React2.createElement(
+  return /* @__PURE__ */ React6.createElement(
     $View,
     {
       $key: `containerPosition${id}`,
       $style: createStyle,
       onLayout: (event) => {
-        const index = peek$(`containerIndex${id}`, ctx);
+        const index = peek$(ctx, `containerIndex${id}`);
         if (index >= 0) {
           const length = Math.round(event.nativeEvent.layout[horizontal ? "width" : "height"]);
           onLayout(index, length);
         }
       }
     },
-    /* @__PURE__ */ React2.createElement(
+    /* @__PURE__ */ React6.createElement(
       InnerContainer,
       {
         id,
@@ -107,11 +104,11 @@ var Container = ({
 };
 
 // src/Containers.tsx
-var Containers = React2.memo(function Containers2({
+var Containers = React6.memo(function Containers2({
   horizontal,
   recycleItems,
   ItemSeparatorComponent,
-  updateItemLength,
+  updateItemSize,
   getRenderedItem
 }) {
   const ctx = useStateContext();
@@ -119,7 +116,7 @@ var Containers = React2.memo(function Containers2({
   const containers = [];
   for (let i = 0; i < numContainers; i++) {
     containers.push(
-      /* @__PURE__ */ React2.createElement(
+      /* @__PURE__ */ React6.createElement(
         Container,
         {
           id: i,
@@ -127,20 +124,20 @@ var Containers = React2.memo(function Containers2({
           recycleItems,
           horizontal,
           getRenderedItem,
-          onLayout: updateItemLength,
+          onLayout: updateItemSize,
           ItemSeparatorComponent
         }
       )
     );
   }
-  return /* @__PURE__ */ React2.createElement(
+  return /* @__PURE__ */ React6.createElement(
     $View,
     {
       $key: "totalLength",
       $style: () => horizontal ? {
-        width: peek$("totalLength", ctx)
+        width: peek$(ctx, "totalLength")
       } : {
-        height: peek$("totalLength", ctx)
+        height: peek$(ctx, "totalLength")
       }
     },
     containers
@@ -149,15 +146,15 @@ var Containers = React2.memo(function Containers2({
 
 // src/ListComponent.tsx
 var getComponent = (Component) => {
-  if (React2.isValidElement(Component)) {
+  if (React6.isValidElement(Component)) {
     return Component;
   }
   if (Component) {
-    return /* @__PURE__ */ React2.createElement(Component, null);
+    return /* @__PURE__ */ React6.createElement(Component, null);
   }
   return null;
 };
-var ListComponent = React2.memo(function ListComponent2({
+var ListComponent = React6.memo(function ListComponent2({
   style,
   contentContainerStyle,
   horizontal,
@@ -172,12 +169,12 @@ var ListComponent = React2.memo(function ListComponent2({
   ListFooterComponent,
   ListFooterComponentStyle,
   getRenderedItem,
-  updateItemLength,
+  updateItemSize,
   refScroller,
   ...rest
 }) {
   const ctx = useStateContext();
-  return /* @__PURE__ */ React2.createElement(
+  return /* @__PURE__ */ React6.createElement(
     ScrollView,
     {
       ...rest,
@@ -190,24 +187,23 @@ var ListComponent = React2.memo(function ListComponent2({
       ],
       onScroll: handleScroll,
       onLayout,
-      scrollEventThrottle: 32,
       horizontal,
       contentOffset: initialContentOffset ? horizontal ? { x: initialContentOffset, y: 0 } : { x: 0, y: initialContentOffset } : void 0,
       ref: refScroller
     },
-    alignItemsAtEnd && /* @__PURE__ */ React2.createElement($View, { $key: "paddingTop", $style: () => ({ height: peek$("paddingTop", ctx) }) }),
-    ListHeaderComponent && /* @__PURE__ */ React2.createElement(View, { style: ListHeaderComponentStyle }, getComponent(ListHeaderComponent)),
-    /* @__PURE__ */ React2.createElement(
+    alignItemsAtEnd && /* @__PURE__ */ React6.createElement($View, { $key: "paddingTop", $style: () => ({ height: peek$(ctx, "paddingTop") }) }),
+    ListHeaderComponent && /* @__PURE__ */ React6.createElement(View, { style: ListHeaderComponentStyle }, getComponent(ListHeaderComponent)),
+    /* @__PURE__ */ React6.createElement(
       Containers,
       {
         horizontal,
         recycleItems,
         getRenderedItem,
         ItemSeparatorComponent: ItemSeparatorComponent && getComponent(ItemSeparatorComponent),
-        updateItemLength
+        updateItemSize
       }
     ),
-    ListFooterComponent && /* @__PURE__ */ React2.createElement(View, { style: ListFooterComponentStyle }, getComponent(ListFooterComponent))
+    ListFooterComponent && /* @__PURE__ */ React6.createElement(View, { style: ListFooterComponentStyle }, getComponent(ListFooterComponent))
   );
 });
 
@@ -215,10 +211,11 @@ var ListComponent = React2.memo(function ListComponent2({
 var DEFAULT_SCROLL_BUFFER = 0;
 var POSITION_OUT_OF_VIEW = -1e4;
 var LegendList = forwardRef(function LegendList2(props, forwardedRef) {
-  return /* @__PURE__ */ React2.createElement(StateProvider, null, /* @__PURE__ */ React2.createElement(LegendListInner, { ...props, ref: forwardedRef }));
+  return /* @__PURE__ */ React6.createElement(StateProvider, null, /* @__PURE__ */ React6.createElement(LegendListInner, { ...props, ref: forwardedRef }));
 });
 var LegendListInner = forwardRef(
   function LegendListInner2(props, forwardedRef) {
+    var _a, _b;
     const {
       data,
       initialScrollIndex,
@@ -226,7 +223,7 @@ var LegendListInner = forwardRef(
       horizontal,
       style: styleProp,
       contentContainerStyle: contentContainerStyleProp,
-      initialContainers,
+      initialNumContainers,
       drawDistance,
       recycleItems = true,
       onEndReachedThreshold = 0.5,
@@ -236,7 +233,8 @@ var LegendListInner = forwardRef(
       onScroll: onScrollProp,
       keyExtractor,
       renderItem,
-      estimatedItemLength,
+      estimatedItemSize,
+      getEstimatedItemSize,
       onEndReached,
       onViewableRangeChanged,
       ...rest
@@ -254,20 +252,39 @@ var LegendListInner = forwardRef(
     );
     const refState = useRef();
     const getId = (index) => {
-      var _a;
-      const data2 = (_a = refState.current) == null ? void 0 : _a.data;
+      var _a2;
+      const data2 = (_a2 = refState.current) == null ? void 0 : _a2.data;
       if (!data2) {
         return "";
       }
       const ret = index < data2.length ? keyExtractor ? keyExtractor(data2[index], index) : index : null;
       return ret + "";
     };
+    const getItemLength = (index, data2) => {
+      return getEstimatedItemSize ? getEstimatedItemSize(index, data2) : estimatedItemSize;
+    };
+    const calculateInitialOffset = () => {
+      if (initialScrollIndex) {
+        if (getEstimatedItemSize) {
+          let offset = 0;
+          for (let i = 0; i < initialScrollIndex; i++) {
+            offset += getEstimatedItemSize(i, data[i]);
+          }
+          return offset;
+        } else if (estimatedItemSize) {
+          return initialScrollIndex * estimatedItemSize;
+        }
+      }
+      return void 0;
+    };
+    const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : useMemo(calculateInitialOffset, [initialScrollIndex, estimatedItemSize]);
     if (!refState.current) {
       refState.current = {
         lengths: /* @__PURE__ */ new Map(),
         positions: /* @__PURE__ */ new Map(),
         pendingAdjust: 0,
-        animFrame: null,
+        animFrameScroll: null,
+        animFrameLayout: null,
         isStartReached: false,
         isEndReached: false,
         isAtBottom: false,
@@ -279,35 +296,36 @@ var LegendListInner = forwardRef(
         startNoBuffer: 0,
         endBuffered: 0,
         endNoBuffer: 0,
-        scroll: 0,
-        topPad: 0
+        scroll: initialContentOffset || 0
       };
       refState.current.idsInFirstRender = new Set(data.map((_, i) => getId(i)));
     }
     refState.current.data = data;
-    set$(`numItems`, ctx, data.length);
-    const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : initialScrollIndex ? initialScrollIndex * estimatedItemLength(initialScrollIndex) : void 0;
-    const setTotalLength = (length) => {
-      set$(`totalLength`, ctx, length);
+    set$(ctx, `numItems`, data.length);
+    set$(ctx, `stylePaddingTop`, (_b = (_a = styleFlattened == null ? void 0 : styleFlattened.paddingTop) != null ? _a : contentContainerStyleFlattened == null ? void 0 : contentContainerStyleFlattened.paddingTop) != null ? _b : 0);
+    const addTotalSize = (add) => {
+      const length = (peek$(ctx, `totalLength`) || 0) + add;
+      set$(ctx, `totalLength`, length);
       const screenLength = refState.current.scrollLength;
       if (alignItemsAtEnd) {
-        const listPaddingTop = ((style == null ? void 0 : style.paddingTop) || 0) + ((contentContainerStyle == null ? void 0 : contentContainerStyle.paddingTop) || 0);
-        set$(`paddingTop`, ctx, Math.max(0, screenLength - length - listPaddingTop));
+        const listPaddingTop = peek$(ctx, `stylePaddingTop`);
+        set$(ctx, `paddingTop`, Math.max(0, screenLength - length - listPaddingTop));
       }
     };
     const allocateContainers = useCallback(() => {
       const scrollLength = refState.current.scrollLength;
-      const numContainers = initialContainers || Math.ceil((scrollLength + scrollBuffer * 2) / estimatedItemLength(0)) + 4;
+      const averageItemSize = estimatedItemSize != null ? estimatedItemSize : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(0, data[0]);
+      const numContainers = initialNumContainers || Math.ceil((scrollLength + scrollBuffer * 2) / averageItemSize) + 4;
       for (let i = 0; i < numContainers; i++) {
-        set$(`containerIndex${i}`, ctx, -1);
-        set$(`containerPosition${i}`, ctx, POSITION_OUT_OF_VIEW);
+        set$(ctx, `containerIndex${i}`, -1);
+        set$(ctx, `containerPosition${i}`, POSITION_OUT_OF_VIEW);
       }
-      set$(`numContainers`, ctx, numContainers);
+      set$(ctx, `numContainers`, numContainers);
     }, []);
     const getRenderedItem = useCallback(
       (index) => {
-        var _a;
-        const data2 = (_a = refState.current) == null ? void 0 : _a.data;
+        var _a2;
+        const data2 = (_a2 = refState.current) == null ? void 0 : _a2.data;
         if (!data2) {
           return null;
         }
@@ -320,146 +338,164 @@ var LegendListInner = forwardRef(
       [renderItem]
     );
     const calculateItemsInView = useCallback(() => {
-      var _a, _b;
-      const {
-        data: data2,
-        scrollLength,
-        scroll: scrollState,
-        topPad,
-        startNoBuffer: startNoBufferState,
-        startBuffered: startBufferedState,
-        endNoBuffer: endNoBufferState,
-        endBuffered: endBufferedState
-      } = refState.current;
-      if (!data2) {
-        return;
-      }
-      const scroll = scrollState - topPad;
-      const { lengths, positions } = refState.current;
-      let top = 0;
-      let startNoBuffer = null;
-      let startBuffered = null;
-      let endNoBuffer = null;
-      let endBuffered = null;
-      for (let i = 0; i < data2.length; i++) {
-        const id = getId(i);
-        const length = (_a = lengths.get(id)) != null ? _a : estimatedItemLength(i);
-        if (positions.get(id) !== top) {
-          positions.set(id, top);
-        }
-        if (startNoBuffer === null && top + length > scroll) {
-          startNoBuffer = i;
+      unstable_batchedUpdates(() => {
+        var _a2, _b2, _c;
+        const {
+          data: data2,
+          scrollLength,
+          scroll: scrollState,
+          startNoBuffer: startNoBufferState,
+          startBuffered: startBufferedState,
+          endNoBuffer: endNoBufferState,
+          endBuffered: endBufferedState
+        } = refState.current;
+        if (!data2) {
+          return;
         }
-        if (startBuffered === null && top + length > scroll - scrollBuffer) {
-          startBuffered = i;
+        const topPad = (peek$(ctx, `stylePaddingTop`) || 0) + (peek$(ctx, `headerSize`) || 0);
+        const scroll = scrollState - topPad;
+        const { lengths, positions } = refState.current;
+        let startNoBuffer = null;
+        let startBuffered = null;
+        let endNoBuffer = null;
+        let endBuffered = null;
+        let loopStart = startBufferedState || 0;
+        if (startBufferedState) {
+          for (let i = startBufferedState; i >= 0; i--) {
+            const id = getId(i);
+            const top2 = positions.get(id);
+            if (top2 !== void 0) {
+              const length = (_a2 = lengths.get(id)) != null ? _a2 : getItemLength(i, data2[i]);
+              const bottom = top2 + length;
+              if (bottom > scroll - scrollBuffer) {
+                loopStart = i;
+              } else {
+                break;
+              }
+            }
+          }
         }
-        if (startNoBuffer !== null) {
-          if (top <= scroll + scrollLength) {
-            endNoBuffer = i;
+        let top = loopStart > 0 ? positions.get(getId(loopStart)) : 0;
+        for (let i = loopStart; i < data2.length; i++) {
+          const id = getId(i);
+          const length = (_b2 = lengths.get(id)) != null ? _b2 : getItemLength(i, data2[i]);
+          if (positions.get(id) !== top) {
+            positions.set(id, top);
           }
-          if (top <= scroll + scrollLength + scrollBuffer) {
-            endBuffered = i;
-          } else {
-            break;
+          if (startNoBuffer === null && top + length > scroll) {
+            startNoBuffer = i;
           }
-        }
-        top += length;
-      }
-      Object.assign(refState.current, {
-        startBuffered,
-        startNoBuffer,
-        endBuffered,
-        endNoBuffer
-      });
-      if (startBuffered !== null && endBuffered !== null) {
-        const prevNumContainers = ctx.values.get("numContainers");
-        let numContainers = prevNumContainers;
-        for (let i = startBuffered; i <= endBuffered; i++) {
-          let isContained = false;
-          for (let j = 0; j < numContainers; j++) {
-            const index = peek$(`containerIndex${j}`, ctx);
-            if (index === i) {
-              isContained = true;
+          if (startBuffered === null && top + length > scroll - scrollBuffer) {
+            startBuffered = i;
+          }
+          if (startNoBuffer !== null) {
+            if (top <= scroll + scrollLength) {
+              endNoBuffer = i;
+            }
+            if (top <= scroll + scrollLength + scrollBuffer) {
+              endBuffered = i;
+            } else {
               break;
             }
           }
-          if (!isContained) {
-            let didRecycle = false;
-            for (let u = 0; u < numContainers; u++) {
-              const index = peek$(`containerIndex${u}`, ctx);
-              if (index < startBuffered || index > endBuffered) {
-                set$(`containerIndex${u}`, ctx, i);
-                didRecycle = true;
+          top += length;
+        }
+        Object.assign(refState.current, {
+          startBuffered,
+          startNoBuffer,
+          endBuffered,
+          endNoBuffer
+        });
+        if (startBuffered !== null && endBuffered !== null) {
+          const prevNumContainers = ctx.values.get("numContainers");
+          let numContainers = prevNumContainers;
+          for (let i = startBuffered; i <= endBuffered; i++) {
+            let isContained = false;
+            for (let j = 0; j < numContainers; j++) {
+              const index = peek$(ctx, `containerIndex${j}`);
+              if (index === i) {
+                isContained = true;
                 break;
               }
             }
-            if (!didRecycle) {
-              if (__DEV__) {
-                console.warn(
-                  "[legend-list] No container to recycle, consider increasing initialContainers or estimatedItemLength",
-                  i
-                );
+            if (!isContained) {
+              let didRecycle = false;
+              for (let u = 0; u < numContainers; u++) {
+                const index = peek$(ctx, `containerIndex${u}`);
+                if (index < startBuffered || index > endBuffered) {
+                  set$(ctx, `containerIndex${u}`, i);
+                  didRecycle = true;
+                  break;
+                }
+              }
+              if (!didRecycle) {
+                if (__DEV__) {
+                  console.warn(
+                    "[legend-list] No container to recycle, consider increasing initialContainers or estimatedItemSize",
+                    i
+                  );
+                }
+                const id = numContainers;
+                numContainers++;
+                set$(ctx, `containerIndex${id}`, i);
+                set$(ctx, `containerPosition${id}`, POSITION_OUT_OF_VIEW);
               }
-              const id = numContainers;
-              numContainers++;
-              set$(`containerIndex${id}`, ctx, i);
-              set$(`containerPosition${id}`, ctx, POSITION_OUT_OF_VIEW);
             }
           }
-        }
-        if (numContainers !== prevNumContainers) {
-          set$(`numContainers`, ctx, numContainers);
-        }
-        for (let i = 0; i < numContainers; i++) {
-          const itemIndex = peek$(`containerIndex${i}`, ctx);
-          const item = data2[itemIndex];
-          if (item) {
-            const id = getId(itemIndex);
-            if (itemIndex < startBuffered || itemIndex > endBuffered) {
-              set$(`containerPosition${i}`, ctx, POSITION_OUT_OF_VIEW);
-            } else {
-              const pos = (_b = positions.get(id)) != null ? _b : -1;
-              const prevPos = peek$(`containerPosition${i}`, ctx);
-              if (pos >= 0 && pos !== prevPos) {
-                set$(`containerPosition${i}`, ctx, pos);
+          if (numContainers !== prevNumContainers) {
+            set$(ctx, `numContainers`, numContainers);
+          }
+          for (let i = 0; i < numContainers; i++) {
+            const itemIndex = peek$(ctx, `containerIndex${i}`);
+            const item = data2[itemIndex];
+            if (item) {
+              const id = getId(itemIndex);
+              if (itemIndex < startBuffered || itemIndex > endBuffered) {
+                set$(ctx, `containerPosition${i}`, POSITION_OUT_OF_VIEW);
+              } else {
+                const pos = (_c = positions.get(id)) != null ? _c : -1;
+                const prevPos = peek$(ctx, `containerPosition${i}`);
+                if (pos >= 0 && pos !== prevPos) {
+                  set$(ctx, `containerPosition${i}`, pos);
+                }
               }
             }
           }
-        }
-        if (onViewableRangeChanged) {
-          if (startNoBuffer !== startNoBufferState || startBuffered !== startBufferedState || endNoBuffer !== endNoBufferState || endBuffered !== endBufferedState) {
-            onViewableRangeChanged({
-              start: startNoBuffer,
-              startBuffered,
-              end: endNoBuffer,
-              endBuffered,
-              items: data2.slice(startNoBuffer, endNoBuffer + 1)
-            });
+          if (onViewableRangeChanged) {
+            if (startNoBuffer !== startNoBufferState || startBuffered !== startBufferedState || endNoBuffer !== endNoBufferState || endBuffered !== endBufferedState) {
+              onViewableRangeChanged({
+                start: startNoBuffer,
+                startBuffered,
+                end: endNoBuffer,
+                endBuffered,
+                items: data2.slice(startNoBuffer, endNoBuffer + 1)
+              });
+            }
           }
         }
-      }
+      });
     }, [data]);
     useMemo(() => {
-      var _a, _b;
+      var _a2, _b2;
       allocateContainers();
       calculateItemsInView();
-      const lengths = (_a = refState.current) == null ? void 0 : _a.lengths;
+      const lengths = (_a2 = refState.current) == null ? void 0 : _a2.lengths;
       let totalLength = 0;
       for (let i = 0; i < data.length; i++) {
         const id = getId(i);
-        totalLength += (_b = lengths.get(id)) != null ? _b : estimatedItemLength(i);
+        totalLength += (_b2 = lengths.get(id)) != null ? _b2 : getItemLength(i, data[i]);
       }
-      setTotalLength(totalLength);
+      addTotalSize(totalLength);
     }, []);
     const checkAtBottom = () => {
-      var _a;
+      var _a2;
       const { scrollLength, scroll } = refState.current;
-      const totalLength = peek$("totalLength", ctx);
+      const totalLength = peek$(ctx, "totalLength");
       const distanceFromEnd = totalLength - scroll - scrollLength;
       if (refState.current) {
         refState.current.isAtBottom = distanceFromEnd < scrollLength * maintainScrollAtEndThreshold;
       }
-      if (onEndReached && !((_a = refState.current) == null ? void 0 : _a.isEndReached)) {
+      if (onEndReached && !((_a2 = refState.current) == null ? void 0 : _a2.isEndReached)) {
         if (distanceFromEnd < onEndReachedThreshold * scrollLength) {
           if (refState.current) {
             refState.current.isEndReached = true;
@@ -475,30 +511,33 @@ var LegendListInner = forwardRef(
       calculateItemsInView();
       checkAtBottom();
     }, [data]);
-    const updateItemLength = useCallback((index, length) => {
-      var _a, _b, _c, _d, _e;
-      const data2 = (_a = refState.current) == null ? void 0 : _a.data;
+    const updateItemSize = useCallback((index, length) => {
+      var _a2, _b2, _c, _d;
+      const data2 = (_a2 = refState.current) == null ? void 0 : _a2.data;
       if (!data2) {
         return;
       }
-      const lengths = (_b = refState.current) == null ? void 0 : _b.lengths;
+      const lengths = (_b2 = refState.current) == null ? void 0 : _b2.lengths;
       const id = getId(index);
       const wasInFirstRender = (_c = refState.current) == null ? void 0 : _c.idsInFirstRender.has(id);
-      const prevLength = lengths.get(id) || (wasInFirstRender ? estimatedItemLength(index) : 0);
+      const prevLength = lengths.get(id) || (wasInFirstRender ? getItemLength(index, data2[index]) : 0);
       if (!prevLength || prevLength !== length) {
         lengths.set(id, length);
-        const totalLength = peek$("totalLength", ctx);
-        setTotalLength(totalLength + (length - prevLength));
+        addTotalSize(length - prevLength);
         if (((_d = refState.current) == null ? void 0 : _d.isAtBottom) && maintainScrollAtEnd) {
           requestAnimationFrame(() => {
-            var _a2;
-            (_a2 = refScroller.current) == null ? void 0 : _a2.scrollToEnd({
+            var _a3;
+            (_a3 = refScroller.current) == null ? void 0 : _a3.scrollToEnd({
               animated: true
             });
           });
         }
-        if (!((_e = refState.current) == null ? void 0 : _e.animFrame)) {
-          calculateItemsInView();
+        const state = refState.current;
+        if (!state.animFrameScroll && !state.animFrameLayout) {
+          state.animFrameLayout = requestAnimationFrame(() => {
+            state.animFrameLayout = null;
+            calculateItemsInView();
+          });
         }
       }
     }, []);
@@ -506,7 +545,7 @@ var LegendListInner = forwardRef(
       calculateItemsInView();
       checkAtBottom();
       if (refState.current) {
-        refState.current.animFrame = null;
+        refState.current.animFrameScroll = null;
       }
     }, []);
     const onLayout = useCallback((event) => {
@@ -515,11 +554,15 @@ var LegendListInner = forwardRef(
     }, []);
     const handleScroll = useCallback(
       (event, fromSelf) => {
+        var _a2, _b2, _c;
+        if (((_b2 = (_a2 = event.nativeEvent) == null ? void 0 : _a2.contentSize) == null ? void 0 : _b2.height) === 0 && ((_c = event.nativeEvent.contentSize) == null ? void 0 : _c.width) === 0) {
+          return;
+        }
         refState.current.hasScrolled = true;
         const newScroll = event.nativeEvent.contentOffset[horizontal ? "x" : "y"];
         refState.current.scroll = newScroll;
-        if (refState.current && !refState.current.animFrame) {
-          refState.current.animFrame = requestAnimationFrame(handleScrollDebounced);
+        if (refState.current && !refState.current.animFrameScroll) {
+          refState.current.animFrameScroll = requestAnimationFrame(handleScrollDebounced);
         }
         if (!fromSelf) {
           onScrollProp == null ? void 0 : onScrollProp(event);
@@ -527,20 +570,7 @@ var LegendListInner = forwardRef(
       },
       []
     );
-    useEffect(() => {
-      if (initialContentOffset) {
-        const offset = horizontal ? { x: initialContentOffset, y: 0 } : { x: 0, y: initialContentOffset };
-        handleScroll(
-          {
-            nativeEvent: { contentOffset: offset }
-          },
-          /*fromSelf*/
-          true
-        );
-        calculateItemsInView();
-      }
-    }, []);
-    return /* @__PURE__ */ React2.createElement(
+    return /* @__PURE__ */ React6.createElement(
       ListComponent,
       {
         ...rest,
@@ -550,7 +580,7 @@ var LegendListInner = forwardRef(
         refScroller,
         initialContentOffset,
         getRenderedItem,
-        updateItemLength,
+        updateItemSize,
         handleScroll,
         onLayout,
         recycleItems,