@legendapp/list 3.3.4 → 3.3.5

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.3.5
+
+- Fix: Changing `dataKey` no longer leaves the new dataset invisible. #519
+- Fix: `maintainScrollAtEnd` stays pinned as newly inserted rows are measured, and scroll corrections preserve `anchoredEndSpace` padding. #520
+- Fix: Programmatic scrolls no longer throw in browsers, get lost when they replace unfinished initial scrolling, or stop working after a previous request is canceled. #518
+
 ## 3.3.4
 
 - Feat: `getState().indexByKey(key)` looks up an item’s current index by key.

package/package.json

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

package/react-native.js

@@ -457,6 +457,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 {
@@ -964,6 +986,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;
@@ -1279,29 +1319,6 @@ function clampScrollOffset(ctx, offset, scrollTarget) {
   return clampedOffset;
 }
 
-// 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.runPendingScrollToEnd = void 0;
-  state.scrollingTo = void 0;
-  state.scrollTargetPinnedRange = void 0;
-  settlePendingImperativeScroll(state);
-}
-
 // src/core/finishScrollTo.ts
 function finishScrollTo(ctx) {
   var _a3, _b;
@@ -4833,7 +4850,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({
@@ -5683,13 +5700,11 @@ var ContainerSlot = typedMemo(function ContainerSlot2(props) {
   return /* @__PURE__ */ React2__namespace.createElement(ContainerSlotBase, { ...props });
 });
 function useFreshDataTransitionVisibility(readyToRender, transitionEpoch) {
-  const completedTransitionEpoch = React2.useRef(transitionEpoch);
-  const isTransitionPending = completedTransitionEpoch.current !== transitionEpoch;
+  const [completedTransitionEpoch, setCompletedTransitionEpoch] = React2.useState(transitionEpoch);
+  const isTransitionPending = completedTransitionEpoch !== transitionEpoch;
   React2.useLayoutEffect(() => {
-    if (!readyToRender) {
-      completedTransitionEpoch.current = transitionEpoch;
-    }
-  }, [readyToRender, transitionEpoch]);
+    setCompletedTransitionEpoch(transitionEpoch);
+  }, [transitionEpoch]);
   return readyToRender && !isTransitionPending;
 }
 
@@ -6402,7 +6417,8 @@ var ScheduledWork = class {
     const work = this.work.get(key);
     if (work) {
       this.work.delete(key);
-      work[1](work[0]);
+      const [handle, cancel] = work;
+      cancel(handle);
     }
   }
   has(key) {
@@ -6655,6 +6671,7 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
   };
   const runScrollWithPromise = (run, isReady = () => true) => new Promise((resolve) => {
     const token = startImperativeScroll(resolve);
+    supersedeInitialScroll(ctx);
     runScrollRequest(token, resolve, run, isReady);
   });
   state.runPendingScrollToEnd = () => {
@@ -6781,9 +6798,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);
       }
     }),

package/react-native.mjs

@@ -436,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 {
@@ -943,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;
@@ -1258,29 +1298,6 @@ function clampScrollOffset(ctx, offset, scrollTarget) {
   return clampedOffset;
 }
 
-// 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.runPendingScrollToEnd = void 0;
-  state.scrollingTo = void 0;
-  state.scrollTargetPinnedRange = void 0;
-  settlePendingImperativeScroll(state);
-}
-
 // src/core/finishScrollTo.ts
 function finishScrollTo(ctx) {
   var _a3, _b;
@@ -4812,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({
@@ -5662,13 +5679,11 @@ var ContainerSlot = typedMemo(function ContainerSlot2(props) {
   return /* @__PURE__ */ React2.createElement(ContainerSlotBase, { ...props });
 });
 function useFreshDataTransitionVisibility(readyToRender, transitionEpoch) {
-  const completedTransitionEpoch = useRef(transitionEpoch);
-  const isTransitionPending = completedTransitionEpoch.current !== transitionEpoch;
+  const [completedTransitionEpoch, setCompletedTransitionEpoch] = useState(transitionEpoch);
+  const isTransitionPending = completedTransitionEpoch !== transitionEpoch;
   useLayoutEffect(() => {
-    if (!readyToRender) {
-      completedTransitionEpoch.current = transitionEpoch;
-    }
-  }, [readyToRender, transitionEpoch]);
+    setCompletedTransitionEpoch(transitionEpoch);
+  }, [transitionEpoch]);
   return readyToRender && !isTransitionPending;
 }
 
@@ -6381,7 +6396,8 @@ var ScheduledWork = class {
     const work = this.work.get(key);
     if (work) {
       this.work.delete(key);
-      work[1](work[0]);
+      const [handle, cancel] = work;
+      cancel(handle);
     }
   }
   has(key) {
@@ -6634,6 +6650,7 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
   };
   const runScrollWithPromise = (run, isReady = () => true) => new Promise((resolve) => {
     const token = startImperativeScroll(resolve);
+    supersedeInitialScroll(ctx);
     runScrollRequest(token, resolve, run, isReady);
   });
   state.runPendingScrollToEnd = () => {
@@ -6760,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);
       }
     }),

