@legendapp/list 3.3.5 → 3.3.6

package/react.js

@@ -76,10 +76,6 @@ function getStylePaddingEnd(props) {
   }
   return (isHorizontalRTLProps(props) ? props.stylePaddingLeft : props.stylePaddingRight) || 0;
 }
-function getLogicalHorizontalMaxOffset(state, contentWidth) {
-  var _a3;
-  return (_a3 = getHorizontalMaxOffset(state, contentWidth)) != null ? _a3 : 0;
-}
 function getHorizontalInsetEnd(state, inset) {
   if (!inset) {
     return 0;
@@ -710,6 +706,12 @@ function checkAtBottom(ctx, allowedEdge, allowGateCreatedInCurrentCheck) {
   } = state;
   const contentSize = getContentSize(ctx);
   resetSharedEdgeGateIfOutsideHysteresis(ctx);
+  if (state.props.data.length === 0 && scrollLength > 0 && contentSize <= scrollLength) {
+    set$(ctx, "isAtEnd", true);
+    set$(ctx, "isNearEnd", true);
+    set$(ctx, "isWithinMaintainScrollAtEndThreshold", true);
+    return;
+  }
   if (contentSize > 0 && queuedInitialLayout) {
     const insetEnd = getContentInsetEnd(ctx);
     const distanceFromEnd = contentSize - scroll - scrollLength - insetEnd;
@@ -719,7 +721,7 @@ function checkAtBottom(ctx, allowedEdge, allowGateCreatedInCurrentCheck) {
     set$(
       ctx,
       "isWithinMaintainScrollAtEndThreshold",
-      isContentLess || distanceFromEnd <= maintainScrollAtEndThreshold * scrollLength
+      isContentLess || distanceFromEnd <= maintainScrollAtEndThreshold * scrollLength || state.pendingMaintainScrollAtEnd || maintainingScrollAtEnd === "animated" || maintainingScrollAtEnd === "instant"
     );
     const shouldSkipThresholdChecks = hasActiveInitialScroll(state) || maintainingScrollAtEnd;
     if (!shouldSkipThresholdChecks) {
@@ -1064,10 +1066,22 @@ function getAlignItemsAtEndPadding(ctx) {
   return shouldPad ? Math.max(0, state.scrollLength - getRawContentLength(ctx) - getContentInsetEnd(ctx)) : 0;
 }
 function updateContentMetricsState(ctx) {
+  var _a3;
+  const { state } = ctx;
   const previousPadding = peek$(ctx, "alignItemsAtEndPadding") || 0;
   const nextPadding = getAlignItemsAtEndPadding(ctx);
   if (previousPadding !== nextPadding) {
-    set$(ctx, "alignItemsAtEndPadding", nextPadding);
+    const isAnimatedMaintainActive = state.maintainingScrollAtEnd === "pending-animated" || state.maintainingScrollAtEnd === "animated";
+    const isMaintainExpected = state.didContainersLayout && ((_a3 = state.props.maintainScrollAtEnd) == null ? void 0 : _a3.animated) && (isAnimatedMaintainActive || previousPadding > nextPadding && peek$(ctx, "isWithinMaintainScrollAtEndThreshold"));
+    if (isMaintainExpected && !isAnimatedMaintainActive && !state.pendingMaintainScrollAtEnd) {
+      state.scheduledWork.microtask(() => {
+        if (!state.maintainingScrollAtEnd && !state.pendingMaintainScrollAtEnd) {
+          set$(ctx, "alignItemsAtEndPadding", getAlignItemsAtEndPadding(ctx));
+        }
+      }, "alignItemsAtEndPaddingFallback");
+    } else if (!isMaintainExpected) {
+      set$(ctx, "alignItemsAtEndPadding", nextPadding);
+    }
   }
 }
 
@@ -1425,22 +1439,110 @@ function listenForScrollEnd(ctx, params) {
   scheduledWork.register("platformScrollCompletion", cancel);
 }
 
+// src/core/scrollRequestTracker.ts
+function getScrollRequestTracker(ctx) {
+  if (!ctx.scrollRequestTracker) {
+    let currentToken = 0;
+    const start = (resolve) => {
+      const state = ctx.state;
+      state.scheduledWork.cancel("imperativeScrollReady");
+      const token = ++currentToken;
+      settlePendingImperativeScroll(state);
+      state.pendingScrollResolve = resolve;
+      return token;
+    };
+    const runNow = (token, resolve, run) => {
+      const state = ctx.state;
+      if (token !== currentToken) {
+        return;
+      }
+      const didStartScroll = run();
+      if (!didStartScroll || !state.scrollingTo) {
+        if (state.pendingScrollResolve === resolve) {
+          state.pendingScrollResolve = void 0;
+        }
+        resolve();
+      }
+    };
+    ctx.scrollRequestTracker = {
+      isCurrent: (token) => token === currentToken,
+      runNow,
+      runNowIfIdle: (run) => {
+        const state = ctx.state;
+        if (state.pendingScrollResolve || state.scrollingTo) {
+          return Promise.resolve();
+        }
+        return new Promise((resolve) => {
+          const token = start(resolve);
+          runNow(token, resolve, run);
+        });
+      },
+      start
+    };
+  }
+  return ctx.scrollRequestTracker;
+}
+
+// src/utils/requestAdjust.ts
+function requestAdjust(ctx, positionDiff, source) {
+  const state = ctx.state;
+  if (Math.abs(positionDiff) > 0.1) {
+    const doit = () => {
+      {
+        state.scrollAdjustHandler.requestAdjust(positionDiff);
+        if (state.adjustingFromInitialMount) {
+          state.adjustingFromInitialMount--;
+        }
+      }
+    };
+    state.scroll += positionDiff;
+    state.scrollForNextCalculateItemsInView = void 0;
+    const readyToRender = peek$(ctx, "readyToRender");
+    if (readyToRender) {
+      doit();
+    } else {
+      state.adjustingFromInitialMount = (state.adjustingFromInitialMount || 0) + 1;
+      requestAnimationFrame(doit);
+    }
+  }
+}
+
 // src/core/doMaintainScrollAtEnd.ts
+function finishMaintainScrollAtEnd(ctx) {
+  var _a3;
+  const { state } = ctx;
+  const currentPadding = peek$(ctx, "alignItemsAtEndPadding") || 0;
+  const nextPadding = getAlignItemsAtEndPadding(ctx);
+  state.maintainingScrollAtEnd = void 0;
+  state.pendingMaintainScrollAtEnd = false;
+  if (currentPadding !== nextPadding) {
+    set$(ctx, "alignItemsAtEndPadding", nextPadding);
+    state.scrollForNextCalculateItemsInView = void 0;
+    (_a3 = state.triggerCalculateItemsInView) == null ? void 0 : _a3.call(state, { forceFullItemPositions: true });
+    const nextScroll = clampScrollOffset(ctx, state.scroll + nextPadding - currentPadding);
+    requestAdjust(ctx, nextScroll - state.scroll);
+  }
+}
 function doMaintainScrollAtEnd(ctx) {
   const state = ctx.state;
   const {
     didContainersLayout,
+    didFinishInitialScroll,
     pendingNativeMVCPAdjust,
-    refScroller,
     props: { maintainScrollAtEnd }
   } = state;
   const isWithinMaintainScrollAtEndThreshold = peek$(ctx, "isWithinMaintainScrollAtEndThreshold");
-  const shouldMaintainScrollAtEnd = !!(isWithinMaintainScrollAtEndThreshold && maintainScrollAtEnd && didContainersLayout);
+  const isReplayingPendingMaintain = !!state.pendingMaintainScrollAtEnd;
+  const shouldMaintainScrollAtEnd = !!((isWithinMaintainScrollAtEndThreshold || isReplayingPendingMaintain) && maintainScrollAtEnd && didFinishInitialScroll);
+  if (shouldMaintainScrollAtEnd && !didContainersLayout) {
+    state.pendingMaintainScrollAtEnd = true;
+    return false;
+  }
   if (pendingNativeMVCPAdjust) {
     state.pendingMaintainScrollAtEnd = shouldMaintainScrollAtEnd;
     return false;
   }
-  if (shouldMaintainScrollAtEnd) {
+  if (shouldMaintainScrollAtEnd && didContainersLayout) {
     state.pendingMaintainScrollAtEnd = false;
     const contentSize = getContentSize(ctx);
     if (contentSize < state.scrollLength) {
@@ -1452,39 +1554,29 @@ function doMaintainScrollAtEnd(ctx) {
       const scrollAtRequest = state.scroll;
       state.maintainingScrollAtEnd = pendingState;
       requestAnimationFrame(() => {
+        if (state.maintainingScrollAtEnd !== pendingState) {
+          return;
+        }
         const isStillWithinThreshold = peek$(ctx, "isWithinMaintainScrollAtEndThreshold");
         const didScrollSinceRequest = state.scroll !== scrollAtRequest;
-        if (isStillWithinThreshold || !didScrollSinceRequest) {
+        if (isReplayingPendingMaintain || isStillWithinThreshold || !didScrollSinceRequest) {
           state.maintainingScrollAtEnd = activeState;
-          const scroller = refScroller.current;
-          if (state.props.horizontal && isHorizontalRTL(state)) {
-            const currentContentSize = getContentSize(ctx);
-            const logicalEndOffset = getLogicalHorizontalMaxOffset(state, currentContentSize);
-            const nativeOffset = toNativeHorizontalOffset(state, logicalEndOffset, currentContentSize);
-            scroller == null ? void 0 : scroller.scrollTo({
-              animated: maintainScrollAtEnd.animated,
-              x: nativeOffset,
-              y: 0
-            });
-          } else {
-            scroller == null ? void 0 : scroller.scrollToEnd({
-              animated: maintainScrollAtEnd.animated
-            });
-          }
-          setTimeout(
-            () => {
-              if (state.maintainingScrollAtEnd === activeState) {
-                state.maintainingScrollAtEnd = void 0;
-                if (state.pendingMaintainScrollAtEnd) {
-                  doMaintainScrollAtEnd(ctx);
-                }
-              }
-            },
-            maintainScrollAtEnd.animated ? 500 : 0
+          const scrollPromise = getScrollRequestTracker(ctx).runNowIfIdle(
+            () => ctx.scrollToEnd({ animated: maintainScrollAtEnd.animated })
           );
+          void scrollPromise.then(() => {
+            if (state.maintainingScrollAtEnd !== activeState) {
+              return;
+            }
+            if (state.pendingMaintainScrollAtEnd) {
+              state.maintainingScrollAtEnd = void 0;
+              doMaintainScrollAtEnd(ctx);
+            } else {
+              finishMaintainScrollAtEnd(ctx);
+            }
+          });
         } else if (state.maintainingScrollAtEnd === pendingState) {
-          state.maintainingScrollAtEnd = void 0;
-          state.pendingMaintainScrollAtEnd = false;
+          finishMaintainScrollAtEnd(ctx);
         }
       });
     } else {
@@ -1492,34 +1584,10 @@ function doMaintainScrollAtEnd(ctx) {
     }
     return true;
   }
-  state.pendingMaintainScrollAtEnd = false;
+  finishMaintainScrollAtEnd(ctx);
   return false;
 }
 
-// src/utils/requestAdjust.ts
-function requestAdjust(ctx, positionDiff, dataChanged) {
-  const state = ctx.state;
-  if (Math.abs(positionDiff) > 0.1) {
-    const doit = () => {
-      {
-        state.scrollAdjustHandler.requestAdjust(positionDiff);
-        if (state.adjustingFromInitialMount) {
-          state.adjustingFromInitialMount--;
-        }
-      }
-    };
-    state.scroll += positionDiff;
-    state.scrollForNextCalculateItemsInView = void 0;
-    const readyToRender = peek$(ctx, "readyToRender");
-    if (readyToRender) {
-      doit();
-    } else {
-      state.adjustingFromInitialMount = (state.adjustingFromInitialMount || 0) + 1;
-      requestAnimationFrame(doit);
-    }
-  }
-}
-
 // src/core/mvcp.ts
 var MVCP_POSITION_EPSILON = 0.1;
 var MVCP_ANCHOR_LOCK_TTL_MS = 300;
@@ -1656,7 +1724,7 @@ function resolvePendingNativeMVCPAdjust(ctx, newScroll) {
   }
   return false;
 }
-function prepareMVCP(ctx, dataChanged) {
+function prepareMVCP(ctx, dataChanged, adjustmentSource) {
   const state = ctx.state;
   const { idsInView, positions, props } = state;
   const {
@@ -1908,6 +1976,10 @@ function updateScroll(ctx, newScroll, forceUpdate, options) {
   state.scrollTime = currentTime;
   const scrollDelta = Math.abs(newScroll - prevScroll);
   const isUserScrollEvent = !!(options == null ? void 0 : options.fromNativeScrollEvent) && scrollDelta > 0.1 && !adjustChanged && scrollingTo === void 0 && !state.pendingNativeMVCPAdjust;
+  const didCancelMaintainScrollAtEnd = isUserScrollEvent && newScroll < prevScroll && !!(state.maintainingScrollAtEnd || state.pendingMaintainScrollAtEnd);
+  if (didCancelMaintainScrollAtEnd) {
+    finishMaintainScrollAtEnd(ctx);
+  }
   const allowedEdge = isUserScrollEvent ? beginReachedEdgeUserScroll(ctx, newScroll - prevScroll) : void 0;
   const didResolvePendingNativeMVCPAdjust = resolvePendingNativeMVCPAdjust(ctx, newScroll);
   const scrollLength = state.scrollLength;
@@ -1916,7 +1988,7 @@ function updateScroll(ctx, newScroll, forceUpdate, options) {
   updateAdaptiveRender(ctx, scrollVelocity, { forceLight: isLargeUserScrollJump });
   const lastCalculated = state.scrollLastCalculate;
   const useAggressiveItemRecalculation = isInMVCPActiveMode(state);
-  const shouldUpdate = useAggressiveItemRecalculation || didResolvePendingNativeMVCPAdjust || allowedEdge !== void 0 || forceUpdate || lastCalculated === void 0 || Math.abs(state.scroll - lastCalculated) > 2;
+  const shouldUpdate = useAggressiveItemRecalculation || didResolvePendingNativeMVCPAdjust || didCancelMaintainScrollAtEnd || allowedEdge !== void 0 || forceUpdate || lastCalculated === void 0 || Math.abs(state.scroll - lastCalculated) > 2;
   if (shouldUpdate) {
     state.scrollLastCalculate = state.scroll;
     state.ignoreScrollFromMVCPIgnored = false;
@@ -2745,7 +2817,7 @@ function handleBootstrapInitialScrollFooterLayout(ctx, options) {
   }
 }
 function handleBootstrapInitialScrollLayoutChange(ctx) {
-  var _a3, _b, _c;
+  var _a3, _b;
   const state = ctx.state;
   const initialScroll = state.initialScroll;
   const bootstrapInitialScroll = getBootstrapInitialScrollSession(state);
@@ -2759,19 +2831,15 @@ function handleBootstrapInitialScrollLayoutChange(ctx) {
         if (state.didFinishInitialScroll) {
           schedulePreservedEndAnchorCorrection(ctx);
         } else if (scrollingTo) {
-          const existingWatchdog = initialScrollWatchdog.get(state);
-          scrollingTo.offset = resolvedOffset;
-          scrollingTo.targetOffset = resolvedOffset;
           state.initialScroll = {
             ...initialScroll,
             contentOffset: resolvedOffset
           };
-          state.hasScrolled = false;
-          initialScrollWatchdog.set(state, {
-            startScroll: (_c = existingWatchdog == null ? void 0 : existingWatchdog.startScroll) != null ? _c : state.scroll,
-            targetOffset: resolvedOffset
+          dispatchInitialScroll(ctx, {
+            forceScroll: true,
+            resolvedOffset,
+            target: state.initialScroll
           });
-          requestAdjust(ctx, offsetDiff);
         }
       }
     } else {
@@ -3998,6 +4066,9 @@ function setDidLayout(ctx) {
   state.queuedInitialLayout = true;
   checkAtBottom(ctx);
   setInitialRenderState(ctx, { didLayout: true });
+  if (state.pendingMaintainScrollAtEnd) {
+    doMaintainScrollAtEnd(ctx);
+  }
 }
 
 // src/core/calculateItemsInView.ts
@@ -4234,7 +4305,7 @@ function calculateItemsInView(ctx, params = {}) {
     const stickyHeaderIndicesArr = state.props.stickyHeaderIndicesArr || [];
     const stickyHeaderIndicesSet = state.props.stickyHeaderIndicesSet || /* @__PURE__ */ new Set();
     const drawDistance = getEffectiveDrawDistance(ctx, params.drawDistanceMode);
-    const { dataChanged, doMVCP, forceFullItemPositions } = params;
+    const { dataChanged, doMVCP, forceFullItemPositions, mvcpAdjustmentSource } = params;
     const bootstrapInitialScrollState = ((_a3 = state.initialScrollSession) == null ? void 0 : _a3.kind) === "bootstrap" ? state.initialScrollSession.bootstrap : void 0;
     const suppressInitialScrollSideEffects = !!bootstrapInitialScrollState;
     const prevNumContainers = peek$(ctx, "numContainers");
@@ -4738,9 +4809,12 @@ function runOrScheduleMVCPRecalculate(ctx) {
   } else {
     if (!state.mvcpAnchorLock) {
       state.scheduledWork.cancel("mvcpRecalculate");
-      calculateItemsInView(ctx, { doMVCP: true });
+      calculateItemsInView(ctx, { doMVCP: true, mvcpAdjustmentSource: "item-size" });
     } else if (!state.scheduledWork.has("mvcpRecalculate")) {
-      state.scheduledWork.frame(() => calculateItemsInView(ctx, { doMVCP: true }), "mvcpRecalculate");
+      state.scheduledWork.frame(
+        () => calculateItemsInView(ctx, { doMVCP: true, mvcpAdjustmentSource: "item-size" }),
+        "mvcpRecalculate"
+      );
     }
   }
 }
@@ -5107,6 +5181,30 @@ function useContainerItemSignals(containerContext) {
     itemKey
   };
 }
+function scheduleViewabilityConfigWarning(ctx, hookName, configId) {
+  let cancelled = false;
+  Promise.resolve().then(() => {
+    var _a3;
+    const viewabilityConfigCallbackPairs = (_a3 = ctx.state) == null ? void 0 : _a3.viewabilityConfigCallbackPairs;
+    if (!cancelled && ctx.state) {
+      if (!(viewabilityConfigCallbackPairs == null ? void 0 : viewabilityConfigCallbackPairs.length)) {
+        warnDevOnce(
+          `${hookName}-missing-viewability-config`,
+          `${hookName} requires viewability to be configured on the owning LegendList. Add viewabilityConfig with a visibility threshold.`
+        );
+      } else if (hookName === "useViewability" && !viewabilityConfigCallbackPairs.some((pair) => pair.viewabilityConfig.id === (configId != null ? configId : ""))) {
+        const configDescription = configId ? ` for configId "${configId}"` : "";
+        warnDevOnce(
+          `${hookName}-missing-viewability-config-${configId != null ? configId : "default"}`,
+          `${hookName}${configDescription} requires a matching viewabilityConfig.id on the owning LegendList. Add an id to viewabilityConfig and pass the same id to useViewability.`
+        );
+      }
+    }
+  });
+  return () => {
+    cancelled = true;
+  };
+}
 function useAdaptiveRender() {
   const [mode] = useArr$(["adaptiveRender"]);
   return mode;
@@ -5146,7 +5244,9 @@ function useViewability(callback, configId) {
     const { containerId } = containerContext;
     const key = containerId + (configId != null ? configId : "");
     ctx.mapViewabilityCallbacks.set(key, callback);
+    const cancelConfigWarning = IS_DEV ? scheduleViewabilityConfigWarning(ctx, "useViewability", configId) : void 0;
     return () => {
+      cancelConfigWarning == null ? void 0 : cancelConfigWarning();
       ctx.mapViewabilityCallbacks.delete(key);
     };
   }, [ctx, callback, configId, containerContext]);
@@ -5170,7 +5270,9 @@ function useViewabilityAmount(callback) {
     }
     const { containerId } = containerContext;
     ctx.mapViewabilityAmountCallbacks.set(containerId, callback);
+    const cancelConfigWarning = IS_DEV ? scheduleViewabilityConfigWarning(ctx, "useViewabilityAmount") : void 0;
     return () => {
+      cancelConfigWarning == null ? void 0 : cancelConfigWarning();
       ctx.mapViewabilityAmountCallbacks.delete(containerId);
     };
   }, [ctx, callback, containerContext]);
@@ -7043,11 +7145,29 @@ var ScheduledWork = class {
   constructor() {
     this.work = /* @__PURE__ */ new Map();
   }
+  microtask(callback, key) {
+    const pendingWork = this.work.get(key);
+    if (pendingWork == null ? void 0 : pendingWork.callback) {
+      pendingWork.callback = callback;
+    } else {
+      this.cancel(key);
+      const work = { callback, cancel: () => {
+      } };
+      this.work.set(key, work);
+      queueMicrotask(() => {
+        var _a3;
+        if (this.work.get(key) === work) {
+          this.work.delete(key);
+          (_a3 = work.callback) == null ? void 0 : _a3.call(work);
+        }
+      });
+    }
+  }
   timeout(callback, delay, key) {
     if (key) {
       this.cancel(key);
     }
-    const work = [void 0, clearTimeout];
+    const work = { cancel: () => clearTimeout(handle) };
     const handle = setTimeout(() => {
       const workKey = key != null ? key : handle;
       if (this.work.get(workKey) === work) {
@@ -7055,14 +7175,13 @@ var ScheduledWork = class {
         callback();
       }
     }, delay);
-    work[0] = handle;
     this.work.set(key != null ? key : handle, work);
   }
   frame(callback, key) {
     this.cancel(key);
-    const work = [void 0, cancelAnimationFrame];
+    const work = { cancel: () => cancelAnimationFrame(handle) };
     this.work.set(key, work);
-    work[0] = requestAnimationFrame(() => {
+    const handle = requestAnimationFrame(() => {
       if (this.work.get(key) === work) {
         this.work.delete(key);
         callback();
@@ -7071,22 +7190,21 @@ var ScheduledWork = class {
   }
   register(key, cancel) {
     this.cancel(key);
-    this.work.set(key, [void 0, cancel]);
+    this.work.set(key, { cancel });
   }
   cancel(key) {
     const work = this.work.get(key);
     if (work) {
       this.work.delete(key);
-      const [handle, cancel] = work;
-      cancel(handle);
+      work.cancel();
     }
   }
   has(key) {
     return this.work.has(key);
   }
   dispose() {
-    for (const [handle, cancel] of this.work.values()) {
-      cancel(handle);
+    for (const work of this.work.values()) {
+      work.cancel();
     }
     this.work.clear();
   }
@@ -7143,6 +7261,25 @@ var ScrollAdjustHandler = class {
   }
 };
 
+// src/core/scrollToEnd.ts
+function scrollToEnd(ctx, options) {
+  const state = ctx.state;
+  const data = state.props.data;
+  const index = data.length - 1;
+  if (index === -1) {
+    return false;
+  }
+  const paddingBottom = state.props.stylePaddingBottom || 0;
+  const footerSize = peek$(ctx, "footerSize") || 0;
+  scrollToIndex(ctx, {
+    ...options,
+    index,
+    viewOffset: -paddingBottom - footerSize + ((options == null ? void 0 : options.viewOffset) || 0),
+    viewPosition: 1
+  });
+  return true;
+}
+
 // src/core/updateContentInsetEndAdjustment.ts
 function updateContentInsetEndAdjustment(ctx, previousContentInsetEndAdjustment) {
   const state = ctx.state;
@@ -7205,25 +7342,6 @@ function createColumnWrapperStyle(contentContainerStyle) {
   }
 }
 
-// src/core/scrollToEnd.ts
-function scrollToEnd(ctx, options) {
-  const state = ctx.state;
-  const data = state.props.data;
-  const index = data.length - 1;
-  if (index === -1) {
-    return false;
-  }
-  const paddingBottom = state.props.stylePaddingBottom || 0;
-  const footerSize = peek$(ctx, "footerSize") || 0;
-  scrollToIndex(ctx, {
-    ...options,
-    index,
-    viewOffset: -paddingBottom - footerSize + ((options == null ? void 0 : options.viewOffset) || 0),
-    viewPosition: 1
-  });
-  return true;
-}
-
 // src/utils/createImperativeHandle.ts
 var DEFAULT_AVERAGE_ITEM_SIZE_TYPE = "default";
 function getAverageItemSizes(state) {
@@ -7246,9 +7364,9 @@ function triggerMountedContainerLayouts(ctx) {
 }
 function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
   const state = ctx.state;
+  const scrollRequestTracker = getScrollRequestTracker(ctx);
   const IMPERATIVE_SCROLL_SETTLE_MAX_WAIT_MS = 800;
   const IMPERATIVE_SCROLL_SETTLE_STABLE_FRAMES = 2;
-  let imperativeScrollToken = 0;
   const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.scheduledWork.has("mvcpRecalculate") || state.ignoreScrollFromMVCP !== void 0;
   const isScrollToIndexReady = (targetIndex, allowEmpty = false) => {
     var _a3;
@@ -7270,7 +7388,7 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
     const startedAt = Date.now();
     let stableFrames = 0;
     const check = () => {
-      if (token !== imperativeScrollToken) {
+      if (!scrollRequestTracker.isCurrent(token)) {
         return;
       }
       if (isSettlingAfterDataChange() || !isReady()) {
@@ -7288,33 +7406,15 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
     state.scheduledWork.frame(check, "imperativeScrollReady");
   };
   const runScrollRequest = (token, resolve, run, isReady = () => true) => {
-    const runNow = () => {
-      if (token !== imperativeScrollToken) {
-        return;
-      }
-      const didStartScroll = run();
-      if (!didStartScroll || !state.scrollingTo) {
-        if (state.pendingScrollResolve === resolve) {
-          state.pendingScrollResolve = void 0;
-        }
-        resolve();
-      }
-    };
+    const runNow = () => scrollRequestTracker.runNow(token, resolve, run);
     if (isSettlingAfterDataChange() || !isReady()) {
       runWhenReady(token, runNow, isReady);
     } else {
       runNow();
     }
   };
-  const startImperativeScroll = (resolve) => {
-    state.scheduledWork.cancel("imperativeScrollReady");
-    const token = ++imperativeScrollToken;
-    settlePendingImperativeScroll(state);
-    state.pendingScrollResolve = resolve;
-    return token;
-  };
   const runScrollWithPromise = (run, isReady = () => true) => new Promise((resolve) => {
-    const token = startImperativeScroll(resolve);
+    const token = scrollRequestTracker.start(resolve);
     supersedeInitialScroll(ctx);
     runScrollRequest(token, resolve, run, isReady);
   });
@@ -7322,7 +7422,7 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
     const pendingScroll = state.pendingScrollToEnd;
     if (pendingScroll) {
       state.pendingScrollToEnd = void 0;
-      if (pendingScroll.token === imperativeScrollToken) {
+      if (scrollRequestTracker.isCurrent(pendingScroll.token)) {
         runScrollRequest(
           pendingScroll.token,
           pendingScroll.resolve,
@@ -7436,7 +7536,7 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
     }),
     scrollToEnd: (options) => new Promise((resolve) => {
       var _a3;
-      const token = startImperativeScroll(resolve);
+      const token = scrollRequestTracker.start(resolve);
       state.pendingScrollToEnd = {
         options,
         resolve,
@@ -7816,6 +7916,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const shouldInitializeHorizontalRTL = !initialScrollAtEnd && !hasInitialScrollIndex && !hasInitialScrollOffset && isHorizontalRTLProps({ horizontal, rtl });
   const initialScrollUsesOffsetOnly = !initialScrollAtEnd && !hasInitialScrollIndex && (hasInitialScrollOffset || shouldInitializeHorizontalRTL);
   const usesBootstrapInitialScroll = initialScrollAtEnd || hasInitialScrollIndex;
+  const shouldBottomAlignNumericInitialScrollIndex = typeof initialScrollIndexProp === "number" && !hasInitialScrollOffset && dataProp.length > 1 && initialScrollIndexProp >= dataProp.length - 1;
   const initialScrollProp = initialScrollAtEnd ? {
     index: Math.max(0, dataProp.length - 1),
     preserveForBottomPadding: true,
@@ -7828,7 +7929,9 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     viewPosition: (_d = initialScrollIndexProp.viewPosition) != null ? _d : 0
   } : {
     index: initialScrollIndexProp != null ? initialScrollIndexProp : 0,
-    viewOffset: initialScrollOffsetProp != null ? initialScrollOffsetProp : 0
+    preserveForBottomPadding: shouldBottomAlignNumericInitialScrollIndex ? true : void 0,
+    viewOffset: initialScrollOffsetProp != null ? initialScrollOffsetProp : shouldBottomAlignNumericInitialScrollIndex ? -stylePaddingEndState : 0,
+    viewPosition: shouldBottomAlignNumericInitialScrollIndex ? 1 : void 0
   } : initialScrollUsesOffsetOnly ? {
     contentOffset: initialScrollOffsetProp != null ? initialScrollOffsetProp : 0,
     index: 0,
@@ -7934,6 +8037,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         viewabilityConfigCallbackPairs: void 0
       };
       const internalState = ctx.state;
+      ctx.scrollToEnd = (options) => scrollToEnd(ctx, options);
       internalState.triggerCalculateItemsInView = (params) => calculateItemsInView(ctx, params);
       internalState.reprocessCurrentScroll = () => updateScroll(ctx, internalState.scroll, true);
       set$(ctx, "maintainVisibleContentPosition", maintainVisibleContentPositionConfig);
@@ -8287,6 +8391,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       onScroll: (event) => onScroll(ctx, event),
       onScrollBeginDrag: (event) => {
         var _a4, _b2;
+        const maintainingScrollAtEnd = state.maintainingScrollAtEnd;
+        if (maintainingScrollAtEnd === "animated" || maintainingScrollAtEnd === "instant") {
+          cancelImperativeScroll(state);
+        }
+        if (maintainingScrollAtEnd) {
+          finishMaintainScrollAtEnd(ctx);
+        }
         prepareReachedEdgeForNextUserScroll(ctx);
         (_b2 = (_a4 = state.props).onScrollBeginDrag) == null ? void 0 : _b2.call(_a4, event);
       },