@legendapp/list 2.0.0-next.22 → 2.0.0-next.24

package/index.d.mts

@@ -277,6 +277,7 @@ interface InternalState {
     endBuffered: number;
     endNoBuffer: number;
     firstFullyOnScreenIndex: number;
+    idsInView: string[];
     scrollPending: number;
     scroll: number;
     scrollTime: number;

package/index.d.ts

@@ -277,6 +277,7 @@ interface InternalState {
     endBuffered: number;
     endNoBuffer: number;
     firstFullyOnScreenIndex: number;
+    idsInView: string[];
     scrollPending: number;
     scroll: number;
     scrollTime: number;

package/index.js

@@ -920,18 +920,6 @@ function calculateOffsetWithOffsetPosition(state, offsetParam, params) {
   return offset;
 }
 
-// src/core/getEffectiveScroll.ts
-function getEffectiveScroll(ctx, state) {
-  const { scroll: scrollState, scrollLength } = state;
-  const topPad = peek$(ctx, "stylePaddingTop") + peek$(ctx, "headerSize");
-  const totalSize = peek$(ctx, "totalSize");
-  let scroll = scrollState - topPad;
-  if (scroll + scrollLength > totalSize) {
-    scroll = Math.max(0, totalSize - scrollLength);
-  }
-  return scroll;
-}
-
 // src/core/finishScrollTo.ts
 var finishScrollTo = (state) => {
   if (state) {
@@ -943,14 +931,16 @@ var finishScrollTo = (state) => {
 // src/core/scrollTo.ts
 function scrollTo(state, params = {}) {
   var _a;
-  const { animated } = params;
+  const { animated, noScrollingTo } = params;
   const {
     refScroller,
     props: { horizontal }
   } = state;
   const offset = calculateOffsetWithOffsetPosition(state, params.offset, params);
   state.scrollHistory.length = 0;
-  state.scrollingTo = params;
+  if (!noScrollingTo) {
+    state.scrollingTo = params;
+  }
   state.scrollPending = offset;
   (_a = refScroller.current) == null ? void 0 : _a.scrollTo({
     animated: !!animated,
@@ -964,10 +954,18 @@ function scrollTo(state, params = {}) {
 }
 
 // src/utils/requestAdjust.ts
-function requestAdjust(ctx, state, positionDiff) {
+function requestAdjust(ctx, state, positionDiff, dataChanged) {
   if (Math.abs(positionDiff) > 0.1) {
+    const needsScrollWorkaround = reactNative.Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
     const doit = () => {
-      state.scrollAdjustHandler.requestAdjust(positionDiff);
+      if (needsScrollWorkaround) {
+        scrollTo(state, {
+          noScrollingTo: true,
+          offset: state.scroll
+        });
+      } else {
+        state.scrollAdjustHandler.requestAdjust(positionDiff);
+      }
     };
     state.scroll += positionDiff;
     state.scrollForNextCalculateItemsInView = void 0;
@@ -986,9 +984,12 @@ function requestAdjust(ctx, state, positionDiff) {
       if (state.ignoreScrollFromMVCPTimeout) {
         clearTimeout(state.ignoreScrollFromMVCPTimeout);
       }
-      state.ignoreScrollFromMVCPTimeout = setTimeout(() => {
-        state.ignoreScrollFromMVCP = void 0;
-      }, 100);
+      state.ignoreScrollFromMVCPTimeout = setTimeout(
+        () => {
+          state.ignoreScrollFromMVCP = void 0;
+        },
+        needsScrollWorkaround ? 250 : 100
+      );
     } else {
       requestAnimationFrame(doit);
     }
@@ -996,44 +997,32 @@ function requestAdjust(ctx, state, positionDiff) {
 }
 
 // src/core/mvcp.ts
-function getItemsInView(ctx, state) {
-  const { startNoBuffer, endNoBuffer, positions, scrollLength } = state;
-  const idsInViewWithPositions = [];
-  const scroll = getEffectiveScroll(ctx, state);
-  if (startNoBuffer !== null && endNoBuffer !== null) {
-    for (let i = startNoBuffer; i <= endNoBuffer; i++) {
-      const id = getId(state, i);
-      if (id) {
-        const position = positions.get(id);
-        if (position === void 0 || position > scroll + scrollLength) {
-          break;
-        } else if (position >= scroll) {
-          idsInViewWithPositions.push({ id, position });
-        }
-      }
-    }
-  }
-  return idsInViewWithPositions;
-}
 function prepareMVCP(ctx, state, dataChanged) {
-  var _a;
   const {
+    idsInView,
     positions,
     scrollingTo,
     props: { maintainVisibleContentPosition }
   } = state;
   let prevPosition;
   let targetId;
-  let idsInViewWithPositions;
+  const idsInViewWithPositions = [];
   const scrollTarget = scrollingTo == null ? void 0 : scrollingTo.index;
   if (maintainVisibleContentPosition) {
     const indexByKey = state.indexByKey;
     if (scrollTarget !== void 0) {
       targetId = getId(state, scrollTarget);
-    } else if (peek$(ctx, "containersDidLayout")) {
-      idsInViewWithPositions = getItemsInView(ctx, state);
-      if (!dataChanged) {
-        targetId = (_a = idsInViewWithPositions.find(({ id }) => indexByKey.get(id) !== void 0)) == null ? void 0 : _a.id;
+    } else if (idsInView.length > 0 && peek$(ctx, "containersDidLayout")) {
+      if (dataChanged) {
+        for (let i = 0; i < idsInView.length; i++) {
+          const id = idsInView[i];
+          const index = indexByKey.get(id);
+          if (index !== void 0) {
+            idsInViewWithPositions.push({ id, position: positions.get(id) });
+          }
+        }
+      } else {
+        targetId = state.idsInView.find((id) => indexByKey.get(id) !== void 0);
       }
     }
     if (targetId !== void 0) {
@@ -1042,7 +1031,7 @@ function prepareMVCP(ctx, state, dataChanged) {
   }
   return () => {
     let positionDiff;
-    if (dataChanged && idsInViewWithPositions && targetId === void 0) {
+    if (dataChanged && targetId === void 0) {
       for (let i = 0; i < idsInViewWithPositions.length; i++) {
         const { id, position } = idsInViewWithPositions[i];
         const newPosition = positions.get(id);
@@ -1059,13 +1048,7 @@ function prepareMVCP(ctx, state, dataChanged) {
       }
     }
     if (positionDiff !== void 0 && Math.abs(positionDiff) > 0.1) {
-      if (reactNative.Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff) {
-        scrollTo(state, {
-          offset: state.scroll + positionDiff
-        });
-      } else {
-        requestAdjust(ctx, state, positionDiff);
-      }
+      requestAdjust(ctx, state, positionDiff, dataChanged);
     }
   };
 }
@@ -1789,7 +1772,7 @@ function handleStickyRecycling(ctx, state, stickyArray, scroll, scrollBuffer, pe
 }
 function calculateItemsInView(ctx, state, params = {}) {
   reactNative.unstable_batchedUpdates(() => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const {
       columns,
       containerItemKeys,
@@ -1810,7 +1793,10 @@ function calculateItemsInView(ctx, state, params = {}) {
     if (!data || scrollLength === 0 || !prevNumContainers) {
       return;
     }
+    const totalSize = peek$(ctx, "totalSize");
+    const topPad = peek$(ctx, "stylePaddingTop") + peek$(ctx, "headerSize");
     const numColumns = peek$(ctx, "numColumns");
+    const previousScrollAdjust = 0;
     const { dataChanged, doMVCP } = params;
     const speed = getScrollVelocity(state);
     if (doMVCP || dataChanged) {
@@ -1823,6 +1809,7 @@ function calculateItemsInView(ctx, state, params = {}) {
       updateAllPositions(ctx, state, dataChanged);
       checkMVCP == null ? void 0 : checkMVCP();
     }
+    const scrollExtra = 0;
     const { queuedInitialLayout } = state;
     let { scroll: scrollState } = state;
     if (!queuedInitialLayout && initialScroll) {
@@ -1832,9 +1819,12 @@ function calculateItemsInView(ctx, state, params = {}) {
         initialScroll
       );
       scrollState = updatedOffset;
-      state.scroll = scrollState;
     }
-    const scroll = getEffectiveScroll(ctx, state);
+    const scrollAdjustPad = -previousScrollAdjust - topPad;
+    let scroll = scrollState + scrollExtra + scrollAdjustPad;
+    if (scroll + scrollLength > totalSize) {
+      scroll = Math.max(0, totalSize - scrollLength);
+    }
     if (ENABLE_DEBUG_VIEW) {
       set$(ctx, "debugRawScroll", scrollState);
       set$(ctx, "debugComputedScroll", scroll);
@@ -1924,10 +1914,16 @@ function calculateItemsInView(ctx, state, params = {}) {
         }
       }
     }
+    const idsInView = [];
+    for (let i = firstFullyOnScreenIndex; i <= endNoBuffer; i++) {
+      const id = (_e = idCache.get(i)) != null ? _e : getId(state, i);
+      idsInView.push(id);
+    }
     Object.assign(state, {
       endBuffered,
       endNoBuffer,
       firstFullyOnScreenIndex,
+      idsInView,
       startBuffered,
       startBufferedId,
       startNoBuffer
@@ -1952,7 +1948,7 @@ function calculateItemsInView(ctx, state, params = {}) {
       let numContainers2 = prevNumContainers;
       const needNewContainers = [];
       for (let i = startBuffered; i <= endBuffered; i++) {
-        const id = (_e = idCache.get(i)) != null ? _e : getId(state, i);
+        const id = (_f = idCache.get(i)) != null ? _f : getId(state, i);
         if (!containerItemKeys.has(id)) {
           needNewContainers.push(i);
         }
@@ -1987,7 +1983,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         for (let idx = 0; idx < needNewContainers.length; idx++) {
           const i = needNewContainers[idx];
           const containerIndex = availableContainers[idx];
-          const id = (_f = idCache.get(i)) != null ? _f : getId(state, i);
+          const id = (_g = idCache.get(i)) != null ? _g : getId(state, i);
           const oldKey = peek$(ctx, `containerItemKey${containerIndex}`);
           if (oldKey && oldKey !== id) {
             containerItemKeys.delete(oldKey);
@@ -2041,7 +2037,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         const itemIndex = indexByKey.get(itemKey);
         const item = data[itemIndex];
         if (item !== void 0) {
-          const id = (_g = idCache.get(itemIndex)) != null ? _g : getId(state, itemIndex);
+          const id = (_h = idCache.get(itemIndex)) != null ? _h : getId(state, itemIndex);
           const position = positions.get(id);
           if (position === void 0) {
             set$(ctx, `containerPosition${i}`, POSITION_OUT_OF_VIEW);
@@ -2619,6 +2615,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       endReachedBlockedByTimer: false,
       firstFullyOnScreenIndex: -1,
       idCache: /* @__PURE__ */ new Map(),
+      idsInView: [],
       indexByKey: /* @__PURE__ */ new Map(),
       initialScroll,
       isAtEnd: false,

package/index.mjs

@@ -899,18 +899,6 @@ function calculateOffsetWithOffsetPosition(state, offsetParam, params) {
   return offset;
 }
 
-// src/core/getEffectiveScroll.ts
-function getEffectiveScroll(ctx, state) {
-  const { scroll: scrollState, scrollLength } = state;
-  const topPad = peek$(ctx, "stylePaddingTop") + peek$(ctx, "headerSize");
-  const totalSize = peek$(ctx, "totalSize");
-  let scroll = scrollState - topPad;
-  if (scroll + scrollLength > totalSize) {
-    scroll = Math.max(0, totalSize - scrollLength);
-  }
-  return scroll;
-}
-
 // src/core/finishScrollTo.ts
 var finishScrollTo = (state) => {
   if (state) {
@@ -922,14 +910,16 @@ var finishScrollTo = (state) => {
 // src/core/scrollTo.ts
 function scrollTo(state, params = {}) {
   var _a;
-  const { animated } = params;
+  const { animated, noScrollingTo } = params;
   const {
     refScroller,
     props: { horizontal }
   } = state;
   const offset = calculateOffsetWithOffsetPosition(state, params.offset, params);
   state.scrollHistory.length = 0;
-  state.scrollingTo = params;
+  if (!noScrollingTo) {
+    state.scrollingTo = params;
+  }
   state.scrollPending = offset;
   (_a = refScroller.current) == null ? void 0 : _a.scrollTo({
     animated: !!animated,
@@ -943,10 +933,18 @@ function scrollTo(state, params = {}) {
 }
 
 // src/utils/requestAdjust.ts
-function requestAdjust(ctx, state, positionDiff) {
+function requestAdjust(ctx, state, positionDiff, dataChanged) {
   if (Math.abs(positionDiff) > 0.1) {
+    const needsScrollWorkaround = Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
     const doit = () => {
-      state.scrollAdjustHandler.requestAdjust(positionDiff);
+      if (needsScrollWorkaround) {
+        scrollTo(state, {
+          noScrollingTo: true,
+          offset: state.scroll
+        });
+      } else {
+        state.scrollAdjustHandler.requestAdjust(positionDiff);
+      }
     };
     state.scroll += positionDiff;
     state.scrollForNextCalculateItemsInView = void 0;
@@ -965,9 +963,12 @@ function requestAdjust(ctx, state, positionDiff) {
       if (state.ignoreScrollFromMVCPTimeout) {
         clearTimeout(state.ignoreScrollFromMVCPTimeout);
       }
-      state.ignoreScrollFromMVCPTimeout = setTimeout(() => {
-        state.ignoreScrollFromMVCP = void 0;
-      }, 100);
+      state.ignoreScrollFromMVCPTimeout = setTimeout(
+        () => {
+          state.ignoreScrollFromMVCP = void 0;
+        },
+        needsScrollWorkaround ? 250 : 100
+      );
     } else {
       requestAnimationFrame(doit);
     }
@@ -975,44 +976,32 @@ function requestAdjust(ctx, state, positionDiff) {
 }
 
 // src/core/mvcp.ts
-function getItemsInView(ctx, state) {
-  const { startNoBuffer, endNoBuffer, positions, scrollLength } = state;
-  const idsInViewWithPositions = [];
-  const scroll = getEffectiveScroll(ctx, state);
-  if (startNoBuffer !== null && endNoBuffer !== null) {
-    for (let i = startNoBuffer; i <= endNoBuffer; i++) {
-      const id = getId(state, i);
-      if (id) {
-        const position = positions.get(id);
-        if (position === void 0 || position > scroll + scrollLength) {
-          break;
-        } else if (position >= scroll) {
-          idsInViewWithPositions.push({ id, position });
-        }
-      }
-    }
-  }
-  return idsInViewWithPositions;
-}
 function prepareMVCP(ctx, state, dataChanged) {
-  var _a;
   const {
+    idsInView,
     positions,
     scrollingTo,
     props: { maintainVisibleContentPosition }
   } = state;
   let prevPosition;
   let targetId;
-  let idsInViewWithPositions;
+  const idsInViewWithPositions = [];
   const scrollTarget = scrollingTo == null ? void 0 : scrollingTo.index;
   if (maintainVisibleContentPosition) {
     const indexByKey = state.indexByKey;
     if (scrollTarget !== void 0) {
       targetId = getId(state, scrollTarget);
-    } else if (peek$(ctx, "containersDidLayout")) {
-      idsInViewWithPositions = getItemsInView(ctx, state);
-      if (!dataChanged) {
-        targetId = (_a = idsInViewWithPositions.find(({ id }) => indexByKey.get(id) !== void 0)) == null ? void 0 : _a.id;
+    } else if (idsInView.length > 0 && peek$(ctx, "containersDidLayout")) {
+      if (dataChanged) {
+        for (let i = 0; i < idsInView.length; i++) {
+          const id = idsInView[i];
+          const index = indexByKey.get(id);
+          if (index !== void 0) {
+            idsInViewWithPositions.push({ id, position: positions.get(id) });
+          }
+        }
+      } else {
+        targetId = state.idsInView.find((id) => indexByKey.get(id) !== void 0);
       }
     }
     if (targetId !== void 0) {
@@ -1021,7 +1010,7 @@ function prepareMVCP(ctx, state, dataChanged) {
   }
   return () => {
     let positionDiff;
-    if (dataChanged && idsInViewWithPositions && targetId === void 0) {
+    if (dataChanged && targetId === void 0) {
       for (let i = 0; i < idsInViewWithPositions.length; i++) {
         const { id, position } = idsInViewWithPositions[i];
         const newPosition = positions.get(id);
@@ -1038,13 +1027,7 @@ function prepareMVCP(ctx, state, dataChanged) {
       }
     }
     if (positionDiff !== void 0 && Math.abs(positionDiff) > 0.1) {
-      if (Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff) {
-        scrollTo(state, {
-          offset: state.scroll + positionDiff
-        });
-      } else {
-        requestAdjust(ctx, state, positionDiff);
-      }
+      requestAdjust(ctx, state, positionDiff, dataChanged);
     }
   };
 }
@@ -1768,7 +1751,7 @@ function handleStickyRecycling(ctx, state, stickyArray, scroll, scrollBuffer, pe
 }
 function calculateItemsInView(ctx, state, params = {}) {
   unstable_batchedUpdates(() => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const {
       columns,
       containerItemKeys,
@@ -1789,7 +1772,10 @@ function calculateItemsInView(ctx, state, params = {}) {
     if (!data || scrollLength === 0 || !prevNumContainers) {
       return;
     }
+    const totalSize = peek$(ctx, "totalSize");
+    const topPad = peek$(ctx, "stylePaddingTop") + peek$(ctx, "headerSize");
     const numColumns = peek$(ctx, "numColumns");
+    const previousScrollAdjust = 0;
     const { dataChanged, doMVCP } = params;
     const speed = getScrollVelocity(state);
     if (doMVCP || dataChanged) {
@@ -1802,6 +1788,7 @@ function calculateItemsInView(ctx, state, params = {}) {
       updateAllPositions(ctx, state, dataChanged);
       checkMVCP == null ? void 0 : checkMVCP();
     }
+    const scrollExtra = 0;
     const { queuedInitialLayout } = state;
     let { scroll: scrollState } = state;
     if (!queuedInitialLayout && initialScroll) {
@@ -1811,9 +1798,12 @@ function calculateItemsInView(ctx, state, params = {}) {
         initialScroll
       );
       scrollState = updatedOffset;
-      state.scroll = scrollState;
     }
-    const scroll = getEffectiveScroll(ctx, state);
+    const scrollAdjustPad = -previousScrollAdjust - topPad;
+    let scroll = scrollState + scrollExtra + scrollAdjustPad;
+    if (scroll + scrollLength > totalSize) {
+      scroll = Math.max(0, totalSize - scrollLength);
+    }
     if (ENABLE_DEBUG_VIEW) {
       set$(ctx, "debugRawScroll", scrollState);
       set$(ctx, "debugComputedScroll", scroll);
@@ -1903,10 +1893,16 @@ function calculateItemsInView(ctx, state, params = {}) {
         }
       }
     }
+    const idsInView = [];
+    for (let i = firstFullyOnScreenIndex; i <= endNoBuffer; i++) {
+      const id = (_e = idCache.get(i)) != null ? _e : getId(state, i);
+      idsInView.push(id);
+    }
     Object.assign(state, {
       endBuffered,
       endNoBuffer,
       firstFullyOnScreenIndex,
+      idsInView,
       startBuffered,
       startBufferedId,
       startNoBuffer
@@ -1931,7 +1927,7 @@ function calculateItemsInView(ctx, state, params = {}) {
       let numContainers2 = prevNumContainers;
       const needNewContainers = [];
       for (let i = startBuffered; i <= endBuffered; i++) {
-        const id = (_e = idCache.get(i)) != null ? _e : getId(state, i);
+        const id = (_f = idCache.get(i)) != null ? _f : getId(state, i);
         if (!containerItemKeys.has(id)) {
           needNewContainers.push(i);
         }
@@ -1966,7 +1962,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         for (let idx = 0; idx < needNewContainers.length; idx++) {
           const i = needNewContainers[idx];
           const containerIndex = availableContainers[idx];
-          const id = (_f = idCache.get(i)) != null ? _f : getId(state, i);
+          const id = (_g = idCache.get(i)) != null ? _g : getId(state, i);
           const oldKey = peek$(ctx, `containerItemKey${containerIndex}`);
           if (oldKey && oldKey !== id) {
             containerItemKeys.delete(oldKey);
@@ -2020,7 +2016,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         const itemIndex = indexByKey.get(itemKey);
         const item = data[itemIndex];
         if (item !== void 0) {
-          const id = (_g = idCache.get(itemIndex)) != null ? _g : getId(state, itemIndex);
+          const id = (_h = idCache.get(itemIndex)) != null ? _h : getId(state, itemIndex);
           const position = positions.get(id);
           if (position === void 0) {
             set$(ctx, `containerPosition${i}`, POSITION_OUT_OF_VIEW);
@@ -2598,6 +2594,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       endReachedBlockedByTimer: false,
       firstFullyOnScreenIndex: -1,
       idCache: /* @__PURE__ */ new Map(),
+      idsInView: [],
       indexByKey: /* @__PURE__ */ new Map(),
       initialScroll,
       isAtEnd: false,

package/package.json

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