@legendapp/list 1.0.3 → 1.0.5

package/README.md

@@ -92,6 +92,9 @@ const LegendListExample = () => {
             keyExtractor={(item) => item.id}
             recycleItems={true}
 
+            // Recommended if data can change
+            maintainVisibleContentPosition
+
             ref={listRef}
         />
     )

package/index.d.mts

@@ -57,7 +57,7 @@ type LegendListPropsBase<ItemT, TScrollView extends ComponentProps<typeof Scroll
     getEstimatedItemSize?: (index: number, item: ItemT) => number;
     /**
      * Ratio of initial container pool size to data length (e.g., 0.5 for half).
-     * @default 1
+     * @default 2
      */
     initialContainerPoolRatio?: number | undefined;
     /**
@@ -276,7 +276,7 @@ interface InternalState {
     queuedCalculateItemsInView: number | undefined;
     lastBatchingAction: number;
     ignoreScrollFromCalcTotal?: boolean;
-    disableAveragesForScrolls?: number;
+    disableScrollJumpsFrom?: number;
     scrollingToOffset?: number | undefined;
     averageSizes: Record<string, {
         num: number;

package/index.d.ts

@@ -57,7 +57,7 @@ type LegendListPropsBase<ItemT, TScrollView extends ComponentProps<typeof Scroll
     getEstimatedItemSize?: (index: number, item: ItemT) => number;
     /**
      * Ratio of initial container pool size to data length (e.g., 0.5 for half).
-     * @default 1
+     * @default 2
      */
     initialContainerPoolRatio?: number | undefined;
     /**
@@ -276,7 +276,7 @@ interface InternalState {
     queuedCalculateItemsInView: number | undefined;
     lastBatchingAction: number;
     ignoreScrollFromCalcTotal?: boolean;
-    disableAveragesForScrolls?: number;
+    disableScrollJumpsFrom?: number;
     scrollingToOffset?: number | undefined;
     averageSizes: Record<string, {
         num: number;

package/index.js

@@ -159,6 +159,9 @@ function warnDevOnce(id, text) {
 function roundSize(size) {
   return Math.floor(size * 8) / 8;
 }
+function isNullOrUndefined(value) {
+  return value === null || value === void 0;
+}
 var symbolFirst = Symbol();
 function useInit(cb) {
   const refValue = React2.useRef(symbolFirst);
@@ -335,20 +338,28 @@ var Container = ({
     forceLayoutRender((v) => v + 1);
   }, []);
   const onLayout = (event) => {
-    if (itemKey !== void 0) {
+    var _a, _b;
+    if (!isNullOrUndefined(itemKey)) {
       const layout = event.nativeEvent.layout;
-      const size = roundSize(layout[horizontal ? "width" : "height"]);
-      if (!IsNewArchitecture && size === 0 && layout.x === 0 && layout.y === 0) {
-        return;
+      let size = roundSize(layout[horizontal ? "width" : "height"]);
+      const doUpdate = () => {
+        refLastSize.current = size;
+        updateItemSize(itemKey, size);
+      };
+      if (IsNewArchitecture || size > 0) {
+        doUpdate();
+      } else {
+        (_b = (_a = ref.current) == null ? void 0 : _a.measure) == null ? void 0 : _b.call(_a, (x, y, width, height) => {
+          size = roundSize(horizontal ? width : height);
+          doUpdate();
+        });
       }
-      refLastSize.current = size;
-      updateItemSize(itemKey, size);
     }
   };
   if (IsNewArchitecture) {
     React2.useLayoutEffect(() => {
       var _a, _b;
-      if (itemKey !== void 0) {
+      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;
@@ -360,7 +371,7 @@ var Container = ({
     }, [itemKey, layoutRenderCount]);
   } else {
     React2.useEffect(() => {
-      if (itemKey) {
+      if (!isNullOrUndefined(itemKey)) {
         const timeout = setTimeout(() => {
           if (refLastSize.current) {
             updateItemSize(itemKey, refLastSize.current);
@@ -1099,6 +1110,11 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   }) => {
     var _a;
     const state = refState.current;
+    if (index >= state.data.length) {
+      index = state.data.length - 1;
+    } else if (index < 0) {
+      index = 0;
+    }
     const firstIndexOffset = calculateOffsetForIndex(index);
     let firstIndexScrollPostion = firstIndexOffset - viewOffset;
     const diff = Math.abs(state.scroll - firstIndexScrollPostion);
@@ -1117,15 +1133,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     if (viewPosition) {
       firstIndexScrollPostion -= viewPosition * (state.scrollLength - getItemSize(getId(index), index, state.data[index]));
     }
-    state.scrollAdjustHandler.setDisableAdjust(true);
-    state.scrollingToOffset = firstIndexScrollPostion;
     scrollTo(firstIndexScrollPostion, animated);
-    if (!animated) {
-      requestAnimationFrame(() => {
-        state.scrollingToOffset = void 0;
-        state.scrollAdjustHandler.setDisableAdjust(false);
-      });
-    }
   };
   const setDidLayout = () => {
     refState.current.queuedInitialLayout = true;
@@ -1227,6 +1235,15 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
     return map;
   };
+  const disableScrollJumps = (timeout) => {
+    const state = refState.current;
+    if (state.scrollingToOffset === void 0) {
+      state.disableScrollJumpsFrom = state.scroll - state.scrollAdjustHandler.getAppliedAdjust();
+      setTimeout(() => {
+        state.disableScrollJumpsFrom = void 0;
+      }, timeout);
+    }
+  };
   const getElementPositionBelowAchor = (id) => {
     var _a;
     const state = refState.current;
@@ -1305,6 +1322,18 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
     }
   }, []);
+  const checkAllSizesKnown = React2.useCallback(() => {
+    const { startBuffered, endBuffered, sizesKnown } = refState.current;
+    if (endBuffered !== null) {
+      let areAllKnown = true;
+      for (let i = startBuffered; areAllKnown && i <= endBuffered; i++) {
+        const key = getId(i);
+        areAllKnown && (areAllKnown = sizesKnown.has(key));
+      }
+      return areAllKnown;
+    }
+    return false;
+  }, []);
   const calculateItemsInView = React2.useCallback(() => {
     var _a;
     const state = refState.current;
@@ -1315,8 +1344,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       positions,
       columns,
       scrollAdjustHandler,
-      scrollVelocity: speed,
-      disableAveragesForScrolls
+      scrollVelocity: speed
     } = state;
     if (!data || scrollLength === 0) {
       return;
@@ -1327,7 +1355,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     const previousScrollAdjust = scrollAdjustHandler.getAppliedAdjust();
     const scrollExtra = Math.max(-16, Math.min(16, speed)) * 16;
     let scrollState = state.scroll;
-    const useAverageSize = !disableAveragesForScrolls;
+    const useAverageSize = !state.disableScrollJumpsFrom;
     if (!state.queuedInitialLayout && initialScrollIndex) {
       const updatedOffset = calculateOffsetForIndex(initialScrollIndex);
       scrollState = updatedOffset;
@@ -1357,6 +1385,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
     }
     const scrollBottom = scroll + scrollLength;
+    const prevStartBuffered = state.startBuffered;
     const prevEndBuffered = state.endBuffered;
     let startNoBuffer = null;
     let startBuffered = null;
@@ -1466,6 +1495,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       const prevNumContainers = ctx.values.get("numContainers");
       let numContainers = prevNumContainers;
       let didWarnMoreContainers = false;
+      const allocatedContainers = /* @__PURE__ */ new Set();
       for (let i = startBuffered; i <= endBuffered; i++) {
         let isContained = false;
         const id = getId(i);
@@ -1481,38 +1511,44 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
           let furthestIndex = -1;
           let furthestDistance = 0;
           for (let u = 0; u < numContainers; u++) {
+            if (allocatedContainers.has(u)) {
+              continue;
+            }
             const key = peek$(ctx, `containerItemKey${u}`);
             if (key === void 0) {
               furthestIndex = u;
               break;
             }
-            const index = state.indexByKey.get(key);
+            const index2 = state.indexByKey.get(key);
             const pos = peek$(ctx, `containerPosition${u}`).top;
-            if (index < startBuffered || index > endBuffered) {
+            if (isNullOrUndefined(index2) || pos === POSITION_OUT_OF_VIEW) {
+              furthestIndex = u;
+              break;
+            }
+            if (index2 < startBuffered || index2 > endBuffered) {
               const distance = Math.abs(pos - top2);
-              if (index < 0 || distance > furthestDistance) {
+              if (index2 < 0 || pos === POSITION_OUT_OF_VIEW || distance > furthestDistance) {
                 furthestDistance = distance;
                 furthestIndex = u;
               }
             }
           }
-          if (furthestIndex >= 0) {
-            set$(ctx, `containerItemKey${furthestIndex}`, id);
-            const index = state.indexByKey.get(id);
-            set$(ctx, `containerItemData${furthestIndex}`, data[index]);
-          } else {
-            const containerId = numContainers;
+          const containerId = furthestIndex >= 0 ? furthestIndex : numContainers;
+          set$(ctx, `containerItemKey${containerId}`, id);
+          const index = state.indexByKey.get(id);
+          set$(ctx, `containerItemData${containerId}`, data[index]);
+          allocatedContainers.add(containerId);
+          if (furthestIndex === -1) {
             numContainers++;
             set$(ctx, `containerItemKey${containerId}`, id);
-            const index = state.indexByKey.get(id);
-            set$(ctx, `containerItemData${containerId}`, data[index]);
+            const index2 = state.indexByKey.get(id);
+            set$(ctx, `containerItemData${containerId}`, data[index2]);
             set$(ctx, `containerPosition${containerId}`, ANCHORED_POSITION_OUT_OF_VIEW);
             set$(ctx, `containerColumn${containerId}`, -1);
             if (__DEV__ && !didWarnMoreContainers && numContainers > peek$(ctx, "numContainersPooled")) {
               didWarnMoreContainers = true;
               console.warn(
-                "[legend-list] No container to recycle, so creating one on demand. This can be a minor performance issue and is likely caused by the estimatedItemSize being too large. Consider decreasing estimatedItemSize. numContainers:",
-                numContainers
+                "[legend-list] No container to recycle, so creating one on demand. This can be a minor performance issue and is likely caused by the estimatedItemSize being too large. Consider decreasing estimatedItemSize or increasing initialContainerPoolRatio."
               );
             }
           }
@@ -1534,7 +1570,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
             const prevPos = peek$(ctx, `containerPosition${i}`);
             const pos = positions.get(id) || 0;
             const size = getItemSize(id, itemIndex, data[i]);
-            if (pos + size >= scroll && pos <= scrollBottom || prevPos + size >= scroll && prevPos <= scrollBottom || endBuffered < prevEndBuffered) {
+            if (pos + size >= scroll && pos <= scrollBottom || prevPos + size >= scroll && prevPos <= scrollBottom || endBuffered < prevEndBuffered || startBuffered > prevStartBuffered) {
               set$(ctx, `containerPosition${i}`, ANCHORED_POSITION_OUT_OF_VIEW);
             }
           } else {
@@ -1569,12 +1605,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
     }
     if (!state.queuedInitialLayout && endBuffered !== null) {
-      let areAllKnown = true;
-      for (let i = startBuffered; areAllKnown && i <= endBuffered; i++) {
-        const key = getId(i);
-        areAllKnown && (areAllKnown = state.sizesKnown.has(key));
-      }
-      if (areAllKnown) {
+      if (checkAllSizesKnown()) {
         setDidLayout();
       }
     }
@@ -1622,13 +1653,27 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       setPaddingTop({ alignItemsPaddingTop: paddingTop });
     }
   };
+  const finishScrollTo = () => {
+    const state = refState.current;
+    if (state) {
+      state.scrollingToOffset = void 0;
+      state.scrollAdjustHandler.setDisableAdjust(false);
+      calculateItemsInView();
+    }
+  };
   const scrollTo = (offset, animated) => {
     var _a;
+    const state = refState.current;
+    state.scrollAdjustHandler.setDisableAdjust(true);
+    state.scrollingToOffset = offset;
     (_a = refScroller.current) == null ? void 0 : _a.scrollTo({
       x: horizontal ? offset : 0,
       y: horizontal ? 0 : offset,
       animated: !!animated
     });
+    if (!animated) {
+      requestAnimationFrame(finishScrollTo);
+    }
   };
   const doMaintainScrollAtEnd = (animated) => {
     const state = refState.current;
@@ -1726,7 +1771,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     if (state) {
       state.data = dataProp;
       if (!isFirst2) {
-        state.disableAveragesForScrolls = 2;
+        disableScrollJumps(2e3);
         refState.current.scrollForNextCalculateItemsInView = void 0;
         const numContainers = peek$(ctx, "numContainers");
         for (let i = 0; i < numContainers; i++) {
@@ -1881,7 +1926,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         isFirst
       );
     }
-  }, [isFirst, dataProp, numColumnsProp]);
+  }, [dataProp, numColumnsProp]);
   React2.useEffect(() => {
     set$(ctx, "extraData", extraData);
   }, [extraData]);
@@ -1943,7 +1988,17 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   });
   const updateItemSize = React2.useCallback((itemKey, size, fromFixGaps) => {
     const state = refState.current;
-    const { sizes, indexByKey, sizesKnown, data, rowHeights, startBuffered, endBuffered, averageSizes } = state;
+    const {
+      sizes,
+      indexByKey,
+      sizesKnown,
+      data,
+      rowHeights,
+      startBuffered,
+      endBuffered,
+      averageSizes,
+      queuedInitialLayout
+    } = state;
     if (!data) {
       return;
     }
@@ -1952,7 +2007,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     state.minIndexSizeChanged = state.minIndexSizeChanged !== void 0 ? Math.min(state.minIndexSizeChanged, index) : index;
     const prevSize = getItemSize(itemKey, index, data);
     let needsCalculate = false;
-    const needsUpdateContainersDidLayout = !peek$(ctx, "containersDidLayout");
+    let needsUpdateContainersDidLayout = false;
     sizesKnown.set(itemKey, size);
     const itemType = "";
     let averages = averageSizes[itemType];
@@ -1991,7 +2046,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
           );
         }, 1e3);
       }
