@legendapp/list 1.0.5 → 1.0.7

package/index.js

@@ -919,7 +919,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     columnWrapperStyle,
     keyExtractor: keyExtractorProp,
     renderItem,
-    estimatedItemSize,
+    estimatedItemSize: estimatedItemSizeProp,
     getEstimatedItemSize,
     suggestEstimatedItemSize,
     ListEmptyComponent,
@@ -959,6 +959,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   ctx.columnWrapperStyle = columnWrapperStyle || (contentContainerStyle ? createColumnWrapperStyle(contentContainerStyle) : void 0);
   const refScroller = React2.useRef(null);
   const combinedRef = useCombinedRef(refScroller, refScrollView);
+  const estimatedItemSize = estimatedItemSizeProp != null ? estimatedItemSizeProp : DEFAULT_ITEM_SIZE;
   const scrollBuffer = (drawDistance != null ? drawDistance : DEFAULT_DRAW_DISTANCE) || 1;
   const keyExtractor = keyExtractorProp != null ? keyExtractorProp : (item, index) => index.toString();
   const refState = React2.useRef();
@@ -972,7 +973,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     return `${ret}`;
   };
   const getItemSize = (key, index, data, useAverageSize = false) => {
-    var _a;
     const state = refState.current;
     const sizeKnown = state.sizesKnown.get(key);
     const sizePrevious = state.sizes.get(key);
@@ -992,7 +992,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       return sizePrevious;
     }
     if (size === void 0) {
-      size = (_a = getEstimatedItemSize ? getEstimatedItemSize(index, data) : estimatedItemSize) != null ? _a : DEFAULT_ITEM_SIZE;
+      size = getEstimatedItemSize ? getEstimatedItemSize(index, data) : estimatedItemSize;
     }
     state.sizes.set(key, size);
     return size;
@@ -1013,7 +1013,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         for (let i = 0; i < index; i++) {
           offset += sizeFn(i);
         }
-      } else if (estimatedItemSize) {
+      } else {
         offset = index * estimatedItemSize;
       }
       const adjust = peek$(ctx, "containersDidLayout") ? ((_a = refState.current) == null ? void 0 : _a.scrollAdjustHandler.getAppliedAdjust()) || 0 : 0;
@@ -1355,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 = !state.disableScrollJumpsFrom;
+    const useAverageSize = !state.disableScrollJumpsFrom && speed >= 0 && peek$(ctx, "containersDidLayout");
     if (!state.queuedInitialLayout && initialScrollIndex) {
       const updatedOffset = calculateOffsetForIndex(initialScrollIndex);
       scrollState = updatedOffset;
@@ -1385,8 +1385,6 @@ 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;
     let startBufferedId = null;
@@ -1437,7 +1435,17 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
       return topOffset;
     };
