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

package/index.d.mts

@@ -178,6 +178,7 @@ interface LegendListSpecificProps<ItemT, TItemType extends string | undefined> {
     initialScrollIndex?: number | {
         index: number;
         viewOffset?: number | undefined;
+        viewPosition?: number | undefined;
     };
     /**
      * When true, the list initializes scrolled to the last item.

package/index.d.ts

@@ -178,6 +178,7 @@ interface LegendListSpecificProps<ItemT, TItemType extends string | undefined> {
     initialScrollIndex?: number | {
         index: number;
         viewOffset?: number | undefined;
+        viewPosition?: number | undefined;
     };
     /**
      * When true, the list initializes scrolled to the last item.

package/index.js

@@ -3851,7 +3851,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     maintainVisibleContentPositionProp
   );
   const [renderNum, setRenderNum] = React3.useState(0);
-  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState, viewPosition: 1 } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? { index: initialScrollIndexProp.index || 0, viewOffset: initialScrollIndexProp.viewOffset || 0 } : { index: initialScrollIndexProp || 0, viewOffset: initialScrollOffsetProp || 0 } : void 0;
+  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState, viewPosition: 1 } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? {
+    index: initialScrollIndexProp.index || 0,
+    viewOffset: initialScrollIndexProp.viewOffset || (initialScrollIndexProp.viewPosition === 1 ? -stylePaddingBottomState : 0),
+    viewPosition: initialScrollIndexProp.viewPosition || 0
+  } : {
+    index: initialScrollIndexProp || 0,
+    viewOffset: initialScrollOffsetProp || 0
+  } : void 0;
   const [canRender, setCanRender] = React3__namespace.useState(!IsNewArchitecture);
   const ctx = useStateContext();
   ctx.columnWrapperStyle = columnWrapperStyle || (contentContainerStyle ? createColumnWrapperStyle(contentContainerStyle) : void 0);
@@ -3889,6 +3896,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         columns: /* @__PURE__ */ new Map(),
         containerItemKeys: /* @__PURE__ */ new Map(),
         containerItemTypes: /* @__PURE__ */ new Map(),
+        contentInsetOverride: void 0,
         dataChangeNeedsScrollUpdate: false,
         didColumnsChange: false,
         didDataChange: false,
@@ -3918,7 +3926,6 @@ 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(),

package/index.mjs

@@ -3830,7 +3830,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     maintainVisibleContentPositionProp
   );
   const [renderNum, setRenderNum] = useState(0);
-  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState, viewPosition: 1 } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? { index: initialScrollIndexProp.index || 0, viewOffset: initialScrollIndexProp.viewOffset || 0 } : { index: initialScrollIndexProp || 0, viewOffset: initialScrollOffsetProp || 0 } : void 0;
+  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState, viewPosition: 1 } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? {
+    index: initialScrollIndexProp.index || 0,
+    viewOffset: initialScrollIndexProp.viewOffset || (initialScrollIndexProp.viewPosition === 1 ? -stylePaddingBottomState : 0),
+    viewPosition: initialScrollIndexProp.viewPosition || 0
+  } : {
+    index: initialScrollIndexProp || 0,
+    viewOffset: initialScrollOffsetProp || 0
+  } : void 0;
   const [canRender, setCanRender] = React3.useState(!IsNewArchitecture);
   const ctx = useStateContext();
   ctx.columnWrapperStyle = columnWrapperStyle || (contentContainerStyle ? createColumnWrapperStyle(contentContainerStyle) : void 0);
@@ -3868,6 +3875,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         columns: /* @__PURE__ */ new Map(),
         containerItemKeys: /* @__PURE__ */ new Map(),
         containerItemTypes: /* @__PURE__ */ new Map(),
+        contentInsetOverride: void 0,
         dataChangeNeedsScrollUpdate: false,
         didColumnsChange: false,
         didDataChange: false,
@@ -3897,7 +3905,6 @@ 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(),

package/index.native.d.mts

@@ -178,6 +178,7 @@ interface LegendListSpecificProps<ItemT, TItemType extends string | undefined> {
     initialScrollIndex?: number | {
         index: number;
         viewOffset?: number | undefined;
+        viewPosition?: number | undefined;
     };
     /**
      * When true, the list initializes scrolled to the last item.

package/index.native.d.ts

@@ -178,6 +178,7 @@ interface LegendListSpecificProps<ItemT, TItemType extends string | undefined> {
     initialScrollIndex?: number | {
         index: number;
         viewOffset?: number | undefined;
+        viewPosition?: number | undefined;
     };
     /**
      * When true, the list initializes scrolled to the last item.

package/index.native.js

@@ -1622,7 +1622,6 @@ function ensureInitialAnchor(ctx) {
     settledTicks: 0
   });
   requestAdjust(ctx, delta);
-  requestAnimationFrame(() => finishScrollTo(ctx));
 }
 
 // src/core/mvcp.ts
@@ -3654,7 +3653,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     maintainVisibleContentPositionProp
   );
   const [renderNum, setRenderNum] = React2.useState(0);
-  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState, viewPosition: 1 } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? { index: initialScrollIndexProp.index || 0, viewOffset: initialScrollIndexProp.viewOffset || 0 } : { index: initialScrollIndexProp || 0, viewOffset: initialScrollOffsetProp || 0 } : void 0;
+  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState, viewPosition: 1 } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? {
+    index: initialScrollIndexProp.index || 0,
+    viewOffset: initialScrollIndexProp.viewOffset || (initialScrollIndexProp.viewPosition === 1 ? -stylePaddingBottomState : 0),
+    viewPosition: initialScrollIndexProp.viewPosition || 0
+  } : {
+    index: initialScrollIndexProp || 0,
+    viewOffset: initialScrollOffsetProp || 0
+  } : void 0;
   const [canRender, setCanRender] = React2__namespace.useState(!IsNewArchitecture);
   const ctx = useStateContext();
   ctx.columnWrapperStyle = columnWrapperStyle || (contentContainerStyle ? createColumnWrapperStyle(contentContainerStyle) : void 0);
@@ -3692,6 +3698,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         columns: /* @__PURE__ */ new Map(),
         containerItemKeys: /* @__PURE__ */ new Map(),
         containerItemTypes: /* @__PURE__ */ new Map(),
+        contentInsetOverride: void 0,
         dataChangeNeedsScrollUpdate: false,
         didColumnsChange: false,
         didDataChange: false,
@@ -3721,7 +3728,6 @@ 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(),

package/index.native.mjs

@@ -1601,7 +1601,6 @@ function ensureInitialAnchor(ctx) {
     settledTicks: 0
   });
   requestAdjust(ctx, delta);
