@legendapp/list 3.0.0-beta.11 → 3.0.0-beta.13

package/section-list.js

@@ -1071,7 +1071,6 @@ var ListComponent = typedMemo(function ListComponent2({
   getRenderedItem: getRenderedItem2,
   updateItemSize: updateItemSize2,
   refScrollView,
-  maintainVisibleContentPosition,
   renderScrollComponent,
   scrollAdjustHandler,
   onLayoutHeader,
@@ -1080,6 +1079,7 @@ var ListComponent = typedMemo(function ListComponent2({
   ...rest
 }) {
   const ctx = useStateContext();
+  const maintainVisibleContentPosition = ctx.state.props.maintainVisibleContentPosition;
   const ScrollComponent = renderScrollComponent ? React3.useMemo(
     () => React3__namespace.forwardRef((props, ref) => renderScrollComponent({ ...props, ref })),
     [renderScrollComponent]
@@ -1097,7 +1097,7 @@ var ListComponent = typedMemo(function ListComponent2({
       ],
       contentOffset: initialContentOffset ? horizontal ? { x: initialContentOffset, y: 0 } : { x: 0, y: initialContentOffset } : void 0,
       horizontal,
-      maintainVisibleContentPosition: maintainVisibleContentPosition ? { minIndexForVisible: 0 } : void 0,
+      maintainVisibleContentPosition: maintainVisibleContentPosition.scroll || maintainVisibleContentPosition.dataChanged ? { minIndexForVisible: 0 } : void 0,
       onLayout,
       onScroll: onScroll2,
       ref: refScrollView,
@@ -1641,14 +1641,16 @@ function requestAdjust(ctx, positionDiff, dataChanged) {
 function prepareMVCP(ctx, dataChanged) {
   const state = ctx.state;
   const { idsInView, positions, props } = state;
-  const { maintainVisibleContentPosition } = props;
+  const {
+    maintainVisibleContentPosition: { dataChanged: mvcpdataChanged, scroll: mvcpScroll }
+  } = props;
   const scrollingTo = state.scrollingTo;
   let prevPosition;
   let targetId;
   const idsInViewWithPositions = [];
   const scrollTarget = scrollingTo == null ? void 0 : scrollingTo.index;
   const scrollingToViewPosition = scrollingTo == null ? void 0 : scrollingTo.viewPosition;
-  const shouldMVCP = !dataChanged || maintainVisibleContentPosition;
+  const shouldMVCP = dataChanged ? mvcpdataChanged : mvcpScroll;
   const indexByKey = state.indexByKey;
   if (shouldMVCP) {
     if (scrollTarget !== void 0) {
@@ -1671,7 +1673,7 @@ function prepareMVCP(ctx, dataChanged) {
     }
     return () => {
       let positionDiff = 0;
-      if (dataChanged && targetId === void 0 && maintainVisibleContentPosition) {
+      if (dataChanged && targetId === void 0 && mvcpdataChanged) {
         for (let i = 0; i < idsInViewWithPositions.length; i++) {
           const { id, position } = idsInViewWithPositions[i];
           const newPosition = positions.get(id);
@@ -1805,39 +1807,40 @@ function updateTotalSize(ctx) {
 // src/utils/getScrollVelocity.ts
 var getScrollVelocity = (state) => {
   const { scrollHistory } = state;
-  let velocity = 0;
-  if (scrollHistory.length >= 1) {
-    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];
-      if (i > 0) {
-        const prevEntry = scrollHistory[i - 1];
-        const prevDirection = entry.scroll - prevEntry.scroll;
-        const currentDirection = nextEntry.scroll - entry.scroll;
-        if (prevDirection > 0 && currentDirection < 0 || prevDirection < 0 && currentDirection > 0) {
-          start = i;
-          break;
-        }
-      }
+  const newestIndex = scrollHistory.length - 1;
+  if (newestIndex < 1) {
+    return 0;
+  }
+  const newest = scrollHistory[newestIndex];
+  const now = Date.now();
+  let direction = 0;
+  for (let i = newestIndex; i > 0; i--) {
+    const delta = scrollHistory[i].scroll - scrollHistory[i - 1].scroll;
+    if (delta !== 0) {
+      direction = Math.sign(delta);
+      break;
     }
-    for (let i = start; i < scrollHistory.length - 1; i++) {
-      const entry = scrollHistory[i];
-      if (now - entry.time <= 1e3) {
-        oldest = entry;
-        break;
-      }
+  }
+  if (direction === 0) {
+    return 0;
+  }
+  let oldest = newest;
+  for (let i = newestIndex - 1; i >= 0; i--) {
+    const current = scrollHistory[i];
+    const next = scrollHistory[i + 1];
+    const delta = next.scroll - current.scroll;
+    const deltaSign = Math.sign(delta);
+    if (deltaSign !== 0 && deltaSign !== direction) {
+      break;
     }
-    if (oldest && oldest !== newest) {
-      const scrollDiff = newest.scroll - oldest.scroll;
-      const timeDiff = newest.time - oldest.time;
-      velocity = timeDiff > 0 ? scrollDiff / timeDiff : 0;
+    if (now - current.time > 1e3) {
+      break;
     }
+    oldest = current;
   }
-  return velocity;
+  const scrollDiff = newest.scroll - oldest.scroll;
+  const timeDiff = newest.time - oldest.time;
+  return timeDiff > 0 ? scrollDiff / timeDiff : 0;
 };
 
 // src/utils/updateSnapToOffsets.ts
@@ -2767,7 +2770,7 @@ function checkFinishedScrollFrame(ctx) {
   if (scrollingTo) {
     const { state } = ctx;
     state.animFrameCheckFinishedScroll = void 0;
-    const scroll = state.scroll;
+    const scroll = state.scrollPending;
     const adjust = state.scrollAdjustHandler.getAdjust();
     const clampedTargetOffset = clampScrollOffset(ctx, scrollingTo.offset - (scrollingTo.viewOffset || 0));
     const maxOffset = clampScrollOffset(ctx, scroll);
@@ -3022,7 +3025,6 @@ function onScroll(ctx, event) {
     return;
   }
   let newScroll = event.nativeEvent.contentOffset[state.props.horizontal ? "x" : "y"];
-  state.scrollPending = newScroll;
   if (state.scrollingTo) {
     const maxOffset = clampScrollOffset(ctx, newScroll);
     if (newScroll !== maxOffset && Math.abs(newScroll - maxOffset) > 1) {
@@ -3036,8 +3038,11 @@ function onScroll(ctx, event) {
       return;
     }
   }
+  state.scrollPending = newScroll;
   updateScroll(ctx, newScroll);
-  checkFinishedScroll(ctx);
+  if (state.scrollingTo) {
+    checkFinishedScroll(ctx);
+  }
   onScrollProp == null ? void 0 : onScrollProp(event);
 }
 
@@ -3372,6 +3377,24 @@ function getRenderedItem(ctx, key) {
   }
   return { index, item: data[index], renderedItem };
 }
+
+// src/utils/normalizeMaintainVisibleContentPosition.ts
+function normalizeMaintainVisibleContentPosition(value) {
+  var _a3, _b;
+  if (value === true) {
+    return { dataChanged: true, scroll: true };
+  }
+  if (value && typeof value === "object") {
+    return {
+      dataChanged: (_a3 = value.dataChanged) != null ? _a3 : false,
+      scroll: (_b = value.scroll) != null ? _b : true
+    };
+  }
+  if (value === false) {
+    return { dataChanged: false, scroll: false };
+  }
+  return { dataChanged: false, scroll: true };
+}
 function useThrottleDebounce(mode) {
   const timeoutRef = React3.useRef(null);
   const lastCallTimeRef = React3.useRef(0);
@@ -3466,7 +3489,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     ListHeaderComponent,
     maintainScrollAtEnd = false,
     maintainScrollAtEndThreshold = 0.1,
-    maintainVisibleContentPosition = false,
+    maintainVisibleContentPosition: maintainVisibleContentPositionProp,
     numColumns: numColumnsProp = 1,
     onEndReached,
     onEndReachedThreshold = 0.5,
@@ -3504,6 +3527,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const style = { ...StyleSheet.flatten(styleProp) };
   const stylePaddingTopState = extractPadding(style, contentContainerStyle, "Top");
   const stylePaddingBottomState = extractPadding(style, contentContainerStyle, "Bottom");
+  const maintainVisibleContentPositionConfig = normalizeMaintainVisibleContentPosition(
+    maintainVisibleContentPositionProp
+  );
   const [renderNum, setRenderNum] = React3.useState(0);
   const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? { index: initialScrollIndexProp.index || 0, viewOffset: initialScrollIndexProp.viewOffset || 0 } : { index: initialScrollIndexProp || 0, viewOffset: initialScrollOffsetProp || 0 } : void 0;
   const [canRender, setCanRender] = React3__namespace.useState(!IsNewArchitecture);
@@ -3588,7 +3614,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       };
       const internalState = ctx.state;
       internalState.triggerCalculateItemsInView = (params) => calculateItemsInView(ctx, params);
-      set$(ctx, "maintainVisibleContentPosition", maintainVisibleContentPosition);
+      set$(ctx, "maintainVisibleContentPosition", maintainVisibleContentPositionConfig);
       set$(ctx, "extraData", extraData);
     }
     refState.current = ctx.state;
@@ -3619,7 +3645,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     keyExtractor,
     maintainScrollAtEnd,
     maintainScrollAtEndThreshold,
-    maintainVisibleContentPosition,
+    maintainVisibleContentPosition: maintainVisibleContentPositionConfig,
     numColumns: numColumnsProp,
     onEndReached,
     onEndReachedThreshold,
@@ -3654,7 +3680,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     setPaddingTop(ctx, { stylePaddingTop: stylePaddingTopState });
     refState.current.props.stylePaddingBottom = stylePaddingBottomState;
     let paddingDiff = stylePaddingTopState - prevPaddingTop;
-    if (paddingDiff && prevPaddingTop !== void 0 && Platform.OS === "ios") {
+    if (maintainVisibleContentPositionConfig.scroll && paddingDiff && prevPaddingTop !== void 0 && Platform.OS === "ios") {
       if (state.scroll < 0) {
         paddingDiff += state.scroll;
       }
@@ -3689,7 +3715,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       value = 0;
     }
     if (!value) {
-      state.didFinishInitialScroll = true;
+      setInitialRenderState(ctx, { didInitialScroll: true });
     }
     return value;
   }, [renderNum]);
@@ -3811,7 +3837,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       initialContentOffset,
       ListEmptyComponent: dataProp.length === 0 ? ListEmptyComponent : void 0,
       ListHeaderComponent,
-      maintainVisibleContentPosition,
       onLayout,
       onLayoutHeader,
       onMomentumScrollEnd: fns.onMomentumScrollEnd,

package/section-list.mjs

@@ -1050,7 +1050,6 @@ var ListComponent = typedMemo(function ListComponent2({
   getRenderedItem: getRenderedItem2,
   updateItemSize: updateItemSize2,
   refScrollView,
-  maintainVisibleContentPosition,
   renderScrollComponent,
   scrollAdjustHandler,
   onLayoutHeader,
@@ -1059,6 +1058,7 @@ var ListComponent = typedMemo(function ListComponent2({
   ...rest
 }) {
   const ctx = useStateContext();
+  const maintainVisibleContentPosition = ctx.state.props.maintainVisibleContentPosition;
   const ScrollComponent = renderScrollComponent ? useMemo(
     () => React3.forwardRef((props, ref) => renderScrollComponent({ ...props, ref })),
     [renderScrollComponent]
@@ -1076,7 +1076,7 @@ var ListComponent = typedMemo(function ListComponent2({
       ],
       contentOffset: initialContentOffset ? horizontal ? { x: initialContentOffset, y: 0 } : { x: 0, y: initialContentOffset } : void 0,
       horizontal,
-      maintainVisibleContentPosition: maintainVisibleContentPosition ? { minIndexForVisible: 0 } : void 0,
+      maintainVisibleContentPosition: maintainVisibleContentPosition.scroll || maintainVisibleContentPosition.dataChanged ? { minIndexForVisible: 0 } : void 0,
       onLayout,
       onScroll: onScroll2,
       ref: refScrollView,
@@ -1620,14 +1620,16 @@ function requestAdjust(ctx, positionDiff, dataChanged) {
 function prepareMVCP(ctx, dataChanged) {
   const state = ctx.state;
   const { idsInView, positions, props } = state;
-  const { maintainVisibleContentPosition } = props;
+  const {
+    maintainVisibleContentPosition: { dataChanged: mvcpdataChanged, scroll: mvcpScroll }
+  } = props;
   const scrollingTo = state.scrollingTo;
   let prevPosition;
   let targetId;
   const idsInViewWithPositions = [];
   const scrollTarget = scrollingTo == null ? void 0 : scrollingTo.index;
   const scrollingToViewPosition = scrollingTo == null ? void 0 : scrollingTo.viewPosition;
-  const shouldMVCP = !dataChanged || maintainVisibleContentPosition;
+  const shouldMVCP = dataChanged ? mvcpdataChanged : mvcpScroll;
   const indexByKey = state.indexByKey;
   if (shouldMVCP) {
     if (scrollTarget !== void 0) {
@@ -1650,7 +1652,7 @@ function prepareMVCP(ctx, dataChanged) {
     }
     return () => {
       let positionDiff = 0;
-      if (dataChanged && targetId === void 0 && maintainVisibleContentPosition) {
+      if (dataChanged && targetId === void 0 && mvcpdataChanged) {
         for (let i = 0; i < idsInViewWithPositions.length; i++) {
           const { id, position } = idsInViewWithPositions[i];
           const newPosition = positions.get(id);
@@ -1784,39 +1786,40 @@ function updateTotalSize(ctx) {
 // src/utils/getScrollVelocity.ts
 var getScrollVelocity = (state) => {
   const { scrollHistory } = state;
-  let velocity = 0;
-  if (scrollHistory.length >= 1) {
-    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];
-      if (i > 0) {
-        const prevEntry = scrollHistory[i - 1];
-        const prevDirection = entry.scroll - prevEntry.scroll;
-        const currentDirection = nextEntry.scroll - entry.scroll;
-        if (prevDirection > 0 && currentDirection < 0 || prevDirection < 0 && currentDirection > 0) {
-          start = i;
-          break;
-        }
-      }
+  const newestIndex = scrollHistory.length - 1;
+  if (newestIndex < 1) {
+    return 0;
+  }
+  const newest = scrollHistory[newestIndex];
+  const now = Date.now();
+  let direction = 0;
+  for (let i = newestIndex; i > 0; i--) {
+    const delta = scrollHistory[i].scroll - scrollHistory[i - 1].scroll;
+    if (delta !== 0) {
+      direction = Math.sign(delta);
+      break;
     }
-    for (let i = start; i < scrollHistory.length - 1; i++) {
-      const entry = scrollHistory[i];
-      if (now - entry.time <= 1e3) {
-        oldest = entry;
-        break;
-      }
+  }
+  if (direction === 0) {
+    return 0;
+  }
+  let oldest = newest;
+  for (let i = newestIndex - 1; i >= 0; i--) {
+    const current = scrollHistory[i];
+    const next = scrollHistory[i + 1];
+    const delta = next.scroll - current.scroll;
+    const deltaSign = Math.sign(delta);
+    if (deltaSign !== 0 && deltaSign !== direction) {
+      break;
     }
-    if (oldest && oldest !== newest) {
-      const scrollDiff = newest.scroll - oldest.scroll;
-      const timeDiff = newest.time - oldest.time;
-      velocity = timeDiff > 0 ? scrollDiff / timeDiff : 0;
+    if (now - current.time > 1e3) {
+      break;
     }
+    oldest = current;
   }
-  return velocity;
+  const scrollDiff = newest.scroll - oldest.scroll;
+  const timeDiff = newest.time - oldest.time;
+  return timeDiff > 0 ? scrollDiff / timeDiff : 0;
 };
 
 // src/utils/updateSnapToOffsets.ts
@@ -2746,7 +2749,7 @@ function checkFinishedScrollFrame(ctx) {
   if (scrollingTo) {
     const { state } = ctx;
     state.animFrameCheckFinishedScroll = void 0;
-    const scroll = state.scroll;
+    const scroll = state.scrollPending;
     const adjust = state.scrollAdjustHandler.getAdjust();
     const clampedTargetOffset = clampScrollOffset(ctx, scrollingTo.offset - (scrollingTo.viewOffset || 0));
     const maxOffset = clampScrollOffset(ctx, scroll);
@@ -3001,7 +3004,6 @@ function onScroll(ctx, event) {
     return;
   }
   let newScroll = event.nativeEvent.contentOffset[state.props.horizontal ? "x" : "y"];
-  state.scrollPending = newScroll;
   if (state.scrollingTo) {
     const maxOffset = clampScrollOffset(ctx, newScroll);
     if (newScroll !== maxOffset && Math.abs(newScroll - maxOffset) > 1) {
@@ -3015,8 +3017,11 @@ function onScroll(ctx, event) {
       return;
     }
   }
+  state.scrollPending = newScroll;
   updateScroll(ctx, newScroll);
-  checkFinishedScroll(ctx);
+  if (state.scrollingTo) {
+    checkFinishedScroll(ctx);
+  }
   onScrollProp == null ? void 0 : onScrollProp(event);
 }
 
@@ -3351,6 +3356,24 @@ function getRenderedItem(ctx, key) {
   }
   return { index, item: data[index], renderedItem };
 }
+
+// src/utils/normalizeMaintainVisibleContentPosition.ts
+function normalizeMaintainVisibleContentPosition(value) {
+  var _a3, _b;
+  if (value === true) {
+    return { dataChanged: true, scroll: true };
+  }
+  if (value && typeof value === "object") {
+    return {
+      dataChanged: (_a3 = value.dataChanged) != null ? _a3 : false,
+      scroll: (_b = value.scroll) != null ? _b : true
+    };
+  }
+  if (value === false) {
+    return { dataChanged: false, scroll: false };
+  }
+  return { dataChanged: false, scroll: true };
+}
 function useThrottleDebounce(mode) {
   const timeoutRef = useRef(null);
   const lastCallTimeRef = useRef(0);
@@ -3445,7 +3468,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     ListHeaderComponent,
     maintainScrollAtEnd = false,
     maintainScrollAtEndThreshold = 0.1,
-    maintainVisibleContentPosition = false,
+    maintainVisibleContentPosition: maintainVisibleContentPositionProp,
     numColumns: numColumnsProp = 1,
     onEndReached,
     onEndReachedThreshold = 0.5,
@@ -3483,6 +3506,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const style = { ...StyleSheet.flatten(styleProp) };
   const stylePaddingTopState = extractPadding(style, contentContainerStyle, "Top");
   const stylePaddingBottomState = extractPadding(style, contentContainerStyle, "Bottom");
+  const maintainVisibleContentPositionConfig = normalizeMaintainVisibleContentPosition(
+    maintainVisibleContentPositionProp
+  );
   const [renderNum, setRenderNum] = useState(0);
   const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? { index: initialScrollIndexProp.index || 0, viewOffset: initialScrollIndexProp.viewOffset || 0 } : { index: initialScrollIndexProp || 0, viewOffset: initialScrollOffsetProp || 0 } : void 0;
   const [canRender, setCanRender] = React3.useState(!IsNewArchitecture);
@@ -3567,7 +3593,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       };
       const internalState = ctx.state;
       internalState.triggerCalculateItemsInView = (params) => calculateItemsInView(ctx, params);
-      set$(ctx, "maintainVisibleContentPosition", maintainVisibleContentPosition);
+      set$(ctx, "maintainVisibleContentPosition", maintainVisibleContentPositionConfig);
       set$(ctx, "extraData", extraData);
     }
     refState.current = ctx.state;
@@ -3598,7 +3624,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     keyExtractor,
     maintainScrollAtEnd,
     maintainScrollAtEndThreshold,
-    maintainVisibleContentPosition,
+    maintainVisibleContentPosition: maintainVisibleContentPositionConfig,
     numColumns: numColumnsProp,
     onEndReached,
     onEndReachedThreshold,
@@ -3633,7 +3659,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     setPaddingTop(ctx, { stylePaddingTop: stylePaddingTopState });
     refState.current.props.stylePaddingBottom = stylePaddingBottomState;
     let paddingDiff = stylePaddingTopState - prevPaddingTop;
-    if (paddingDiff && prevPaddingTop !== void 0 && Platform.OS === "ios") {
+    if (maintainVisibleContentPositionConfig.scroll && paddingDiff && prevPaddingTop !== void 0 && Platform.OS === "ios") {
       if (state.scroll < 0) {
         paddingDiff += state.scroll;
       }
@@ -3668,7 +3694,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       value = 0;
     }
     if (!value) {
-      state.didFinishInitialScroll = true;
+      setInitialRenderState(ctx, { didInitialScroll: true });
     }
     return value;
   }, [renderNum]);
@@ -3790,7 +3816,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       initialContentOffset,
       ListEmptyComponent: dataProp.length === 0 ? ListEmptyComponent : void 0,
       ListHeaderComponent,
-      maintainVisibleContentPosition,
       onLayout,
       onLayoutHeader,
       onMomentumScrollEnd: fns.onMomentumScrollEnd,

package/section-list.native.d.mts

@@ -1,7 +1,7 @@
 import * as react_native from 'react-native';
 import { SectionListData, SectionBase, SectionListRenderItemInfo, SectionListScrollParams } from 'react-native';
 import * as React from 'react';
-import { a as LegendListRef, L as LegendListProps } from './types-1Hgg1rTO.mjs';
+import { a as LegendListRef, L as LegendListProps } from './types-BSoW8ni4.mjs';
 import 'react-native-reanimated';
 
 type SectionListSeparatorProps<ItemT, SectionT> = {

package/section-list.native.d.ts

@@ -1,7 +1,7 @@
 import * as react_native from 'react-native';
 import { SectionListData, SectionBase, SectionListRenderItemInfo, SectionListScrollParams } from 'react-native';
 import * as React from 'react';
-import { a as LegendListRef, L as LegendListProps } from './types-1Hgg1rTO.js';
+import { a as LegendListRef, L as LegendListProps } from './types-BSoW8ni4.js';
 import 'react-native-reanimated';
 
 type SectionListSeparatorProps<ItemT, SectionT> = {