react-native-reorderable-list 0.12.0 → 0.13.1

package/src/components/ScrollViewContainer.tsx

@@ -1,8 +1,10 @@
-import React, {useMemo} from 'react';
+import React, {useCallback, useMemo} from 'react';
 import {LayoutChangeEvent} from 'react-native';
 
 import {Gesture, GestureDetector} from 'react-native-gesture-handler';
 import Animated, {
+  measure,
+  runOnUI,
   useAnimatedRef,
   useAnimatedScrollHandler,
   useComposedEventHandler,
@@ -21,6 +23,7 @@ export const ScrollViewContainer: React.FC<ScrollViewContainerProps> = ({
   const scrollViewScrollEnabled = useSharedValue(scrollEnabled);
   const scrollViewContainerRef = useAnimatedRef<Animated.ScrollView>();
   const scrollViewScrollOffsetY = useSharedValue(0);
+  const scrollViewPageY = useSharedValue(0);
   const scrollViewHeightY = useSharedValue(0);
 
   const outerScrollGesture = useMemo(() => Gesture.Native(), []);
@@ -40,6 +43,7 @@ export const ScrollViewContainer: React.FC<ScrollViewContainerProps> = ({
   const contextValue = useMemo(
     () => ({
       scrollViewContainerRef,
+      scrollViewPageY,
       scrollViewHeightY,
       scrollViewScrollOffsetY,
       scrollViewScrollEnabled,
@@ -48,6 +52,7 @@ export const ScrollViewContainer: React.FC<ScrollViewContainerProps> = ({
     }),
     [
       scrollViewContainerRef,
+      scrollViewPageY,
       scrollViewHeightY,
       scrollViewScrollOffsetY,
       scrollViewScrollEnabled,
@@ -56,11 +61,24 @@ export const ScrollViewContainer: React.FC<ScrollViewContainerProps> = ({
     ],
   );
 
-  const handleLayout = (e: LayoutChangeEvent) => {
-    scrollViewHeightY.value = e.nativeEvent.layout.height;
+  const handleLayout = useCallback(
+    (e: LayoutChangeEvent) => {
+      scrollViewHeightY.value = e.nativeEvent.layout.height;
 
-    onLayout?.(e);
-  };
+      // measuring pageY allows wrapping nested lists in other views
+      runOnUI(() => {
+        const measurement = measure(scrollViewContainerRef);
+        if (!measurement) {
+          return;
+        }
+
+        scrollViewPageY.value = measurement.pageY;
+      })();
+
+      onLayout?.(e);
+    },
+    [onLayout, scrollViewContainerRef, scrollViewHeightY, scrollViewPageY],
+  );
 
   return (
     <ScrollViewContainerContext.Provider value={contextValue}>

package/src/contexts/ScrollViewContainerContext.ts

@@ -6,6 +6,7 @@ import {SharedValue} from 'react-native-reanimated';
 
 interface ScrollViewContainerContextData {
   scrollViewContainerRef: React.RefObject<ScrollView>;
+  scrollViewPageY: SharedValue<number>;
   scrollViewHeightY: SharedValue<number>;
   scrollViewScrollOffsetY: SharedValue<number>;
   scrollViewScrollEnabled: SharedValue<boolean>;

package/src/types/props.ts

@@ -95,11 +95,6 @@ export interface ReorderableListProps<T>
    * Default: `5`.
    */
   autoscrollActivationDelta?: number;
-  /**
-   * Specifies the fraction of an item's size at which it will shift when a dragged item crosses over it.
-   * For example, a value of 0.2 means the item shifts when the dragged item passes 20% of its height (vertical list). Default is `0.2`.
-   */
-  dragReorderThreshold?: number;
   /**
    * Duration of the animations in milliseconds.
    * Be aware that users won't be able to drag a new item until the dragged item is released and