-  requestAnimationFrame(() => finishScrollTo(ctx));
 }
 
 // src/core/mvcp.ts
@@ -3633,7 +3632,14 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
     maintainVisibleContentPositionProp
   );
   const [renderNum, setRenderNum] = useState(0);
-  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState, viewPosition: 1 } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? { index: initialScrollIndexProp.index || 0, viewOffset: initialScrollIndexProp.viewOffset || 0 } : { index: initialScrollIndexProp || 0, viewOffset: initialScrollOffsetProp || 0 } : void 0;
+  const initialScrollProp = initialScrollAtEnd ? { index: Math.max(0, dataProp.length - 1), viewOffset: -stylePaddingBottomState, viewPosition: 1 } : initialScrollIndexProp || initialScrollOffsetProp ? typeof initialScrollIndexProp === "object" ? {
+    index: initialScrollIndexProp.index || 0,
+    viewOffset: initialScrollIndexProp.viewOffset || (initialScrollIndexProp.viewPosition === 1 ? -stylePaddingBottomState : 0),
+    viewPosition: initialScrollIndexProp.viewPosition || 0
+  } : {
+    index: initialScrollIndexProp || 0,
+    viewOffset: initialScrollOffsetProp || 0
+  } : void 0;
   const [canRender, setCanRender] = React2.useState(!IsNewArchitecture);
   const ctx = useStateContext();
   ctx.columnWrapperStyle = columnWrapperStyle || (contentContainerStyle ? createColumnWrapperStyle(contentContainerStyle) : void 0);
