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

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,17 +34,18 @@ var clampProgress = (progress) => {
   "worklet";
   return Math.min(1, Math.max(0, progress));
 };
-var calculateKeyboardInset = (height, safeAreaInsetBottom, isNewArchitecture) => {
-  "worklet";
-  return isNewArchitecture ? Math.max(0, height - safeAreaInsetBottom) : Math.max(isNewArchitecture ? 0 : -safeAreaInsetBottom, height - safeAreaInsetBottom * 2);
-};
-var calculateEndPaddingInset = (keyboardHeight, alignItemsAtEndPadding) => {
+var calculateKeyboardInset = (height, safeAreaInsetBottom) => {
   "worklet";
-  return Math.min(keyboardHeight, alignItemsAtEndPadding);
+  return Math.max(0, height - safeAreaInsetBottom);
 };
-var calculateTopInset = (safeAreaInsetTop, isNewArchitecture, extraTopInset) => {
+var calculateEffectiveKeyboardHeight = (keyboardHeight, contentLength, scrollLength, alignItemsAtEnd) => {
   "worklet";
-  return (isNewArchitecture ? 0 : safeAreaInsetTop * 2) + extraTopInset;
+  if (alignItemsAtEnd) {
+    return keyboardHeight;
+  } else {
+    const availableSpace = Math.max(0, scrollLength - contentLength);
+    return Math.max(0, keyboardHeight - availableSpace);
+  }
 };
 var calculateKeyboardTargetOffset = (startOffset, keyboardHeight, isOpening, progress) => {
   "worklet";
@@ -62,10 +59,11 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
     horizontal,
     onMetricsChange: onMetricsChangeProp,
     onScroll: onScrollProp,
-    safeAreaInsets = { bottom: 0, top: 0 },
+    safeAreaInsetBottom = 0,
     style: styleProp,
     ...rest
   } = props;
+  const { alignItemsAtEnd } = props;
   const styleFlattened = StyleSheet.flatten(styleProp);
   const refLegendList = useRef(null);
   const combinedRef = useCombinedRef(forwardedRef, refLegendList);
@@ -76,16 +74,19 @@ 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) => {
-      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,36 +100,23 @@ 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) {
-        runOnUI((padding, safeInsetTop, isNewArchitecture) => {
-          "worklet";
-          if (!isKeyboardOpen.get()) {
-            return;
-          }
-          const vKeyboardHeight = keyboardHeight.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, 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
-    ]
+    [alignItemsAtEndPadding, onMetricsChangeProp, updateScrollMetrics]
   );
   useKeyboardHandler(
     // biome-ignore assist/source/useSortedKeys: prefer start/move/end
@@ -157,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) => {
@@ -177,28 +158,23 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
           const progress = clampProgress(event.progress);
           const vIsOpening = isOpening.get();
           const vKeyboardHeight = keyboardHeight.get();
-          const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, vAlignItemsPadding);
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
           const targetOffset = calculateKeyboardTargetOffset(
             scrollOffsetAtKeyboardStart.get(),
-            vKeyboardHeight,
+            vEffectiveKeyboardHeight,
             vIsOpening,
             progress
           );
           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);
           }
         }
       },
@@ -210,13 +186,17 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
         if (vMode === "running") {
           const progress = clampProgress(event.progress);
           const vKeyboardHeight = keyboardHeight.get();
-          const vAlignItemsPadding = alignItemsAtEndPadding.get();
-          const vTopInset = calculateEndPaddingInset(vKeyboardHeight, vAlignItemsPadding);
+          const vEffectiveKeyboardHeight = calculateEffectiveKeyboardHeight(
+            vKeyboardHeight,
+            contentLength.get(),
+            scrollLength.get(),
+            alignItemsAtEnd
+          );
           const vIsOpening = isOpening.get();
           if (!wasInteractive) {
             const targetOffset = calculateKeyboardTargetOffset(
               scrollOffsetAtKeyboardStart.get(),
-              vKeyboardHeight,
+              vEffectiveKeyboardHeight,
               vIsOpening,
               progress
             );
@@ -227,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());
             }
@@ -245,7 +216,7 @@ var KeyboardAvoidingLegendList = forwardRef(function KeyboardAvoidingLegendList2
         }
       }
     },
-    [scrollViewRef, safeAreaInsetBottom]
+    [alignItemsAtEnd, safeAreaInsetBottom, scrollViewRef]
   );
   const animatedProps = useAnimatedProps(() => {
     "worklet";
@@ -257,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(
@@ -282,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.21",
+  "version": "3.0.0-beta.23",
   "description": "Legend List is a drop-in replacement for FlatList with much better performance and supporting dynamically sized items.",
   "sideEffects": false,
   "private": false,