From cc3fb676555d3616ef13703b063ec41de2a78e21 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius@mac.lan>
Date: Tue, 1 Sep 2026 00:04:44 -0700
Subject: [PATCH 1/8] fix(mobile): keep thread scroll bounds current after
 animations

---
 .../lib/legend-list-size-animation.test.ts    | 285 ++++++++++++++++++
 patches/@legendapp__list@3.3.5.patch          |  34 +--
 pnpm-lock.yaml                                |  10 +-
 3 files changed, 304 insertions(+), 25 deletions(-)
 create mode 100644 apps/mobile/src/lib/legend-list-size-animation.test.ts

diff --git a/apps/mobile/src/lib/legend-list-size-animation.test.ts b/apps/mobile/src/lib/legend-list-size-animation.test.ts
new file mode 100644
index 000000000000..48bd70ed381c
--- /dev/null
+++ b/apps/mobile/src/lib/legend-list-size-animation.test.ts
@@ -0,0 +1,285 @@
+import * as NodeFS from "node:fs";
+import * as NodeVM from "node:vm";
+import * as TypeScript from "typescript";
+import { describe, expect, it } from "vite-plus/test";
+
+import { createReactHookHarness } from "../../../web/src/test/reactHookHarness";
+
+const bundles = ["reanimated.js", "reanimated.mjs"].map((name) => {
+  const path = new URL(`../../node_modules/@legendapp/list/${name}`, import.meta.url);
+  const source = NodeFS.readFileSync(path, "utf8");
+  return {
+    name,
+    source: name.endsWith(".mjs")
+      ? TypeScript.transpileModule(source, {
+          compilerOptions: {
+            module: TypeScript.ModuleKind.CommonJS,
+            target: TypeScript.ScriptTarget.ESNext,
+            esModuleInterop: true,
+          },
+        }).outputText
+      : source,
+  };
+});
+
+type SizeSignal = "totalSize" | "alignItemsAtEndPadding";
+type NativeStyle = { readonly height?: number; readonly width?: number };
+type AnimatedStyle = { read: () => NativeStyle };
+type Style = NativeStyle | AnimatedStyle | ReadonlyArray<Style> | undefined;
+type Animation = {
+  readonly target: number;
+  readonly complete: (finished: boolean) => void;
+};
+
+class AnimatedNumber {
+  private current: number;
+  private animation: (Animation & { readonly from: number }) | null = null;
+
+  constructor(initial: number) {
+    this.current = initial;
+  }
+
+  get value(): number {
+    return this.current;
+  }
+
+  set value(next: number | Animation) {
+    const previous = this.animation;
+    this.animation = null;
+    previous?.complete(false);
+    if (typeof next === "number") {
+      this.current = next;
+    } else {
+      this.animation = { ...next, from: this.current };
+    }
+  }
+
+  advance(progress: number) {
+    const animation = this.animation;
+    if (animation === null) {
+      return;
+    }
+    this.current = animation.from + (animation.target - animation.from) * progress;
+    if (progress === 1) {
+      this.animation = null;
+      animation.complete(true);
+    }
+  }
+}
+
+function makeSizeView(bundleSource: string, signalName: SizeSignal, initialSize: number) {
+  const hooks = createReactHookHarness();
+  const values: Array<AnimatedNumber> = [];
+  const effects: Array<() => void> = [];
+  const attachedStyles = new Set<AnimatedStyle>();
+  const animatedNativeProps: { height?: number; width?: number } = {};
+  let staticNativeProps: NativeStyle = {};
+  let renderPending = false;
+  const signals = { totalSize: initialSize, alignItemsAtEndPadding: initialSize };
+  const ctx = {
+    state: {
+      contentSizeAnimationEpoch: 0,
+      contentSizeAnimationEligible: false,
+      contentSizeAnimationActiveEpoch: undefined as number | undefined,
+      contentSizeAnimationActiveSignals: new Set<string>(),
+    },
+  };
+
+  const react = {
+    useRef: hooks.useRef,
+    useCallback: hooks.useCallback,
+    useState<T>(initial: T) {
+      const [value, setValue] = hooks.useState(initial);
+      return [
+        value,
+        (next: T) => {
+          setValue(next);
+          renderPending = true;
+        },
+      ];
+    },
+    useLayoutEffect(effect: () => void, dependencies: ReadonlyArray<unknown>) {
+      const previous = hooks.useRef<ReadonlyArray<unknown> | undefined>(undefined);
+      if (
+        previous.current === undefined ||
+        dependencies.some((dependency, index) => !Object.is(dependency, previous.current?.[index]))
+      ) {
+        previous.current = dependencies;
+        effects.push(effect);
+      }
+    },
+    forwardRef: (component: unknown) => component,
+    createElement: (_component: unknown, props: { readonly style: Style }) => ({ props }),
+  };
+
+  const publishAnimatedStyles = () => {
+    for (const style of attachedStyles) {
+      Object.assign(animatedNativeProps, style.read());
+    }
+  };
+  const reanimated = {
+    View: "AnimatedView",
+    createAnimatedComponent: (component: unknown) => component,
+    runOnJS: (callback: (...args: unknown[]) => void) => callback,
+    runOnUI: (callback: (...args: unknown[]) => void) => callback,
+    useSharedValue(initial: number) {
+      const reference = hooks.useRef<AnimatedNumber | null>(null);
+      if (reference.current === null) {
+        reference.current = new AnimatedNumber(initial);
+        values.push(reference.current);
+      }
+      return reference.current;
+    },
+    useAnimatedStyle(read: () => NativeStyle) {
+      const reference = hooks.useRef<AnimatedStyle>({ read });
+      reference.current.read = read;
+      return reference.current;
+    },
+  };
+  const modules: Record<string, unknown> = {
+    react,
+    "react-native": { View: "View" },
+    "react-native-reanimated": reanimated,
+    "@legendapp/list/react-native": {
+      internal: {
+        typedMemo: (component: unknown) => component,
+        useStateContext: () => ctx,
+        useArr$: (names: ReadonlyArray<SizeSignal>) => names.map((name) => signals[name]),
+      },
+    },
+  };
+  const module = { exports: {} };
+  // Execute the installed patch, not a copy of its size/animation logic.
+  NodeVM.runInNewContext(`${bundleSource}\nmodule.exports = ReanimatedSizeView;`, {
+    module,
+    exports: module.exports,
+    require(name: string) {
+      if (!(name in modules)) {
+        throw new Error(`Unexpected LegendList dependency: ${name}`);
+      }
+      return modules[name];
+    },
+  });
+  const SizeView = module.exports as (props: {
+    readonly signalName: SizeSignal;
+    readonly horizontal: false;
+    readonly layoutTransition: typeof transition;
+  }) => { readonly props: { readonly style: Style } };
+  const transition = {
+    getAnimationAndConfig: () => [
+      (target: number, _config: unknown, complete: Animation["complete"]): Animation => ({
+        target,
+        complete,
+      }),
+      {},
+    ],
+  };
+
+  function commitStyle(style: Style) {
+    if (Array.isArray(style)) {
+      style.forEach(commitStyle);
+    } else if (style && "read" in style) {
+      attachedStyles.add(style);
+    } else if (style) {
+      staticNativeProps = { ...staticNativeProps, ...style };
+    }
+  }
+
+  function render() {
+    let passes = 0;
+    do {
+      if (++passes > 10) {
+        throw new Error("Size view did not finish rendering.");
+      }
+      renderPending = false;
+      hooks.beginRender();
+      const element = SizeView({ signalName, horizontal: false, layoutTransition: transition });
+      // Reanimated 4's ViewDescriptorsSet.remove detaches future updates but
+      // leaves native animated props intact. Its Fabric commit hook reapplies
+      // that registry over React's static props on subsequent commits.
+      attachedStyles.clear();
+      staticNativeProps = {};
+      commitStyle(element.props.style);
+      for (const effect of effects.splice(0)) {
+        effect();
+      }
+      publishAnimatedStyles();
+    } while (renderPending);
+  }
+
+  render();
+  return {
+    update(size: number, eligible: boolean, newEpoch = true) {
+      signals[signalName] = size;
+      ctx.state.contentSizeAnimationEligible = eligible;
+      if (newEpoch) {
+        ctx.state.contentSizeAnimationEpoch += 1;
+      }
+      render();
+    },
+    advance(progress: number) {
+      for (const value of values) {
+        value.advance(progress);
+      }
+      publishAnimatedStyles();
+      if (renderPending) {
+        render();
+      }
+    },
+    nativeSize: () => animatedNativeProps.height ?? staticNativeProps.height ?? 0,
+    dragAfterJumpToEnd() {
+      const otherContentHeight = 1_000;
+      const viewportHeight = 600;
+      // scrollToOverflowEnabled lets the arrow reach LegendList's logical
+      // target. A gesture must then obey the actual UIScrollView content size.
+      const target = signals[signalName] + otherContentHeight - viewportHeight;
+      const nativeEnd =
+        (animatedNativeProps.height ?? staticNativeProps.height ?? 0) +
+        otherContentHeight -
+        viewportHeight;
+      return Math.min(target + 100, nativeEnd);
+    },
+  };
+}
+
+describe.each(bundles)("LegendList $name", ({ source }) => {
+  describe.each<SizeSignal>(["totalSize", "alignItemsAtEndPadding"])(
+    "animated %s",
+    (signalName) => {
+      it("keeps the native scroll range current after a disclosure animation finishes", () => {
+        const view = makeSizeView(source, signalName, 1_200);
+        view.update(1_600, true);
+        view.advance(1);
+        expect(view.nativeSize()).toBe(1_600);
+
+        view.update(2_400, false);
+        expect(view.dragAfterJumpToEnd()).toBe(2_800);
+        expect(view.nativeSize()).toBe(2_400);
+
+        view.update(800, false);
+        expect(view.nativeSize()).toBe(800);
+      });
+
+      it("preserves measurement corrections across overlapping animations and later updates", () => {
+        const view = makeSizeView(source, signalName, 1_200);
+        view.update(1_600, true);
+        view.advance(0.5);
+        expect(view.nativeSize()).toBe(1_400);
+
+        // A same-epoch measurement moves the base without restarting the tween.
+        view.update(1_700, false, false);
+        expect(view.nativeSize()).toBe(1_500);
+        view.update(2_000, true);
+        expect(view.nativeSize()).toBe(1_500);
+        view.advance(0.5);
+        expect(view.nativeSize()).toBe(1_750);
+        view.advance(1);
+        expect(view.nativeSize()).toBe(2_000);
+
+        view.update(2_600, false);
+        expect(view.nativeSize()).toBe(2_600);
+        expect(view.dragAfterJumpToEnd()).toBe(3_000);
+      });
+    },
+  );
+});
diff --git a/patches/@legendapp__list@3.3.5.patch b/patches/@legendapp__list@3.3.5.patch
index c3b5ee5b0e3c..35cc58ac2bc2 100644
--- a/patches/@legendapp__list@3.3.5.patch
+++ b/patches/@legendapp__list@3.3.5.patch
@@ -1358,7 +1358,7 @@ index e5043320700b12f34f4c0babbc341f85ca8135c1..2ce63830a28636b21937a0741fd0e613
       * Number of columns to render items in.
       * @default 1
 diff --git a/reanimated.js b/reanimated.js
-index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..59e218cb79f56c34995fb86c5de5a71ff8ce9f4d 100644
+index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..9c5f560320ab47f5eeb73f44fbdcf332ba831558 100644
 --- a/reanimated.js
 +++ b/reanimated.js
 @@ -115,8 +115,10 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
@@ -1404,7 +1404,7 @@ index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..59e218cb79f56c34995fb86c5de5a71f
        ref: refView,
        style: viewStyle,
        ...rest
-@@ -141,6 +162,96 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
+@@ -141,6 +162,93 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
      children
    );
  });
@@ -1418,12 +1418,12 @@ index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..59e218cb79f56c34995fb86c5de5a71f
 +  const previousEpochRef = React__namespace.useRef(ctx.state.contentSizeAnimationEpoch || 0);
 +  const animationRunRef = React__namespace.useRef(0);
 +  const isAnimatingRef = React__namespace.useRef(false);
-+  const [isAnimating, setIsAnimating] = React__namespace.useState(false);
 +  const transition = props.layoutTransition;
 +  const canAnimate = !!transition && typeof transition.getAnimationAndConfig === "function";
 +  const renderEpoch = ctx.state.contentSizeAnimationEpoch || 0;
-+  const startsEligibleAnimation = canAnimate && logicalSize !== previousLogicalSizeRef.current && renderEpoch !== previousEpochRef.current && ctx.state.contentSizeAnimationEligible;
-+  const useAnimatedAxis = isAnimating || startsEligibleAnimation;
++  // Keep the animated size attached after transitions finish. Reanimated
++  // retains removed animated props, so switching to a static size leaves
++  // native scroll bounds stuck while logical measurements keep changing.
 +  const animatedStyle = Reanimated.useAnimatedStyle(() => {
 +    const size = Math.max(0, baseSize.value + animatedDelta.value);
 +    return horizontal ? { width: size } : { height: size };
@@ -1433,7 +1433,6 @@ index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..59e218cb79f56c34995fb86c5de5a71f
 +      return;
 +    }
 +    isAnimatingRef.current = false;
-+    setIsAnimating(false);
 +    const state = ctx.state;
 +    if (state.contentSizeAnimationActiveEpoch !== epoch) {
 +      return;
@@ -1480,7 +1479,6 @@ index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..59e218cb79f56c34995fb86c5de5a71f
 +    state.contentSizeAnimationActiveSignals.add(signalName);
 +    const wasAnimating = isAnimatingRef.current;
 +    isAnimatingRef.current = true;
-+    setIsAnimating(true);
 +    const run = ++animationRunRef.current;
 +    Reanimated.runOnUI((absoluteSize, previousSize, continuesAnimation, animationRun, animationEpoch) => {
 +      "worklet";
@@ -1495,13 +1493,12 @@ index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..59e218cb79f56c34995fb86c5de5a71f
 +      }));
 +    })(logicalSize, previousLogicalSize, wasAnimating, run, epoch);
 +  }, [baseSize, animatedDelta, canAnimate, completeAnimation, ctx.state, logicalSize, renderEpoch, signalName, transition]);
-+  const sizeStyle = useAnimatedAxis ? animatedStyle : horizontal ? { width: logicalSize } : { height: logicalSize };
-+  return /* @__PURE__ */ React__namespace.createElement(Reanimated__default.default.View, { ...rest, style: [style, sizeStyle] }, children);
++  return /* @__PURE__ */ React__namespace.createElement(Reanimated__default.default.View, { ...rest, style: [style, animatedStyle] }, children);
 +});
  function setSharedValueValue(sharedValue, value) {
    if (!sharedValue) {
      return;
-@@ -245,10 +356,19 @@ var LegendListForwardedRef = typedMemo(
+@@ -245,10 +353,19 @@ var LegendListForwardedRef = typedMemo(
          );
        };
      }, [hasItemLayoutAnimation, recycleItems]);
@@ -1522,7 +1519,7 @@ index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..59e218cb79f56c34995fb86c5de5a71f
          renderScrollComponent: renderReanimatedScrollComponent,
          ...IsNewArchitecture ? { stickyPositionComponentInternal } : {}
 diff --git a/reanimated.mjs b/reanimated.mjs
-index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..bd3c680eb4abeca786d538ebf7b23a5725398942 100644
+index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..cab29fd2a513470175baf2ac930772c7d9275642 100644
 --- a/reanimated.mjs
 +++ b/reanimated.mjs
 @@ -1,7 +1,7 @@
@@ -1577,7 +1574,7 @@ index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..bd3c680eb4abeca786d538ebf7b23a57
        ref: refView,
        style: viewStyle,
        ...rest
-@@ -117,6 +138,96 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
+@@ -117,6 +138,93 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
      children
    );
  });
@@ -1591,12 +1588,12 @@ index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..bd3c680eb4abeca786d538ebf7b23a57
 +  const previousEpochRef = React.useRef(ctx.state.contentSizeAnimationEpoch || 0);
 +  const animationRunRef = React.useRef(0);
 +  const isAnimatingRef = React.useRef(false);
-+  const [isAnimating, setIsAnimating] = React.useState(false);
 +  const transition = props.layoutTransition;
 +  const canAnimate = !!transition && typeof transition.getAnimationAndConfig === "function";
 +  const renderEpoch = ctx.state.contentSizeAnimationEpoch || 0;
-+  const startsEligibleAnimation = canAnimate && logicalSize !== previousLogicalSizeRef.current && renderEpoch !== previousEpochRef.current && ctx.state.contentSizeAnimationEligible;
-+  const useAnimatedAxis = isAnimating || startsEligibleAnimation;
++  // Keep the animated size attached after transitions finish. Reanimated
++  // retains removed animated props, so switching to a static size leaves
++  // native scroll bounds stuck while logical measurements keep changing.
 +  const animatedStyle = useAnimatedStyle(() => {
 +    const size = Math.max(0, baseSize.value + animatedDelta.value);
 +    return horizontal ? { width: size } : { height: size };
@@ -1606,7 +1603,6 @@ index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..bd3c680eb4abeca786d538ebf7b23a57
 +      return;
 +    }
 +    isAnimatingRef.current = false;
-+    setIsAnimating(false);
 +    const state = ctx.state;
 +    if (state.contentSizeAnimationActiveEpoch !== epoch) {
 +      return;
@@ -1653,7 +1649,6 @@ index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..bd3c680eb4abeca786d538ebf7b23a57
 +    state.contentSizeAnimationActiveSignals.add(signalName);
 +    const wasAnimating = isAnimatingRef.current;
 +    isAnimatingRef.current = true;
-+    setIsAnimating(true);
 +    const run = ++animationRunRef.current;
 +    runOnUI((absoluteSize, previousSize, continuesAnimation, animationRun, animationEpoch) => {
 +      "worklet";
@@ -1668,13 +1663,12 @@ index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..bd3c680eb4abeca786d538ebf7b23a57
 +      }));
 +    })(logicalSize, previousLogicalSize, wasAnimating, run, epoch);
 +  }, [baseSize, animatedDelta, canAnimate, completeAnimation, ctx.state, logicalSize, renderEpoch, signalName, transition]);
-+  const sizeStyle = useAnimatedAxis ? animatedStyle : horizontal ? { width: logicalSize } : { height: logicalSize };
-+  return /* @__PURE__ */ React.createElement(Reanimated.View, { ...rest, style: [style, sizeStyle] }, children);
++  return /* @__PURE__ */ React.createElement(Reanimated.View, { ...rest, style: [style, animatedStyle] }, children);
 +});
  function setSharedValueValue(sharedValue, value) {
    if (!sharedValue) {
      return;
-@@ -221,10 +332,19 @@ var LegendListForwardedRef = typedMemo(
+@@ -221,10 +329,19 @@ var LegendListForwardedRef = typedMemo(
          );
        };
      }, [hasItemLayoutAnimation, recycleItems]);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4a1a2067a831..155cceb9c9a4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -86,7 +86,7 @@ patchedDependencies:
   '@effect/vitest@4.0.0-beta.103': a16b1e870d8c29e4a98b17cc4c638a4ff471753d8ca3487f78a22b759caf951b
   '@expo/metro-config@57.0.12': 96f1a75347e6ea02dc4b7034ace815d8ee39e18b8166ebfb573d9e58328f0dc2
   '@ff-labs/fff-node@0.9.4': ab9ff544009e1891cfe3930105862d3699007f38922a79f3c98d90018deca368
-  '@legendapp/list@3.3.5': f786e0ada19a32703f71a7230a819697ebff2527873dfb9997c8455947e0060b
+  '@legendapp/list@3.3.5': 4a422c1d8b2f7488ddeadf6074126b2a84433d3f0e308b26574a6ae72554ba0b
   '@pierre/diffs@1.3.0-beta.10': 7ef7cb0cbabb17c15cdb137554068b36f15f6f5265e73fb51452aa3380db91aa
   '@react-native-ai/apple@0.12.0': 2d09870c2848d185cb05b53ed823a46e12dba519324d8dd8e584e28731990f9d
   '@react-native-menu/menu@2.0.0': f63d256bf6a97a873b5e628eb595bd6ef0075ddd5bdd890fc920f7a6024290dd