@@ -3671,6 +3677,7 @@ var LegendListInner = typedForwardRef(function LegendListInner2(props, forwarded
         columns: /* @__PURE__ */ new Map(),
         containerItemKeys: /* @__PURE__ */ new Map(),
         containerItemTypes: /* @__PURE__ */ new Map(),
+        contentInsetOverride: void 0,
         dataChangeNeedsScrollUpdate: false,
         didColumnsChange: false,
         didDataChange: false,
@@ -3700,7 +3707,6 @@ 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(),

package/keyboard.d.mts

@@ -4,13 +4,10 @@ import { ReanimatedScrollEvent } from 'react-native-reanimated/lib/typescript/ho
 import { LegendListRef } from '@legendapp/list';
 import { AnimatedLegendListProps } from '@legendapp/list/reanimated';
 
-declare const KeyboardAvoidingLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "onScroll" | "contentInset"> & {
+declare const KeyboardAvoidingLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "onScroll" | "automaticallyAdjustContentInsets" | "contentInset"> & {
     onScroll?: (event: ReanimatedScrollEvent) => void;
     contentInset?: Insets | undefined;
-    safeAreaInsets?: {
-        top: number;
-        bottom: number;
-    };
+    safeAreaInsetBottom?: number;
 } & React.RefAttributes<LegendListRef>) => React.ReactNode;
 
 export { KeyboardAvoidingLegendList, KeyboardAvoidingLegendList as LegendList };

package/keyboard.d.ts

@@ -4,13 +4,10 @@ import { ReanimatedScrollEvent } from 'react-native-reanimated/lib/typescript/ho
 import { LegendListRef } from '@legendapp/list';
 import { AnimatedLegendListProps } from '@legendapp/list/reanimated';
 
-declare const KeyboardAvoidingLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "onScroll" | "contentInset"> & {
+declare const KeyboardAvoidingLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "onScroll" | "automaticallyAdjustContentInsets" | "contentInset"> & {
     onScroll?: (event: ReanimatedScrollEvent) => void;
     contentInset?: Insets | undefined;
-    safeAreaInsets?: {
-        top: number;
-        bottom: number;
-    };
+    safeAreaInsetBottom?: number;
 } & React.RefAttributes<LegendListRef>) => React.ReactNode;
 
 export { KeyboardAvoidingLegendList, KeyboardAvoidingLegendList as LegendList };

package/keyboard.js

@@ -28,9 +28,6 @@ var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 // src/integrations/keyboard.tsx
 
-// src/constants-platform.ts
-var IsNewArchitecture = true;
-
 // src/utils/helpers.ts
 function isFunction(obj) {
   return typeof obj === "function";
@@ -58,9 +55,9 @@ var clampProgress = (progress) => {
   "worklet";
   return Math.min(1, Math.max(0, progress));
 };
-var calculateKeyboardInset = (height, safeAreaInsetBottom, isNewArchitecture) => {
+var calculateKeyboardInset = (height, safeAreaInsetBottom) => {
   "worklet";
-  return Math.max(0, height - safeAreaInsetBottom) ;
+  return Math.max(0, height - safeAreaInsetBottom);
 };
 var calculateEffectiveKeyboardHeight = (keyboardHeight, contentLength, scrollLength, alignItemsAtEnd) => {
   "worklet";
@@ -71,14 +68,6 @@ var calculateEffectiveKeyboardHeight = (keyboardHeight, contentLength, scrollLen
     return Math.max(0, keyboardHeight - availableSpace);
   }
 };
-var calculateEndPaddingInset = (keyboardHeight, alignItemsAtEndPadding) => {
-  "worklet";
-  return Math.min(keyboardHeight, alignItemsAtEndPadding);
-};
-var calculateTopInset = (safeAreaInsetTop, isNewArchitecture, extraTopInset) => {
-  "worklet";
-  return (isNewArchitecture ? 0 : safeAreaInsetTop * 2) + extraTopInset;
-};
 var calculateKeyboardTargetOffset = (startOffset, keyboardHeight, isOpening, progress) => {
   "worklet";
   const normalizedProgress = isOpening ? progress : 1 - progress;
@@ -91,7 +80,7 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
     horizontal,
     onMetricsChange: onMetricsChangeProp,
     onScroll: onScrollProp,
-    safeAreaInsets = { bottom: 0, top: 0 },
+    safeAreaInsetBottom = 0,
     style: styleProp,
     ...rest
   } = props;
@@ -106,14 +95,13 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
   const animatedOffsetY = reactNativeReanimated.useSharedValue(null);
   const scrollOffsetAtKeyboardStart = reactNativeReanimated.useSharedValue(0);
   const mode = reactNativeReanimated.useSharedValue("idle");
-  const keyboardInset = reactNativeReanimated.useSharedValue({ bottom: 0, top: 0 });
+  const keyboardInset = reactNativeReanimated.useSharedValue(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);
-  const { top: safeAreaInsetTop, bottom: safeAreaInsetBottom } = safeAreaInsets;
   const isKeyboardOpen = reactNativeReanimated.useSharedValue(false);
   const scrollHandler = reactNativeReanimated.useAnimatedScrollHandler(
     (event) => {
@@ -147,39 +135,9 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
       updateScrollMetrics();
       const nextPadding = metrics.alignItemsAtEndPadding || 0;
       alignItemsAtEndPadding.set(nextPadding);
-      if (!horizontal) {
-        reactNativeReanimated.runOnUI((padding, safeInsetTop, isNewArchitecture) => {
-          "worklet";
-          if (!isKeyboardOpen.get()) {
-            return;
-          }
-          const vKeyboardHeight = keyboardHeight.get();
-          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,
-            top: topInset
-          });
-        })(nextPadding, safeAreaInsetTop, IsNewArchitecture);
-      }
       onMetricsChangeProp == null ? void 0 : onMetricsChangeProp(metrics);
     },
-    [
-      alignItemsAtEndPadding,
-      horizontal,
-      isKeyboardOpen,
-      keyboardHeight,
-      keyboardInset,
-      onMetricsChangeProp,
-      safeAreaInsetTop,
-      updateScrollMetrics
-    ]
+    [alignItemsAtEndPadding, onMetricsChangeProp, updateScrollMetrics]
   );
   reactNativeKeyboardController.useKeyboardHandler(
     // biome-ignore assist/source/useSortedKeys: prefer start/move/end
@@ -208,18 +166,11 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
         }
         mode.set("running");
         if (!didInteractive.get()) {
-          if (!isAndroid && !IsNewArchitecture) {
-            keyboardInset.set({
-              bottom: keyboardInset.get().bottom,
-              // Legacy iOS uses a doubled top inset to keep content below the status bar.
-              top: calculateTopInset(safeAreaInsetTop, IsNewArchitecture, 0)
-            });
-          }
           didInteractive.set(true);
         }
         if (isAndroid && !horizontal) {
           const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom);
-          keyboardInset.set({ bottom: newInset, top: safeAreaInsetTop * 2 });
+          keyboardInset.set(newInset);
         }
       },
       onMove: (event) => {
@@ -234,8 +185,6 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
             scrollLength.get(),
             alignItemsAtEnd
           );
-          const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const targetOffset = calculateKeyboardTargetOffset(
             scrollOffsetAtKeyboardStart.get(),
             vEffectiveKeyboardHeight,
@@ -246,16 +195,7 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
           animatedOffsetY.set(targetOffset);
           if (!horizontal) {
             const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom);
-            const topInset = calculateTopInset(
-              safeAreaInsetTop,
-              IsNewArchitecture,
-              vIsOpening ? vTopInset : 0
-            );
-            keyboardInset.set({
-              bottom: newInset,
-              // Add top padding only while opening to keep end-aligned items visible.
-              top: topInset
-            });
+            keyboardInset.set(newInset);
           }
         }
       },
@@ -273,8 +213,6 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
             scrollLength.get(),
             alignItemsAtEnd
           );
-          const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const vIsOpening = isOpening.get();
           if (!wasInteractive) {
             const targetOffset = calculateKeyboardTargetOffset(
@@ -291,16 +229,7 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
           isKeyboardOpen.set(event.height > 0);
           if (!horizontal) {
             const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom);
-            const topInset = calculateTopInset(
-              safeAreaInsetTop,
-              IsNewArchitecture,
-              event.height > 0 ? vTopInset : 0
-            );
-            keyboardInset.set({
-              bottom: newInset,
-              // Preserve end-aligned padding only while the keyboard is visible.
-              top: topInset
-            });
+            keyboardInset.set(newInset);
             if (newInset <= 0) {
               animatedOffsetY.set(scrollOffsetY.get());
             }
@@ -320,24 +249,21 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
         y: vAnimatedOffsetY
       }
     };
