@legendapp/list 3.3.3 → 3.3.5

package/react-native.mjs

@@ -41,6 +41,12 @@ function isHorizontalRTL(state) {
 function isHorizontalRTLProps(props) {
   return !!(props == null ? void 0 : props.horizontal) && isRTLProps(props);
 }
+function getStylePaddingEnd(props) {
+  if (!(props == null ? void 0 : props.horizontal)) {
+    return (props == null ? void 0 : props.stylePaddingBottom) || 0;
+  }
+  return (isHorizontalRTLProps(props) ? props.stylePaddingLeft : props.stylePaddingRight) || 0;
+}
 function getLogicalHorizontalMaxOffset(state, contentWidth) {
   var _a3;
   return (_a3 = getHorizontalMaxOffset(state, contentWidth)) != null ? _a3 : 0;
@@ -159,6 +165,14 @@ function useStateContext() {
   return React2.useContext(ContextState);
 }
 function createSelectorFunctionsArr(ctx, signalNames) {
+  if (!ctx) {
+    const emptyValues = [];
+    return {
+      get: () => emptyValues,
+      subscribe: () => () => {
+      }
+    };
+  }
   let lastValues = [];
   let lastSignalValues = [];
   return {
@@ -265,7 +279,7 @@ function getContentInsetEndAdjustmentEnd(adjustment) {
   return Math.max(0, adjustment != null ? adjustment : 0);
 }
 function getContentInsetEnd(ctx, contentInsetEndAdjustmentOverride) {
-  var _a3, _b;
+  var _a3;
   const state = ctx.state;
   const { props } = state;
   const horizontal = props.horizontal;
@@ -276,8 +290,8 @@ function getContentInsetEnd(ctx, contentInsetEndAdjustmentOverride) {
     contentInsetEndAdjustmentOverride != null ? contentInsetEndAdjustmentOverride : props.contentInsetEndAdjustment
   );
   const anchoredEndSpaceSize = peek$(ctx, "anchoredEndSpaceSize");
-  const anchoredEndInset = ((_a3 = props.anchoredEndSpace) == null ? void 0 : _a3.includeInEndInset) && anchoredEndSpaceSize ? anchoredEndSpaceSize : 0;
-  const overrideInset = (_b = state.contentInsetOverride) != null ? _b : void 0;
+  const anchoredEndInset = props.anchoredEndSpace && anchoredEndSpaceSize ? anchoredEndSpaceSize : 0;
+  const overrideInset = (_a3 = state.contentInsetOverride) != null ? _a3 : void 0;
   const adjustedBaseEndInset = baseEndInset + contentInsetEndAdjustment;
   if (overrideInset) {
     const mergedInset = { bottom: 0, left: 0, right: 0, ...baseInset, ...overrideInset };
@@ -293,14 +307,15 @@ function getContentInsetEnd(ctx, contentInsetEndAdjustmentOverride) {
 function getContentSize(ctx) {
   var _a3, _b;
   const { values, state } = ctx;
-  const stylePaddingTop = values.get("stylePaddingTop") || 0;
-  const stylePaddingBottom = state.props.stylePaddingBottom || 0;
+  const stylePaddingStart = state.props.horizontal ? state.props.stylePaddingLeft || 0 : values.get("stylePaddingTop") || 0;
+  const stylePaddingEnd = state.props.horizontal ? state.props.stylePaddingRight || 0 : state.props.stylePaddingBottom || 0;
   const alignItemsAtEndPadding = values.get("alignItemsAtEndPadding") || 0;
   const headerSize = values.get("headerSize") || 0;
   const footerSize = values.get("footerSize") || 0;
-  const contentInsetBottom = getContentInsetEnd(ctx);
+  const contentInsetEnd = getContentInsetEnd(ctx);
   const totalSize = (_b = (_a3 = state.pendingTotalSize) != null ? _a3 : state.totalSize) != null ? _b : values.get("totalSize");
-  return headerSize + footerSize + totalSize + stylePaddingTop + alignItemsAtEndPadding + stylePaddingBottom + (contentInsetBottom || 0);
+  const layoutSize = Math.max(0, totalSize - (state.props.data.length > 0 ? ctx.scrollAxisGap : 0));
+  return headerSize + footerSize + layoutSize + stylePaddingStart + alignItemsAtEndPadding + stylePaddingEnd + (contentInsetEnd || 0);
 }
 
 // src/components/DebugView.tsx
@@ -421,6 +436,28 @@ var EDGE_POSITION_EPSILON = 1;
 var ENABLE_DEVMODE = IS_DEV && false;
 var ENABLE_DEBUG_VIEW = IS_DEV && false;
 
+// src/core/cancelImperativeScroll.ts
+function cancelScrollCompletionChecks({ scheduledWork }) {
+  scheduledWork.cancel("checkFinishedScrollFrame");
+  scheduledWork.cancel("checkFinishedScrollRetryFrame");
+  scheduledWork.cancel("checkFinishedScrollFallback");
+  scheduledWork.cancel("platformScrollCompletion");
+}
+function settlePendingImperativeScroll(state) {
+  var _a3, _b;
+  const resolvePendingScroll = (_b = state.pendingScrollResolve) != null ? _b : (_a3 = state.pendingScrollToEnd) == null ? void 0 : _a3.resolve;
+  state.pendingScrollResolve = void 0;
+  state.pendingScrollToEnd = void 0;
+  resolvePendingScroll == null ? void 0 : resolvePendingScroll();
+}
+function cancelImperativeScroll(state) {
+  cancelScrollCompletionChecks(state);
+  state.scheduledWork.cancel("imperativeScrollReady");
+  state.scrollingTo = void 0;
+  state.scrollTargetPinnedRange = void 0;
+  settlePendingImperativeScroll(state);
+}
+
 // src/core/deferredPublicOnScroll.ts
 function withResolvedContentOffset(state, event, resolvedOffset) {
   return {
@@ -789,13 +826,7 @@ var DEFAULT_WEB_ADAPTIVE_RENDER_ENTER_VELOCITY = 6;
 var DEFAULT_WEB_ADAPTIVE_RENDER_EXIT_VELOCITY = 3;
 var DEFAULT_WEB_ADAPTIVE_RENDER_EXIT_DELAY = 250;
 function clearAdaptiveRenderExitTimeout(ctx) {
-  const state = ctx.state;
-  const previousTimeout = state.timeoutAdaptiveRender;
-  if (previousTimeout !== void 0) {
-    clearTimeout(previousTimeout);
-    state.timeouts.delete(previousTimeout);
-    state.timeoutAdaptiveRender = void 0;
-  }
+  ctx.state.scheduledWork.cancel("adaptiveRender");
 }
 function scheduleAdaptiveRenderExit(ctx, exitDelay) {
   const state = ctx.state;
@@ -803,13 +834,7 @@ function scheduleAdaptiveRenderExit(ctx, exitDelay) {
   if (exitDelay <= 0) {
     setAdaptiveRender(ctx, "normal", "scroll");
   } else {
-    const timeout = setTimeout(() => {
-      state.timeouts.delete(timeout);
-      state.timeoutAdaptiveRender = void 0;
-      setAdaptiveRender(ctx, "normal", "scroll");
-    }, exitDelay);
-    state.timeoutAdaptiveRender = timeout;
-    state.timeouts.add(timeout);
+    state.scheduledWork.timeout(() => setAdaptiveRender(ctx, "normal", "scroll"), exitDelay, "adaptiveRender");
   }
 }
 function setAdaptiveRender(ctx, mode, reason) {
@@ -841,7 +866,7 @@ function updateAdaptiveRender(ctx, scrollVelocity, options) {
       const exitDelay = (_c = adaptiveRender.exitDelay) != null ? _c : isWeb ? DEFAULT_WEB_ADAPTIVE_RENDER_EXIT_DELAY : DEFAULT_ADAPTIVE_RENDER_EXIT_DELAY;
       const threshold = currentMode === "light" ? exitVelocity : enterVelocity;
       const nextMode = (options == null ? void 0 : options.forceLight) || Math.abs(scrollVelocity) > threshold ? "light" : "normal";
-      const previousMode = state.timeoutAdaptiveRender !== void 0 ? "normal" : currentMode;
+      const previousMode = state.scheduledWork.has("adaptiveRender") ? "normal" : currentMode;
       if (nextMode !== previousMode) {
         if (nextMode === "light") {
           setAdaptiveRender(ctx, "light", "scroll");
@@ -868,14 +893,13 @@ function getEffectiveDrawDistance(ctx, mode) {
 }
 function scheduleFullDrawDistancePrewarm(ctx) {
   const { state } = ctx;
-  if (state.props.drawDistance <= INITIAL_DRAW_DISTANCE || state.queuedFullDrawDistancePrewarm !== void 0) {
+  if (state.props.drawDistance <= INITIAL_DRAW_DISTANCE || state.scheduledWork.has("fullDrawDistancePrewarm")) {
     return;
   }
-  state.queuedFullDrawDistancePrewarm = requestAnimationFrame(() => {
+  state.scheduledWork.frame(() => {
     var _a3;
-    state.queuedFullDrawDistancePrewarm = void 0;
-    (_a3 = state.triggerCalculateItemsInView) == null ? void 0 : _a3.call(state);
-  });
+    return (_a3 = state.triggerCalculateItemsInView) == null ? void 0 : _a3.call(state);
+  }, "fullDrawDistancePrewarm");
 }
 
 // src/utils/setInitialRenderState.ts
@@ -933,10 +957,7 @@ function syncInitialScrollOffset(state, offset) {
   state.scrollPrev = offset;
 }
 function clearPreservedInitialScrollTargetTimeout(state) {
-  if (state.timeoutPreservedInitialScrollClear !== void 0) {
-    clearTimeout(state.timeoutPreservedInitialScrollClear);
-    state.timeoutPreservedInitialScrollClear = void 0;
-  }
+  state.scheduledWork.cancel("preservedInitialScroll");
 }
 function clearPreservedInitialScrollTarget(state) {
   clearPreservedInitialScrollTargetTimeout(state);
@@ -944,6 +965,24 @@ function clearPreservedInitialScrollTarget(state) {
   state.initialScroll = void 0;
   setInitialScrollSession(state);
 }
+function supersedeInitialScroll(ctx) {
+  var _a3, _b, _c;
+  const state = ctx.state;
+  const bootstrapInitialScroll = ((_a3 = state.initialScrollSession) == null ? void 0 : _a3.kind) === "bootstrap" ? state.initialScrollSession.bootstrap : void 0;
+  if (state.initialScroll || bootstrapInitialScroll || ((_b = state.scrollingTo) == null ? void 0 : _b.isInitialScroll)) {
+    if ((bootstrapInitialScroll == null ? void 0 : bootstrapInitialScroll.frameHandle) !== void 0 && typeof cancelAnimationFrame === "function") {
+      cancelAnimationFrame(bootstrapInitialScroll.frameHandle);
+    }
+    if ((_c = state.scrollingTo) == null ? void 0 : _c.isInitialScroll) {
+      cancelScrollCompletionChecks(state);
+      state.scrollingTo = void 0;
+      state.scrollTargetPinnedRange = void 0;
+    }
+    initialScrollCompletion.resetFlags(state);
+    setInitialScrollSession(state, { bootstrap: null });
+    finishInitialScroll(ctx);
+  }
+}
 function finishInitialScroll(ctx, options) {
   var _a3, _b, _c;
   const state = ctx.state;
@@ -965,14 +1004,17 @@ function finishInitialScroll(ctx, options) {
       setInitialScrollSession(state);
       clearPreservedInitialScrollTargetTimeout(state);
       if (options == null ? void 0 : options.schedulePreservedTargetClear) {
-        state.timeoutPreservedInitialScrollClear = setTimeout(() => {
-          var _a5;
-          state.timeoutPreservedInitialScrollClear = void 0;
-          if (!state.didFinishInitialScroll || ((_a5 = state.scrollingTo) == null ? void 0 : _a5.isInitialScroll) || !state.initialScroll) {
-            return;
-          }
-          clearPreservedInitialScrollTarget(state);
-        }, PRESERVED_INITIAL_SCROLL_FALLBACK_CLEAR_DELAY_MS);
+        state.scheduledWork.timeout(
+          () => {
+            var _a5;
+            if (!state.didFinishInitialScroll || ((_a5 = state.scrollingTo) == null ? void 0 : _a5.isInitialScroll) || !state.initialScroll) {
+              return;
+            }
+            clearPreservedInitialScrollTarget(state);
+          },
+          PRESERVED_INITIAL_SCROLL_FALLBACK_CLEAR_DELAY_MS,
+          "preservedInitialScroll"
+        );
       }
     } else {
       clearPreservedInitialScrollTarget(state);
@@ -999,9 +1041,11 @@ function calculateOffsetForIndex(ctx, index) {
   return index !== void 0 ? state.positions[index] || 0 : 0;
 }
 
-// src/core/getTopOffsetAdjustment.ts
-function getTopOffsetAdjustment(ctx) {
-  return (peek$(ctx, "stylePaddingTop") || 0) + (peek$(ctx, "alignItemsAtEndPadding") || 0) + (peek$(ctx, "headerSize") || 0);
+// src/core/getStartOffsetAdjustment.ts
+function getStartOffsetAdjustment(ctx) {
+  const { state } = ctx;
+  const stylePaddingStart = state.props.horizontal ? (isHorizontalRTL(state) ? state.props.stylePaddingRight : state.props.stylePaddingLeft) || 0 : peek$(ctx, "stylePaddingTop") || 0;
+  return stylePaddingStart + (peek$(ctx, "alignItemsAtEndPadding") || 0) + (peek$(ctx, "headerSize") || 0);
 }
 
 // src/utils/getId.ts
@@ -1214,9 +1258,9 @@ function calculateOffsetWithOffsetPosition(ctx, offsetParam, params) {
     offset -= viewOffset;
   }
   if (index !== void 0) {
-    const topOffsetAdjustment = getTopOffsetAdjustment(ctx);
-    if (topOffsetAdjustment) {
-      offset += topOffsetAdjustment;
+    const startOffsetAdjustment = getStartOffsetAdjustment(ctx);
+    if (startOffsetAdjustment) {
+      offset += startOffsetAdjustment;
     }
   }
   if (viewPosition !== void 0 && index !== void 0) {
@@ -1226,7 +1270,8 @@ function calculateOffsetWithOffsetPosition(ctx, offsetParam, params) {
     }
     const isOutOfBounds = index < 0 || index >= dataLength;
     const fallbackEstimatedSize = (_a3 = state.props.estimatedItemSize) != null ? _a3 : 0;
-    const itemSize = isOutOfBounds ? fallbackEstimatedSize : getItemSize(ctx, getId(state, index), index, state.props.data[index]);
+    const measuredItemSize = isOutOfBounds ? fallbackEstimatedSize : getItemSize(ctx, getId(state, index), index, state.props.data[index]);
+    const itemSize = Math.max(0, measuredItemSize - (isOutOfBounds ? 0 : ctx.scrollAxisGap));
     const trailingInset = getContentInsetEnd(ctx);
     offset -= viewPosition * (state.scrollLength - trailingInset - itemSize);
     if (!isOutOfBounds && index === state.props.data.length - 1) {
@@ -1258,6 +1303,7 @@ function finishScrollTo(ctx) {
   var _a3, _b;
   const state = ctx.state;
   if (state == null ? void 0 : state.scrollingTo) {
+    cancelScrollCompletionChecks(state);
     const resolvePendingScroll = state.pendingScrollResolve;
     state.pendingScrollResolve = void 0;
     const scrollingTo = state.scrollingTo;
@@ -1306,7 +1352,7 @@ function checkFinishedScroll(ctx, options) {
       return;
     }
   }
-  ctx.state.animFrameCheckFinishedScroll = requestAnimationFrame(() => checkFinishedScrollFrame(ctx));
+  ctx.state.scheduledWork.frame(() => checkFinishedScrollFrame(ctx), "checkFinishedScrollFrame");
 }
 function hasScrollCompletionOwnership(state, options) {
   const { clampedTargetOffset, scrollingTo } = options;
@@ -1376,7 +1422,6 @@ function checkFinishedScrollFrame(ctx) {
     return;
   }
   const { state } = ctx;
-  state.animFrameCheckFinishedScroll = void 0;
   const completionState = getResolvedScrollCompletionState(ctx, scrollingTo);
   if (completionState.isAtResolvedTarget && hasScrollCompletionOwnership(state, {
     clampedTargetOffset: completionState.clampedTargetOffset,
@@ -1395,61 +1440,62 @@ function scrollToFallbackOffset(ctx, offset) {
 }
 function checkFinishedScrollFallback(ctx) {
   const state = ctx.state;
+  if (state.scheduledWork.has("checkFinishedScrollFallback")) {
+    return;
+  }
   const scrollingTo = state.scrollingTo;
   const shouldFinishInitialZeroTarget = shouldFinishInitialZeroTargetScroll(ctx);
   const silentInitialDispatch = isSilentInitialDispatch(state, scrollingTo);
   const canFinishInitialWithoutNativeProgress = scrollingTo !== void 0 ? shouldFinishInitialScrollWithoutNativeProgress(state, scrollingTo) : false;
   const slowTimeout = (scrollingTo == null ? void 0 : scrollingTo.isInitialScroll) && !shouldFinishInitialZeroTarget && !canFinishInitialWithoutNativeProgress || !state.didContainersLayout;
   const initialDelay = shouldFinishInitialZeroTarget || canFinishInitialWithoutNativeProgress ? 0 : silentInitialDispatch ? SILENT_INITIAL_SCROLL_RETRY_DELAY_MS : slowTimeout ? 500 : 100;
-  state.timeoutCheckFinishedScrollFallback = setTimeout(() => {
-    let numChecks = 0;
-    const scheduleFallbackCheck = (delay) => {
-      state.timeoutCheckFinishedScrollFallback = setTimeout(checkHasScrolled, delay);
-    };
-    const checkHasScrolled = () => {
-      var _a3, _b, _c, _d;
-      state.timeoutCheckFinishedScrollFallback = void 0;
-      const isStillScrollingTo = state.scrollingTo;
-      if (isStillScrollingTo) {
-        numChecks++;
-        const isNativeInitialPending = isNativeInitialNonZeroTarget(state) && !state.hasScrolled;
-        const maxChecks = silentInitialDispatch ? 5 : isNativeInitialPending ? INITIAL_SCROLL_MAX_FALLBACK_CHECKS : 5;
-        const shouldFinishZeroTarget = shouldFinishInitialZeroTargetScroll(ctx);
-        const canFinishInitialScrollWithoutNativeProgress = shouldFinishInitialScrollWithoutNativeProgress(
-          state,
-          isStillScrollingTo
+  let numChecks = 0;
+  const scheduleFallbackCheck = (delay) => {
+    state.scheduledWork.timeout(checkHasScrolled, delay, "checkFinishedScrollFallback");
+  };
+  const checkHasScrolled = () => {
+    var _a3, _b, _c, _d;
+    const isStillScrollingTo = state.scrollingTo;
+    if (isStillScrollingTo) {
+      numChecks++;
+      const isNativeInitialPending = isNativeInitialNonZeroTarget(state) && !state.hasScrolled;
+      const maxChecks = silentInitialDispatch ? 5 : isNativeInitialPending ? INITIAL_SCROLL_MAX_FALLBACK_CHECKS : 5;
+      const shouldFinishZeroTarget = shouldFinishInitialZeroTargetScroll(ctx);
+      const canFinishInitialScrollWithoutNativeProgress = shouldFinishInitialScrollWithoutNativeProgress(
+        state,
+        isStillScrollingTo
+      );
+      const completionState = getResolvedScrollCompletionState(ctx, isStillScrollingTo);
+      const canFinishAfterSilentNativeDispatch = Platform.OS === "android" && silentInitialDispatch && completionState.isAtResolvedTarget && numChecks >= 1;
+      const shouldRetrySilentInitialNativeScroll = Platform.OS === "android" && canFinishAfterSilentNativeDispatch && !initialScrollCompletion.didRetrySilentInitialScroll(state);
+      const shouldFinishAfterObservedScroll = state.hasScrolled && (!isStillScrollingTo.isInitialScroll || completionState.isAtResolvedTarget);
+      const shouldRetryUnalignedInitialScroll = isStillScrollingTo.isInitialScroll && !completionState.isAtResolvedTarget && numChecks <= maxChecks;
+      const shouldRetryUnalignedEndScroll = Platform.OS === "ios" && !isStillScrollingTo.isInitialScroll && isEndAlignedLastItemTarget(ctx, isStillScrollingTo) && !completionState.isAtResolvedTarget && numChecks <= maxChecks;
+      if (shouldRetrySilentInitialNativeScroll) {
+        const targetOffset = (_b = (_a3 = getInitialScrollWatchdogTargetOffset(state)) != null ? _a3 : isStillScrollingTo.targetOffset) != null ? _b : 0;
+        const jiggleOffset = targetOffset >= SILENT_INITIAL_SCROLL_TARGET_EPSILON ? targetOffset - SILENT_INITIAL_SCROLL_TARGET_EPSILON : targetOffset + SILENT_INITIAL_SCROLL_TARGET_EPSILON;
+        initialScrollCompletion.markSilentInitialScrollRetry(state);
+        scrollToFallbackOffset(ctx, jiggleOffset);
+        state.scheduledWork.frame(
+          () => scrollToFallbackOffset(ctx, targetOffset),
+          "checkFinishedScrollRetryFrame"
         );
-        const completionState = getResolvedScrollCompletionState(ctx, isStillScrollingTo);
-        const canFinishAfterSilentNativeDispatch = Platform.OS === "android" && silentInitialDispatch && completionState.isAtResolvedTarget && numChecks >= 1;
-        const shouldRetrySilentInitialNativeScroll = Platform.OS === "android" && canFinishAfterSilentNativeDispatch && !initialScrollCompletion.didRetrySilentInitialScroll(state);
-        const shouldFinishAfterObservedScroll = state.hasScrolled && (!isStillScrollingTo.isInitialScroll || completionState.isAtResolvedTarget);
-        const shouldRetryUnalignedInitialScroll = isStillScrollingTo.isInitialScroll && !completionState.isAtResolvedTarget && numChecks <= maxChecks;
-        const shouldRetryUnalignedEndScroll = Platform.OS === "ios" && !isStillScrollingTo.isInitialScroll && isEndAlignedLastItemTarget(ctx, isStillScrollingTo) && !completionState.isAtResolvedTarget && numChecks <= maxChecks;
-        if (shouldRetrySilentInitialNativeScroll) {
-          const targetOffset = (_b = (_a3 = getInitialScrollWatchdogTargetOffset(state)) != null ? _a3 : isStillScrollingTo.targetOffset) != null ? _b : 0;
-          const jiggleOffset = targetOffset >= SILENT_INITIAL_SCROLL_TARGET_EPSILON ? targetOffset - SILENT_INITIAL_SCROLL_TARGET_EPSILON : targetOffset + SILENT_INITIAL_SCROLL_TARGET_EPSILON;
-          initialScrollCompletion.markSilentInitialScrollRetry(state);
-          scrollToFallbackOffset(ctx, jiggleOffset);
-          requestAnimationFrame(() => {
-            scrollToFallbackOffset(ctx, targetOffset);
-          });
-          scheduleFallbackCheck(SILENT_INITIAL_SCROLL_RETRY_DELAY_MS);
-        } else if (shouldRetryUnalignedEndScroll) {
-          scrollToFallbackOffset(ctx, completionState.clampedTargetOffset);
-          scheduleFallbackCheck(100);
-        } else if (shouldFinishZeroTarget || shouldFinishAfterObservedScroll || canFinishInitialScrollWithoutNativeProgress || canFinishAfterSilentNativeDispatch || numChecks > maxChecks) {
-          finishScrollTo(ctx);
-        } else if ((isNativeInitialPending || shouldRetryUnalignedInitialScroll) && numChecks <= maxChecks) {
-          const targetOffset = (_d = (_c = getInitialScrollWatchdogTargetOffset(state)) != null ? _c : isStillScrollingTo.targetOffset) != null ? _d : state.scrollPending;
-          scrollToFallbackOffset(ctx, targetOffset);
-          scheduleFallbackCheck(silentInitialDispatch ? SILENT_INITIAL_SCROLL_RETRY_DELAY_MS : 100);
-        } else {
-          scheduleFallbackCheck(silentInitialDispatch ? SILENT_INITIAL_SCROLL_RETRY_DELAY_MS : 100);
-        }
+        scheduleFallbackCheck(SILENT_INITIAL_SCROLL_RETRY_DELAY_MS);
+      } else if (shouldRetryUnalignedEndScroll) {
+        scrollToFallbackOffset(ctx, completionState.clampedTargetOffset);
+        scheduleFallbackCheck(100);
+      } else if (shouldFinishZeroTarget || shouldFinishAfterObservedScroll || canFinishInitialScrollWithoutNativeProgress || canFinishAfterSilentNativeDispatch || numChecks > maxChecks) {
+        finishScrollTo(ctx);
+      } else if ((isNativeInitialPending || shouldRetryUnalignedInitialScroll) && numChecks <= maxChecks) {
+        const targetOffset = (_d = (_c = getInitialScrollWatchdogTargetOffset(state)) != null ? _c : isStillScrollingTo.targetOffset) != null ? _d : state.scrollPending;
+        scrollToFallbackOffset(ctx, targetOffset);
+        scheduleFallbackCheck(silentInitialDispatch ? SILENT_INITIAL_SCROLL_RETRY_DELAY_MS : 100);
+      } else {
+        scheduleFallbackCheck(silentInitialDispatch ? SILENT_INITIAL_SCROLL_RETRY_DELAY_MS : 100);
       }
-    };
-    checkHasScrolled();
-  }, initialDelay);
+    }
+  };
+  scheduleFallbackCheck(initialDelay);
 }
 
 // src/core/doScrollTo.native.ts
@@ -1473,6 +1519,9 @@ function doScrollTo(ctx, params) {
   if (isInitialScroll) {
     initialScrollCompletion.markInitialScrollNativeDispatch(state);
   }
+  if (isAnimated && Math.abs(state.scroll - offset) <= 1) {
+    checkFinishedScroll(ctx);
+  }
   if (!isAnimated) {
     state.scroll = offset;
     checkFinishedScrollFallback(ctx);
@@ -1503,9 +1552,12 @@ function doMaintainScrollAtEnd(ctx) {
     if (!state.maintainingScrollAtEnd) {
       const pendingState = maintainScrollAtEnd.animated ? "pending-animated" : "pending-instant";
       const activeState = maintainScrollAtEnd.animated ? "animated" : "instant";
+      const scrollAtRequest = state.scroll;
       state.maintainingScrollAtEnd = pendingState;
       requestAnimationFrame(() => {
-        if (peek$(ctx, "isWithinMaintainScrollAtEndThreshold")) {
+        const isStillWithinThreshold = peek$(ctx, "isWithinMaintainScrollAtEndThreshold");
+        const didScrollSinceRequest = state.scroll !== scrollAtRequest;
+        if (isStillWithinThreshold || !didScrollSinceRequest) {
           state.maintainingScrollAtEnd = activeState;
           const scroller = refScroller.current;
           if (state.props.horizontal && isHorizontalRTL(state)) {
@@ -1535,6 +1587,7 @@ function doMaintainScrollAtEnd(ctx) {
           );
         } else if (state.maintainingScrollAtEnd === pendingState) {
           state.maintainingScrollAtEnd = void 0;
+          state.pendingMaintainScrollAtEnd = false;
         }
       });
     } else {
@@ -1576,20 +1629,21 @@ function requestAdjust(ctx, positionDiff, dataChanged) {
         } else {
           state.ignoreScrollFromMVCP.gt = threshold;
         }
-        if (state.ignoreScrollFromMVCPTimeout) {
-          clearTimeout(state.ignoreScrollFromMVCPTimeout);
-        }
         const delay = needsScrollWorkaround ? 250 : 100;
-        state.ignoreScrollFromMVCPTimeout = setTimeout(() => {
-          var _a3;
-          state.ignoreScrollFromMVCP = void 0;
-          const shouldForceUpdate = state.ignoreScrollFromMVCPIgnored && state.scrollProcessingEnabled !== false;
-          if (shouldForceUpdate) {
-            state.ignoreScrollFromMVCPIgnored = false;
-            state.scrollPending = state.scroll;
-            (_a3 = state.reprocessCurrentScroll) == null ? void 0 : _a3.call(state);
-          }
-        }, delay);
+        state.scheduledWork.timeout(
+          () => {
+            var _a3;
+            state.ignoreScrollFromMVCP = void 0;
+            const shouldForceUpdate = state.ignoreScrollFromMVCPIgnored && state.scrollProcessingEnabled !== false;
+            if (shouldForceUpdate) {
+              state.ignoreScrollFromMVCPIgnored = false;
+              state.scrollPending = state.scroll;
+              (_a3 = state.reprocessCurrentScroll) == null ? void 0 : _a3.call(state);
+            }
+          },
+          delay,
+          "ignoreScrollFromMVCP"
+        );
       }
     } else {
       state.adjustingFromInitialMount = (state.adjustingFromInitialMount || 0) + 1;
@@ -2017,10 +2071,7 @@ function updateScroll(ctx, newScroll, forceUpdate, options) {
       state.mvcpAnchorLock = void 0;
       state.pendingNativeMVCPAdjust = void 0;
       state.userScrollAnchorReset = { keys: /* @__PURE__ */ new Set() };
-      if (state.queuedMVCPRecalculate !== void 0) {
-        cancelAnimationFrame(state.queuedMVCPRecalculate);
-        state.queuedMVCPRecalculate = void 0;
-      }
+      state.scheduledWork.cancel("mvcpRecalculate");
       flushSync(runCalculateItems);
       scheduleFullDrawDistancePrewarm(ctx);
     } else {
@@ -2165,12 +2216,7 @@ function scrollTo(ctx, params) {
   const {
     props: { horizontal }
   } = state;
-  if (state.animFrameCheckFinishedScroll) {
-    cancelAnimationFrame(ctx.state.animFrameCheckFinishedScroll);
-  }
-  if (state.timeoutCheckFinishedScrollFallback) {
-    clearTimeout(ctx.state.timeoutCheckFinishedScrollFallback);
-  }
+  cancelScrollCompletionChecks(state);
   const requestedOffset = precomputedWithViewOffset ? scrollTargetOffset : calculateOffsetWithOffsetPosition(ctx, scrollTargetOffset, scrollTarget);
   const shouldPreserveRawInitialOffsetRequest = !!isInitialScroll && ((_a3 = state.initialScrollSession) == null ? void 0 : _a3.kind) === "offset";
   const targetOffset = clampScrollOffset(ctx, requestedOffset, scrollTarget);
@@ -2275,10 +2321,7 @@ function setInitialScrollTarget(ctx, target, options) {
   var _a3;
   const { state } = ctx;
   state.clearPreservedInitialScrollOnNextFinish = void 0;
-  if (state.timeoutPreservedInitialScrollClear !== void 0) {
-    clearTimeout(state.timeoutPreservedInitialScrollClear);
-    state.timeoutPreservedInitialScrollClear = void 0;
-  }
+  state.scheduledWork.cancel("preservedInitialScroll");
   state.initialScroll = target;
   if (options == null ? void 0 : options.resetDidFinish) {
     resetInitialRenderState(ctx, { resetInitialScroll: true });
@@ -2571,13 +2614,13 @@ function rearmBootstrapInitialScroll(ctx, options) {
   queueBootstrapInitialScrollReevaluation(ctx.state);
 }
 function createInitialScrollAtEndTarget(options) {
-  const { dataLength, footerSize, preserveForFooterLayout, stylePaddingBottom } = options;
+  const { dataLength, footerSize, preserveForFooterLayout, stylePaddingEnd } = options;
   return {
     contentOffset: void 0,
     index: Math.max(0, dataLength - 1),
     preserveForBottomPadding: true,
     preserveForFooterLayout,
-    viewOffset: -stylePaddingBottom - footerSize,
+    viewOffset: -stylePaddingEnd - footerSize,
     viewPosition: 1
   };
 }
@@ -2591,7 +2634,7 @@ function isRetargetableBottomAlignedInitialScrollTarget(target) {
   return !!(target && target.viewPosition === 1 && (shouldPreserveInitialScrollForBottomPadding(target) || shouldPreserveInitialScrollForFooterLayout(target)));
 }
 function createRetargetedBottomAlignedInitialScroll(options) {
-  const { dataLength, footerSize, initialScrollAtEnd, stylePaddingBottom, target } = options;
+  const { dataLength, footerSize, initialScrollAtEnd, stylePaddingEnd, target } = options;
   const preserveForFooterLayout = shouldPreserveInitialScrollForFooterLayout(target);
   return {
     ...target,
@@ -2599,7 +2642,7 @@ function createRetargetedBottomAlignedInitialScroll(options) {
     index: initialScrollAtEnd ? Math.max(0, dataLength - 1) : target.index,
     preserveForBottomPadding: true,
     preserveForFooterLayout,
-    viewOffset: -stylePaddingBottom - (preserveForFooterLayout ? footerSize : 0),
+    viewOffset: -stylePaddingEnd - (preserveForFooterLayout ? footerSize : 0),
     viewPosition: 1
   };
 }
@@ -2607,7 +2650,7 @@ function areEquivalentBootstrapInitialScrollTargets(current, next) {
   return current.index === next.index && current.preserveForBottomPadding === next.preserveForBottomPadding && current.preserveForFooterLayout === next.preserveForFooterLayout && current.viewOffset === next.viewOffset && current.viewPosition === next.viewPosition;
 }
 function clearPendingInitialScrollFooterLayout(ctx, options) {
-  const { dataLength, stylePaddingBottom, target } = options;
+  const { dataLength, stylePaddingEnd, target } = options;
   if (!shouldPreserveInitialScrollForFooterLayout(target)) {
     return;
   }
@@ -2615,7 +2658,7 @@ function clearPendingInitialScrollFooterLayout(ctx, options) {
     dataLength,
     footerSize: 0,
     preserveForFooterLayout: void 0,
-    stylePaddingBottom
+    stylePaddingEnd
   });
   setInitialScrollTarget(ctx, clearedFooterTarget);
 }
@@ -2676,7 +2719,7 @@ function schedulePreservedEndAnchorCorrectionFrame(ctx, correction) {
   });
 }
 function clearFinishedBootstrapInitialScrollTargetIfMovedAway(ctx) {
-  var _a3, _b;
+  var _a3;
   const state = ctx.state;
   const initialScroll = state.initialScroll;
   if (!state.didFinishInitialScroll || ((_a3 = state.scrollingTo) == null ? void 0 : _a3.isInitialScroll) || (initialScroll == null ? void 0 : initialScroll.viewPosition) !== 1 || state.preservedEndAnchorCorrection) {
@@ -2688,7 +2731,7 @@ function clearFinishedBootstrapInitialScrollTargetIfMovedAway(ctx) {
       if (shouldPreserveInitialScrollForFooterLayout(initialScroll)) {
         clearPendingInitialScrollFooterLayout(ctx, {
           dataLength: state.props.data.length,
-          stylePaddingBottom: (_b = state.props.stylePaddingBottom) != null ? _b : 0,
+          stylePaddingEnd: getStylePaddingEnd(state.props),
           target: initialScroll
         });
       } else {
@@ -2725,7 +2768,7 @@ function startBootstrapInitialScrollOnMount(ctx, options) {
   }
 }
 function handleBootstrapInitialScrollDataChange(ctx, options) {
-  const { dataLength, didDataChange, initialScrollAtEnd, previousDataLength, stylePaddingBottom } = options;
+  const { dataLength, didDataChange, initialScrollAtEnd, previousDataLength, stylePaddingEnd } = options;
   const state = ctx.state;
   const initialScroll = state.initialScroll;
   if (isOffsetInitialScrollSession(state) || !initialScroll) {
@@ -2747,18 +2790,18 @@ function handleBootstrapInitialScrollDataChange(ctx, options) {
       dataLength,
       footerSize: peek$(ctx, "footerSize") || 0,
       preserveForFooterLayout: shouldPreserveInitialScrollForFooterLayout(initialScroll),
-      stylePaddingBottom
+      stylePaddingEnd
     }) : createRetargetedBottomAlignedInitialScroll({
       dataLength,
       footerSize: peek$(ctx, "footerSize") || 0,
       initialScrollAtEnd,
-      stylePaddingBottom,
+      stylePaddingEnd,
       target: initialScroll
     });
     if (!shouldResetDidFinish && didFinishedInitialScrollMoveAwayFromTarget(ctx, initialScroll)) {
       clearPendingInitialScrollFooterLayout(ctx, {
         dataLength,
-        stylePaddingBottom,
+        stylePaddingEnd,
         target: initialScroll
       });
       return;
@@ -2790,7 +2833,7 @@ function handleBootstrapInitialScrollDataChange(ctx, options) {
   }
 }
 function handleBootstrapInitialScrollFooterLayout(ctx, options) {
-  const { dataLength, footerSize, initialScrollAtEnd, stylePaddingBottom } = options;
+  const { dataLength, footerSize, initialScrollAtEnd, stylePaddingEnd } = options;
   const state = ctx.state;
   if (!initialScrollAtEnd) {
     return;
@@ -2806,7 +2849,7 @@ function handleBootstrapInitialScrollFooterLayout(ctx, options) {
   if (didFinishedInitialScrollMoveAwayFromTarget(ctx, initialScroll)) {
     clearPendingInitialScrollFooterLayout(ctx, {
       dataLength,
-      stylePaddingBottom,
+      stylePaddingEnd,
       target: initialScroll
     });
   } else {
@@ -2814,13 +2857,13 @@ function handleBootstrapInitialScrollFooterLayout(ctx, options) {
       dataLength,
       footerSize,
       preserveForFooterLayout: shouldPreserveInitialScrollForFooterLayout(initialScroll),
-      stylePaddingBottom
+      stylePaddingEnd
     });
     const didTargetChange = initialScroll.index !== updatedInitialScroll.index || initialScroll.viewPosition !== updatedInitialScroll.viewPosition || initialScroll.viewOffset !== updatedInitialScroll.viewOffset;
     if (!didTargetChange) {
       clearPendingInitialScrollFooterLayout(ctx, {
         dataLength,
-        stylePaddingBottom,
+        stylePaddingEnd,
         target: initialScroll
       });
     } else {
@@ -3047,7 +3090,7 @@ function handleInitialScrollDataChange(ctx, options) {
     initialScrollAtEnd,
     latestInitialScroll,
     latestInitialScrollSessionKind,
-    stylePaddingBottom,
+    stylePaddingEnd,
     useBootstrapInitialScroll
   } = options;
   const state = ctx.state;
@@ -3077,7 +3120,7 @@ function handleInitialScrollDataChange(ctx, options) {
       didDataChange,
       initialScrollAtEnd,
       previousDataLength: previousInitialScrollDataLength,
-      stylePaddingBottom
+      stylePaddingEnd
     });
     return;
   }
@@ -3547,7 +3590,6 @@ function setupViewability(props) {
 }
 function updateViewableItems(state, ctx, viewabilityConfigCallbackPairs, scrollSize, start, end, startBuffered = start, endBuffered = end) {
   const {
-    timeouts,
     props: { data }
   } = state;
   for (const viewabilityConfigCallbackPair of viewabilityConfigCallbackPairs) {
@@ -3557,11 +3599,10 @@ function updateViewableItems(state, ctx, viewabilityConfigCallbackPairs, scrollS
     viewabilityState.startBuffered = startBuffered;
     viewabilityState.endBuffered = endBuffered;
     if (viewabilityConfigCallbackPair.viewabilityConfig.minimumViewTime) {
-      const timer = setTimeout(() => {
-        timeouts.delete(timer);
-        updateViewableItemsWithConfig(data, viewabilityConfigCallbackPair, state, ctx, scrollSize);
-      }, viewabilityConfigCallbackPair.viewabilityConfig.minimumViewTime);
-      timeouts.add(timer);
+      state.scheduledWork.timeout(
+        () => updateViewableItemsWithConfig(data, viewabilityConfigCallbackPair, state, ctx, scrollSize),
+        viewabilityConfigCallbackPair.viewabilityConfig.minimumViewTime
+      );
     } else {
       updateViewableItemsWithConfig(data, viewabilityConfigCallbackPair, state, ctx, scrollSize);
     }
@@ -3920,20 +3961,15 @@ function getProjectedBufferAdjustment(scrollVelocity, trailingBuffer) {
 }
 function scheduleRenderRangeProjectionSettle(ctx) {
   const state = ctx.state;
-  const previousTimeout = state.timeoutRenderRangeProjectionSettle;
-  if (previousTimeout !== void 0) {
-    clearTimeout(previousTimeout);
-    state.timeouts.delete(previousTimeout);
-  }
-  const timeout = setTimeout(() => {
-    var _a3;
-    state.timeoutRenderRangeProjectionSettle = void 0;
-    state.timeouts.delete(timeout);
-    state.scrollHistory.length = 0;
-    (_a3 = state.triggerCalculateItemsInView) == null ? void 0 : _a3.call(state);
-  }, RENDER_RANGE_PROJECTION_SETTLE_DELAY);
-  state.timeoutRenderRangeProjectionSettle = timeout;
-  state.timeouts.add(timeout);
+  state.scheduledWork.timeout(
+    () => {
+      var _a3;
+      state.scrollHistory.length = 0;
+      (_a3 = state.triggerCalculateItemsInView) == null ? void 0 : _a3.call(state);
+    },
+    RENDER_RANGE_PROJECTION_SETTLE_DELAY,
+    "renderRangeProjection"
+  );
 }
 function findCurrentStickyIndex(stickyArray, scroll, state) {
   const positions = state.positions;
@@ -4601,8 +4637,6 @@ function maybeUpdateAnchoredEndSpace(ctx) {
     if (anchorIndex >= 0 && anchorIndex < data.length && state.scrollLength > 0) {
       nextAnchorKey = getId(state, anchorIndex);
       let contentBelowAnchor = 0;
-      const footerSize = ctx.values.get("footerSize") || 0;
-      const stylePaddingBottom = state.props.stylePaddingBottom || 0;
       let hasUnknownTailSize = false;
       for (let index = anchorIndex; index < data.length; index++) {
         const size = getKnownOrFixedItemSize(ctx, index);
@@ -4614,14 +4648,16 @@ function maybeUpdateAnchoredEndSpace(ctx) {
           contentBelowAnchor += effectiveSize;
         }
       }
-      contentBelowAnchor += footerSize + stylePaddingBottom;
+      contentBelowAnchor = Math.max(0, contentBelowAnchor - ctx.scrollAxisGap);
+      contentBelowAnchor += (ctx.values.get("footerSize") || 0) + getStylePaddingEnd(state.props);
       isReady = !hasUnknownTailSize;
       nextSize = hasUnknownTailSize ? previousSize || 0 : Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
     } else if (anchorIndex >= 0) {
       isReady = false;
     }
   }
-  const didSizeChange = previousSize !== nextSize;
+  const didSizeChange = previousSize !== nextSize && (previousSize !== void 0 || anchoredEndSpace !== void 0);
+  const didEffectiveSizeChange = (previousSize || 0) !== nextSize;
   const didReadyAnchorChange = previousReadyAnchorIndex !== nextAnchorIndex || previousReadyAnchorKey !== nextAnchorKey;
   if (isReady && (didSizeChange || didReadyAnchorChange)) {
     state.anchoredEndSpaceReadyAnchorIndex = nextAnchorIndex;
@@ -4630,8 +4666,9 @@ function maybeUpdateAnchoredEndSpace(ctx) {
       set$(ctx, "anchoredEndSpaceSize", nextSize);
       (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
     }
-    if (didSizeChange && (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset)) {
-      updateScroll(ctx, state.scroll, true);
+    if (didEffectiveSizeChange) {
+      updateContentMetricsState(ctx);
+      updateScroll(ctx, state.scroll, true, { markHasScrolled: false });
     }
     (_b = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onReady) == null ? void 0 : _b.call(anchoredEndSpace, { anchorIndex: nextAnchorIndex, anchorKey: nextAnchorKey, size: nextSize });
   }
@@ -4660,16 +4697,10 @@ function runOrScheduleMVCPRecalculate(ctx) {
     }
   } else if (Platform.OS === "web") {
     if (!state.mvcpAnchorLock) {
-      if (state.queuedMVCPRecalculate !== void 0) {
-        cancelAnimationFrame(state.queuedMVCPRecalculate);
-        state.queuedMVCPRecalculate = void 0;
-      }
+      state.scheduledWork.cancel("mvcpRecalculate");
       calculateItemsInView(ctx, { doMVCP: true });
-    } else if (state.queuedMVCPRecalculate === void 0) {
-      state.queuedMVCPRecalculate = requestAnimationFrame(() => {
-        state.queuedMVCPRecalculate = void 0;
-        calculateItemsInView(ctx, { doMVCP: true });
-      });
+    } else if (!state.scheduledWork.has("mvcpRecalculate")) {
+      state.scheduledWork.frame(() => calculateItemsInView(ctx, { doMVCP: true }), "mvcpRecalculate");
     }
   } else {
     calculateItemsInView(ctx, { doMVCP: true });
@@ -4716,6 +4747,9 @@ function flushItemSizeUpdates(ctx, result) {
   } else if (result.didMeasureUserScrollAnchorResetItem && ((_a3 = state.userScrollAnchorReset) == null ? void 0 : _a3.keys.size) === 0) {
     state.userScrollAnchorReset = void 0;
   }
+  if (result.didChange) {
+    maybeUpdateAnchoredEndSpace(ctx);
+  }
   if (result.didChange && result.shouldMaintainScrollAtEnd) {
     doMaintainScrollAtEnd(ctx);
   }
@@ -4795,7 +4829,7 @@ function applyItemSize(ctx, itemKey, sizeObj, resolvedMeasurementItem) {
     if (!needsRecalculate && state.containerItemKeys.has(itemKey)) {
       needsRecalculate = true;
     }
-    if (prevSizeKnown !== void 0 && Math.abs(prevSizeKnown - size) > 5) {
+    if (prevSizeKnown === void 0 || Math.abs(prevSizeKnown - size) > 5) {
       shouldMaintainScrollAtEnd = true;
     }
     onItemSizeChanged == null ? void 0 : onItemSizeChanged({
@@ -4805,7 +4839,6 @@ function applyItemSize(ctx, itemKey, sizeObj, resolvedMeasurementItem) {
       previous: size - diff,
       size
     });
-    maybeUpdateAnchoredEndSpace(ctx);
   }
   if (minIndexSizeChanged !== void 0) {
     state.minIndexSizeChanged = state.minIndexSizeChanged !== void 0 ? Math.min(state.minIndexSizeChanged, minIndexSizeChanged) : minIndexSizeChanged;
@@ -5645,19 +5678,32 @@ function ContainerSlotBase({
 var ContainerSlot = typedMemo(function ContainerSlot2(props) {
   return /* @__PURE__ */ React2.createElement(ContainerSlotBase, { ...props });
 });
+function useFreshDataTransitionVisibility(readyToRender, transitionEpoch) {
+  const [completedTransitionEpoch, setCompletedTransitionEpoch] = useState(transitionEpoch);
+  const isTransitionPending = completedTransitionEpoch !== transitionEpoch;
+  useLayoutEffect(() => {
+    setCompletedTransitionEpoch(transitionEpoch);
+  }, [transitionEpoch]);
+  return readyToRender && !isTransitionPending;
+}
 
 // src/components/Containers.native.tsx
-var ContainersLayer = typedMemo(function ContainersLayer2({ children, horizontal }) {
+var ContainersLayer = typedMemo(function ContainersLayer2({
+  children,
+  freshDataTransitionEpoch,
+  horizontal
+}) {
   const ctx = useStateContext();
   const columnWrapperStyle = ctx.columnWrapperStyle;
   const animSize = useValue$("totalSize");
   const [readyToRender, numColumns, otherAxisSize = 0] = useArr$(["readyToRender", "numColumns", "otherAxisSize"]);
+  const isVisible = useFreshDataTransitionVisibility(!!readyToRender, freshDataTransitionEpoch);
   const style = horizontal ? {
     height: otherAxisSize || "100%",
     minHeight: otherAxisSize,
-    opacity: readyToRender ? 1 : 0,
+    opacity: isVisible ? 1 : 0,
     width: animSize
-  } : { height: animSize, minWidth: otherAxisSize, opacity: readyToRender ? 1 : 0 };
+  } : { height: animSize, minWidth: otherAxisSize, opacity: isVisible ? 1 : 0 };
   if (columnWrapperStyle) {
     const { columnGap, rowGap, gap } = columnWrapperStyle;
     const gapX = columnGap || gap || 0;
@@ -5678,9 +5724,10 @@ var ContainersLayer = typedMemo(function ContainersLayer2({ children, horizontal
       }
     }
   }
-  return /* @__PURE__ */ React2.createElement(Animated.View, { style }, /* @__PURE__ */ React2.createElement(ContainerLayoutCoordinator, null, children));
+  return /* @__PURE__ */ React2.createElement(Animated.View, { pointerEvents: isVisible ? void 0 : "none", style }, /* @__PURE__ */ React2.createElement(ContainerLayoutCoordinator, null, children));
 });
 var Containers = typedMemo(function Containers2({
+  freshDataTransitionEpoch,
   horizontal,
   recycleItems,
   ItemSeparatorComponent,
@@ -5705,7 +5752,7 @@ var Containers = typedMemo(function Containers2({
       )
     );
   }
-  return /* @__PURE__ */ React2.createElement(ContainersLayer, { horizontal }, containers);
+  return /* @__PURE__ */ React2.createElement(ContainersLayer, { freshDataTransitionEpoch, horizontal }, containers);
 });
 var ListComponentScrollView = Animated.ScrollView;
 
@@ -5744,16 +5791,6 @@ var SnapWrapper = React2.forwardRef(function SnapWrapperInner({ ScrollComponent,
   const [snapToOffsets] = useArr$(["snapToOffsets"]);
   return /* @__PURE__ */ React2.createElement(ScrollComponent, { ...props, ref, snapToOffsets });
 });
-function WebAnchoredEndSpace({ horizontal }) {
-  const ctx = useStateContext();
-  const [anchoredEndSpaceSize] = useArr$(["anchoredEndSpaceSize"]);
-  const shouldRenderAnchoredEndSpace = !!ctx.state.props.anchoredEndSpace && (anchoredEndSpaceSize || 0) > 0;
-  if (!shouldRenderAnchoredEndSpace) {
-    return null;
-  }
-  const style = horizontal ? { height: "100%", width: anchoredEndSpaceSize || 0 } : { height: anchoredEndSpaceSize || 0 };
-  return /* @__PURE__ */ React2.createElement("div", { style }, null);
-}
 
 // src/core/updateContentMetrics.ts
 var SCROLL_ADJUST_EPSILON = 0.1;
@@ -5787,7 +5824,11 @@ function setHeaderSize(ctx, size) {
   state.didMeasureHeader = true;
 }
 function setFooterSize(ctx, size) {
-  return setContentLengthSignal(ctx, "footerSize", size);
+  const didChange = setContentLengthSignal(ctx, "footerSize", size);
+  if (didChange) {
+    maybeUpdateAnchoredEndSpace(ctx);
+  }
+  return didChange;
 }
 function areInsetsEqual(left, right) {
   var _a3, _b, _c, _d, _e, _f, _g, _h;
@@ -5830,6 +5871,7 @@ var LayoutView = ({ onLayoutChange, refView, ...rest }) => {
   const { onLayout } = useOnLayoutSync({ onLayoutChange, ref });
   return /* @__PURE__ */ React2.createElement(View$1, { ...rest, onLayout, ref });
 };
+var StyleSheet = StyleSheet$1;
 
 // src/components/ListComponent.tsx
 var AlignItemsAtEndSpacer = typedMemo(function AlignItemsAtEndSpacer2({ horizontal }) {
@@ -5847,6 +5889,7 @@ var AlignItemsAtEndSpacer = typedMemo(function AlignItemsAtEndSpacer2({ horizont
 });
 var ListComponent = typedMemo(function ListComponent2({
   canRender,
+  freshDataTransitionEpoch,
   style,
   contentContainerStyle,
   horizontal,
@@ -5876,8 +5919,17 @@ var ListComponent = typedMemo(function ListComponent2({
 }) {
   const ctx = useStateContext();
   const maintainVisibleContentPosition = ctx.state.props.maintainVisibleContentPosition;
-  const [otherAxisSize = 0] = useArr$(["otherAxisSize"]);
+  const [anchoredEndSpaceSize = 0, otherAxisSize = 0] = useArr$(["anchoredEndSpaceSize", "otherAxisSize"]);
   const shouldRenderAlignItemsAtEndSpacer = ctx.state.props.alignItemsAtEndPaddingEnabled;
+  const shouldMaterializeAnchoredEndSpace = !!ctx.state.props.anchoredEndSpace && ctx.state.props.anchoredEndSpaceOwner === "list" && anchoredEndSpaceSize > 0;
+  let anchoredEndSpaceStyle;
+  if (shouldMaterializeAnchoredEndSpace) {
+    const paddingEnd = horizontal ? isHorizontalRTL(ctx.state) ? "Left" : "Right" : "Bottom";
+    const flattenedContentContainerStyle = StyleSheet.flatten(contentContainerStyle);
+    anchoredEndSpaceStyle = {
+      [`padding${paddingEnd}`]: extractPadding({}, flattenedContentContainerStyle || {}, paddingEnd) + anchoredEndSpaceSize
+    };
+  }
   const autoOtherAxisStyle = getAutoOtherAxisStyle({
     horizontal,
     needsOtherAxisSize: ctx.state.needsOtherAxisSize,
@@ -5930,10 +5982,10 @@ var ListComponent = typedMemo(function ListComponent2({
       ...rest,
       ...Platform.OS === "web" ? ScrollComponent === ListComponentScrollView ? { onInternalScrollEnd, useWindowScroll } : {} : { onScrollBeginDrag: onInternalScrollBeginDrag },
       contentContainerStyle: [
-        horizontal ? {
-          height: "100%"
-        } : {},
-        contentContainerStyle
+        horizontal ? { height: "100%" } : {},
+        contentContainerStyle,
+        anchoredEndSpaceStyle,
+        Platform.OS === "web" ? { boxSizing: "border-box" } : void 0
       ],
       contentOffset: initialContentOffset !== void 0 ? horizontal ? { x: initialContentOffset, y: 0 } : { x: 0, y: initialContentOffset } : void 0,
       horizontal,
@@ -5951,6 +6003,7 @@ var ListComponent = typedMemo(function ListComponent2({
     canRender && !ListEmptyComponent && /* @__PURE__ */ React2.createElement(
       Containers,
       {
+        freshDataTransitionEpoch,
         getRenderedItem: getRenderedItem2,
         horizontal,
         ItemSeparatorComponent,
@@ -5959,7 +6012,6 @@ var ListComponent = typedMemo(function ListComponent2({
       }
     ),
     ListFooterComponent && /* @__PURE__ */ React2.createElement(LayoutView, { onLayoutChange: onLayoutFooterInternal, style: ListFooterComponentStyle }, getComponent(ListFooterComponent)),
-    Platform.OS === "web" && /* @__PURE__ */ React2.createElement(WebAnchoredEndSpace, { horizontal }),
     IS_DEV && ENABLE_DEVMODE
   );
 });
@@ -5968,7 +6020,16 @@ var WEB_UNBOUNDED_HEIGHT_CONTAINER_RATIO = 0.9;
 var WEB_UNBOUNDED_HEIGHT_VIEWPORT_RATIO = 0.9;
 function useDevChecksImpl(props) {
   const ctx = useStateContext();
-  const { childrenMode, keyExtractor, renderScrollComponent, useWindowScroll } = props;
+  const { anchoredEndSpace, childrenMode, keyExtractor, numColumns, renderScrollComponent, useWindowScroll } = props;
+  const hasAnchoredEndSpace = !!anchoredEndSpace;
+  useEffect(() => {
+    if (hasAnchoredEndSpace && (numColumns != null ? numColumns : 1) > 1) {
+      warnDevOnce(
+        "anchoredEndSpaceNumColumns",
+        "anchoredEndSpace is only supported when numColumns is 1. Using it with multiple columns may produce incorrect anchored spacing."
+      );
+    }
+  }, [hasAnchoredEndSpace, numColumns]);
   useEffect(() => {
     if (useWindowScroll && renderScrollComponent) {
       warnDevOnce(
@@ -6296,6 +6357,60 @@ function onScroll(ctx, event) {
   }
 }
 
+// src/core/ScheduledWork.ts
+var ScheduledWork = class {
+  constructor() {
+    this.work = /* @__PURE__ */ new Map();
+  }
+  timeout(callback, delay, key) {
+    if (key) {
+      this.cancel(key);
+    }
+    const work = [void 0, clearTimeout];
+    const handle = setTimeout(() => {
+      const workKey = key != null ? key : handle;
+      if (this.work.get(workKey) === work) {
+        this.work.delete(workKey);
+        callback();
+      }
+    }, delay);
+    work[0] = handle;
+    this.work.set(key != null ? key : handle, work);
+  }
+  frame(callback, key) {
+    this.cancel(key);
+    const work = [void 0, cancelAnimationFrame];
+    this.work.set(key, work);
+    work[0] = requestAnimationFrame(() => {
+      if (this.work.get(key) === work) {
+        this.work.delete(key);
+        callback();
+      }
+    });
+  }
+  register(key, cancel) {
+    this.cancel(key);
+    this.work.set(key, [void 0, cancel]);
+  }
+  cancel(key) {
+    const work = this.work.get(key);
+    if (work) {
+      this.work.delete(key);
+      const [handle, cancel] = work;
+      cancel(handle);
+    }
+  }
+  has(key) {
+    return this.work.has(key);
+  }
+  dispose() {
+    for (const [handle, cancel] of this.work.values()) {
+      cancel(handle);
+    }
+    this.work.clear();
+  }
+};
+
 // src/core/ScrollAdjustHandler.ts
 var ScrollAdjustHandler = class {
   constructor(ctx) {
@@ -6383,7 +6498,6 @@ var useCombinedRef = (...refs) => {
   }, refs);
   return callback;
 };
-var StyleSheet = StyleSheet$1;
 function useStickyScrollHandler(stickyHeaderIndices, horizontal, ctx, onScroll2) {
   const shouldUseRnAnimatedEngine = !ctx.state.props.stickyPositionComponentInternal;
   return useMemo(() => {
@@ -6470,7 +6584,7 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
   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.queuedMVCPRecalculate !== void 0 || state.ignoreScrollFromMVCP !== void 0;
+  const isSettlingAfterDataChange = () => !!state.didDataChange || !!state.didColumnsChange || state.scheduledWork.has("mvcpRecalculate") || state.ignoreScrollFromMVCP !== void 0;
   const isScrollToIndexReady = (targetIndex, allowEmpty = false) => {
     var _a3;
     const props = state.props;
@@ -6504,9 +6618,9 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
         run();
         return;
       }
-      requestAnimationFrame(check);
+      state.scheduledWork.frame(check, "imperativeScrollReady");
     };
-    requestAnimationFrame(check);
+    state.scheduledWork.frame(check, "imperativeScrollReady");
   };
   const runScrollRequest = (token, resolve, run, isReady = () => true) => {
     const runNow = () => {
@@ -6528,15 +6642,15 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
     }
   };
   const startImperativeScroll = (resolve) => {
-    var _a3;
+    state.scheduledWork.cancel("imperativeScrollReady");
     const token = ++imperativeScrollToken;
-    state.pendingScrollToEnd = void 0;
-    (_a3 = state.pendingScrollResolve) == null ? void 0 : _a3.call(state);
+    settlePendingImperativeScroll(state);
     state.pendingScrollResolve = resolve;
     return token;
   };
   const runScrollWithPromise = (run, isReady = () => true) => new Promise((resolve) => {
     const token = startImperativeScroll(resolve);
+    supersedeInitialScroll(ctx);
     runScrollRequest(token, resolve, run, isReady);
   });
   state.runPendingScrollToEnd = () => {
@@ -6615,6 +6729,7 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
       end: state.endNoBuffer,
       endBuffered: state.endBuffered,
       getAverageItemSizes: () => getAverageItemSizes(state),
+      indexByKey: (key) => state.indexByKey.get(key),
       isAtEnd: peek$(ctx, "isAtEnd"),
       isAtStart: peek$(ctx, "isAtStart"),
       isEndReached: state.isEndReached,
@@ -6662,9 +6777,9 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
         resolve,
         token
       };
-      if (scheduleImperativeScrollCommit) {
-        scheduleImperativeScrollCommit();
-      } else {
+      scheduleImperativeScrollCommit == null ? void 0 : scheduleImperativeScrollCommit();
+      supersedeInitialScroll(ctx);
+      if (!scheduleImperativeScrollCommit) {
         (_a3 = state.runPendingScrollToEnd) == null ? void 0 : _a3.call(state);
       }
     }),
@@ -6918,7 +7033,7 @@ var LegendList = typedMemo(
   })
 );
 var LegendListInner = typedForwardRef(function LegendListInner2(props, forwardedRef) {
-  var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+  var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s;
   const noopOnScroll = useCallback((_event) => {
   }, []);
   if (props.recycleItems === void 0) {
@@ -6994,9 +7109,11 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     ...rest
   } = props;
   const animatedPropsInternal = props.animatedPropsInternal;
+  const anchoredEndSpaceOwner = (_a3 = props.anchoredEndSpaceOwnerInternal) != null ? _a3 : "list";
   const positionComponentInternal = props.positionComponentInternal;
   const stickyPositionComponentInternal = props.stickyPositionComponentInternal;
   const {
+    anchoredEndSpaceOwnerInternal: _anchoredEndSpaceOwnerInternal,
     positionComponentInternal: _positionComponentInternal,
     stickyPositionComponentInternal: _stickyPositionComponentInternal,
     ...restProps
@@ -7018,6 +7135,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const stylePaddingBottomState = extractPadding(style, contentContainerStyle, "Bottom");
   const stylePaddingLeftState = extractPadding(style, contentContainerStyle, "Left");
   const stylePaddingRightState = extractPadding(style, contentContainerStyle, "Right");
+  const stylePaddingEndState = getStylePaddingEnd({
+    horizontal,
+    rtl,
+    stylePaddingBottom: stylePaddingBottomState,
+    stylePaddingLeft: stylePaddingLeftState,
+    stylePaddingRight: stylePaddingRightState
+  });
   const maintainScrollAtEndConfig = normalizeMaintainScrollAtEnd(maintainScrollAtEnd);
   const maintainVisibleContentPositionConfig = normalizeMaintainVisibleContentPosition(
     maintainVisibleContentPositionProp
@@ -7030,13 +7154,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const initialScrollProp = initialScrollAtEnd ? {
     index: Math.max(0, dataProp.length - 1),
     preserveForBottomPadding: true,
-    viewOffset: -stylePaddingBottomState,
+    viewOffset: -stylePaddingEndState,
     viewPosition: 1
   } : hasInitialScrollIndex ? typeof initialScrollIndexProp === "object" ? {
-    index: (_a3 = initialScrollIndexProp.index) != null ? _a3 : 0,
+    index: (_b = initialScrollIndexProp.index) != null ? _b : 0,
     preserveForBottomPadding: initialScrollIndexProp.viewOffset === void 0 && initialScrollIndexProp.viewPosition === 1 ? true : void 0,
-    viewOffset: (_b = initialScrollIndexProp.viewOffset) != null ? _b : initialScrollIndexProp.viewPosition === 1 ? -stylePaddingBottomState : 0,
-    viewPosition: (_c = initialScrollIndexProp.viewPosition) != null ? _c : 0
+    viewOffset: (_c = initialScrollIndexProp.viewOffset) != null ? _c : initialScrollIndexProp.viewPosition === 1 ? -stylePaddingEndState : 0,
+    viewPosition: (_d = initialScrollIndexProp.viewPosition) != null ? _d : 0
   } : {
     index: initialScrollIndexProp != null ? initialScrollIndexProp : 0,
     viewOffset: initialScrollOffsetProp != null ? initialScrollOffsetProp : 0
@@ -7049,7 +7173,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const [, scheduleImperativeScrollCommit] = React2.useReducer((value) => value + 1, 0);
   const ctx = useStateContext();
   ctx.columnWrapperStyle = columnWrapperStyle || (contentContainerStyle ? createColumnWrapperStyle(contentContainerStyle) : void 0);
-  const scrollAxisGap = horizontal ? (_f = (_d = ctx.columnWrapperStyle) == null ? void 0 : _d.columnGap) != null ? _f : (_e = ctx.columnWrapperStyle) == null ? void 0 : _e.gap : (_i = (_g = ctx.columnWrapperStyle) == null ? void 0 : _g.rowGap) != null ? _i : (_h = ctx.columnWrapperStyle) == null ? void 0 : _h.gap;
+  const scrollAxisGap = horizontal ? (_g = (_e = ctx.columnWrapperStyle) == null ? void 0 : _e.columnGap) != null ? _g : (_f = ctx.columnWrapperStyle) == null ? void 0 : _f.gap : (_j = (_h = ctx.columnWrapperStyle) == null ? void 0 : _h.rowGap) != null ? _j : (_i = ctx.columnWrapperStyle) == null ? void 0 : _i.gap;
   const nextScrollAxisGap = typeof scrollAxisGap === "number" && Number.isFinite(scrollAxisGap) ? scrollAxisGap : 0;
   const refScroller = useRef(null);
   const combinedRef = useCombinedRef(refScroller, refScrollView);
@@ -7064,8 +7188,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex,
     alwaysRender == null ? void 0 : alwaysRender.top,
     alwaysRender == null ? void 0 : alwaysRender.bottom,
-    (_j = alwaysRender == null ? void 0 : alwaysRender.indices) == null ? void 0 : _j.join(","),
-    (_k = alwaysRender == null ? void 0 : alwaysRender.keys) == null ? void 0 : _k.join(","),
+    (_k = alwaysRender == null ? void 0 : alwaysRender.indices) == null ? void 0 : _k.join(","),
+    (_l = alwaysRender == null ? void 0 : alwaysRender.keys) == null ? void 0 : _l.join(","),
     dataProp,
     dataKey,
     dataVersion,
@@ -7078,7 +7202,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   if (!refState.current) {
     if (!ctx.state) {
       const initialScrollLength = (estimatedListSize != null ? estimatedListSize : IsNewArchitecture ? { height: 0, width: 0 } : getWindowSize())[horizontal ? "width" : "height"];
-      ctx.values.set("adaptiveRender", (_l = experimental_adaptiveRender == null ? void 0 : experimental_adaptiveRender.initialMode) != null ? _l : "normal");
+      ctx.values.set("adaptiveRender", (_m = experimental_adaptiveRender == null ? void 0 : experimental_adaptiveRender.initialMode) != null ? _m : "normal");
       ctx.state = {
         averageSizes: {},
         columnSpans: [],
@@ -7097,6 +7221,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         endNoBuffer: -1,
         endReachedSnapshot: void 0,
         firstFullyOnScreenIndex: -1,
+        freshDataTransitionEpoch: 0,
         hasHadNonEmptyData: dataProp.length > 0,
         idCache: [],
         idsInView: [],
@@ -7121,8 +7246,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         positions: [],
         props: {},
         queuedCalculateItemsInView: 0,
-        queuedFullDrawDistancePrewarm: void 0,
         refScroller: { current: null },
+        scheduledWork: new ScheduledWork(),
         scroll: 0,
         scrollAdjustHandler: new ScrollAdjustHandler(ctx),
         scrollForNextCalculateItemsInView: void 0,
@@ -7140,8 +7265,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         startReachedSnapshot: void 0,
         stickyContainerPool: /* @__PURE__ */ new Set(),
         stickyContainers: /* @__PURE__ */ new Map(),
-        timeoutAdaptiveRender: void 0,
-        timeouts: /* @__PURE__ */ new Set(),
         totalSize: 0,
         viewabilityConfigCallbackPairs: void 0
       };
@@ -7163,13 +7286,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   const didScrollAxisGapChange = !isFirstLocal && ctx.scrollAxisGap !== nextScrollAxisGap;
   ctx.scrollAxisGap = nextScrollAxisGap;
   state.didColumnsChange = numColumnsProp !== previousNumColumnsProp || didScrollAxisGapChange;
-  const previousDataLength = (_n = (_m = state.props.data) == null ? void 0 : _m.length) != null ? _n : 0;
+  const previousDataLength = (_o = (_n = state.props.data) == null ? void 0 : _n.length) != null ? _o : 0;
   const didDataReferenceChangeLocal = state.props.data !== dataProp;
   const didDataKeyChangeLocal = state.props.dataKey !== dataKey;
   const didDataVersionChangeLocal = state.props.dataVersion !== dataVersion;
   const didDataChangeLocal = didDataKeyChangeLocal || didDataVersionChangeLocal || didDataReferenceChangeLocal && checkStructuralDataChange(state, dataProp, state.props.data);
   const shouldResetFreshDataLayout = !isFirstLocal && didDataChangeLocal && state.hasHadNonEmptyData && (didDataKeyChangeLocal || previousDataLength === 0) && dataProp.length > 0;
-  if (didDataChangeLocal && !initialScrollAtEnd && state.didFinishInitialScroll && ((_o = state.initialScroll) == null ? void 0 : _o.viewPosition) === 1 && state.props.data.length > 0) {
+  if (didDataChangeLocal && !initialScrollAtEnd && state.didFinishInitialScroll && ((_p = state.initialScroll) == null ? void 0 : _p.viewPosition) === 1 && state.props.data.length > 0) {
     clearPreservedInitialScrollTarget(state);
   }
   if (didDataChangeLocal) {
@@ -7178,10 +7301,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     state.didDataChange = true;
     state.previousData = state.props.data;
   }
+  if (shouldResetFreshDataLayout) {
+    state.freshDataTransitionEpoch += 1;
+  }
   const throttledOnScroll = useThrottledOnScroll(onScrollProp != null ? onScrollProp : noopOnScroll, scrollEventThrottle != null ? scrollEventThrottle : 0);
   const throttleScrollFn = scrollEventThrottle && onScrollProp ? throttledOnScroll : onScrollProp;
-  const anchoredEndSpaceResolved = Platform.OS === "web" && anchoredEndSpace ? { ...anchoredEndSpace, includeInEndInset: true } : anchoredEndSpace;
-  const didAnchoredEndSpaceAnchorIndexChange = !isFirstLocal && !didDataChangeLocal && ((_p = state.props.anchoredEndSpace) == null ? void 0 : _p.anchorIndex) !== (anchoredEndSpaceResolved == null ? void 0 : anchoredEndSpaceResolved.anchorIndex);
+  const didAnchoredEndSpaceAnchorIndexChange = !isFirstLocal && !didDataChangeLocal && ((_q = state.props.anchoredEndSpace) == null ? void 0 : _q.anchorIndex) !== (anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex);
   state.props = {
     adaptiveRender: experimental_adaptiveRender,
     alignItemsAtEnd,
@@ -7189,7 +7314,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     alwaysRender,
     alwaysRenderIndicesArr: alwaysRenderIndices.arr,
     alwaysRenderIndicesSet: alwaysRenderIndices.set,
-    anchoredEndSpace: anchoredEndSpaceResolved,
+    anchoredEndSpace,
+    anchoredEndSpaceOwner,
     animatedProps: animatedPropsInternal,
     contentContainerAlignItems: contentContainerStyle.alignItems,
     contentInset,
@@ -7238,12 +7364,6 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   if (!isFirstLocal && previousAdaptiveRender && !experimental_adaptiveRender) {
     resetAdaptiveRender(ctx);
   }
-  if (shouldResetFreshDataLayout) {
-    resetInitialRenderState(ctx, {
-      resetInitialScroll: !!initialScrollProp,
-      resetLayout: true
-    });
-  }
   const memoizedLastItemKeys = useMemo(() => {
     if (!dataProp.length) return [];
     return Array.from(
@@ -7307,6 +7427,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     useDevChecks(props);
   }
   useLayoutEffect(() => {
+    if (shouldResetFreshDataLayout) {
+      resetInitialRenderState(ctx, {
+        resetInitialScroll: !!initialScrollProp,
+        resetLayout: true
+      });
+    }
     handleInitialScrollDataChange(ctx, {
       dataLength: dataProp.length,
       didDataChange: didDataChangeLocal,
@@ -7314,7 +7440,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       initialScrollAtEnd,
       latestInitialScroll: initialScrollProp,
       latestInitialScrollSessionKind: initialScrollUsesOffsetOnly ? "offset" : "bootstrap",
-      stylePaddingBottom: stylePaddingBottomState,
+      stylePaddingEnd: stylePaddingEndState,
       useBootstrapInitialScroll: usesBootstrapInitialScroll
     });
   }, [
@@ -7323,7 +7449,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     didDataChangeLocal,
     shouldResetFreshDataLayout,
     initialScrollAtEnd,
-    stylePaddingBottomState,
+    stylePaddingEndState,
     usesBootstrapInitialScroll
   ]);
   useLayoutEffect(() => {
@@ -7341,7 +7467,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorMaxSize,
     anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorOffset,
     didAnchoredEndSpaceAnchorIndexChange,
-    numColumnsProp
+    horizontal,
+    numColumnsProp,
+    rtl,
+    stylePaddingBottomState,
+    stylePaddingLeftState,
+    stylePaddingRightState
   ]);
   useLayoutEffect(() => {
     const previousContentInsetEndAdjustment = previousContentInsetEndAdjustmentRef.current;
@@ -7357,10 +7488,10 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         dataLength: dataProp.length,
         footerSize: layout[horizontal ? "width" : "height"],
         initialScrollAtEnd,
-        stylePaddingBottom: stylePaddingBottomState
+        stylePaddingEnd: stylePaddingEndState
       });
     },
-    [dataProp.length, initialScrollAtEnd, horizontal, stylePaddingBottomState, usesBootstrapInitialScroll]
+    [dataProp.length, initialScrollAtEnd, horizontal, stylePaddingEndState, usesBootstrapInitialScroll]
   );
   const onLayoutChange = useCallback(
     (layout, fromLayoutEffect) => {
@@ -7377,7 +7508,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       }
       advanceCurrentInitialScrollSession(ctx);
     },
-    [dataProp.length, initialScrollAtEnd, stylePaddingBottomState, usesBootstrapInitialScroll]
+    [dataProp.length, initialScrollAtEnd, stylePaddingEndState, usesBootstrapInitialScroll]
   );
   const { onLayout } = useOnLayoutSync({
     onLayoutChange,
@@ -7473,14 +7604,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
   useImperativeHandle(forwardedRef, () => createImperativeHandle(ctx, scheduleImperativeScrollCommit), []);
   useEffect(() => {
     return () => {
-      if (state.queuedFullDrawDistancePrewarm !== void 0) {
-        cancelAnimationFrame(state.queuedFullDrawDistancePrewarm);
-        state.queuedFullDrawDistancePrewarm = void 0;
-      }
-      for (const timeout of state.timeouts) {
-        clearTimeout(timeout);
-      }
-      state.timeouts.clear();
+      cancelImperativeScroll(state);
+      state.scheduledWork.dispose();
     };
   }, [state]);
   useLayoutEffect(() => {
@@ -7522,6 +7647,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       canRender,
       contentContainerStyle,
       contentInset,
+      freshDataTransitionEpoch: state.freshDataTransitionEpoch,
       getRenderedItem: fns.getRenderedItem,
       horizontal,
       initialContentOffset,
@@ -7537,7 +7663,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       onScroll: onScrollHandler,
       recycleItems,
       refreshControl: refreshControlElement ? stylePaddingTopState > 0 ? React2.cloneElement(refreshControlElement, {
-        progressViewOffset: ((_q = refreshControlElement.props.progressViewOffset) != null ? _q : 0) + stylePaddingTopState
+        progressViewOffset: ((_r = refreshControlElement.props.progressViewOffset) != null ? _r : 0) + stylePaddingTopState
       }) : refreshControlElement : onRefresh && /* @__PURE__ */ React2.createElement(
         RefreshControl,
         {
@@ -7548,7 +7674,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
       ),
       refScrollView: combinedRef,
       renderScrollComponent,
-      scrollAdjustHandler: (_r = refState.current) == null ? void 0 : _r.scrollAdjustHandler,
+      scrollAdjustHandler: (_s = refState.current) == null ? void 0 : _s.scrollAdjustHandler,
       scrollEventThrottle: 0,
       snapToIndices,
       stickyHeaderIndices,