@@ -228,7 +228,7 @@ importers:
         version: 57.0.14(@babel/core@7.29.7)(@types/react-dom@19.2.3(@types/react@19.2.16))(@types/react@19.2.16)(expo@57.0.18)(react-dom@19.2.3(react@19.2.3))(react-native-worklets@0.10.1(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@legendapp/list':
         specifier: 'catalog:'
-        version: 3.3.5(patch_hash=f786e0ada19a32703f71a7230a819697ebff2527873dfb9997c8455947e0060b)(react-dom@19.2.3(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 3.3.5(patch_hash=4a422c1d8b2f7488ddeadf6074126b2a84433d3f0e308b26574a6ae72554ba0b)(react-dom@19.2.3(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@noble/curves':
         specifier: 'catalog:'
         version: 1.9.1
@@ -572,7 +572,7 @@ importers:
         version: 0.9.0
       '@legendapp/list':
         specifier: 'catalog:'
-        version: 3.3.5(patch_hash=f786e0ada19a32703f71a7230a819697ebff2527873dfb9997c8455947e0060b)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+        version: 3.3.5(patch_hash=4a422c1d8b2f7488ddeadf6074126b2a84433d3f0e308b26574a6ae72554ba0b)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@lexical/react':
         specifier: ^0.41.0
         version: 0.41.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(yjs@13.6.31)
@@ -12892,7 +12892,7 @@ snapshots:
     dependencies:
       jsbi: 4.3.2
 
-  '@legendapp/list@3.3.5(patch_hash=f786e0ada19a32703f71a7230a819697ebff2527873dfb9997c8455947e0060b)(react-dom@19.2.3(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
+  '@legendapp/list@3.3.5(patch_hash=4a422c1d8b2f7488ddeadf6074126b2a84433d3f0e308b26574a6ae72554ba0b)(react-dom@19.2.3(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
     dependencies:
       react: 19.2.3
       use-sync-external-store: 1.6.0(react@19.2.3)
@@ -12900,7 +12900,7 @@ snapshots:
       react-dom: 19.2.3(react@19.2.3)
       react-native: 0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
 
-  '@legendapp/list@3.3.5(patch_hash=f786e0ada19a32703f71a7230a819697ebff2527873dfb9997c8455947e0060b)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@legendapp/list@3.3.5(patch_hash=4a422c1d8b2f7488ddeadf6074126b2a84433d3f0e308b26574a6ae72554ba0b)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       react: 19.2.6
       use-sync-external-store: 1.6.0(react@19.2.6)

From ec32e23d495af2d69360d83b943c486a0b74ee1c Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Tue, 1 Sep 2026 00:35:42 -0700
Subject: [PATCH 2/8] Delete patches/@legendapp__list@3.3.5.patch

---
 patches/@legendapp__list@3.3.5.patch | 1690 --------------------------
 1 file changed, 1690 deletions(-)
 delete mode 100644 patches/@legendapp__list@3.3.5.patch

diff --git a/patches/@legendapp__list@3.3.5.patch b/patches/@legendapp__list@3.3.5.patch
deleted file mode 100644
index 35cc58ac2bc2..000000000000
--- a/patches/@legendapp__list@3.3.5.patch
+++ /dev/null
@@ -1,1690 +0,0 @@
-diff --git a/keyboard.d.ts b/keyboard.d.ts
-index 367945cdfa8a8c260b7a127657a75c016c9ab46f..0ac7bf8b8e9c386058b2374199e58fe8c92d39b3 100644
---- a/keyboard.d.ts
-+++ b/keyboard.d.ts
-@@ -279,7 +279,7 @@ type KeyboardChatComposerInsetListRef = {
- type KeyboardChatComposerRef = {
-     current: Pick<View, "measure"> | null;
- };
--declare function useKeyboardChatComposerInset(listRef: KeyboardChatComposerInsetListRef, composerRef: KeyboardChatComposerRef, initialHeight?: number): {
-+declare function useKeyboardChatComposerInset(listRef: KeyboardChatComposerInsetListRef, composerRef: KeyboardChatComposerRef, initialHeight?: number, heightAdjustment?: number, animationDuration?: number): {
-     contentInsetEndAdjustment: SharedValue<number>;
-     onComposerLayout: (event: LayoutChangeEvent) => void;
- };
-@@ -288,8 +288,10 @@ declare function useKeyboardScrollToEnd({ freeze: freezeProp, listRef }: UseKeyb
-     scrollMessageToEnd: ({ animated, closeKeyboard }: ScrollMessageToEndOptions) => Promise<void>;
- };
- declare const KeyboardAwareLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "anchoredEndSpace" | "contentInsetEndAdjustment" | "renderScrollComponent"> & KeyboardChatScrollViewPropsUnique & {
-+    adjustedInsetCompensation?: number;
-     anchoredEndSpace?: AnchoredEndSpaceConfig;
-     contentInsetEndAdjustment?: SharedValue<number>;
-+    contentInsetEndStaticAdjustment?: number;
-     keyboardOffset?: number;
- } & React.RefAttributes<LegendListRef>) => React.ReactElement | null;
- 
-diff --git a/keyboard.js b/keyboard.js
-index 6645bcbb1f77c36c432035eaf8b2d6d924fc8bda..321c4c305129dd3ce3f06127c47d51720a73fb83 100644
---- a/keyboard.js
-+++ b/keyboard.js
-@@ -33,19 +33,22 @@ if (typeof __DEV__ !== "undefined" && __DEV__ && !reactNativeKeyboardController.
-     "[legend-list] KeyboardAwareLegendList requires a recent react-native-keyboard-controller with KeyboardChatScrollView. Please upgrade react-native-keyboard-controller to at least 1.21.7."
-   );
- }
--function useKeyboardChatComposerInset(listRef, composerRef, initialHeight = 0) {
-+function useKeyboardChatComposerInset(listRef, composerRef, initialHeight = 0, heightAdjustment = 0, animationDuration = 0) {
-   const contentInsetEndAdjustment = reactNativeReanimated.useSharedValue(initialHeight);
-   const lastHeightRef = React.useRef(void 0);
-   const reportHeight = React.useCallback(
--    (height) => {
-+    (rawHeight) => {
-+      const height = Math.max(0, rawHeight + heightAdjustment);
-       var _a;
-       if (Number.isFinite(height) && height !== lastHeightRef.current) {
-+        const shouldAnimate = lastHeightRef.current !== void 0 && animationDuration > 0;
-         lastHeightRef.current = height;
--        contentInsetEndAdjustment.value = height;
--        (_a = listRef.current) == null ? void 0 : _a.reportContentInset({ bottom: height });
-+        contentInsetEndAdjustment.value = shouldAnimate ? reactNativeReanimated.withTiming(height, {
-+          duration: animationDuration
-+        }) : height;
-       }
-     },
--    [contentInsetEndAdjustment, listRef]
-+    [animationDuration, contentInsetEndAdjustment, heightAdjustment, listRef]
-   );
-   React.useLayoutEffect(() => {
-     var _a;
-@@ -84,9 +87,11 @@ function useKeyboardScrollToEnd({ freeze: freezeProp, listRef }) {
- }
- var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(props, forwardedRef) {
-   const {
-+    adjustedInsetCompensation,
-     anchoredEndSpace,
-     applyWorkaroundForContentInsetHitTestBug,
-     contentInsetEndAdjustment,
-+    contentInsetEndStaticAdjustment,
-     freeze,
-     keyboardLiftBehavior,
-     keyboardOffset,
-@@ -94,6 +99,7 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
-   } = props;
-   const refLegendList = React.useRef(null);
-   const combinedRef = useCombinedRef(forwardedRef, refLegendList);
-+  const adjustedStartInsetCompensation = props.contentInsetStartAdjustment;
-   const blankSpace = reactNativeReanimated.useSharedValue(0);
-   React.useEffect(() => {
-     if (!anchoredEndSpace) {
-@@ -108,11 +114,15 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
-       ...anchoredEndSpace,
-       onSizeChanged: (size) => {
-         var _a;
--        blankSpace.value = size;
-+        // The anchored blank is sized against the ADJUSTED viewport, but the
-+        // scroll component writes it as a raw contentInset that UIKit tops up
-+        // with the safe-area bottom — write it net of that or the end rest
-+        // (and the anchored message) sinks one safe-area under the header.
-+        blankSpace.value = size > 0 ? Math.max(0, size - (adjustedInsetCompensation || 0)) : 0;
-         (_a = anchoredEndSpace.onSizeChanged) == null ? void 0 : _a.call(anchoredEndSpace, size);
-       }
-     };
--  }, [anchoredEndSpace, blankSpace]);
-+  }, [adjustedInsetCompensation, anchoredEndSpace, blankSpace]);
-   const onContentInsetChange = React.useCallback((insets) => {
-     var _a;
-     (_a = refLegendList.current) == null ? void 0 : _a.reportContentInset(insets);
-@@ -123,6 +133,8 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
-         reactNativeKeyboardController.KeyboardChatScrollView,
-         {
-           ...scrollProps,
-+          adjustedInsetCompensation,
-+          adjustedStartInsetCompensation,
-           applyWorkaroundForContentInsetHitTestBug,
-           blankSpace,
-           extraContentPadding: contentInsetEndAdjustment,
-@@ -134,6 +146,8 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
-       );
-     },
-     [
-+      adjustedInsetCompensation,
-+      adjustedStartInsetCompensation,
-       applyWorkaroundForContentInsetHitTestBug,
-       blankSpace,
-       contentInsetEndAdjustment,
-@@ -149,6 +163,7 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
-     {
-       anchoredEndSpace: anchoredEndSpaceWithBlankSpace,
-       anchoredEndSpaceOwnerInternal: "scroll",
-+      contentInsetEndAdjustment: contentInsetEndStaticAdjustment,
-       ref: combinedRef,
-       renderScrollComponent: memoList,
-       ...rest
-diff --git a/keyboard.mjs b/keyboard.mjs
-index 87b38b9607c2eba6b407c2acfd520633bdb0e7c2..111eb242ba9d9ade1cb912550f7df85cf4f361ee 100644
---- a/keyboard.mjs
-+++ b/keyboard.mjs
-@@ -1,7 +1,7 @@
- import * as React from 'react';
- import { useRef, useEffect, useMemo, useCallback, useLayoutEffect } from 'react';
- import { KeyboardChatScrollView, KeyboardController } from 'react-native-keyboard-controller';
--import { useSharedValue } from 'react-native-reanimated';
-+import { useSharedValue, withTiming } from 'react-native-reanimated';
- import { internal } from '@legendapp/list/react-native';
- import { AnimatedLegendList } from '@legendapp/list/reanimated';
- 
-@@ -12,19 +12,22 @@ if (typeof __DEV__ !== "undefined" && __DEV__ && !KeyboardChatScrollView) {
-     "[legend-list] KeyboardAwareLegendList requires a recent react-native-keyboard-controller with KeyboardChatScrollView. Please upgrade react-native-keyboard-controller to at least 1.21.7."
-   );
- }
--function useKeyboardChatComposerInset(listRef, composerRef, initialHeight = 0) {
-+function useKeyboardChatComposerInset(listRef, composerRef, initialHeight = 0, heightAdjustment = 0, animationDuration = 0) {
-   const contentInsetEndAdjustment = useSharedValue(initialHeight);
-   const lastHeightRef = useRef(void 0);
-   const reportHeight = useCallback(
--    (height) => {
-+    (rawHeight) => {
-+      const height = Math.max(0, rawHeight + heightAdjustment);
-       var _a;
-       if (Number.isFinite(height) && height !== lastHeightRef.current) {
-+        const shouldAnimate = lastHeightRef.current !== void 0 && animationDuration > 0;
-         lastHeightRef.current = height;
--        contentInsetEndAdjustment.value = height;
--        (_a = listRef.current) == null ? void 0 : _a.reportContentInset({ bottom: height });
-+        contentInsetEndAdjustment.value = shouldAnimate ? withTiming(height, {
-+          duration: animationDuration
-+        }) : height;
-       }
-     },
--    [contentInsetEndAdjustment, listRef]
-+    [animationDuration, contentInsetEndAdjustment, heightAdjustment, listRef]
-   );
-   useLayoutEffect(() => {
-     var _a;
-@@ -63,9 +66,11 @@ function useKeyboardScrollToEnd({ freeze: freezeProp, listRef }) {
- }
- var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(props, forwardedRef) {
-   const {
-+    adjustedInsetCompensation,
-     anchoredEndSpace,
-     applyWorkaroundForContentInsetHitTestBug,
-     contentInsetEndAdjustment,
-+    contentInsetEndStaticAdjustment,
-     freeze,
-     keyboardLiftBehavior,
-     keyboardOffset,
-@@ -73,6 +78,7 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
-   } = props;
-   const refLegendList = useRef(null);
-   const combinedRef = useCombinedRef(forwardedRef, refLegendList);
-+  const adjustedStartInsetCompensation = props.contentInsetStartAdjustment;
-   const blankSpace = useSharedValue(0);
-   useEffect(() => {
-     if (!anchoredEndSpace) {
-@@ -87,11 +93,15 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
-       ...anchoredEndSpace,
-       onSizeChanged: (size) => {
-         var _a;
--        blankSpace.value = size;
-+        // The anchored blank is sized against the ADJUSTED viewport, but the
-+        // scroll component writes it as a raw contentInset that UIKit tops up
-+        // with the safe-area bottom — write it net of that or the end rest
-+        // (and the anchored message) sinks one safe-area under the header.
-+        blankSpace.value = size > 0 ? Math.max(0, size - (adjustedInsetCompensation || 0)) : 0;
-         (_a = anchoredEndSpace.onSizeChanged) == null ? void 0 : _a.call(anchoredEndSpace, size);
-       }
-     };
--  }, [anchoredEndSpace, blankSpace]);
-+  }, [adjustedInsetCompensation, anchoredEndSpace, blankSpace]);
-   const onContentInsetChange = useCallback((insets) => {
-     var _a;
-     (_a = refLegendList.current) == null ? void 0 : _a.reportContentInset(insets);
-@@ -102,6 +112,8 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
-         KeyboardChatScrollView,
-         {
-           ...scrollProps,
-+          adjustedInsetCompensation,
-+          adjustedStartInsetCompensation,
-           applyWorkaroundForContentInsetHitTestBug,
-           blankSpace,
-           extraContentPadding: contentInsetEndAdjustment,
-@@ -113,6 +125,8 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
-       );
-     },
-     [
-+      adjustedInsetCompensation,
-+      adjustedStartInsetCompensation,
-       applyWorkaroundForContentInsetHitTestBug,
-       blankSpace,
-       contentInsetEndAdjustment,
-@@ -128,6 +142,7 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
-     {
-       anchoredEndSpace: anchoredEndSpaceWithBlankSpace,
-       anchoredEndSpaceOwnerInternal: "scroll",
-+      contentInsetEndAdjustment: contentInsetEndStaticAdjustment,
-       ref: combinedRef,
-       renderScrollComponent: memoList,
-       ...rest
-diff --git a/react-native.d.ts b/react-native.d.ts
-index ce1fe00001c9e5aee6c6ea8bb2d4757d4586d002..3ccf6f16067152dfcb0c143371e2ec6aba6636e5 100644
---- a/react-native.d.ts
-+++ b/react-native.d.ts
-@@ -293,6 +293,12 @@ interface LegendListSpecificProps<ItemT, TItemType extends string | undefined> {
-      * The adjustment is also rendered as real content padding so the browser scroll range includes it.
-      */
-     contentInsetEndAdjustment?: number;
-+    /**
-+     * Width/height of a leading content inset applied natively outside the list's knowledge
-+     * (e.g. iOS contentInsetAdjustmentBehavior="automatic" under a transparent header).
-+     * Programmatic scrolls clamp to -adjustment instead of 0 so content can rest below the header.
-+     */
-+    contentInsetStartAdjustment?: number;
-     /**
-      * Number of columns to render items in.
-      * @default 1
-diff --git a/react-native.js b/react-native.js
-index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c3ffe83af 100644
---- a/react-native.js
-+++ b/react-native.js
-@@ -954,7 +954,7 @@ function setInitialRenderState(ctx, {
-   if (didInitialScroll) {
-     state.didFinishInitialScroll = true;
-   }
--  const isReadyToRender = Boolean(state.didContainersLayout && state.didFinishInitialScroll);
-+  const isReadyToRender = Boolean(state.didContainersLayout && state.didFinishInitialScroll && !state.insetEndRevealHold);
-   if (isReadyToRender && !peek$(ctx, "readyToRender")) {
-     set$(ctx, "readyToRender", true);
-     setAdaptiveRender(ctx, "normal", "ready");
-@@ -1090,7 +1090,7 @@ function getRawContentLength(ctx) {
- function getAlignItemsAtEndPadding(ctx) {
-   const { state } = ctx;
-   const shouldPad = !!state.props.alignItemsAtEndPaddingEnabled && !state.props.horizontal && state.props.data.length > 0 && state.scrollLength > 0;
--  return shouldPad ? Math.max(0, state.scrollLength - getRawContentLength(ctx) - getContentInsetEnd(ctx)) : 0;
-+  return shouldPad ? Math.max(0, state.scrollLength - getContentInsetStartAdjustment(ctx) - getRawContentLength(ctx) - getContentInsetEnd(ctx)) : 0;
- }
- function updateContentMetricsState(ctx) {
-   const previousPadding = peek$(ctx, "alignItemsAtEndPadding") || 0;
-@@ -1115,6 +1115,10 @@ function addTotalSize(ctx, key, add, notifyTotalSize = true) {
-     totalSize += add;
-   }
-   if (prevTotalSize !== totalSize) {
-+    const now = Date.now();
-+    const isContinuingContentSizeAnimation = state.contentSizeAnimationActiveEpoch !== void 0;
-+    state.contentSizeAnimationEpoch = (state.contentSizeAnimationEpoch || 0) + 1;
-+    state.contentSizeAnimationEligible = !!state.props.sizeComponentInternal && state.didContainersLayout && (isContinuingContentSizeAnimation || !state.props.maintainScrollAtEnd && !state.isUserDragging && !state.isMomentumScrolling && now - (state.lastMVCPAdjustTime || 0) >= 300);
-     if (!IsNewArchitecture && state.initialScroll && totalSize < prevTotalSize) {
-       state.pendingTotalSize = totalSize;
-     } else {
-@@ -1304,18 +1308,23 @@ function calculateOffsetWithOffsetPosition(ctx, offsetParam, params) {
- }
- 
- // src/core/clampScrollOffset.ts
-+function getContentInsetStartAdjustment(ctx) {
-+  const adjustment = ctx.state.props.contentInsetStartAdjustment;
-+  return typeof adjustment === "number" && Number.isFinite(adjustment) ? Math.max(0, adjustment) : 0;
-+}
- function clampScrollOffset(ctx, offset, scrollTarget) {
-   const state = ctx.state;
-   const contentSize = getContentSize(ctx);
-+  const minOffset = -getContentInsetStartAdjustment(ctx);
-   let clampedOffset = offset;
-   if (Number.isFinite(contentSize) && Number.isFinite(state.scrollLength) && (Platform.OS !== "android" || state.lastLayout)) {
--    const baseMaxOffset = Math.max(0, contentSize - state.scrollLength);
-+    const baseMaxOffset = Math.max(minOffset, contentSize - state.scrollLength);
-     const viewOffset = scrollTarget == null ? void 0 : scrollTarget.viewOffset;
-     const extraEndOffset = typeof viewOffset === "number" && viewOffset < 0 ? -viewOffset : 0;
-     const maxOffset = baseMaxOffset + extraEndOffset;
-     clampedOffset = Math.min(offset, maxOffset);
-   }
--  clampedOffset = Math.max(0, clampedOffset);
-+  clampedOffset = Math.max(minOffset, clampedOffset);
-   return clampedOffset;
- }
- 
-@@ -1451,10 +1460,10 @@ function checkFinishedScrollFrame(ctx) {
-     finishScrollTo(ctx);
-   }
- }
--function scrollToFallbackOffset(ctx, offset) {
-+function scrollToFallbackOffset(ctx, offset, animated) {
-   var _a3;
-   (_a3 = ctx.state.refScroller.current) == null ? void 0 : _a3.scrollTo({
--    animated: false,
-+    animated: !!animated,
-     x: ctx.state.props.horizontal ? offset : 0,
-     y: ctx.state.props.horizontal ? 0 : offset
-   });
-@@ -1503,7 +1512,10 @@ function checkFinishedScrollFallback(ctx) {
-         );
-         scheduleFallbackCheck(SILENT_INITIAL_SCROLL_RETRY_DELAY_MS);
-       } else if (shouldRetryUnalignedEndScroll) {
--        scrollToFallbackOffset(ctx, completionState.clampedTargetOffset);
-+        const isActivelyAnimatingToEnd = !!isStillScrollingTo.animated && Date.now() - state.scrollTime < 100;
-+        if (!isActivelyAnimatingToEnd) {
-+          scrollToFallbackOffset(ctx, completionState.clampedTargetOffset, !!isStillScrollingTo.animated);
-+        }
-         scheduleFallbackCheck(100);
-       } else if (shouldFinishZeroTarget || shouldFinishAfterObservedScroll || canFinishInitialScrollWithoutNativeProgress || canFinishAfterSilentNativeDispatch || numChecks > maxChecks) {
-         finishScrollTo(ctx);
-@@ -1560,15 +1572,28 @@ function doMaintainScrollAtEnd(ctx) {
-   } = state;
-   const isWithinMaintainScrollAtEndThreshold = peek$(ctx, "isWithinMaintainScrollAtEndThreshold");
-   const shouldMaintainScrollAtEnd = !!(isWithinMaintainScrollAtEndThreshold && maintainScrollAtEnd && didContainersLayout);
-+  if (state.contentSizeAnimationActiveEpoch !== void 0) {
-+    state.pendingMaintainScrollAtEnd = false;
-+    return false;
-+  }
-   if (pendingNativeMVCPAdjust) {
-     state.pendingMaintainScrollAtEnd = shouldMaintainScrollAtEnd;
-     return false;
-   }
-   if (shouldMaintainScrollAtEnd) {
-     state.pendingMaintainScrollAtEnd = false;
-+    const maintainAnchoredEndSpace = state.props.anchoredEndSpace;
-+    const maintainAnchorIndex = maintainAnchoredEndSpace == null ? void 0 : maintainAnchoredEndSpace.anchorIndex;
-+    if (maintainAnchorIndex !== void 0 && maintainAnchorIndex >= 0 && maintainAnchorIndex < state.props.data.length && !areKnownOrFixedItemSizesAvailable(ctx, maintainAnchorIndex, state.props.data.length - 1)) {
-+      return false;
-+    }
-     const contentSize = getContentSize(ctx);
-+    const maintainInsetStartAdjustment = getContentInsetStartAdjustment(ctx);
-     if (contentSize < state.scrollLength) {
--      state.scroll = 0;
-+      state.scroll = -maintainInsetStartAdjustment;
-+      if (maintainInsetStartAdjustment > 0) {
-+        return true;
-+      }
-     }
-     if (!state.maintainingScrollAtEnd) {
-       const pendingState = maintainScrollAtEnd.animated ? "pending-animated" : "pending-instant";
-@@ -1591,9 +1616,18 @@ function doMaintainScrollAtEnd(ctx) {
-               y: 0
-             });
-           } else {
--            scroller == null ? void 0 : scroller.scrollToEnd({
--              animated: maintainScrollAtEnd.animated
--            });
-+            const insetStartAdjustment = getContentInsetStartAdjustment(ctx);
-+            if (insetStartAdjustment > 0) {
-+              scroller == null ? void 0 : scroller.scrollTo({
-+                animated: maintainScrollAtEnd.animated,
-+                x: 0,
-+                y: Math.max(-insetStartAdjustment, getContentSize(ctx) - state.scrollLength)
-+              });
-+            } else {
-+              scroller == null ? void 0 : scroller.scrollToEnd({
-+                animated: maintainScrollAtEnd.animated
-+              });
-+            }
-           }
-           setTimeout(
-             () => {
-@@ -1624,6 +1658,10 @@ function doMaintainScrollAtEnd(ctx) {
- function requestAdjust(ctx, positionDiff, dataChanged) {
-   const state = ctx.state;
-   if (Math.abs(positionDiff) > 0.1) {
-+    // Timestamp for ReanimatedPositionView: repositions caused by an MVCP
-+    // size adjustment are already compensated by a contentOffset shift, so
-+    // animating them would make rows visibly lurch and slide back.
-+    state.lastMVCPAdjustTime = Date.now();
-     const needsScrollWorkaround = Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
-     const doit = () => {
-       if (needsScrollWorkaround) {
-@@ -1728,7 +1766,9 @@ function getPredictedNativeClamp(state, unresolvedAmount, totalSize) {
-   if (Math.abs(unresolvedAmount) <= MVCP_POSITION_EPSILON) {
-     return 0;
-   }
--  const maxScroll = Math.max(0, totalSize - state.scrollLength);
-+  const insetStartAdjustment = state.props.contentInsetStartAdjustment;
-+  const minScroll = typeof insetStartAdjustment === "number" && Number.isFinite(insetStartAdjustment) ? -Math.max(0, insetStartAdjustment) : 0;
-+  const maxScroll = Math.max(minScroll, totalSize - state.scrollLength);
-   const clampDelta = maxScroll - state.scroll;
-   if (unresolvedAmount < 0) {
-     return Math.max(unresolvedAmount, Math.min(0, clampDelta));
-@@ -1790,7 +1830,7 @@ function resolvePendingNativeMVCPAdjust(ctx, newScroll) {
-     settlePendingNativeMVCPAdjust(ctx, remainingAfterManual, nativeDelta);
-     return true;
-   }
--  const expectedNativeClampScroll = Math.max(0, getContentSize(ctx) - state.scrollLength);
-+  const expectedNativeClampScroll = Math.max(-getContentInsetStartAdjustment(ctx), getContentSize(ctx) - state.scrollLength);
-   const distanceToClamp = Math.abs(newScroll - expectedNativeClampScroll);
-   const isAtExpectedNativeClamp = distanceToClamp <= NATIVE_END_CLAMP_EPSILON;
-   if (isAtExpectedNativeClamp) {
-@@ -1923,7 +1963,7 @@ function prepareMVCP(ctx, dataChanged) {
-             if (diff > 0) {
-               diff = Math.max(0, totalSize - state.scroll - state.scrollLength);
-             } else {
--              const maxScroll = Math.max(0, totalSize - state.scrollLength);
-+              const maxScroll = Math.max(-getContentInsetStartAdjustment(ctx), totalSize - state.scrollLength);
-               state.scroll = maxScroll;
-               state.scrollPending = maxScroll;
-               diff = 0;
-@@ -2320,8 +2360,121 @@ function scrollToIndex(ctx, {
- }
- 
- // src/core/initialScroll.ts
-+var INSET_END_SETTLE_WATCHDOG_FRAMES = 150;
-+var INSET_END_SETTLE_WATCHDOG_STABLE_FRAMES = 20;
-+var INSET_END_REVEAL_STABLE_FRAMES = 3;
-+var INSET_END_REVEAL_MAX_HOLD_FRAMES = 40;
-+function startInsetEndSettleWatchdog(ctx) {
-+  const state = ctx.state;
-+  if (state.insetEndSettleWatchdogActive) {
-+    return;
-+  }
-+  state.insetEndSettleWatchdogActive = true;
-+  state.didUserDrag = false;
-+  // Hold the readyToRender opacity gate until the end landing is stable, so
-+  // the estimated-to-measured settle chase happens before first VISIBLE
-+  // paint instead of in front of the user. Capped so slow measurement can
-+  // never hide content for long.
-+  state.insetEndRevealHold = true;
-+  let frames = 0;
-+  let settledFrames = 0;
-+  let revealStableFrames = 0;
-+  const releaseRevealHold = () => {
-+    if (state.insetEndRevealHold) {
-+      state.insetEndRevealHold = false;
-+      setInitialRenderState(ctx, {});
-+    }
-+  };
-+  // Revealing flips adaptive rendering to "normal", which re-renders rows and
-+  // can move the end target one more time — do that upgrade while still
-+  // hidden (phase 1), then require stability again before revealing (phase 2)
-+  // so the first visible frame is the settled one.
-+  let revealPhase = 1;
-+  const onRevealStability = () => {
-+    var _a3;
-+    if (!state.insetEndRevealHold) {
-+      return;
-+    }
-+    if (revealPhase === 1) {
-+      revealPhase = 2;
-+      revealStableFrames = 0;
-+      setAdaptiveRender(ctx, "normal");
-+      (_a3 = state.triggerCalculateItemsInView) == null ? void 0 : _a3.call(state);
-+      return;
-+    }
-+    releaseRevealHold();
-+  };
-+  const tick = () => {
-+    // The user owns the scroll from their first drag — a re-pin here would
-+    // pin the list under their finger.
-+    if (frames++ >= INSET_END_SETTLE_WATCHDOG_FRAMES || settledFrames >= INSET_END_SETTLE_WATCHDOG_STABLE_FRAMES || state.didUserDrag || !ctx.state || ctx.state !== state) {
-+      state.insetEndSettleWatchdogActive = false;
-+      releaseRevealHold();
-+      return;
-+    }
-+    if (frames >= INSET_END_REVEAL_MAX_HOLD_FRAMES) {
-+      releaseRevealHold();
-+    }
-+    const insetStartAdjustment = getContentInsetStartAdjustment(ctx);
-+    const contentSize = getContentSize(ctx);
-+    const scrollLength = state.scrollLength;
-+    if (insetStartAdjustment > 0 && scrollLength > 0 && Number.isFinite(contentSize) && contentSize > scrollLength && !state.scrollingTo && !state.maintainingScrollAtEnd) {
-+      const endOffset = Math.max(-insetStartAdjustment, contentSize - scrollLength);
-+      const distance = endOffset - state.scroll;
-+      // Estimated row sizes converging to measured ones can strand the initial
-+      // end landing when the library's own end-anchor bookkeeping gives up.
-+      // While still near the end (never fighting a user who scrolled away),
-+      // re-pin to the current true end until sizes stop changing.
-+      if (Math.abs(distance) > 2 && Math.abs(distance) <= scrollLength * 0.5) {
-+        settledFrames = 0;
-+        revealStableFrames = 0;
-+        const scroller = state.refScroller.current;
-+        if (scroller) {
-+          scroller.scrollTo({ animated: false, x: 0, y: endOffset });
-+        }
-+      } else {
-+        settledFrames++;
-+        revealStableFrames++;
-+        if (revealStableFrames >= INSET_END_REVEAL_STABLE_FRAMES) {
-+          onRevealStability();
-+        }
-+      }
-+    } else {
-+      // Conditions that make re-pinning unnecessary (underflow, in-flight
-+      // programmatic scroll) count toward stability for the reveal.
-+      revealStableFrames++;
-+      if (revealStableFrames >= INSET_END_REVEAL_STABLE_FRAMES) {
-+        onRevealStability();
-+      }
-+    }
-+    requestAnimationFrame(tick);
-+  };
-+  requestAnimationFrame(tick);
-+}
- function dispatchInitialScroll(ctx, params) {
-   const { forceScroll, resolvedOffset, target, waitForCompletionFrame } = params;
-+  const insetStartAdjustment = getContentInsetStartAdjustment(ctx);
-+  if (insetStartAdjustment > 0 && ctx.state.props.data.length > 0) {
-+    if (ctx.state.scrollLength <= 0) {
-+      // The scroll length is unknown, so the resolved target is meaningless;
-+      // the initial-scroll machinery re-advances after layout.
-+      return;
-+    }
-+    if (resolvedOffset <= -insetStartAdjustment + 1 && !ctx.state.didDispatchInsetInitialScroll) {
-+      // Content underflows the viewport and nothing has scrolled yet: the
-+      // untouched native rest position (UIKit's adjustedContentInset) IS the
-+      // end position. Dispatching a negative scroll here would race UIKit's
-+      // inset application during screen attach, so just finish the session.
-+      finishInitialScroll(ctx, {
-+        resolvedOffset
-+      });
-+      return;
-+    }
-+    ctx.state.didDispatchInsetInitialScroll = true;
-+    if (target.viewPosition === 1) {
-+      startInsetEndSettleWatchdog(ctx);
-+    }
-+  }
-   const requestedIndex = target.index;
-   const index = requestedIndex !== void 0 ? clampScrollIndex(requestedIndex, ctx.state.props.data.length) : void 0;
-   const itemSize = getItemSizeAtIndex(ctx, index);
-@@ -2747,7 +2900,9 @@ function clearFinishedBootstrapInitialScrollTargetIfMovedAway(ctx) {
-     return;
-   }
-   if (didFinishedInitialScrollMoveAwayFromTarget(ctx, initialScroll)) {
--    const shouldKeepEndTargetAlive = isRetargetableBottomAlignedInitialScrollTarget(initialScroll) && peek$(ctx, "isAtEnd");
-+    const endTargetDistanceFromEnd = getContentSize(ctx) - state.scroll - state.scrollLength - getContentInsetEnd(ctx);
-+    const isNearEndForInsetList = getContentInsetStartAdjustment(ctx) > 0 && Number.isFinite(endTargetDistanceFromEnd) && endTargetDistanceFromEnd <= state.scrollLength * 0.5;
-+    const shouldKeepEndTargetAlive = isRetargetableBottomAlignedInitialScrollTarget(initialScroll) && (peek$(ctx, "isAtEnd") || isNearEndForInsetList);
-     if (!shouldKeepEndTargetAlive) {
-       if (shouldPreserveInitialScrollForFooterLayout(initialScroll)) {
-         clearPendingInitialScrollFooterLayout(ctx, {
-@@ -4672,7 +4827,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
-       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);
-+      const knownSizeBound = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
-+      nextSize = hasUnknownTailSize ? Math.min(previousSize || 0, knownSizeBound) : knownSizeBound;
-     } else if (anchorIndex >= 0) {
-       isReady = false;
-     }
-@@ -4692,6 +4848,12 @@ function maybeUpdateAnchoredEndSpace(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 });
-+  } else if (!isReady && didSizeChange && nextSize < (previousSize || 0)) {
-+    set$(ctx, "anchoredEndSpaceSize", nextSize);
-+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-+      updateScroll(ctx, state.scroll, true, { markHasScrolled: false });
-+    }
-   }
-   return nextSize;
- }
-@@ -5715,6 +5877,7 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
-   horizontal
- }) {
-   const ctx = useStateContext();
-+  const SizeComponent = ctx.state.props.sizeComponentInternal;
-   const columnWrapperStyle = ctx.columnWrapperStyle;
-   const animSize = useValue$("totalSize");
-   const [readyToRender, numColumns, otherAxisSize = 0] = useArr$(["readyToRender", "numColumns", "otherAxisSize"]);
-@@ -5725,6 +5888,13 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
-     opacity: isVisible ? 1 : 0,
-     width: animSize
-   } : { height: animSize, minWidth: otherAxisSize, opacity: isVisible ? 1 : 0 };
-+  if (SizeComponent) {
-+    if (horizontal) {
-+      delete style.width;
-+    } else {
-+      delete style.height;
-+    }
-+  }
-   if (columnWrapperStyle) {
-     const { columnGap, rowGap, gap } = columnWrapperStyle;
-     const gapX = columnGap || gap || 0;
-@@ -5745,7 +5915,8 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
-       }
-     }
-   }
--  return /* @__PURE__ */ React2__namespace.createElement(ReactNative.Animated.View, { pointerEvents: isVisible ? void 0 : "none", style }, /* @__PURE__ */ React2__namespace.createElement(ContainerLayoutCoordinator, null, children));
-+  const content = /* @__PURE__ */ React2__namespace.createElement(ContainerLayoutCoordinator, null, children);
-+  return SizeComponent ? /* @__PURE__ */ React2__namespace.createElement(SizeComponent, { horizontal, pointerEvents: isVisible ? void 0 : "none", signalName: "totalSize", style }, content) : /* @__PURE__ */ React2__namespace.createElement(ReactNative.Animated.View, { pointerEvents: isVisible ? void 0 : "none", style }, content);
- });
- var Containers = typedMemo(function Containers2({
-   freshDataTransitionEpoch,
-@@ -5896,7 +6067,12 @@ var StyleSheet = ReactNative.StyleSheet;
- 
- // src/components/ListComponent.tsx
- var AlignItemsAtEndSpacer = typedMemo(function AlignItemsAtEndSpacer2({ horizontal }) {
-+  const ctx = useStateContext();
-   const [alignItemsAtEndPadding = 0] = useArr$(["alignItemsAtEndPadding"]);
-+  const SizeComponent = ctx.state.props.sizeComponentInternal;
-+  if (SizeComponent) {
-+    return /* @__PURE__ */ React2__namespace.createElement(SizeComponent, { horizontal, signalName: "alignItemsAtEndPadding", style: { flexShrink: 0 } });
-+  }
-   if (alignItemsAtEndPadding <= 0) {
-     return null;
-   }
-@@ -5929,8 +6105,12 @@ var ListComponent = typedMemo(function ListComponent2({
-   refScrollView,
-   renderScrollComponent,
-   onLayoutFooter,
-+  onInternalMomentumScrollBegin,
-   onInternalScrollBeginDrag,
-+  onInternalScrollEndDrag,
-   onInternalScrollEnd,
-+  onMomentumScrollBegin,
-+  onScrollEndDrag,
-   scrollAdjustHandler,
-   snapToIndices,
-   stickyHeaderConfig,
-@@ -6001,7 +6181,17 @@ var ListComponent = typedMemo(function ListComponent2({
-     SnapOrScroll,
-     {
-       ...rest,
--      ...Platform.OS === "web" ? ScrollComponent === ListComponentScrollView ? { onInternalScrollEnd, useWindowScroll } : {} : { onScrollBeginDrag: onInternalScrollBeginDrag },
-+      ...Platform.OS === "web" ? ScrollComponent === ListComponentScrollView ? { onInternalScrollEnd, useWindowScroll } : {} : {
-+        onMomentumScrollBegin: (event) => {
-+          onInternalMomentumScrollBegin == null ? void 0 : onInternalMomentumScrollBegin(event);
-+          onMomentumScrollBegin == null ? void 0 : onMomentumScrollBegin(event);
-+        },
-+        onScrollBeginDrag: onInternalScrollBeginDrag,
-+        onScrollEndDrag: (event) => {
-+          onInternalScrollEndDrag == null ? void 0 : onInternalScrollEndDrag(event);
-+          onScrollEndDrag == null ? void 0 : onScrollEndDrag(event);
-+        }
-+      },
-       contentContainerStyle: [
-         horizontal ? { height: "100%" } : {},
-         contentContainerStyle,
-@@ -7075,6 +7265,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-     dataVersion,
-     drawDistance = 250,
-     contentInsetEndAdjustment,
-+    contentInsetStartAdjustment,
-     estimatedItemSize = 100,
-     estimatedListSize,
-     extraData,
-@@ -7132,10 +7323,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-   const animatedPropsInternal = props.animatedPropsInternal;
-   const anchoredEndSpaceOwner = (_a3 = props.anchoredEndSpaceOwnerInternal) != null ? _a3 : "list";
-   const positionComponentInternal = props.positionComponentInternal;
-+  const sizeComponentInternal = props.sizeComponentInternal;
-   const stickyPositionComponentInternal = props.stickyPositionComponentInternal;
-   const {
-     anchoredEndSpaceOwnerInternal: _anchoredEndSpaceOwnerInternal,
-     positionComponentInternal: _positionComponentInternal,
-+    sizeComponentInternal: _sizeComponentInternal,
-     stickyPositionComponentInternal: _stickyPositionComponentInternal,
-     ...restProps
-   } = rest;
-@@ -7200,7 +7393,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-   const combinedRef = useCombinedRef(refScroller, refScrollView);
-   const keyExtractor = keyExtractorProp != null ? keyExtractorProp : ((_item, index) => index.toString());
-   const stickyHeaderIndices = stickyHeaderIndicesProp;
--  const contentInsetEndAdjustmentResolved = Platform.OS === "web" ? contentInsetEndAdjustment : void 0;
-+  const contentInsetEndAdjustmentResolved = contentInsetEndAdjustment;
-   const previousContentInsetEndAdjustmentRef = React2.useRef(contentInsetEndAdjustmentResolved);
-   const alwaysRenderIndices = React2.useMemo(() => {
-     const indices = getAlwaysRenderIndices(alwaysRender, dataProp, keyExtractor, anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex);
-@@ -7341,6 +7534,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-     contentContainerAlignItems: contentContainerStyle.alignItems,
-     contentInset,
-     contentInsetEndAdjustment: contentInsetEndAdjustmentResolved,
-+    contentInsetStartAdjustment,
-     data: dataProp,
-     dataKey,
-     dataVersion,
-@@ -7372,6 +7566,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-     renderItem,
-     rtl,
-     snapToIndices,
-+    sizeComponentInternal,
-     stickyHeaderIndicesArr: stickyHeaderIndices != null ? stickyHeaderIndices : [],
-     stickyHeaderIndicesSet: React2.useMemo(() => new Set(stickyHeaderIndices != null ? stickyHeaderIndices : []), [stickyHeaderIndices == null ? void 0 : stickyHeaderIndices.join(",")]),
-     stickyPositionComponentInternal,
-@@ -7423,6 +7618,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-       return void 0;
-     }
-     const resolvedOffset = (_a4 = initialScroll.contentOffset) != null ? _a4 : resolveInitialScrollOffset(ctx, initialScroll);
-+    if (getContentInsetStartAdjustment(ctx) > 0) {
-+      // With a native leading inset (transparent header + automatic insets),
-+      // any mount-time contentOffset races UIKit's adjustedContentInset
-+      // application. The gated initial-scroll dispatch positions the list once
-+      // real sizes are known instead.
-+      return void 0;
-+    }
-     return usesBootstrapInitialScroll && ((_b2 = state.initialScrollSession) == null ? void 0 : _b2.kind) === "bootstrap" && Platform.OS === "web" ? void 0 : resolvedOffset;
-   }, [usesBootstrapInitialScroll]);
-   React2.useLayoutEffect(() => {
-@@ -7547,6 +7749,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-     [
-       dataKey,
-       dataVersion,
-+      contentInsetStartAdjustment,
-       memoizedLastItemKeys.join(","),
-       numColumnsProp,
-       nextScrollAxisGap,
-@@ -7643,6 +7846,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-     () => ({
-       getRenderedItem: (key) => getRenderedItem(ctx, key),
-       onMomentumScrollEnd: (event) => {
-+        state.isMomentumScrolling = false;
-         checkFinishedScrollFallback(ctx);
-         if (state.props.onMomentumScrollEnd) {
-           state.props.onMomentumScrollEnd(event);
-@@ -7651,6 +7855,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-       onScroll: (event) => onScroll(ctx, event),
-       onScrollBeginDrag: (event) => {
-         var _a4, _b2;
-+        ctx.state.didUserDrag = true;
-+        ctx.state.isUserDragging = true;
-         prepareReachedEdgeForNextUserScroll(ctx);
-         (_b2 = (_a4 = state.props).onScrollBeginDrag) == null ? void 0 : _b2.call(_a4, event);
-       },
-@@ -7676,11 +7882,18 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-       ListFooterComponent,
-       ListFooterComponentStyle,
-       ListHeaderComponent,
-+      onInternalMomentumScrollBegin: () => {
-+        ctx.state.isMomentumScrolling = true;
-+      },
-       onInternalScrollBeginDrag: fns.onScrollBeginDrag,
-+      onInternalScrollEndDrag: () => {
-+        ctx.state.isUserDragging = false;
-+      },
-       onInternalScrollEnd: fns.onScrollEnd,
-       onLayout,
-       onLayoutFooter,
-       onMomentumScrollEnd: fns.onMomentumScrollEnd,
-+      onScrollBeginDrag: fns.onScrollBeginDrag,
-       onScroll: onScrollHandler,
-       recycleItems,
-       refreshControl: refreshControlElement ? stylePaddingTopState > 0 ? React2__namespace.cloneElement(refreshControlElement, {
-diff --git a/react-native.mjs b/react-native.mjs
-index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318d57e29dc 100644
---- a/react-native.mjs
-+++ b/react-native.mjs
-@@ -933,7 +933,7 @@ function setInitialRenderState(ctx, {
-   if (didInitialScroll) {
-     state.didFinishInitialScroll = true;
-   }
--  const isReadyToRender = Boolean(state.didContainersLayout && state.didFinishInitialScroll);
-+  const isReadyToRender = Boolean(state.didContainersLayout && state.didFinishInitialScroll && !state.insetEndRevealHold);
-   if (isReadyToRender && !peek$(ctx, "readyToRender")) {
-     set$(ctx, "readyToRender", true);
-     setAdaptiveRender(ctx, "normal", "ready");
-@@ -1069,7 +1069,7 @@ function getRawContentLength(ctx) {
- function getAlignItemsAtEndPadding(ctx) {
-   const { state } = ctx;
-   const shouldPad = !!state.props.alignItemsAtEndPaddingEnabled && !state.props.horizontal && state.props.data.length > 0 && state.scrollLength > 0;
--  return shouldPad ? Math.max(0, state.scrollLength - getRawContentLength(ctx) - getContentInsetEnd(ctx)) : 0;
-+  return shouldPad ? Math.max(0, state.scrollLength - getContentInsetStartAdjustment(ctx) - getRawContentLength(ctx) - getContentInsetEnd(ctx)) : 0;
- }
- function updateContentMetricsState(ctx) {
-   const previousPadding = peek$(ctx, "alignItemsAtEndPadding") || 0;
-@@ -1094,6 +1094,10 @@ function addTotalSize(ctx, key, add, notifyTotalSize = true) {
-     totalSize += add;
-   }
-   if (prevTotalSize !== totalSize) {
-+    const now = Date.now();
-+    const isContinuingContentSizeAnimation = state.contentSizeAnimationActiveEpoch !== void 0;
-+    state.contentSizeAnimationEpoch = (state.contentSizeAnimationEpoch || 0) + 1;
-+    state.contentSizeAnimationEligible = !!state.props.sizeComponentInternal && state.didContainersLayout && (isContinuingContentSizeAnimation || !state.props.maintainScrollAtEnd && !state.isUserDragging && !state.isMomentumScrolling && now - (state.lastMVCPAdjustTime || 0) >= 300);
-     if (!IsNewArchitecture && state.initialScroll && totalSize < prevTotalSize) {
-       state.pendingTotalSize = totalSize;
-     } else {
-@@ -1283,18 +1287,23 @@ function calculateOffsetWithOffsetPosition(ctx, offsetParam, params) {
- }
- 
- // src/core/clampScrollOffset.ts
-+function getContentInsetStartAdjustment(ctx) {
-+  const adjustment = ctx.state.props.contentInsetStartAdjustment;
-+  return typeof adjustment === "number" && Number.isFinite(adjustment) ? Math.max(0, adjustment) : 0;
-+}
- function clampScrollOffset(ctx, offset, scrollTarget) {
-   const state = ctx.state;
-   const contentSize = getContentSize(ctx);
-+  const minOffset = -getContentInsetStartAdjustment(ctx);
-   let clampedOffset = offset;
-   if (Number.isFinite(contentSize) && Number.isFinite(state.scrollLength) && (Platform.OS !== "android" || state.lastLayout)) {
--    const baseMaxOffset = Math.max(0, contentSize - state.scrollLength);
-+    const baseMaxOffset = Math.max(minOffset, contentSize - state.scrollLength);
-     const viewOffset = scrollTarget == null ? void 0 : scrollTarget.viewOffset;
-     const extraEndOffset = typeof viewOffset === "number" && viewOffset < 0 ? -viewOffset : 0;
-     const maxOffset = baseMaxOffset + extraEndOffset;
-     clampedOffset = Math.min(offset, maxOffset);
-   }
--  clampedOffset = Math.max(0, clampedOffset);
-+  clampedOffset = Math.max(minOffset, clampedOffset);
-   return clampedOffset;
- }
- 
-@@ -1430,10 +1439,10 @@ function checkFinishedScrollFrame(ctx) {
-     finishScrollTo(ctx);
-   }
- }
--function scrollToFallbackOffset(ctx, offset) {
-+function scrollToFallbackOffset(ctx, offset, animated) {
-   var _a3;
-   (_a3 = ctx.state.refScroller.current) == null ? void 0 : _a3.scrollTo({
--    animated: false,
-+    animated: !!animated,
-     x: ctx.state.props.horizontal ? offset : 0,
-     y: ctx.state.props.horizontal ? 0 : offset
-   });
-@@ -1482,7 +1491,10 @@ function checkFinishedScrollFallback(ctx) {
-         );
-         scheduleFallbackCheck(SILENT_INITIAL_SCROLL_RETRY_DELAY_MS);
-       } else if (shouldRetryUnalignedEndScroll) {
--        scrollToFallbackOffset(ctx, completionState.clampedTargetOffset);
-+        const isActivelyAnimatingToEnd = !!isStillScrollingTo.animated && Date.now() - state.scrollTime < 100;
-+        if (!isActivelyAnimatingToEnd) {
-+          scrollToFallbackOffset(ctx, completionState.clampedTargetOffset, !!isStillScrollingTo.animated);
-+        }
-         scheduleFallbackCheck(100);
-       } else if (shouldFinishZeroTarget || shouldFinishAfterObservedScroll || canFinishInitialScrollWithoutNativeProgress || canFinishAfterSilentNativeDispatch || numChecks > maxChecks) {
-         finishScrollTo(ctx);
-@@ -1539,15 +1551,28 @@ function doMaintainScrollAtEnd(ctx) {
-   } = state;
-   const isWithinMaintainScrollAtEndThreshold = peek$(ctx, "isWithinMaintainScrollAtEndThreshold");
-   const shouldMaintainScrollAtEnd = !!(isWithinMaintainScrollAtEndThreshold && maintainScrollAtEnd && didContainersLayout);
-+  if (state.contentSizeAnimationActiveEpoch !== void 0) {
-+    state.pendingMaintainScrollAtEnd = false;
-+    return false;
-+  }
-   if (pendingNativeMVCPAdjust) {
-     state.pendingMaintainScrollAtEnd = shouldMaintainScrollAtEnd;
-     return false;
-   }
-   if (shouldMaintainScrollAtEnd) {
-     state.pendingMaintainScrollAtEnd = false;
-+    const maintainAnchoredEndSpace = state.props.anchoredEndSpace;
-+    const maintainAnchorIndex = maintainAnchoredEndSpace == null ? void 0 : maintainAnchoredEndSpace.anchorIndex;
-+    if (maintainAnchorIndex !== void 0 && maintainAnchorIndex >= 0 && maintainAnchorIndex < state.props.data.length && !areKnownOrFixedItemSizesAvailable(ctx, maintainAnchorIndex, state.props.data.length - 1)) {
-+      return false;
-+    }
-     const contentSize = getContentSize(ctx);
-+    const maintainInsetStartAdjustment = getContentInsetStartAdjustment(ctx);
-     if (contentSize < state.scrollLength) {
--      state.scroll = 0;
-+      state.scroll = -maintainInsetStartAdjustment;
-+      if (maintainInsetStartAdjustment > 0) {
-+        return true;
-+      }
-     }
-     if (!state.maintainingScrollAtEnd) {
-       const pendingState = maintainScrollAtEnd.animated ? "pending-animated" : "pending-instant";
-@@ -1570,9 +1595,18 @@ function doMaintainScrollAtEnd(ctx) {
-               y: 0
-             });
-           } else {
--            scroller == null ? void 0 : scroller.scrollToEnd({
--              animated: maintainScrollAtEnd.animated
--            });
-+            const insetStartAdjustment = getContentInsetStartAdjustment(ctx);
-+            if (insetStartAdjustment > 0) {
-+              scroller == null ? void 0 : scroller.scrollTo({
-+                animated: maintainScrollAtEnd.animated,
-+                x: 0,
-+                y: Math.max(-insetStartAdjustment, getContentSize(ctx) - state.scrollLength)
-+              });
-+            } else {
-+              scroller == null ? void 0 : scroller.scrollToEnd({
-+                animated: maintainScrollAtEnd.animated
-+              });
-+            }
-           }
-           setTimeout(
-             () => {
-@@ -1603,6 +1637,10 @@ function doMaintainScrollAtEnd(ctx) {
- function requestAdjust(ctx, positionDiff, dataChanged) {
-   const state = ctx.state;
-   if (Math.abs(positionDiff) > 0.1) {
-+    // Timestamp for ReanimatedPositionView: repositions caused by an MVCP
-+    // size adjustment are already compensated by a contentOffset shift, so
-+    // animating them would make rows visibly lurch and slide back.
-+    state.lastMVCPAdjustTime = Date.now();
-     const needsScrollWorkaround = Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
-     const doit = () => {
-       if (needsScrollWorkaround) {
-@@ -1707,7 +1745,9 @@ function getPredictedNativeClamp(state, unresolvedAmount, totalSize) {
-   if (Math.abs(unresolvedAmount) <= MVCP_POSITION_EPSILON) {
-     return 0;
-   }
--  const maxScroll = Math.max(0, totalSize - state.scrollLength);
-+  const insetStartAdjustment = state.props.contentInsetStartAdjustment;
-+  const minScroll = typeof insetStartAdjustment === "number" && Number.isFinite(insetStartAdjustment) ? -Math.max(0, insetStartAdjustment) : 0;
-+  const maxScroll = Math.max(minScroll, totalSize - state.scrollLength);
-   const clampDelta = maxScroll - state.scroll;
-   if (unresolvedAmount < 0) {
-     return Math.max(unresolvedAmount, Math.min(0, clampDelta));
-@@ -1769,7 +1809,7 @@ function resolvePendingNativeMVCPAdjust(ctx, newScroll) {
-     settlePendingNativeMVCPAdjust(ctx, remainingAfterManual, nativeDelta);
-     return true;
-   }
--  const expectedNativeClampScroll = Math.max(0, getContentSize(ctx) - state.scrollLength);
-+  const expectedNativeClampScroll = Math.max(-getContentInsetStartAdjustment(ctx), getContentSize(ctx) - state.scrollLength);
-   const distanceToClamp = Math.abs(newScroll - expectedNativeClampScroll);
-   const isAtExpectedNativeClamp = distanceToClamp <= NATIVE_END_CLAMP_EPSILON;
-   if (isAtExpectedNativeClamp) {
-@@ -1902,7 +1942,7 @@ function prepareMVCP(ctx, dataChanged) {
-             if (diff > 0) {
-               diff = Math.max(0, totalSize - state.scroll - state.scrollLength);
-             } else {
--              const maxScroll = Math.max(0, totalSize - state.scrollLength);
-+              const maxScroll = Math.max(-getContentInsetStartAdjustment(ctx), totalSize - state.scrollLength);
-               state.scroll = maxScroll;
-               state.scrollPending = maxScroll;
-               diff = 0;
-@@ -2299,8 +2339,121 @@ function scrollToIndex(ctx, {
- }
- 
- // src/core/initialScroll.ts
-+var INSET_END_SETTLE_WATCHDOG_FRAMES = 150;
-+var INSET_END_SETTLE_WATCHDOG_STABLE_FRAMES = 20;
-+var INSET_END_REVEAL_STABLE_FRAMES = 3;
-+var INSET_END_REVEAL_MAX_HOLD_FRAMES = 40;
-+function startInsetEndSettleWatchdog(ctx) {
-+  const state = ctx.state;
-+  if (state.insetEndSettleWatchdogActive) {
-+    return;
-+  }
-+  state.insetEndSettleWatchdogActive = true;
-+  state.didUserDrag = false;
-+  // Hold the readyToRender opacity gate until the end landing is stable, so
-+  // the estimated-to-measured settle chase happens before first VISIBLE
-+  // paint instead of in front of the user. Capped so slow measurement can
-+  // never hide content for long.
-+  state.insetEndRevealHold = true;
-+  let frames = 0;
-+  let settledFrames = 0;
-+  let revealStableFrames = 0;
-+  const releaseRevealHold = () => {
-+    if (state.insetEndRevealHold) {
-+      state.insetEndRevealHold = false;
-+      setInitialRenderState(ctx, {});
-+    }
-+  };
-+  // Revealing flips adaptive rendering to "normal", which re-renders rows and
-+  // can move the end target one more time — do that upgrade while still
-+  // hidden (phase 1), then require stability again before revealing (phase 2)
-+  // so the first visible frame is the settled one.
-+  let revealPhase = 1;
-+  const onRevealStability = () => {
-+    var _a3;
-+    if (!state.insetEndRevealHold) {
-+      return;
-+    }
-+    if (revealPhase === 1) {
-+      revealPhase = 2;
-+      revealStableFrames = 0;
-+      setAdaptiveRender(ctx, "normal");
-+      (_a3 = state.triggerCalculateItemsInView) == null ? void 0 : _a3.call(state);
-+      return;
-+    }
-+    releaseRevealHold();
-+  };
-+  const tick = () => {
-+    // The user owns the scroll from their first drag — a re-pin here would
-+    // pin the list under their finger.
-+    if (frames++ >= INSET_END_SETTLE_WATCHDOG_FRAMES || settledFrames >= INSET_END_SETTLE_WATCHDOG_STABLE_FRAMES || state.didUserDrag || !ctx.state || ctx.state !== state) {
-+      state.insetEndSettleWatchdogActive = false;
-+      releaseRevealHold();
-+      return;
-+    }
-+    if (frames >= INSET_END_REVEAL_MAX_HOLD_FRAMES) {
-+      releaseRevealHold();
-+    }
-+    const insetStartAdjustment = getContentInsetStartAdjustment(ctx);
-+    const contentSize = getContentSize(ctx);
-+    const scrollLength = state.scrollLength;
-+    if (insetStartAdjustment > 0 && scrollLength > 0 && Number.isFinite(contentSize) && contentSize > scrollLength && !state.scrollingTo && !state.maintainingScrollAtEnd) {
-+      const endOffset = Math.max(-insetStartAdjustment, contentSize - scrollLength);
-+      const distance = endOffset - state.scroll;
-+      // Estimated row sizes converging to measured ones can strand the initial
-+      // end landing when the library's own end-anchor bookkeeping gives up.
-+      // While still near the end (never fighting a user who scrolled away),
-+      // re-pin to the current true end until sizes stop changing.
-+      if (Math.abs(distance) > 2 && Math.abs(distance) <= scrollLength * 0.5) {
-+        settledFrames = 0;
-+        revealStableFrames = 0;
-+        const scroller = state.refScroller.current;
-+        if (scroller) {
-+          scroller.scrollTo({ animated: false, x: 0, y: endOffset });
-+        }
-+      } else {
-+        settledFrames++;
-+        revealStableFrames++;
-+        if (revealStableFrames >= INSET_END_REVEAL_STABLE_FRAMES) {
-+          onRevealStability();
-+        }
-+      }
-+    } else {
-+      // Conditions that make re-pinning unnecessary (underflow, in-flight
-+      // programmatic scroll) count toward stability for the reveal.
-+      revealStableFrames++;
-+      if (revealStableFrames >= INSET_END_REVEAL_STABLE_FRAMES) {
-+        onRevealStability();
-+      }
-+    }
-+    requestAnimationFrame(tick);
-+  };
-+  requestAnimationFrame(tick);
-+}
- function dispatchInitialScroll(ctx, params) {
-   const { forceScroll, resolvedOffset, target, waitForCompletionFrame } = params;
-+  const insetStartAdjustment = getContentInsetStartAdjustment(ctx);
-+  if (insetStartAdjustment > 0 && ctx.state.props.data.length > 0) {
-+    if (ctx.state.scrollLength <= 0) {
-+      // The scroll length is unknown, so the resolved target is meaningless;
-+      // the initial-scroll machinery re-advances after layout.
-+      return;
-+    }
-+    if (resolvedOffset <= -insetStartAdjustment + 1 && !ctx.state.didDispatchInsetInitialScroll) {
-+      // Content underflows the viewport and nothing has scrolled yet: the
-+      // untouched native rest position (UIKit's adjustedContentInset) IS the
-+      // end position. Dispatching a negative scroll here would race UIKit's
-+      // inset application during screen attach, so just finish the session.
-+      finishInitialScroll(ctx, {
-+        resolvedOffset
-+      });
-+      return;
-+    }
-+    ctx.state.didDispatchInsetInitialScroll = true;
-+    if (target.viewPosition === 1) {
-+      startInsetEndSettleWatchdog(ctx);
-+    }
-+  }
-   const requestedIndex = target.index;
-   const index = requestedIndex !== void 0 ? clampScrollIndex(requestedIndex, ctx.state.props.data.length) : void 0;
-   const itemSize = getItemSizeAtIndex(ctx, index);
-@@ -2726,7 +2879,9 @@ function clearFinishedBootstrapInitialScrollTargetIfMovedAway(ctx) {
-     return;
-   }
-   if (didFinishedInitialScrollMoveAwayFromTarget(ctx, initialScroll)) {
--    const shouldKeepEndTargetAlive = isRetargetableBottomAlignedInitialScrollTarget(initialScroll) && peek$(ctx, "isAtEnd");
-+    const endTargetDistanceFromEnd = getContentSize(ctx) - state.scroll - state.scrollLength - getContentInsetEnd(ctx);
-+    const isNearEndForInsetList = getContentInsetStartAdjustment(ctx) > 0 && Number.isFinite(endTargetDistanceFromEnd) && endTargetDistanceFromEnd <= state.scrollLength * 0.5;
-+    const shouldKeepEndTargetAlive = isRetargetableBottomAlignedInitialScrollTarget(initialScroll) && (peek$(ctx, "isAtEnd") || isNearEndForInsetList);
-     if (!shouldKeepEndTargetAlive) {
-       if (shouldPreserveInitialScrollForFooterLayout(initialScroll)) {
-         clearPendingInitialScrollFooterLayout(ctx, {
-@@ -4651,7 +4806,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
-       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);
-+      const knownSizeBound = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
-+      nextSize = hasUnknownTailSize ? Math.min(previousSize || 0, knownSizeBound) : knownSizeBound;
-     } else if (anchorIndex >= 0) {
-       isReady = false;
-     }
-@@ -4671,6 +4827,12 @@ function maybeUpdateAnchoredEndSpace(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 });
-+  } else if (!isReady && didSizeChange && nextSize < (previousSize || 0)) {
-+    set$(ctx, "anchoredEndSpaceSize", nextSize);
-+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-+      updateScroll(ctx, state.scroll, true, { markHasScrolled: false });
-+    }
-   }
-   return nextSize;
- }
-@@ -5694,6 +5856,7 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
-   horizontal
- }) {
-   const ctx = useStateContext();
-+  const SizeComponent = ctx.state.props.sizeComponentInternal;
-   const columnWrapperStyle = ctx.columnWrapperStyle;
-   const animSize = useValue$("totalSize");
-   const [readyToRender, numColumns, otherAxisSize = 0] = useArr$(["readyToRender", "numColumns", "otherAxisSize"]);
-@@ -5704,6 +5867,13 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
-     opacity: isVisible ? 1 : 0,
-     width: animSize
-   } : { height: animSize, minWidth: otherAxisSize, opacity: isVisible ? 1 : 0 };
-+  if (SizeComponent) {
-+    if (horizontal) {
-+      delete style.width;
-+    } else {
-+      delete style.height;
-+    }
-+  }
-   if (columnWrapperStyle) {
-     const { columnGap, rowGap, gap } = columnWrapperStyle;
-     const gapX = columnGap || gap || 0;
-@@ -5724,7 +5894,8 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
-       }
-     }
-   }
--  return /* @__PURE__ */ React2.createElement(Animated.View, { pointerEvents: isVisible ? void 0 : "none", style }, /* @__PURE__ */ React2.createElement(ContainerLayoutCoordinator, null, children));
-+  const content = /* @__PURE__ */ React2.createElement(ContainerLayoutCoordinator, null, children);
-+  return SizeComponent ? /* @__PURE__ */ React2.createElement(SizeComponent, { horizontal, pointerEvents: isVisible ? void 0 : "none", signalName: "totalSize", style }, content) : /* @__PURE__ */ React2.createElement(Animated.View, { pointerEvents: isVisible ? void 0 : "none", style }, content);
- });
- var Containers = typedMemo(function Containers2({
-   freshDataTransitionEpoch,
-@@ -5875,7 +6046,12 @@ var StyleSheet = StyleSheet$1;
- 
- // src/components/ListComponent.tsx
- var AlignItemsAtEndSpacer = typedMemo(function AlignItemsAtEndSpacer2({ horizontal }) {
-+  const ctx = useStateContext();
-   const [alignItemsAtEndPadding = 0] = useArr$(["alignItemsAtEndPadding"]);
-+  const SizeComponent = ctx.state.props.sizeComponentInternal;
-+  if (SizeComponent) {
-+    return /* @__PURE__ */ React2.createElement(SizeComponent, { horizontal, signalName: "alignItemsAtEndPadding", style: { flexShrink: 0 } });
-+  }
-   if (alignItemsAtEndPadding <= 0) {
-     return null;
-   }
-@@ -5908,8 +6084,12 @@ var ListComponent = typedMemo(function ListComponent2({
-   refScrollView,
-   renderScrollComponent,
-   onLayoutFooter,
-+  onInternalMomentumScrollBegin,
-   onInternalScrollBeginDrag,
-+  onInternalScrollEndDrag,
-   onInternalScrollEnd,
-+  onMomentumScrollBegin,
-+  onScrollEndDrag,
-   scrollAdjustHandler,
-   snapToIndices,
-   stickyHeaderConfig,
-@@ -5980,7 +6160,17 @@ var ListComponent = typedMemo(function ListComponent2({
-     SnapOrScroll,
-     {
-       ...rest,
--      ...Platform.OS === "web" ? ScrollComponent === ListComponentScrollView ? { onInternalScrollEnd, useWindowScroll } : {} : { onScrollBeginDrag: onInternalScrollBeginDrag },
-+      ...Platform.OS === "web" ? ScrollComponent === ListComponentScrollView ? { onInternalScrollEnd, useWindowScroll } : {} : {
-+        onMomentumScrollBegin: (event) => {
-+          onInternalMomentumScrollBegin == null ? void 0 : onInternalMomentumScrollBegin(event);
-+          onMomentumScrollBegin == null ? void 0 : onMomentumScrollBegin(event);
-+        },
-+        onScrollBeginDrag: onInternalScrollBeginDrag,
-+        onScrollEndDrag: (event) => {
-+          onInternalScrollEndDrag == null ? void 0 : onInternalScrollEndDrag(event);
-+          onScrollEndDrag == null ? void 0 : onScrollEndDrag(event);
-+        }
-+      },
-       contentContainerStyle: [
-         horizontal ? { height: "100%" } : {},
-         contentContainerStyle,
-@@ -7054,6 +7244,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-     dataVersion,
-     drawDistance = 250,
-     contentInsetEndAdjustment,
-+    contentInsetStartAdjustment,
-     estimatedItemSize = 100,
-     estimatedListSize,
-     extraData,
-@@ -7111,10 +7302,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-   const animatedPropsInternal = props.animatedPropsInternal;
-   const anchoredEndSpaceOwner = (_a3 = props.anchoredEndSpaceOwnerInternal) != null ? _a3 : "list";
-   const positionComponentInternal = props.positionComponentInternal;
-+  const sizeComponentInternal = props.sizeComponentInternal;
-   const stickyPositionComponentInternal = props.stickyPositionComponentInternal;
-   const {
-     anchoredEndSpaceOwnerInternal: _anchoredEndSpaceOwnerInternal,
-     positionComponentInternal: _positionComponentInternal,
-+    sizeComponentInternal: _sizeComponentInternal,
-     stickyPositionComponentInternal: _stickyPositionComponentInternal,
-     ...restProps
-   } = rest;
-@@ -7179,7 +7372,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-   const combinedRef = useCombinedRef(refScroller, refScrollView);
-   const keyExtractor = keyExtractorProp != null ? keyExtractorProp : ((_item, index) => index.toString());
-   const stickyHeaderIndices = stickyHeaderIndicesProp;
--  const contentInsetEndAdjustmentResolved = Platform.OS === "web" ? contentInsetEndAdjustment : void 0;
-+  const contentInsetEndAdjustmentResolved = contentInsetEndAdjustment;
-   const previousContentInsetEndAdjustmentRef = useRef(contentInsetEndAdjustmentResolved);
-   const alwaysRenderIndices = useMemo(() => {
-     const indices = getAlwaysRenderIndices(alwaysRender, dataProp, keyExtractor, anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex);
-@@ -7320,6 +7513,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-     contentContainerAlignItems: contentContainerStyle.alignItems,
-     contentInset,
-     contentInsetEndAdjustment: contentInsetEndAdjustmentResolved,
-+    contentInsetStartAdjustment,
-     data: dataProp,
-     dataKey,
-     dataVersion,
-@@ -7351,6 +7545,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-     renderItem,
-     rtl,
-     snapToIndices,
-+    sizeComponentInternal,
-     stickyHeaderIndicesArr: stickyHeaderIndices != null ? stickyHeaderIndices : [],
-     stickyHeaderIndicesSet: useMemo(() => new Set(stickyHeaderIndices != null ? stickyHeaderIndices : []), [stickyHeaderIndices == null ? void 0 : stickyHeaderIndices.join(",")]),
-     stickyPositionComponentInternal,
-@@ -7402,6 +7597,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-       return void 0;
-     }
-     const resolvedOffset = (_a4 = initialScroll.contentOffset) != null ? _a4 : resolveInitialScrollOffset(ctx, initialScroll);
-+    if (getContentInsetStartAdjustment(ctx) > 0) {
-+      // With a native leading inset (transparent header + automatic insets),
-+      // any mount-time contentOffset races UIKit's adjustedContentInset
-+      // application. The gated initial-scroll dispatch positions the list once
-+      // real sizes are known instead.
-+      return void 0;
-+    }
-     return usesBootstrapInitialScroll && ((_b2 = state.initialScrollSession) == null ? void 0 : _b2.kind) === "bootstrap" && Platform.OS === "web" ? void 0 : resolvedOffset;
-   }, [usesBootstrapInitialScroll]);
-   useLayoutEffect(() => {
-@@ -7526,6 +7728,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-     [
-       dataKey,
-       dataVersion,
-+      contentInsetStartAdjustment,
-       memoizedLastItemKeys.join(","),
-       numColumnsProp,
-       nextScrollAxisGap,
-@@ -7622,6 +7825,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-     () => ({
-       getRenderedItem: (key) => getRenderedItem(ctx, key),
-       onMomentumScrollEnd: (event) => {
-+        state.isMomentumScrolling = false;
-         checkFinishedScrollFallback(ctx);
-         if (state.props.onMomentumScrollEnd) {
-           state.props.onMomentumScrollEnd(event);
-@@ -7630,6 +7834,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-       onScroll: (event) => onScroll(ctx, event),
-       onScrollBeginDrag: (event) => {
-         var _a4, _b2;
-+        ctx.state.didUserDrag = true;
-+        ctx.state.isUserDragging = true;
-         prepareReachedEdgeForNextUserScroll(ctx);
-         (_b2 = (_a4 = state.props).onScrollBeginDrag) == null ? void 0 : _b2.call(_a4, event);
-       },
-@@ -7655,11 +7861,18 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
-       ListFooterComponent,
-       ListFooterComponentStyle,
-       ListHeaderComponent,
-+      onInternalMomentumScrollBegin: () => {
-+        ctx.state.isMomentumScrolling = true;
-+      },
-       onInternalScrollBeginDrag: fns.onScrollBeginDrag,
-+      onInternalScrollEndDrag: () => {
-+        ctx.state.isUserDragging = false;
-+      },
-       onInternalScrollEnd: fns.onScrollEnd,
-       onLayout,
-       onLayoutFooter,
-       onMomentumScrollEnd: fns.onMomentumScrollEnd,
-+      onScrollBeginDrag: fns.onScrollBeginDrag,
-       onScroll: onScrollHandler,
-       recycleItems,
-       refreshControl: refreshControlElement ? stylePaddingTopState > 0 ? React2.cloneElement(refreshControlElement, {
-diff --git a/react.js b/react.js
-index 914d2dafaafa001c9ab6791a0a0581659295e333..a2df18d450eebe451fda42bab47d1658458edbb1 100644
---- a/react.js
-+++ b/react.js
-@@ -4702,7 +4702,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
-       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);
-+      const knownSizeBound = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
-+      nextSize = hasUnknownTailSize ? Math.min(previousSize || 0, knownSizeBound) : knownSizeBound;
-     } else if (anchorIndex >= 0) {
-       isReady = false;
-     }
-@@ -4722,6 +4723,12 @@ function maybeUpdateAnchoredEndSpace(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 });
-+  } else if (!isReady && didSizeChange && nextSize < (previousSize || 0)) {
-+    set$(ctx, "anchoredEndSpaceSize", nextSize);
-+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-+      updateScroll(ctx, state.scroll, true, { markHasScrolled: false });
-+    }
-   }
-   return nextSize;
- }
-@@ -6446,8 +6453,8 @@ function ScrollAdjust() {
-               window.getComputedStyle(contentNode)[axis.paddingEndProp]
-             );
-             const temporaryPaddingEnd = `${(currentPaddingEnd || 0) + pad}px`;
--            temporaryPaddingRef.current = { baseline: baselinePaddingEnd, value: temporaryPaddingEnd };
-             contentNode.style[axis.paddingEndProp] = temporaryPaddingEnd;
-+            temporaryPaddingRef.current = { baseline: baselinePaddingEnd, value: contentNode.style[axis.paddingEndProp] };
-             void contentNode.offsetHeight;
-             scrollBy();
-             if (resetPaddingRafRef.current !== void 0) {
-diff --git a/react.mjs b/react.mjs
-index 95465f2ab89ce41a10553f58af83618f7310e83c..25cf046f2c3141ddce5a0b6e28c354b865331b4f 100644
---- a/react.mjs
-+++ b/react.mjs
-@@ -4681,7 +4681,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
-       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);
-+      const knownSizeBound = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
-+      nextSize = hasUnknownTailSize ? Math.min(previousSize || 0, knownSizeBound) : knownSizeBound;
-     } else if (anchorIndex >= 0) {
-       isReady = false;
-     }
-@@ -4701,6 +4702,12 @@ function maybeUpdateAnchoredEndSpace(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 });
-+  } else if (!isReady && didSizeChange && nextSize < (previousSize || 0)) {
-+    set$(ctx, "anchoredEndSpaceSize", nextSize);
-+    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
-+    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
-+      updateScroll(ctx, state.scroll, true, { markHasScrolled: false });
-+    }
-   }
-   return nextSize;
- }
-@@ -6425,8 +6432,8 @@ function ScrollAdjust() {
-               window.getComputedStyle(contentNode)[axis.paddingEndProp]
-             );
-             const temporaryPaddingEnd = `${(currentPaddingEnd || 0) + pad}px`;
--            temporaryPaddingRef.current = { baseline: baselinePaddingEnd, value: temporaryPaddingEnd };
-             contentNode.style[axis.paddingEndProp] = temporaryPaddingEnd;
-+            temporaryPaddingRef.current = { baseline: baselinePaddingEnd, value: contentNode.style[axis.paddingEndProp] };
-             void contentNode.offsetHeight;
-             scrollBy();
-             if (resetPaddingRafRef.current !== void 0) {
-diff --git a/reanimated.d.ts b/reanimated.d.ts
-index e5043320700b12f34f4c0babbc341f85ca8135c1..2ce63830a28636b21937a0741fd0e613dae950fe 100644
---- a/reanimated.d.ts
-+++ b/reanimated.d.ts
-@@ -294,6 +294,12 @@ interface LegendListSpecificProps<ItemT, TItemType extends string | undefined> {
-      * The adjustment is also rendered as real content padding so the browser scroll range includes it.
-      */
-     contentInsetEndAdjustment?: number;
-+    /**
-+     * Width/height of a leading content inset applied natively outside the list's knowledge
-+     * (e.g. iOS contentInsetAdjustmentBehavior="automatic" under a transparent header).
-+     * Programmatic scrolls clamp to -adjustment instead of 0 so content can rest below the header.
-+     */
-+    contentInsetStartAdjustment?: number;
-     /**
-      * Number of columns to render items in.
-      * @default 1
-diff --git a/reanimated.js b/reanimated.js
-index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..9c5f560320ab47f5eeb73f44fbdcf332ba831558 100644
---- a/reanimated.js
-+++ b/reanimated.js
-@@ -115,8 +115,10 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
-   const { id, horizontal, style, refView, children, recycleItems, layoutTransition, ...rest } = props;
-   const [positionValue = POSITION_OUT_OF_VIEW] = useArr$([`containerPosition${id}`]);
-   const prevItemKeyRef = React__namespace.useRef(void 0);
-+  const previousPositionRef = React__namespace.useRef(positionValue);
-+  const lastContentSizeEpochRef = React__namespace.useRef(ctx.state.contentSizeAnimationEpoch || 0);
-   let shouldSkipTransitionForRecycleReuse = false;
--  if (recycleItems && layoutTransition) {
-+  if (layoutTransition) {
-     const itemKeySignal = `containerItemKey${id}`;
-     const itemKey = peek$(ctx, itemKeySignal);
-     shouldSkipTransitionForRecycleReuse = itemKey !== void 0 && prevItemKeyRef.current !== void 0 && prevItemKeyRef.current !== itemKey;
-@@ -130,10 +132,29 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
-     () => [style, horizontal ? { left: positionValue } : { top: positionValue }],
-     [horizontal, positionValue, style]
-   );
-+  // Two kinds of repositions must not animate: (1) MVCP size adjustments,
-+  // which are compensated by an equal contentOffset shift so the row should
-+  // not visibly move — animating turns the invisible correction into a
-+  // lurch-and-settle; (2) any reposition while the user is actively
-+  // scrolling, where rows shifting under the finger reads as jank. The
-+  // transition exists to smooth at-rest shifts (streaming text, work-log
-+  // folds), so gate it to at-rest moments.
-+  const now = Date.now();
-+  const contentSizeEpoch = ctx.state.contentSizeAnimationEpoch || 0;
-+  const didPositionChange = positionValue !== previousPositionRef.current;
-+  const isRawSizeReposition = didPositionChange && contentSizeEpoch !== lastContentSizeEpochRef.current && ctx.state.contentSizeAnimationEligible && !!layoutTransition && typeof layoutTransition.getAnimationAndConfig === "function";
-+  React__namespace.useLayoutEffect(() => {
-+    if (didPositionChange) {
-+      previousPositionRef.current = positionValue;
-+      lastContentSizeEpochRef.current = contentSizeEpoch;
-+    }
-+  }, [contentSizeEpoch, didPositionChange, positionValue]);
-+  const isRecentNativeReposition = now - (ctx.state.lastNativeScrollTime || 0) < 300;
-+  const shouldSkipLayoutTransition = now - (ctx.state.lastMVCPAdjustTime || 0) < 300 || ctx.state.isUserDragging || ctx.state.isMomentumScrolling || isRecentNativeReposition && !isRawSizeReposition;
-   return /* @__PURE__ */ React__namespace.createElement(
-     Reanimated__default.default.View,
-     {
--      layout: shouldSkipTransitionForRecycleReuse ? void 0 : layoutTransition,
-+      layout: shouldSkipTransitionForRecycleReuse || shouldSkipLayoutTransition ? void 0 : layoutTransition,
-       ref: refView,
-       style: viewStyle,
-       ...rest
-@@ -141,6 +162,93 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
-     children
-   );
- });
-+var ReanimatedSizeView = typedMemo(function ReanimatedSizeViewComponent(props) {
-+  const ctx = useStateContext();
-+  const { horizontal, signalName, style, children, ...rest } = props;
-+  const [logicalSize = 0] = useArr$(signalName === "totalSize" ? [signalName] : [signalName, "totalSize"]);
-+  const baseSize = Reanimated.useSharedValue(logicalSize);
-+  const animatedDelta = Reanimated.useSharedValue(0);
-+  const previousLogicalSizeRef = React__namespace.useRef(logicalSize);
-+  const previousEpochRef = React__namespace.useRef(ctx.state.contentSizeAnimationEpoch || 0);
-+  const animationRunRef = React__namespace.useRef(0);
-+  const isAnimatingRef = React__namespace.useRef(false);
-+  const transition = props.layoutTransition;
-+  const canAnimate = !!transition && typeof transition.getAnimationAndConfig === "function";
-+  const renderEpoch = ctx.state.contentSizeAnimationEpoch || 0;
-+  // Keep the animated size attached after transitions finish. Reanimated
-+  // retains removed animated props, so switching to a static size leaves
-+  // native scroll bounds stuck while logical measurements keep changing.
-+  const animatedStyle = Reanimated.useAnimatedStyle(() => {
-+    const size = Math.max(0, baseSize.value + animatedDelta.value);
-+    return horizontal ? { width: size } : { height: size };
-+  }, [horizontal]);
-+  const completeAnimation = React__namespace.useCallback((run, epoch) => {
-+    if (animationRunRef.current !== run) {
-+      return;
-+    }
-+    isAnimatingRef.current = false;
-+    const state = ctx.state;
-+    if (state.contentSizeAnimationActiveEpoch !== epoch) {
-+      return;
-+    }
-+    state.contentSizeAnimationActiveSignals.delete(signalName);
-+    if (state.contentSizeAnimationActiveSignals.size === 0) {
-+      state.contentSizeAnimationActiveEpoch = void 0;
-+      state.contentSizeAnimationEligible = false;
-+    }
-+  }, [ctx.state, signalName]);
-+  React__namespace.useLayoutEffect(() => {
-+    const state = ctx.state;
-+    const epoch = state.contentSizeAnimationEpoch || 0;
-+    const previousLogicalSize = previousLogicalSizeRef.current;
-+    const delta = logicalSize - previousLogicalSize;
-+    const isNewEpoch = epoch !== previousEpochRef.current;
-+    const isNewEligibleEpoch = canAnimate && isNewEpoch && state.contentSizeAnimationEligible;
-+    previousLogicalSizeRef.current = logicalSize;
-+    previousEpochRef.current = epoch;
-+    if (!delta) {
-+      return;
-+    }
-+    if (!isNewEligibleEpoch) {
-+      baseSize.value = logicalSize;
-+      if (signalName === "totalSize" && isNewEpoch && state.contentSizeAnimationEligible && !canAnimate) {
-+        state.contentSizeAnimationEligible = false;
-+      }
-+      return;
-+    }
-+    const [animation, config] = transition.getAnimationAndConfig();
-+    const delayFunction = typeof transition.getDelayFunction === "function" ? transition.getDelayFunction() : (_, value) => value;
-+    const delay = typeof transition.getDelay === "function" ? transition.getDelay() : 0;
-+    if (typeof animation !== "function" || typeof delayFunction !== "function") {
-+      baseSize.value = logicalSize;
-+      if (signalName === "totalSize") {
-+        state.contentSizeAnimationEligible = false;
-+      }
-+      return;
-+    }
-+    if (state.contentSizeAnimationActiveEpoch !== epoch) {
-+      state.contentSizeAnimationActiveEpoch = epoch;
-+      state.contentSizeAnimationActiveSignals = /* @__PURE__ */ new Set();
-+    }
-+    state.contentSizeAnimationActiveSignals.add(signalName);
-+    const wasAnimating = isAnimatingRef.current;
-+    isAnimatingRef.current = true;
-+    const run = ++animationRunRef.current;
-+    Reanimated.runOnUI((absoluteSize, previousSize, continuesAnimation, animationRun, animationEpoch) => {
-+      "worklet";
-+      const currentVisualSize = continuesAnimation ? baseSize.value + animatedDelta.value : previousSize;
-+      baseSize.value = absoluteSize;
-+      animatedDelta.value = currentVisualSize - absoluteSize;
-+      animatedDelta.value = delayFunction(delay, animation(0, config, (finished) => {
-+        "worklet";
-+        if (finished) {
-+          Reanimated.runOnJS(completeAnimation)(animationRun, animationEpoch);
-+        }
-+      }));
-+    })(logicalSize, previousLogicalSize, wasAnimating, run, epoch);
-+  }, [baseSize, animatedDelta, canAnimate, completeAnimation, ctx.state, logicalSize, renderEpoch, signalName, transition]);
-+  return /* @__PURE__ */ React__namespace.createElement(Reanimated__default.default.View, { ...rest, style: [style, animatedStyle] }, children);
-+});
- function setSharedValueValue(sharedValue, value) {
-   if (!sharedValue) {
-     return;
-@@ -245,10 +353,19 @@ var LegendListForwardedRef = typedMemo(
-         );
-       };
-     }, [hasItemLayoutAnimation, recycleItems]);
-+    const sizeComponentInternal = React__namespace.useMemo(() => {
-+      if (!hasItemLayoutAnimation) {
-+        return void 0;
-+      }
-+      return function SizeComponent(sizeProps) {
-+        return /* @__PURE__ */ React__namespace.createElement(ReanimatedSizeView, { ...sizeProps, layoutTransition: itemLayoutAnimationRef.current });
-+      };
-+    }, [hasItemLayoutAnimation]);
-     const legendListProps = {
-       ...rest,
-       positionComponentInternal,
-       recycleItems,
-+      sizeComponentInternal,
-       ...{
-         renderScrollComponent: renderReanimatedScrollComponent,
-         ...IsNewArchitecture ? { stickyPositionComponentInternal } : {}
-diff --git a/reanimated.mjs b/reanimated.mjs
-index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..cab29fd2a513470175baf2ac930772c7d9275642 100644
---- a/reanimated.mjs
-+++ b/reanimated.mjs
-@@ -1,7 +1,7 @@
- import * as React from 'react';
- import { useCallback } from 'react';
- import { View } from 'react-native';
--import Reanimated, { useAnimatedRef, useAnimatedStyle, useSharedValue, useScrollViewOffset } from 'react-native-reanimated';
-+import Reanimated, { runOnJS, runOnUI, useAnimatedRef, useAnimatedStyle, useSharedValue, useScrollViewOffset } from 'react-native-reanimated';
- import { internal, LegendList } from '@legendapp/list/react-native';
- 
- // src/integrations/reanimated.tsx
-@@ -91,8 +91,10 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
-   const { id, horizontal, style, refView, children, recycleItems, layoutTransition, ...rest } = props;
-   const [positionValue = POSITION_OUT_OF_VIEW] = useArr$([`containerPosition${id}`]);
-   const prevItemKeyRef = React.useRef(void 0);
-+  const previousPositionRef = React.useRef(positionValue);
-+  const lastContentSizeEpochRef = React.useRef(ctx.state.contentSizeAnimationEpoch || 0);
-   let shouldSkipTransitionForRecycleReuse = false;
--  if (recycleItems && layoutTransition) {
-+  if (layoutTransition) {
-     const itemKeySignal = `containerItemKey${id}`;
-     const itemKey = peek$(ctx, itemKeySignal);
-     shouldSkipTransitionForRecycleReuse = itemKey !== void 0 && prevItemKeyRef.current !== void 0 && prevItemKeyRef.current !== itemKey;
-@@ -106,10 +108,29 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
-     () => [style, horizontal ? { left: positionValue } : { top: positionValue }],
-     [horizontal, positionValue, style]
-   );
-+  // Two kinds of repositions must not animate: (1) MVCP size adjustments,
-+  // which are compensated by an equal contentOffset shift so the row should
-+  // not visibly move — animating turns the invisible correction into a
-+  // lurch-and-settle; (2) any reposition while the user is actively
-+  // scrolling, where rows shifting under the finger reads as jank. The
-+  // transition exists to smooth at-rest shifts (streaming text, work-log
-+  // folds), so gate it to at-rest moments.
-+  const now = Date.now();
-+  const contentSizeEpoch = ctx.state.contentSizeAnimationEpoch || 0;
-+  const didPositionChange = positionValue !== previousPositionRef.current;
-+  const isRawSizeReposition = didPositionChange && contentSizeEpoch !== lastContentSizeEpochRef.current && ctx.state.contentSizeAnimationEligible && !!layoutTransition && typeof layoutTransition.getAnimationAndConfig === "function";
-+  React.useLayoutEffect(() => {
-+    if (didPositionChange) {
-+      previousPositionRef.current = positionValue;
-+      lastContentSizeEpochRef.current = contentSizeEpoch;
-+    }
-+  }, [contentSizeEpoch, didPositionChange, positionValue]);
-+  const isRecentNativeReposition = now - (ctx.state.lastNativeScrollTime || 0) < 300;
-+  const shouldSkipLayoutTransition = now - (ctx.state.lastMVCPAdjustTime || 0) < 300 || ctx.state.isUserDragging || ctx.state.isMomentumScrolling || isRecentNativeReposition && !isRawSizeReposition;
-   return /* @__PURE__ */ React.createElement(
-     Reanimated.View,
-     {
--      layout: shouldSkipTransitionForRecycleReuse ? void 0 : layoutTransition,
-+      layout: shouldSkipTransitionForRecycleReuse || shouldSkipLayoutTransition ? void 0 : layoutTransition,
-       ref: refView,
-       style: viewStyle,
-       ...rest
-@@ -117,6 +138,93 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
-     children
-   );
- });
-+var ReanimatedSizeView = typedMemo(function ReanimatedSizeViewComponent(props) {
-+  const ctx = useStateContext();
-+  const { horizontal, signalName, style, children, ...rest } = props;
-+  const [logicalSize = 0] = useArr$(signalName === "totalSize" ? [signalName] : [signalName, "totalSize"]);
-+  const baseSize = useSharedValue(logicalSize);
-+  const animatedDelta = useSharedValue(0);
-+  const previousLogicalSizeRef = React.useRef(logicalSize);
-+  const previousEpochRef = React.useRef(ctx.state.contentSizeAnimationEpoch || 0);
-+  const animationRunRef = React.useRef(0);
-+  const isAnimatingRef = React.useRef(false);
-+  const transition = props.layoutTransition;
-+  const canAnimate = !!transition && typeof transition.getAnimationAndConfig === "function";
-+  const renderEpoch = ctx.state.contentSizeAnimationEpoch || 0;
-+  // Keep the animated size attached after transitions finish. Reanimated
-+  // retains removed animated props, so switching to a static size leaves
-+  // native scroll bounds stuck while logical measurements keep changing.
-+  const animatedStyle = useAnimatedStyle(() => {
-+    const size = Math.max(0, baseSize.value + animatedDelta.value);
-+    return horizontal ? { width: size } : { height: size };
-+  }, [horizontal]);
-+  const completeAnimation = useCallback((run, epoch) => {
-+    if (animationRunRef.current !== run) {
-+      return;
-+    }
-+    isAnimatingRef.current = false;
-+    const state = ctx.state;
-+    if (state.contentSizeAnimationActiveEpoch !== epoch) {
-+      return;
-+    }
-+    state.contentSizeAnimationActiveSignals.delete(signalName);
-+    if (state.contentSizeAnimationActiveSignals.size === 0) {
-+      state.contentSizeAnimationActiveEpoch = void 0;
-+      state.contentSizeAnimationEligible = false;
-+    }
-+  }, [ctx.state, signalName]);
-+  React.useLayoutEffect(() => {
-+    const state = ctx.state;
-+    const epoch = state.contentSizeAnimationEpoch || 0;
-+    const previousLogicalSize = previousLogicalSizeRef.current;
-+    const delta = logicalSize - previousLogicalSize;
-+    const isNewEpoch = epoch !== previousEpochRef.current;
-+    const isNewEligibleEpoch = canAnimate && isNewEpoch && state.contentSizeAnimationEligible;
-+    previousLogicalSizeRef.current = logicalSize;
-+    previousEpochRef.current = epoch;
-+    if (!delta) {
-+      return;
-+    }
-+    if (!isNewEligibleEpoch) {
-+      baseSize.value = logicalSize;
-+      if (signalName === "totalSize" && isNewEpoch && state.contentSizeAnimationEligible && !canAnimate) {
-+        state.contentSizeAnimationEligible = false;
-+      }
-+      return;
-+    }
-+    const [animation, config] = transition.getAnimationAndConfig();
-+    const delayFunction = typeof transition.getDelayFunction === "function" ? transition.getDelayFunction() : (_, value) => value;
-+    const delay = typeof transition.getDelay === "function" ? transition.getDelay() : 0;
-+    if (typeof animation !== "function" || typeof delayFunction !== "function") {
-+      baseSize.value = logicalSize;
-+      if (signalName === "totalSize") {
-+        state.contentSizeAnimationEligible = false;
-+      }
-+      return;
-+    }
-+    if (state.contentSizeAnimationActiveEpoch !== epoch) {
-+      state.contentSizeAnimationActiveEpoch = epoch;
-+      state.contentSizeAnimationActiveSignals = /* @__PURE__ */ new Set();
-+    }
-+    state.contentSizeAnimationActiveSignals.add(signalName);
-+    const wasAnimating = isAnimatingRef.current;
-+    isAnimatingRef.current = true;
-+    const run = ++animationRunRef.current;
-+    runOnUI((absoluteSize, previousSize, continuesAnimation, animationRun, animationEpoch) => {
-+      "worklet";
-+      const currentVisualSize = continuesAnimation ? baseSize.value + animatedDelta.value : previousSize;
-+      baseSize.value = absoluteSize;
-+      animatedDelta.value = currentVisualSize - absoluteSize;
-+      animatedDelta.value = delayFunction(delay, animation(0, config, (finished) => {
-+        "worklet";
-+        if (finished) {
-+          runOnJS(completeAnimation)(animationRun, animationEpoch);
-+        }
-+      }));
-+    })(logicalSize, previousLogicalSize, wasAnimating, run, epoch);
-+  }, [baseSize, animatedDelta, canAnimate, completeAnimation, ctx.state, logicalSize, renderEpoch, signalName, transition]);
-+  return /* @__PURE__ */ React.createElement(Reanimated.View, { ...rest, style: [style, animatedStyle] }, children);
-+});
- function setSharedValueValue(sharedValue, value) {
-   if (!sharedValue) {
-     return;
-@@ -221,10 +329,19 @@ var LegendListForwardedRef = typedMemo(
-         );
-       };
-     }, [hasItemLayoutAnimation, recycleItems]);
-+    const sizeComponentInternal = React.useMemo(() => {
-+      if (!hasItemLayoutAnimation) {
-+        return void 0;
-+      }
-+      return function SizeComponent(sizeProps) {
-+        return /* @__PURE__ */ React.createElement(ReanimatedSizeView, { ...sizeProps, layoutTransition: itemLayoutAnimationRef.current });
-+      };
-+    }, [hasItemLayoutAnimation]);
-     const legendListProps = {
-       ...rest,
-       positionComponentInternal,
-       recycleItems,
-+      sizeComponentInternal,
-       ...{
-         renderScrollComponent: renderReanimatedScrollComponent,
-         ...IsNewArchitecture ? { stickyPositionComponentInternal } : {}

From 479f910c7142cef00e27de33322e6d3f2d891733 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius@mac.lan>
Date: Tue, 1 Sep 2026 00:40:23 -0700
Subject: [PATCH 3/8] fix(mobile): restore list patch and remove scroll test
 harness

---
 .../lib/legend-list-size-animation.test.ts    |  285 ---
 patches/@legendapp__list@3.3.5.patch          | 1690 +++++++++++++++++
 2 files changed, 1690 insertions(+), 285 deletions(-)
 delete mode 100644 apps/mobile/src/lib/legend-list-size-animation.test.ts
 create mode 100644 patches/@legendapp__list@3.3.5.patch

diff --git a/apps/mobile/src/lib/legend-list-size-animation.test.ts b/apps/mobile/src/lib/legend-list-size-animation.test.ts
deleted file mode 100644
index 48bd70ed381c..000000000000
--- a/apps/mobile/src/lib/legend-list-size-animation.test.ts
+++ /dev/null
@@ -1,285 +0,0 @@
-import * as NodeFS from "node:fs";
-import * as NodeVM from "node:vm";
-import * as TypeScript from "typescript";
-import { describe, expect, it } from "vite-plus/test";
-
-import { createReactHookHarness } from "../../../web/src/test/reactHookHarness";
-
-const bundles = ["reanimated.js", "reanimated.mjs"].map((name) => {
-  const path = new URL(`../../node_modules/@legendapp/list/${name}`, import.meta.url);
-  const source = NodeFS.readFileSync(path, "utf8");
-  return {
-    name,
-    source: name.endsWith(".mjs")
-      ? TypeScript.transpileModule(source, {
-          compilerOptions: {
-            module: TypeScript.ModuleKind.CommonJS,
-            target: TypeScript.ScriptTarget.ESNext,
-            esModuleInterop: true,
-          },
-        }).outputText
-      : source,
-  };
-});
-
-type SizeSignal = "totalSize" | "alignItemsAtEndPadding";
-type NativeStyle = { readonly height?: number; readonly width?: number };
-type AnimatedStyle = { read: () => NativeStyle };
-type Style = NativeStyle | AnimatedStyle | ReadonlyArray<Style> | undefined;
-type Animation = {
-  readonly target: number;
-  readonly complete: (finished: boolean) => void;
-};
-
-class AnimatedNumber {
-  private current: number;
-  private animation: (Animation & { readonly from: number }) | null = null;
-
-  constructor(initial: number) {
-    this.current = initial;
-  }
-
-  get value(): number {
-    return this.current;
-  }
-
-  set value(next: number | Animation) {
-    const previous = this.animation;
-    this.animation = null;
-    previous?.complete(false);
-    if (typeof next === "number") {
-      this.current = next;
-    } else {
-      this.animation = { ...next, from: this.current };
-    }
-  }
-
-  advance(progress: number) {
-    const animation = this.animation;
-    if (animation === null) {
-      return;
-    }
-    this.current = animation.from + (animation.target - animation.from) * progress;
-    if (progress === 1) {
-      this.animation = null;
-      animation.complete(true);
-    }
-  }
-}
-
-function makeSizeView(bundleSource: string, signalName: SizeSignal, initialSize: number) {
-  const hooks = createReactHookHarness();
-  const values: Array<AnimatedNumber> = [];
-  const effects: Array<() => void> = [];
-  const attachedStyles = new Set<AnimatedStyle>();
-  const animatedNativeProps: { height?: number; width?: number } = {};
-  let staticNativeProps: NativeStyle = {};
-  let renderPending = false;
-  const signals = { totalSize: initialSize, alignItemsAtEndPadding: initialSize };
-  const ctx = {
-    state: {
-      contentSizeAnimationEpoch: 0,
-      contentSizeAnimationEligible: false,
-      contentSizeAnimationActiveEpoch: undefined as number | undefined,
-      contentSizeAnimationActiveSignals: new Set<string>(),
-    },
-  };
-
-  const react = {
-    useRef: hooks.useRef,
-    useCallback: hooks.useCallback,
-    useState<T>(initial: T) {
-      const [value, setValue] = hooks.useState(initial);
-      return [
-        value,
-        (next: T) => {
-          setValue(next);
-          renderPending = true;
-        },
-      ];
-    },
-    useLayoutEffect(effect: () => void, dependencies: ReadonlyArray<unknown>) {
-      const previous = hooks.useRef<ReadonlyArray<unknown> | undefined>(undefined);
-      if (
-        previous.current === undefined ||
-        dependencies.some((dependency, index) => !Object.is(dependency, previous.current?.[index]))
-      ) {
-        previous.current = dependencies;
-        effects.push(effect);
-      }
-    },
-    forwardRef: (component: unknown) => component,
-    createElement: (_component: unknown, props: { readonly style: Style }) => ({ props }),
-  };
-
-  const publishAnimatedStyles = () => {
-    for (const style of attachedStyles) {
-      Object.assign(animatedNativeProps, style.read());
-    }
-  };
-  const reanimated = {
-    View: "AnimatedView",
-    createAnimatedComponent: (component: unknown) => component,
-    runOnJS: (callback: (...args: unknown[]) => void) => callback,
-    runOnUI: (callback: (...args: unknown[]) => void) => callback,
-    useSharedValue(initial: number) {
-      const reference = hooks.useRef<AnimatedNumber | null>(null);
-      if (reference.current === null) {
-        reference.current = new AnimatedNumber(initial);
-        values.push(reference.current);
-      }
-      return reference.current;
-    },
-    useAnimatedStyle(read: () => NativeStyle) {
-      const reference = hooks.useRef<AnimatedStyle>({ read });
-      reference.current.read = read;
-      return reference.current;
-    },
-  };
-  const modules: Record<string, unknown> = {
-    react,
-    "react-native": { View: "View" },
-    "react-native-reanimated": reanimated,
-    "@legendapp/list/react-native": {
-      internal: {
-        typedMemo: (component: unknown) => component,
-        useStateContext: () => ctx,
-        useArr$: (names: ReadonlyArray<SizeSignal>) => names.map((name) => signals[name]),
-      },
-    },
-  };
-  const module = { exports: {} };
-  // Execute the installed patch, not a copy of its size/animation logic.
-  NodeVM.runInNewContext(`${bundleSource}\nmodule.exports = ReanimatedSizeView;`, {
-    module,
-    exports: module.exports,
-    require(name: string) {
-      if (!(name in modules)) {
-        throw new Error(`Unexpected LegendList dependency: ${name}`);
-      }
-      return modules[name];
-    },
-  });
-  const SizeView = module.exports as (props: {
-    readonly signalName: SizeSignal;
-    readonly horizontal: false;
-    readonly layoutTransition: typeof transition;
-  }) => { readonly props: { readonly style: Style } };
-  const transition = {
-    getAnimationAndConfig: () => [
-      (target: number, _config: unknown, complete: Animation["complete"]): Animation => ({
-        target,
-        complete,
-      }),
-      {},
-    ],
-  };
-
-  function commitStyle(style: Style) {
-    if (Array.isArray(style)) {
-      style.forEach(commitStyle);
-    } else if (style && "read" in style) {
-      attachedStyles.add(style);
-    } else if (style) {
-      staticNativeProps = { ...staticNativeProps, ...style };
-    }
-  }
-
-  function render() {
-    let passes = 0;
-    do {
-      if (++passes > 10) {
-        throw new Error("Size view did not finish rendering.");
-      }
-      renderPending = false;
-      hooks.beginRender();
-      const element = SizeView({ signalName, horizontal: false, layoutTransition: transition });
-      // Reanimated 4's ViewDescriptorsSet.remove detaches future updates but
-      // leaves native animated props intact. Its Fabric commit hook reapplies
-      // that registry over React's static props on subsequent commits.
-      attachedStyles.clear();
-      staticNativeProps = {};
-      commitStyle(element.props.style);
-      for (const effect of effects.splice(0)) {
-        effect();
-      }
-      publishAnimatedStyles();
-    } while (renderPending);
-  }
-
-  render();
-  return {
-    update(size: number, eligible: boolean, newEpoch = true) {
-      signals[signalName] = size;
-      ctx.state.contentSizeAnimationEligible = eligible;
-      if (newEpoch) {
-        ctx.state.contentSizeAnimationEpoch += 1;
-      }
-      render();
-    },
-    advance(progress: number) {
-      for (const value of values) {
-        value.advance(progress);
-      }
-      publishAnimatedStyles();
-      if (renderPending) {
-        render();
-      }
-    },
-    nativeSize: () => animatedNativeProps.height ?? staticNativeProps.height ?? 0,
-    dragAfterJumpToEnd() {
-      const otherContentHeight = 1_000;
-      const viewportHeight = 600;
-      // scrollToOverflowEnabled lets the arrow reach LegendList's logical
-      // target. A gesture must then obey the actual UIScrollView content size.
-      const target = signals[signalName] + otherContentHeight - viewportHeight;
-      const nativeEnd =
-        (animatedNativeProps.height ?? staticNativeProps.height ?? 0) +
-        otherContentHeight -
-        viewportHeight;
-      return Math.min(target + 100, nativeEnd);
-    },
-  };
-}
-
-describe.each(bundles)("LegendList $name", ({ source }) => {
-  describe.each<SizeSignal>(["totalSize", "alignItemsAtEndPadding"])(
-    "animated %s",
-    (signalName) => {
-      it("keeps the native scroll range current after a disclosure animation finishes", () => {
-        const view = makeSizeView(source, signalName, 1_200);
-        view.update(1_600, true);
-        view.advance(1);
-        expect(view.nativeSize()).toBe(1_600);
-
-        view.update(2_400, false);
-        expect(view.dragAfterJumpToEnd()).toBe(2_800);
-        expect(view.nativeSize()).toBe(2_400);
-
-        view.update(800, false);
-        expect(view.nativeSize()).toBe(800);
-      });
-
-      it("preserves measurement corrections across overlapping animations and later updates", () => {
-        const view = makeSizeView(source, signalName, 1_200);
-        view.update(1_600, true);
-        view.advance(0.5);
-        expect(view.nativeSize()).toBe(1_400);
-
-        // A same-epoch measurement moves the base without restarting the tween.
-        view.update(1_700, false, false);
-        expect(view.nativeSize()).toBe(1_500);
-        view.update(2_000, true);
-        expect(view.nativeSize()).toBe(1_500);
-        view.advance(0.5);
-        expect(view.nativeSize()).toBe(1_750);
-        view.advance(1);
-        expect(view.nativeSize()).toBe(2_000);
-
-        view.update(2_600, false);
-        expect(view.nativeSize()).toBe(2_600);
-        expect(view.dragAfterJumpToEnd()).toBe(3_000);
-      });
-    },
-  );
-});
diff --git a/patches/@legendapp__list@3.3.5.patch b/patches/@legendapp__list@3.3.5.patch
new file mode 100644
index 000000000000..35cc58ac2bc2
--- /dev/null
+++ b/patches/@legendapp__list@3.3.5.patch
@@ -0,0 +1,1690 @@
+diff --git a/keyboard.d.ts b/keyboard.d.ts
+index 367945cdfa8a8c260b7a127657a75c016c9ab46f..0ac7bf8b8e9c386058b2374199e58fe8c92d39b3 100644
+--- a/keyboard.d.ts
++++ b/keyboard.d.ts
+@@ -279,7 +279,7 @@ type KeyboardChatComposerInsetListRef = {
+ type KeyboardChatComposerRef = {
+     current: Pick<View, "measure"> | null;
+ };
+-declare function useKeyboardChatComposerInset(listRef: KeyboardChatComposerInsetListRef, composerRef: KeyboardChatComposerRef, initialHeight?: number): {
++declare function useKeyboardChatComposerInset(listRef: KeyboardChatComposerInsetListRef, composerRef: KeyboardChatComposerRef, initialHeight?: number, heightAdjustment?: number, animationDuration?: number): {
+     contentInsetEndAdjustment: SharedValue<number>;
+     onComposerLayout: (event: LayoutChangeEvent) => void;
+ };
+@@ -288,8 +288,10 @@ declare function useKeyboardScrollToEnd({ freeze: freezeProp, listRef }: UseKeyb
+     scrollMessageToEnd: ({ animated, closeKeyboard }: ScrollMessageToEndOptions) => Promise<void>;
+ };
+ declare const KeyboardAwareLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "anchoredEndSpace" | "contentInsetEndAdjustment" | "renderScrollComponent"> & KeyboardChatScrollViewPropsUnique & {
++    adjustedInsetCompensation?: number;
+     anchoredEndSpace?: AnchoredEndSpaceConfig;
+     contentInsetEndAdjustment?: SharedValue<number>;
++    contentInsetEndStaticAdjustment?: number;
+     keyboardOffset?: number;
+ } & React.RefAttributes<LegendListRef>) => React.ReactElement | null;
+ 
+diff --git a/keyboard.js b/keyboard.js
+index 6645bcbb1f77c36c432035eaf8b2d6d924fc8bda..321c4c305129dd3ce3f06127c47d51720a73fb83 100644
+--- a/keyboard.js
++++ b/keyboard.js
+@@ -33,19 +33,22 @@ if (typeof __DEV__ !== "undefined" && __DEV__ && !reactNativeKeyboardController.
+     "[legend-list] KeyboardAwareLegendList requires a recent react-native-keyboard-controller with KeyboardChatScrollView. Please upgrade react-native-keyboard-controller to at least 1.21.7."
+   );
+ }
+-function useKeyboardChatComposerInset(listRef, composerRef, initialHeight = 0) {
++function useKeyboardChatComposerInset(listRef, composerRef, initialHeight = 0, heightAdjustment = 0, animationDuration = 0) {
+   const contentInsetEndAdjustment = reactNativeReanimated.useSharedValue(initialHeight);
+   const lastHeightRef = React.useRef(void 0);
+   const reportHeight = React.useCallback(
+-    (height) => {
++    (rawHeight) => {
++      const height = Math.max(0, rawHeight + heightAdjustment);
+       var _a;
+       if (Number.isFinite(height) && height !== lastHeightRef.current) {
++        const shouldAnimate = lastHeightRef.current !== void 0 && animationDuration > 0;
+         lastHeightRef.current = height;
+-        contentInsetEndAdjustment.value = height;
+-        (_a = listRef.current) == null ? void 0 : _a.reportContentInset({ bottom: height });
++        contentInsetEndAdjustment.value = shouldAnimate ? reactNativeReanimated.withTiming(height, {
++          duration: animationDuration
++        }) : height;
+       }
+     },
+-    [contentInsetEndAdjustment, listRef]
++    [animationDuration, contentInsetEndAdjustment, heightAdjustment, listRef]
+   );
+   React.useLayoutEffect(() => {
+     var _a;
+@@ -84,9 +87,11 @@ function useKeyboardScrollToEnd({ freeze: freezeProp, listRef }) {
+ }
+ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(props, forwardedRef) {
+   const {
++    adjustedInsetCompensation,
+     anchoredEndSpace,
+     applyWorkaroundForContentInsetHitTestBug,
+     contentInsetEndAdjustment,
++    contentInsetEndStaticAdjustment,
+     freeze,
+     keyboardLiftBehavior,
+     keyboardOffset,
+@@ -94,6 +99,7 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
+   } = props;
+   const refLegendList = React.useRef(null);
+   const combinedRef = useCombinedRef(forwardedRef, refLegendList);
++  const adjustedStartInsetCompensation = props.contentInsetStartAdjustment;
+   const blankSpace = reactNativeReanimated.useSharedValue(0);
+   React.useEffect(() => {
+     if (!anchoredEndSpace) {
+@@ -108,11 +114,15 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
+       ...anchoredEndSpace,
+       onSizeChanged: (size) => {
+         var _a;
+-        blankSpace.value = size;
++        // The anchored blank is sized against the ADJUSTED viewport, but the
++        // scroll component writes it as a raw contentInset that UIKit tops up
++        // with the safe-area bottom — write it net of that or the end rest
++        // (and the anchored message) sinks one safe-area under the header.
++        blankSpace.value = size > 0 ? Math.max(0, size - (adjustedInsetCompensation || 0)) : 0;
+         (_a = anchoredEndSpace.onSizeChanged) == null ? void 0 : _a.call(anchoredEndSpace, size);
+       }
+     };
+-  }, [anchoredEndSpace, blankSpace]);
++  }, [adjustedInsetCompensation, anchoredEndSpace, blankSpace]);
+   const onContentInsetChange = React.useCallback((insets) => {
+     var _a;
+     (_a = refLegendList.current) == null ? void 0 : _a.reportContentInset(insets);
+@@ -123,6 +133,8 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
+         reactNativeKeyboardController.KeyboardChatScrollView,
+         {
+           ...scrollProps,
++          adjustedInsetCompensation,
++          adjustedStartInsetCompensation,
+           applyWorkaroundForContentInsetHitTestBug,
+           blankSpace,
+           extraContentPadding: contentInsetEndAdjustment,
+@@ -134,6 +146,8 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
+       );
+     },
+     [
++      adjustedInsetCompensation,
++      adjustedStartInsetCompensation,
+       applyWorkaroundForContentInsetHitTestBug,
+       blankSpace,
+       contentInsetEndAdjustment,
+@@ -149,6 +163,7 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
+     {
+       anchoredEndSpace: anchoredEndSpaceWithBlankSpace,
+       anchoredEndSpaceOwnerInternal: "scroll",
++      contentInsetEndAdjustment: contentInsetEndStaticAdjustment,
+       ref: combinedRef,
+       renderScrollComponent: memoList,
+       ...rest
+diff --git a/keyboard.mjs b/keyboard.mjs
+index 87b38b9607c2eba6b407c2acfd520633bdb0e7c2..111eb242ba9d9ade1cb912550f7df85cf4f361ee 100644
+--- a/keyboard.mjs
++++ b/keyboard.mjs
+@@ -1,7 +1,7 @@
+ import * as React from 'react';
+ import { useRef, useEffect, useMemo, useCallback, useLayoutEffect } from 'react';
+ import { KeyboardChatScrollView, KeyboardController } from 'react-native-keyboard-controller';
+-import { useSharedValue } from 'react-native-reanimated';
++import { useSharedValue, withTiming } from 'react-native-reanimated';
+ import { internal } from '@legendapp/list/react-native';
+ import { AnimatedLegendList } from '@legendapp/list/reanimated';
+ 
+@@ -12,19 +12,22 @@ if (typeof __DEV__ !== "undefined" && __DEV__ && !KeyboardChatScrollView) {
+     "[legend-list] KeyboardAwareLegendList requires a recent react-native-keyboard-controller with KeyboardChatScrollView. Please upgrade react-native-keyboard-controller to at least 1.21.7."
+   );
+ }
+-function useKeyboardChatComposerInset(listRef, composerRef, initialHeight = 0) {
++function useKeyboardChatComposerInset(listRef, composerRef, initialHeight = 0, heightAdjustment = 0, animationDuration = 0) {
+   const contentInsetEndAdjustment = useSharedValue(initialHeight);
+   const lastHeightRef = useRef(void 0);
+   const reportHeight = useCallback(
+-    (height) => {
++    (rawHeight) => {
++      const height = Math.max(0, rawHeight + heightAdjustment);
+       var _a;
+       if (Number.isFinite(height) && height !== lastHeightRef.current) {
++        const shouldAnimate = lastHeightRef.current !== void 0 && animationDuration > 0;
+         lastHeightRef.current = height;
+-        contentInsetEndAdjustment.value = height;
+-        (_a = listRef.current) == null ? void 0 : _a.reportContentInset({ bottom: height });
++        contentInsetEndAdjustment.value = shouldAnimate ? withTiming(height, {
++          duration: animationDuration
++        }) : height;
+       }
+     },
+-    [contentInsetEndAdjustment, listRef]
++    [animationDuration, contentInsetEndAdjustment, heightAdjustment, listRef]
+   );
+   useLayoutEffect(() => {
+     var _a;
+@@ -63,9 +66,11 @@ function useKeyboardScrollToEnd({ freeze: freezeProp, listRef }) {
+ }
+ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(props, forwardedRef) {
+   const {
++    adjustedInsetCompensation,
+     anchoredEndSpace,
+     applyWorkaroundForContentInsetHitTestBug,
+     contentInsetEndAdjustment,
++    contentInsetEndStaticAdjustment,
+     freeze,
+     keyboardLiftBehavior,
+     keyboardOffset,
+@@ -73,6 +78,7 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
+   } = props;
+   const refLegendList = useRef(null);
+   const combinedRef = useCombinedRef(forwardedRef, refLegendList);
++  const adjustedStartInsetCompensation = props.contentInsetStartAdjustment;
+   const blankSpace = useSharedValue(0);
+   useEffect(() => {
+     if (!anchoredEndSpace) {
+@@ -87,11 +93,15 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
+       ...anchoredEndSpace,
+       onSizeChanged: (size) => {
+         var _a;
+-        blankSpace.value = size;
++        // The anchored blank is sized against the ADJUSTED viewport, but the
++        // scroll component writes it as a raw contentInset that UIKit tops up
++        // with the safe-area bottom — write it net of that or the end rest
++        // (and the anchored message) sinks one safe-area under the header.
++        blankSpace.value = size > 0 ? Math.max(0, size - (adjustedInsetCompensation || 0)) : 0;
+         (_a = anchoredEndSpace.onSizeChanged) == null ? void 0 : _a.call(anchoredEndSpace, size);
+       }
+     };
+-  }, [anchoredEndSpace, blankSpace]);
++  }, [adjustedInsetCompensation, anchoredEndSpace, blankSpace]);
+   const onContentInsetChange = useCallback((insets) => {
+     var _a;
+     (_a = refLegendList.current) == null ? void 0 : _a.reportContentInset(insets);
+@@ -102,6 +112,8 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
+         KeyboardChatScrollView,
+         {
+           ...scrollProps,
++          adjustedInsetCompensation,
++          adjustedStartInsetCompensation,
+           applyWorkaroundForContentInsetHitTestBug,
+           blankSpace,
+           extraContentPadding: contentInsetEndAdjustment,
+@@ -113,6 +125,8 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
+       );
+     },
+     [
++      adjustedInsetCompensation,
++      adjustedStartInsetCompensation,
+       applyWorkaroundForContentInsetHitTestBug,
+       blankSpace,
+       contentInsetEndAdjustment,
+@@ -128,6 +142,7 @@ var KeyboardAwareLegendList = typedForwardRef(function KeyboardAwareLegendList2(
+     {
+       anchoredEndSpace: anchoredEndSpaceWithBlankSpace,
+       anchoredEndSpaceOwnerInternal: "scroll",
++      contentInsetEndAdjustment: contentInsetEndStaticAdjustment,
+       ref: combinedRef,
+       renderScrollComponent: memoList,
+       ...rest
+diff --git a/react-native.d.ts b/react-native.d.ts
+index ce1fe00001c9e5aee6c6ea8bb2d4757d4586d002..3ccf6f16067152dfcb0c143371e2ec6aba6636e5 100644
+--- a/react-native.d.ts
++++ b/react-native.d.ts
+@@ -293,6 +293,12 @@ interface LegendListSpecificProps<ItemT, TItemType extends string | undefined> {
+      * The adjustment is also rendered as real content padding so the browser scroll range includes it.
+      */
+     contentInsetEndAdjustment?: number;
++    /**
++     * Width/height of a leading content inset applied natively outside the list's knowledge
++     * (e.g. iOS contentInsetAdjustmentBehavior="automatic" under a transparent header).
++     * Programmatic scrolls clamp to -adjustment instead of 0 so content can rest below the header.
++     */
++    contentInsetStartAdjustment?: number;
+     /**
+      * Number of columns to render items in.
+      * @default 1
+diff --git a/react-native.js b/react-native.js
+index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c3ffe83af 100644
+--- a/react-native.js
++++ b/react-native.js
+@@ -954,7 +954,7 @@ function setInitialRenderState(ctx, {
+   if (didInitialScroll) {
+     state.didFinishInitialScroll = true;
+   }
+-  const isReadyToRender = Boolean(state.didContainersLayout && state.didFinishInitialScroll);
++  const isReadyToRender = Boolean(state.didContainersLayout && state.didFinishInitialScroll && !state.insetEndRevealHold);
+   if (isReadyToRender && !peek$(ctx, "readyToRender")) {
+     set$(ctx, "readyToRender", true);
+     setAdaptiveRender(ctx, "normal", "ready");
+@@ -1090,7 +1090,7 @@ function getRawContentLength(ctx) {
+ function getAlignItemsAtEndPadding(ctx) {
+   const { state } = ctx;
+   const shouldPad = !!state.props.alignItemsAtEndPaddingEnabled && !state.props.horizontal && state.props.data.length > 0 && state.scrollLength > 0;
+-  return shouldPad ? Math.max(0, state.scrollLength - getRawContentLength(ctx) - getContentInsetEnd(ctx)) : 0;
++  return shouldPad ? Math.max(0, state.scrollLength - getContentInsetStartAdjustment(ctx) - getRawContentLength(ctx) - getContentInsetEnd(ctx)) : 0;
+ }
+ function updateContentMetricsState(ctx) {
+   const previousPadding = peek$(ctx, "alignItemsAtEndPadding") || 0;
+@@ -1115,6 +1115,10 @@ function addTotalSize(ctx, key, add, notifyTotalSize = true) {
+     totalSize += add;
+   }
+   if (prevTotalSize !== totalSize) {
++    const now = Date.now();
++    const isContinuingContentSizeAnimation = state.contentSizeAnimationActiveEpoch !== void 0;
++    state.contentSizeAnimationEpoch = (state.contentSizeAnimationEpoch || 0) + 1;
++    state.contentSizeAnimationEligible = !!state.props.sizeComponentInternal && state.didContainersLayout && (isContinuingContentSizeAnimation || !state.props.maintainScrollAtEnd && !state.isUserDragging && !state.isMomentumScrolling && now - (state.lastMVCPAdjustTime || 0) >= 300);
+     if (!IsNewArchitecture && state.initialScroll && totalSize < prevTotalSize) {
+       state.pendingTotalSize = totalSize;
+     } else {
+@@ -1304,18 +1308,23 @@ function calculateOffsetWithOffsetPosition(ctx, offsetParam, params) {
+ }
+ 
+ // src/core/clampScrollOffset.ts
++function getContentInsetStartAdjustment(ctx) {
++  const adjustment = ctx.state.props.contentInsetStartAdjustment;
++  return typeof adjustment === "number" && Number.isFinite(adjustment) ? Math.max(0, adjustment) : 0;
++}
+ function clampScrollOffset(ctx, offset, scrollTarget) {
+   const state = ctx.state;
+   const contentSize = getContentSize(ctx);
++  const minOffset = -getContentInsetStartAdjustment(ctx);
+   let clampedOffset = offset;
+   if (Number.isFinite(contentSize) && Number.isFinite(state.scrollLength) && (Platform.OS !== "android" || state.lastLayout)) {
+-    const baseMaxOffset = Math.max(0, contentSize - state.scrollLength);
++    const baseMaxOffset = Math.max(minOffset, contentSize - state.scrollLength);
+     const viewOffset = scrollTarget == null ? void 0 : scrollTarget.viewOffset;
+     const extraEndOffset = typeof viewOffset === "number" && viewOffset < 0 ? -viewOffset : 0;
+     const maxOffset = baseMaxOffset + extraEndOffset;
+     clampedOffset = Math.min(offset, maxOffset);
+   }
+-  clampedOffset = Math.max(0, clampedOffset);
++  clampedOffset = Math.max(minOffset, clampedOffset);
+   return clampedOffset;
+ }
+ 
+@@ -1451,10 +1460,10 @@ function checkFinishedScrollFrame(ctx) {
+     finishScrollTo(ctx);
+   }
+ }
+-function scrollToFallbackOffset(ctx, offset) {
++function scrollToFallbackOffset(ctx, offset, animated) {
+   var _a3;
+   (_a3 = ctx.state.refScroller.current) == null ? void 0 : _a3.scrollTo({
+-    animated: false,
++    animated: !!animated,
+     x: ctx.state.props.horizontal ? offset : 0,
+     y: ctx.state.props.horizontal ? 0 : offset
+   });
+@@ -1503,7 +1512,10 @@ function checkFinishedScrollFallback(ctx) {
+         );
+         scheduleFallbackCheck(SILENT_INITIAL_SCROLL_RETRY_DELAY_MS);
+       } else if (shouldRetryUnalignedEndScroll) {
+-        scrollToFallbackOffset(ctx, completionState.clampedTargetOffset);
++        const isActivelyAnimatingToEnd = !!isStillScrollingTo.animated && Date.now() - state.scrollTime < 100;
++        if (!isActivelyAnimatingToEnd) {
++          scrollToFallbackOffset(ctx, completionState.clampedTargetOffset, !!isStillScrollingTo.animated);
++        }
+         scheduleFallbackCheck(100);
+       } else if (shouldFinishZeroTarget || shouldFinishAfterObservedScroll || canFinishInitialScrollWithoutNativeProgress || canFinishAfterSilentNativeDispatch || numChecks > maxChecks) {
+         finishScrollTo(ctx);
+@@ -1560,15 +1572,28 @@ function doMaintainScrollAtEnd(ctx) {
+   } = state;
+   const isWithinMaintainScrollAtEndThreshold = peek$(ctx, "isWithinMaintainScrollAtEndThreshold");
+   const shouldMaintainScrollAtEnd = !!(isWithinMaintainScrollAtEndThreshold && maintainScrollAtEnd && didContainersLayout);
++  if (state.contentSizeAnimationActiveEpoch !== void 0) {
++    state.pendingMaintainScrollAtEnd = false;
++    return false;
++  }
+   if (pendingNativeMVCPAdjust) {
+     state.pendingMaintainScrollAtEnd = shouldMaintainScrollAtEnd;
+     return false;
+   }
+   if (shouldMaintainScrollAtEnd) {
+     state.pendingMaintainScrollAtEnd = false;
++    const maintainAnchoredEndSpace = state.props.anchoredEndSpace;
++    const maintainAnchorIndex = maintainAnchoredEndSpace == null ? void 0 : maintainAnchoredEndSpace.anchorIndex;
++    if (maintainAnchorIndex !== void 0 && maintainAnchorIndex >= 0 && maintainAnchorIndex < state.props.data.length && !areKnownOrFixedItemSizesAvailable(ctx, maintainAnchorIndex, state.props.data.length - 1)) {
++      return false;
++    }
+     const contentSize = getContentSize(ctx);
++    const maintainInsetStartAdjustment = getContentInsetStartAdjustment(ctx);
+     if (contentSize < state.scrollLength) {
+-      state.scroll = 0;
++      state.scroll = -maintainInsetStartAdjustment;
++      if (maintainInsetStartAdjustment > 0) {
++        return true;
++      }
+     }
+     if (!state.maintainingScrollAtEnd) {
+       const pendingState = maintainScrollAtEnd.animated ? "pending-animated" : "pending-instant";
+@@ -1591,9 +1616,18 @@ function doMaintainScrollAtEnd(ctx) {
+               y: 0
+             });
+           } else {
+-            scroller == null ? void 0 : scroller.scrollToEnd({
+-              animated: maintainScrollAtEnd.animated
+-            });
++            const insetStartAdjustment = getContentInsetStartAdjustment(ctx);
++            if (insetStartAdjustment > 0) {
++              scroller == null ? void 0 : scroller.scrollTo({
++                animated: maintainScrollAtEnd.animated,
++                x: 0,
++                y: Math.max(-insetStartAdjustment, getContentSize(ctx) - state.scrollLength)
++              });
++            } else {
++              scroller == null ? void 0 : scroller.scrollToEnd({
++                animated: maintainScrollAtEnd.animated
++              });
++            }
+           }
+           setTimeout(
+             () => {
+@@ -1624,6 +1658,10 @@ function doMaintainScrollAtEnd(ctx) {
+ function requestAdjust(ctx, positionDiff, dataChanged) {
+   const state = ctx.state;
+   if (Math.abs(positionDiff) > 0.1) {
++    // Timestamp for ReanimatedPositionView: repositions caused by an MVCP
++    // size adjustment are already compensated by a contentOffset shift, so
++    // animating them would make rows visibly lurch and slide back.
++    state.lastMVCPAdjustTime = Date.now();
+     const needsScrollWorkaround = Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
+     const doit = () => {
+       if (needsScrollWorkaround) {
+@@ -1728,7 +1766,9 @@ function getPredictedNativeClamp(state, unresolvedAmount, totalSize) {
+   if (Math.abs(unresolvedAmount) <= MVCP_POSITION_EPSILON) {
+     return 0;
+   }
+-  const maxScroll = Math.max(0, totalSize - state.scrollLength);
++  const insetStartAdjustment = state.props.contentInsetStartAdjustment;
++  const minScroll = typeof insetStartAdjustment === "number" && Number.isFinite(insetStartAdjustment) ? -Math.max(0, insetStartAdjustment) : 0;
++  const maxScroll = Math.max(minScroll, totalSize - state.scrollLength);
+   const clampDelta = maxScroll - state.scroll;
+   if (unresolvedAmount < 0) {
+     return Math.max(unresolvedAmount, Math.min(0, clampDelta));
+@@ -1790,7 +1830,7 @@ function resolvePendingNativeMVCPAdjust(ctx, newScroll) {
+     settlePendingNativeMVCPAdjust(ctx, remainingAfterManual, nativeDelta);
+     return true;
+   }
+-  const expectedNativeClampScroll = Math.max(0, getContentSize(ctx) - state.scrollLength);
++  const expectedNativeClampScroll = Math.max(-getContentInsetStartAdjustment(ctx), getContentSize(ctx) - state.scrollLength);
+   const distanceToClamp = Math.abs(newScroll - expectedNativeClampScroll);
+   const isAtExpectedNativeClamp = distanceToClamp <= NATIVE_END_CLAMP_EPSILON;
+   if (isAtExpectedNativeClamp) {
+@@ -1923,7 +1963,7 @@ function prepareMVCP(ctx, dataChanged) {
+             if (diff > 0) {
+               diff = Math.max(0, totalSize - state.scroll - state.scrollLength);
+             } else {
+-              const maxScroll = Math.max(0, totalSize - state.scrollLength);
++              const maxScroll = Math.max(-getContentInsetStartAdjustment(ctx), totalSize - state.scrollLength);
+               state.scroll = maxScroll;
+               state.scrollPending = maxScroll;
+               diff = 0;
+@@ -2320,8 +2360,121 @@ function scrollToIndex(ctx, {
+ }
+ 
+ // src/core/initialScroll.ts
++var INSET_END_SETTLE_WATCHDOG_FRAMES = 150;
++var INSET_END_SETTLE_WATCHDOG_STABLE_FRAMES = 20;
++var INSET_END_REVEAL_STABLE_FRAMES = 3;
++var INSET_END_REVEAL_MAX_HOLD_FRAMES = 40;
++function startInsetEndSettleWatchdog(ctx) {
++  const state = ctx.state;
++  if (state.insetEndSettleWatchdogActive) {
++    return;
++  }
++  state.insetEndSettleWatchdogActive = true;
++  state.didUserDrag = false;
++  // Hold the readyToRender opacity gate until the end landing is stable, so
++  // the estimated-to-measured settle chase happens before first VISIBLE
++  // paint instead of in front of the user. Capped so slow measurement can
++  // never hide content for long.
++  state.insetEndRevealHold = true;
++  let frames = 0;
++  let settledFrames = 0;
++  let revealStableFrames = 0;
++  const releaseRevealHold = () => {
++    if (state.insetEndRevealHold) {
++      state.insetEndRevealHold = false;
++      setInitialRenderState(ctx, {});
++    }
++  };
++  // Revealing flips adaptive rendering to "normal", which re-renders rows and
++  // can move the end target one more time — do that upgrade while still
++  // hidden (phase 1), then require stability again before revealing (phase 2)
++  // so the first visible frame is the settled one.
++  let revealPhase = 1;
++  const onRevealStability = () => {
++    var _a3;
++    if (!state.insetEndRevealHold) {
++      return;
++    }
++    if (revealPhase === 1) {
++      revealPhase = 2;
++      revealStableFrames = 0;
++      setAdaptiveRender(ctx, "normal");
++      (_a3 = state.triggerCalculateItemsInView) == null ? void 0 : _a3.call(state);
++      return;
++    }
++    releaseRevealHold();
++  };
++  const tick = () => {
++    // The user owns the scroll from their first drag — a re-pin here would
++    // pin the list under their finger.
++    if (frames++ >= INSET_END_SETTLE_WATCHDOG_FRAMES || settledFrames >= INSET_END_SETTLE_WATCHDOG_STABLE_FRAMES || state.didUserDrag || !ctx.state || ctx.state !== state) {
++      state.insetEndSettleWatchdogActive = false;
++      releaseRevealHold();
++      return;
++    }
++    if (frames >= INSET_END_REVEAL_MAX_HOLD_FRAMES) {
++      releaseRevealHold();
++    }
++    const insetStartAdjustment = getContentInsetStartAdjustment(ctx);
++    const contentSize = getContentSize(ctx);
++    const scrollLength = state.scrollLength;
++    if (insetStartAdjustment > 0 && scrollLength > 0 && Number.isFinite(contentSize) && contentSize > scrollLength && !state.scrollingTo && !state.maintainingScrollAtEnd) {
++      const endOffset = Math.max(-insetStartAdjustment, contentSize - scrollLength);
++      const distance = endOffset - state.scroll;
++      // Estimated row sizes converging to measured ones can strand the initial
++      // end landing when the library's own end-anchor bookkeeping gives up.
++      // While still near the end (never fighting a user who scrolled away),
++      // re-pin to the current true end until sizes stop changing.
++      if (Math.abs(distance) > 2 && Math.abs(distance) <= scrollLength * 0.5) {
++        settledFrames = 0;
++        revealStableFrames = 0;
++        const scroller = state.refScroller.current;
++        if (scroller) {
++          scroller.scrollTo({ animated: false, x: 0, y: endOffset });
++        }
++      } else {
++        settledFrames++;
++        revealStableFrames++;
++        if (revealStableFrames >= INSET_END_REVEAL_STABLE_FRAMES) {
++          onRevealStability();
++        }
++      }
++    } else {
++      // Conditions that make re-pinning unnecessary (underflow, in-flight
++      // programmatic scroll) count toward stability for the reveal.
++      revealStableFrames++;
++      if (revealStableFrames >= INSET_END_REVEAL_STABLE_FRAMES) {
++        onRevealStability();
++      }
++    }
++    requestAnimationFrame(tick);
++  };
++  requestAnimationFrame(tick);
++}
+ function dispatchInitialScroll(ctx, params) {
+   const { forceScroll, resolvedOffset, target, waitForCompletionFrame } = params;
++  const insetStartAdjustment = getContentInsetStartAdjustment(ctx);
++  if (insetStartAdjustment > 0 && ctx.state.props.data.length > 0) {
++    if (ctx.state.scrollLength <= 0) {
++      // The scroll length is unknown, so the resolved target is meaningless;
++      // the initial-scroll machinery re-advances after layout.
++      return;
++    }
++    if (resolvedOffset <= -insetStartAdjustment + 1 && !ctx.state.didDispatchInsetInitialScroll) {
++      // Content underflows the viewport and nothing has scrolled yet: the
++      // untouched native rest position (UIKit's adjustedContentInset) IS the
++      // end position. Dispatching a negative scroll here would race UIKit's
++      // inset application during screen attach, so just finish the session.
++      finishInitialScroll(ctx, {
++        resolvedOffset
++      });
++      return;
++    }
++    ctx.state.didDispatchInsetInitialScroll = true;
++    if (target.viewPosition === 1) {
++      startInsetEndSettleWatchdog(ctx);
++    }
++  }
+   const requestedIndex = target.index;
+   const index = requestedIndex !== void 0 ? clampScrollIndex(requestedIndex, ctx.state.props.data.length) : void 0;
+   const itemSize = getItemSizeAtIndex(ctx, index);
+@@ -2747,7 +2900,9 @@ function clearFinishedBootstrapInitialScrollTargetIfMovedAway(ctx) {
+     return;
+   }
+   if (didFinishedInitialScrollMoveAwayFromTarget(ctx, initialScroll)) {
+-    const shouldKeepEndTargetAlive = isRetargetableBottomAlignedInitialScrollTarget(initialScroll) && peek$(ctx, "isAtEnd");
++    const endTargetDistanceFromEnd = getContentSize(ctx) - state.scroll - state.scrollLength - getContentInsetEnd(ctx);
++    const isNearEndForInsetList = getContentInsetStartAdjustment(ctx) > 0 && Number.isFinite(endTargetDistanceFromEnd) && endTargetDistanceFromEnd <= state.scrollLength * 0.5;
++    const shouldKeepEndTargetAlive = isRetargetableBottomAlignedInitialScrollTarget(initialScroll) && (peek$(ctx, "isAtEnd") || isNearEndForInsetList);
+     if (!shouldKeepEndTargetAlive) {
+       if (shouldPreserveInitialScrollForFooterLayout(initialScroll)) {
+         clearPendingInitialScrollFooterLayout(ctx, {
+@@ -4672,7 +4827,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
+       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);
++      const knownSizeBound = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
++      nextSize = hasUnknownTailSize ? Math.min(previousSize || 0, knownSizeBound) : knownSizeBound;
+     } else if (anchorIndex >= 0) {
+       isReady = false;
+     }
+@@ -4692,6 +4848,12 @@ function maybeUpdateAnchoredEndSpace(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 });
++  } else if (!isReady && didSizeChange && nextSize < (previousSize || 0)) {
++    set$(ctx, "anchoredEndSpaceSize", nextSize);
++    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
++    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
++      updateScroll(ctx, state.scroll, true, { markHasScrolled: false });
++    }
+   }
+   return nextSize;
+ }
+@@ -5715,6 +5877,7 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
+   horizontal
+ }) {
+   const ctx = useStateContext();
++  const SizeComponent = ctx.state.props.sizeComponentInternal;
+   const columnWrapperStyle = ctx.columnWrapperStyle;
+   const animSize = useValue$("totalSize");
+   const [readyToRender, numColumns, otherAxisSize = 0] = useArr$(["readyToRender", "numColumns", "otherAxisSize"]);
+@@ -5725,6 +5888,13 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
+     opacity: isVisible ? 1 : 0,
+     width: animSize
+   } : { height: animSize, minWidth: otherAxisSize, opacity: isVisible ? 1 : 0 };
++  if (SizeComponent) {
++    if (horizontal) {
++      delete style.width;
++    } else {
++      delete style.height;
++    }
++  }
+   if (columnWrapperStyle) {
+     const { columnGap, rowGap, gap } = columnWrapperStyle;
+     const gapX = columnGap || gap || 0;
+@@ -5745,7 +5915,8 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
+       }
+     }
+   }
+-  return /* @__PURE__ */ React2__namespace.createElement(ReactNative.Animated.View, { pointerEvents: isVisible ? void 0 : "none", style }, /* @__PURE__ */ React2__namespace.createElement(ContainerLayoutCoordinator, null, children));
++  const content = /* @__PURE__ */ React2__namespace.createElement(ContainerLayoutCoordinator, null, children);
++  return SizeComponent ? /* @__PURE__ */ React2__namespace.createElement(SizeComponent, { horizontal, pointerEvents: isVisible ? void 0 : "none", signalName: "totalSize", style }, content) : /* @__PURE__ */ React2__namespace.createElement(ReactNative.Animated.View, { pointerEvents: isVisible ? void 0 : "none", style }, content);
+ });
+ var Containers = typedMemo(function Containers2({
+   freshDataTransitionEpoch,
+@@ -5896,7 +6067,12 @@ var StyleSheet = ReactNative.StyleSheet;
+ 
+ // src/components/ListComponent.tsx
+ var AlignItemsAtEndSpacer = typedMemo(function AlignItemsAtEndSpacer2({ horizontal }) {
++  const ctx = useStateContext();
+   const [alignItemsAtEndPadding = 0] = useArr$(["alignItemsAtEndPadding"]);
++  const SizeComponent = ctx.state.props.sizeComponentInternal;
++  if (SizeComponent) {
++    return /* @__PURE__ */ React2__namespace.createElement(SizeComponent, { horizontal, signalName: "alignItemsAtEndPadding", style: { flexShrink: 0 } });
++  }
+   if (alignItemsAtEndPadding <= 0) {
+     return null;
+   }
+@@ -5929,8 +6105,12 @@ var ListComponent = typedMemo(function ListComponent2({
+   refScrollView,
+   renderScrollComponent,
+   onLayoutFooter,
++  onInternalMomentumScrollBegin,
+   onInternalScrollBeginDrag,
++  onInternalScrollEndDrag,
+   onInternalScrollEnd,
++  onMomentumScrollBegin,
++  onScrollEndDrag,
+   scrollAdjustHandler,
+   snapToIndices,
+   stickyHeaderConfig,
+@@ -6001,7 +6181,17 @@ var ListComponent = typedMemo(function ListComponent2({
+     SnapOrScroll,
+     {
+       ...rest,
+-      ...Platform.OS === "web" ? ScrollComponent === ListComponentScrollView ? { onInternalScrollEnd, useWindowScroll } : {} : { onScrollBeginDrag: onInternalScrollBeginDrag },
++      ...Platform.OS === "web" ? ScrollComponent === ListComponentScrollView ? { onInternalScrollEnd, useWindowScroll } : {} : {
++        onMomentumScrollBegin: (event) => {
++          onInternalMomentumScrollBegin == null ? void 0 : onInternalMomentumScrollBegin(event);
++          onMomentumScrollBegin == null ? void 0 : onMomentumScrollBegin(event);
++        },
++        onScrollBeginDrag: onInternalScrollBeginDrag,
++        onScrollEndDrag: (event) => {
++          onInternalScrollEndDrag == null ? void 0 : onInternalScrollEndDrag(event);
++          onScrollEndDrag == null ? void 0 : onScrollEndDrag(event);
++        }
++      },
+       contentContainerStyle: [
+         horizontal ? { height: "100%" } : {},
+         contentContainerStyle,
+@@ -7075,6 +7265,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+     dataVersion,
+     drawDistance = 250,
+     contentInsetEndAdjustment,
++    contentInsetStartAdjustment,
+     estimatedItemSize = 100,
+     estimatedListSize,
+     extraData,
+@@ -7132,10 +7323,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+   const animatedPropsInternal = props.animatedPropsInternal;
+   const anchoredEndSpaceOwner = (_a3 = props.anchoredEndSpaceOwnerInternal) != null ? _a3 : "list";
+   const positionComponentInternal = props.positionComponentInternal;
++  const sizeComponentInternal = props.sizeComponentInternal;
+   const stickyPositionComponentInternal = props.stickyPositionComponentInternal;
+   const {
+     anchoredEndSpaceOwnerInternal: _anchoredEndSpaceOwnerInternal,
+     positionComponentInternal: _positionComponentInternal,
++    sizeComponentInternal: _sizeComponentInternal,
+     stickyPositionComponentInternal: _stickyPositionComponentInternal,
+     ...restProps
+   } = rest;
+@@ -7200,7 +7393,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+   const combinedRef = useCombinedRef(refScroller, refScrollView);
+   const keyExtractor = keyExtractorProp != null ? keyExtractorProp : ((_item, index) => index.toString());
+   const stickyHeaderIndices = stickyHeaderIndicesProp;
+-  const contentInsetEndAdjustmentResolved = Platform.OS === "web" ? contentInsetEndAdjustment : void 0;
++  const contentInsetEndAdjustmentResolved = contentInsetEndAdjustment;
+   const previousContentInsetEndAdjustmentRef = React2.useRef(contentInsetEndAdjustmentResolved);
+   const alwaysRenderIndices = React2.useMemo(() => {
+     const indices = getAlwaysRenderIndices(alwaysRender, dataProp, keyExtractor, anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex);
+@@ -7341,6 +7534,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+     contentContainerAlignItems: contentContainerStyle.alignItems,
+     contentInset,
+     contentInsetEndAdjustment: contentInsetEndAdjustmentResolved,
++    contentInsetStartAdjustment,
+     data: dataProp,
+     dataKey,
+     dataVersion,
+@@ -7372,6 +7566,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+     renderItem,
+     rtl,
+     snapToIndices,
++    sizeComponentInternal,
+     stickyHeaderIndicesArr: stickyHeaderIndices != null ? stickyHeaderIndices : [],
+     stickyHeaderIndicesSet: React2.useMemo(() => new Set(stickyHeaderIndices != null ? stickyHeaderIndices : []), [stickyHeaderIndices == null ? void 0 : stickyHeaderIndices.join(",")]),
+     stickyPositionComponentInternal,
+@@ -7423,6 +7618,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+       return void 0;
+     }
+     const resolvedOffset = (_a4 = initialScroll.contentOffset) != null ? _a4 : resolveInitialScrollOffset(ctx, initialScroll);
++    if (getContentInsetStartAdjustment(ctx) > 0) {
++      // With a native leading inset (transparent header + automatic insets),
++      // any mount-time contentOffset races UIKit's adjustedContentInset
++      // application. The gated initial-scroll dispatch positions the list once
++      // real sizes are known instead.
++      return void 0;
++    }
+     return usesBootstrapInitialScroll && ((_b2 = state.initialScrollSession) == null ? void 0 : _b2.kind) === "bootstrap" && Platform.OS === "web" ? void 0 : resolvedOffset;
+   }, [usesBootstrapInitialScroll]);
+   React2.useLayoutEffect(() => {
+@@ -7547,6 +7749,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+     [
+       dataKey,
+       dataVersion,
++      contentInsetStartAdjustment,
+       memoizedLastItemKeys.join(","),
+       numColumnsProp,
+       nextScrollAxisGap,
+@@ -7643,6 +7846,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+     () => ({
+       getRenderedItem: (key) => getRenderedItem(ctx, key),
+       onMomentumScrollEnd: (event) => {
++        state.isMomentumScrolling = false;
+         checkFinishedScrollFallback(ctx);
+         if (state.props.onMomentumScrollEnd) {
+           state.props.onMomentumScrollEnd(event);
+@@ -7651,6 +7855,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+       onScroll: (event) => onScroll(ctx, event),
+       onScrollBeginDrag: (event) => {
+         var _a4, _b2;
++        ctx.state.didUserDrag = true;
++        ctx.state.isUserDragging = true;
+         prepareReachedEdgeForNextUserScroll(ctx);
+         (_b2 = (_a4 = state.props).onScrollBeginDrag) == null ? void 0 : _b2.call(_a4, event);
+       },
+@@ -7676,11 +7882,18 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+       ListFooterComponent,
+       ListFooterComponentStyle,
+       ListHeaderComponent,
++      onInternalMomentumScrollBegin: () => {
++        ctx.state.isMomentumScrolling = true;
++      },
+       onInternalScrollBeginDrag: fns.onScrollBeginDrag,
++      onInternalScrollEndDrag: () => {
++        ctx.state.isUserDragging = false;
++      },
+       onInternalScrollEnd: fns.onScrollEnd,
+       onLayout,
+       onLayoutFooter,
+       onMomentumScrollEnd: fns.onMomentumScrollEnd,
++      onScrollBeginDrag: fns.onScrollBeginDrag,
+       onScroll: onScrollHandler,
+       recycleItems,
+       refreshControl: refreshControlElement ? stylePaddingTopState > 0 ? React2__namespace.cloneElement(refreshControlElement, {
+diff --git a/react-native.mjs b/react-native.mjs
+index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318d57e29dc 100644
+--- a/react-native.mjs
++++ b/react-native.mjs
+@@ -933,7 +933,7 @@ function setInitialRenderState(ctx, {
+   if (didInitialScroll) {
+     state.didFinishInitialScroll = true;
+   }
+-  const isReadyToRender = Boolean(state.didContainersLayout && state.didFinishInitialScroll);
++  const isReadyToRender = Boolean(state.didContainersLayout && state.didFinishInitialScroll && !state.insetEndRevealHold);
+   if (isReadyToRender && !peek$(ctx, "readyToRender")) {
+     set$(ctx, "readyToRender", true);
+     setAdaptiveRender(ctx, "normal", "ready");
+@@ -1069,7 +1069,7 @@ function getRawContentLength(ctx) {
+ function getAlignItemsAtEndPadding(ctx) {
+   const { state } = ctx;
+   const shouldPad = !!state.props.alignItemsAtEndPaddingEnabled && !state.props.horizontal && state.props.data.length > 0 && state.scrollLength > 0;
+-  return shouldPad ? Math.max(0, state.scrollLength - getRawContentLength(ctx) - getContentInsetEnd(ctx)) : 0;
++  return shouldPad ? Math.max(0, state.scrollLength - getContentInsetStartAdjustment(ctx) - getRawContentLength(ctx) - getContentInsetEnd(ctx)) : 0;
+ }
+ function updateContentMetricsState(ctx) {
+   const previousPadding = peek$(ctx, "alignItemsAtEndPadding") || 0;
+@@ -1094,6 +1094,10 @@ function addTotalSize(ctx, key, add, notifyTotalSize = true) {
+     totalSize += add;
+   }
+   if (prevTotalSize !== totalSize) {
++    const now = Date.now();
++    const isContinuingContentSizeAnimation = state.contentSizeAnimationActiveEpoch !== void 0;
++    state.contentSizeAnimationEpoch = (state.contentSizeAnimationEpoch || 0) + 1;
++    state.contentSizeAnimationEligible = !!state.props.sizeComponentInternal && state.didContainersLayout && (isContinuingContentSizeAnimation || !state.props.maintainScrollAtEnd && !state.isUserDragging && !state.isMomentumScrolling && now - (state.lastMVCPAdjustTime || 0) >= 300);
+     if (!IsNewArchitecture && state.initialScroll && totalSize < prevTotalSize) {
+       state.pendingTotalSize = totalSize;
+     } else {
+@@ -1283,18 +1287,23 @@ function calculateOffsetWithOffsetPosition(ctx, offsetParam, params) {
+ }
+ 
+ // src/core/clampScrollOffset.ts
++function getContentInsetStartAdjustment(ctx) {
++  const adjustment = ctx.state.props.contentInsetStartAdjustment;
++  return typeof adjustment === "number" && Number.isFinite(adjustment) ? Math.max(0, adjustment) : 0;
++}
+ function clampScrollOffset(ctx, offset, scrollTarget) {
+   const state = ctx.state;
+   const contentSize = getContentSize(ctx);
++  const minOffset = -getContentInsetStartAdjustment(ctx);
+   let clampedOffset = offset;
+   if (Number.isFinite(contentSize) && Number.isFinite(state.scrollLength) && (Platform.OS !== "android" || state.lastLayout)) {
+-    const baseMaxOffset = Math.max(0, contentSize - state.scrollLength);
++    const baseMaxOffset = Math.max(minOffset, contentSize - state.scrollLength);
+     const viewOffset = scrollTarget == null ? void 0 : scrollTarget.viewOffset;
+     const extraEndOffset = typeof viewOffset === "number" && viewOffset < 0 ? -viewOffset : 0;
+     const maxOffset = baseMaxOffset + extraEndOffset;
+     clampedOffset = Math.min(offset, maxOffset);
+   }
+-  clampedOffset = Math.max(0, clampedOffset);
++  clampedOffset = Math.max(minOffset, clampedOffset);
+   return clampedOffset;
+ }
+ 
+@@ -1430,10 +1439,10 @@ function checkFinishedScrollFrame(ctx) {
+     finishScrollTo(ctx);
+   }
+ }
+-function scrollToFallbackOffset(ctx, offset) {
++function scrollToFallbackOffset(ctx, offset, animated) {
+   var _a3;
+   (_a3 = ctx.state.refScroller.current) == null ? void 0 : _a3.scrollTo({
+-    animated: false,
++    animated: !!animated,
+     x: ctx.state.props.horizontal ? offset : 0,
+     y: ctx.state.props.horizontal ? 0 : offset
+   });
+@@ -1482,7 +1491,10 @@ function checkFinishedScrollFallback(ctx) {
+         );
+         scheduleFallbackCheck(SILENT_INITIAL_SCROLL_RETRY_DELAY_MS);
+       } else if (shouldRetryUnalignedEndScroll) {
+-        scrollToFallbackOffset(ctx, completionState.clampedTargetOffset);
++        const isActivelyAnimatingToEnd = !!isStillScrollingTo.animated && Date.now() - state.scrollTime < 100;
++        if (!isActivelyAnimatingToEnd) {
++          scrollToFallbackOffset(ctx, completionState.clampedTargetOffset, !!isStillScrollingTo.animated);
++        }
+         scheduleFallbackCheck(100);
+       } else if (shouldFinishZeroTarget || shouldFinishAfterObservedScroll || canFinishInitialScrollWithoutNativeProgress || canFinishAfterSilentNativeDispatch || numChecks > maxChecks) {
+         finishScrollTo(ctx);
+@@ -1539,15 +1551,28 @@ function doMaintainScrollAtEnd(ctx) {
+   } = state;
+   const isWithinMaintainScrollAtEndThreshold = peek$(ctx, "isWithinMaintainScrollAtEndThreshold");
+   const shouldMaintainScrollAtEnd = !!(isWithinMaintainScrollAtEndThreshold && maintainScrollAtEnd && didContainersLayout);
++  if (state.contentSizeAnimationActiveEpoch !== void 0) {
++    state.pendingMaintainScrollAtEnd = false;
++    return false;
++  }
+   if (pendingNativeMVCPAdjust) {
+     state.pendingMaintainScrollAtEnd = shouldMaintainScrollAtEnd;
+     return false;
+   }
+   if (shouldMaintainScrollAtEnd) {
+     state.pendingMaintainScrollAtEnd = false;
++    const maintainAnchoredEndSpace = state.props.anchoredEndSpace;
++    const maintainAnchorIndex = maintainAnchoredEndSpace == null ? void 0 : maintainAnchoredEndSpace.anchorIndex;
++    if (maintainAnchorIndex !== void 0 && maintainAnchorIndex >= 0 && maintainAnchorIndex < state.props.data.length && !areKnownOrFixedItemSizesAvailable(ctx, maintainAnchorIndex, state.props.data.length - 1)) {
++      return false;
++    }
+     const contentSize = getContentSize(ctx);
++    const maintainInsetStartAdjustment = getContentInsetStartAdjustment(ctx);
+     if (contentSize < state.scrollLength) {
+-      state.scroll = 0;
++      state.scroll = -maintainInsetStartAdjustment;
++      if (maintainInsetStartAdjustment > 0) {
++        return true;
++      }
+     }
+     if (!state.maintainingScrollAtEnd) {
+       const pendingState = maintainScrollAtEnd.animated ? "pending-animated" : "pending-instant";
+@@ -1570,9 +1595,18 @@ function doMaintainScrollAtEnd(ctx) {
+               y: 0
+             });
+           } else {
+-            scroller == null ? void 0 : scroller.scrollToEnd({
+-              animated: maintainScrollAtEnd.animated
+-            });
++            const insetStartAdjustment = getContentInsetStartAdjustment(ctx);
++            if (insetStartAdjustment > 0) {
++              scroller == null ? void 0 : scroller.scrollTo({
++                animated: maintainScrollAtEnd.animated,
++                x: 0,
++                y: Math.max(-insetStartAdjustment, getContentSize(ctx) - state.scrollLength)
++              });
++            } else {
++              scroller == null ? void 0 : scroller.scrollToEnd({
++                animated: maintainScrollAtEnd.animated
++              });
++            }
+           }
+           setTimeout(
+             () => {
+@@ -1603,6 +1637,10 @@ function doMaintainScrollAtEnd(ctx) {
+ function requestAdjust(ctx, positionDiff, dataChanged) {
+   const state = ctx.state;
+   if (Math.abs(positionDiff) > 0.1) {
++    // Timestamp for ReanimatedPositionView: repositions caused by an MVCP
++    // size adjustment are already compensated by a contentOffset shift, so
++    // animating them would make rows visibly lurch and slide back.
++    state.lastMVCPAdjustTime = Date.now();
+     const needsScrollWorkaround = Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
+     const doit = () => {
+       if (needsScrollWorkaround) {
+@@ -1707,7 +1745,9 @@ function getPredictedNativeClamp(state, unresolvedAmount, totalSize) {
+   if (Math.abs(unresolvedAmount) <= MVCP_POSITION_EPSILON) {
+     return 0;
+   }
+-  const maxScroll = Math.max(0, totalSize - state.scrollLength);
++  const insetStartAdjustment = state.props.contentInsetStartAdjustment;
++  const minScroll = typeof insetStartAdjustment === "number" && Number.isFinite(insetStartAdjustment) ? -Math.max(0, insetStartAdjustment) : 0;
++  const maxScroll = Math.max(minScroll, totalSize - state.scrollLength);
+   const clampDelta = maxScroll - state.scroll;
+   if (unresolvedAmount < 0) {
+     return Math.max(unresolvedAmount, Math.min(0, clampDelta));
+@@ -1769,7 +1809,7 @@ function resolvePendingNativeMVCPAdjust(ctx, newScroll) {
+     settlePendingNativeMVCPAdjust(ctx, remainingAfterManual, nativeDelta);
+     return true;
+   }
+-  const expectedNativeClampScroll = Math.max(0, getContentSize(ctx) - state.scrollLength);
++  const expectedNativeClampScroll = Math.max(-getContentInsetStartAdjustment(ctx), getContentSize(ctx) - state.scrollLength);
+   const distanceToClamp = Math.abs(newScroll - expectedNativeClampScroll);
+   const isAtExpectedNativeClamp = distanceToClamp <= NATIVE_END_CLAMP_EPSILON;
+   if (isAtExpectedNativeClamp) {
+@@ -1902,7 +1942,7 @@ function prepareMVCP(ctx, dataChanged) {
+             if (diff > 0) {
+               diff = Math.max(0, totalSize - state.scroll - state.scrollLength);
+             } else {
+-              const maxScroll = Math.max(0, totalSize - state.scrollLength);
++              const maxScroll = Math.max(-getContentInsetStartAdjustment(ctx), totalSize - state.scrollLength);
+               state.scroll = maxScroll;
+               state.scrollPending = maxScroll;
+               diff = 0;
+@@ -2299,8 +2339,121 @@ function scrollToIndex(ctx, {
+ }
+ 
+ // src/core/initialScroll.ts
++var INSET_END_SETTLE_WATCHDOG_FRAMES = 150;
++var INSET_END_SETTLE_WATCHDOG_STABLE_FRAMES = 20;
++var INSET_END_REVEAL_STABLE_FRAMES = 3;
++var INSET_END_REVEAL_MAX_HOLD_FRAMES = 40;
++function startInsetEndSettleWatchdog(ctx) {
++  const state = ctx.state;
++  if (state.insetEndSettleWatchdogActive) {
++    return;
++  }
++  state.insetEndSettleWatchdogActive = true;
++  state.didUserDrag = false;
++  // Hold the readyToRender opacity gate until the end landing is stable, so
++  // the estimated-to-measured settle chase happens before first VISIBLE
++  // paint instead of in front of the user. Capped so slow measurement can
++  // never hide content for long.
++  state.insetEndRevealHold = true;
++  let frames = 0;
++  let settledFrames = 0;
++  let revealStableFrames = 0;
++  const releaseRevealHold = () => {
++    if (state.insetEndRevealHold) {
++      state.insetEndRevealHold = false;
++      setInitialRenderState(ctx, {});
++    }
++  };
++  // Revealing flips adaptive rendering to "normal", which re-renders rows and
++  // can move the end target one more time — do that upgrade while still
++  // hidden (phase 1), then require stability again before revealing (phase 2)
++  // so the first visible frame is the settled one.
++  let revealPhase = 1;
++  const onRevealStability = () => {
++    var _a3;
++    if (!state.insetEndRevealHold) {
++      return;
++    }
++    if (revealPhase === 1) {
++      revealPhase = 2;
++      revealStableFrames = 0;
++      setAdaptiveRender(ctx, "normal");
++      (_a3 = state.triggerCalculateItemsInView) == null ? void 0 : _a3.call(state);
++      return;
++    }
++    releaseRevealHold();
++  };
++  const tick = () => {
++    // The user owns the scroll from their first drag — a re-pin here would
++    // pin the list under their finger.
++    if (frames++ >= INSET_END_SETTLE_WATCHDOG_FRAMES || settledFrames >= INSET_END_SETTLE_WATCHDOG_STABLE_FRAMES || state.didUserDrag || !ctx.state || ctx.state !== state) {
++      state.insetEndSettleWatchdogActive = false;
++      releaseRevealHold();
++      return;
++    }
++    if (frames >= INSET_END_REVEAL_MAX_HOLD_FRAMES) {
++      releaseRevealHold();
++    }
++    const insetStartAdjustment = getContentInsetStartAdjustment(ctx);
++    const contentSize = getContentSize(ctx);
++    const scrollLength = state.scrollLength;
++    if (insetStartAdjustment > 0 && scrollLength > 0 && Number.isFinite(contentSize) && contentSize > scrollLength && !state.scrollingTo && !state.maintainingScrollAtEnd) {
++      const endOffset = Math.max(-insetStartAdjustment, contentSize - scrollLength);
++      const distance = endOffset - state.scroll;
++      // Estimated row sizes converging to measured ones can strand the initial
++      // end landing when the library's own end-anchor bookkeeping gives up.
++      // While still near the end (never fighting a user who scrolled away),
++      // re-pin to the current true end until sizes stop changing.
++      if (Math.abs(distance) > 2 && Math.abs(distance) <= scrollLength * 0.5) {
++        settledFrames = 0;
++        revealStableFrames = 0;
++        const scroller = state.refScroller.current;
++        if (scroller) {
++          scroller.scrollTo({ animated: false, x: 0, y: endOffset });
++        }
++      } else {
++        settledFrames++;
++        revealStableFrames++;
++        if (revealStableFrames >= INSET_END_REVEAL_STABLE_FRAMES) {
++          onRevealStability();
++        }
++      }
++    } else {
++      // Conditions that make re-pinning unnecessary (underflow, in-flight
++      // programmatic scroll) count toward stability for the reveal.
++      revealStableFrames++;
++      if (revealStableFrames >= INSET_END_REVEAL_STABLE_FRAMES) {
++        onRevealStability();
++      }
++    }
++    requestAnimationFrame(tick);
++  };
++  requestAnimationFrame(tick);
++}
+ function dispatchInitialScroll(ctx, params) {
+   const { forceScroll, resolvedOffset, target, waitForCompletionFrame } = params;
++  const insetStartAdjustment = getContentInsetStartAdjustment(ctx);
++  if (insetStartAdjustment > 0 && ctx.state.props.data.length > 0) {
++    if (ctx.state.scrollLength <= 0) {
++      // The scroll length is unknown, so the resolved target is meaningless;
++      // the initial-scroll machinery re-advances after layout.
++      return;
++    }
++    if (resolvedOffset <= -insetStartAdjustment + 1 && !ctx.state.didDispatchInsetInitialScroll) {
++      // Content underflows the viewport and nothing has scrolled yet: the
++      // untouched native rest position (UIKit's adjustedContentInset) IS the
++      // end position. Dispatching a negative scroll here would race UIKit's
++      // inset application during screen attach, so just finish the session.
++      finishInitialScroll(ctx, {
++        resolvedOffset
++      });
++      return;
++    }
++    ctx.state.didDispatchInsetInitialScroll = true;
++    if (target.viewPosition === 1) {
++      startInsetEndSettleWatchdog(ctx);
++    }
++  }
+   const requestedIndex = target.index;
+   const index = requestedIndex !== void 0 ? clampScrollIndex(requestedIndex, ctx.state.props.data.length) : void 0;
+   const itemSize = getItemSizeAtIndex(ctx, index);
+@@ -2726,7 +2879,9 @@ function clearFinishedBootstrapInitialScrollTargetIfMovedAway(ctx) {
+     return;
+   }
+   if (didFinishedInitialScrollMoveAwayFromTarget(ctx, initialScroll)) {
+-    const shouldKeepEndTargetAlive = isRetargetableBottomAlignedInitialScrollTarget(initialScroll) && peek$(ctx, "isAtEnd");
++    const endTargetDistanceFromEnd = getContentSize(ctx) - state.scroll - state.scrollLength - getContentInsetEnd(ctx);
++    const isNearEndForInsetList = getContentInsetStartAdjustment(ctx) > 0 && Number.isFinite(endTargetDistanceFromEnd) && endTargetDistanceFromEnd <= state.scrollLength * 0.5;
++    const shouldKeepEndTargetAlive = isRetargetableBottomAlignedInitialScrollTarget(initialScroll) && (peek$(ctx, "isAtEnd") || isNearEndForInsetList);
+     if (!shouldKeepEndTargetAlive) {
+       if (shouldPreserveInitialScrollForFooterLayout(initialScroll)) {
+         clearPendingInitialScrollFooterLayout(ctx, {
+@@ -4651,7 +4806,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
+       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);
++      const knownSizeBound = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
++      nextSize = hasUnknownTailSize ? Math.min(previousSize || 0, knownSizeBound) : knownSizeBound;
+     } else if (anchorIndex >= 0) {
+       isReady = false;
+     }
+@@ -4671,6 +4827,12 @@ function maybeUpdateAnchoredEndSpace(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 });
++  } else if (!isReady && didSizeChange && nextSize < (previousSize || 0)) {
++    set$(ctx, "anchoredEndSpaceSize", nextSize);
++    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
++    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
++      updateScroll(ctx, state.scroll, true, { markHasScrolled: false });
++    }
+   }
+   return nextSize;
+ }
+@@ -5694,6 +5856,7 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
+   horizontal
+ }) {
+   const ctx = useStateContext();
++  const SizeComponent = ctx.state.props.sizeComponentInternal;
+   const columnWrapperStyle = ctx.columnWrapperStyle;
+   const animSize = useValue$("totalSize");
+   const [readyToRender, numColumns, otherAxisSize = 0] = useArr$(["readyToRender", "numColumns", "otherAxisSize"]);
+@@ -5704,6 +5867,13 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
+     opacity: isVisible ? 1 : 0,
+     width: animSize
+   } : { height: animSize, minWidth: otherAxisSize, opacity: isVisible ? 1 : 0 };
++  if (SizeComponent) {
++    if (horizontal) {
++      delete style.width;
++    } else {
++      delete style.height;
++    }
++  }
+   if (columnWrapperStyle) {
+     const { columnGap, rowGap, gap } = columnWrapperStyle;
+     const gapX = columnGap || gap || 0;
+@@ -5724,7 +5894,8 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
+       }
+     }
+   }
+-  return /* @__PURE__ */ React2.createElement(Animated.View, { pointerEvents: isVisible ? void 0 : "none", style }, /* @__PURE__ */ React2.createElement(ContainerLayoutCoordinator, null, children));
++  const content = /* @__PURE__ */ React2.createElement(ContainerLayoutCoordinator, null, children);
++  return SizeComponent ? /* @__PURE__ */ React2.createElement(SizeComponent, { horizontal, pointerEvents: isVisible ? void 0 : "none", signalName: "totalSize", style }, content) : /* @__PURE__ */ React2.createElement(Animated.View, { pointerEvents: isVisible ? void 0 : "none", style }, content);
+ });
+ var Containers = typedMemo(function Containers2({
+   freshDataTransitionEpoch,
+@@ -5875,7 +6046,12 @@ var StyleSheet = StyleSheet$1;
+ 
+ // src/components/ListComponent.tsx
+ var AlignItemsAtEndSpacer = typedMemo(function AlignItemsAtEndSpacer2({ horizontal }) {
++  const ctx = useStateContext();
+   const [alignItemsAtEndPadding = 0] = useArr$(["alignItemsAtEndPadding"]);
++  const SizeComponent = ctx.state.props.sizeComponentInternal;
++  if (SizeComponent) {
++    return /* @__PURE__ */ React2.createElement(SizeComponent, { horizontal, signalName: "alignItemsAtEndPadding", style: { flexShrink: 0 } });
++  }
+   if (alignItemsAtEndPadding <= 0) {
+     return null;
+   }
+@@ -5908,8 +6084,12 @@ var ListComponent = typedMemo(function ListComponent2({
+   refScrollView,
+   renderScrollComponent,
+   onLayoutFooter,
++  onInternalMomentumScrollBegin,
+   onInternalScrollBeginDrag,
++  onInternalScrollEndDrag,
+   onInternalScrollEnd,
++  onMomentumScrollBegin,
++  onScrollEndDrag,
+   scrollAdjustHandler,
+   snapToIndices,
+   stickyHeaderConfig,
+@@ -5980,7 +6160,17 @@ var ListComponent = typedMemo(function ListComponent2({
+     SnapOrScroll,
+     {
+       ...rest,
+-      ...Platform.OS === "web" ? ScrollComponent === ListComponentScrollView ? { onInternalScrollEnd, useWindowScroll } : {} : { onScrollBeginDrag: onInternalScrollBeginDrag },
++      ...Platform.OS === "web" ? ScrollComponent === ListComponentScrollView ? { onInternalScrollEnd, useWindowScroll } : {} : {
++        onMomentumScrollBegin: (event) => {
++          onInternalMomentumScrollBegin == null ? void 0 : onInternalMomentumScrollBegin(event);
++          onMomentumScrollBegin == null ? void 0 : onMomentumScrollBegin(event);
++        },
++        onScrollBeginDrag: onInternalScrollBeginDrag,
++        onScrollEndDrag: (event) => {
++          onInternalScrollEndDrag == null ? void 0 : onInternalScrollEndDrag(event);
++          onScrollEndDrag == null ? void 0 : onScrollEndDrag(event);
++        }
++      },
+       contentContainerStyle: [
+         horizontal ? { height: "100%" } : {},
+         contentContainerStyle,
+@@ -7054,6 +7244,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+     dataVersion,
+     drawDistance = 250,
+     contentInsetEndAdjustment,
++    contentInsetStartAdjustment,
+     estimatedItemSize = 100,
+     estimatedListSize,
+     extraData,
+@@ -7111,10 +7302,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+   const animatedPropsInternal = props.animatedPropsInternal;
+   const anchoredEndSpaceOwner = (_a3 = props.anchoredEndSpaceOwnerInternal) != null ? _a3 : "list";
+   const positionComponentInternal = props.positionComponentInternal;
++  const sizeComponentInternal = props.sizeComponentInternal;
+   const stickyPositionComponentInternal = props.stickyPositionComponentInternal;
+   const {
+     anchoredEndSpaceOwnerInternal: _anchoredEndSpaceOwnerInternal,
+     positionComponentInternal: _positionComponentInternal,
++    sizeComponentInternal: _sizeComponentInternal,
+     stickyPositionComponentInternal: _stickyPositionComponentInternal,
+     ...restProps
+   } = rest;
+@@ -7179,7 +7372,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+   const combinedRef = useCombinedRef(refScroller, refScrollView);
+   const keyExtractor = keyExtractorProp != null ? keyExtractorProp : ((_item, index) => index.toString());
+   const stickyHeaderIndices = stickyHeaderIndicesProp;
+-  const contentInsetEndAdjustmentResolved = Platform.OS === "web" ? contentInsetEndAdjustment : void 0;
++  const contentInsetEndAdjustmentResolved = contentInsetEndAdjustment;
+   const previousContentInsetEndAdjustmentRef = useRef(contentInsetEndAdjustmentResolved);
+   const alwaysRenderIndices = useMemo(() => {
+     const indices = getAlwaysRenderIndices(alwaysRender, dataProp, keyExtractor, anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex);
+@@ -7320,6 +7513,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+     contentContainerAlignItems: contentContainerStyle.alignItems,
+     contentInset,
+     contentInsetEndAdjustment: contentInsetEndAdjustmentResolved,
++    contentInsetStartAdjustment,
+     data: dataProp,
+     dataKey,
+     dataVersion,
+@@ -7351,6 +7545,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+     renderItem,
+     rtl,
+     snapToIndices,
++    sizeComponentInternal,
+     stickyHeaderIndicesArr: stickyHeaderIndices != null ? stickyHeaderIndices : [],
+     stickyHeaderIndicesSet: useMemo(() => new Set(stickyHeaderIndices != null ? stickyHeaderIndices : []), [stickyHeaderIndices == null ? void 0 : stickyHeaderIndices.join(",")]),
+     stickyPositionComponentInternal,
+@@ -7402,6 +7597,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+       return void 0;
+     }
+     const resolvedOffset = (_a4 = initialScroll.contentOffset) != null ? _a4 : resolveInitialScrollOffset(ctx, initialScroll);
++    if (getContentInsetStartAdjustment(ctx) > 0) {
++      // With a native leading inset (transparent header + automatic insets),
++      // any mount-time contentOffset races UIKit's adjustedContentInset
++      // application. The gated initial-scroll dispatch positions the list once
++      // real sizes are known instead.
++      return void 0;
++    }
+     return usesBootstrapInitialScroll && ((_b2 = state.initialScrollSession) == null ? void 0 : _b2.kind) === "bootstrap" && Platform.OS === "web" ? void 0 : resolvedOffset;
+   }, [usesBootstrapInitialScroll]);
+   useLayoutEffect(() => {
+@@ -7526,6 +7728,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+     [
+       dataKey,
+       dataVersion,
++      contentInsetStartAdjustment,
+       memoizedLastItemKeys.join(","),
+       numColumnsProp,
+       nextScrollAxisGap,
+@@ -7622,6 +7825,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+     () => ({
+       getRenderedItem: (key) => getRenderedItem(ctx, key),
+       onMomentumScrollEnd: (event) => {
++        state.isMomentumScrolling = false;
+         checkFinishedScrollFallback(ctx);
+         if (state.props.onMomentumScrollEnd) {
+           state.props.onMomentumScrollEnd(event);
+@@ -7630,6 +7834,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+       onScroll: (event) => onScroll(ctx, event),
+       onScrollBeginDrag: (event) => {
+         var _a4, _b2;
++        ctx.state.didUserDrag = true;
++        ctx.state.isUserDragging = true;
+         prepareReachedEdgeForNextUserScroll(ctx);
+         (_b2 = (_a4 = state.props).onScrollBeginDrag) == null ? void 0 : _b2.call(_a4, event);
+       },
+@@ -7655,11 +7861,18 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+       ListFooterComponent,
+       ListFooterComponentStyle,
+       ListHeaderComponent,
++      onInternalMomentumScrollBegin: () => {
++        ctx.state.isMomentumScrolling = true;
++      },
+       onInternalScrollBeginDrag: fns.onScrollBeginDrag,
++      onInternalScrollEndDrag: () => {
++        ctx.state.isUserDragging = false;
++      },
+       onInternalScrollEnd: fns.onScrollEnd,
+       onLayout,
+       onLayoutFooter,
+       onMomentumScrollEnd: fns.onMomentumScrollEnd,
++      onScrollBeginDrag: fns.onScrollBeginDrag,
+       onScroll: onScrollHandler,
+       recycleItems,
+       refreshControl: refreshControlElement ? stylePaddingTopState > 0 ? React2.cloneElement(refreshControlElement, {
+diff --git a/react.js b/react.js
+index 914d2dafaafa001c9ab6791a0a0581659295e333..a2df18d450eebe451fda42bab47d1658458edbb1 100644
+--- a/react.js
++++ b/react.js
+@@ -4702,7 +4702,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
+       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);
++      const knownSizeBound = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
++      nextSize = hasUnknownTailSize ? Math.min(previousSize || 0, knownSizeBound) : knownSizeBound;
+     } else if (anchorIndex >= 0) {
+       isReady = false;
+     }
+@@ -4722,6 +4723,12 @@ function maybeUpdateAnchoredEndSpace(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 });
++  } else if (!isReady && didSizeChange && nextSize < (previousSize || 0)) {
++    set$(ctx, "anchoredEndSpaceSize", nextSize);
++    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
++    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
++      updateScroll(ctx, state.scroll, true, { markHasScrolled: false });
++    }
+   }
+   return nextSize;
+ }
+@@ -6446,8 +6453,8 @@ function ScrollAdjust() {
+               window.getComputedStyle(contentNode)[axis.paddingEndProp]
+             );
+             const temporaryPaddingEnd = `${(currentPaddingEnd || 0) + pad}px`;
+-            temporaryPaddingRef.current = { baseline: baselinePaddingEnd, value: temporaryPaddingEnd };
+             contentNode.style[axis.paddingEndProp] = temporaryPaddingEnd;
++            temporaryPaddingRef.current = { baseline: baselinePaddingEnd, value: contentNode.style[axis.paddingEndProp] };
+             void contentNode.offsetHeight;
+             scrollBy();
+             if (resetPaddingRafRef.current !== void 0) {
+diff --git a/react.mjs b/react.mjs
+index 95465f2ab89ce41a10553f58af83618f7310e83c..25cf046f2c3141ddce5a0b6e28c354b865331b4f 100644
+--- a/react.mjs
++++ b/react.mjs
+@@ -4681,7 +4681,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
+       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);
++      const knownSizeBound = Math.max(0, state.scrollLength - contentBelowAnchor - anchorOffset);
++      nextSize = hasUnknownTailSize ? Math.min(previousSize || 0, knownSizeBound) : knownSizeBound;
+     } else if (anchorIndex >= 0) {
+       isReady = false;
+     }
+@@ -4701,6 +4702,12 @@ function maybeUpdateAnchoredEndSpace(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 });
++  } else if (!isReady && didSizeChange && nextSize < (previousSize || 0)) {
++    set$(ctx, "anchoredEndSpaceSize", nextSize);
++    (_a3 = anchoredEndSpace == null ? void 0 : anchoredEndSpace.onSizeChanged) == null ? void 0 : _a3.call(anchoredEndSpace, nextSize);
++    if (anchoredEndSpace == null ? void 0 : anchoredEndSpace.includeInEndInset) {
++      updateScroll(ctx, state.scroll, true, { markHasScrolled: false });
++    }
+   }
+   return nextSize;
+ }
+@@ -6425,8 +6432,8 @@ function ScrollAdjust() {
+               window.getComputedStyle(contentNode)[axis.paddingEndProp]
+             );
+             const temporaryPaddingEnd = `${(currentPaddingEnd || 0) + pad}px`;
+-            temporaryPaddingRef.current = { baseline: baselinePaddingEnd, value: temporaryPaddingEnd };
+             contentNode.style[axis.paddingEndProp] = temporaryPaddingEnd;
++            temporaryPaddingRef.current = { baseline: baselinePaddingEnd, value: contentNode.style[axis.paddingEndProp] };
+             void contentNode.offsetHeight;
+             scrollBy();
+             if (resetPaddingRafRef.current !== void 0) {
+diff --git a/reanimated.d.ts b/reanimated.d.ts
+index e5043320700b12f34f4c0babbc341f85ca8135c1..2ce63830a28636b21937a0741fd0e613dae950fe 100644
+--- a/reanimated.d.ts
++++ b/reanimated.d.ts
+@@ -294,6 +294,12 @@ interface LegendListSpecificProps<ItemT, TItemType extends string | undefined> {
+      * The adjustment is also rendered as real content padding so the browser scroll range includes it.
+      */
+     contentInsetEndAdjustment?: number;
++    /**
++     * Width/height of a leading content inset applied natively outside the list's knowledge
++     * (e.g. iOS contentInsetAdjustmentBehavior="automatic" under a transparent header).
++     * Programmatic scrolls clamp to -adjustment instead of 0 so content can rest below the header.
++     */
++    contentInsetStartAdjustment?: number;
+     /**
+      * Number of columns to render items in.
+      * @default 1
+diff --git a/reanimated.js b/reanimated.js
+index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..9c5f560320ab47f5eeb73f44fbdcf332ba831558 100644
+--- a/reanimated.js
++++ b/reanimated.js
+@@ -115,8 +115,10 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
+   const { id, horizontal, style, refView, children, recycleItems, layoutTransition, ...rest } = props;
+   const [positionValue = POSITION_OUT_OF_VIEW] = useArr$([`containerPosition${id}`]);
+   const prevItemKeyRef = React__namespace.useRef(void 0);
++  const previousPositionRef = React__namespace.useRef(positionValue);
++  const lastContentSizeEpochRef = React__namespace.useRef(ctx.state.contentSizeAnimationEpoch || 0);
+   let shouldSkipTransitionForRecycleReuse = false;
+-  if (recycleItems && layoutTransition) {
++  if (layoutTransition) {
+     const itemKeySignal = `containerItemKey${id}`;
+     const itemKey = peek$(ctx, itemKeySignal);
+     shouldSkipTransitionForRecycleReuse = itemKey !== void 0 && prevItemKeyRef.current !== void 0 && prevItemKeyRef.current !== itemKey;
+@@ -130,10 +132,29 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
+     () => [style, horizontal ? { left: positionValue } : { top: positionValue }],
+     [horizontal, positionValue, style]
+   );
++  // Two kinds of repositions must not animate: (1) MVCP size adjustments,
++  // which are compensated by an equal contentOffset shift so the row should
++  // not visibly move — animating turns the invisible correction into a
++  // lurch-and-settle; (2) any reposition while the user is actively
++  // scrolling, where rows shifting under the finger reads as jank. The
++  // transition exists to smooth at-rest shifts (streaming text, work-log
++  // folds), so gate it to at-rest moments.
++  const now = Date.now();
++  const contentSizeEpoch = ctx.state.contentSizeAnimationEpoch || 0;
++  const didPositionChange = positionValue !== previousPositionRef.current;
++  const isRawSizeReposition = didPositionChange && contentSizeEpoch !== lastContentSizeEpochRef.current && ctx.state.contentSizeAnimationEligible && !!layoutTransition && typeof layoutTransition.getAnimationAndConfig === "function";
++  React__namespace.useLayoutEffect(() => {
++    if (didPositionChange) {
++      previousPositionRef.current = positionValue;
++      lastContentSizeEpochRef.current = contentSizeEpoch;
++    }
++  }, [contentSizeEpoch, didPositionChange, positionValue]);
++  const isRecentNativeReposition = now - (ctx.state.lastNativeScrollTime || 0) < 300;
++  const shouldSkipLayoutTransition = now - (ctx.state.lastMVCPAdjustTime || 0) < 300 || ctx.state.isUserDragging || ctx.state.isMomentumScrolling || isRecentNativeReposition && !isRawSizeReposition;
+   return /* @__PURE__ */ React__namespace.createElement(
+     Reanimated__default.default.View,
+     {
+-      layout: shouldSkipTransitionForRecycleReuse ? void 0 : layoutTransition,
++      layout: shouldSkipTransitionForRecycleReuse || shouldSkipLayoutTransition ? void 0 : layoutTransition,
+       ref: refView,
+       style: viewStyle,
+       ...rest
+@@ -141,6 +162,93 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
+     children
+   );
+ });
++var ReanimatedSizeView = typedMemo(function ReanimatedSizeViewComponent(props) {
++  const ctx = useStateContext();
++  const { horizontal, signalName, style, children, ...rest } = props;
++  const [logicalSize = 0] = useArr$(signalName === "totalSize" ? [signalName] : [signalName, "totalSize"]);
++  const baseSize = Reanimated.useSharedValue(logicalSize);
++  const animatedDelta = Reanimated.useSharedValue(0);
++  const previousLogicalSizeRef = React__namespace.useRef(logicalSize);
++  const previousEpochRef = React__namespace.useRef(ctx.state.contentSizeAnimationEpoch || 0);
++  const animationRunRef = React__namespace.useRef(0);
++  const isAnimatingRef = React__namespace.useRef(false);
++  const transition = props.layoutTransition;
++  const canAnimate = !!transition && typeof transition.getAnimationAndConfig === "function";
++  const renderEpoch = ctx.state.contentSizeAnimationEpoch || 0;
++  // Keep the animated size attached after transitions finish. Reanimated
++  // retains removed animated props, so switching to a static size leaves
++  // native scroll bounds stuck while logical measurements keep changing.
++  const animatedStyle = Reanimated.useAnimatedStyle(() => {
++    const size = Math.max(0, baseSize.value + animatedDelta.value);
++    return horizontal ? { width: size } : { height: size };
++  }, [horizontal]);
++  const completeAnimation = React__namespace.useCallback((run, epoch) => {
++    if (animationRunRef.current !== run) {
++      return;
++    }
++    isAnimatingRef.current = false;
++    const state = ctx.state;
++    if (state.contentSizeAnimationActiveEpoch !== epoch) {
++      return;
++    }
++    state.contentSizeAnimationActiveSignals.delete(signalName);
++    if (state.contentSizeAnimationActiveSignals.size === 0) {
++      state.contentSizeAnimationActiveEpoch = void 0;
++      state.contentSizeAnimationEligible = false;
++    }
++  }, [ctx.state, signalName]);
++  React__namespace.useLayoutEffect(() => {
++    const state = ctx.state;
++    const epoch = state.contentSizeAnimationEpoch || 0;
++    const previousLogicalSize = previousLogicalSizeRef.current;
++    const delta = logicalSize - previousLogicalSize;
++    const isNewEpoch = epoch !== previousEpochRef.current;
++    const isNewEligibleEpoch = canAnimate && isNewEpoch && state.contentSizeAnimationEligible;
++    previousLogicalSizeRef.current = logicalSize;
++    previousEpochRef.current = epoch;
++    if (!delta) {
++      return;
++    }
++    if (!isNewEligibleEpoch) {
++      baseSize.value = logicalSize;
++      if (signalName === "totalSize" && isNewEpoch && state.contentSizeAnimationEligible && !canAnimate) {
++        state.contentSizeAnimationEligible = false;
++      }
++      return;
++    }
++    const [animation, config] = transition.getAnimationAndConfig();
++    const delayFunction = typeof transition.getDelayFunction === "function" ? transition.getDelayFunction() : (_, value) => value;
++    const delay = typeof transition.getDelay === "function" ? transition.getDelay() : 0;
++    if (typeof animation !== "function" || typeof delayFunction !== "function") {
++      baseSize.value = logicalSize;
++      if (signalName === "totalSize") {
++        state.contentSizeAnimationEligible = false;
++      }
++      return;
++    }
++    if (state.contentSizeAnimationActiveEpoch !== epoch) {
++      state.contentSizeAnimationActiveEpoch = epoch;
++      state.contentSizeAnimationActiveSignals = /* @__PURE__ */ new Set();
++    }
++    state.contentSizeAnimationActiveSignals.add(signalName);
++    const wasAnimating = isAnimatingRef.current;
++    isAnimatingRef.current = true;
++    const run = ++animationRunRef.current;
++    Reanimated.runOnUI((absoluteSize, previousSize, continuesAnimation, animationRun, animationEpoch) => {
++      "worklet";
++      const currentVisualSize = continuesAnimation ? baseSize.value + animatedDelta.value : previousSize;
++      baseSize.value = absoluteSize;
++      animatedDelta.value = currentVisualSize - absoluteSize;
++      animatedDelta.value = delayFunction(delay, animation(0, config, (finished) => {
++        "worklet";
++        if (finished) {
++          Reanimated.runOnJS(completeAnimation)(animationRun, animationEpoch);
++        }
++      }));
++    })(logicalSize, previousLogicalSize, wasAnimating, run, epoch);
++  }, [baseSize, animatedDelta, canAnimate, completeAnimation, ctx.state, logicalSize, renderEpoch, signalName, transition]);
++  return /* @__PURE__ */ React__namespace.createElement(Reanimated__default.default.View, { ...rest, style: [style, animatedStyle] }, children);
++});
+ function setSharedValueValue(sharedValue, value) {
+   if (!sharedValue) {
+     return;
+@@ -245,10 +353,19 @@ var LegendListForwardedRef = typedMemo(
+         );
+       };
+     }, [hasItemLayoutAnimation, recycleItems]);
++    const sizeComponentInternal = React__namespace.useMemo(() => {
++      if (!hasItemLayoutAnimation) {
++        return void 0;
++      }
++      return function SizeComponent(sizeProps) {
++        return /* @__PURE__ */ React__namespace.createElement(ReanimatedSizeView, { ...sizeProps, layoutTransition: itemLayoutAnimationRef.current });
++      };
++    }, [hasItemLayoutAnimation]);
+     const legendListProps = {
+       ...rest,
+       positionComponentInternal,
+       recycleItems,
++      sizeComponentInternal,
+       ...{
+         renderScrollComponent: renderReanimatedScrollComponent,
+         ...IsNewArchitecture ? { stickyPositionComponentInternal } : {}
+diff --git a/reanimated.mjs b/reanimated.mjs
+index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..cab29fd2a513470175baf2ac930772c7d9275642 100644
+--- a/reanimated.mjs
++++ b/reanimated.mjs
+@@ -1,7 +1,7 @@
+ import * as React from 'react';
+ import { useCallback } from 'react';
+ import { View } from 'react-native';
+-import Reanimated, { useAnimatedRef, useAnimatedStyle, useSharedValue, useScrollViewOffset } from 'react-native-reanimated';
++import Reanimated, { runOnJS, runOnUI, useAnimatedRef, useAnimatedStyle, useSharedValue, useScrollViewOffset } from 'react-native-reanimated';
+ import { internal, LegendList } from '@legendapp/list/react-native';
+ 
+ // src/integrations/reanimated.tsx
+@@ -91,8 +91,10 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
+   const { id, horizontal, style, refView, children, recycleItems, layoutTransition, ...rest } = props;
+   const [positionValue = POSITION_OUT_OF_VIEW] = useArr$([`containerPosition${id}`]);
+   const prevItemKeyRef = React.useRef(void 0);
++  const previousPositionRef = React.useRef(positionValue);
++  const lastContentSizeEpochRef = React.useRef(ctx.state.contentSizeAnimationEpoch || 0);
+   let shouldSkipTransitionForRecycleReuse = false;
+-  if (recycleItems && layoutTransition) {
++  if (layoutTransition) {
+     const itemKeySignal = `containerItemKey${id}`;
+     const itemKey = peek$(ctx, itemKeySignal);
+     shouldSkipTransitionForRecycleReuse = itemKey !== void 0 && prevItemKeyRef.current !== void 0 && prevItemKeyRef.current !== itemKey;
+@@ -106,10 +108,29 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
+     () => [style, horizontal ? { left: positionValue } : { top: positionValue }],
+     [horizontal, positionValue, style]
+   );
++  // Two kinds of repositions must not animate: (1) MVCP size adjustments,
++  // which are compensated by an equal contentOffset shift so the row should
++  // not visibly move — animating turns the invisible correction into a
++  // lurch-and-settle; (2) any reposition while the user is actively
++  // scrolling, where rows shifting under the finger reads as jank. The
++  // transition exists to smooth at-rest shifts (streaming text, work-log
++  // folds), so gate it to at-rest moments.
++  const now = Date.now();
++  const contentSizeEpoch = ctx.state.contentSizeAnimationEpoch || 0;
++  const didPositionChange = positionValue !== previousPositionRef.current;
++  const isRawSizeReposition = didPositionChange && contentSizeEpoch !== lastContentSizeEpochRef.current && ctx.state.contentSizeAnimationEligible && !!layoutTransition && typeof layoutTransition.getAnimationAndConfig === "function";
++  React.useLayoutEffect(() => {
++    if (didPositionChange) {
++      previousPositionRef.current = positionValue;
++      lastContentSizeEpochRef.current = contentSizeEpoch;
++    }
++  }, [contentSizeEpoch, didPositionChange, positionValue]);
++  const isRecentNativeReposition = now - (ctx.state.lastNativeScrollTime || 0) < 300;
++  const shouldSkipLayoutTransition = now - (ctx.state.lastMVCPAdjustTime || 0) < 300 || ctx.state.isUserDragging || ctx.state.isMomentumScrolling || isRecentNativeReposition && !isRawSizeReposition;
+   return /* @__PURE__ */ React.createElement(
+     Reanimated.View,
+     {
+-      layout: shouldSkipTransitionForRecycleReuse ? void 0 : layoutTransition,
++      layout: shouldSkipTransitionForRecycleReuse || shouldSkipLayoutTransition ? void 0 : layoutTransition,
+       ref: refView,
+       style: viewStyle,
+       ...rest
+@@ -117,6 +138,93 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
+     children
+   );
+ });
++var ReanimatedSizeView = typedMemo(function ReanimatedSizeViewComponent(props) {
++  const ctx = useStateContext();
++  const { horizontal, signalName, style, children, ...rest } = props;
++  const [logicalSize = 0] = useArr$(signalName === "totalSize" ? [signalName] : [signalName, "totalSize"]);
++  const baseSize = useSharedValue(logicalSize);
++  const animatedDelta = useSharedValue(0);
++  const previousLogicalSizeRef = React.useRef(logicalSize);
++  const previousEpochRef = React.useRef(ctx.state.contentSizeAnimationEpoch || 0);
++  const animationRunRef = React.useRef(0);
++  const isAnimatingRef = React.useRef(false);
++  const transition = props.layoutTransition;
++  const canAnimate = !!transition && typeof transition.getAnimationAndConfig === "function";
++  const renderEpoch = ctx.state.contentSizeAnimationEpoch || 0;
++  // Keep the animated size attached after transitions finish. Reanimated
++  // retains removed animated props, so switching to a static size leaves
++  // native scroll bounds stuck while logical measurements keep changing.
++  const animatedStyle = useAnimatedStyle(() => {
++    const size = Math.max(0, baseSize.value + animatedDelta.value);
++    return horizontal ? { width: size } : { height: size };
++  }, [horizontal]);
++  const completeAnimation = useCallback((run, epoch) => {
++    if (animationRunRef.current !== run) {
++      return;
++    }
++    isAnimatingRef.current = false;
++    const state = ctx.state;
++    if (state.contentSizeAnimationActiveEpoch !== epoch) {
++      return;
++    }
++    state.contentSizeAnimationActiveSignals.delete(signalName);
++    if (state.contentSizeAnimationActiveSignals.size === 0) {
++      state.contentSizeAnimationActiveEpoch = void 0;
++      state.contentSizeAnimationEligible = false;
++    }
++  }, [ctx.state, signalName]);
++  React.useLayoutEffect(() => {
++    const state = ctx.state;
++    const epoch = state.contentSizeAnimationEpoch || 0;
++    const previousLogicalSize = previousLogicalSizeRef.current;
++    const delta = logicalSize - previousLogicalSize;
++    const isNewEpoch = epoch !== previousEpochRef.current;
++    const isNewEligibleEpoch = canAnimate && isNewEpoch && state.contentSizeAnimationEligible;
++    previousLogicalSizeRef.current = logicalSize;
++    previousEpochRef.current = epoch;
++    if (!delta) {
++      return;
++    }
++    if (!isNewEligibleEpoch) {
++      baseSize.value = logicalSize;
++      if (signalName === "totalSize" && isNewEpoch && state.contentSizeAnimationEligible && !canAnimate) {
++        state.contentSizeAnimationEligible = false;
++      }
++      return;
++    }
++    const [animation, config] = transition.getAnimationAndConfig();
++    const delayFunction = typeof transition.getDelayFunction === "function" ? transition.getDelayFunction() : (_, value) => value;
++    const delay = typeof transition.getDelay === "function" ? transition.getDelay() : 0;
++    if (typeof animation !== "function" || typeof delayFunction !== "function") {
++      baseSize.value = logicalSize;
++      if (signalName === "totalSize") {
++        state.contentSizeAnimationEligible = false;
++      }
++      return;
++    }
++    if (state.contentSizeAnimationActiveEpoch !== epoch) {
++      state.contentSizeAnimationActiveEpoch = epoch;
++      state.contentSizeAnimationActiveSignals = /* @__PURE__ */ new Set();
++    }
++    state.contentSizeAnimationActiveSignals.add(signalName);
++    const wasAnimating = isAnimatingRef.current;
++    isAnimatingRef.current = true;
++    const run = ++animationRunRef.current;
++    runOnUI((absoluteSize, previousSize, continuesAnimation, animationRun, animationEpoch) => {
++      "worklet";
++      const currentVisualSize = continuesAnimation ? baseSize.value + animatedDelta.value : previousSize;
++      baseSize.value = absoluteSize;
++      animatedDelta.value = currentVisualSize - absoluteSize;
++      animatedDelta.value = delayFunction(delay, animation(0, config, (finished) => {
++        "worklet";
++        if (finished) {
++          runOnJS(completeAnimation)(animationRun, animationEpoch);
++        }
++      }));
++    })(logicalSize, previousLogicalSize, wasAnimating, run, epoch);
++  }, [baseSize, animatedDelta, canAnimate, completeAnimation, ctx.state, logicalSize, renderEpoch, signalName, transition]);
++  return /* @__PURE__ */ React.createElement(Reanimated.View, { ...rest, style: [style, animatedStyle] }, children);
++});
+ function setSharedValueValue(sharedValue, value) {
+   if (!sharedValue) {
+     return;
+@@ -221,10 +329,19 @@ var LegendListForwardedRef = typedMemo(
+         );
+       };
+     }, [hasItemLayoutAnimation, recycleItems]);
++    const sizeComponentInternal = React.useMemo(() => {
++      if (!hasItemLayoutAnimation) {
++        return void 0;
++      }
++      return function SizeComponent(sizeProps) {
++        return /* @__PURE__ */ React.createElement(ReanimatedSizeView, { ...sizeProps, layoutTransition: itemLayoutAnimationRef.current });
++      };
++    }, [hasItemLayoutAnimation]);
+     const legendListProps = {
+       ...rest,
+       positionComponentInternal,
+       recycleItems,
++      sizeComponentInternal,
+       ...{
+         renderScrollComponent: renderReanimatedScrollComponent,
+         ...IsNewArchitecture ? { stickyPositionComponentInternal } : {}

From fa0926df49f6325f9407f4a6748f5d46128fb199 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius@mac.lan>
Date: Tue, 1 Sep 2026 03:01:41 -0700
Subject: [PATCH 4/8] fix(mobile): preserve position during first disclosure
 expansion

---
 .../src/features/threads/ThreadFeed.tsx       |  18 +-
 .../threads/thread-feed-live-follow.test.ts   |  11 +
 .../threads/thread-feed-live-follow.ts        |   4 +-
 patches/@legendapp__list@3.3.5.patch          | 224 ++++++++++++------
 pnpm-lock.yaml                                |  10 +-
 5 files changed, 181 insertions(+), 86 deletions(-)

diff --git a/apps/mobile/src/features/threads/ThreadFeed.tsx b/apps/mobile/src/features/threads/ThreadFeed.tsx
index 8234a3c44f43..d61153c812e8 100644
--- a/apps/mobile/src/features/threads/ThreadFeed.tsx
+++ b/apps/mobile/src/features/threads/ThreadFeed.tsx
@@ -1838,12 +1838,12 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
   // Live-follow latch. LegendList's maintainScrollAtEnd alone re-pins the feed
   // whenever the viewport drifts back inside its geometric threshold, which
   // yanked users off history they were reading every time a stream chunk grew
-  // a row. Follow breaks when the user scrolls up and away, and re-arms only
-  // when the list actually returns to the end (or on send / thread switch).
+  // a row. Scrolling away or expanding a disclosure above the end breaks
+  // follow; reaching the end (or sending / switching threads) re-arms it.
   const [endFollowEnabled, setEndFollowEnabled] = useState(true);
   const endFollowEnabledRef = useRef(true);
   // A "user scroll session" spans from drag start through the end of its
-  // momentum; only motion inside a session can break follow, so MVCP
+  // momentum; scroll events only break follow inside that session, so MVCP
   // compensations and programmatic scrolls never strand a follower.
   const userScrollSessionRef = useRef(false);
   const setEndFollow = useCallback(
@@ -2271,13 +2271,23 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
     }
     disclosureSettleFrameRef.current = requestAnimationFrame(() => {
       disclosureSettleSecondFrameRef.current = requestAnimationFrame(() => {
+        // A disclosure can leave the reader above the end without a drag.
+        // Reconcile follow before a later layout or resume can re-pin it.
+        const listState = props.listRef.current?.getState();
+        if (listState) {
+          transitionEndFollow({
+            type: "disclosure-settled",
+            isAtEnd: listState.isAtEnd,
+            userScrollSessionActive: userScrollSessionRef.current,
+          });
+        }
         disclosureAnchorKeyRef.current = null;
         setDisclosureToggleSettling(false);
         disclosureSettleFrameRef.current = null;
         disclosureSettleSecondFrameRef.current = null;
       });
     });
-  }, []);
+  }, [props.listRef, transitionEndFollow]);
 
   const suspendEndScrollMaintenanceForDisclosure = useCallback((anchorKey: string | null) => {
     disclosureAnchorKeyRef.current = anchorKey;
diff --git a/apps/mobile/src/features/threads/thread-feed-live-follow.test.ts b/apps/mobile/src/features/threads/thread-feed-live-follow.test.ts
index 2ea207923429..b77600805876 100644
--- a/apps/mobile/src/features/threads/thread-feed-live-follow.test.ts
+++ b/apps/mobile/src/features/threads/thread-feed-live-follow.test.ts
@@ -102,6 +102,17 @@ describe("resolveThreadFeedLiveFollow", () => {
     ).toBe(false);
   });
 
+  it.each([
+    { isAtEnd: false, userScrollSessionActive: false, expected: false },
+    { isAtEnd: true, userScrollSessionActive: false, expected: true },
+    { isAtEnd: false, userScrollSessionActive: true, expected: false },
+    { isAtEnd: true, userScrollSessionActive: true, expected: false },
+  ])("reconciles follow after a disclosure settles: %j", ({ expected, ...state }) => {
+    expect(resolveThreadFeedLiveFollow(!expected, { type: "disclosure-settled", ...state })).toBe(
+      expected,
+    );
+  });
+
   it("re-arms at the actual end only after the user scroll session ends", () => {
     expect(
       resolveThreadFeedLiveFollow(false, {
diff --git a/apps/mobile/src/features/threads/thread-feed-live-follow.ts b/apps/mobile/src/features/threads/thread-feed-live-follow.ts
index 312fd67473e5..83d5cc22faed 100644
--- a/apps/mobile/src/features/threads/thread-feed-live-follow.ts
+++ b/apps/mobile/src/features/threads/thread-feed-live-follow.ts
@@ -7,7 +7,7 @@ export type ThreadFeedLiveFollowEvent =
       readonly userScrollSessionActive: boolean;
     }
   | {
-      readonly type: "scroll";
+      readonly type: "scroll" | "disclosure-settled";
       readonly isAtEnd: boolean;
       readonly userScrollSessionActive: boolean;
     };
@@ -41,6 +41,8 @@ export function resolveThreadFeedLiveFollow(
       return false;
     case "user-scroll-end":
       return event.userScrollSessionActive ? event.isAtEnd : current;
+    case "disclosure-settled":
+      return !event.userScrollSessionActive && event.isAtEnd;
     case "scroll":
       if (event.userScrollSessionActive) {
         return false;
diff --git a/patches/@legendapp__list@3.3.5.patch b/patches/@legendapp__list@3.3.5.patch
index 35cc58ac2bc2..2fea500e1bde 100644
--- a/patches/@legendapp__list@3.3.5.patch
+++ b/patches/@legendapp__list@3.3.5.patch
@@ -241,10 +241,35 @@ index ce1fe00001c9e5aee6c6ea8bb2d4757d4586d002..3ccf6f16067152dfcb0c143371e2ec6a
       * Number of columns to render items in.
       * @default 1
 diff --git a/react-native.js b/react-native.js
-index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c3ffe83af 100644
+index b3c5a306b293f797a8b338adfca3060c0f6db22b..24d0763aef074411eb7d17f0feb8df752a843de0 100644
 --- a/react-native.js
 +++ b/react-native.js
-@@ -954,7 +954,7 @@ function setInitialRenderState(ctx, {
+@@ -717,6 +717,15 @@ function hasActiveInitialScroll(state) {
+   return !!(state == null ? void 0 : state.initialScroll) && !state.didFinishInitialScroll;
+ }
+
++// Size-only changes may not emit a scroll event to refresh the edge signal.
++function getIsAtEnd(ctx, contentSize = getContentSize(ctx)) {
++  const { queuedInitialLayout, scroll, scrollLength } = ctx.state;
++  if (!(contentSize > 0 && queuedInitialLayout)) {
++    return peek$(ctx, "isAtEnd");
++  }
++  return contentSize < scrollLength || contentSize - scroll - scrollLength - getContentInsetEnd(ctx) <= EDGE_POSITION_EPSILON;
++}
++
+ // src/utils/checkAtBottom.ts
+ function checkAtBottom(ctx, allowedEdge, allowGateCreatedInCurrentCheck) {
+   var _a3;
+@@ -737,7 +746,7 @@ function checkAtBottom(ctx, allowedEdge, allowGateCreatedInCurrentCheck) {
+     const insetEnd = getContentInsetEnd(ctx);
+     const distanceFromEnd = contentSize - scroll - scrollLength - insetEnd;
+     const isContentLess = contentSize < scrollLength;
+-    set$(ctx, "isAtEnd", isContentLess || distanceFromEnd <= EDGE_POSITION_EPSILON);
++    set$(ctx, "isAtEnd", getIsAtEnd(ctx, contentSize));
+     set$(ctx, "isNearEnd", isContentLess || distanceFromEnd <= onEndReachedThreshold * scrollLength);
+     set$(
+       ctx,
+@@ -954,7 +963,7 @@ function setInitialRenderState(ctx, {
    if (didInitialScroll) {
      state.didFinishInitialScroll = true;
    }
@@ -253,7 +278,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
    if (isReadyToRender && !peek$(ctx, "readyToRender")) {
      set$(ctx, "readyToRender", true);
      setAdaptiveRender(ctx, "normal", "ready");
-@@ -1090,7 +1090,7 @@ function getRawContentLength(ctx) {
+@@ -1090,7 +1099,7 @@ function getRawContentLength(ctx) {
  function getAlignItemsAtEndPadding(ctx) {
    const { state } = ctx;
    const shouldPad = !!state.props.alignItemsAtEndPaddingEnabled && !state.props.horizontal && state.props.data.length > 0 && state.scrollLength > 0;
@@ -262,7 +287,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
  }
  function updateContentMetricsState(ctx) {
    const previousPadding = peek$(ctx, "alignItemsAtEndPadding") || 0;
-@@ -1115,6 +1115,10 @@ function addTotalSize(ctx, key, add, notifyTotalSize = true) {
+@@ -1115,6 +1124,10 @@ function addTotalSize(ctx, key, add, notifyTotalSize = true) {
      totalSize += add;
    }
    if (prevTotalSize !== totalSize) {
@@ -273,7 +298,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
      if (!IsNewArchitecture && state.initialScroll && totalSize < prevTotalSize) {
        state.pendingTotalSize = totalSize;
      } else {
-@@ -1304,18 +1308,23 @@ function calculateOffsetWithOffsetPosition(ctx, offsetParam, params) {
+@@ -1304,18 +1317,23 @@ function calculateOffsetWithOffsetPosition(ctx, offsetParam, params) {
  }
  
  // src/core/clampScrollOffset.ts
@@ -299,7 +324,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
    return clampedOffset;
  }
  
-@@ -1451,10 +1460,10 @@ function checkFinishedScrollFrame(ctx) {
+@@ -1451,10 +1469,10 @@ function checkFinishedScrollFrame(ctx) {
      finishScrollTo(ctx);
    }
  }
@@ -312,7 +337,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
      x: ctx.state.props.horizontal ? offset : 0,
      y: ctx.state.props.horizontal ? 0 : offset
    });
-@@ -1503,7 +1512,10 @@ function checkFinishedScrollFallback(ctx) {
+@@ -1503,7 +1521,10 @@ function checkFinishedScrollFallback(ctx) {
          );
          scheduleFallbackCheck(SILENT_INITIAL_SCROLL_RETRY_DELAY_MS);
        } else if (shouldRetryUnalignedEndScroll) {
@@ -324,7 +349,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
          scheduleFallbackCheck(100);
        } else if (shouldFinishZeroTarget || shouldFinishAfterObservedScroll || canFinishInitialScrollWithoutNativeProgress || canFinishAfterSilentNativeDispatch || numChecks > maxChecks) {
          finishScrollTo(ctx);
-@@ -1560,15 +1572,28 @@ function doMaintainScrollAtEnd(ctx) {
+@@ -1560,15 +1581,28 @@ function doMaintainScrollAtEnd(ctx) {
    } = state;
    const isWithinMaintainScrollAtEndThreshold = peek$(ctx, "isWithinMaintainScrollAtEndThreshold");
    const shouldMaintainScrollAtEnd = !!(isWithinMaintainScrollAtEndThreshold && maintainScrollAtEnd && didContainersLayout);
@@ -354,7 +379,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
      }
      if (!state.maintainingScrollAtEnd) {
        const pendingState = maintainScrollAtEnd.animated ? "pending-animated" : "pending-instant";
-@@ -1591,9 +1616,18 @@ function doMaintainScrollAtEnd(ctx) {
+@@ -1591,9 +1625,18 @@ function doMaintainScrollAtEnd(ctx) {
                y: 0
              });
            } else {
@@ -376,7 +401,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
            }
            setTimeout(
              () => {
-@@ -1624,6 +1658,10 @@ function doMaintainScrollAtEnd(ctx) {
+@@ -1624,6 +1667,10 @@ function doMaintainScrollAtEnd(ctx) {
  function requestAdjust(ctx, positionDiff, dataChanged) {
    const state = ctx.state;
    if (Math.abs(positionDiff) > 0.1) {
@@ -387,7 +412,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
      const needsScrollWorkaround = Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
      const doit = () => {
        if (needsScrollWorkaround) {
-@@ -1728,7 +1766,9 @@ function getPredictedNativeClamp(state, unresolvedAmount, totalSize) {
+@@ -1728,7 +1775,9 @@ function getPredictedNativeClamp(state, unresolvedAmount, totalSize) {
    if (Math.abs(unresolvedAmount) <= MVCP_POSITION_EPSILON) {
      return 0;
    }
@@ -398,7 +423,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
    const clampDelta = maxScroll - state.scroll;
    if (unresolvedAmount < 0) {
      return Math.max(unresolvedAmount, Math.min(0, clampDelta));
-@@ -1790,7 +1830,7 @@ function resolvePendingNativeMVCPAdjust(ctx, newScroll) {
+@@ -1790,7 +1839,7 @@ function resolvePendingNativeMVCPAdjust(ctx, newScroll) {
      settlePendingNativeMVCPAdjust(ctx, remainingAfterManual, nativeDelta);
      return true;
    }
@@ -407,7 +432,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
    const distanceToClamp = Math.abs(newScroll - expectedNativeClampScroll);
    const isAtExpectedNativeClamp = distanceToClamp <= NATIVE_END_CLAMP_EPSILON;
    if (isAtExpectedNativeClamp) {
-@@ -1923,7 +1963,7 @@ function prepareMVCP(ctx, dataChanged) {
+@@ -1923,7 +1972,7 @@ function prepareMVCP(ctx, dataChanged) {
              if (diff > 0) {
                diff = Math.max(0, totalSize - state.scroll - state.scrollLength);
              } else {
@@ -416,7 +441,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
                state.scroll = maxScroll;
                state.scrollPending = maxScroll;
                diff = 0;
-@@ -2320,8 +2360,121 @@ function scrollToIndex(ctx, {
+@@ -2320,8 +2369,121 @@ function scrollToIndex(ctx, {
  }
  
  // src/core/initialScroll.ts
@@ -538,7 +563,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
    const requestedIndex = target.index;
    const index = requestedIndex !== void 0 ? clampScrollIndex(requestedIndex, ctx.state.props.data.length) : void 0;
    const itemSize = getItemSizeAtIndex(ctx, index);
-@@ -2747,7 +2900,9 @@ function clearFinishedBootstrapInitialScrollTargetIfMovedAway(ctx) {
+@@ -2747,7 +2909,9 @@ function clearFinishedBootstrapInitialScrollTargetIfMovedAway(ctx) {
      return;
    }
    if (didFinishedInitialScrollMoveAwayFromTarget(ctx, initialScroll)) {
@@ -549,7 +574,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
      if (!shouldKeepEndTargetAlive) {
        if (shouldPreserveInitialScrollForFooterLayout(initialScroll)) {
          clearPendingInitialScrollFooterLayout(ctx, {
-@@ -4672,7 +4827,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
+@@ -4672,7 +4836,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
        contentBelowAnchor = Math.max(0, contentBelowAnchor - ctx.scrollAxisGap);
        contentBelowAnchor += (ctx.values.get("footerSize") || 0) + getStylePaddingEnd(state.props);
        isReady = !hasUnknownTailSize;
@@ -559,7 +584,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
      } else if (anchorIndex >= 0) {
        isReady = false;
      }
-@@ -4692,6 +4848,12 @@ function maybeUpdateAnchoredEndSpace(ctx) {
+@@ -4692,6 +4857,12 @@ function maybeUpdateAnchoredEndSpace(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 });
@@ -572,7 +597,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
    }
    return nextSize;
  }
-@@ -5715,6 +5877,7 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
+@@ -5715,6 +5886,7 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
    horizontal
  }) {
    const ctx = useStateContext();
@@ -580,7 +605,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
    const columnWrapperStyle = ctx.columnWrapperStyle;
    const animSize = useValue$("totalSize");
    const [readyToRender, numColumns, otherAxisSize = 0] = useArr$(["readyToRender", "numColumns", "otherAxisSize"]);
-@@ -5725,6 +5888,13 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
+@@ -5725,6 +5897,13 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
      opacity: isVisible ? 1 : 0,
      width: animSize
    } : { height: animSize, minWidth: otherAxisSize, opacity: isVisible ? 1 : 0 };
@@ -594,7 +619,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
    if (columnWrapperStyle) {
      const { columnGap, rowGap, gap } = columnWrapperStyle;
      const gapX = columnGap || gap || 0;
-@@ -5745,7 +5915,8 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
+@@ -5745,7 +5924,8 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
        }
      }
    }
@@ -604,7 +629,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
  });
  var Containers = typedMemo(function Containers2({
    freshDataTransitionEpoch,
-@@ -5896,7 +6067,12 @@ var StyleSheet = ReactNative.StyleSheet;
+@@ -5896,7 +6076,12 @@ var StyleSheet = ReactNative.StyleSheet;
  
  // src/components/ListComponent.tsx
  var AlignItemsAtEndSpacer = typedMemo(function AlignItemsAtEndSpacer2({ horizontal }) {
@@ -617,7 +642,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
    if (alignItemsAtEndPadding <= 0) {
      return null;
    }
-@@ -5929,8 +6105,12 @@ var ListComponent = typedMemo(function ListComponent2({
+@@ -5929,8 +6114,12 @@ var ListComponent = typedMemo(function ListComponent2({
    refScrollView,
    renderScrollComponent,
    onLayoutFooter,
@@ -630,7 +655,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
    scrollAdjustHandler,
    snapToIndices,
    stickyHeaderConfig,
-@@ -6001,7 +6181,17 @@ var ListComponent = typedMemo(function ListComponent2({
+@@ -6001,7 +6190,17 @@ var ListComponent = typedMemo(function ListComponent2({
      SnapOrScroll,
      {
        ...rest,
@@ -649,7 +674,16 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
        contentContainerStyle: [
          horizontal ? { height: "100%" } : {},
          contentContainerStyle,
-@@ -7075,6 +7265,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -6751,7 +6950,7 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
+       endBuffered: state.endBuffered,
+       getAverageItemSizes: () => getAverageItemSizes(state),
+       indexByKey: (key) => state.indexByKey.get(key),
+-      isAtEnd: peek$(ctx, "isAtEnd"),
++      isAtEnd: getIsAtEnd(ctx),
+       isAtStart: peek$(ctx, "isAtStart"),
+       isEndReached: state.isEndReached,
+       isNearEnd: peek$(ctx, "isNearEnd"),
+@@ -7075,6 +7274,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
      dataVersion,
      drawDistance = 250,
      contentInsetEndAdjustment,
@@ -657,7 +691,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
      estimatedItemSize = 100,
      estimatedListSize,
      extraData,
-@@ -7132,10 +7323,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7132,10 +7332,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
    const animatedPropsInternal = props.animatedPropsInternal;
    const anchoredEndSpaceOwner = (_a3 = props.anchoredEndSpaceOwnerInternal) != null ? _a3 : "list";
    const positionComponentInternal = props.positionComponentInternal;
@@ -670,7 +704,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
      stickyPositionComponentInternal: _stickyPositionComponentInternal,
      ...restProps
    } = rest;
-@@ -7200,7 +7393,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7200,7 +7402,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
    const combinedRef = useCombinedRef(refScroller, refScrollView);
    const keyExtractor = keyExtractorProp != null ? keyExtractorProp : ((_item, index) => index.toString());
    const stickyHeaderIndices = stickyHeaderIndicesProp;
@@ -679,7 +713,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
    const previousContentInsetEndAdjustmentRef = React2.useRef(contentInsetEndAdjustmentResolved);
    const alwaysRenderIndices = React2.useMemo(() => {
      const indices = getAlwaysRenderIndices(alwaysRender, dataProp, keyExtractor, anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex);
-@@ -7341,6 +7534,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7341,6 +7543,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
      contentContainerAlignItems: contentContainerStyle.alignItems,
      contentInset,
      contentInsetEndAdjustment: contentInsetEndAdjustmentResolved,
@@ -687,7 +721,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
      data: dataProp,
      dataKey,
      dataVersion,
-@@ -7372,6 +7566,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7372,6 +7575,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
      renderItem,
      rtl,
      snapToIndices,
@@ -695,7 +729,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
      stickyHeaderIndicesArr: stickyHeaderIndices != null ? stickyHeaderIndices : [],
      stickyHeaderIndicesSet: React2.useMemo(() => new Set(stickyHeaderIndices != null ? stickyHeaderIndices : []), [stickyHeaderIndices == null ? void 0 : stickyHeaderIndices.join(",")]),
      stickyPositionComponentInternal,
-@@ -7423,6 +7618,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7423,6 +7627,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
        return void 0;
      }
      const resolvedOffset = (_a4 = initialScroll.contentOffset) != null ? _a4 : resolveInitialScrollOffset(ctx, initialScroll);
@@ -709,7 +743,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
      return usesBootstrapInitialScroll && ((_b2 = state.initialScrollSession) == null ? void 0 : _b2.kind) === "bootstrap" && Platform.OS === "web" ? void 0 : resolvedOffset;
    }, [usesBootstrapInitialScroll]);
    React2.useLayoutEffect(() => {
-@@ -7547,6 +7749,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7547,6 +7758,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
      [
        dataKey,
        dataVersion,
@@ -717,7 +751,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
        memoizedLastItemKeys.join(","),
        numColumnsProp,
        nextScrollAxisGap,
-@@ -7643,6 +7846,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7643,6 +7855,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
      () => ({
        getRenderedItem: (key) => getRenderedItem(ctx, key),
        onMomentumScrollEnd: (event) => {
@@ -725,7 +759,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
          checkFinishedScrollFallback(ctx);
          if (state.props.onMomentumScrollEnd) {
            state.props.onMomentumScrollEnd(event);
-@@ -7651,6 +7855,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7651,6 +7864,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
        onScroll: (event) => onScroll(ctx, event),
        onScrollBeginDrag: (event) => {
          var _a4, _b2;
@@ -734,7 +768,7 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
          prepareReachedEdgeForNextUserScroll(ctx);
          (_b2 = (_a4 = state.props).onScrollBeginDrag) == null ? void 0 : _b2.call(_a4, event);
        },
-@@ -7676,11 +7882,18 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7676,11 +7891,18 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
        ListFooterComponent,
        ListFooterComponentStyle,
        ListHeaderComponent,
@@ -754,10 +788,35 @@ index b3c5a306b293f797a8b338adfca3060c0f6db22b..eb51ff0c375d7e5bd3473fca83995c7c
        recycleItems,
        refreshControl: refreshControlElement ? stylePaddingTopState > 0 ? React2__namespace.cloneElement(refreshControlElement, {
 diff --git a/react-native.mjs b/react-native.mjs
-index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318d57e29dc 100644
+index 40e87cda8c9bc79a889e5542f29af429a24b24d4..90e0d1a9dfd07d0212aae308f547b9ff7e3ad022 100644
 --- a/react-native.mjs
 +++ b/react-native.mjs
-@@ -933,7 +933,7 @@ function setInitialRenderState(ctx, {
+@@ -696,6 +696,15 @@ function hasActiveInitialScroll(state) {
+   return !!(state == null ? void 0 : state.initialScroll) && !state.didFinishInitialScroll;
+ }
+
++// Size-only changes may not emit a scroll event to refresh the edge signal.
++function getIsAtEnd(ctx, contentSize = getContentSize(ctx)) {
++  const { queuedInitialLayout, scroll, scrollLength } = ctx.state;
++  if (!(contentSize > 0 && queuedInitialLayout)) {
++    return peek$(ctx, "isAtEnd");
++  }
++  return contentSize < scrollLength || contentSize - scroll - scrollLength - getContentInsetEnd(ctx) <= EDGE_POSITION_EPSILON;
++}
++
+ // src/utils/checkAtBottom.ts
+ function checkAtBottom(ctx, allowedEdge, allowGateCreatedInCurrentCheck) {
+   var _a3;
+@@ -716,7 +725,7 @@ function checkAtBottom(ctx, allowedEdge, allowGateCreatedInCurrentCheck) {
+     const insetEnd = getContentInsetEnd(ctx);
+     const distanceFromEnd = contentSize - scroll - scrollLength - insetEnd;
+     const isContentLess = contentSize < scrollLength;
+-    set$(ctx, "isAtEnd", isContentLess || distanceFromEnd <= EDGE_POSITION_EPSILON);
++    set$(ctx, "isAtEnd", getIsAtEnd(ctx, contentSize));
+     set$(ctx, "isNearEnd", isContentLess || distanceFromEnd <= onEndReachedThreshold * scrollLength);
+     set$(
+       ctx,
+@@ -933,7 +942,7 @@ function setInitialRenderState(ctx, {
    if (didInitialScroll) {
      state.didFinishInitialScroll = true;
    }
@@ -766,7 +825,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
    if (isReadyToRender && !peek$(ctx, "readyToRender")) {
      set$(ctx, "readyToRender", true);
      setAdaptiveRender(ctx, "normal", "ready");
-@@ -1069,7 +1069,7 @@ function getRawContentLength(ctx) {
+@@ -1069,7 +1078,7 @@ function getRawContentLength(ctx) {
  function getAlignItemsAtEndPadding(ctx) {
    const { state } = ctx;
    const shouldPad = !!state.props.alignItemsAtEndPaddingEnabled && !state.props.horizontal && state.props.data.length > 0 && state.scrollLength > 0;
@@ -775,7 +834,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
  }
  function updateContentMetricsState(ctx) {
    const previousPadding = peek$(ctx, "alignItemsAtEndPadding") || 0;
-@@ -1094,6 +1094,10 @@ function addTotalSize(ctx, key, add, notifyTotalSize = true) {
+@@ -1094,6 +1103,10 @@ function addTotalSize(ctx, key, add, notifyTotalSize = true) {
      totalSize += add;
    }
    if (prevTotalSize !== totalSize) {
@@ -786,7 +845,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
      if (!IsNewArchitecture && state.initialScroll && totalSize < prevTotalSize) {
        state.pendingTotalSize = totalSize;
      } else {
-@@ -1283,18 +1287,23 @@ function calculateOffsetWithOffsetPosition(ctx, offsetParam, params) {
+@@ -1283,18 +1296,23 @@ function calculateOffsetWithOffsetPosition(ctx, offsetParam, params) {
  }
  
  // src/core/clampScrollOffset.ts
@@ -812,7 +871,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
    return clampedOffset;
  }
  
-@@ -1430,10 +1439,10 @@ function checkFinishedScrollFrame(ctx) {
+@@ -1430,10 +1448,10 @@ function checkFinishedScrollFrame(ctx) {
      finishScrollTo(ctx);
    }
  }
@@ -825,7 +884,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
      x: ctx.state.props.horizontal ? offset : 0,
      y: ctx.state.props.horizontal ? 0 : offset
    });
-@@ -1482,7 +1491,10 @@ function checkFinishedScrollFallback(ctx) {
+@@ -1482,7 +1500,10 @@ function checkFinishedScrollFallback(ctx) {
          );
          scheduleFallbackCheck(SILENT_INITIAL_SCROLL_RETRY_DELAY_MS);
        } else if (shouldRetryUnalignedEndScroll) {
@@ -837,7 +896,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
          scheduleFallbackCheck(100);
        } else if (shouldFinishZeroTarget || shouldFinishAfterObservedScroll || canFinishInitialScrollWithoutNativeProgress || canFinishAfterSilentNativeDispatch || numChecks > maxChecks) {
          finishScrollTo(ctx);
-@@ -1539,15 +1551,28 @@ function doMaintainScrollAtEnd(ctx) {
+@@ -1539,15 +1560,28 @@ function doMaintainScrollAtEnd(ctx) {
    } = state;
    const isWithinMaintainScrollAtEndThreshold = peek$(ctx, "isWithinMaintainScrollAtEndThreshold");
    const shouldMaintainScrollAtEnd = !!(isWithinMaintainScrollAtEndThreshold && maintainScrollAtEnd && didContainersLayout);
@@ -867,7 +926,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
      }
      if (!state.maintainingScrollAtEnd) {
        const pendingState = maintainScrollAtEnd.animated ? "pending-animated" : "pending-instant";
-@@ -1570,9 +1595,18 @@ function doMaintainScrollAtEnd(ctx) {
+@@ -1570,9 +1604,18 @@ function doMaintainScrollAtEnd(ctx) {
                y: 0
              });
            } else {
@@ -889,7 +948,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
            }
            setTimeout(
              () => {
-@@ -1603,6 +1637,10 @@ function doMaintainScrollAtEnd(ctx) {
+@@ -1603,6 +1646,10 @@ function doMaintainScrollAtEnd(ctx) {
  function requestAdjust(ctx, positionDiff, dataChanged) {
    const state = ctx.state;
    if (Math.abs(positionDiff) > 0.1) {
@@ -900,7 +959,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
      const needsScrollWorkaround = Platform.OS === "android" && !IsNewArchitecture && dataChanged && state.scroll <= positionDiff;
      const doit = () => {
        if (needsScrollWorkaround) {
-@@ -1707,7 +1745,9 @@ function getPredictedNativeClamp(state, unresolvedAmount, totalSize) {
+@@ -1707,7 +1754,9 @@ function getPredictedNativeClamp(state, unresolvedAmount, totalSize) {
    if (Math.abs(unresolvedAmount) <= MVCP_POSITION_EPSILON) {
      return 0;
    }
@@ -911,7 +970,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
    const clampDelta = maxScroll - state.scroll;
    if (unresolvedAmount < 0) {
      return Math.max(unresolvedAmount, Math.min(0, clampDelta));
-@@ -1769,7 +1809,7 @@ function resolvePendingNativeMVCPAdjust(ctx, newScroll) {
+@@ -1769,7 +1818,7 @@ function resolvePendingNativeMVCPAdjust(ctx, newScroll) {
      settlePendingNativeMVCPAdjust(ctx, remainingAfterManual, nativeDelta);
      return true;
    }
@@ -920,7 +979,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
    const distanceToClamp = Math.abs(newScroll - expectedNativeClampScroll);
    const isAtExpectedNativeClamp = distanceToClamp <= NATIVE_END_CLAMP_EPSILON;
    if (isAtExpectedNativeClamp) {
-@@ -1902,7 +1942,7 @@ function prepareMVCP(ctx, dataChanged) {
+@@ -1902,7 +1951,7 @@ function prepareMVCP(ctx, dataChanged) {
              if (diff > 0) {
                diff = Math.max(0, totalSize - state.scroll - state.scrollLength);
              } else {
@@ -929,7 +988,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
                state.scroll = maxScroll;
                state.scrollPending = maxScroll;
                diff = 0;
-@@ -2299,8 +2339,121 @@ function scrollToIndex(ctx, {
+@@ -2299,8 +2348,121 @@ function scrollToIndex(ctx, {
  }
  
  // src/core/initialScroll.ts
@@ -1051,7 +1110,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
    const requestedIndex = target.index;
    const index = requestedIndex !== void 0 ? clampScrollIndex(requestedIndex, ctx.state.props.data.length) : void 0;
    const itemSize = getItemSizeAtIndex(ctx, index);
-@@ -2726,7 +2879,9 @@ function clearFinishedBootstrapInitialScrollTargetIfMovedAway(ctx) {
+@@ -2726,7 +2888,9 @@ function clearFinishedBootstrapInitialScrollTargetIfMovedAway(ctx) {
      return;
    }
    if (didFinishedInitialScrollMoveAwayFromTarget(ctx, initialScroll)) {
@@ -1062,7 +1121,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
      if (!shouldKeepEndTargetAlive) {
        if (shouldPreserveInitialScrollForFooterLayout(initialScroll)) {
          clearPendingInitialScrollFooterLayout(ctx, {
-@@ -4651,7 +4806,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
+@@ -4651,7 +4815,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
        contentBelowAnchor = Math.max(0, contentBelowAnchor - ctx.scrollAxisGap);
        contentBelowAnchor += (ctx.values.get("footerSize") || 0) + getStylePaddingEnd(state.props);
        isReady = !hasUnknownTailSize;
@@ -1072,7 +1131,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
      } else if (anchorIndex >= 0) {
        isReady = false;
      }
-@@ -4671,6 +4827,12 @@ function maybeUpdateAnchoredEndSpace(ctx) {
+@@ -4671,6 +4836,12 @@ function maybeUpdateAnchoredEndSpace(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 });
@@ -1085,7 +1144,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
    }
    return nextSize;
  }
-@@ -5694,6 +5856,7 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
+@@ -5694,6 +5865,7 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
    horizontal
  }) {
    const ctx = useStateContext();
@@ -1093,7 +1152,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
    const columnWrapperStyle = ctx.columnWrapperStyle;
    const animSize = useValue$("totalSize");
    const [readyToRender, numColumns, otherAxisSize = 0] = useArr$(["readyToRender", "numColumns", "otherAxisSize"]);
-@@ -5704,6 +5867,13 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
+@@ -5704,6 +5876,13 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
      opacity: isVisible ? 1 : 0,
      width: animSize
    } : { height: animSize, minWidth: otherAxisSize, opacity: isVisible ? 1 : 0 };
@@ -1107,7 +1166,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
    if (columnWrapperStyle) {
      const { columnGap, rowGap, gap } = columnWrapperStyle;
      const gapX = columnGap || gap || 0;
-@@ -5724,7 +5894,8 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
+@@ -5724,7 +5903,8 @@ var ContainersLayer = typedMemo(function ContainersLayer2({
        }
      }
    }
@@ -1117,7 +1176,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
  });
  var Containers = typedMemo(function Containers2({
    freshDataTransitionEpoch,
-@@ -5875,7 +6046,12 @@ var StyleSheet = StyleSheet$1;
+@@ -5875,7 +6055,12 @@ var StyleSheet = StyleSheet$1;
  
  // src/components/ListComponent.tsx
  var AlignItemsAtEndSpacer = typedMemo(function AlignItemsAtEndSpacer2({ horizontal }) {
@@ -1130,7 +1189,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
    if (alignItemsAtEndPadding <= 0) {
      return null;
    }
-@@ -5908,8 +6084,12 @@ var ListComponent = typedMemo(function ListComponent2({
+@@ -5908,8 +6093,12 @@ var ListComponent = typedMemo(function ListComponent2({
    refScrollView,
    renderScrollComponent,
    onLayoutFooter,
@@ -1143,7 +1202,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
    scrollAdjustHandler,
    snapToIndices,
    stickyHeaderConfig,
-@@ -5980,7 +6160,17 @@ var ListComponent = typedMemo(function ListComponent2({
+@@ -5980,7 +6169,17 @@ var ListComponent = typedMemo(function ListComponent2({
      SnapOrScroll,
      {
        ...rest,
@@ -1162,7 +1221,16 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
        contentContainerStyle: [
          horizontal ? { height: "100%" } : {},
          contentContainerStyle,
-@@ -7054,6 +7244,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -6730,7 +6929,7 @@ function createImperativeHandle(ctx, scheduleImperativeScrollCommit) {
+       endBuffered: state.endBuffered,
+       getAverageItemSizes: () => getAverageItemSizes(state),
+       indexByKey: (key) => state.indexByKey.get(key),
+-      isAtEnd: peek$(ctx, "isAtEnd"),
++      isAtEnd: getIsAtEnd(ctx),
+       isAtStart: peek$(ctx, "isAtStart"),
+       isEndReached: state.isEndReached,
+       isNearEnd: peek$(ctx, "isNearEnd"),
+@@ -7054,6 +7253,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
      dataVersion,
      drawDistance = 250,
      contentInsetEndAdjustment,
@@ -1170,7 +1238,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
      estimatedItemSize = 100,
      estimatedListSize,
      extraData,
-@@ -7111,10 +7302,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7111,10 +7311,12 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
    const animatedPropsInternal = props.animatedPropsInternal;
    const anchoredEndSpaceOwner = (_a3 = props.anchoredEndSpaceOwnerInternal) != null ? _a3 : "list";
    const positionComponentInternal = props.positionComponentInternal;
@@ -1183,7 +1251,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
      stickyPositionComponentInternal: _stickyPositionComponentInternal,
      ...restProps
    } = rest;
-@@ -7179,7 +7372,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7179,7 +7381,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
    const combinedRef = useCombinedRef(refScroller, refScrollView);
    const keyExtractor = keyExtractorProp != null ? keyExtractorProp : ((_item, index) => index.toString());
    const stickyHeaderIndices = stickyHeaderIndicesProp;
@@ -1192,7 +1260,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
    const previousContentInsetEndAdjustmentRef = useRef(contentInsetEndAdjustmentResolved);
    const alwaysRenderIndices = useMemo(() => {
      const indices = getAlwaysRenderIndices(alwaysRender, dataProp, keyExtractor, anchoredEndSpace == null ? void 0 : anchoredEndSpace.anchorIndex);
-@@ -7320,6 +7513,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7320,6 +7522,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
      contentContainerAlignItems: contentContainerStyle.alignItems,
      contentInset,
      contentInsetEndAdjustment: contentInsetEndAdjustmentResolved,
@@ -1200,7 +1268,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
      data: dataProp,
      dataKey,
      dataVersion,
-@@ -7351,6 +7545,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7351,6 +7554,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
      renderItem,
      rtl,
      snapToIndices,
@@ -1208,7 +1276,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
      stickyHeaderIndicesArr: stickyHeaderIndices != null ? stickyHeaderIndices : [],
      stickyHeaderIndicesSet: useMemo(() => new Set(stickyHeaderIndices != null ? stickyHeaderIndices : []), [stickyHeaderIndices == null ? void 0 : stickyHeaderIndices.join(",")]),
      stickyPositionComponentInternal,
-@@ -7402,6 +7597,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7402,6 +7606,13 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
        return void 0;
      }
      const resolvedOffset = (_a4 = initialScroll.contentOffset) != null ? _a4 : resolveInitialScrollOffset(ctx, initialScroll);
@@ -1222,7 +1290,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
      return usesBootstrapInitialScroll && ((_b2 = state.initialScrollSession) == null ? void 0 : _b2.kind) === "bootstrap" && Platform.OS === "web" ? void 0 : resolvedOffset;
    }, [usesBootstrapInitialScroll]);
    useLayoutEffect(() => {
-@@ -7526,6 +7728,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7526,6 +7737,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
      [
        dataKey,
        dataVersion,
@@ -1230,7 +1298,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
        memoizedLastItemKeys.join(","),
        numColumnsProp,
        nextScrollAxisGap,
-@@ -7622,6 +7825,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7622,6 +7834,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
      () => ({
        getRenderedItem: (key) => getRenderedItem(ctx, key),
        onMomentumScrollEnd: (event) => {
@@ -1238,7 +1306,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
          checkFinishedScrollFallback(ctx);
          if (state.props.onMomentumScrollEnd) {
            state.props.onMomentumScrollEnd(event);
-@@ -7630,6 +7834,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7630,6 +7843,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
        onScroll: (event) => onScroll(ctx, event),
        onScrollBeginDrag: (event) => {
          var _a4, _b2;
@@ -1247,7 +1315,7 @@ index 40e87cda8c9bc79a889e5542f29af429a24b24d4..700515b52c27a4ccd5343176121e7318
          prepareReachedEdgeForNextUserScroll(ctx);
          (_b2 = (_a4 = state.props).onScrollBeginDrag) == null ? void 0 : _b2.call(_a4, event);
        },
-@@ -7655,11 +7861,18 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
+@@ -7655,11 +7870,18 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
        ListFooterComponent,
        ListFooterComponentStyle,
        ListHeaderComponent,
@@ -1358,7 +1426,7 @@ index e5043320700b12f34f4c0babbc341f85ca8135c1..2ce63830a28636b21937a0741fd0e613
       * Number of columns to render items in.
       * @default 1
 diff --git a/reanimated.js b/reanimated.js
-index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..9c5f560320ab47f5eeb73f44fbdcf332ba831558 100644
+index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..fc03be2190c046f743ffde45ed189ee7868d0cec 100644
 --- a/reanimated.js
 +++ b/reanimated.js
 @@ -115,8 +115,10 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
@@ -1404,7 +1472,7 @@ index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..9c5f560320ab47f5eeb73f44fbdcf332
        ref: refView,
        style: viewStyle,
        ...rest
-@@ -141,6 +162,93 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
+@@ -141,6 +162,95 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
      children
    );
  });
@@ -1449,13 +1517,15 @@ index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..9c5f560320ab47f5eeb73f44fbdcf332
 +    const previousLogicalSize = previousLogicalSizeRef.current;
 +    const delta = logicalSize - previousLogicalSize;
 +    const isNewEpoch = epoch !== previousEpochRef.current;
-+    const isNewEligibleEpoch = canAnimate && isNewEpoch && state.contentSizeAnimationEligible;
++    // Retarget measurements received mid-animation, even in the same epoch.
++    // Updating only the base keeps the old delta and can shrink scroll bounds.
++    const shouldAnimate = canAnimate && (isAnimatingRef.current || isNewEpoch && state.contentSizeAnimationEligible);
 +    previousLogicalSizeRef.current = logicalSize;
 +    previousEpochRef.current = epoch;
 +    if (!delta) {
 +      return;
 +    }
-+    if (!isNewEligibleEpoch) {
++    if (!shouldAnimate) {
 +      baseSize.value = logicalSize;
 +      if (signalName === "totalSize" && isNewEpoch && state.contentSizeAnimationEligible && !canAnimate) {
 +        state.contentSizeAnimationEligible = false;
@@ -1498,7 +1568,7 @@ index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..9c5f560320ab47f5eeb73f44fbdcf332
  function setSharedValueValue(sharedValue, value) {
    if (!sharedValue) {
      return;
-@@ -245,10 +353,19 @@ var LegendListForwardedRef = typedMemo(
+@@ -245,10 +355,19 @@ var LegendListForwardedRef = typedMemo(
          );
        };
      }, [hasItemLayoutAnimation, recycleItems]);
@@ -1519,7 +1589,7 @@ index f1265fad74189591b5aae86cf2e3a31f9c0fdb02..9c5f560320ab47f5eeb73f44fbdcf332
          renderScrollComponent: renderReanimatedScrollComponent,
          ...IsNewArchitecture ? { stickyPositionComponentInternal } : {}
 diff --git a/reanimated.mjs b/reanimated.mjs
-index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..cab29fd2a513470175baf2ac930772c7d9275642 100644
+index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..6ab929250c8924e2d9919ee09a4f774238fbb90a 100644
 --- a/reanimated.mjs
 +++ b/reanimated.mjs
 @@ -1,7 +1,7 @@
@@ -1574,7 +1644,7 @@ index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..cab29fd2a513470175baf2ac930772c7
        ref: refView,
        style: viewStyle,
        ...rest
-@@ -117,6 +138,93 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
+@@ -117,6 +138,95 @@ var ReanimatedPositionView = typedMemo(function ReanimatedPositionViewComponent(
      children
    );
  });
@@ -1619,13 +1689,15 @@ index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..cab29fd2a513470175baf2ac930772c7
 +    const previousLogicalSize = previousLogicalSizeRef.current;
 +    const delta = logicalSize - previousLogicalSize;
 +    const isNewEpoch = epoch !== previousEpochRef.current;
-+    const isNewEligibleEpoch = canAnimate && isNewEpoch && state.contentSizeAnimationEligible;
++    // Retarget measurements received mid-animation, even in the same epoch.
++    // Updating only the base keeps the old delta and can shrink scroll bounds.
++    const shouldAnimate = canAnimate && (isAnimatingRef.current || isNewEpoch && state.contentSizeAnimationEligible);
 +    previousLogicalSizeRef.current = logicalSize;
 +    previousEpochRef.current = epoch;
 +    if (!delta) {
 +      return;
 +    }
-+    if (!isNewEligibleEpoch) {
++    if (!shouldAnimate) {
 +      baseSize.value = logicalSize;
 +      if (signalName === "totalSize" && isNewEpoch && state.contentSizeAnimationEligible && !canAnimate) {
 +        state.contentSizeAnimationEligible = false;
@@ -1668,7 +1740,7 @@ index 29a00d5dc084fd408a0e0a0a4d64e856d0ed1525..cab29fd2a513470175baf2ac930772c7
  function setSharedValueValue(sharedValue, value) {
    if (!sharedValue) {
      return;
-@@ -221,10 +329,19 @@ var LegendListForwardedRef = typedMemo(
+@@ -221,10 +331,19 @@ var LegendListForwardedRef = typedMemo(
          );
        };
      }, [hasItemLayoutAnimation, recycleItems]);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 155cceb9c9a4..262203a10002 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -86,7 +86,7 @@ patchedDependencies:
   '@effect/vitest@4.0.0-beta.103': a16b1e870d8c29e4a98b17cc4c638a4ff471753d8ca3487f78a22b759caf951b
   '@expo/metro-config@57.0.12': 96f1a75347e6ea02dc4b7034ace815d8ee39e18b8166ebfb573d9e58328f0dc2
   '@ff-labs/fff-node@0.9.4': ab9ff544009e1891cfe3930105862d3699007f38922a79f3c98d90018deca368
-  '@legendapp/list@3.3.5': 4a422c1d8b2f7488ddeadf6074126b2a84433d3f0e308b26574a6ae72554ba0b
+  '@legendapp/list@3.3.5': 03ec41339cd915ecb9a774a6b90cc2197c29038f7db67c4d2e55cd3971e5be43
   '@pierre/diffs@1.3.0-beta.10': 7ef7cb0cbabb17c15cdb137554068b36f15f6f5265e73fb51452aa3380db91aa
   '@react-native-ai/apple@0.12.0': 2d09870c2848d185cb05b53ed823a46e12dba519324d8dd8e584e28731990f9d
   '@react-native-menu/menu@2.0.0': f63d256bf6a97a873b5e628eb595bd6ef0075ddd5bdd890fc920f7a6024290dd
@@ -228,7 +228,7 @@ importers:
         version: 57.0.14(@babel/core@7.29.7)(@types/react-dom@19.2.3(@types/react@19.2.16))(@types/react@19.2.16)(expo@57.0.18)(react-dom@19.2.3(react@19.2.3))(react-native-worklets@0.10.1(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@legendapp/list':
         specifier: 'catalog:'
-        version: 3.3.5(patch_hash=4a422c1d8b2f7488ddeadf6074126b2a84433d3f0e308b26574a6ae72554ba0b)(react-dom@19.2.3(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
+        version: 3.3.5(patch_hash=03ec41339cd915ecb9a774a6b90cc2197c29038f7db67c4d2e55cd3971e5be43)(react-dom@19.2.3(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)
       '@noble/curves':
         specifier: 'catalog:'
         version: 1.9.1
@@ -572,7 +572,7 @@ importers:
         version: 0.9.0
       '@legendapp/list':
         specifier: 'catalog:'
-        version: 3.3.5(patch_hash=4a422c1d8b2f7488ddeadf6074126b2a84433d3f0e308b26574a6ae72554ba0b)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
+        version: 3.3.5(patch_hash=03ec41339cd915ecb9a774a6b90cc2197c29038f7db67c4d2e55cd3971e5be43)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)
       '@lexical/react':
         specifier: ^0.41.0
         version: 0.41.0(react-dom@19.2.6(react@19.2.6))(react@19.2.6)(yjs@13.6.31)
@@ -12892,7 +12892,7 @@ snapshots:
     dependencies:
       jsbi: 4.3.2
 
-  '@legendapp/list@3.3.5(patch_hash=4a422c1d8b2f7488ddeadf6074126b2a84433d3f0e308b26574a6ae72554ba0b)(react-dom@19.2.3(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
+  '@legendapp/list@3.3.5(patch_hash=03ec41339cd915ecb9a774a6b90cc2197c29038f7db67c4d2e55cd3971e5be43)(react-dom@19.2.3(react@19.2.3))(react-native@0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6))(react@19.2.3)':
     dependencies:
       react: 19.2.3
       use-sync-external-store: 1.6.0(react@19.2.3)
@@ -12900,7 +12900,7 @@ snapshots:
       react-dom: 19.2.3(react@19.2.3)
       react-native: 0.86.3(@babel/core@7.29.7)(@react-native/metro-config@0.86.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.2.16)(bufferutil@4.1.0)(react@19.2.3)(utf-8-validate@6.0.6)
 
-  '@legendapp/list@3.3.5(patch_hash=4a422c1d8b2f7488ddeadf6074126b2a84433d3f0e308b26574a6ae72554ba0b)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
+  '@legendapp/list@3.3.5(patch_hash=03ec41339cd915ecb9a774a6b90cc2197c29038f7db67c4d2e55cd3971e5be43)(react-dom@19.2.6(react@19.2.6))(react@19.2.6)':
     dependencies:
       react: 19.2.6
       use-sync-external-store: 1.6.0(react@19.2.6)

From 2ea9edb0271a58625cff83b3390ed7af3852cdae Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius@mac.lan>
Date: Tue, 1 Sep 2026 10:49:34 -0700
Subject: [PATCH 5/8] fix(mobile): prevent overlapping disclosure animations

---
 apps/mobile/src/features/threads/ThreadFeed.tsx      | 11 +++++------
 apps/mobile/src/features/threads/thread-work-log.tsx |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/apps/mobile/src/features/threads/ThreadFeed.tsx b/apps/mobile/src/features/threads/ThreadFeed.tsx
index d61153c812e8..0d6bf89eadfa 100644
--- a/apps/mobile/src/features/threads/ThreadFeed.tsx
+++ b/apps/mobile/src/features/threads/ThreadFeed.tsx
@@ -70,7 +70,6 @@ import { useSafeAreaInsets } from "react-native-safe-area-context";
 import Animated, {
   FadeIn,
   FadeInUp,
-  FadeOut,
   LinearTransition,
   type SharedValue,
 } from "react-native-reanimated";
@@ -166,10 +165,9 @@ function formatMessageTime(input: string): string {
 // text-sm line at every supported base font size (26px at the 22pt maximum),
 // so its height is a constant; a drifted value costs one correction on
 // measure, not a persistent offset.
-const TURN_FOLD_HEIGHT = 56; // min-h-11 (44) + mb-3 (12)
+const TURN_FOLD_HEIGHT = 48; // min-h-11 (44) + mb-1 (4)
 const THREAD_FEED_LAYOUT_TRANSITION = LinearTransition.duration(THREAD_DISCLOSURE_TRANSITION_MS);
 const THREAD_FEED_DISCLOSURE_ENTER_TRANSITION = FadeIn.duration(140);
-const THREAD_FEED_DISCLOSURE_EXIT_TRANSITION = FadeOut.duration(120);
 const EMPTY_DISCLOSURE_ENTRY_IDS: ReadonlySet<string> = new Set();
 
 // Entering animations must only play for rows born just now — LegendList
@@ -1351,7 +1349,7 @@ function renderFeedEntry(
         accessibilityState={{ expanded: entry.expanded }}
         onPress={() => props.onToggleTurnFold(entry.turnId)}
         hitSlop={4}
-        className="mb-3 min-h-11 flex-row items-center gap-2 border-b border-adaptive-neutral-200-a80-white-a8 px-2"
+        className="mb-1 min-h-11 flex-row items-center gap-2 border-b border-adaptive-neutral-200-a80-white-a8 px-2"
       >
         <Text className="font-t3-medium text-sm tabular-nums text-foreground-muted">
           {entry.label}
@@ -1484,7 +1482,7 @@ function renderFeedEntry(
     const enterAnimated = isFreshTimestamp(message.createdAt);
     return (
       <Animated.View
-        className={cn(showAssistantMeta ? "mb-5 px-1" : "mb-2 px-1")}
+        className={cn(showAssistantMeta ? "mb-5 px-1" : "mb-1 px-1")}
         {...(enterAnimated ? { entering: FadeIn.duration(220) } : {})}
       >
         {renderedText.trim().length > 0 ? (
@@ -2428,6 +2426,8 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
     [expandedWorkRows],
   );
 
+  // Virtualized rows must disappear immediately: retaining their exiting
+  // text can overlap the rows moving into the same space.
   const renderItem = useCallback(
     (info: { item: ThreadFeedEntry; index: number }) => (
       <Animated.View
@@ -2437,7 +2437,6 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
             ? THREAD_FEED_DISCLOSURE_ENTER_TRANSITION
             : undefined
         }
-        exiting={THREAD_FEED_DISCLOSURE_EXIT_TRANSITION}
       >
         {renderFeedEntry(info, {
           environmentId: props.environmentId,
diff --git a/apps/mobile/src/features/threads/thread-work-log.tsx b/apps/mobile/src/features/threads/thread-work-log.tsx
index 7e167f82eb44..5ecb66bb899c 100644
--- a/apps/mobile/src/features/threads/thread-work-log.tsx
+++ b/apps/mobile/src/features/threads/thread-work-log.tsx
@@ -260,7 +260,7 @@ const WORK_ROW_HEIGHT = 32; // min-h-8
 const WORK_ROW_GAP = 1; // gap-px
 const WORK_LOG_BOTTOM_MARGIN = 4; // mb-1
 
-export const WORK_GROUP_TOGGLE_HEIGHT = 36; // min-h-8 (32) + mb-1 (4)
+export const WORK_GROUP_TOGGLE_HEIGHT = 32; // min-h-8
 
 export function collapsedWorkLogHeight(activities: ReadonlyArray<ThreadFeedActivity>): number {
   const rows = activities;
@@ -433,7 +433,7 @@ export function ThreadWorkGroupToggle(props: {
   const icon = toolGroupSummarySymbolName(props.summaryKind);
 
   return (
-    <View className="-mx-1 mb-1 px-1 py-0">
+    <View className="-mx-1 px-1 py-0">
       <Pressable
         accessibilityRole="button"
         accessibilityState={{ expanded: props.expanded }}

From 53bdfed4086d7e5487e9d733748dac3d17eb8beb Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius@mac.lan>
Date: Tue, 1 Sep 2026 10:49:51 -0700
Subject: [PATCH 6/8] fix(mobile): scope disclosure state to its environment

---
 apps/mobile/src/features/threads/ThreadDetailScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx b/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
index 41489bca952c..2736549b2b75 100644
--- a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
+++ b/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
@@ -688,7 +688,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
           onTouchCancel={handleFeedTouchCancel}
         >
           <ThreadFeed
-            key={props.selectedThread.id}
+            key={selectedThreadKey}
             environmentId={props.environmentId}
             threadId={props.selectedThread.id}
             workspaceRoot={props.threadCwd}

From eb90673499c2266976819a563590ade3ac532aa1 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius@mac.lan>
Date: Tue, 1 Sep 2026 11:04:35 -0700
Subject: [PATCH 7/8] fix(mobile): sequence disclosure row animations

---
 .../src/features/threads/ThreadFeed.tsx       | 46 ++++---------------
 1 file changed, 8 insertions(+), 38 deletions(-)

diff --git a/apps/mobile/src/features/threads/ThreadFeed.tsx b/apps/mobile/src/features/threads/ThreadFeed.tsx
index 0d6bf89eadfa..465a7ad306e5 100644
--- a/apps/mobile/src/features/threads/ThreadFeed.tsx
+++ b/apps/mobile/src/features/threads/ThreadFeed.tsx
@@ -167,8 +167,10 @@ function formatMessageTime(input: string): string {
 // measure, not a persistent offset.
 const TURN_FOLD_HEIGHT = 48; // min-h-11 (44) + mb-1 (4)
 const THREAD_FEED_LAYOUT_TRANSITION = LinearTransition.duration(THREAD_DISCLOSURE_TRANSITION_MS);
-const THREAD_FEED_DISCLOSURE_ENTER_TRANSITION = FadeIn.duration(140);
-const EMPTY_DISCLOSURE_ENTRY_IDS: ReadonlySet<string> = new Set();
+// Let neighboring rows move out of the new rows' space before showing their text.
+const THREAD_FEED_DISCLOSURE_ENTER_TRANSITION = FadeIn.delay(
+  THREAD_DISCLOSURE_TRANSITION_MS,
+).duration(140);
 
 // Entering animations must only play for rows born just now — LegendList
 // remounts rows when they scroll back into view, and replaying an entrance for
@@ -1823,7 +1825,6 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
   const disclosureSettleFrameRef = useRef<number | null>(null);
   const disclosureSettleSecondFrameRef = useRef<number | null>(null);
   const disclosureAnchorKeyRef = useRef<string | null>(null);
-  const previousPresentedFeedRef = useRef<ReadonlyArray<ThreadFeedEntry> | null>(null);
   const headerMaterialVisibleRef = useRef(false);
   const previousLatestTurnRef = useRef(props.latestTurn);
   const userScrollSettleTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
@@ -2156,33 +2157,6 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
       props.latestTurn,
     ],
   );
-  const disclosureEnteringEntryIds = useMemo(() => {
-    const anchorKey = disclosureAnchorKeyRef.current;
-    const previousPresentedFeed = previousPresentedFeedRef.current;
-    if (!disclosureToggleSettling || anchorKey === null || previousPresentedFeed === null) {
-      return EMPTY_DISCLOSURE_ENTRY_IDS;
-    }
-
-    const previousIds = new Set(previousPresentedFeed.map((entry) => entry.id));
-    const anchorIndex = presentedFeed.findIndex((entry) => entry.id === anchorKey);
-    const enteringIds = new Set<string>();
-    if (anchorIndex < 0) {
-      return enteringIds;
-    }
-    for (let index = anchorIndex + 1; index < presentedFeed.length; index += 1) {
-      const entryId = presentedFeed[index]!.id;
-      if (previousIds.has(entryId)) {
-        break;
-      }
-      enteringIds.add(entryId);
-    }
-    return enteringIds;
-  }, [disclosureToggleSettling, presentedFeed]);
-
-  useLayoutEffect(() => {
-    previousPresentedFeedRef.current = presentedFeed;
-  }, [presentedFeed]);
-
   // The empty↔filled key below remounts the list and resets its imperative
   // content-inset override. Seed the fresh instance synchronously with the
   // current overlay height before the scroll integration's next reaction;
@@ -2426,17 +2400,13 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
     [expandedWorkRows],
   );
 
-  // Virtualized rows must disappear immediately: retaining their exiting
-  // text can overlap the rows moving into the same space.
+  // Disclosures can mount existing offscreen rows as well as new work rows.
+  // Fade those in after movement; never retain removed rows over replacements.
   const renderItem = useCallback(
     (info: { item: ThreadFeedEntry; index: number }) => (
       <Animated.View
         key={info.item.id}
-        entering={
-          disclosureEnteringEntryIds.has(info.item.id)
-            ? THREAD_FEED_DISCLOSURE_ENTER_TRANSITION
-            : undefined
-        }
+        entering={disclosureToggleSettling ? THREAD_FEED_DISCLOSURE_ENTER_TRANSITION : undefined}
       >
         {renderFeedEntry(info, {
           environmentId: props.environmentId,
@@ -2465,7 +2435,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
     ),
     [
       copiedRowId,
-      disclosureEnteringEntryIds,
+      disclosureToggleSettling,
       expandedWorkRows,
       terminalAssistantMessageIds,
       unsettledTurnId,

From ad27b1b014171bca5fdff27856e591e0221db836 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius@mac.lan>
Date: Tue, 1 Sep 2026 12:14:17 -0700
Subject: [PATCH 8/8] fix(mobile): animate thread disclosure chevrons

---
 .../src/features/threads/ThreadFeed.tsx       |  9 +--
 .../src/features/threads/thread-work-log.tsx  | 60 ++++++++++++++-----
 2 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/apps/mobile/src/features/threads/ThreadFeed.tsx b/apps/mobile/src/features/threads/ThreadFeed.tsx
index 465a7ad306e5..c9122e588f4d 100644
--- a/apps/mobile/src/features/threads/ThreadFeed.tsx
+++ b/apps/mobile/src/features/threads/ThreadFeed.tsx
@@ -131,6 +131,7 @@ import {
 } from "./thread-feed-live-follow";
 import {
   collapsedWorkLogHeight,
+  ThreadDisclosureChevron,
   ThreadWorkGroupToggle,
   ThreadWorkLog,
   THREAD_DISCLOSURE_TRANSITION_MS,
@@ -1356,11 +1357,11 @@ function renderFeedEntry(
         <Text className="font-t3-medium text-sm tabular-nums text-foreground-muted">
           {entry.label}
         </Text>
-        <SymbolView
-          name={entry.expanded ? "chevron.down" : "chevron.right"}
+        <ThreadDisclosureChevron
+          expanded={entry.expanded}
+          collapsedDirection="right"
           size={15}
-          tintColorClassName={"accent-icon-subtle"}
-          type="monochrome"
+          tintColor={iconSubtleColor}
         />
       </Pressable>
     );
diff --git a/apps/mobile/src/features/threads/thread-work-log.tsx b/apps/mobile/src/features/threads/thread-work-log.tsx
index 5ecb66bb899c..d602a85ac1ee 100644
--- a/apps/mobile/src/features/threads/thread-work-log.tsx
+++ b/apps/mobile/src/features/threads/thread-work-log.tsx
@@ -2,7 +2,7 @@ import * as Haptics from "expo-haptics";
 import { type AppSymbolName, SymbolView } from "../../components/AppSymbol";
 import { MaskedView } from "@expo/ui/community/masked-view";
 import { useIsFocused } from "@react-navigation/native";
-import { useEffect, useId, useState, type ComponentProps } from "react";
+import { useEffect, useId, useLayoutEffect, useState, type ComponentProps } from "react";
 import {
   AccessibilityInfo,
   AppState,
@@ -42,6 +42,44 @@ const WORK_LOG_LAYOUT_TRANSITION = LinearTransition.duration(THREAD_DISCLOSURE_T
 const WORK_LOG_DETAIL_ENTER_TRANSITION = FadeIn.duration(140);
 const WORK_LOG_DETAIL_EXIT_TRANSITION = FadeOut.duration(120);
 
+export function ThreadDisclosureChevron(props: {
+  readonly expanded: boolean;
+  readonly collapsedDirection: "right" | "down";
+  readonly size: number;
+  readonly tintColor: ColorValue;
+}) {
+  const expandedAngle = props.collapsedDirection === "right" ? 90 : 180;
+  const rotation = useSharedValue(props.expanded ? expandedAngle : 0);
+
+  useLayoutEffect(() => {
+    rotation.value = withTiming(props.expanded ? expandedAngle : 0, {
+      duration: THREAD_DISCLOSURE_TRANSITION_MS,
+      reduceMotion: ReduceMotion.System,
+    });
+  }, [expandedAngle, props.expanded, rotation]);
+
+  const rotationStyle = useAnimatedStyle(() => ({
+    transform: [{ rotate: `${rotation.value}deg` }],
+  }));
+
+  return (
+    <Animated.View
+      accessible={false}
+      accessibilityElementsHidden
+      importantForAccessibility="no-hide-descendants"
+      pointerEvents="none"
+      style={[{ width: props.size, height: props.size }, rotationStyle]}
+    >
+      <SymbolView
+        name={props.collapsedDirection === "right" ? "chevron.right" : "chevron.down"}
+        size={props.size}
+        tintColor={props.tintColor}
+        type="monochrome"
+      />
+    </Animated.View>
+  );
+}
+
 function ShimmerWorkContent(props: {
   readonly highlighted: boolean;
   readonly icon: AppSymbolName;
@@ -370,15 +408,11 @@ export function ThreadWorkLog(props: {
                     ) : null}
                     <View className="h-4 w-4 items-center justify-center">
                       {canExpand ? (
-                        <SymbolView
-                          name={
-                            expanded
-                              ? { ios: "chevron.up", android: "keyboard_arrow_up" }
-                              : { ios: "chevron.down", android: "keyboard_arrow_down" }
-                          }
+                        <ThreadDisclosureChevron
+                          expanded={expanded}
+                          collapsedDirection="down"
                           size={11}
                           tintColor={props.iconSubtleColor}
-                          type="monochrome"
                         />
                       ) : null}
                     </View>
@@ -468,15 +502,11 @@ export function ThreadWorkGroupToggle(props: {
             </Text>
           </>
         )}
-        <SymbolView
-          name={
-            props.expanded
-              ? { ios: "chevron.up", android: "keyboard_arrow_up" }
-              : { ios: "chevron.down", android: "keyboard_arrow_down" }
-          }
+        <ThreadDisclosureChevron
+          expanded={props.expanded}
+          collapsedDirection="down"
           size={11}
           tintColor={props.iconSubtleColor}
-          type="monochrome"
         />
       </Pressable>
     </View>