-    for (let i = Math.max(0, loopStart); i < data.length; i++) {
+    let foundEnd = false;
+    const prevNumContainers = ctx.values.get("numContainers");
+    let maxIndexRendered = 0;
+    for (let i = 0; i < prevNumContainers; i++) {
+      const key = peek$(ctx, `containerItemKey${i}`);
+      if (key !== void 0) {
+        const index = state.indexByKey.get(key);
+        maxIndexRendered = Math.max(maxIndexRendered, index);
+      }
+    }
+    for (let i = Math.max(0, loopStart); i < data.length && (!foundEnd || i <= maxIndexRendered); i++) {
       const id = getId(i);
       const size = getItemSize(id, i, data[i], useAverageSize);
       maxSizeInRow = Math.max(maxSizeInRow, size);
@@ -1450,21 +1458,23 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       if (columns.get(id) !== column) {
         columns.set(id, column);
       }
-      if (startNoBuffer === null && top + size > scroll) {
-        startNoBuffer = i;
-      }
-      if (startBuffered === null && top + size > scroll - scrollBufferTop) {
-        startBuffered = i;
-        startBufferedId = id;
-      }
-      if (startNoBuffer !== null) {
-        if (top <= scrollBottom) {
-          endNoBuffer = i;
+      if (!foundEnd) {
+        if (startNoBuffer === null && top + size > scroll) {
+          startNoBuffer = i;
         }
-        if (top <= scrollBottom + scrollBufferBottom) {
-          endBuffered = i;
-        } else {
-          break;
+        if (startBuffered === null && top + size > scroll - scrollBufferTop) {
+          startBuffered = i;
+          startBufferedId = id;
+        }
+        if (startNoBuffer !== null) {
+          if (top <= scrollBottom) {
+            endNoBuffer = i;
+          }
+          if (top <= scrollBottom + scrollBufferBottom) {
+            endBuffered = i;
+          } else {
+            foundEnd = true;
+          }
         }
       }
       column++;
@@ -1492,7 +1502,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       } : void 0;
     }
     if (startBuffered !== null && endBuffered !== null) {
-      const prevNumContainers = ctx.values.get("numContainers");
       let numContainers = prevNumContainers;
       let didWarnMoreContainers = false;
       const allocatedContainers = /* @__PURE__ */ new Set();
@@ -1566,18 +1575,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         const item = data[itemIndex];
         if (item !== void 0) {
           const id = getId(itemIndex);
-          if (itemKey !== id || itemIndex < startBuffered || itemIndex > endBuffered) {
-            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 || startBuffered > prevStartBuffered) {
-              set$(ctx, `containerPosition${i}`, ANCHORED_POSITION_OUT_OF_VIEW);
-            }
+          const position = positions.get(id);
+          if (position === void 0) {
+            set$(ctx, `containerPosition${i}`, ANCHORED_POSITION_OUT_OF_VIEW);
           } else {
             const pos = {
               type: "top",
-              relativeCoordinate: positions.get(id) || 0,
-              top: positions.get(id) || 0
+              relativeCoordinate: positions.get(id),
+              top: positions.get(id)
             };
             const column2 = columns.get(id) || 1;
             if (maintainVisibleContentPosition && itemIndex < anchorElementIndex) {
@@ -1951,11 +1956,10 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     return { index, item: data[index], renderedItem };
   }, []);
   const doInitialAllocateContainers = () => {
-    var _a;
     const state = refState.current;
     const { scrollLength, data } = state;
     if (scrollLength > 0 && data.length > 0 && !peek$(ctx, "numContainers")) {
-      const averageItemSize = (_a = estimatedItemSize != null ? estimatedItemSize : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(0, data[0])) != null ? _a : DEFAULT_ITEM_SIZE;
+      const averageItemSize = getEstimatedItemSize ? getEstimatedItemSize(0, data[0]) : estimatedItemSize;
       const numContainers = Math.ceil((scrollLength + scrollBuffer * 2) / averageItemSize) * numColumnsProp;
       for (let i = 0; i < numContainers; i++) {
         set$(ctx, `containerPosition${i}`, ANCHORED_POSITION_OUT_OF_VIEW);
@@ -2006,6 +2010,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     const numColumns = peek$(ctx, "numColumns");
     state.minIndexSizeChanged = state.minIndexSizeChanged !== void 0 ? Math.min(state.minIndexSizeChanged, index) : index;
     const prevSize = getItemSize(itemKey, index, data);
+    const prevSizeKnown = sizesKnown.get(itemKey);
     let needsCalculate = false;
     let needsUpdateContainersDidLayout = false;
     sizesKnown.set(itemKey, size);
@@ -2048,7 +2053,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
       state.scrollForNextCalculateItemsInView = void 0;
       addTotalSize(itemKey, diff, 0);
-      doMaintainScrollAtEnd(false);
+      if (prevSizeKnown !== void 0 && Math.abs(prevSizeKnown - size) > 5) {
+        doMaintainScrollAtEnd(false);
+      }
       if (onItemSizeChanged) {
         onItemSizeChanged({
           size,

package/index.mjs

@@ -898,7 +898,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     columnWrapperStyle,
     keyExtractor: keyExtractorProp,
     renderItem,
-    estimatedItemSize,
+    estimatedItemSize: estimatedItemSizeProp,
     getEstimatedItemSize,
     suggestEstimatedItemSize,
     ListEmptyComponent,
@@ -938,6 +938,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   ctx.columnWrapperStyle = columnWrapperStyle || (contentContainerStyle ? createColumnWrapperStyle(contentContainerStyle) : void 0);
   const refScroller = useRef(null);
   const combinedRef = useCombinedRef(refScroller, refScrollView);
+  const estimatedItemSize = estimatedItemSizeProp != null ? estimatedItemSizeProp : DEFAULT_ITEM_SIZE;
   const scrollBuffer = (drawDistance != null ? drawDistance : DEFAULT_DRAW_DISTANCE) || 1;
   const keyExtractor = keyExtractorProp != null ? keyExtractorProp : (item, index) => index.toString();
   const refState = useRef();
@@ -951,7 +952,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     return `${ret}`;
   };
   const getItemSize = (key, index, data, useAverageSize = false) => {
-    var _a;
     const state = refState.current;
     const sizeKnown = state.sizesKnown.get(key);
     const sizePrevious = state.sizes.get(key);
@@ -971,7 +971,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       return sizePrevious;
     }
     if (size === void 0) {
-      size = (_a = getEstimatedItemSize ? getEstimatedItemSize(index, data) : estimatedItemSize) != null ? _a : DEFAULT_ITEM_SIZE;
+      size = getEstimatedItemSize ? getEstimatedItemSize(index, data) : estimatedItemSize;
     }
     state.sizes.set(key, size);
     return size;
@@ -992,7 +992,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         for (let i = 0; i < index; i++) {
           offset += sizeFn(i);
         }
-      } else if (estimatedItemSize) {
+      } else {
         offset = index * estimatedItemSize;
       }
       const adjust = peek$(ctx, "containersDidLayout") ? ((_a = refState.current) == null ? void 0 : _a.scrollAdjustHandler.getAppliedAdjust()) || 0 : 0;
@@ -1334,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 = !state.disableScrollJumpsFrom;
+    const useAverageSize = !state.disableScrollJumpsFrom && speed >= 0 && peek$(ctx, "containersDidLayout");
     if (!state.queuedInitialLayout && initialScrollIndex) {
       const updatedOffset = calculateOffsetForIndex(initialScrollIndex);
       scrollState = updatedOffset;
@@ -1364,8 +1364,6 @@ 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;
     let startBufferedId = null;
@@ -1416,7 +1414,17 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
       return topOffset;
     };
-    for (let i = Math.max(0, loopStart); i < data.length; i++) {
+    let foundEnd = false;
+    const prevNumContainers = ctx.values.get("numContainers");
+    let maxIndexRendered = 0;
+    for (let i = 0; i < prevNumContainers; i++) {
+      const key = peek$(ctx, `containerItemKey${i}`);
+      if (key !== void 0) {
+        const index = state.indexByKey.get(key);
+        maxIndexRendered = Math.max(maxIndexRendered, index);
+      }
+    }
+    for (let i = Math.max(0, loopStart); i < data.length && (!foundEnd || i <= maxIndexRendered); i++) {
       const id = getId(i);
       const size = getItemSize(id, i, data[i], useAverageSize);
       maxSizeInRow = Math.max(maxSizeInRow, size);
@@ -1429,21 +1437,23 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       if (columns.get(id) !== column) {
         columns.set(id, column);
       }
-      if (startNoBuffer === null && top + size > scroll) {
-        startNoBuffer = i;
-      }
-      if (startBuffered === null && top + size > scroll - scrollBufferTop) {
-        startBuffered = i;
-        startBufferedId = id;
-      }
-      if (startNoBuffer !== null) {
-        if (top <= scrollBottom) {
-          endNoBuffer = i;
+      if (!foundEnd) {
+        if (startNoBuffer === null && top + size > scroll) {
+          startNoBuffer = i;
         }
-        if (top <= scrollBottom + scrollBufferBottom) {
-          endBuffered = i;
-        } else {
-          break;
+        if (startBuffered === null && top + size > scroll - scrollBufferTop) {
+          startBuffered = i;
+          startBufferedId = id;
+        }
+        if (startNoBuffer !== null) {
+          if (top <= scrollBottom) {
+            endNoBuffer = i;
+          }
+          if (top <= scrollBottom + scrollBufferBottom) {
+            endBuffered = i;
+          } else {
+            foundEnd = true;
+          }
         }
       }
       column++;
@@ -1471,7 +1481,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       } : void 0;
     }
     if (startBuffered !== null && endBuffered !== null) {
-      const prevNumContainers = ctx.values.get("numContainers");
       let numContainers = prevNumContainers;
       let didWarnMoreContainers = false;
       const allocatedContainers = /* @__PURE__ */ new Set();
@@ -1545,18 +1554,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         const item = data[itemIndex];
         if (item !== void 0) {
           const id = getId(itemIndex);
-          if (itemKey !== id || itemIndex < startBuffered || itemIndex > endBuffered) {
-            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 || startBuffered > prevStartBuffered) {
-              set$(ctx, `containerPosition${i}`, ANCHORED_POSITION_OUT_OF_VIEW);
-            }
+          const position = positions.get(id);
+          if (position === void 0) {
+            set$(ctx, `containerPosition${i}`, ANCHORED_POSITION_OUT_OF_VIEW);
           } else {
             const pos = {
               type: "top",
-              relativeCoordinate: positions.get(id) || 0,
-              top: positions.get(id) || 0
+              relativeCoordinate: positions.get(id),
+              top: positions.get(id)
             };
             const column2 = columns.get(id) || 1;
             if (maintainVisibleContentPosition && itemIndex < anchorElementIndex) {
@@ -1930,11 +1935,10 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     return { index, item: data[index], renderedItem };
   }, []);
   const doInitialAllocateContainers = () => {
-    var _a;
     const state = refState.current;
     const { scrollLength, data } = state;
     if (scrollLength > 0 && data.length > 0 && !peek$(ctx, "numContainers")) {
-      const averageItemSize = (_a = estimatedItemSize != null ? estimatedItemSize : getEstimatedItemSize == null ? void 0 : getEstimatedItemSize(0, data[0])) != null ? _a : DEFAULT_ITEM_SIZE;
+      const averageItemSize = getEstimatedItemSize ? getEstimatedItemSize(0, data[0]) : estimatedItemSize;
       const numContainers = Math.ceil((scrollLength + scrollBuffer * 2) / averageItemSize) * numColumnsProp;
       for (let i = 0; i < numContainers; i++) {
         set$(ctx, `containerPosition${i}`, ANCHORED_POSITION_OUT_OF_VIEW);
@@ -1985,6 +1989,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     const numColumns = peek$(ctx, "numColumns");
     state.minIndexSizeChanged = state.minIndexSizeChanged !== void 0 ? Math.min(state.minIndexSizeChanged, index) : index;
     const prevSize = getItemSize(itemKey, index, data);
+    const prevSizeKnown = sizesKnown.get(itemKey);
     let needsCalculate = false;
     let needsUpdateContainersDidLayout = false;
     sizesKnown.set(itemKey, size);
@@ -2027,7 +2032,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
       state.scrollForNextCalculateItemsInView = void 0;
       addTotalSize(itemKey, diff, 0);
-      doMaintainScrollAtEnd(false);
+      if (prevSizeKnown !== void 0 && Math.abs(prevSizeKnown - size) > 5) {
+        doMaintainScrollAtEnd(false);
+      }
       if (onItemSizeChanged) {
         onItemSizeChanged({
           size,

package/package.json

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