-    const { top: keyboardInsetTop, bottom: keyboardInsetBottom } = keyboardInset.get();
+    const keyboardInsetBottom = keyboardInset.get();
     return isIos ? Object.assign(baseProps, {
       contentInset: {
         bottom: ((_a = contentInsetProp == null ? void 0 : contentInsetProp.bottom) != null ? _a : 0) + (horizontal ? 0 : keyboardInsetBottom),
         left: (_b = contentInsetProp == null ? void 0 : contentInsetProp.left) != null ? _b : 0,
         right: (_c = contentInsetProp == null ? void 0 : contentInsetProp.right) != null ? _c : 0,
-        top: ((_d = contentInsetProp == null ? void 0 : contentInsetProp.top) != null ? _d : 0) - keyboardInsetTop
+        top: (_d = contentInsetProp == null ? void 0 : contentInsetProp.top) != null ? _d : 0
       }
     }) : baseProps;
   });
   const style = isAndroid ? reactNativeReanimated.useAnimatedStyle(
-    () => {
-      var _a;
-      return {
-        ...styleFlattened || {},
-        marginBottom: (_a = keyboardInset.get().bottom) != null ? _a : 0
-      };
-    },
+    () => ({
+      ...styleFlattened || {},
+      marginBottom: keyboardInset.get()
+    }),
     [styleProp, keyboardInset]
   ) : void 0;
   return /* @__PURE__ */ React__namespace.createElement(
@@ -345,6 +271,7 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
     {
       ...rest,
       animatedProps,
+      automaticallyAdjustContentInsets: false,
       keyboardDismissMode: "interactive",
       onMetricsChange: handleMetricsChange,
       onScroll: scrollHandler,

package/keyboard.mjs

@@ -2,14 +2,11 @@ import * as React from 'react';
 import { forwardRef, useRef, useCallback } from 'react';
 import { StyleSheet, Platform } from 'react-native';
 import { useKeyboardHandler } from 'react-native-keyboard-controller';
-import { useAnimatedRef, useSharedValue, useAnimatedScrollHandler, runOnJS, runOnUI, useAnimatedProps, useAnimatedStyle } from 'react-native-reanimated';
+import { useAnimatedRef, useSharedValue, useAnimatedScrollHandler, runOnJS, useAnimatedProps, useAnimatedStyle } from 'react-native-reanimated';
 import { AnimatedLegendList } from '@legendapp/list/reanimated';
 
 // src/integrations/keyboard.tsx
 
-// src/constants-platform.ts
-var IsNewArchitecture = true;
-
 // src/utils/helpers.ts
 function isFunction(obj) {
   return typeof obj === "function";
@@ -37,9 +34,9 @@ var clampProgress = (progress) => {
   "worklet";
   return Math.min(1, Math.max(0, progress));
 };
-var calculateKeyboardInset = (height, safeAreaInsetBottom, isNewArchitecture) => {
+var calculateKeyboardInset = (height, safeAreaInsetBottom) => {
   "worklet";
-  return Math.max(0, height - safeAreaInsetBottom) ;
+  return Math.max(0, height - safeAreaInsetBottom);
 };
 var calculateEffectiveKeyboardHeight = (keyboardHeight, contentLength, scrollLength, alignItemsAtEnd) => {
   "worklet";
@@ -50,14 +47,6 @@ var calculateEffectiveKeyboardHeight = (keyboardHeight, contentLength, scrollLen
     return Math.max(0, keyboardHeight - availableSpace);
   }
 };
-var calculateEndPaddingInset = (keyboardHeight, alignItemsAtEndPadding) => {
-  "worklet";
-  return Math.min(keyboardHeight, alignItemsAtEndPadding);
-};
-var calculateTopInset = (safeAreaInsetTop, isNewArchitecture, extraTopInset) => {
-  "worklet";
-  return (isNewArchitecture ? 0 : safeAreaInsetTop * 2) + extraTopInset;
-};
 var calculateKeyboardTargetOffset = (startOffset, keyboardHeight, isOpening, progress) => {
   "worklet";
   const normalizedProgress = isOpening ? progress : 1 - progress;
@@ -70,7 +59,7 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
     horizontal,
     onMetricsChange: onMetricsChangeProp,
     onScroll: onScrollProp,
-    safeAreaInsets = { bottom: 0, top: 0 },
+    safeAreaInsetBottom = 0,
     style: styleProp,
     ...rest
   } = props;
@@ -85,14 +74,13 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
   const animatedOffsetY = useSharedValue(null);
   const scrollOffsetAtKeyboardStart = useSharedValue(0);
   const mode = useSharedValue("idle");
-  const keyboardInset = useSharedValue({ bottom: 0, top: 0 });
+  const keyboardInset = useSharedValue(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);
-  const { top: safeAreaInsetTop, bottom: safeAreaInsetBottom } = safeAreaInsets;
   const isKeyboardOpen = useSharedValue(false);
   const scrollHandler = useAnimatedScrollHandler(
     (event) => {
@@ -126,39 +114,9 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
       updateScrollMetrics();
       const nextPadding = metrics.alignItemsAtEndPadding || 0;
       alignItemsAtEndPadding.set(nextPadding);
-      if (!horizontal) {
-        runOnUI((padding, safeInsetTop, isNewArchitecture) => {
-          "worklet";
-          if (!isKeyboardOpen.get()) {
-            return;
-          }
-          const vKeyboardHeight = keyboardHeight.get();
-          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,
-            top: topInset
-          });
-        })(nextPadding, safeAreaInsetTop, IsNewArchitecture);
-      }
       onMetricsChangeProp == null ? void 0 : onMetricsChangeProp(metrics);
     },
-    [
-      alignItemsAtEndPadding,
-      horizontal,
-      isKeyboardOpen,
-      keyboardHeight,
-      keyboardInset,
-      onMetricsChangeProp,
-      safeAreaInsetTop,
-      updateScrollMetrics
-    ]
+    [alignItemsAtEndPadding, onMetricsChangeProp, updateScrollMetrics]
   );
   useKeyboardHandler(
     // biome-ignore assist/source/useSortedKeys: prefer start/move/end
@@ -187,18 +145,11 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
         }
         mode.set("running");
         if (!didInteractive.get()) {
-          if (!isAndroid && !IsNewArchitecture) {
-            keyboardInset.set({
-              bottom: keyboardInset.get().bottom,
-              // Legacy iOS uses a doubled top inset to keep content below the status bar.
-              top: calculateTopInset(safeAreaInsetTop, IsNewArchitecture, 0)
-            });
-          }
           didInteractive.set(true);
         }
         if (isAndroid && !horizontal) {
           const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom);
-          keyboardInset.set({ bottom: newInset, top: safeAreaInsetTop * 2 });
+          keyboardInset.set(newInset);
         }
       },
       onMove: (event) => {
@@ -213,8 +164,6 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
             scrollLength.get(),
             alignItemsAtEnd
           );