package/react-native.web.js

@@ -434,6 +434,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 {
@@ -935,6 +957,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;
@@ -1248,29 +1288,6 @@ function clampScrollOffset(ctx, offset, scrollTarget) {
   return clampedOffset;
 }
 
-// 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.runPendingScrollToEnd = void 0;
-  state.scrollingTo = void 0;
-  state.scrollTargetPinnedRange = void 0;
-  settlePendingImperativeScroll(state);
-}
-
 // src/core/finishScrollTo.ts
 function finishScrollTo(ctx) {
   var _a3, _b;
@@ -4850,7 +4867,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({
@@ -5750,13 +5767,11 @@ function useDOMOrder(ref) {
   }, [ctx]);
 }
 function useFreshDataTransitionVisibility(readyToRender, transitionEpoch) {
-  const completedTransitionEpoch = React3.useRef(transitionEpoch);
-  const isTransitionPending = completedTransitionEpoch.current !== transitionEpoch;
+  const [completedTransitionEpoch, setCompletedTransitionEpoch] = React3.useState(transitionEpoch);
+  const isTransitionPending = completedTransitionEpoch !== transitionEpoch;
   React3.useLayoutEffect(() => {
-    if (!readyToRender) {
-      completedTransitionEpoch.current = transitionEpoch;
-    }
-  }, [readyToRender, transitionEpoch]);
+    setCompletedTransitionEpoch(transitionEpoch);
+  }, [transitionEpoch]);
   return readyToRender && !isTransitionPending;
 }
 
