@legendapp/list 3.0.0-beta.21 → 3.0.0-beta.22

package/index.d.mts

@@ -1,6 +1,6 @@
 import * as React$1 from 'react';
 import { ComponentProps, Key, ReactNode, Dispatch, SetStateAction } from 'react';
-import { View, ScrollView, Animated, LayoutRectangle, ScrollViewProps, Insets, ScrollViewComponent, ScrollResponderMixin, StyleProp, ViewStyle, NativeSyntheticEvent, NativeScrollEvent } from 'react-native';
+import { View, ScrollView, Animated, LayoutRectangle, Insets, ScrollViewProps, ScrollViewComponent, ScrollResponderMixin, StyleProp, ViewStyle, NativeSyntheticEvent, NativeScrollEvent } from 'react-native';
 import Reanimated from 'react-native-reanimated';
 
 type AnimatedValue = number;
@@ -466,6 +466,8 @@ interface InternalState {
     loadStartTime: number;
     maintainingScrollAtEnd?: boolean;
     minIndexSizeChanged: number | undefined;
+    contentInsetOverride?: Partial<Insets> | null;
+    nativeContentInset?: Insets;
     nativeMarginTop: number;
     needsOtherAxisSize?: boolean;
     otherAxisSize?: number;
@@ -581,6 +583,7 @@ type LegendListState = {
     positions: Map<string, number>;
     scroll: number;
     scrollLength: number;
+    scrollVelocity: number;
     sizeAtIndex: (index: number) => number;
     sizes: Map<string, number>;
     start: number;
@@ -686,6 +689,11 @@ type LegendListRef = {
      * @param enabled - If true, scroll processing is enabled.
      */
     setScrollProcessingEnabled(enabled: boolean): void;
+    /**
+     * Reports an externally measured content inset. Pass null/undefined to clear.
+     * Values are merged on top of props/animated/native insets.
+     */
+    reportContentInset(inset?: Partial<Insets> | null): void;
 };
 interface ViewToken<ItemT = any> {
     containerId: number;

package/index.d.ts

@@ -1,6 +1,6 @@
 import * as React$1 from 'react';
 import { ComponentProps, Key, ReactNode, Dispatch, SetStateAction } from 'react';
-import { View, ScrollView, Animated, LayoutRectangle, ScrollViewProps, Insets, ScrollViewComponent, ScrollResponderMixin, StyleProp, ViewStyle, NativeSyntheticEvent, NativeScrollEvent } from 'react-native';
+import { View, ScrollView, Animated, LayoutRectangle, Insets, ScrollViewProps, ScrollViewComponent, ScrollResponderMixin, StyleProp, ViewStyle, NativeSyntheticEvent, NativeScrollEvent } from 'react-native';
 import Reanimated from 'react-native-reanimated';
 
 type AnimatedValue = number;
@@ -466,6 +466,8 @@ interface InternalState {
     loadStartTime: number;
     maintainingScrollAtEnd?: boolean;
     minIndexSizeChanged: number | undefined;
+    contentInsetOverride?: Partial<Insets> | null;
+    nativeContentInset?: Insets;
     nativeMarginTop: number;
     needsOtherAxisSize?: boolean;
     otherAxisSize?: number;
@@ -581,6 +583,7 @@ type LegendListState = {
     positions: Map<string, number>;
     scroll: number;
     scrollLength: number;
+    scrollVelocity: number;
     sizeAtIndex: (index: number) => number;
     sizes: Map<string, number>;
     start: number;
@@ -686,6 +689,11 @@ type LegendListRef = {
      * @param enabled - If true, scroll processing is enabled.
      */
     setScrollProcessingEnabled(enabled: boolean): void;
+    /**
+     * Reports an externally measured content inset. Pass null/undefined to clear.
+     * Values are merged on top of props/animated/native insets.
+     */
+    reportContentInset(inset?: Partial<Insets> | null): void;
 };
 interface ViewToken<ItemT = any> {
     containerId: number;

package/index.js

@@ -35,7 +35,7 @@ var Text = View;
 
 // src/state/getContentInsetEnd.ts
 function getContentInsetEnd(state) {
-  var _a3;
+  var _a3, _b;
   const { props } = state;
   const horizontal = props.horizontal;
   let contentInset = props.contentInset;
@@ -49,7 +49,16 @@ function getContentInsetEnd(state) {
       }
     }
   }
-  return (horizontal ? contentInset == null ? void 0 : contentInset.right : contentInset == null ? void 0 : contentInset.bottom) || 0;
+  const baseInset = contentInset != null ? contentInset : state.nativeContentInset;
+  const overrideInset = (_b = state.contentInsetOverride) != null ? _b : void 0;
+  if (overrideInset) {
+    const mergedInset = { top: 0, left: 0, right: 0, bottom: 0, ...baseInset, ...overrideInset };
+    return (horizontal ? mergedInset.right : mergedInset.bottom) || 0;
+  }
+  if (baseInset) {
+    return (horizontal ? baseInset.right : baseInset.bottom) || 0;
+  }
+  return 0;
 }
 
 // src/state/getContentSize.ts
@@ -1753,7 +1762,7 @@ function updateScroll(ctx, newScroll, forceUpdate) {
   const scrollDelta = Math.abs(newScroll - prevScroll);
   const scrollLength = state.scrollLength;
   const lastCalculated = state.scrollLastCalculate;
-  const shouldUpdate = state.dataChangeNeedsScrollUpdate || state.scrollLastCalculate === void 0 || lastCalculated === void 0 || Math.abs(state.scroll - lastCalculated) > 2;
+  const shouldUpdate = forceUpdate || state.dataChangeNeedsScrollUpdate || state.scrollLastCalculate === void 0 || lastCalculated === void 0 || Math.abs(state.scroll - lastCalculated) > 2;
   if (shouldUpdate) {
     state.scrollLastCalculate = state.scroll;
     state.ignoreScrollFromMVCPIgnored = false;
@@ -3243,7 +3252,7 @@ function handleLayout(ctx, layout, setCanRender) {
 
 // src/core/onScroll.ts
 function onScroll(ctx, event) {
-  var _a3, _b, _c;
+  var _a3, _b, _c, _d;
   const state = ctx.state;
   const {
     scrollProcessingEnabled,
@@ -3255,6 +3264,15 @@ function onScroll(ctx, event) {
   if (((_b = (_a3 = event.nativeEvent) == null ? void 0 : _a3.contentSize) == null ? void 0 : _b.height) === 0 && ((_c = event.nativeEvent.contentSize) == null ? void 0 : _c.width) === 0) {
     return;
   }
+  let insetChanged = false;
+  if ((_d = event.nativeEvent) == null ? void 0 : _d.contentInset) {
+    const { contentInset } = event.nativeEvent;
+    const prevInset = state.nativeContentInset;
+    if (!prevInset || prevInset.top !== contentInset.top || prevInset.bottom !== contentInset.bottom || prevInset.left !== contentInset.left || prevInset.right !== contentInset.right) {
+      state.nativeContentInset = contentInset;
+      insetChanged = true;
+    }
+  }
   let newScroll = event.nativeEvent.contentOffset[state.props.horizontal ? "x" : "y"];
   if (state.scrollingTo) {
     const maxOffset = clampScrollOffset(ctx, newScroll);
@@ -3270,7 +3288,7 @@ function onScroll(ctx, event) {
     }
   }
   state.scrollPending = newScroll;
-  updateScroll(ctx, newScroll);
+  updateScroll(ctx, newScroll, insetChanged);
   if (state.scrollingTo) {
     checkFinishedScroll(ctx);
   }
@@ -3443,7 +3461,10 @@ function updateOneItemSize(ctx, itemKey, sizeObj) {
     if (!averages) {
       averages = averageSizes[itemType] = { avg: 0, num: 0 };
     }
-    if (prevSizeKnown !== void 0 && prevSizeKnown > 0) {
+    if (averages.num === 0) {
+      averages.avg = size;
+      averages.num++;
+    } else if (prevSizeKnown !== void 0 && prevSizeKnown > 0) {
       averages.avg += (size - prevSizeKnown) / averages.num;
     } else {
       averages.avg = (averages.avg * averages.num + size) / (averages.num + 1);
@@ -3528,7 +3549,7 @@ function createImperativeHandle(ctx) {
     getScrollResponder: () => refScroller.current.getScrollResponder(),
     getState: () => ({
       activeStickyIndex: peek$(ctx, "activeStickyIndex"),
-      contentLength: state.totalSize,
+      contentLength: getContentSize(ctx),
       data: state.props.data,
       elementAtIndex: (index) => {
         var _a3;
@@ -3544,6 +3565,7 @@ function createImperativeHandle(ctx) {
       positions: state.positions,
       scroll: state.scroll,
       scrollLength: state.scrollLength,
+      scrollVelocity: getScrollVelocity(state),
       sizeAtIndex: (index) => state.sizesKnown.get(getId(state, index)),
       sizes: state.sizesKnown,
       start: state.startNoBuffer,
@@ -3581,6 +3603,10 @@ function createImperativeHandle(ctx) {
       }
     },
     scrollToOffset: (params) => scrollTo(ctx, params),
+    reportContentInset: (inset) => {
+      state.contentInsetOverride = inset != null ? inset : void 0;
+      updateScroll(ctx, state.scroll, true);
+    },
     setScrollProcessingEnabled: (enabled) => {
       state.scrollProcessingEnabled = enabled;
     },
@@ -3892,6 +3918,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         lastScrollDelta: 0,
         loadStartTime: Date.now(),
         minIndexSizeChanged: 0,
+        contentInsetOverride: void 0,
+        nativeContentInset: void 0,
         nativeMarginTop: 0,
         positions: /* @__PURE__ */ new Map(),
         props: {},

package/index.mjs

@@ -14,7 +14,7 @@ var Text = View;
 
 // src/state/getContentInsetEnd.ts
 function getContentInsetEnd(state) {
-  var _a3;
+  var _a3, _b;
   const { props } = state;
   const horizontal = props.horizontal;
   let contentInset = props.contentInset;
@@ -28,7 +28,16 @@ function getContentInsetEnd(state) {
       }
     }
   }
-  return (horizontal ? contentInset == null ? void 0 : contentInset.right : contentInset == null ? void 0 : contentInset.bottom) || 0;
+  const baseInset = contentInset != null ? contentInset : state.nativeContentInset;
+  const overrideInset = (_b = state.contentInsetOverride) != null ? _b : void 0;
+  if (overrideInset) {
+    const mergedInset = { top: 0, left: 0, right: 0, bottom: 0, ...baseInset, ...overrideInset };
+    return (horizontal ? mergedInset.right : mergedInset.bottom) || 0;
+  }
+  if (baseInset) {
+    return (horizontal ? baseInset.right : baseInset.bottom) || 0;
+  }
+  return 0;
 }
 
 // src/state/getContentSize.ts
@@ -1732,7 +1741,7 @@ function updateScroll(ctx, newScroll, forceUpdate) {
   const scrollDelta = Math.abs(newScroll - prevScroll);
   const scrollLength = state.scrollLength;
   const lastCalculated = state.scrollLastCalculate;
-  const shouldUpdate = state.dataChangeNeedsScrollUpdate || state.scrollLastCalculate === void 0 || lastCalculated === void 0 || Math.abs(state.scroll - lastCalculated) > 2;
+  const shouldUpdate = forceUpdate || state.dataChangeNeedsScrollUpdate || state.scrollLastCalculate === void 0 || lastCalculated === void 0 || Math.abs(state.scroll - lastCalculated) > 2;
   if (shouldUpdate) {
     state.scrollLastCalculate = state.scroll;
     state.ignoreScrollFromMVCPIgnored = false;
@@ -3222,7 +3231,7 @@ function handleLayout(ctx, layout, setCanRender) {
 
 // src/core/onScroll.ts
 function onScroll(ctx, event) {
-  var _a3, _b, _c;
+  var _a3, _b, _c, _d;
   const state = ctx.state;
   const {
     scrollProcessingEnabled,
@@ -3234,6 +3243,15 @@ function onScroll(ctx, event) {
   if (((_b = (_a3 = event.nativeEvent) == null ? void 0 : _a3.contentSize) == null ? void 0 : _b.height) === 0 && ((_c = event.nativeEvent.contentSize) == null ? void 0 : _c.width) === 0) {
     return;
   }
+  let insetChanged = false;
+  if ((_d = event.nativeEvent) == null ? void 0 : _d.contentInset) {
+    const { contentInset } = event.nativeEvent;
+    const prevInset = state.nativeContentInset;
+    if (!prevInset || prevInset.top !== contentInset.top || prevInset.bottom !== contentInset.bottom || prevInset.left !== contentInset.left || prevInset.right !== contentInset.right) {
+      state.nativeContentInset = contentInset;
+      insetChanged = true;
+    }
+  }
   let newScroll = event.nativeEvent.contentOffset[state.props.horizontal ? "x" : "y"];
   if (state.scrollingTo) {
     const maxOffset = clampScrollOffset(ctx, newScroll);
@@ -3249,7 +3267,7 @@ function onScroll(ctx, event) {
     }
   }
   state.scrollPending = newScroll;
-  updateScroll(ctx, newScroll);
+  updateScroll(ctx, newScroll, insetChanged);
   if (state.scrollingTo) {
     checkFinishedScroll(ctx);
   }
@@ -3422,7 +3440,10 @@ function updateOneItemSize(ctx, itemKey, sizeObj) {
     if (!averages) {
       averages = averageSizes[itemType] = { avg: 0, num: 0 };
     }
-    if (prevSizeKnown !== void 0 && prevSizeKnown > 0) {
+    if (averages.num === 0) {
+      averages.avg = size;
+      averages.num++;
+    } else if (prevSizeKnown !== void 0 && prevSizeKnown > 0) {
       averages.avg += (size - prevSizeKnown) / averages.num;
     } else {
       averages.avg = (averages.avg * averages.num + size) / (averages.num + 1);
@@ -3507,7 +3528,7 @@ function createImperativeHandle(ctx) {
     getScrollResponder: () => refScroller.current.getScrollResponder(),
     getState: () => ({
       activeStickyIndex: peek$(ctx, "activeStickyIndex"),
-      contentLength: state.totalSize,
+      contentLength: getContentSize(ctx),
       data: state.props.data,
       elementAtIndex: (index) => {
         var _a3;
@@ -3523,6 +3544,7 @@ function createImperativeHandle(ctx) {
       positions: state.positions,
       scroll: state.scroll,
       scrollLength: state.scrollLength,
+      scrollVelocity: getScrollVelocity(state),
       sizeAtIndex: (index) => state.sizesKnown.get(getId(state, index)),
       sizes: state.sizesKnown,
       start: state.startNoBuffer,
@@ -3560,6 +3582,10 @@ function createImperativeHandle(ctx) {
       }
     },
     scrollToOffset: (params) => scrollTo(ctx, params),
+    reportContentInset: (inset) => {
+      state.contentInsetOverride = inset != null ? inset : void 0;
+      updateScroll(ctx, state.scroll, true);
+    },
     setScrollProcessingEnabled: (enabled) => {
       state.scrollProcessingEnabled = enabled;
     },
@@ -3871,6 +3897,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         lastScrollDelta: 0,
         loadStartTime: Date.now(),
         minIndexSizeChanged: 0,
+        contentInsetOverride: void 0,
+        nativeContentInset: void 0,
         nativeMarginTop: 0,
         positions: /* @__PURE__ */ new Map(),
         props: {},

package/index.native.d.mts

@@ -1,6 +1,6 @@
 import * as React$1 from 'react';
 import { ComponentProps, Key, ReactNode, Dispatch, SetStateAction } from 'react';
-import { View, ScrollView, Animated, LayoutRectangle, ScrollViewProps, Insets, ScrollViewComponent, ScrollResponderMixin, StyleProp, ViewStyle, NativeSyntheticEvent, NativeScrollEvent } from 'react-native';
+import { View, ScrollView, Animated, LayoutRectangle, Insets, ScrollViewProps, ScrollViewComponent, ScrollResponderMixin, StyleProp, ViewStyle, NativeSyntheticEvent, NativeScrollEvent } from 'react-native';
 import Reanimated from 'react-native-reanimated';
 
 type AnimatedValue = number;
@@ -466,6 +466,8 @@ interface InternalState {
     loadStartTime: number;
     maintainingScrollAtEnd?: boolean;
     minIndexSizeChanged: number | undefined;
+    contentInsetOverride?: Partial<Insets> | null;
+    nativeContentInset?: Insets;
     nativeMarginTop: number;
     needsOtherAxisSize?: boolean;
     otherAxisSize?: number;
@@ -581,6 +583,7 @@ type LegendListState = {
     positions: Map<string, number>;
     scroll: number;
     scrollLength: number;
+    scrollVelocity: number;
     sizeAtIndex: (index: number) => number;
     sizes: Map<string, number>;
     start: number;
@@ -686,6 +689,11 @@ type LegendListRef = {
      * @param enabled - If true, scroll processing is enabled.
      */
     setScrollProcessingEnabled(enabled: boolean): void;
+    /**
+     * Reports an externally measured content inset. Pass null/undefined to clear.
+     * Values are merged on top of props/animated/native insets.
+     */
+    reportContentInset(inset?: Partial<Insets> | null): void;
 };
 interface ViewToken<ItemT = any> {
     containerId: number;

package/index.native.d.ts

@@ -1,6 +1,6 @@
 import * as React$1 from 'react';
 import { ComponentProps, Key, ReactNode, Dispatch, SetStateAction } from 'react';
-import { View, ScrollView, Animated, LayoutRectangle, ScrollViewProps, Insets, ScrollViewComponent, ScrollResponderMixin, StyleProp, ViewStyle, NativeSyntheticEvent, NativeScrollEvent } from 'react-native';
+import { View, ScrollView, Animated, LayoutRectangle, Insets, ScrollViewProps, ScrollViewComponent, ScrollResponderMixin, StyleProp, ViewStyle, NativeSyntheticEvent, NativeScrollEvent } from 'react-native';
 import Reanimated from 'react-native-reanimated';
 
 type AnimatedValue = number;
@@ -466,6 +466,8 @@ interface InternalState {
     loadStartTime: number;
     maintainingScrollAtEnd?: boolean;
     minIndexSizeChanged: number | undefined;
+    contentInsetOverride?: Partial<Insets> | null;
+    nativeContentInset?: Insets;
     nativeMarginTop: number;
     needsOtherAxisSize?: boolean;
     otherAxisSize?: number;
@@ -581,6 +583,7 @@ type LegendListState = {
     positions: Map<string, number>;
     scroll: number;
     scrollLength: number;
+    scrollVelocity: number;
     sizeAtIndex: (index: number) => number;
     sizes: Map<string, number>;
     start: number;
@@ -686,6 +689,11 @@ type LegendListRef = {
      * @param enabled - If true, scroll processing is enabled.
      */
     setScrollProcessingEnabled(enabled: boolean): void;
+    /**
+     * Reports an externally measured content inset. Pass null/undefined to clear.
+     * Values are merged on top of props/animated/native insets.
+     */
+    reportContentInset(inset?: Partial<Insets> | null): void;
 };
 interface ViewToken<ItemT = any> {
     containerId: number;

package/index.native.js

@@ -31,7 +31,7 @@ var Text = reactNative.Text;
 
 // src/state/getContentInsetEnd.ts
 function getContentInsetEnd(state) {
-  var _a3;
+  var _a3, _b;
   const { props } = state;
   const horizontal = props.horizontal;
   let contentInset = props.contentInset;
@@ -45,7 +45,16 @@ function getContentInsetEnd(state) {
       }
     }
   }
-  return (horizontal ? contentInset == null ? void 0 : contentInset.right : contentInset == null ? void 0 : contentInset.bottom) || 0;
+  const baseInset = contentInset != null ? contentInset : state.nativeContentInset;
+  const overrideInset = (_b = state.contentInsetOverride) != null ? _b : void 0;
+  if (overrideInset) {
+    const mergedInset = { top: 0, left: 0, right: 0, bottom: 0, ...baseInset, ...overrideInset };
+    return (horizontal ? mergedInset.right : mergedInset.bottom) || 0;
+  }
+  if (baseInset) {
+    return (horizontal ? baseInset.right : baseInset.bottom) || 0;
+  }
+  return 0;
 }
 
 // src/state/getContentSize.ts
@@ -3027,7 +3036,7 @@ function handleLayout(ctx, layout, setCanRender) {
 
 // src/core/onScroll.ts
 function onScroll(ctx, event) {
-  var _a3, _b, _c;
+  var _a3, _b, _c, _d;
   const state = ctx.state;
   const {
     scrollProcessingEnabled,
@@ -3039,6 +3048,15 @@ function onScroll(ctx, event) {
   if (((_b = (_a3 = event.nativeEvent) == null ? void 0 : _a3.contentSize) == null ? void 0 : _b.height) === 0 && ((_c = event.nativeEvent.contentSize) == null ? void 0 : _c.width) === 0) {
     return;
   }
+  let insetChanged = false;
+  if ((_d = event.nativeEvent) == null ? void 0 : _d.contentInset) {
+    const { contentInset } = event.nativeEvent;
+    const prevInset = state.nativeContentInset;
+    if (!prevInset || prevInset.top !== contentInset.top || prevInset.bottom !== contentInset.bottom || prevInset.left !== contentInset.left || prevInset.right !== contentInset.right) {
+      state.nativeContentInset = contentInset;
+      insetChanged = true;
+    }
+  }
   let newScroll = event.nativeEvent.contentOffset[state.props.horizontal ? "x" : "y"];
   if (state.scrollingTo) {
     const maxOffset = clampScrollOffset(ctx, newScroll);
@@ -3054,7 +3072,7 @@ function onScroll(ctx, event) {
     }
   }
   state.scrollPending = newScroll;
-  updateScroll(ctx, newScroll);
+  updateScroll(ctx, newScroll, insetChanged);
   if (state.scrollingTo) {
     checkFinishedScroll(ctx);
   }
@@ -3227,7 +3245,10 @@ function updateOneItemSize(ctx, itemKey, sizeObj) {
     if (!averages) {
       averages = averageSizes[itemType] = { avg: 0, num: 0 };
     }
-    if (prevSizeKnown !== void 0 && prevSizeKnown > 0) {
+    if (averages.num === 0) {
+      averages.avg = size;
+      averages.num++;
+    } else if (prevSizeKnown !== void 0 && prevSizeKnown > 0) {
       averages.avg += (size - prevSizeKnown) / averages.num;
     } else {
       averages.avg = (averages.avg * averages.num + size) / (averages.num + 1);
@@ -3331,7 +3352,7 @@ function createImperativeHandle(ctx) {
     getScrollResponder: () => refScroller.current.getScrollResponder(),
     getState: () => ({
       activeStickyIndex: peek$(ctx, "activeStickyIndex"),
-      contentLength: state.totalSize,
+      contentLength: getContentSize(ctx),
       data: state.props.data,
       elementAtIndex: (index) => {
         var _a3;
@@ -3347,6 +3368,7 @@ function createImperativeHandle(ctx) {
       positions: state.positions,
       scroll: state.scroll,
       scrollLength: state.scrollLength,
+      scrollVelocity: getScrollVelocity(state),
       sizeAtIndex: (index) => state.sizesKnown.get(getId(state, index)),
       sizes: state.sizesKnown,
       start: state.startNoBuffer,
@@ -3384,6 +3406,10 @@ function createImperativeHandle(ctx) {
       }
     },
     scrollToOffset: (params) => scrollTo(ctx, params),
+    reportContentInset: (inset) => {
+      state.contentInsetOverride = inset != null ? inset : void 0;
+      updateScroll(ctx, state.scroll, true);
+    },
     setScrollProcessingEnabled: (enabled) => {
       state.scrollProcessingEnabled = enabled;
     },
@@ -3695,6 +3721,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         lastScrollDelta: 0,
         loadStartTime: Date.now(),
         minIndexSizeChanged: 0,
+        contentInsetOverride: void 0,
+        nativeContentInset: void 0,
         nativeMarginTop: 0,
         positions: /* @__PURE__ */ new Map(),
         props: {},

package/index.native.mjs

@@ -10,7 +10,7 @@ var Text = Text$1;
 
 // src/state/getContentInsetEnd.ts
 function getContentInsetEnd(state) {
-  var _a3;
+  var _a3, _b;
   const { props } = state;
   const horizontal = props.horizontal;
   let contentInset = props.contentInset;
@@ -24,7 +24,16 @@ function getContentInsetEnd(state) {
       }
     }
   }
-  return (horizontal ? contentInset == null ? void 0 : contentInset.right : contentInset == null ? void 0 : contentInset.bottom) || 0;
+  const baseInset = contentInset != null ? contentInset : state.nativeContentInset;
+  const overrideInset = (_b = state.contentInsetOverride) != null ? _b : void 0;
+  if (overrideInset) {
+    const mergedInset = { top: 0, left: 0, right: 0, bottom: 0, ...baseInset, ...overrideInset };
+    return (horizontal ? mergedInset.right : mergedInset.bottom) || 0;
+  }
+  if (baseInset) {
+    return (horizontal ? baseInset.right : baseInset.bottom) || 0;
+  }
+  return 0;
 }
 
 // src/state/getContentSize.ts
@@ -3006,7 +3015,7 @@ function handleLayout(ctx, layout, setCanRender) {
 
 // src/core/onScroll.ts
 function onScroll(ctx, event) {
-  var _a3, _b, _c;
+  var _a3, _b, _c, _d;
   const state = ctx.state;
   const {
     scrollProcessingEnabled,
@@ -3018,6 +3027,15 @@ function onScroll(ctx, event) {
   if (((_b = (_a3 = event.nativeEvent) == null ? void 0 : _a3.contentSize) == null ? void 0 : _b.height) === 0 && ((_c = event.nativeEvent.contentSize) == null ? void 0 : _c.width) === 0) {
     return;
   }
+  let insetChanged = false;
+  if ((_d = event.nativeEvent) == null ? void 0 : _d.contentInset) {
+    const { contentInset } = event.nativeEvent;
+    const prevInset = state.nativeContentInset;
+    if (!prevInset || prevInset.top !== contentInset.top || prevInset.bottom !== contentInset.bottom || prevInset.left !== contentInset.left || prevInset.right !== contentInset.right) {
+      state.nativeContentInset = contentInset;
+      insetChanged = true;
+    }
+  }
   let newScroll = event.nativeEvent.contentOffset[state.props.horizontal ? "x" : "y"];
   if (state.scrollingTo) {
     const maxOffset = clampScrollOffset(ctx, newScroll);
@@ -3033,7 +3051,7 @@ function onScroll(ctx, event) {
     }
   }
   state.scrollPending = newScroll;
-  updateScroll(ctx, newScroll);
+  updateScroll(ctx, newScroll, insetChanged);
   if (state.scrollingTo) {
     checkFinishedScroll(ctx);
   }
@@ -3206,7 +3224,10 @@ function updateOneItemSize(ctx, itemKey, sizeObj) {
     if (!averages) {
       averages = averageSizes[itemType] = { avg: 0, num: 0 };
     }
-    if (prevSizeKnown !== void 0 && prevSizeKnown > 0) {
+    if (averages.num === 0) {
+      averages.avg = size;
+      averages.num++;
+    } else if (prevSizeKnown !== void 0 && prevSizeKnown > 0) {
       averages.avg += (size - prevSizeKnown) / averages.num;
     } else {
       averages.avg = (averages.avg * averages.num + size) / (averages.num + 1);
@@ -3310,7 +3331,7 @@ function createImperativeHandle(ctx) {
     getScrollResponder: () => refScroller.current.getScrollResponder(),
     getState: () => ({
       activeStickyIndex: peek$(ctx, "activeStickyIndex"),
-      contentLength: state.totalSize,
+      contentLength: getContentSize(ctx),
       data: state.props.data,
       elementAtIndex: (index) => {
         var _a3;
@@ -3326,6 +3347,7 @@ function createImperativeHandle(ctx) {
       positions: state.positions,
       scroll: state.scroll,
       scrollLength: state.scrollLength,
+      scrollVelocity: getScrollVelocity(state),
       sizeAtIndex: (index) => state.sizesKnown.get(getId(state, index)),
       sizes: state.sizesKnown,
       start: state.startNoBuffer,
@@ -3363,6 +3385,10 @@ function createImperativeHandle(ctx) {
       }
     },
     scrollToOffset: (params) => scrollTo(ctx, params),
+    reportContentInset: (inset) => {
+      state.contentInsetOverride = inset != null ? inset : void 0;
+      updateScroll(ctx, state.scroll, true);
+    },
     setScrollProcessingEnabled: (enabled) => {
       state.scrollProcessingEnabled = enabled;
     },
@@ -3674,6 +3700,8 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         lastScrollDelta: 0,
         loadStartTime: Date.now(),
         minIndexSizeChanged: 0,
+        contentInsetOverride: void 0,
+        nativeContentInset: void 0,
         nativeMarginTop: 0,
         positions: /* @__PURE__ */ new Map(),
         props: {},

package/keyboard.js

@@ -62,6 +62,15 @@ var calculateKeyboardInset = (height, safeAreaInsetBottom, isNewArchitecture) =>
   "worklet";
   return Math.max(0, height - safeAreaInsetBottom) ;
 };
+var calculateEffectiveKeyboardHeight = (keyboardHeight, contentLength, scrollLength, alignItemsAtEnd) => {
+  "worklet";
+  if (alignItemsAtEnd) {
+    return keyboardHeight;
+  } else {
+    const availableSpace = Math.max(0, scrollLength - contentLength);
+    return Math.max(0, keyboardHeight - availableSpace);
+  }
+};
 var calculateEndPaddingInset = (keyboardHeight, alignItemsAtEndPadding) => {
   "worklet";
   return Math.min(keyboardHeight, alignItemsAtEndPadding);
@@ -86,6 +95,7 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
     style: styleProp,
     ...rest
   } = props;
+  const { alignItemsAtEnd } = props;
   const styleFlattened = reactNative.StyleSheet.flatten(styleProp);
   const refLegendList = React.useRef(null);
   const combinedRef = useCombinedRef(forwardedRef, refLegendList);
@@ -98,6 +108,8 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
   const mode = reactNativeReanimated.useSharedValue("idle");
   const keyboardInset = reactNativeReanimated.useSharedValue({ bottom: 0, top: 0 });
   const keyboardHeight = reactNativeReanimated.useSharedValue(0);
+  const contentLength = reactNativeReanimated.useSharedValue(0);
+  const scrollLength = reactNativeReanimated.useSharedValue(0);
   const alignItemsAtEndPadding = reactNativeReanimated.useSharedValue(0);
   const isOpening = reactNativeReanimated.useSharedValue(false);
   const didInteractive = reactNativeReanimated.useSharedValue(false);
@@ -105,7 +117,9 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
   const isKeyboardOpen = reactNativeReanimated.useSharedValue(false);
   const scrollHandler = reactNativeReanimated.useAnimatedScrollHandler(
     (event) => {
-      scrollOffsetY.set(event.contentOffset[horizontal ? "x" : "y"]);
+      if (mode.get() !== "running" || didInteractive.get()) {
+        scrollOffsetY.set(event.contentOffset[horizontal ? "x" : "y"]);
+      }
       if (onScrollProp) {
         reactNativeReanimated.runOnJS(onScrollProp)(event);
       }
@@ -119,8 +133,18 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
     },
     [refLegendList]
   );
+  const updateScrollMetrics = React.useCallback(() => {
+    var _a;
+    const state = (_a = refLegendList.current) == null ? void 0 : _a.getState();
+    if (!state) {
+      return;
+    }
+    contentLength.set(state.contentLength);
+    scrollLength.set(state.scrollLength);
+  }, [contentLength, scrollLength]);
   const handleMetricsChange = React.useCallback(
     (metrics) => {
+      updateScrollMetrics();
       const nextPadding = metrics.alignItemsAtEndPadding || 0;
       alignItemsAtEndPadding.set(nextPadding);
       if (!horizontal) {
@@ -130,7 +154,13 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
             return;
           }
           const vKeyboardHeight = keyboardHeight.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, padding);
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
+          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, padding);
           const topInset = calculateTopInset(safeInsetTop, isNewArchitecture, vTopInset);
           keyboardInset.set({
             bottom: keyboardInset.get().bottom,
@@ -147,7 +177,8 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
       keyboardHeight,
       keyboardInset,
       onMetricsChangeProp,
-      safeAreaInsetTop
+      safeAreaInsetTop,
+      updateScrollMetrics
     ]
   );
   reactNativeKeyboardController.useKeyboardHandler(
@@ -197,11 +228,17 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
           const progress = clampProgress(event.progress);
           const vIsOpening = isOpening.get();
           const vKeyboardHeight = keyboardHeight.get();
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
           const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, vAlignItemsPadding);
+          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const targetOffset = calculateKeyboardTargetOffset(
             scrollOffsetAtKeyboardStart.get(),
-            vKeyboardHeight,
+            vEffectiveKeyboardHeight,
             vIsOpening,
             progress
           );
@@ -230,13 +267,19 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
         if (vMode === "running") {
           const progress = clampProgress(event.progress);
           const vKeyboardHeight = keyboardHeight.get();
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
           const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, vAlignItemsPadding);
+          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const vIsOpening = isOpening.get();
           if (!wasInteractive) {
             const targetOffset = calculateKeyboardTargetOffset(
               scrollOffsetAtKeyboardStart.get(),
-              vKeyboardHeight,
+              vEffectiveKeyboardHeight,
               vIsOpening,
               progress
             );
@@ -265,7 +308,7 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
         }
       }
     },
-    [scrollViewRef, safeAreaInsetBottom]
+    [alignItemsAtEnd, safeAreaInsetBottom, scrollViewRef]
   );
   const animatedProps = reactNativeReanimated.useAnimatedProps(() => {
     "worklet";

package/keyboard.mjs

@@ -41,6 +41,15 @@ var calculateKeyboardInset = (height, safeAreaInsetBottom, isNewArchitecture) =>
   "worklet";
   return Math.max(0, height - safeAreaInsetBottom) ;
 };
+var calculateEffectiveKeyboardHeight = (keyboardHeight, contentLength, scrollLength, alignItemsAtEnd) => {
+  "worklet";
+  if (alignItemsAtEnd) {
+    return keyboardHeight;
+  } else {
+    const availableSpace = Math.max(0, scrollLength - contentLength);
+    return Math.max(0, keyboardHeight - availableSpace);
+  }
+};
 var calculateEndPaddingInset = (keyboardHeight, alignItemsAtEndPadding) => {
   "worklet";
   return Math.min(keyboardHeight, alignItemsAtEndPadding);
@@ -65,6 +74,7 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
     style: styleProp,
     ...rest
   } = props;
+  const { alignItemsAtEnd } = props;
   const styleFlattened = StyleSheet.flatten(styleProp);
   const refLegendList = useRef(null);
   const combinedRef = useCombinedRef(forwardedRef, refLegendList);
@@ -77,6 +87,8 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
   const mode = useSharedValue("idle");
   const keyboardInset = useSharedValue({ bottom: 0, top: 0 });
   const keyboardHeight = useSharedValue(0);
+  const contentLength = useSharedValue(0);
+  const scrollLength = useSharedValue(0);
   const alignItemsAtEndPadding = useSharedValue(0);
   const isOpening = useSharedValue(false);
   const didInteractive = useSharedValue(false);
@@ -84,7 +96,9 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
   const isKeyboardOpen = useSharedValue(false);
   const scrollHandler = useAnimatedScrollHandler(
     (event) => {
-      scrollOffsetY.set(event.contentOffset[horizontal ? "x" : "y"]);
+      if (mode.get() !== "running" || didInteractive.get()) {
+        scrollOffsetY.set(event.contentOffset[horizontal ? "x" : "y"]);
+      }
       if (onScrollProp) {
         runOnJS(onScrollProp)(event);
       }
@@ -98,8 +112,18 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
     },
     [refLegendList]
   );
+  const updateScrollMetrics = useCallback(() => {
+    var _a;
+    const state = (_a = refLegendList.current) == null ? void 0 : _a.getState();
+    if (!state) {
+      return;
+    }
+    contentLength.set(state.contentLength);
+    scrollLength.set(state.scrollLength);
+  }, [contentLength, scrollLength]);
   const handleMetricsChange = useCallback(
     (metrics) => {
+      updateScrollMetrics();
       const nextPadding = metrics.alignItemsAtEndPadding || 0;
       alignItemsAtEndPadding.set(nextPadding);
       if (!horizontal) {
@@ -109,7 +133,13 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
             return;
           }
           const vKeyboardHeight = keyboardHeight.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, padding);
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
+          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, padding);
           const topInset = calculateTopInset(safeInsetTop, isNewArchitecture, vTopInset);
           keyboardInset.set({
             bottom: keyboardInset.get().bottom,
@@ -126,7 +156,8 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
       keyboardHeight,
       keyboardInset,
       onMetricsChangeProp,
-      safeAreaInsetTop
+      safeAreaInsetTop,
+      updateScrollMetrics
     ]
   );
   useKeyboardHandler(
@@ -176,11 +207,17 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
           const progress = clampProgress(event.progress);
           const vIsOpening = isOpening.get();
           const vKeyboardHeight = keyboardHeight.get();
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
           const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, vAlignItemsPadding);
+          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const targetOffset = calculateKeyboardTargetOffset(
             scrollOffsetAtKeyboardStart.get(),
-            vKeyboardHeight,
+            vEffectiveKeyboardHeight,
             vIsOpening,
             progress
           );
@@ -209,13 +246,19 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
         if (vMode === "running") {
           const progress = clampProgress(event.progress);
           const vKeyboardHeight = keyboardHeight.get();
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
           const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, vAlignItemsPadding);
+          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const vIsOpening = isOpening.get();
           if (!wasInteractive) {
             const targetOffset = calculateKeyboardTargetOffset(
               scrollOffsetAtKeyboardStart.get(),
-              vKeyboardHeight,
+              vEffectiveKeyboardHeight,
               vIsOpening,
               progress
             );
@@ -244,7 +287,7 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
         }
       }
     },
-    [scrollViewRef, safeAreaInsetBottom]
+    [alignItemsAtEnd, safeAreaInsetBottom, scrollViewRef]
   );
   const animatedProps = useAnimatedProps(() => {
     "worklet";

package/keyboard.native.js

@@ -63,6 +63,15 @@ var calculateKeyboardInset = (height, safeAreaInsetBottom, isNewArchitecture) =>
   "worklet";
   return isNewArchitecture ? Math.max(0, height - safeAreaInsetBottom) : Math.max(isNewArchitecture ? 0 : -safeAreaInsetBottom, height - safeAreaInsetBottom * 2);
 };
+var calculateEffectiveKeyboardHeight = (keyboardHeight, contentLength, scrollLength, alignItemsAtEnd) => {
+  "worklet";
+  if (alignItemsAtEnd) {
+    return keyboardHeight;
+  } else {
+    const availableSpace = Math.max(0, scrollLength - contentLength);
+    return Math.max(0, keyboardHeight - availableSpace);
+  }
+};
 var calculateEndPaddingInset = (keyboardHeight, alignItemsAtEndPadding) => {
   "worklet";
   return Math.min(keyboardHeight, alignItemsAtEndPadding);
@@ -87,6 +96,7 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
     style: styleProp,
     ...rest
   } = props;
+  const { alignItemsAtEnd } = props;
   const styleFlattened = reactNative.StyleSheet.flatten(styleProp);
   const refLegendList = React.useRef(null);
   const combinedRef = useCombinedRef(forwardedRef, refLegendList);
@@ -99,6 +109,8 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
   const mode = reactNativeReanimated.useSharedValue("idle");
   const keyboardInset = reactNativeReanimated.useSharedValue({ bottom: 0, top: 0 });
   const keyboardHeight = reactNativeReanimated.useSharedValue(0);
+  const contentLength = reactNativeReanimated.useSharedValue(0);
+  const scrollLength = reactNativeReanimated.useSharedValue(0);
   const alignItemsAtEndPadding = reactNativeReanimated.useSharedValue(0);
   const isOpening = reactNativeReanimated.useSharedValue(false);
   const didInteractive = reactNativeReanimated.useSharedValue(false);
@@ -106,7 +118,9 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
   const isKeyboardOpen = reactNativeReanimated.useSharedValue(false);
   const scrollHandler = reactNativeReanimated.useAnimatedScrollHandler(
     (event) => {
-      scrollOffsetY.set(event.contentOffset[horizontal ? "x" : "y"]);
+      if (mode.get() !== "running" || didInteractive.get()) {
+        scrollOffsetY.set(event.contentOffset[horizontal ? "x" : "y"]);
+      }
       if (onScrollProp) {
         reactNativeReanimated.runOnJS(onScrollProp)(event);
       }
@@ -120,8 +134,18 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
     },
     [refLegendList]
   );
+  const updateScrollMetrics = React.useCallback(() => {
+    var _a;
+    const state = (_a = refLegendList.current) == null ? void 0 : _a.getState();
+    if (!state) {
+      return;
+    }
+    contentLength.set(state.contentLength);
+    scrollLength.set(state.scrollLength);
+  }, [contentLength, scrollLength]);
   const handleMetricsChange = React.useCallback(
     (metrics) => {
+      updateScrollMetrics();
       const nextPadding = metrics.alignItemsAtEndPadding || 0;
       alignItemsAtEndPadding.set(nextPadding);
       if (!horizontal) {
@@ -131,7 +155,13 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
             return;
           }
           const vKeyboardHeight = keyboardHeight.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, padding);
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
+          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, padding);
           const topInset = calculateTopInset(safeInsetTop, isNewArchitecture, vTopInset);
           keyboardInset.set({
             bottom: keyboardInset.get().bottom,
@@ -148,7 +178,8 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
       keyboardHeight,
       keyboardInset,
       onMetricsChangeProp,
-      safeAreaInsetTop
+      safeAreaInsetTop,
+      updateScrollMetrics
     ]
   );
   reactNativeKeyboardController.useKeyboardHandler(
@@ -198,11 +229,17 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
           const progress = clampProgress(event.progress);
           const vIsOpening = isOpening.get();
           const vKeyboardHeight = keyboardHeight.get();
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
           const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, vAlignItemsPadding);
+          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const targetOffset = calculateKeyboardTargetOffset(
             scrollOffsetAtKeyboardStart.get(),
-            vKeyboardHeight,
+            vEffectiveKeyboardHeight,
             vIsOpening,
             progress
           );
@@ -231,13 +268,19 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
         if (vMode === "running") {
           const progress = clampProgress(event.progress);
           const vKeyboardHeight = keyboardHeight.get();
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
           const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, vAlignItemsPadding);
+          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const vIsOpening = isOpening.get();
           if (!wasInteractive) {
             const targetOffset = calculateKeyboardTargetOffset(
               scrollOffsetAtKeyboardStart.get(),
-              vKeyboardHeight,
+              vEffectiveKeyboardHeight,
               vIsOpening,
               progress
             );
@@ -266,7 +309,7 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
         }
       }
     },
-    [scrollViewRef, safeAreaInsetBottom]
+    [alignItemsAtEnd, safeAreaInsetBottom, scrollViewRef]
   );
   const animatedProps = reactNativeReanimated.useAnimatedProps(() => {
     "worklet";

package/keyboard.native.mjs

@@ -42,6 +42,15 @@ var calculateKeyboardInset = (height, safeAreaInsetBottom, isNewArchitecture) =>
   "worklet";
   return isNewArchitecture ? Math.max(0, height - safeAreaInsetBottom) : Math.max(isNewArchitecture ? 0 : -safeAreaInsetBottom, height - safeAreaInsetBottom * 2);
 };
+var calculateEffectiveKeyboardHeight = (keyboardHeight, contentLength, scrollLength, alignItemsAtEnd) => {
+  "worklet";
+  if (alignItemsAtEnd) {
+    return keyboardHeight;
+  } else {
+    const availableSpace = Math.max(0, scrollLength - contentLength);
+    return Math.max(0, keyboardHeight - availableSpace);
+  }
+};
 var calculateEndPaddingInset = (keyboardHeight, alignItemsAtEndPadding) => {
   "worklet";
   return Math.min(keyboardHeight, alignItemsAtEndPadding);
@@ -66,6 +75,7 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
     style: styleProp,
     ...rest
   } = props;
+  const { alignItemsAtEnd } = props;
   const styleFlattened = StyleSheet.flatten(styleProp);
   const refLegendList = useRef(null);
   const combinedRef = useCombinedRef(forwardedRef, refLegendList);
@@ -78,6 +88,8 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
   const mode = useSharedValue("idle");
   const keyboardInset = useSharedValue({ bottom: 0, top: 0 });
   const keyboardHeight = useSharedValue(0);
+  const contentLength = useSharedValue(0);
+  const scrollLength = useSharedValue(0);
   const alignItemsAtEndPadding = useSharedValue(0);
   const isOpening = useSharedValue(false);
   const didInteractive = useSharedValue(false);
@@ -85,7 +97,9 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
   const isKeyboardOpen = useSharedValue(false);
   const scrollHandler = useAnimatedScrollHandler(
     (event) => {
-      scrollOffsetY.set(event.contentOffset[horizontal ? "x" : "y"]);
+      if (mode.get() !== "running" || didInteractive.get()) {
+        scrollOffsetY.set(event.contentOffset[horizontal ? "x" : "y"]);
+      }
       if (onScrollProp) {
         runOnJS(onScrollProp)(event);
       }
@@ -99,8 +113,18 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
     },
     [refLegendList]
   );
+  const updateScrollMetrics = useCallback(() => {
+    var _a;
+    const state = (_a = refLegendList.current) == null ? void 0 : _a.getState();
+    if (!state) {
+      return;
+    }
+    contentLength.set(state.contentLength);
+    scrollLength.set(state.scrollLength);
+  }, [contentLength, scrollLength]);
   const handleMetricsChange = useCallback(
     (metrics) => {
+      updateScrollMetrics();
       const nextPadding = metrics.alignItemsAtEndPadding || 0;
       alignItemsAtEndPadding.set(nextPadding);
       if (!horizontal) {
@@ -110,7 +134,13 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
             return;
           }
           const vKeyboardHeight = keyboardHeight.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, padding);
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
+          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, padding);
           const topInset = calculateTopInset(safeInsetTop, isNewArchitecture, vTopInset);
           keyboardInset.set({
             bottom: keyboardInset.get().bottom,
@@ -127,7 +157,8 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
       keyboardHeight,
       keyboardInset,
       onMetricsChangeProp,
-      safeAreaInsetTop
+      safeAreaInsetTop,
+      updateScrollMetrics
     ]
   );
   useKeyboardHandler(
@@ -177,11 +208,17 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
           const progress = clampProgress(event.progress);
           const vIsOpening = isOpening.get();
           const vKeyboardHeight = keyboardHeight.get();
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
           const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, vAlignItemsPadding);
+          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const targetOffset = calculateKeyboardTargetOffset(
             scrollOffsetAtKeyboardStart.get(),
-            vKeyboardHeight,
+            vEffectiveKeyboardHeight,
             vIsOpening,
             progress
           );
@@ -210,13 +247,19 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
         if (vMode === "running") {
           const progress = clampProgress(event.progress);
           const vKeyboardHeight = keyboardHeight.get();
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
           const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, vAlignItemsPadding);
+          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const vIsOpening = isOpening.get();
           if (!wasInteractive) {
             const targetOffset = calculateKeyboardTargetOffset(
               scrollOffsetAtKeyboardStart.get(),
-              vKeyboardHeight,
+              vEffectiveKeyboardHeight,
               vIsOpening,
               progress
             );
@@ -245,7 +288,7 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
         }
       }
     },
-    [scrollViewRef, safeAreaInsetBottom]
+    [alignItemsAtEnd, safeAreaInsetBottom, scrollViewRef]
   );
   const animatedProps = useAnimatedProps(() => {
     "worklet";

package/package.json

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