-          const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const targetOffset = calculateKeyboardTargetOffset(
             scrollOffsetAtKeyboardStart.get(),
             vEffectiveKeyboardHeight,
@@ -225,16 +174,7 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
           animatedOffsetY.set(targetOffset);
           if (!horizontal) {
             const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom);
-            const topInset = calculateTopInset(
-              safeAreaInsetTop,
-              IsNewArchitecture,
-              vIsOpening ? vTopInset : 0
-            );
-            keyboardInset.set({
-              bottom: newInset,
-              // Add top padding only while opening to keep end-aligned items visible.
-              top: topInset
-            });
+            keyboardInset.set(newInset);
           }
         }
       },
@@ -252,8 +192,6 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
             scrollLength.get(),
             alignItemsAtEnd
           );
-          const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const vIsOpening = isOpening.get();
           if (!wasInteractive) {
             const targetOffset = calculateKeyboardTargetOffset(
@@ -270,16 +208,7 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
           isKeyboardOpen.set(event.height > 0);
           if (!horizontal) {
             const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom);
-            const topInset = calculateTopInset(
-              safeAreaInsetTop,
-              IsNewArchitecture,
-              event.height > 0 ? vTopInset : 0
-            );
-            keyboardInset.set({
-              bottom: newInset,
-              // Preserve end-aligned padding only while the keyboard is visible.
-              top: topInset
-            });
+            keyboardInset.set(newInset);
             if (newInset <= 0) {
               animatedOffsetY.set(scrollOffsetY.get());
             }
@@ -299,24 +228,21 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
         y: vAnimatedOffsetY
       }
     };