@@ -6397,10 +6412,9 @@ function ScrollAdjust() {
   const lastScrollOffsetRef = React3__namespace.useRef(0);
   const lastScrollAdjustUserOffsetRef = React3__namespace.useRef(0);
   const resetPaddingRafRef = React3__namespace.useRef(void 0);
-  const resetPaddingBaselineRef = React3__namespace.useRef(void 0);
+  const temporaryPaddingRef = React3__namespace.useRef(void 0);
   const contentNodeRef = React3__namespace.useRef(null);
   const callback = React3__namespace.useCallback(() => {
-    var _a3;
     const scrollAdjust = peek$(ctx, "scrollAdjust");
     const scrollAdjustUserOffset = peek$(ctx, "scrollAdjustUserOffset");
     const scrollOffset = (scrollAdjust || 0) + (scrollAdjustUserOffset || 0);
@@ -6424,19 +6438,28 @@ function ScrollAdjust() {
           const nextScroll = currentScroll + scrollDelta;
           const needsTemporaryPadding = scrollDelta > 0 && !ctx.state.adjustingFromInitialMount && totalSize < nextScroll + viewportSize;
           if (needsTemporaryPadding) {
-            const previousPaddingEnd = (_a3 = resetPaddingBaselineRef.current) != null ? _a3 : contentNode.style[axis.paddingEndProp];
-            resetPaddingBaselineRef.current = previousPaddingEnd;
+            const currentInlinePaddingEnd = contentNode.style[axis.paddingEndProp];
+            const previousTemporaryPadding = temporaryPaddingRef.current;
+            const baselinePaddingEnd = (previousTemporaryPadding == null ? void 0 : previousTemporaryPadding.value) === currentInlinePaddingEnd ? previousTemporaryPadding.baseline : currentInlinePaddingEnd;
             const pad = (nextScroll + viewportSize - totalSize) * 2;
-            contentNode.style[axis.paddingEndProp] = `${pad}px`;
+            const currentPaddingEnd = Number.parseFloat(
+              window.getComputedStyle(contentNode)[axis.paddingEndProp]
+            );
+            const temporaryPaddingEnd = `${(currentPaddingEnd || 0) + pad}px`;
+            temporaryPaddingRef.current = { baseline: baselinePaddingEnd, value: temporaryPaddingEnd };
+            contentNode.style[axis.paddingEndProp] = temporaryPaddingEnd;
             void contentNode.offsetHeight;
             scrollBy();
             if (resetPaddingRafRef.current !== void 0) {
               cancelAnimationFrame(resetPaddingRafRef.current);
             }
             resetPaddingRafRef.current = requestAnimationFrame(() => {
+              const temporaryPadding = temporaryPaddingRef.current;
               resetPaddingRafRef.current = void 0;
-              resetPaddingBaselineRef.current = void 0;
-              contentNode.style[axis.paddingEndProp] = previousPaddingEnd;
+              temporaryPaddingRef.current = void 0;
+              if (contentNode.style[axis.paddingEndProp] === (temporaryPadding == null ? void 0 : temporaryPadding.value)) {
+                contentNode.style[axis.paddingEndProp] = temporaryPadding.baseline;
+              }
             });
           } else {
             scrollBy();
@@ -7054,7 +7077,8 @@ var ScheduledWork = class {
     const work = this.work.get(key);
     if (work) {
       this.work.delete(key);
-      work[1](work[0]);
+      const [handle, cancel] = work;
+      cancel(handle);
     }
   }
   has(key) {
@@ -7291,6 +7315,7 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
   };
   const runScrollWithPromise = (run, isReady = () => true) => new Promise((resolve) => {
     const token = startImperativeScroll(resolve);
+    supersedeInitialScroll(ctx);
     runScrollRequest(token, resolve, run, isReady);
   });
   state.runPendingScrollToEnd = () => {
@@ -7417,9 +7442,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);
       }
     }),

package/react-native.web.mjs

@@ -413,6 +413,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 {
@@ -914,6 +936,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;
@@ -1227,29 +1267,6 @@ function clampScrollOffset(ctx, offset, scrollTarget) {
   return clampedOffset;
 }
 
-// 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.runPendingScrollToEnd = void 0;
-  state.scrollingTo = void 0;
-  state.scrollTargetPinnedRange = void 0;
-  settlePendingImperativeScroll(state);
-}
-
 // src/core/finishScrollTo.ts
 function finishScrollTo(ctx) {
   var _a3, _b;
@@ -4829,7 +4846,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({
@@ -5729,13 +5746,11 @@ function useDOMOrder(ref) {
   }, [ctx]);
 }
 function useFreshDataTransitionVisibility(readyToRender, transitionEpoch) {
-  const completedTransitionEpoch = useRef(transitionEpoch);
-  const isTransitionPending = completedTransitionEpoch.current !== transitionEpoch;
+  const [completedTransitionEpoch, setCompletedTransitionEpoch] = useState(transitionEpoch);
+  const isTransitionPending = completedTransitionEpoch !== transitionEpoch;
   useLayoutEffect(() => {
-    if (!readyToRender) {
-      completedTransitionEpoch.current = transitionEpoch;
-    }
-  }, [readyToRender, transitionEpoch]);
+    setCompletedTransitionEpoch(transitionEpoch);
+  }, [transitionEpoch]);
   return readyToRender && !isTransitionPending;
 }
 
@@ -6376,10 +6391,9 @@ function ScrollAdjust() {
   const lastScrollOffsetRef = React3.useRef(0);
   const lastScrollAdjustUserOffsetRef = React3.useRef(0);
   const resetPaddingRafRef = React3.useRef(void 0);
-  const resetPaddingBaselineRef = React3.useRef(void 0);
+  const temporaryPaddingRef = React3.useRef(void 0);
   const contentNodeRef = React3.useRef(null);
   const callback = React3.useCallback(() => {
-    var _a3;
     const scrollAdjust = peek$(ctx, "scrollAdjust");
     const scrollAdjustUserOffset = peek$(ctx, "scrollAdjustUserOffset");
     const scrollOffset = (scrollAdjust || 0) + (scrollAdjustUserOffset || 0);
@@ -6403,19 +6417,28 @@ function ScrollAdjust() {
           const nextScroll = currentScroll + scrollDelta;
           const needsTemporaryPadding = scrollDelta > 0 && !ctx.state.adjustingFromInitialMount && totalSize < nextScroll + viewportSize;
           if (needsTemporaryPadding) {
-            const previousPaddingEnd = (_a3 = resetPaddingBaselineRef.current) != null ? _a3 : contentNode.style[axis.paddingEndProp];
-            resetPaddingBaselineRef.current = previousPaddingEnd;
+            const currentInlinePaddingEnd = contentNode.style[axis.paddingEndProp];
+            const previousTemporaryPadding = temporaryPaddingRef.current;
+            const baselinePaddingEnd = (previousTemporaryPadding == null ? void 0 : previousTemporaryPadding.value) === currentInlinePaddingEnd ? previousTemporaryPadding.baseline : currentInlinePaddingEnd;
             const pad = (nextScroll + viewportSize - totalSize) * 2;
-            contentNode.style[axis.paddingEndProp] = `${pad}px`;
+            const currentPaddingEnd = Number.parseFloat(
+              window.getComputedStyle(contentNode)[axis.paddingEndProp]
+            );
+            const temporaryPaddingEnd = `${(currentPaddingEnd || 0) + pad}px`;
+            temporaryPaddingRef.current = { baseline: baselinePaddingEnd, value: temporaryPaddingEnd };
+            contentNode.style[axis.paddingEndProp] = temporaryPaddingEnd;
             void contentNode.offsetHeight;
             scrollBy();
             if (resetPaddingRafRef.current !== void 0) {
               cancelAnimationFrame(resetPaddingRafRef.current);
             }
             resetPaddingRafRef.current = requestAnimationFrame(() => {
+              const temporaryPadding = temporaryPaddingRef.current;
               resetPaddingRafRef.current = void 0;
-              resetPaddingBaselineRef.current = void 0;
-              contentNode.style[axis.paddingEndProp] = previousPaddingEnd;
+              temporaryPaddingRef.current = void 0;
+              if (contentNode.style[axis.paddingEndProp] === (temporaryPadding == null ? void 0 : temporaryPadding.value)) {
+                contentNode.style[axis.paddingEndProp] = temporaryPadding.baseline;
+              }
             });
           } else {
             scrollBy();
@@ -7033,7 +7056,8 @@ var ScheduledWork = class {
     const work = this.work.get(key);
     if (work) {
       this.work.delete(key);
-      work[1](work[0]);
+      const [handle, cancel] = work;
+      cancel(handle);
     }
   }
   has(key) {
@@ -7270,6 +7294,7 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
   };
   const runScrollWithPromise = (run, isReady = () => true) => new Promise((resolve) => {
     const token = startImperativeScroll(resolve);
+    supersedeInitialScroll(ctx);
     runScrollRequest(token, resolve, run, isReady);
   });
   state.runPendingScrollToEnd = () => {
@@ -7396,9 +7421,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);
       }
     }),

package/react.js

@@ -434,6 +434,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 {
@@ -935,6 +957,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;
@@ -1248,29 +1288,6 @@ function clampScrollOffset(ctx, offset, scrollTarget) {
   return clampedOffset;
 }
 
-// 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.runPendingScrollToEnd = void 0;
-  state.scrollingTo = void 0;
-  state.scrollTargetPinnedRange = void 0;
-  settlePendingImperativeScroll(state);
-}
-
 // src/core/finishScrollTo.ts
 function finishScrollTo(ctx) {
   var _a3, _b;
@@ -4850,7 +4867,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({
@@ -5750,13 +5767,11 @@ function useDOMOrder(ref) {
   }, [ctx]);
 }
 function useFreshDataTransitionVisibility(readyToRender, transitionEpoch) {
-  const completedTransitionEpoch = React3.useRef(transitionEpoch);
-  const isTransitionPending = completedTransitionEpoch.current !== transitionEpoch;
+  const [completedTransitionEpoch, setCompletedTransitionEpoch] = React3.useState(transitionEpoch);
+  const isTransitionPending = completedTransitionEpoch !== transitionEpoch;
   React3.useLayoutEffect(() => {
-    if (!readyToRender) {
-      completedTransitionEpoch.current = transitionEpoch;
-    }
-  }, [readyToRender, transitionEpoch]);
+    setCompletedTransitionEpoch(transitionEpoch);
+  }, [transitionEpoch]);
   return readyToRender && !isTransitionPending;
 }
 
@@ -6397,10 +6412,9 @@ function ScrollAdjust() {
   const lastScrollOffsetRef = React3__namespace.useRef(0);
   const lastScrollAdjustUserOffsetRef = React3__namespace.useRef(0);
   const resetPaddingRafRef = React3__namespace.useRef(void 0);
-  const resetPaddingBaselineRef = React3__namespace.useRef(void 0);
+  const temporaryPaddingRef = React3__namespace.useRef(void 0);
   const contentNodeRef = React3__namespace.useRef(null);
   const callback = React3__namespace.useCallback(() => {
-    var _a3;
     const scrollAdjust = peek$(ctx, "scrollAdjust");
     const scrollAdjustUserOffset = peek$(ctx, "scrollAdjustUserOffset");
     const scrollOffset = (scrollAdjust || 0) + (scrollAdjustUserOffset || 0);
@@ -6424,19 +6438,28 @@ function ScrollAdjust() {
           const nextScroll = currentScroll + scrollDelta;
           const needsTemporaryPadding = scrollDelta > 0 && !ctx.state.adjustingFromInitialMount && totalSize < nextScroll + viewportSize;
           if (needsTemporaryPadding) {
-            const previousPaddingEnd = (_a3 = resetPaddingBaselineRef.current) != null ? _a3 : contentNode.style[axis.paddingEndProp];
-            resetPaddingBaselineRef.current = previousPaddingEnd;
+            const currentInlinePaddingEnd = contentNode.style[axis.paddingEndProp];
+            const previousTemporaryPadding = temporaryPaddingRef.current;
+            const baselinePaddingEnd = (previousTemporaryPadding == null ? void 0 : previousTemporaryPadding.value) === currentInlinePaddingEnd ? previousTemporaryPadding.baseline : currentInlinePaddingEnd;
             const pad = (nextScroll + viewportSize - totalSize) * 2;
-            contentNode.style[axis.paddingEndProp] = `${pad}px`;
+            const currentPaddingEnd = Number.parseFloat(
+              window.getComputedStyle(contentNode)[axis.paddingEndProp]
+            );
+            const temporaryPaddingEnd = `${(currentPaddingEnd || 0) + pad}px`;
+            temporaryPaddingRef.current = { baseline: baselinePaddingEnd, value: temporaryPaddingEnd };
+            contentNode.style[axis.paddingEndProp] = temporaryPaddingEnd;
             void contentNode.offsetHeight;
             scrollBy();
             if (resetPaddingRafRef.current !== void 0) {
               cancelAnimationFrame(resetPaddingRafRef.current);
             }
             resetPaddingRafRef.current = requestAnimationFrame(() => {
+              const temporaryPadding = temporaryPaddingRef.current;
               resetPaddingRafRef.current = void 0;
-              resetPaddingBaselineRef.current = void 0;
-              contentNode.style[axis.paddingEndProp] = previousPaddingEnd;
+              temporaryPaddingRef.current = void 0;
+              if (contentNode.style[axis.paddingEndProp] === (temporaryPadding == null ? void 0 : temporaryPadding.value)) {
+                contentNode.style[axis.paddingEndProp] = temporaryPadding.baseline;
+              }
             });
           } else {
             scrollBy();
@@ -7054,7 +7077,8 @@ var ScheduledWork = class {
     const work = this.work.get(key);
     if (work) {
       this.work.delete(key);
-      work[1](work[0]);
+      const [handle, cancel] = work;
+      cancel(handle);
     }
   }
   has(key) {
@@ -7291,6 +7315,7 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
   };
   const runScrollWithPromise = (run, isReady = () => true) => new Promise((resolve) => {
     const token = startImperativeScroll(resolve);
+    supersedeInitialScroll(ctx);
     runScrollRequest(token, resolve, run, isReady);
   });
   state.runPendingScrollToEnd = () => {
@@ -7417,9 +7442,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);
       }
     }),

package/react.mjs

@@ -413,6 +413,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 {
@@ -914,6 +936,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;
@@ -1227,29 +1267,6 @@ function clampScrollOffset(ctx, offset, scrollTarget) {
   return clampedOffset;
 }
 
-// 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.runPendingScrollToEnd = void 0;
-  state.scrollingTo = void 0;
-  state.scrollTargetPinnedRange = void 0;
-  settlePendingImperativeScroll(state);
-}
-
 // src/core/finishScrollTo.ts
 function finishScrollTo(ctx) {
   var _a3, _b;
@@ -4829,7 +4846,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({
@@ -5729,13 +5746,11 @@ function useDOMOrder(ref) {
   }, [ctx]);
 }
 function useFreshDataTransitionVisibility(readyToRender, transitionEpoch) {
-  const completedTransitionEpoch = useRef(transitionEpoch);
-  const isTransitionPending = completedTransitionEpoch.current !== transitionEpoch;
+  const [completedTransitionEpoch, setCompletedTransitionEpoch] = useState(transitionEpoch);
+  const isTransitionPending = completedTransitionEpoch !== transitionEpoch;
   useLayoutEffect(() => {
-    if (!readyToRender) {
-      completedTransitionEpoch.current = transitionEpoch;
-    }
-  }, [readyToRender, transitionEpoch]);
+    setCompletedTransitionEpoch(transitionEpoch);
+  }, [transitionEpoch]);
   return readyToRender && !isTransitionPending;
 }
 
@@ -6376,10 +6391,9 @@ function ScrollAdjust() {
   const lastScrollOffsetRef = React3.useRef(0);
   const lastScrollAdjustUserOffsetRef = React3.useRef(0);
   const resetPaddingRafRef = React3.useRef(void 0);
-  const resetPaddingBaselineRef = React3.useRef(void 0);
+  const temporaryPaddingRef = React3.useRef(void 0);
   const contentNodeRef = React3.useRef(null);
   const callback = React3.useCallback(() => {
-    var _a3;
     const scrollAdjust = peek$(ctx, "scrollAdjust");
     const scrollAdjustUserOffset = peek$(ctx, "scrollAdjustUserOffset");
     const scrollOffset = (scrollAdjust || 0) + (scrollAdjustUserOffset || 0);
@@ -6403,19 +6417,28 @@ function ScrollAdjust() {
           const nextScroll = currentScroll + scrollDelta;
           const needsTemporaryPadding = scrollDelta > 0 && !ctx.state.adjustingFromInitialMount && totalSize < nextScroll + viewportSize;
           if (needsTemporaryPadding) {
-            const previousPaddingEnd = (_a3 = resetPaddingBaselineRef.current) != null ? _a3 : contentNode.style[axis.paddingEndProp];
-            resetPaddingBaselineRef.current = previousPaddingEnd;
+            const currentInlinePaddingEnd = contentNode.style[axis.paddingEndProp];
+            const previousTemporaryPadding = temporaryPaddingRef.current;
+            const baselinePaddingEnd = (previousTemporaryPadding == null ? void 0 : previousTemporaryPadding.value) === currentInlinePaddingEnd ? previousTemporaryPadding.baseline : currentInlinePaddingEnd;
             const pad = (nextScroll + viewportSize - totalSize) * 2;
-            contentNode.style[axis.paddingEndProp] = `${pad}px`;
+            const currentPaddingEnd = Number.parseFloat(
+              window.getComputedStyle(contentNode)[axis.paddingEndProp]
+            );
+            const temporaryPaddingEnd = `${(currentPaddingEnd || 0) + pad}px`;
+            temporaryPaddingRef.current = { baseline: baselinePaddingEnd, value: temporaryPaddingEnd };
+            contentNode.style[axis.paddingEndProp] = temporaryPaddingEnd;
             void contentNode.offsetHeight;
             scrollBy();
             if (resetPaddingRafRef.current !== void 0) {
               cancelAnimationFrame(resetPaddingRafRef.current);
             }
             resetPaddingRafRef.current = requestAnimationFrame(() => {
+              const temporaryPadding = temporaryPaddingRef.current;
               resetPaddingRafRef.current = void 0;
-              resetPaddingBaselineRef.current = void 0;
-              contentNode.style[axis.paddingEndProp] = previousPaddingEnd;
+              temporaryPaddingRef.current = void 0;
+              if (contentNode.style[axis.paddingEndProp] === (temporaryPadding == null ? void 0 : temporaryPadding.value)) {
+                contentNode.style[axis.paddingEndProp] = temporaryPadding.baseline;
+              }
             });
           } else {
             scrollBy();
@@ -7033,7 +7056,8 @@ var ScheduledWork = class {
     const work = this.work.get(key);
     if (work) {
       this.work.delete(key);
-      work[1](work[0]);
+      const [handle, cancel] = work;
+      cancel(handle);
     }
   }
   has(key) {
@@ -7270,6 +7294,7 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
   };
   const runScrollWithPromise = (run, isReady = () => true) => new Promise((resolve) => {
     const token = startImperativeScroll(resolve);
+    supersedeInitialScroll(ctx);
     runScrollRequest(token, resolve, run, isReady);
   });
   state.runPendingScrollToEnd = () => {
@@ -7396,9 +7421,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);
       }
     }),