@legendapp/list 1.0.0-beta.12 → 1.0.0-beta.14

package/index.d.mts

@@ -7,12 +7,15 @@ import Animated from 'react-native-reanimated';
 declare class ScrollAdjustHandler {
     private ctx;
     private appliedAdjust;
-    private pendingAdjust;
     private busy;
     private context;
+    private isPaused;
     constructor(ctx: any);
+    private doAjdust;
     requestAdjust(adjust: number, onAdjusted: (diff: number) => void): void;
     getAppliedAdjust(): number;
+    pauseAdjust(): void;
+    unPauseAdjust(): boolean;
 }
 
 type LegendListPropsBase<ItemT, TScrollView extends ComponentProps<typeof ScrollView> | ComponentProps<typeof Animated.ScrollView>> = Omit<TScrollView, "contentOffset" | "contentInset" | "maintainVisibleContentPosition" | "stickyHeaderIndices"> & {

package/index.d.ts

@@ -7,12 +7,15 @@ import Animated from 'react-native-reanimated';
 declare class ScrollAdjustHandler {
     private ctx;
     private appliedAdjust;
-    private pendingAdjust;
     private busy;
     private context;
+    private isPaused;
     constructor(ctx: any);
+    private doAjdust;
     requestAdjust(adjust: number, onAdjusted: (diff: number) => void): void;
     getAppliedAdjust(): number;
+    pauseAdjust(): void;
+    unPauseAdjust(): boolean;
 }
 
 type LegendListPropsBase<ItemT, TScrollView extends ComponentProps<typeof ScrollView> | ComponentProps<typeof Animated.ScrollView>> = Omit<TScrollView, "contentOffset" | "contentInset" | "maintainVisibleContentPosition" | "stickyHeaderIndices"> & {

package/index.js

@@ -191,10 +191,11 @@ function useInterval(callback, delay) {
     return () => clearInterval(interval);
   }, [delay]);
 }