-    const { top: keyboardInsetTop, bottom: keyboardInsetBottom } = keyboardInset.get();
+    const keyboardInsetBottom = keyboardInset.get();
     return isIos ? Object.assign(baseProps, {
       contentInset: {
         bottom: ((_a = contentInsetProp == null ? void 0 : contentInsetProp.bottom) != null ? _a : 0) + (horizontal ? 0 : keyboardInsetBottom),
         left: (_b = contentInsetProp == null ? void 0 : contentInsetProp.left) != null ? _b : 0,
         right: (_c = contentInsetProp == null ? void 0 : contentInsetProp.right) != null ? _c : 0,
-        top: ((_d = contentInsetProp == null ? void 0 : contentInsetProp.top) != null ? _d : 0) - keyboardInsetTop
+        top: (_d = contentInsetProp == null ? void 0 : contentInsetProp.top) != null ? _d : 0
       }
     }) : baseProps;
   });
   const style = isAndroid ? useAnimatedStyle(
-    () => {
-      var _a;
-      return {
-        ...styleFlattened || {},
-        marginBottom: (_a = keyboardInset.get().bottom) != null ? _a : 0
-      };
-    },
+    () => ({
+      ...styleFlattened || {},
+      marginBottom: keyboardInset.get()
+    }),
     [styleProp, keyboardInset]
   ) : void 0;
   return /* @__PURE__ */ React.createElement(
@@ -324,6 +250,7 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
     {
       ...rest,
       animatedProps,
+      automaticallyAdjustContentInsets: false,
       keyboardDismissMode: "interactive",
       onMetricsChange: handleMetricsChange,
       onScroll: scrollHandler,

package/keyboard.native.d.mts

@@ -4,13 +4,10 @@ import { ReanimatedScrollEvent } from 'react-native-reanimated/lib/typescript/ho
 import { LegendListRef } from '@legendapp/list';
 import { AnimatedLegendListProps } from '@legendapp/list/reanimated';
 
-declare const KeyboardAvoidingLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "onScroll" | "contentInset"> & {
+declare const KeyboardAvoidingLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "onScroll" | "automaticallyAdjustContentInsets" | "contentInset"> & {
     onScroll?: (event: ReanimatedScrollEvent) => void;
     contentInset?: Insets | undefined;
-    safeAreaInsets?: {
-        top: number;
-        bottom: number;
-    };
+    safeAreaInsetBottom?: number;
 } & React.RefAttributes<LegendListRef>) => React.ReactNode;
 
 export { KeyboardAvoidingLegendList, KeyboardAvoidingLegendList as LegendList };

package/keyboard.native.d.ts

@@ -4,13 +4,10 @@ import { ReanimatedScrollEvent } from 'react-native-reanimated/lib/typescript/ho
 import { LegendListRef } from '@legendapp/list';
 import { AnimatedLegendListProps } from '@legendapp/list/reanimated';
 
-declare const KeyboardAvoidingLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "onScroll" | "contentInset"> & {
+declare const KeyboardAvoidingLegendList: <ItemT>(props: Omit<AnimatedLegendListProps<ItemT>, "onScroll" | "automaticallyAdjustContentInsets" | "contentInset"> & {
     onScroll?: (event: ReanimatedScrollEvent) => void;
     contentInset?: Insets | undefined;
-    safeAreaInsets?: {
-        top: number;
-        bottom: number;
-    };
+    safeAreaInsetBottom?: number;
 } & React.RefAttributes<LegendListRef>) => React.ReactNode;
 
 export { KeyboardAvoidingLegendList, KeyboardAvoidingLegendList as LegendList };

package/keyboard.native.js

@@ -28,10 +28,6 @@ var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 // src/integrations/keyboard.tsx
 
-// src/constants-platform.native.ts
-var f = global.nativeFabricUIManager;
-var IsNewArchitecture = f !== void 0 && f != null;
-
 // src/utils/helpers.ts
 function isFunction(obj) {
   return typeof obj === "function";
@@ -59,9 +55,9 @@ var clampProgress = (progress) => {
   "worklet";
   return Math.min(1, Math.max(0, progress));
 };
-var calculateKeyboardInset = (height, safeAreaInsetBottom, isNewArchitecture) => {
+var calculateKeyboardInset = (height, safeAreaInsetBottom) => {
   "worklet";
-  return isNewArchitecture ? Math.max(0, height - safeAreaInsetBottom) : Math.max(isNewArchitecture ? 0 : -safeAreaInsetBottom, height - safeAreaInsetBottom * 2);
+  return Math.max(0, height - safeAreaInsetBottom);
 };
 var calculateEffectiveKeyboardHeight = (keyboardHeight, contentLength, scrollLength, alignItemsAtEnd) => {
   "worklet";
@@ -72,14 +68,6 @@ var calculateEffectiveKeyboardHeight = (keyboardHeight, contentLength, scrollLen
     return Math.max(0, keyboardHeight - availableSpace);
   }
 };
-var calculateEndPaddingInset = (keyboardHeight, alignItemsAtEndPadding) => {
-  "worklet";
-  return Math.min(keyboardHeight, alignItemsAtEndPadding);
-};
-var calculateTopInset = (safeAreaInsetTop, isNewArchitecture, extraTopInset) => {
-  "worklet";
-  return (isNewArchitecture ? 0 : safeAreaInsetTop * 2) + extraTopInset;
-};
 var calculateKeyboardTargetOffset = (startOffset, keyboardHeight, isOpening, progress) => {
   "worklet";
   const normalizedProgress = isOpening ? progress : 1 - progress;
@@ -92,7 +80,7 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
     horizontal,
     onMetricsChange: onMetricsChangeProp,
     onScroll: onScrollProp,
-    safeAreaInsets = { bottom: 0, top: 0 },
+    safeAreaInsetBottom = 0,
     style: styleProp,
     ...rest
   } = props;
@@ -107,14 +95,13 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
   const animatedOffsetY = reactNativeReanimated.useSharedValue(null);
   const scrollOffsetAtKeyboardStart = reactNativeReanimated.useSharedValue(0);
   const mode = reactNativeReanimated.useSharedValue("idle");
-  const keyboardInset = reactNativeReanimated.useSharedValue({ bottom: 0, top: 0 });
+  const keyboardInset = reactNativeReanimated.useSharedValue(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);
-  const { top: safeAreaInsetTop, bottom: safeAreaInsetBottom } = safeAreaInsets;
   const isKeyboardOpen = reactNativeReanimated.useSharedValue(false);
   const scrollHandler = reactNativeReanimated.useAnimatedScrollHandler(
     (event) => {
@@ -148,39 +135,9 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
       updateScrollMetrics();
       const nextPadding = metrics.alignItemsAtEndPadding || 0;
       alignItemsAtEndPadding.set(nextPadding);
-      if (!horizontal) {
-        reactNativeReanimated.runOnUI((padding, safeInsetTop, isNewArchitecture) => {
-          "worklet";
-          if (!isKeyboardOpen.get()) {
-            return;
-          }
-          const vKeyboardHeight = keyboardHeight.get();
-          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,
-            top: topInset
-          });
-        })(nextPadding, safeAreaInsetTop, IsNewArchitecture);
-      }
       onMetricsChangeProp == null ? void 0 : onMetricsChangeProp(metrics);
     },
-    [
-      alignItemsAtEndPadding,
-      horizontal,
-      isKeyboardOpen,
-      keyboardHeight,
-      keyboardInset,
-      onMetricsChangeProp,
-      safeAreaInsetTop,
-      updateScrollMetrics
-    ]
+    [alignItemsAtEndPadding, onMetricsChangeProp, updateScrollMetrics]
   );
   reactNativeKeyboardController.useKeyboardHandler(
     // biome-ignore assist/source/useSortedKeys: prefer start/move/end
@@ -209,18 +166,11 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
         }
         mode.set("running");
         if (!didInteractive.get()) {
-          if (!isAndroid && !IsNewArchitecture) {
-            keyboardInset.set({
-              bottom: keyboardInset.get().bottom,
-              // Legacy iOS uses a doubled top inset to keep content below the status bar.
-              top: calculateTopInset(safeAreaInsetTop, IsNewArchitecture, 0)
-            });
-          }
           didInteractive.set(true);
         }
         if (isAndroid && !horizontal) {
-          const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom, IsNewArchitecture);
-          keyboardInset.set({ bottom: newInset, top: safeAreaInsetTop * 2 });
+          const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom);
+          keyboardInset.set(newInset);
         }
       },
       onMove: (event) => {
@@ -235,8 +185,6 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
             scrollLength.get(),
             alignItemsAtEnd
           );
-          const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const targetOffset = calculateKeyboardTargetOffset(
             scrollOffsetAtKeyboardStart.get(),
             vEffectiveKeyboardHeight,
@@ -246,17 +194,8 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
           scrollOffsetY.set(targetOffset);
           animatedOffsetY.set(targetOffset);
           if (!horizontal) {
-            const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom, IsNewArchitecture);
-            const topInset = calculateTopInset(
-              safeAreaInsetTop,
-              IsNewArchitecture,
-              vIsOpening ? vTopInset : 0
-            );
-            keyboardInset.set({
-              bottom: newInset,
-              // Add top padding only while opening to keep end-aligned items visible.
-              top: topInset
-            });
+            const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom);
+            keyboardInset.set(newInset);
           }
         }
       },
@@ -274,8 +213,6 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
             scrollLength.get(),
             alignItemsAtEnd
           );
