@legendapp/list 2.0.1 → 2.0.2

package/index.js

@@ -1066,7 +1066,7 @@ function ensurePositionCalculated(ctx, state, index) {
   updateItemPositions(ctx, state, false, newStart, newEnd);
 }
 function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const {
     columns,
     indexByKey,
@@ -1083,29 +1083,47 @@ function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex)
   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;
+  const dataLength = data.length;
+  const requiredRange = getRequiredRange(ctx, state);
+  const shouldOptimize = dataLength >= 500;
+  const optimizedEndIndex = shouldOptimize ? Math.min(dataLength - 1, requiredRange.end) : dataLength - 1;
+  const actualEndIndex = endIndex !== void 0 ? Math.min(endIndex, dataLength - 1) : optimizedEndIndex;
+  let adjustedStartIndex = startIndex;
+  let adjustedEndIndex = actualEndIndex;
+  if (((_a = state.positionRange) == null ? void 0 : _a.valid) && !dataChanged && shouldOptimize) {
+    const existingStart = state.positionRange.start;
+    const existingEnd = state.positionRange.end;
+    const requiredStart = requiredRange.start;
+    const requiredEnd = requiredRange.end;
+    if (requiredStart <= existingEnd + 1 && requiredEnd >= existingStart - 1) {
+      adjustedStartIndex = Math.min(startIndex, Math.min(existingStart, requiredStart));
+      adjustedEndIndex = Math.max(actualEndIndex, Math.max(existingEnd, requiredEnd));
+    } else if (requiredStart > existingEnd + 1) {
+      adjustedStartIndex = Math.min(startIndex, existingEnd + 1);
+      adjustedEndIndex = Math.max(actualEndIndex, requiredEnd);
+    } else if (requiredEnd < existingStart - 1) {
+      adjustedStartIndex = Math.min(startIndex, requiredStart);
+      adjustedEndIndex = Math.max(actualEndIndex, existingStart - 1);
+    }
+  }
+  if (adjustedStartIndex > 0) {
+    const prevIndex = adjustedStartIndex - 1;
+    const prevId = (_b = idCache.get(prevIndex)) != null ? _b : getId(state, prevIndex);
+    const prevPosition = (_c = positions.get(prevId)) != null ? _c : 0;
     if (hasColumns) {
-      const prevColumn = (_c = columns.get(prevId)) != null ? _c : 1;
+      const prevColumn = (_d = columns.get(prevId)) != null ? _d : 1;
       currentRowTop = prevPosition;
       column = prevColumn % numColumns + 1;
     } else {
-      const prevSize = (_d = sizesKnown.get(prevId)) != null ? _d : getItemSize(state, prevId, prevIndex, data[prevIndex], useAverageSize);
+      const prevSize = (_e = sizesKnown.get(prevId)) != null ? _e : getItemSize(state, prevId, prevIndex, data[prevIndex], useAverageSize);
       currentRowTop = prevPosition + prevSize;
     }
   }
   const needsIndexByKey = dataChanged || indexByKey.size === 0;