-var LeanView = React6__namespace.forwardRef((props, ref) => {
+var LeanViewComponent = React6__namespace.forwardRef((props, ref) => {
   return React6__namespace.createElement("RCTView", { ...props, ref });
 });
-LeanView.displayName = "RCTView";
+LeanViewComponent.displayName = "RCTView";
+var LeanView = reactNative.Platform.OS === "android" || reactNative.Platform.OS === "ios" ? LeanViewComponent : reactNative.View;
 
 // src/constants.ts
 var POSITION_OUT_OF_VIEW = -1e7;
@@ -288,6 +289,8 @@ var Container = ({
 var useAnimatedValue = reactNative.useAnimatedValue || ((initialValue) => {
   return React6.useRef(new reactNative.Animated.Value(initialValue)).current;
 });
+
+// src/useValue$.ts
 function useValue$(key, getValue, useMicrotask) {
   var _a;
   const ctx = useStateContext();
@@ -491,30 +494,41 @@ var ScrollAdjustHandler = class {
   constructor(ctx) {
     this.ctx = ctx;
     this.appliedAdjust = 0;
-    this.pendingAdjust = 0;
     this.busy = false;
+    this.isPaused = false;
     this.context = ctx;
   }
+  doAjdust() {
+    set$(this.context, "scrollAdjust", this.appliedAdjust);
+    this.busy = false;
+  }
   requestAdjust(adjust, onAdjusted) {
     const oldAdjustTop = peek$(this.context, "scrollAdjust");
     if (oldAdjustTop === adjust) {
       return;
     }
     this.appliedAdjust = adjust;
-    this.pendingAdjust = adjust;
-    const doAjdust = () => {
-      set$(this.context, "scrollAdjust", this.pendingAdjust);
-      onAdjusted(oldAdjustTop - this.pendingAdjust);
-      this.busy = false;
-    };
-    if (!this.busy) {
+    if (!this.busy && !this.isPaused) {
       this.busy = true;
-      doAjdust();
+      this.doAjdust();
+      onAdjusted(oldAdjustTop - adjust);
     }
   }
   getAppliedAdjust() {
     return this.appliedAdjust;
   }
+  pauseAdjust() {
+    this.isPaused = true;
+  }
+  // return true if it was paused
+  unPauseAdjust() {
+    if (this.isPaused) {
+      this.isPaused = false;
+      this.doAjdust();
+      return true;
+    }
+    return false;
+  }
 };
 var typedForwardRef = React6.forwardRef;
 var useCombinedRef = (...refs) => {
@@ -687,7 +701,7 @@ var LegendList = typedForwardRef(function LegendList2(props, forwardedRef) {
   return /* @__PURE__ */ React6__namespace.createElement(StateProvider, null, /* @__PURE__ */ React6__namespace.createElement(LegendListInner, { ...props, ref: forwardedRef }));
 });
 var LegendListInner = typedForwardRef(function LegendListInner2(props, forwardedRef) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d;
   const {
     data: dataProp,
     initialScrollIndex,
@@ -702,6 +716,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     alignItemsAtEnd = false,
     maintainVisibleContentPosition = false,
     onScroll: onScrollProp,
+    onMomentumScrollEnd,
     numColumns: numColumnsProp = 1,
     keyExtractor: keyExtractorProp,
     renderItem,
@@ -748,13 +763,20 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     refState.current.sizes.set(key, size);
     return size;
   };
-  const calculateInitialOffset = (index = initialScrollIndex) => {
+  const calculateOffsetForIndex = (index = initialScrollIndex) => {
     const data = dataProp;
     if (index) {
       let offset = 0;
-      if (getEstimatedItemSize) {
+      const canGetSize = !!refState.current;
+      if (canGetSize || getEstimatedItemSize) {
+        const sizeFn = (index2) => {
+          if (canGetSize) {
+            return getItemSize(getId(index2), index2, data[index2]);
+          }
+          return getEstimatedItemSize(index2, data[index2]);
+        };
         for (let i = 0; i < index; i++) {
-          offset += getEstimatedItemSize(i, data[i]);
+          offset += sizeFn(i);
         }
       } else if (estimatedItemSize) {
         offset = index * estimatedItemSize;
@@ -763,7 +785,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
     return 0;
   };
-  const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : React6.useMemo(calculateInitialOffset, []);
+  const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : React6.useMemo(calculateOffsetForIndex, []);
   if (!refState.current) {
     const initialScrollLength = reactNative.Dimensions.get("window")[horizontal ? "width" : "height"];
     refState.current = {
@@ -915,17 +937,20 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     return map;
   };
   const getElementPositionBelowAchor = (id) => {
+    var _a2;
     const state = refState.current;
     if (!refState.current.belowAnchorElementPositions) {
       state.belowAnchorElementPositions = buildElementPositionsBelowAnchor();
     }
     const res = state.belowAnchorElementPositions.get(id);
     if (res === void 0) {
-      throw new Error("Undefined position below achor");
+      console.warn(`Undefined position below achor ${id} ${(_a2 = state.anchorElement) == null ? void 0 : _a2.id}`);
+      return 0;
     }
     return res;
   };
   const calculateItemsInView = React6.useCallback((speed) => {
+    var _a2;
     const state = refState.current;
     const {
       data,
@@ -1003,14 +1028,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     let column = 1;
     let maxSizeInRow = 0;
     const getInitialTop = (i) => {
-      var _a2;
+      var _a3;
       const id = getId(i);
       let topOffset = 0;
       if (positions.get(id)) {
         topOffset = positions.get(id);
       }
-      if (id === ((_a2 = state.anchorElement) == null ? void 0 : _a2.id)) {
-        topOffset = initialContentOffset || 0;
+      if (id === ((_a3 = state.anchorElement) == null ? void 0 : _a3.id)) {
+        topOffset = state.anchorElement.coordinate;
       }
       return topOffset;
     };
@@ -1018,7 +1043,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       const id = getId(i);
       const size = getItemSize(id, i, data[i]);
       maxSizeInRow = Math.max(maxSizeInRow, size);
-      if (top === void 0) {
+      if (top === void 0 || id === ((_a2 = state.anchorElement) == null ? void 0 : _a2.id)) {
         top = getInitialTop(i);
       }
       if (positions.get(id) !== top) {
@@ -1284,18 +1309,17 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
     }
   };
-  const isFirst = !refState.current.renderItem;
-  if (isFirst || dataProp !== refState.current.data || numColumnsProp !== peek$(ctx, "numColumns")) {
-    if (!keyExtractorProp && !isFirst && dataProp !== refState.current.data) {
-      refState.current.positions.clear();
-    }
-    refState.current.data = dataProp;
+  const calcTotalSizesAndPositions = ({ forgetPositions = false }) => {
+    var _a2, _b2, _c2;
     let totalSize = 0;
     let totalSizeBelowIndex = 0;
     const indexByKey = /* @__PURE__ */ new Map();
     const newPositions = /* @__PURE__ */ new Map();
     let column = 1;
     let maxSizeInRow = 0;
+    if (!refState.current) {
+      return;
+    }
     for (let i = 0; i < dataProp.length; i++) {
       const key = getId(i);
       if (__DEV__) {
@@ -1306,13 +1330,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         }
       }
       indexByKey.set(key, i);
-      if (refState.current.positions.get(key) != null && refState.current.indexByKey.get(key) === i) {
+      if (!forgetPositions && refState.current.positions.get(key) != null && refState.current.indexByKey.get(key) === i) {
         newPositions.set(key, refState.current.positions.get(key));
       }
     }
     refState.current.indexByKey = indexByKey;
     refState.current.positions = newPositions;
-    if (!isFirst) {
+    if (!forgetPositions && !isFirst) {
       if (maintainVisibleContentPosition) {
         if (refState.current.anchorElement == null || indexByKey.get(refState.current.anchorElement.id) == null) {
           if (dataProp.length) {
@@ -1321,8 +1345,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
               id: getId(0)
             };
             refState.current.anchorElement = newAnchorElement;
-            (_a = refState.current.belowAnchorElementPositions) == null ? void 0 : _a.clear();
-            (_b = refScroller.current) == null ? void 0 : _b.scrollTo({ x: 0, y: 0, animated: false });
+            (_a2 = refState.current.belowAnchorElementPositions) == null ? void 0 : _a2.clear();
+            (_b2 = refScroller.current) == null ? void 0 : _b2.scrollTo({ x: 0, y: 0, animated: false });
             setTimeout(() => {
               calculateItemsInView(0);
             }, 0);
@@ -1337,7 +1361,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
           } else {
             refState.current.startBufferedId = void 0;
           }
-          (_c = refScroller.current) == null ? void 0 : _c.scrollTo({ x: 0, y: 0, animated: false });
+          (_c2 = refScroller.current) == null ? void 0 : _c2.scrollTo({ x: 0, y: 0, animated: false });
           setTimeout(() => {
             calculateItemsInView(0);
           }, 0);
@@ -1363,6 +1387,21 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       totalSize += maxSizeInRow;
     }
     addTotalSize(null, totalSize, totalSizeBelowIndex);
+  };
+  const isFirst = !refState.current.renderItem;
+  if (isFirst || dataProp !== refState.current.data || numColumnsProp !== peek$(ctx, "numColumns")) {
+    if (!keyExtractorProp && !isFirst && dataProp !== refState.current.data) {
+      refState.current.sizes.clear();
+      refState.current.positions.clear();
+    }
+    refState.current.data = dataProp;
+    const indexByKey = /* @__PURE__ */ new Map();
+    for (let i = 0; i < dataProp.length; i++) {
+      const key = getId(i);
+      indexByKey.set(key, i);
+    }
+    refState.current.indexByKey = indexByKey;
+    calcTotalSizesAndPositions({ forgetPositions: false });
   }
   React6.useEffect(() => {
     checkResetContainers(
@@ -1375,7 +1414,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   }, [extraData]);
   refState.current.renderItem = renderItem;
   const lastItemKey = dataProp.length > 0 ? getId(dataProp.length - 1) : void 0;
-  const stylePaddingTop = (_g = (_f = (_d = reactNative.StyleSheet.flatten(style)) == null ? void 0 : _d.paddingTop) != null ? _f : (_e = reactNative.StyleSheet.flatten(contentContainerStyle)) == null ? void 0 : _e.paddingTop) != null ? _g : 0;
+  const stylePaddingTop = (_d = (_c = (_a = reactNative.StyleSheet.flatten(style)) == null ? void 0 : _a.paddingTop) != null ? _c : (_b = reactNative.StyleSheet.flatten(contentContainerStyle)) == null ? void 0 : _b.paddingTop) != null ? _d : 0;
   const initalizeStateVars = () => {
     set$(ctx, "lastItemKey", lastItemKey);
     set$(ctx, "numColumns", numColumnsProp);
@@ -1579,10 +1618,42 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   React6.useImperativeHandle(
     forwardedRef,
     () => {
-      const scrollToIndex = ({ index, animated }) => {
-        const offsetObj = calculateInitialOffset(index);
-        const offset = horizontal ? { x: offsetObj, y: 0 } : { x: 0, y: offsetObj };
-        refScroller.current.scrollTo({ ...offset, animated });
+      const scrollToIndex = ({ index, animated = true }) => {
+        var _a2;
+        const state = refState.current;
+        const firstIndexOffset = calculateOffsetForIndex(index);
+        let firstIndexScrollPostion = firstIndexOffset;
+        if (maintainVisibleContentPosition) {
+          const id = getId(index);
+          state.anchorElement = { id, coordinate: firstIndexOffset };
+          (_a2 = state.belowAnchorElementPositions) == null ? void 0 : _a2.clear();
+          state.positions.clear();
+          calcTotalSizesAndPositions({ forgetPositions: true });
+          state.scrollForNextCalculateItemsInView = void 0;
+          state.startBufferedId = id;
+          state.minIndexSizeChanged = index;
+          firstIndexScrollPostion = firstIndexOffset + state.scrollAdjustHandler.getAppliedAdjust();
+          state.scrollAdjustHandler.pauseAdjust();
+          setTimeout(
+            () => {
+              const wasAdjusted = state.scrollAdjustHandler.unPauseAdjust();
+              if (wasAdjusted) {
+                refState.current.scrollVelocity = 0;
+                refState.current.scrollHistory = [];
+                calculateItemsInView(0);
+              }
+            },
+            animated ? 1e3 : 50
+          );
+        }
+        const offset = horizontal ? { x: firstIndexScrollPostion, y: 0 } : { x: 0, y: firstIndexScrollPostion };
+        if (maintainVisibleContentPosition) {
+          setTimeout(() => {
+            refScroller.current.scrollTo({ ...offset, animated });
+          }, 50);
+        } else {
+          refScroller.current.scrollTo({ ...offset, animated });
+        }
       };
       return {
         getNativeScrollRef: () => refScroller.current,
@@ -1616,6 +1687,17 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       getRenderedItem,
       updateItemSize,
       handleScroll,
+      onMomentumScrollEnd: (event) => {
+        const wasPaused = refState.current.scrollAdjustHandler.unPauseAdjust();
+        if (wasPaused) {
+          refState.current.scrollVelocity = 0;
+          refState.current.scrollHistory = [];
+          calculateItemsInView(0);
+        }
+        if (onMomentumScrollEnd) {
+          onMomentumScrollEnd(event);
+        }
+      },
       onLayout,
       recycleItems,
       alignItemsAtEnd,

package/index.mjs

@@ -1,6 +1,6 @@
 import * as React6 from 'react';
 import React6__default, { createContext, memo, useReducer, useEffect, useMemo, useRef, useCallback, useImperativeHandle, useSyncExternalStore, useContext, useState, forwardRef, useLayoutEffect } from 'react';
-import { View, Text, Animated, ScrollView, Dimensions, StyleSheet, Platform, useAnimatedValue as useAnimatedValue$1 } from 'react-native';
+import { View, Text, Platform, Animated, ScrollView, Dimensions, StyleSheet, useAnimatedValue as useAnimatedValue$1 } from 'react-native';
 
 // src/LegendList.tsx
 var ContextState = React6.createContext(null);
@@ -170,10 +170,11 @@ function useInterval(callback, delay) {
     return () => clearInterval(interval);
   }, [delay]);
 }
-var LeanView = React6.forwardRef((props, ref) => {
+var LeanViewComponent = React6.forwardRef((props, ref) => {
   return React6.createElement("RCTView", { ...props, ref });
 });
-LeanView.displayName = "RCTView";
+LeanViewComponent.displayName = "RCTView";
+var LeanView = Platform.OS === "android" || Platform.OS === "ios" ? LeanViewComponent : View;
 
 // src/constants.ts
 var POSITION_OUT_OF_VIEW = -1e7;
@@ -267,6 +268,8 @@ var Container = ({
 var useAnimatedValue = useAnimatedValue$1 || ((initialValue) => {
   return useRef(new Animated.Value(initialValue)).current;
 });
+
+// src/useValue$.ts
 function useValue$(key, getValue, useMicrotask) {
   var _a;
   const ctx = useStateContext();
@@ -470,30 +473,41 @@ var ScrollAdjustHandler = class {
   constructor(ctx) {
     this.ctx = ctx;
     this.appliedAdjust = 0;
-    this.pendingAdjust = 0;
     this.busy = false;
+    this.isPaused = false;
     this.context = ctx;
   }
+  doAjdust() {
+    set$(this.context, "scrollAdjust", this.appliedAdjust);
+    this.busy = false;
+  }
   requestAdjust(adjust, onAdjusted) {
     const oldAdjustTop = peek$(this.context, "scrollAdjust");
     if (oldAdjustTop === adjust) {
       return;
     }
     this.appliedAdjust = adjust;
-    this.pendingAdjust = adjust;
-    const doAjdust = () => {
-      set$(this.context, "scrollAdjust", this.pendingAdjust);
-      onAdjusted(oldAdjustTop - this.pendingAdjust);
-      this.busy = false;
-    };
-    if (!this.busy) {
+    if (!this.busy && !this.isPaused) {
       this.busy = true;
-      doAjdust();
+      this.doAjdust();
+      onAdjusted(oldAdjustTop - adjust);
     }
   }
   getAppliedAdjust() {
     return this.appliedAdjust;
   }
+  pauseAdjust() {
+    this.isPaused = true;
+  }
+  // return true if it was paused
+  unPauseAdjust() {
+    if (this.isPaused) {
+      this.isPaused = false;
+      this.doAjdust();
+      return true;
+    }
+    return false;
+  }
 };
 var typedForwardRef = forwardRef;
 var useCombinedRef = (...refs) => {
@@ -666,7 +680,7 @@ var LegendList = typedForwardRef(function LegendList2(props, forwardedRef) {
   return /* @__PURE__ */ React6.createElement(StateProvider, null, /* @__PURE__ */ React6.createElement(LegendListInner, { ...props, ref: forwardedRef }));
 });
 var LegendListInner = typedForwardRef(function LegendListInner2(props, forwardedRef) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d;
   const {
     data: dataProp,
     initialScrollIndex,
@@ -681,6 +695,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     alignItemsAtEnd = false,
     maintainVisibleContentPosition = false,
     onScroll: onScrollProp,
+    onMomentumScrollEnd,
     numColumns: numColumnsProp = 1,
     keyExtractor: keyExtractorProp,
     renderItem,
@@ -727,13 +742,20 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     refState.current.sizes.set(key, size);
     return size;
   };
-  const calculateInitialOffset = (index = initialScrollIndex) => {
+  const calculateOffsetForIndex = (index = initialScrollIndex) => {
     const data = dataProp;
     if (index) {
       let offset = 0;
-      if (getEstimatedItemSize) {
+      const canGetSize = !!refState.current;
+      if (canGetSize || getEstimatedItemSize) {
+        const sizeFn = (index2) => {
+          if (canGetSize) {
+            return getItemSize(getId(index2), index2, data[index2]);
+          }
+          return getEstimatedItemSize(index2, data[index2]);
+        };
         for (let i = 0; i < index; i++) {
-          offset += getEstimatedItemSize(i, data[i]);
+          offset += sizeFn(i);
         }
       } else if (estimatedItemSize) {
         offset = index * estimatedItemSize;
@@ -742,7 +764,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     }
     return 0;
   };
-  const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : useMemo(calculateInitialOffset, []);
+  const initialContentOffset = initialScrollOffset != null ? initialScrollOffset : useMemo(calculateOffsetForIndex, []);
   if (!refState.current) {
     const initialScrollLength = Dimensions.get("window")[horizontal ? "width" : "height"];
     refState.current = {
@@ -894,17 +916,20 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     return map;
   };
   const getElementPositionBelowAchor = (id) => {
+    var _a2;
     const state = refState.current;
     if (!refState.current.belowAnchorElementPositions) {
       state.belowAnchorElementPositions = buildElementPositionsBelowAnchor();
     }
     const res = state.belowAnchorElementPositions.get(id);
     if (res === void 0) {
-      throw new Error("Undefined position below achor");
+      console.warn(`Undefined position below achor ${id} ${(_a2 = state.anchorElement) == null ? void 0 : _a2.id}`);
+      return 0;
     }
     return res;
   };
   const calculateItemsInView = useCallback((speed) => {
+    var _a2;
     const state = refState.current;
     const {
       data,
@@ -982,14 +1007,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     let column = 1;
     let maxSizeInRow = 0;
     const getInitialTop = (i) => {
-      var _a2;
+      var _a3;
       const id = getId(i);
       let topOffset = 0;
       if (positions.get(id)) {
         topOffset = positions.get(id);
       }
-      if (id === ((_a2 = state.anchorElement) == null ? void 0 : _a2.id)) {
-        topOffset = initialContentOffset || 0;
+      if (id === ((_a3 = state.anchorElement) == null ? void 0 : _a3.id)) {
+        topOffset = state.anchorElement.coordinate;
       }
       return topOffset;
     };
@@ -997,7 +1022,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       const id = getId(i);
       const size = getItemSize(id, i, data[i]);
       maxSizeInRow = Math.max(maxSizeInRow, size);
-      if (top === void 0) {
+      if (top === void 0 || id === ((_a2 = state.anchorElement) == null ? void 0 : _a2.id)) {
         top = getInitialTop(i);
       }
       if (positions.get(id) !== top) {
@@ -1263,18 +1288,17 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
     }
   };
-  const isFirst = !refState.current.renderItem;
-  if (isFirst || dataProp !== refState.current.data || numColumnsProp !== peek$(ctx, "numColumns")) {
-    if (!keyExtractorProp && !isFirst && dataProp !== refState.current.data) {
-      refState.current.positions.clear();
-    }
-    refState.current.data = dataProp;
+  const calcTotalSizesAndPositions = ({ forgetPositions = false }) => {
+    var _a2, _b2, _c2;
     let totalSize = 0;
     let totalSizeBelowIndex = 0;
     const indexByKey = /* @__PURE__ */ new Map();
     const newPositions = /* @__PURE__ */ new Map();
     let column = 1;
     let maxSizeInRow = 0;
+    if (!refState.current) {
+      return;
+    }
     for (let i = 0; i < dataProp.length; i++) {
       const key = getId(i);
       if (__DEV__) {
@@ -1285,13 +1309,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         }
       }
       indexByKey.set(key, i);
-      if (refState.current.positions.get(key) != null && refState.current.indexByKey.get(key) === i) {
+      if (!forgetPositions && refState.current.positions.get(key) != null && refState.current.indexByKey.get(key) === i) {
         newPositions.set(key, refState.current.positions.get(key));
       }
     }
     refState.current.indexByKey = indexByKey;
     refState.current.positions = newPositions;
-    if (!isFirst) {
+    if (!forgetPositions && !isFirst) {
       if (maintainVisibleContentPosition) {
         if (refState.current.anchorElement == null || indexByKey.get(refState.current.anchorElement.id) == null) {
           if (dataProp.length) {
@@ -1300,8 +1324,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
               id: getId(0)
             };
             refState.current.anchorElement = newAnchorElement;
-            (_a = refState.current.belowAnchorElementPositions) == null ? void 0 : _a.clear();
-            (_b = refScroller.current) == null ? void 0 : _b.scrollTo({ x: 0, y: 0, animated: false });
+            (_a2 = refState.current.belowAnchorElementPositions) == null ? void 0 : _a2.clear();
+            (_b2 = refScroller.current) == null ? void 0 : _b2.scrollTo({ x: 0, y: 0, animated: false });
             setTimeout(() => {
               calculateItemsInView(0);
             }, 0);
@@ -1316,7 +1340,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
           } else {
             refState.current.startBufferedId = void 0;
           }
-          (_c = refScroller.current) == null ? void 0 : _c.scrollTo({ x: 0, y: 0, animated: false });
+          (_c2 = refScroller.current) == null ? void 0 : _c2.scrollTo({ x: 0, y: 0, animated: false });
           setTimeout(() => {
             calculateItemsInView(0);
           }, 0);
@@ -1342,6 +1366,21 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       totalSize += maxSizeInRow;
     }
     addTotalSize(null, totalSize, totalSizeBelowIndex);
+  };
+  const isFirst = !refState.current.renderItem;
+  if (isFirst || dataProp !== refState.current.data || numColumnsProp !== peek$(ctx, "numColumns")) {
+    if (!keyExtractorProp && !isFirst && dataProp !== refState.current.data) {
+      refState.current.sizes.clear();
+      refState.current.positions.clear();
+    }
+    refState.current.data = dataProp;
+    const indexByKey = /* @__PURE__ */ new Map();
+    for (let i = 0; i < dataProp.length; i++) {
+      const key = getId(i);
+      indexByKey.set(key, i);
+    }
+    refState.current.indexByKey = indexByKey;
+    calcTotalSizesAndPositions({ forgetPositions: false });
   }
   useEffect(() => {
     checkResetContainers(
@@ -1354,7 +1393,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   }, [extraData]);
   refState.current.renderItem = renderItem;
   const lastItemKey = dataProp.length > 0 ? getId(dataProp.length - 1) : void 0;
-  const stylePaddingTop = (_g = (_f = (_d = StyleSheet.flatten(style)) == null ? void 0 : _d.paddingTop) != null ? _f : (_e = StyleSheet.flatten(contentContainerStyle)) == null ? void 0 : _e.paddingTop) != null ? _g : 0;
+  const stylePaddingTop = (_d = (_c = (_a = StyleSheet.flatten(style)) == null ? void 0 : _a.paddingTop) != null ? _c : (_b = StyleSheet.flatten(contentContainerStyle)) == null ? void 0 : _b.paddingTop) != null ? _d : 0;
   const initalizeStateVars = () => {
     set$(ctx, "lastItemKey", lastItemKey);
     set$(ctx, "numColumns", numColumnsProp);
@@ -1558,10 +1597,42 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   useImperativeHandle(
     forwardedRef,
     () => {
-      const scrollToIndex = ({ index, animated }) => {
-        const offsetObj = calculateInitialOffset(index);
-        const offset = horizontal ? { x: offsetObj, y: 0 } : { x: 0, y: offsetObj };
-        refScroller.current.scrollTo({ ...offset, animated });
+      const scrollToIndex = ({ index, animated = true }) => {
+        var _a2;
+        const state = refState.current;
+        const firstIndexOffset = calculateOffsetForIndex(index);
+        let firstIndexScrollPostion = firstIndexOffset;
+        if (maintainVisibleContentPosition) {
+          const id = getId(index);
+          state.anchorElement = { id, coordinate: firstIndexOffset };
+          (_a2 = state.belowAnchorElementPositions) == null ? void 0 : _a2.clear();
+          state.positions.clear();
+          calcTotalSizesAndPositions({ forgetPositions: true });
+          state.scrollForNextCalculateItemsInView = void 0;
+          state.startBufferedId = id;
+          state.minIndexSizeChanged = index;
+          firstIndexScrollPostion = firstIndexOffset + state.scrollAdjustHandler.getAppliedAdjust();
+          state.scrollAdjustHandler.pauseAdjust();
+          setTimeout(
+            () => {
+              const wasAdjusted = state.scrollAdjustHandler.unPauseAdjust();
+              if (wasAdjusted) {
+                refState.current.scrollVelocity = 0;
+                refState.current.scrollHistory = [];
+                calculateItemsInView(0);
+              }
+            },
+            animated ? 1e3 : 50
+          );
+        }
+        const offset = horizontal ? { x: firstIndexScrollPostion, y: 0 } : { x: 0, y: firstIndexScrollPostion };
+        if (maintainVisibleContentPosition) {
+          setTimeout(() => {
+            refScroller.current.scrollTo({ ...offset, animated });
+          }, 50);
+        } else {
+          refScroller.current.scrollTo({ ...offset, animated });
+        }
       };
       return {
         getNativeScrollRef: () => refScroller.current,
@@ -1595,6 +1666,17 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       getRenderedItem,
       updateItemSize,
       handleScroll,
+      onMomentumScrollEnd: (event) => {
+        const wasPaused = refState.current.scrollAdjustHandler.unPauseAdjust();
+        if (wasPaused) {
+          refState.current.scrollVelocity = 0;
+          refState.current.scrollHistory = [];
+          calculateItemsInView(0);
+        }
+        if (onMomentumScrollEnd) {
+          onMomentumScrollEnd(event);
+        }
+      },
       onLayout,
       recycleItems,
       alignItemsAtEnd,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@legendapp/list",
-  "version": "1.0.0-beta.12",
+  "version": "1.0.0-beta.14",
   "description": "Legend List aims to be a drop-in replacement for FlatList with much better performance and supporting dynamically sized items.",
   "sideEffects": false,
   "private": false,