-          const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const vIsOpening = isOpening.get();
           if (!wasInteractive) {
             const targetOffset = calculateKeyboardTargetOffset(
@@ -291,17 +228,8 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
           didInteractive.set(false);
           isKeyboardOpen.set(event.height > 0);
           if (!horizontal) {
-            const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom, IsNewArchitecture);
-            const topInset = calculateTopInset(
-              safeAreaInsetTop,
-              IsNewArchitecture,
-              event.height > 0 ? vTopInset : 0
-            );
-            keyboardInset.set({
-              bottom: newInset,
-              // Preserve end-aligned padding only while the keyboard is visible.
-              top: topInset
-            });
+            const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom);
+            keyboardInset.set(newInset);
             if (newInset <= 0) {
               animatedOffsetY.set(scrollOffsetY.get());
             }
@@ -321,24 +249,21 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
         y: vAnimatedOffsetY
       }
     };
-    const { top: keyboardInsetTop, bottom: keyboardInsetBottom } = keyboardInset.get();
+    const keyboardInsetBottom = keyboardInset.get();
     return isIos ? Object.assign(baseProps, {
       contentInset: {
         bottom: ((_a = contentInsetProp == null ? void 0 : contentInsetProp.bottom) != null ? _a : 0) + (horizontal ? 0 : keyboardInsetBottom),
         left: (_b = contentInsetProp == null ? void 0 : contentInsetProp.left) != null ? _b : 0,
         right: (_c = contentInsetProp == null ? void 0 : contentInsetProp.right) != null ? _c : 0,
-        top: ((_d = contentInsetProp == null ? void 0 : contentInsetProp.top) != null ? _d : 0) - keyboardInsetTop
+        top: (_d = contentInsetProp == null ? void 0 : contentInsetProp.top) != null ? _d : 0
       }
     }) : baseProps;
   });
   const style = isAndroid ? reactNativeReanimated.useAnimatedStyle(
-    () => {
-      var _a;
-      return {
-        ...styleFlattened || {},
-        marginBottom: (_a = keyboardInset.get().bottom) != null ? _a : 0
-      };
-    },
+    () => ({
+      ...styleFlattened || {},
+      marginBottom: keyboardInset.get()
+    }),
     [styleProp, keyboardInset]
   ) : void 0;
   return /* @__PURE__ */ React__namespace.createElement(
@@ -346,6 +271,7 @@ var KeyboardAvoidingLegendList = React.forwardRef(function KeyboardAvoidingLegen
     {
       ...rest,
       animatedProps,
+      automaticallyAdjustContentInsets: false,
       keyboardDismissMode: "interactive",
       onMetricsChange: handleMetricsChange,
       onScroll: scrollHandler,

package/keyboard.native.mjs

@@ -2,15 +2,11 @@ import * as React from 'react';
 import { forwardRef, useRef, useCallback } from 'react';
 import { StyleSheet, Platform } from 'react-native';
 import { useKeyboardHandler } from 'react-native-keyboard-controller';
-import { useAnimatedRef, useSharedValue, useAnimatedScrollHandler, runOnJS, runOnUI, useAnimatedProps, useAnimatedStyle } from 'react-native-reanimated';
+import { useAnimatedRef, useSharedValue, useAnimatedScrollHandler, runOnJS, useAnimatedProps, useAnimatedStyle } from 'react-native-reanimated';
 import { AnimatedLegendList } from '@legendapp/list/reanimated';
 
 // src/integrations/keyboard.tsx
 
-// src/constants-platform.native.ts
-var f = global.nativeFabricUIManager;
-var IsNewArchitecture = f !== void 0 && f != null;
-
 // src/utils/helpers.ts
 function isFunction(obj) {
   return typeof obj === "function";
@@ -38,9 +34,9 @@ var clampProgress = (progress) => {
   "worklet";
   return Math.min(1, Math.max(0, progress));
 };
-var calculateKeyboardInset = (height, safeAreaInsetBottom, isNewArchitecture) => {
+var calculateKeyboardInset = (height, safeAreaInsetBottom) => {
   "worklet";
-  return isNewArchitecture ? Math.max(0, height - safeAreaInsetBottom) : Math.max(isNewArchitecture ? 0 : -safeAreaInsetBottom, height - safeAreaInsetBottom * 2);
+  return Math.max(0, height - safeAreaInsetBottom);
 };
 var calculateEffectiveKeyboardHeight = (keyboardHeight, contentLength, scrollLength, alignItemsAtEnd) => {
   "worklet";
@@ -51,14 +47,6 @@ var calculateEffectiveKeyboardHeight = (keyboardHeight, contentLength, scrollLen
     return Math.max(0, keyboardHeight - availableSpace);
   }
 };
-var calculateEndPaddingInset = (keyboardHeight, alignItemsAtEndPadding) => {
-  "worklet";
-  return Math.min(keyboardHeight, alignItemsAtEndPadding);
-};
-var calculateTopInset = (safeAreaInsetTop, isNewArchitecture, extraTopInset) => {
-  "worklet";
-  return (isNewArchitecture ? 0 : safeAreaInsetTop * 2) + extraTopInset;
-};
 var calculateKeyboardTargetOffset = (startOffset, keyboardHeight, isOpening, progress) => {
   "worklet";
   const normalizedProgress = isOpening ? progress : 1 - progress;
@@ -71,7 +59,7 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
     horizontal,
     onMetricsChange: onMetricsChangeProp,
     onScroll: onScrollProp,
-    safeAreaInsets = { bottom: 0, top: 0 },
+    safeAreaInsetBottom = 0,
     style: styleProp,
     ...rest
   } = props;
@@ -86,14 +74,13 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
   const animatedOffsetY = useSharedValue(null);
   const scrollOffsetAtKeyboardStart = useSharedValue(0);
   const mode = useSharedValue("idle");
-  const keyboardInset = useSharedValue({ bottom: 0, top: 0 });
+  const keyboardInset = useSharedValue(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);
-  const { top: safeAreaInsetTop, bottom: safeAreaInsetBottom } = safeAreaInsets;
   const isKeyboardOpen = useSharedValue(false);
   const scrollHandler = useAnimatedScrollHandler(
     (event) => {
@@ -127,39 +114,9 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
       updateScrollMetrics();
       const nextPadding = metrics.alignItemsAtEndPadding || 0;
       alignItemsAtEndPadding.set(nextPadding);
-      if (!horizontal) {
-        runOnUI((padding, safeInsetTop, isNewArchitecture) => {
-          "worklet";
-          if (!isKeyboardOpen.get()) {
-            return;
-          }
-          const vKeyboardHeight = keyboardHeight.get();
-          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,
-            top: topInset
-          });
-        })(nextPadding, safeAreaInsetTop, IsNewArchitecture);
-      }
       onMetricsChangeProp == null ? void 0 : onMetricsChangeProp(metrics);
     },
-    [
-      alignItemsAtEndPadding,
-      horizontal,
-      isKeyboardOpen,
-      keyboardHeight,
-      keyboardInset,
-      onMetricsChangeProp,
-      safeAreaInsetTop,
-      updateScrollMetrics
-    ]
+    [alignItemsAtEndPadding, onMetricsChangeProp, updateScrollMetrics]
   );
   useKeyboardHandler(
     // biome-ignore assist/source/useSortedKeys: prefer start/move/end
@@ -188,18 +145,11 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
         }
         mode.set("running");
         if (!didInteractive.get()) {
-          if (!isAndroid && !IsNewArchitecture) {
-            keyboardInset.set({
-              bottom: keyboardInset.get().bottom,
-              // Legacy iOS uses a doubled top inset to keep content below the status bar.
-              top: calculateTopInset(safeAreaInsetTop, IsNewArchitecture, 0)
-            });
-          }
           didInteractive.set(true);
         }
         if (isAndroid && !horizontal) {
-          const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom, IsNewArchitecture);
-          keyboardInset.set({ bottom: newInset, top: safeAreaInsetTop * 2 });
+          const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom);
+          keyboardInset.set(newInset);
         }
       },
       onMove: (event) => {
@@ -214,8 +164,6 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
             scrollLength.get(),
             alignItemsAtEnd
           );
