@legendapp/list 2.0.0-next.18 → 2.0.0-next.19

package/index.d.mts

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

package/index.d.ts

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

package/index.js

@@ -920,6 +920,18 @@ 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) {
@@ -984,32 +996,46 @@ function requestAdjust(ctx, state, positionDiff) {
 }
 
 // src/core/prepareMVCP.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;
-  const idsInViewWithPositions = [];
+  let idsInViewWithPositions;
   const scrollTarget = scrollingTo == null ? void 0 : scrollingTo.index;
   if (maintainVisibleContentPosition) {
     const indexByKey = state.indexByKey;
     if (scrollTarget !== void 0) {
+      console.log("scrollTarget", scrollTarget);
       targetId = getId(state, scrollTarget);
-    } 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);
+    } 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;
+        console.log("targetId in view", targetId);
       }
     }
     if (targetId !== void 0) {
@@ -1018,12 +1044,13 @@ function prepareMVCP(ctx, state, dataChanged) {
   }
   return () => {
     let positionDiff;
-    if (dataChanged && targetId === void 0) {
+    if (dataChanged && idsInViewWithPositions && targetId === void 0) {
       for (let i = 0; i < idsInViewWithPositions.length; i++) {
         const { id, position } = idsInViewWithPositions[i];
         const newPosition = positions.get(id);
         if (newPosition !== void 0) {
           positionDiff = newPosition - position;
+          console.log("positionDiff", positionDiff, id);
           break;
         }
       }
@@ -1032,6 +1059,7 @@ function prepareMVCP(ctx, state, dataChanged) {
       const newPosition = positions.get(targetId);
       if (newPosition !== void 0) {
         positionDiff = newPosition - prevPosition;
+        console.log("positionDiff targetId", positionDiff, targetId);
       }
     }
     if (positionDiff !== void 0 && Math.abs(positionDiff) > 0.1) {
@@ -1126,6 +1154,7 @@ var getScrollVelocity = (state) => {
     const newest = scrollHistory[scrollHistory.length - 1];
     let oldest;
     let start = 0;
+    const now = Date.now();
     for (let i = 0; i < scrollHistory.length - 1; i++) {
       const entry = scrollHistory[i];
       const nextEntry = scrollHistory[i + 1];
@@ -1141,12 +1170,12 @@ var getScrollVelocity = (state) => {
     }
     for (let i = start; i < scrollHistory.length - 1; i++) {
       const entry = scrollHistory[i];
-      if (newest.time - entry.time <= 1e3) {
+      if (now - entry.time <= 1e3) {
         oldest = entry;
         break;
       }
     }
-    if (oldest) {
+    if (oldest && oldest !== newest) {
       const scrollDiff = newest.scroll - oldest.scroll;
       const timeDiff = newest.time - oldest.time;
       velocity = timeDiff > 0 ? scrollDiff / timeDiff : 0;
@@ -1764,7 +1793,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, _h;
+    var _a, _b, _c, _d, _e, _f, _g;
     const {
       columns,
       containerItemKeys,
@@ -1785,10 +1814,7 @@ 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) {
@@ -1801,7 +1827,6 @@ 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,12 +1836,9 @@ function calculateItemsInView(ctx, state, params = {}) {
         initialScroll
       );
       scrollState = updatedOffset;
+      state.scroll = scrollState;
     }
-    const scrollAdjustPad = -previousScrollAdjust - topPad;
-    let scroll = scrollState + scrollExtra + scrollAdjustPad;
-    if (scroll + scrollLength > totalSize) {
-      scroll = Math.max(0, totalSize - scrollLength);
-    }
+    const scroll = getEffectiveScroll(ctx, state);
     if (ENABLE_DEBUG_VIEW) {
       set$(ctx, "debugRawScroll", scrollState);
       set$(ctx, "debugComputedScroll", scroll);
@@ -1906,16 +1928,10 @@ 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
@@ -1940,7 +1956,7 @@ function calculateItemsInView(ctx, state, params = {}) {
       let numContainers2 = prevNumContainers;
       const needNewContainers = [];
       for (let i = startBuffered; i <= endBuffered; i++) {
-        const id = (_f = idCache.get(i)) != null ? _f : getId(state, i);
+        const id = (_e = idCache.get(i)) != null ? _e : getId(state, i);
         if (!containerItemKeys.has(id)) {
           needNewContainers.push(i);
         }
@@ -1975,7 +1991,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         for (let idx = 0; idx < needNewContainers.length; idx++) {
           const i = needNewContainers[idx];
           const containerIndex = availableContainers[idx];
-          const id = (_g = idCache.get(i)) != null ? _g : getId(state, i);
+          const id = (_f = idCache.get(i)) != null ? _f : getId(state, i);
           const oldKey = peek$(ctx, `containerItemKey${containerIndex}`);
           if (oldKey && oldKey !== id) {
             containerItemKeys.delete(oldKey);
@@ -2029,7 +2045,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         const itemIndex = indexByKey.get(itemKey);
         const item = data[itemIndex];
         if (item !== void 0) {
-          const id = (_h = idCache.get(itemIndex)) != null ? _h : getId(state, itemIndex);
+          const id = (_g = idCache.get(itemIndex)) != null ? _g : getId(state, itemIndex);
           const position = positions.get(id);
           if (position === void 0) {
             set$(ctx, `containerPosition${i}`, POSITION_OUT_OF_VIEW);
@@ -2605,7 +2621,6 @@ 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,6 +899,18 @@ 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) {
@@ -963,32 +975,46 @@ function requestAdjust(ctx, state, positionDiff) {
 }
 
 // src/core/prepareMVCP.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;
-  const idsInViewWithPositions = [];
+  let idsInViewWithPositions;
   const scrollTarget = scrollingTo == null ? void 0 : scrollingTo.index;
   if (maintainVisibleContentPosition) {
     const indexByKey = state.indexByKey;
     if (scrollTarget !== void 0) {
+      console.log("scrollTarget", scrollTarget);
       targetId = getId(state, scrollTarget);
-    } 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);
+    } 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;
+        console.log("targetId in view", targetId);
       }
     }
     if (targetId !== void 0) {
@@ -997,12 +1023,13 @@ function prepareMVCP(ctx, state, dataChanged) {
   }
   return () => {
     let positionDiff;
-    if (dataChanged && targetId === void 0) {
+    if (dataChanged && idsInViewWithPositions && targetId === void 0) {
       for (let i = 0; i < idsInViewWithPositions.length; i++) {
         const { id, position } = idsInViewWithPositions[i];
         const newPosition = positions.get(id);
         if (newPosition !== void 0) {
           positionDiff = newPosition - position;
+          console.log("positionDiff", positionDiff, id);
           break;
         }
       }
@@ -1011,6 +1038,7 @@ function prepareMVCP(ctx, state, dataChanged) {
       const newPosition = positions.get(targetId);
       if (newPosition !== void 0) {
         positionDiff = newPosition - prevPosition;
+        console.log("positionDiff targetId", positionDiff, targetId);
       }
     }
     if (positionDiff !== void 0 && Math.abs(positionDiff) > 0.1) {
@@ -1105,6 +1133,7 @@ var getScrollVelocity = (state) => {
     const newest = scrollHistory[scrollHistory.length - 1];
     let oldest;
     let start = 0;
+    const now = Date.now();
     for (let i = 0; i < scrollHistory.length - 1; i++) {
       const entry = scrollHistory[i];
       const nextEntry = scrollHistory[i + 1];
@@ -1120,12 +1149,12 @@ var getScrollVelocity = (state) => {
     }
     for (let i = start; i < scrollHistory.length - 1; i++) {
       const entry = scrollHistory[i];
-      if (newest.time - entry.time <= 1e3) {
+      if (now - entry.time <= 1e3) {
         oldest = entry;
         break;
       }
     }
-    if (oldest) {
+    if (oldest && oldest !== newest) {
       const scrollDiff = newest.scroll - oldest.scroll;
       const timeDiff = newest.time - oldest.time;
       velocity = timeDiff > 0 ? scrollDiff / timeDiff : 0;
@@ -1743,7 +1772,7 @@ function handleStickyRecycling(ctx, state, stickyArray, scroll, scrollBuffer, pe
 }
 function calculateItemsInView(ctx, state, params = {}) {
   unstable_batchedUpdates(() => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g;
     const {
       columns,
       containerItemKeys,
@@ -1764,10 +1793,7 @@ 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) {
@@ -1780,7 +1806,6 @@ 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) {
@@ -1790,12 +1815,9 @@ function calculateItemsInView(ctx, state, params = {}) {
         initialScroll
       );
       scrollState = updatedOffset;
+      state.scroll = scrollState;
     }
-    const scrollAdjustPad = -previousScrollAdjust - topPad;
-    let scroll = scrollState + scrollExtra + scrollAdjustPad;
-    if (scroll + scrollLength > totalSize) {
-      scroll = Math.max(0, totalSize - scrollLength);
-    }
+    const scroll = getEffectiveScroll(ctx, state);
     if (ENABLE_DEBUG_VIEW) {
       set$(ctx, "debugRawScroll", scrollState);
       set$(ctx, "debugComputedScroll", scroll);
@@ -1885,16 +1907,10 @@ 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
@@ -1919,7 +1935,7 @@ function calculateItemsInView(ctx, state, params = {}) {
       let numContainers2 = prevNumContainers;
       const needNewContainers = [];
       for (let i = startBuffered; i <= endBuffered; i++) {
-        const id = (_f = idCache.get(i)) != null ? _f : getId(state, i);
+        const id = (_e = idCache.get(i)) != null ? _e : getId(state, i);
         if (!containerItemKeys.has(id)) {
           needNewContainers.push(i);
         }
@@ -1954,7 +1970,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         for (let idx = 0; idx < needNewContainers.length; idx++) {
           const i = needNewContainers[idx];
           const containerIndex = availableContainers[idx];
-          const id = (_g = idCache.get(i)) != null ? _g : getId(state, i);
+          const id = (_f = idCache.get(i)) != null ? _f : getId(state, i);
           const oldKey = peek$(ctx, `containerItemKey${containerIndex}`);
           if (oldKey && oldKey !== id) {
             containerItemKeys.delete(oldKey);
@@ -2008,7 +2024,7 @@ function calculateItemsInView(ctx, state, params = {}) {
         const itemIndex = indexByKey.get(itemKey);
         const item = data[itemIndex];
         if (item !== void 0) {
-          const id = (_h = idCache.get(itemIndex)) != null ? _h : getId(state, itemIndex);
+          const id = (_g = idCache.get(itemIndex)) != null ? _g : getId(state, itemIndex);
           const position = positions.get(id);
           if (position === void 0) {
             set$(ctx, `containerPosition${i}`, POSITION_OUT_OF_VIEW);
@@ -2584,7 +2600,6 @@ 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.18",
+  "version": "2.0.0-next.19",
   "description": "Legend List is a drop-in replacement for FlatList with much better performance and supporting dynamically sized items.",
   "sideEffects": false,
   "private": false,