@legendapp/list 2.0.11 → 2.0.12

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.12
+- Fix: Scroll velocity calculation was sometimes incorrect when item sizes were very different from estimate
+- Fix: onScroll while scrolling was updating positions without maintainVisibleContentPosition calculations, which was breaking scroll position maintenance
+
 ## 2.0.11
 - Fix: Missing React import in a file
 

package/animated.d.mts

@@ -1,8 +1,8 @@
-import * as React$1 from 'react';
 import * as _legendapp_list from '@legendapp/list';
+import * as React from 'react';
 import { Animated } from 'react-native';
 
-declare const AnimatedLegendList: Animated.AnimatedComponent<(<T>(props: _legendapp_list.LegendListProps<T> & React$1.RefAttributes<_legendapp_list.LegendListRef>) => React.ReactNode) & {
+declare const AnimatedLegendList: Animated.AnimatedComponent<(<T>(props: _legendapp_list.LegendListProps<T> & React.RefAttributes<_legendapp_list.LegendListRef>) => React.ReactNode) & {
     displayName?: string;
 }>;
 

package/animated.d.ts

@@ -1,8 +1,8 @@
-import * as React$1 from 'react';
 import * as _legendapp_list from '@legendapp/list';
+import * as React from 'react';
 import { Animated } from 'react-native';
 
-declare const AnimatedLegendList: Animated.AnimatedComponent<(<T>(props: _legendapp_list.LegendListProps<T> & React$1.RefAttributes<_legendapp_list.LegendListRef>) => React.ReactNode) & {
+declare const AnimatedLegendList: Animated.AnimatedComponent<(<T>(props: _legendapp_list.LegendListProps<T> & React.RefAttributes<_legendapp_list.LegendListRef>) => React.ReactNode) & {
     displayName?: string;
 }>;
 

package/index.d.mts

@@ -329,6 +329,7 @@ interface InternalState {
         scroll: number;
         time: number;
     }>;
+    lastScrollAdjustForHistory?: number;
     startReachedBlockedByTimer: boolean;
     endReachedBlockedByTimer: boolean;
     scrollForNextCalculateItemsInView: {

package/index.d.ts

@@ -329,6 +329,7 @@ interface InternalState {
         scroll: number;
         time: number;
     }>;
+    lastScrollAdjustForHistory?: number;
     startReachedBlockedByTimer: boolean;
     endReachedBlockedByTimer: boolean;
     scrollForNextCalculateItemsInView: {

package/index.js

@@ -695,7 +695,7 @@ function ScrollAdjust() {
 }
 function SnapWrapper({ ScrollComponent, ...props }) {
   const [snapToOffsets] = useArr$(["snapToOffsets"]);
-  return /* @__PURE__ */ React2__namespace.default.createElement(ScrollComponent, { ...props, snapToOffsets });
+  return /* @__PURE__ */ React2__namespace.createElement(ScrollComponent, { ...props, snapToOffsets });
 }
 
 // src/components/ListComponent.tsx
@@ -1889,7 +1889,6 @@ function calculateItemsInView(ctx, state, params = {}) {
     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);
     const scrollExtra = 0;
@@ -1903,7 +1902,7 @@ function calculateItemsInView(ctx, state, params = {}) {
       );
       scrollState = updatedOffset;
     }
-    const scrollAdjustPad = -previousScrollAdjust - topPad;
+    const scrollAdjustPad = -topPad;
     let scroll = scrollState + scrollExtra + scrollAdjustPad;
     if (scroll + scrollLength > totalSize) {
       scroll = Math.max(0, totalSize - scrollLength);
@@ -2415,13 +2414,6 @@ function onScroll(ctx, state, event) {
     return;
   }
   const newScroll = event.nativeEvent.contentOffset[state.props.horizontal ? "x" : "y"];
-  const ignoreScrollFromMVCP = state.ignoreScrollFromMVCP;
-  if (ignoreScrollFromMVCP && !state.scrollingTo) {
-    const { lt, gt } = ignoreScrollFromMVCP;
-    if (lt && newScroll < lt || gt && newScroll > gt) {
-      return;
-    }
-  }
   state.scrollPending = newScroll;
   updateScroll(ctx, state, newScroll);
   onScrollProp == null ? void 0 : onScrollProp(event);
@@ -2431,9 +2423,17 @@ function updateScroll(ctx, state, newScroll) {
   state.hasScrolled = true;
   state.lastBatchingAction = Date.now();
   const currentTime = Date.now();
+  const adjust = state.scrollAdjustHandler.getAdjust();
+  const lastHistoryAdjust = state.lastScrollAdjustForHistory;
+  const adjustChanged = lastHistoryAdjust !== void 0 && Math.abs(adjust - lastHistoryAdjust) > 0.1;
+  if (adjustChanged) {
+    state.scrollHistory.length = 0;
+  }
+  state.lastScrollAdjustForHistory = adjust;
   if (scrollingTo === void 0 && !(state.scrollHistory.length === 0 && newScroll === state.scroll)) {
-    const adjust = state.scrollAdjustHandler.getAdjust();
-    state.scrollHistory.push({ scroll: newScroll - adjust, time: currentTime });
+    if (!adjustChanged) {
+      state.scrollHistory.push({ scroll: newScroll, time: currentTime });
+    }
   }
   if (state.scrollHistory.length > 5) {
     state.scrollHistory.shift();
@@ -2442,8 +2442,15 @@ function updateScroll(ctx, state, newScroll) {
   state.scrollPrevTime = state.scrollTime;
   state.scroll = newScroll;
   state.scrollTime = currentTime;
+  const ignoreScrollFromMVCP = state.ignoreScrollFromMVCP;
+  if (ignoreScrollFromMVCP && !state.scrollingTo) {
+    const { lt, gt } = ignoreScrollFromMVCP;
+    if (lt && newScroll < lt || gt && newScroll > gt) {
+      return;
+    }
+  }
   if (state.dataChangeNeedsScrollUpdate || Math.abs(state.scroll - state.scrollPrev) > 2) {
-    calculateItemsInView(ctx, state);
+    calculateItemsInView(ctx, state, { doMVCP: state.scrollingTo !== void 0 });
     checkAtBottom(ctx, state);
     checkAtTop(state);
     state.dataChangeNeedsScrollUpdate = false;
@@ -2484,7 +2491,6 @@ function updateItemSize(ctx, state, itemKey, sizeObj) {
       getFixedItemSize,
       getItemType,
       horizontal,
-      maintainVisibleContentPosition,
       suggestEstimatedItemSize,
       onItemSizeChanged,
       data,

package/index.mjs

@@ -674,7 +674,7 @@ function ScrollAdjust() {
 }
 function SnapWrapper({ ScrollComponent, ...props }) {
   const [snapToOffsets] = useArr$(["snapToOffsets"]);
-  return /* @__PURE__ */ React2__default.createElement(ScrollComponent, { ...props, snapToOffsets });
+  return /* @__PURE__ */ React2.createElement(ScrollComponent, { ...props, snapToOffsets });
 }
 
 // src/components/ListComponent.tsx
@@ -1868,7 +1868,6 @@ function calculateItemsInView(ctx, state, params = {}) {
     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);
     const scrollExtra = 0;
@@ -1882,7 +1881,7 @@ function calculateItemsInView(ctx, state, params = {}) {
       );
       scrollState = updatedOffset;
     }
-    const scrollAdjustPad = -previousScrollAdjust - topPad;
+    const scrollAdjustPad = -topPad;
     let scroll = scrollState + scrollExtra + scrollAdjustPad;
     if (scroll + scrollLength > totalSize) {
       scroll = Math.max(0, totalSize - scrollLength);
@@ -2394,13 +2393,6 @@ function onScroll(ctx, state, event) {
     return;
   }
   const newScroll = event.nativeEvent.contentOffset[state.props.horizontal ? "x" : "y"];
-  const ignoreScrollFromMVCP = state.ignoreScrollFromMVCP;
-  if (ignoreScrollFromMVCP && !state.scrollingTo) {
-    const { lt, gt } = ignoreScrollFromMVCP;
-    if (lt && newScroll < lt || gt && newScroll > gt) {
-      return;
-    }
-  }
   state.scrollPending = newScroll;
   updateScroll(ctx, state, newScroll);
   onScrollProp == null ? void 0 : onScrollProp(event);
@@ -2410,9 +2402,17 @@ function updateScroll(ctx, state, newScroll) {
   state.hasScrolled = true;
   state.lastBatchingAction = Date.now();
   const currentTime = Date.now();
+  const adjust = state.scrollAdjustHandler.getAdjust();
+  const lastHistoryAdjust = state.lastScrollAdjustForHistory;
+  const adjustChanged = lastHistoryAdjust !== void 0 && Math.abs(adjust - lastHistoryAdjust) > 0.1;
+  if (adjustChanged) {
+    state.scrollHistory.length = 0;
+  }
+  state.lastScrollAdjustForHistory = adjust;
   if (scrollingTo === void 0 && !(state.scrollHistory.length === 0 && newScroll === state.scroll)) {
-    const adjust = state.scrollAdjustHandler.getAdjust();
-    state.scrollHistory.push({ scroll: newScroll - adjust, time: currentTime });
+    if (!adjustChanged) {
+      state.scrollHistory.push({ scroll: newScroll, time: currentTime });
+    }
   }
   if (state.scrollHistory.length > 5) {
     state.scrollHistory.shift();
@@ -2421,8 +2421,15 @@ function updateScroll(ctx, state, newScroll) {
   state.scrollPrevTime = state.scrollTime;
   state.scroll = newScroll;
   state.scrollTime = currentTime;
+  const ignoreScrollFromMVCP = state.ignoreScrollFromMVCP;
+  if (ignoreScrollFromMVCP && !state.scrollingTo) {
+    const { lt, gt } = ignoreScrollFromMVCP;
+    if (lt && newScroll < lt || gt && newScroll > gt) {
+      return;
+    }
+  }
   if (state.dataChangeNeedsScrollUpdate || Math.abs(state.scroll - state.scrollPrev) > 2) {
-    calculateItemsInView(ctx, state);
+    calculateItemsInView(ctx, state, { doMVCP: state.scrollingTo !== void 0 });
     checkAtBottom(ctx, state);
     checkAtTop(state);
     state.dataChangeNeedsScrollUpdate = false;
@@ -2463,7 +2470,6 @@ function updateItemSize(ctx, state, itemKey, sizeObj) {
       getFixedItemSize,
       getItemType,
       horizontal,
-      maintainVisibleContentPosition,
       suggestEstimatedItemSize,
       onItemSizeChanged,
       data,

package/package.json

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

package/reanimated.d.mts

@@ -1,17 +1,18 @@
-import React__default, { ComponentProps } from 'react';
+import * as React from 'react';
+import { ComponentProps } from 'react';
 import Animated from 'react-native-reanimated';
 import { LegendListPropsBase, LegendListRef } from '@legendapp/list';
 
 type KeysToOmit = "getEstimatedItemSize" | "getFixedItemSize" | "getItemType" | "keyExtractor" | "animatedProps" | "renderItem" | "onItemSizeChanged" | "itemsAreEqual" | "ItemSeparatorComponent";
 type PropsBase<ItemT> = LegendListPropsBase<ItemT, ComponentProps<typeof Animated.ScrollView>>;
 interface AnimatedLegendListPropsBase<ItemT> extends Omit<PropsBase<ItemT>, KeysToOmit> {
-    refScrollView?: React__default.Ref<Animated.ScrollView>;
+    refScrollView?: React.Ref<Animated.ScrollView>;
 }
 type OtherAnimatedLegendListProps<ItemT> = Pick<PropsBase<ItemT>, KeysToOmit>;
 type AnimatedLegendListProps<ItemT> = Omit<AnimatedLegendListPropsBase<ItemT>, "refLegendList" | "ref"> & OtherAnimatedLegendListProps<ItemT>;
 type AnimatedLegendListDefinition = <ItemT>(props: AnimatedLegendListProps<ItemT> & {
-    ref?: React__default.Ref<LegendListRef>;
-}) => React__default.ReactElement | null;
+    ref?: React.Ref<LegendListRef>;
+}) => React.ReactElement | null;
 declare const AnimatedLegendList: AnimatedLegendListDefinition;
 
 export { AnimatedLegendList, type AnimatedLegendListProps, type AnimatedLegendListPropsBase };

package/reanimated.d.ts

@@ -1,17 +1,18 @@
-import React__default, { ComponentProps } from 'react';
+import * as React from 'react';
+import { ComponentProps } from 'react';
 import Animated from 'react-native-reanimated';
 import { LegendListPropsBase, LegendListRef } from '@legendapp/list';
 
 type KeysToOmit = "getEstimatedItemSize" | "getFixedItemSize" | "getItemType" | "keyExtractor" | "animatedProps" | "renderItem" | "onItemSizeChanged" | "itemsAreEqual" | "ItemSeparatorComponent";
 type PropsBase<ItemT> = LegendListPropsBase<ItemT, ComponentProps<typeof Animated.ScrollView>>;
 interface AnimatedLegendListPropsBase<ItemT> extends Omit<PropsBase<ItemT>, KeysToOmit> {
-    refScrollView?: React__default.Ref<Animated.ScrollView>;
+    refScrollView?: React.Ref<Animated.ScrollView>;
 }
 type OtherAnimatedLegendListProps<ItemT> = Pick<PropsBase<ItemT>, KeysToOmit>;
 type AnimatedLegendListProps<ItemT> = Omit<AnimatedLegendListPropsBase<ItemT>, "refLegendList" | "ref"> & OtherAnimatedLegendListProps<ItemT>;
 type AnimatedLegendListDefinition = <ItemT>(props: AnimatedLegendListProps<ItemT> & {
-    ref?: React__default.Ref<LegendListRef>;
-}) => React__default.ReactElement | null;
+    ref?: React.Ref<LegendListRef>;
+}) => React.ReactElement | null;
 declare const AnimatedLegendList: AnimatedLegendListDefinition;
 
 export { AnimatedLegendList, type AnimatedLegendListProps, type AnimatedLegendListPropsBase };

package/reanimated.js

@@ -6,7 +6,25 @@ var list = require('@legendapp/list');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var React__default = /*#__PURE__*/_interopDefault(React);
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n.default = e;
+  return Object.freeze(n);
+}
+
+var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var Animated__default = /*#__PURE__*/_interopDefault(Animated);
 
 // src/integrations/reanimated.tsx
@@ -36,7 +54,7 @@ var useCombinedRef = (...refs) => {
 // src/integrations/reanimated.tsx
 var typedMemo = React.memo;
 var LegendListForwardedRef = typedMemo(
-  React__default.default.forwardRef(function LegendListForwardedRef2(props, ref) {
+  React__namespace.forwardRef(function LegendListForwardedRef2(props, ref) {
     const { refLegendList, ...rest } = props;
     const refFn = React.useCallback(
       (r) => {
@@ -44,16 +62,16 @@ var LegendListForwardedRef = typedMemo(
       },
       [refLegendList]
     );
-    return /* @__PURE__ */ React__default.default.createElement(list.LegendList, { ref: refFn, refScrollView: ref, ...rest });
+    return /* @__PURE__ */ React__namespace.createElement(list.LegendList, { ref: refFn, refScrollView: ref, ...rest });
   })
 );
 var AnimatedLegendListComponent = Animated__default.default.createAnimatedComponent(LegendListForwardedRef);
 var AnimatedLegendList = typedMemo(
-  React__default.default.forwardRef(function AnimatedLegendList2(props, ref) {
+  React__namespace.forwardRef(function AnimatedLegendList2(props, ref) {
     const { refScrollView, ...rest } = props;
-    const refLegendList = React__default.default.useRef(null);
+    const refLegendList = React__namespace.useRef(null);
     const combinedRef = useCombinedRef(refLegendList, ref);
-    return /* @__PURE__ */ React__default.default.createElement(AnimatedLegendListComponent, { ref: refScrollView, refLegendList: combinedRef, ...rest });
+    return /* @__PURE__ */ React__namespace.createElement(AnimatedLegendListComponent, { ref: refScrollView, refLegendList: combinedRef, ...rest });
   })
 );
 

package/reanimated.mjs

@@ -1,4 +1,5 @@
-import React, { useCallback, memo } from 'react';
+import * as React from 'react';
+import { useCallback, memo } from 'react';
 import Animated from 'react-native-reanimated';
 import { LegendList } from '@legendapp/list';