-          const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const targetOffset = calculateKeyboardTargetOffset(
             scrollOffsetAtKeyboardStart.get(),
             vEffectiveKeyboardHeight,
@@ -225,17 +173,8 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
           scrollOffsetY.set(targetOffset);
           animatedOffsetY.set(targetOffset);
           if (!horizontal) {
-            const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom, IsNewArchitecture);
-            const topInset = calculateTopInset(
-              safeAreaInsetTop,
-              IsNewArchitecture,
-              vIsOpening ? vTopInset : 0
-            );
-            keyboardInset.set({
-              bottom: newInset,
-              // Add top padding only while opening to keep end-aligned items visible.
-              top: topInset
-            });
+            const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom);
+            keyboardInset.set(newInset);
           }
         }
       },
@@ -253,8 +192,6 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
             scrollLength.get(),
             alignItemsAtEnd
           );
-          const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vEffectiveKeyboardHeight, vAlignItemsPadding);
           const vIsOpening = isOpening.get();
           if (!wasInteractive) {
             const targetOffset = calculateKeyboardTargetOffset(
@@ -270,17 +207,8 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
           didInteractive.set(false);
           isKeyboardOpen.set(event.height > 0);
           if (!horizontal) {
-            const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom, IsNewArchitecture);
-            const topInset = calculateTopInset(
-              safeAreaInsetTop,
-              IsNewArchitecture,
-              event.height > 0 ? vTopInset : 0
-            );
-            keyboardInset.set({
-              bottom: newInset,
-              // Preserve end-aligned padding only while the keyboard is visible.
-              top: topInset
-            });
+            const newInset = calculateKeyboardInset(event.height, safeAreaInsetBottom);
+            keyboardInset.set(newInset);
             if (newInset <= 0) {
               animatedOffsetY.set(scrollOffsetY.get());
             }
@@ -300,24 +228,21 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
         y: vAnimatedOffsetY
       }
     };
-    const { top: keyboardInsetTop, bottom: keyboardInsetBottom } = keyboardInset.get();
+    const keyboardInsetBottom = keyboardInset.get();
     return isIos ? Object.assign(baseProps, {
       contentInset: {
         bottom: ((_a = contentInsetProp == null ? void 0 : contentInsetProp.bottom) != null ? _a : 0) + (horizontal ? 0 : keyboardInsetBottom),
         left: (_b = contentInsetProp == null ? void 0 : contentInsetProp.left) != null ? _b : 0,
         right: (_c = contentInsetProp == null ? void 0 : contentInsetProp.right) != null ? _c : 0,
-        top: ((_d = contentInsetProp == null ? void 0 : contentInsetProp.top) != null ? _d : 0) - keyboardInsetTop
+        top: (_d = contentInsetProp == null ? void 0 : contentInsetProp.top) != null ? _d : 0
       }
     }) : baseProps;
   });
   const style = isAndroid ? useAnimatedStyle(
-    () => {
-      var _a;
-      return {
-        ...styleFlattened || {},
-        marginBottom: (_a = keyboardInset.get().bottom) != null ? _a : 0
-      };
-    },
+    () => ({
+      ...styleFlattened || {},
+      marginBottom: keyboardInset.get()
+    }),
     [styleProp, keyboardInset]
   ) : void 0;
   return /* @__PURE__ */ React.createElement(
@@ -325,6 +250,7 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
     {
       ...rest,
       animatedProps,
+      automaticallyAdjustContentInsets: false,
       keyboardDismissMode: "interactive",
       onMetricsChange: handleMetricsChange,
       onScroll: scrollHandler,

package/package.json

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