-      refState.current.scrollForNextCalculateItemsInView = void 0;
+      state.scrollForNextCalculateItemsInView = void 0;
       addTotalSize(itemKey, diff, 0);
       doMaintainScrollAtEnd(false);
       if (onItemSizeChanged) {
@@ -2004,11 +2059,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         });
       }
     }
+    if (!queuedInitialLayout && checkAllSizesKnown()) {
+      needsUpdateContainersDidLayout = true;
+    }
     const isInView = index >= startBuffered && index <= endBuffered;
-    if (needsUpdateContainersDidLayout || !fromFixGaps && needsCalculate && isInView) {
+    if (needsUpdateContainersDidLayout || !fromFixGaps && needsCalculate && (isInView || !queuedInitialLayout)) {
       const scrollVelocity = state.scrollVelocity;
       let didCalculate = false;
-      if ((Number.isNaN(scrollVelocity) || Math.abs(scrollVelocity) < 1) && (!waitForInitialLayout || needsUpdateContainersDidLayout)) {
+      if ((Number.isNaN(scrollVelocity) || Math.abs(scrollVelocity) < 1 || state.scrollingToOffset !== void 0) && (!waitForInitialLayout || needsUpdateContainersDidLayout || queuedInitialLayout)) {
         if (Date.now() - state.lastBatchingAction < 500) {
           if (!state.queuedCalculateItemsInView) {
             state.queuedCalculateItemsInView = requestAnimationFrame(() => {
@@ -2066,6 +2124,16 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       if (state.ignoreScrollFromCalcTotal && newScroll !== 0) {
         return;
       }
+      if (state.scrollingToOffset !== void 0 && Math.abs(newScroll - state.scrollingToOffset) < 10) {
+        finishScrollTo();
+      }
+      if (state.disableScrollJumpsFrom !== void 0) {
+        const scrollMinusAdjust = newScroll - state.scrollAdjustHandler.getAppliedAdjust();
+        if (Math.abs(scrollMinusAdjust - state.disableScrollJumpsFrom) > 200) {
+          return;
+        }
+        state.disableScrollJumpsFrom = void 0;
+      }
       state.hasScrolled = true;
       state.lastBatchingAction = Date.now();
       const currentTime = performance.now();
@@ -2100,9 +2168,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       if (!fromSelf) {
         (_d = state.onScroll) == null ? void 0 : _d.call(state, event);
       }
-      if (state.disableAveragesForScrolls) {
-        state.disableAveragesForScrolls--;
-      }
     },
     []
   );

package/index.mjs

@@ -138,6 +138,9 @@ function warnDevOnce(id, text) {
 function roundSize(size) {
   return Math.floor(size * 8) / 8;
 }
+function isNullOrUndefined(value) {
+  return value === null || value === void 0;
+}
 var symbolFirst = Symbol();
 function useInit(cb) {
   const refValue = useRef(symbolFirst);
@@ -314,20 +317,28 @@ var Container = ({
     forceLayoutRender((v) => v + 1);
   }, []);
   const onLayout = (event) => {
-    if (itemKey !== void 0) {
+    var _a, _b;
+    if (!isNullOrUndefined(itemKey)) {
       const layout = event.nativeEvent.layout;
-      const size = roundSize(layout[horizontal ? "width" : "height"]);
-      if (!IsNewArchitecture && size === 0 && layout.x === 0 && layout.y === 0) {
-        return;
+      let size = roundSize(layout[horizontal ? "width" : "height"]);
+      const doUpdate = () => {
+        refLastSize.current = size;
+        updateItemSize(itemKey, size);
+      };
+      if (IsNewArchitecture || size > 0) {
+        doUpdate();
+      } else {
+        (_b = (_a = ref.current) == null ? void 0 : _a.measure) == null ? void 0 : _b.call(_a, (x, y, width, height) => {
+          size = roundSize(horizontal ? width : height);
+          doUpdate();
+        });
       }
-      refLastSize.current = size;
-      updateItemSize(itemKey, size);
     }
   };
   if (IsNewArchitecture) {
     useLayoutEffect(() => {
       var _a, _b;
-      if (itemKey !== void 0) {
+      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;
@@ -339,7 +350,7 @@ var Container = ({
     }, [itemKey, layoutRenderCount]);
   } else {
     useEffect(() => {
-      if (itemKey) {
+      if (!isNullOrUndefined(itemKey)) {
         const timeout = setTimeout(() => {
           if (refLastSize.current) {
             updateItemSize(itemKey, refLastSize.current);
@@ -1078,6 +1089,11 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   }) => {
     var _a;
     const state = refState.current;
+    if (index >= state.data.length) {
+      index = state.data.length - 1;
+    } else if (index < 0) {
+      index = 0;
+    }
     const firstIndexOffset = calculateOffsetForIndex(index);
     let firstIndexScrollPostion = firstIndexOffset - viewOffset;
     const diff = Math.abs(state.scroll - firstIndexScrollPostion);
@@ -1096,15 +1112,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     if (viewPosition) {
       firstIndexScrollPostion -= viewPosition * (state.scrollLength - getItemSize(getId(index), index, state.data[index]));
     }
-    state.scrollAdjustHandler.setDisableAdjust(true);
-    state.scrollingToOffset = firstIndexScrollPostion;
     scrollTo(firstIndexScrollPostion, animated);
-    if (!animated) {
-      requestAnimationFrame(() => {
-        state.scrollingToOffset = void 0;
-        state.scrollAdjustHandler.setDisableAdjust(false);
-      });
-    }
   };
   const setDidLayout = () => {
     refState.current.queuedInitialLayout = true;
@@ -1206,6 +1214,15 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
     return map;
   };
+  const disableScrollJumps = (timeout) => {
+    const state = refState.current;
+    if (state.scrollingToOffset === void 0) {
+      state.disableScrollJumpsFrom = state.scroll - state.scrollAdjustHandler.getAppliedAdjust();
+      setTimeout(() => {
+        state.disableScrollJumpsFrom = void 0;
+      }, timeout);
+    }
+  };
   const getElementPositionBelowAchor = (id) => {
     var _a;
     const state = refState.current;
@@ -1284,6 +1301,18 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
     }
   }, []);
+  const checkAllSizesKnown = useCallback(() => {
+    const { startBuffered, endBuffered, sizesKnown } = refState.current;
+    if (endBuffered !== null) {
+      let areAllKnown = true;
+      for (let i = startBuffered; areAllKnown && i <= endBuffered; i++) {
+        const key = getId(i);
+        areAllKnown && (areAllKnown = sizesKnown.has(key));
+      }
+      return areAllKnown;
+    }
+    return false;
+  }, []);
   const calculateItemsInView = useCallback(() => {
     var _a;
     const state = refState.current;
@@ -1294,8 +1323,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       positions,
       columns,
       scrollAdjustHandler,
-      scrollVelocity: speed,
-      disableAveragesForScrolls
+      scrollVelocity: speed
     } = state;
     if (!data || scrollLength === 0) {
       return;
@@ -1306,7 +1334,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     const previousScrollAdjust = scrollAdjustHandler.getAppliedAdjust();
     const scrollExtra = Math.max(-16, Math.min(16, speed)) * 16;
     let scrollState = state.scroll;
-    const useAverageSize = !disableAveragesForScrolls;
+    const useAverageSize = !state.disableScrollJumpsFrom;
     if (!state.queuedInitialLayout && initialScrollIndex) {
       const updatedOffset = calculateOffsetForIndex(initialScrollIndex);
       scrollState = updatedOffset;
@@ -1336,6 +1364,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
     }
     const scrollBottom = scroll + scrollLength;
+    const prevStartBuffered = state.startBuffered;
     const prevEndBuffered = state.endBuffered;
     let startNoBuffer = null;
     let startBuffered = null;
@@ -1445,6 +1474,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       const prevNumContainers = ctx.values.get("numContainers");
       let numContainers = prevNumContainers;
       let didWarnMoreContainers = false;
+      const allocatedContainers = /* @__PURE__ */ new Set();
       for (let i = startBuffered; i <= endBuffered; i++) {
         let isContained = false;
         const id = getId(i);
@@ -1460,38 +1490,44 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
           let furthestIndex = -1;
           let furthestDistance = 0;
           for (let u = 0; u < numContainers; u++) {
+            if (allocatedContainers.has(u)) {
+              continue;
+            }
             const key = peek$(ctx, `containerItemKey${u}`);
             if (key === void 0) {
               furthestIndex = u;
               break;
             }
-            const index = state.indexByKey.get(key);
+            const index2 = state.indexByKey.get(key);
             const pos = peek$(ctx, `containerPosition${u}`).top;
-            if (index < startBuffered || index > endBuffered) {
+            if (isNullOrUndefined(index2) || pos === POSITION_OUT_OF_VIEW) {
+              furthestIndex = u;
+              break;
+            }
+            if (index2 < startBuffered || index2 > endBuffered) {
               const distance = Math.abs(pos - top2);
-              if (index < 0 || distance > furthestDistance) {
+              if (index2 < 0 || pos === POSITION_OUT_OF_VIEW || distance > furthestDistance) {
                 furthestDistance = distance;
                 furthestIndex = u;
               }
             }
           }
-          if (furthestIndex >= 0) {
-            set$(ctx, `containerItemKey${furthestIndex}`, id);
-            const index = state.indexByKey.get(id);
-            set$(ctx, `containerItemData${furthestIndex}`, data[index]);
-          } else {
-            const containerId = numContainers;
+          const containerId = furthestIndex >= 0 ? furthestIndex : numContainers;
+          set$(ctx, `containerItemKey${containerId}`, id);
+          const index = state.indexByKey.get(id);
+          set$(ctx, `containerItemData${containerId}`, data[index]);
+          allocatedContainers.add(containerId);
+          if (furthestIndex === -1) {
             numContainers++;
             set$(ctx, `containerItemKey${containerId}`, id);
-            const index = state.indexByKey.get(id);
-            set$(ctx, `containerItemData${containerId}`, data[index]);
+            const index2 = state.indexByKey.get(id);
+            set$(ctx, `containerItemData${containerId}`, data[index2]);
             set$(ctx, `containerPosition${containerId}`, ANCHORED_POSITION_OUT_OF_VIEW);
             set$(ctx, `containerColumn${containerId}`, -1);
             if (__DEV__ && !didWarnMoreContainers && numContainers > peek$(ctx, "numContainersPooled")) {
               didWarnMoreContainers = true;
               console.warn(
-                "[legend-list] No container to recycle, so creating one on demand. This can be a minor performance issue and is likely caused by the estimatedItemSize being too large. Consider decreasing estimatedItemSize. numContainers:",
-                numContainers
+                "[legend-list] No container to recycle, so creating one on demand. This can be a minor performance issue and is likely caused by the estimatedItemSize being too large. Consider decreasing estimatedItemSize or increasing initialContainerPoolRatio."
               );
             }
           }
@@ -1513,7 +1549,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
             const prevPos = peek$(ctx, `containerPosition${i}`);
             const pos = positions.get(id) || 0;
             const size = getItemSize(id, itemIndex, data[i]);
-            if (pos + size >= scroll && pos <= scrollBottom || prevPos + size >= scroll && prevPos <= scrollBottom || endBuffered < prevEndBuffered) {
+            if (pos + size >= scroll && pos <= scrollBottom || prevPos + size >= scroll && prevPos <= scrollBottom || endBuffered < prevEndBuffered || startBuffered > prevStartBuffered) {
               set$(ctx, `containerPosition${i}`, ANCHORED_POSITION_OUT_OF_VIEW);
             }
           } else {
@@ -1548,12 +1584,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
     }
     if (!state.queuedInitialLayout && endBuffered !== null) {
-      let areAllKnown = true;
-      for (let i = startBuffered; areAllKnown && i <= endBuffered; i++) {
-        const key = getId(i);
-        areAllKnown && (areAllKnown = state.sizesKnown.has(key));
-      }
-      if (areAllKnown) {
+      if (checkAllSizesKnown()) {
         setDidLayout();
       }
     }
@@ -1601,13 +1632,27 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       setPaddingTop({ alignItemsPaddingTop: paddingTop });
     }
   };
+  const finishScrollTo = () => {
+    const state = refState.current;
+    if (state) {
+      state.scrollingToOffset = void 0;
+      state.scrollAdjustHandler.setDisableAdjust(false);
+      calculateItemsInView();
+    }
+  };
   const scrollTo = (offset, animated) => {
     var _a;
+    const state = refState.current;
+    state.scrollAdjustHandler.setDisableAdjust(true);
+    state.scrollingToOffset = offset;
     (_a = refScroller.current) == null ? void 0 : _a.scrollTo({
       x: horizontal ? offset : 0,
       y: horizontal ? 0 : offset,
       animated: !!animated
     });
+    if (!animated) {
+      requestAnimationFrame(finishScrollTo);
+    }
   };
   const doMaintainScrollAtEnd = (animated) => {
     const state = refState.current;
@@ -1705,7 +1750,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     if (state) {
       state.data = dataProp;
       if (!isFirst2) {
-        state.disableAveragesForScrolls = 2;
+        disableScrollJumps(2e3);
         refState.current.scrollForNextCalculateItemsInView = void 0;
         const numContainers = peek$(ctx, "numContainers");
         for (let i = 0; i < numContainers; i++) {
@@ -1860,7 +1905,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         isFirst
       );
     }
-  }, [isFirst, dataProp, numColumnsProp]);
+  }, [dataProp, numColumnsProp]);
   useEffect(() => {
     set$(ctx, "extraData", extraData);
   }, [extraData]);
@@ -1922,7 +1967,17 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   });
   const updateItemSize = useCallback((itemKey, size, fromFixGaps) => {
     const state = refState.current;
-    const { sizes, indexByKey, sizesKnown, data, rowHeights, startBuffered, endBuffered, averageSizes } = state;
+    const {
+      sizes,
+      indexByKey,
+      sizesKnown,
+      data,
+      rowHeights,
+      startBuffered,
+      endBuffered,
+      averageSizes,
+      queuedInitialLayout
+    } = state;
     if (!data) {
       return;
     }
@@ -1931,7 +1986,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     state.minIndexSizeChanged = state.minIndexSizeChanged !== void 0 ? Math.min(state.minIndexSizeChanged, index) : index;
     const prevSize = getItemSize(itemKey, index, data);
     let needsCalculate = false;
-    const needsUpdateContainersDidLayout = !peek$(ctx, "containersDidLayout");
+    let needsUpdateContainersDidLayout = false;
     sizesKnown.set(itemKey, size);
     const itemType = "";
     let averages = averageSizes[itemType];
@@ -1970,7 +2025,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
           );
         }, 1e3);
       }
-      refState.current.scrollForNextCalculateItemsInView = void 0;
+      state.scrollForNextCalculateItemsInView = void 0;
       addTotalSize(itemKey, diff, 0);
       doMaintainScrollAtEnd(false);
       if (onItemSizeChanged) {
@@ -1983,11 +2038,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         });
       }
     }
+    if (!queuedInitialLayout && checkAllSizesKnown()) {
+      needsUpdateContainersDidLayout = true;
+    }
     const isInView = index >= startBuffered && index <= endBuffered;
-    if (needsUpdateContainersDidLayout || !fromFixGaps && needsCalculate && isInView) {
+    if (needsUpdateContainersDidLayout || !fromFixGaps && needsCalculate && (isInView || !queuedInitialLayout)) {
       const scrollVelocity = state.scrollVelocity;
       let didCalculate = false;
-      if ((Number.isNaN(scrollVelocity) || Math.abs(scrollVelocity) < 1) && (!waitForInitialLayout || needsUpdateContainersDidLayout)) {
+      if ((Number.isNaN(scrollVelocity) || Math.abs(scrollVelocity) < 1 || state.scrollingToOffset !== void 0) && (!waitForInitialLayout || needsUpdateContainersDidLayout || queuedInitialLayout)) {
         if (Date.now() - state.lastBatchingAction < 500) {
           if (!state.queuedCalculateItemsInView) {
             state.queuedCalculateItemsInView = requestAnimationFrame(() => {
@@ -2045,6 +2103,16 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       if (state.ignoreScrollFromCalcTotal && newScroll !== 0) {
         return;
       }
+      if (state.scrollingToOffset !== void 0 && Math.abs(newScroll - state.scrollingToOffset) < 10) {
+        finishScrollTo();
+      }
+      if (state.disableScrollJumpsFrom !== void 0) {
+        const scrollMinusAdjust = newScroll - state.scrollAdjustHandler.getAppliedAdjust();
+        if (Math.abs(scrollMinusAdjust - state.disableScrollJumpsFrom) > 200) {
+          return;
+        }
+        state.disableScrollJumpsFrom = void 0;
+      }
       state.hasScrolled = true;
       state.lastBatchingAction = Date.now();
       const currentTime = performance.now();
@@ -2079,9 +2147,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       if (!fromSelf) {
         (_d = state.onScroll) == null ? void 0 : _d.call(state, event);
       }
-      if (state.disableAveragesForScrolls) {
-        state.disableAveragesForScrolls--;
-      }
     },
     []
   );

package/package.json

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