-  const dataLength = data.length;
-  const requiredRange = getRequiredRange(ctx, state);
-  const shouldOptimize = dataLength >= 500;
-  const optimizedEndIndex = shouldOptimize ? Math.min(dataLength - 1, requiredRange.end) : dataLength - 1;
-  const actualEndIndex = endIndex !== void 0 ? Math.min(endIndex, dataLength - 1) : optimizedEndIndex;
-  let actualEndReached = startIndex;
-  for (let i = startIndex; i < dataLength; i++) {
-    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);
+  let actualEndReached = adjustedStartIndex;
+  for (let i = adjustedStartIndex; i < dataLength; i++) {
+    const id = (_f = idCache.get(i)) != null ? _f : getId(state, i);
+    const size = (_g = sizesKnown.get(id)) != null ? _g : getItemSize(state, id, i, data[i], useAverageSize);
     if (__DEV__ && needsIndexByKey) {
       if (indexByKeyForChecking.has(id)) {
         console.error(
@@ -1133,7 +1151,7 @@ function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex)
       currentRowTop += size;
     }
     actualEndReached = i;
-    if (shouldOptimize && i >= actualEndIndex && (!((_g = state.scrollingTo) == null ? void 0 : _g.index) || i >= state.scrollingTo.index)) {
+    if (shouldOptimize && i >= adjustedEndIndex && (!((_h = state.scrollingTo) == null ? void 0 : _h.index) || i >= state.scrollingTo.index)) {
       break;
     }
   }
@@ -1143,13 +1161,16 @@ function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex)
   if (dataChanged) {
     state.positionRange = {
       end: actualEndReached,
-      start: startIndex,
+      start: adjustedStartIndex,
       valid: true
     };
   } else {
     state.positionRange = {
       end: Math.max(state.positionRange.valid ? state.positionRange.end : actualEndReached, actualEndReached),
-      start: Math.min(state.positionRange.valid ? state.positionRange.start : startIndex, startIndex),
+      start: Math.min(
+        state.positionRange.valid ? state.positionRange.start : adjustedStartIndex,
+        adjustedStartIndex
+      ),
       valid: true
     };
   }
@@ -1974,7 +1995,8 @@ function calculateItemsInView(ctx, state, params = {}) {
     let loopStart = startBufferedIdOrig ? indexByKey.get(startBufferedIdOrig) || 0 : 0;
     for (let i = loopStart; i >= 0; i--) {
       const id = (_a = idCache.get(i)) != null ? _a : getId(state, i);
-      const top = positions.get(id);
+      const top = getPositionById(ctx, state, id);
+      if (top === void 0) break;
       const size = (_b = sizes.get(id)) != null ? _b : getItemSize(state, id, i, data[i]);
       const bottom = top + size;
       if (bottom > scroll - scrollBuffer) {
@@ -2003,7 +2025,7 @@ function calculateItemsInView(ctx, state, params = {}) {
     for (let i = Math.max(0, loopStart); i < dataLength && (!foundEnd || i <= maxIndexRendered); i++) {
       const id = (_c = idCache.get(i)) != null ? _c : getId(state, i);
       const size = (_d = sizes.get(id)) != null ? _d : getItemSize(state, id, i, data[i]);
-      const top = positions.get(id);
+      const top = getPositionById(ctx, state, id);
       if (!foundEnd) {
         if (startNoBuffer === null && top + size > scroll) {
           startNoBuffer = i;

package/index.mjs

@@ -1045,7 +1045,7 @@ function ensurePositionCalculated(ctx, state, index) {
   updateItemPositions(ctx, state, false, newStart, newEnd);
 }
 function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const {
     columns,
     indexByKey,
@@ -1062,29 +1062,47 @@ function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex)
   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;
+  const dataLength = data.length;
+  const requiredRange = getRequiredRange(ctx, state);
+  const shouldOptimize = dataLength >= 500;
+  const optimizedEndIndex = shouldOptimize ? Math.min(dataLength - 1, requiredRange.end) : dataLength - 1;
+  const actualEndIndex = endIndex !== void 0 ? Math.min(endIndex, dataLength - 1) : optimizedEndIndex;
+  let adjustedStartIndex = startIndex;
+  let adjustedEndIndex = actualEndIndex;
+  if (((_a = state.positionRange) == null ? void 0 : _a.valid) && !dataChanged && shouldOptimize) {
+    const existingStart = state.positionRange.start;
+    const existingEnd = state.positionRange.end;
+    const requiredStart = requiredRange.start;
+    const requiredEnd = requiredRange.end;
+    if (requiredStart <= existingEnd + 1 && requiredEnd >= existingStart - 1) {
+      adjustedStartIndex = Math.min(startIndex, Math.min(existingStart, requiredStart));
+      adjustedEndIndex = Math.max(actualEndIndex, Math.max(existingEnd, requiredEnd));
+    } else if (requiredStart > existingEnd + 1) {
+      adjustedStartIndex = Math.min(startIndex, existingEnd + 1);
+      adjustedEndIndex = Math.max(actualEndIndex, requiredEnd);
+    } else if (requiredEnd < existingStart - 1) {
+      adjustedStartIndex = Math.min(startIndex, requiredStart);
+      adjustedEndIndex = Math.max(actualEndIndex, existingStart - 1);
+    }
+  }
+  if (adjustedStartIndex > 0) {
+    const prevIndex = adjustedStartIndex - 1;
+    const prevId = (_b = idCache.get(prevIndex)) != null ? _b : getId(state, prevIndex);
+    const prevPosition = (_c = positions.get(prevId)) != null ? _c : 0;
     if (hasColumns) {
-      const prevColumn = (_c = columns.get(prevId)) != null ? _c : 1;
+      const prevColumn = (_d = columns.get(prevId)) != null ? _d : 1;
       currentRowTop = prevPosition;
       column = prevColumn % numColumns + 1;
     } else {
-      const prevSize = (_d = sizesKnown.get(prevId)) != null ? _d : getItemSize(state, prevId, prevIndex, data[prevIndex], useAverageSize);
+      const prevSize = (_e = sizesKnown.get(prevId)) != null ? _e : getItemSize(state, prevId, prevIndex, data[prevIndex], useAverageSize);
       currentRowTop = prevPosition + prevSize;
     }
   }
   const needsIndexByKey = dataChanged || indexByKey.size === 0;
-  const dataLength = data.length;
-  const requiredRange = getRequiredRange(ctx, state);
-  const shouldOptimize = dataLength >= 500;
-  const optimizedEndIndex = shouldOptimize ? Math.min(dataLength - 1, requiredRange.end) : dataLength - 1;
-  const actualEndIndex = endIndex !== void 0 ? Math.min(endIndex, dataLength - 1) : optimizedEndIndex;
-  let actualEndReached = startIndex;
-  for (let i = startIndex; i < dataLength; i++) {
-    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);
+  let actualEndReached = adjustedStartIndex;
+  for (let i = adjustedStartIndex; i < dataLength; i++) {
+    const id = (_f = idCache.get(i)) != null ? _f : getId(state, i);
+    const size = (_g = sizesKnown.get(id)) != null ? _g : getItemSize(state, id, i, data[i], useAverageSize);
     if (__DEV__ && needsIndexByKey) {
       if (indexByKeyForChecking.has(id)) {
         console.error(
@@ -1112,7 +1130,7 @@ function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex)
       currentRowTop += size;
     }
     actualEndReached = i;
-    if (shouldOptimize && i >= actualEndIndex && (!((_g = state.scrollingTo) == null ? void 0 : _g.index) || i >= state.scrollingTo.index)) {
+    if (shouldOptimize && i >= adjustedEndIndex && (!((_h = state.scrollingTo) == null ? void 0 : _h.index) || i >= state.scrollingTo.index)) {
       break;
     }
   }
@@ -1122,13 +1140,16 @@ function updateItemPositions(ctx, state, dataChanged, startIndex = 0, endIndex)
   if (dataChanged) {
     state.positionRange = {
       end: actualEndReached,
-      start: startIndex,
+      start: adjustedStartIndex,
       valid: true
     };
   } else {
     state.positionRange = {
       end: Math.max(state.positionRange.valid ? state.positionRange.end : actualEndReached, actualEndReached),
-      start: Math.min(state.positionRange.valid ? state.positionRange.start : startIndex, startIndex),
+      start: Math.min(
+        state.positionRange.valid ? state.positionRange.start : adjustedStartIndex,
+        adjustedStartIndex
+      ),
       valid: true
     };
   }
@@ -1953,7 +1974,8 @@ function calculateItemsInView(ctx, state, params = {}) {
     let loopStart = startBufferedIdOrig ? indexByKey.get(startBufferedIdOrig) || 0 : 0;
     for (let i = loopStart; i >= 0; i--) {
       const id = (_a = idCache.get(i)) != null ? _a : getId(state, i);
-      const top = positions.get(id);
+      const top = getPositionById(ctx, state, id);
+      if (top === void 0) break;
       const size = (_b = sizes.get(id)) != null ? _b : getItemSize(state, id, i, data[i]);
       const bottom = top + size;
       if (bottom > scroll - scrollBuffer) {
@@ -1982,7 +2004,7 @@ function calculateItemsInView(ctx, state, params = {}) {
     for (let i = Math.max(0, loopStart); i < dataLength && (!foundEnd || i <= maxIndexRendered); i++) {
       const id = (_c = idCache.get(i)) != null ? _c : getId(state, i);
       const size = (_d = sizes.get(id)) != null ? _d : getItemSize(state, id, i, data[i]);
-      const top = positions.get(id);
+      const top = getPositionById(ctx, state, id);
       if (!foundEnd) {
         if (startNoBuffer === null && top + size > scroll) {
           startNoBuffer = i;

package/package.json

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