react-native-reorderable-list 0.6.1 → 0.7.1

package/lib/module/components/NestedReorderableList.js

@@ -0,0 +1,33 @@
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+import React, { forwardRef } from 'react';
+import { ReorderableListCore } from './ReorderableListCore';
+import { ScrollViewContainerContext } from '../contexts';
+import { useContext } from '../hooks';
+const NestedReorderableListWithRef = ({
+  scrollable,
+  scrollEnabled = true,
+  ...rest
+}, ref) => {
+  const {
+    scrollViewContainerRef,
+    scrollViewScrollOffsetY,
+    scrollViewHeightY,
+    scrollViewScrollEnabled,
+    outerScrollGesture,
+    initialScrollViewScrollEnabled
+  } = useContext(ScrollViewContainerContext);
+  return /*#__PURE__*/React.createElement(ReorderableListCore, _extends({}, rest, {
+    ref: ref,
+    scrollViewContainerRef: scrollViewContainerRef,
+    scrollViewScrollOffsetY: scrollViewScrollOffsetY,
+    scrollViewHeightY: scrollViewHeightY,
+    outerScrollGesture: outerScrollGesture,
+    scrollViewScrollEnabled: scrollViewScrollEnabled,
+    initialScrollViewScrollEnabled: initialScrollViewScrollEnabled,
+    scrollable: scrollable,
+    scrollEnabled: scrollEnabled,
+    nestedScrollEnabled: true
+  }));
+};
+export const NestedReorderableList = /*#__PURE__*/forwardRef(NestedReorderableListWithRef);
+//# sourceMappingURL=NestedReorderableList.js.map

package/lib/module/components/NestedReorderableList.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["React","forwardRef","ReorderableListCore","ScrollViewContainerContext","useContext","NestedReorderableListWithRef","scrollable","scrollEnabled","rest","ref","scrollViewContainerRef","scrollViewScrollOffsetY","scrollViewHeightY","scrollViewScrollEnabled","outerScrollGesture","initialScrollViewScrollEnabled","createElement","_extends","nestedScrollEnabled","NestedReorderableList"],"sourceRoot":"../../../src","sources":["components/NestedReorderableList.tsx"],"mappings":";AAAA,OAAOA,KAAK,IAAGC,UAAU,QAAO,OAAO;AAGvC,SAAQC,mBAAmB,QAAO,uBAAuB;AACzD,SAAQC,0BAA0B,QAAO,aAAa;AACtD,SAAQC,UAAU,QAAO,UAAU;AAGnC,MAAMC,4BAA4B,GAAGA,CACnC;EAACC,UAAU;EAAEC,aAAa,GAAG,IAAI;EAAE,GAAGC;AAAmC,CAAC,EAC1EC,GAAqC,KAClC;EACH,MAAM;IACJC,sBAAsB;IACtBC,uBAAuB;IACvBC,iBAAiB;IACjBC,uBAAuB;IACvBC,kBAAkB;IAClBC;EACF,CAAC,GAAGX,UAAU,CAACD,0BAA0B,CAAC;EAE1C,oBACEH,KAAA,CAAAgB,aAAA,CAACd,mBAAmB,EAAAe,QAAA,KACdT,IAAI;IACRC,GAAG,EAAEA,GAAI;IACTC,sBAAsB,EAAEA,sBAAuB;IAC/CC,uBAAuB,EAAEA,uBAAwB;IACjDC,iBAAiB,EAAEA,iBAAkB;IACrCE,kBAAkB,EAAEA,kBAAmB;IACvCD,uBAAuB,EAAEA,uBAAwB;IACjDE,8BAA8B,EAAEA,8BAA+B;IAC/DT,UAAU,EAAEA,UAAW;IACvBC,aAAa,EAAEA,aAAc;IAC7BW,mBAAmB;EAAA,EACpB,CAAC;AAEN,CAAC;AAED,OAAO,MAAMC,qBAAqB,gBAAGlB,UAAU,CAC7CI,4BACF,CAEgB","ignoreList":[]}

package/lib/module/components/ReorderableList.js

@@ -0,0 +1,21 @@
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
+import React, { forwardRef } from 'react';
+import { ReorderableListCore } from './ReorderableListCore';
+const ReorderableListWithRef = ({
+  scrollEnabled = true,
+  ...rest
+}, ref) => {
+  return /*#__PURE__*/React.createElement(ReorderableListCore, _extends({}, rest, {
+    ref: ref,
+    scrollEnabled: scrollEnabled,
+    initialScrollViewScrollEnabled: true,
+    scrollable: true,
+    scrollViewContainerRef: undefined,
+    scrollViewScrollOffsetY: undefined,
+    scrollViewHeightY: undefined,
+    outerScrollGesture: undefined,
+    scrollViewScrollEnabled: undefined
+  }));
+};
+export const ReorderableList = /*#__PURE__*/forwardRef(ReorderableListWithRef);
+//# sourceMappingURL=ReorderableList.js.map

package/lib/module/components/ReorderableList.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["React","forwardRef","ReorderableListCore","ReorderableListWithRef","scrollEnabled","rest","ref","createElement","_extends","initialScrollViewScrollEnabled","scrollable","scrollViewContainerRef","undefined","scrollViewScrollOffsetY","scrollViewHeightY","outerScrollGesture","scrollViewScrollEnabled","ReorderableList"],"sourceRoot":"../../../src","sources":["components/ReorderableList.tsx"],"mappings":";AAAA,OAAOA,KAAK,IAAGC,UAAU,QAAO,OAAO;AAGvC,SAAQC,mBAAmB,QAAO,uBAAuB;AAGzD,MAAMC,sBAAsB,GAAGA,CAC7B;EAACC,aAAa,GAAG,IAAI;EAAE,GAAGC;AAA6B,CAAC,EACxDC,GAA2B,KACxB;EACH,oBACEN,KAAA,CAAAO,aAAA,CAACL,mBAAmB,EAAAM,QAAA,KACdH,IAAI;IACRC,GAAG,EAAEA,GAAI;IACTF,aAAa,EAAEA,aAAc;IAC7BK,8BAA8B,EAAE,IAAK;IACrCC,UAAU,EAAE,IAAK;IACjBC,sBAAsB,EAAEC,SAAU;IAClCC,uBAAuB,EAAED,SAAU;IACnCE,iBAAiB,EAAEF,SAAU;IAC7BG,kBAAkB,EAAEH,SAAU;IAC9BI,uBAAuB,EAAEJ;EAAU,EACpC,CAAC;AAEN,CAAC;AAED,OAAO,MAAMK,eAAe,gBAAGhB,UAAU,CAACE,sBAAsB,CAEhD","ignoreList":[]}

package/lib/module/components/ReorderableListCell.js

@@ -69,9 +69,7 @@ export const ReorderableListCell = /*#__PURE__*/memo(({
       itemOffset.value[index] = y;
       itemHeight.value[index] = height;
     })(e.nativeEvent.layout.y, e.nativeEvent.layout.height);
-    if (onLayout) {
-      onLayout(e);
-    }
+    onLayout === null || onLayout === void 0 || onLayout(e);
   };
   return /*#__PURE__*/React.createElement(ReorderableCellContext.Provider, {
     value: contextValue

package/lib/module/components/ReorderableListCell.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","memo","useCallback","useMemo","Animated","Easing","runOnUI","useAnimatedReaction","useAnimatedStyle","useSharedValue","withTiming","ReorderableCellContext","ReorderableListContext","useContext","ReorderableListCell","index","startDrag","children","onLayout","itemOffset","itemHeight","dragY","draggedIndex","animationDuration","dragHandler","contextValue","currentIndex","draggedHeight","itemZIndex","itemPositionY","itemDragY","itemIndex","value","moveDown","startMove","Math","min","endMove","max","newValue","duration","easing","out","ease","animatedStyle","zIndex","transform","translateY","handleLayout","e","y","height","nativeEvent","layout","createElement","Provider","View","style"],"sourceRoot":"../../../src","sources":["components/ReorderableListCell.tsx"],"mappings":"AAAA,OAAOA,KAAK,IAAGC,IAAI,EAAEC,WAAW,EAAEC,OAAO,QAAO,OAAO;AAGvD,OAAOC,QAAQ,IACbC,MAAM,EAENC,OAAO,EACPC,mBAAmB,EACnBC,gBAAgB,EAChBC,cAAc,EACdC,UAAU,QACL,yBAAyB;AAEhC,SAAQC,sBAAsB,EAAEC,sBAAsB,QAAO,aAAa;AAC1E,SAAQC,UAAU,QAAO,UAAU;AAanC,OAAO,MAAMC,mBAAmB,gBAAGb,IAAI,CACrC,CAAK;EACHc,KAAK;EACLC,SAAS;EACTC,QAAQ;EACRC,QAAQ;EACRC,UAAU;EACVC,UAAU;EACVC,KAAK;EACLC,YAAY;EACZC;AAC2B,CAAC,KAAK;EACjC,MAAMC,WAAW,GAAGtB,WAAW,CAAC,MAAM;IACpC,SAAS;;IAETc,SAAS,CAACD,KAAK,CAAC;EAClB,CAAC,EAAE,CAACC,SAAS,EAAED,KAAK,CAAC,CAAC;EAEtB,MAAMU,YAAY,GAAGtB,OAAO,CAC1B,OAAO;IACLY,KAAK;IACLS,WAAW;IACXF;EACF,CAAC,CAAC,EACF,CAACP,KAAK,EAAES,WAAW,EAAEF,YAAY,CACnC,CAAC;EACD,MAAM;IAACI,YAAY;IAAEC;EAAa,CAAC,GAAGd,UAAU,CAACD,sBAAsB,CAAC;EAExE,MAAMgB,UAAU,GAAGnB,cAAc,CAAC,CAAC,CAAC;EACpC,MAAMoB,aAAa,GAAGpB,cAAc,CAAC,CAAC,CAAC;EACvC,MAAMqB,SAAS,GAAGrB,cAAc,CAAC,CAAC,CAAC;EACnC,MAAMsB,SAAS,GAAGtB,cAAc,CAACM,KAAK,CAAC;EAEvCR,mBAAmB,CACjB,MAAMc,KAAK,CAACW,KAAK,EACjB,MAAM;IACJ,IACED,SAAS,CAACC,KAAK,KAAKV,YAAY,CAACU,KAAK,IACtCN,YAAY,CAACM,KAAK,IAAI,CAAC,IACvBV,YAAY,CAACU,KAAK,IAAI,CAAC,EACvB;MACAF,SAAS,CAACE,KAAK,GAAGX,KAAK,CAACW,KAAK;IAC/B;EACF,CACF,CAAC;EAEDzB,mBAAmB,CACjB,MAAMmB,YAAY,CAACM,KAAK,EACxB,MAAM;IACJ,IACED,SAAS,CAACC,KAAK,KAAKV,YAAY,CAACU,KAAK,IACtCN,YAAY,CAACM,KAAK,IAAI,CAAC,IACvBV,YAAY,CAACU,KAAK,IAAI,CAAC,EACvB;MACA,MAAMC,QAAQ,GAAGP,YAAY,CAACM,KAAK,GAAGV,YAAY,CAACU,KAAK;MACxD,MAAME,SAAS,GAAGC,IAAI,CAACC,GAAG,CAACd,YAAY,CAACU,KAAK,EAAEN,YAAY,CAACM,KAAK,CAAC;MAClE,MAAMK,OAAO,GAAGF,IAAI,CAACG,GAAG,CAAChB,YAAY,CAACU,KAAK,EAAEN,YAAY,CAACM,KAAK,CAAC;MAChE,IAAIO,QAAQ,GAAG,CAAC;MAEhB,IAAIR,SAAS,CAACC,KAAK,IAAIE,SAAS,IAAIH,SAAS,CAACC,KAAK,IAAIK,OAAO,EAAE;QAC9DE,QAAQ,GAAGN,QAAQ,GAAG,CAACN,aAAa,CAACK,KAAK,GAAGL,aAAa,CAACK,KAAK;MAClE;MAEA,IAAIO,QAAQ,KAAKV,aAAa,CAACG,KAAK,EAAE;QACpCH,aAAa,CAACG,KAAK,GAAGtB,UAAU,CAAC6B,QAAQ,EAAE;UACzCC,QAAQ,EAAEjB,iBAAiB,CAACS,KAAK;UACjCS,MAAM,EAAEpC,MAAM,CAACqC,GAAG,CAACrC,MAAM,CAACsC,IAAI;QAChC,CAAC,CAAC;MACJ;IACF;EACF,CACF,CAAC;EAEDpC,mBAAmB,CACjB,MAAMe,YAAY,CAACU,KAAK,KAAKjB,KAAK,EAClCwB,QAAQ,IAAI;IACVX,UAAU,CAACI,KAAK,GAAGO,QAAQ,GAAG,GAAG,GAAG,CAAC;EACvC,CACF,CAAC;EAED,MAAMK,aAAa,GAAGpC,gBAAgB,CAAC,OAAO;IAC5CqC,MAAM,EAAEjB,UAAU,CAACI,KAAK;IACxBc,SAAS,EAAE,CACT;MAACC,UAAU,EAAEjB,SAAS,CAACE;IAAK,CAAC,EAC7B;MAACe,UAAU,EAAElB,aAAa,CAACG;IAAK,CAAC;EAErC,CAAC,CAAC,CAAC;EAEH,MAAMgB,YAAY,GAAIC,CAAoB,IAAK;IAC7C3C,OAAO,CAAC,CAAC4C,CAAS,EAAEC,MAAc,KAAK;MACrChC,UAAU,CAACa,KAAK,CAACjB,KAAK,CAAC,GAAGmC,CAAC;MAC3B9B,UAAU,CAACY,KAAK,CAACjB,KAAK,CAAC,GAAGoC,MAAM;IAClC,CAAC,CAAC,CAACF,CAAC,CAACG,WAAW,CAACC,MAAM,CAACH,CAAC,EAAED,CAAC,CAACG,WAAW,CAACC,MAAM,CAACF,MAAM,CAAC;IAEvD,IAAIjC,QAAQ,EAAE;MACZA,QAAQ,CAAC+B,CAAC,CAAC;IACb;EACF,CAAC;EAED,oBACEjD,KAAA,CAAAsD,aAAA,CAAC3C,sBAAsB,CAAC4C,QAAQ;IAACvB,KAAK,EAAEP;EAAa,gBACnDzB,KAAA,CAAAsD,aAAA,CAAClD,QAAQ,CAACoD,IAAI;IAACC,KAAK,EAAEb,aAAc;IAAC1B,QAAQ,EAAE8B;EAAa,GACzD/B,QACY,CACgB,CAAC;AAEtC,CACF,CAAC","ignoreList":[]}
+{"version":3,"names":["React","memo","useCallback","useMemo","Animated","Easing","runOnUI","useAnimatedReaction","useAnimatedStyle","useSharedValue","withTiming","ReorderableCellContext","ReorderableListContext","useContext","ReorderableListCell","index","startDrag","children","onLayout","itemOffset","itemHeight","dragY","draggedIndex","animationDuration","dragHandler","contextValue","currentIndex","draggedHeight","itemZIndex","itemPositionY","itemDragY","itemIndex","value","moveDown","startMove","Math","min","endMove","max","newValue","duration","easing","out","ease","animatedStyle","zIndex","transform","translateY","handleLayout","e","y","height","nativeEvent","layout","createElement","Provider","View","style"],"sourceRoot":"../../../src","sources":["components/ReorderableListCell.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/{ReorderableList/ReorderableList.js → ReorderableListCore/ReorderableListCore.js}

@@ -1,18 +1,18 @@
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-import React, { useCallback } from 'react';
-import { FlatList } from 'react-native';
-import { GestureDetector } from 'react-native-gesture-handler';
+import React, { useCallback, useMemo } from 'react';
+import { FlatList, Platform } from 'react-native';
+import { Gesture, GestureDetector } from 'react-native-gesture-handler';
 import Animated from 'react-native-reanimated';
-import { AUTOSCROLL_DELAY } from './constants';
-import { useReorderableList } from './useReorderableList';
+import { AUTOSCROLL_CONFIG } from './constants';
+import { useReorderableListCore } from './useReorderableListCore';
 import { ReorderableListContext } from '../../contexts';
 import { ReorderableListCell } from '../ReorderableListCell';
 const AnimatedFlatList = Animated.createAnimatedComponent(FlatList);
-const ReorderableList = ({
+const ReorderableListCore = ({
   data,
   autoscrollThreshold = 0.1,
   autoscrollSpeedScale = 1,
-  autoscrollDelay = AUTOSCROLL_DELAY,
+  autoscrollDelay = AUTOSCROLL_CONFIG.delay,
   animationDuration = 200,
   dragReorderThreshold = 0.2,
   onLayout,
@@ -21,6 +21,14 @@ const ReorderableList = ({
   onDragEnd,
   keyExtractor,
   extraData,
+  scrollViewContainerRef,
+  scrollViewHeightY,
+  scrollViewScrollOffsetY,
+  scrollViewScrollEnabled,
+  scrollEnabled,
+  initialScrollViewScrollEnabled,
+  scrollable,
+  outerScrollGesture,
   ...rest
 }, ref) => {
   const {
@@ -35,7 +43,7 @@ const ReorderableList = ({
     dragY,
     draggedIndex,
     duration
-  } = useReorderableList({
+  } = useReorderableListCore({
     ref,
     autoscrollThreshold,
     autoscrollSpeedScale,
@@ -45,8 +53,24 @@ const ReorderableList = ({
     onLayout,
     onReorder,
     onScroll,
-    onDragEnd
+    onDragEnd,
+    scrollViewContainerRef,
+    scrollViewHeightY,
+    scrollViewScrollOffsetY,
+    scrollViewScrollEnabled,
+    // flatlist will default to true if we pass explicitly undefined,
+    // but internally we would treat it as false, so we force true
+    initialScrollEnabled: typeof scrollEnabled === 'undefined' ? true : scrollEnabled,
+    initialScrollViewScrollEnabled: typeof initialScrollViewScrollEnabled === 'undefined' ? true : initialScrollViewScrollEnabled,
+    nestedScrollable: scrollable
   });
+  const combinedGesture = useMemo(() => {
+    // android is able to handle nested scroll view, but not the full height ones like iOS
+    if (outerScrollGesture && !(Platform.OS === 'android' && scrollable)) {
+      return Gesture.Simultaneous(outerScrollGesture, gestureHandler);
+    }
+    return gestureHandler;
+  }, [scrollable, outerScrollGesture, gestureHandler]);
   const renderAnimatedCell = useCallback(({
     cellKey,
     ...props
@@ -63,7 +87,7 @@ const ReorderableList = ({
   return /*#__PURE__*/React.createElement(ReorderableListContext.Provider, {
     value: listContextValue
   }, /*#__PURE__*/React.createElement(GestureDetector, {
-    gesture: gestureHandler
+    gesture: combinedGesture
   }, /*#__PURE__*/React.createElement(AnimatedFlatList, _extends({}, rest, {
     ref: handleRef,
     data: data,
@@ -75,9 +99,10 @@ const ReorderableList = ({
     removeClippedSubviews: false,
     keyExtractor: keyExtractor,
     extraData: extraData,
-    numColumns: 1
+    numColumns: 1,
+    scrollEnabled: scrollEnabled
   }))));
 };
-const MemoizedReorderableList = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(ReorderableList));
-export { MemoizedReorderableList as ReorderableList };
-//# sourceMappingURL=ReorderableList.js.map
+const MemoizedReorderableListCore = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(ReorderableListCore));
+export { MemoizedReorderableListCore as ReorderableListCore };
+//# sourceMappingURL=ReorderableListCore.js.map

package/lib/module/components/ReorderableListCore/ReorderableListCore.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["React","useCallback","useMemo","FlatList","Platform","Gesture","GestureDetector","Animated","AUTOSCROLL_CONFIG","useReorderableListCore","ReorderableListContext","ReorderableListCell","AnimatedFlatList","createAnimatedComponent","ReorderableListCore","data","autoscrollThreshold","autoscrollSpeedScale","autoscrollDelay","delay","animationDuration","dragReorderThreshold","onLayout","onReorder","onScroll","onDragEnd","keyExtractor","extraData","scrollViewContainerRef","scrollViewHeightY","scrollViewScrollOffsetY","scrollViewScrollEnabled","scrollEnabled","initialScrollViewScrollEnabled","scrollable","outerScrollGesture","rest","ref","gestureHandler","handleScroll","handleFlatListLayout","handleRef","startDrag","listContextValue","itemOffset","itemHeight","dragY","draggedIndex","duration","initialScrollEnabled","nestedScrollable","combinedGesture","OS","Simultaneous","renderAnimatedCell","cellKey","props","createElement","_extends","key","index","Provider","value","gesture","CellRendererComponent","scrollEventThrottle","horizontal","removeClippedSubviews","numColumns","MemoizedReorderableListCore","memo","forwardRef"],"sourceRoot":"../../../../src","sources":["components/ReorderableListCore/ReorderableListCore.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/components/ReorderableListCore/constants.js

@@ -0,0 +1,25 @@
+import { Platform } from 'react-native';
+const IOS_CONFIG = {
+  delay: 80,
+  increment: 100
+};
+const ANDROID_FABRIC_CONFIG = {
+  delay: 50,
+  increment: 80
+};
+const ANDROID_PAPER_CONFIG = {
+  delay: 10,
+  increment: 4
+};
+export const IS_FABRIC = global && typeof global === 'object' && 'nativeFabricUIManager' in global;
+export const AUTOSCROLL_CONFIG = Platform.select({
+  // autoscroll behaves differently with Fabric and Paper on Android
+  android: IS_FABRIC ? ANDROID_FABRIC_CONFIG : ANDROID_PAPER_CONFIG,
+  ios: IOS_CONFIG,
+  // unsupported platforms
+  web: IOS_CONFIG,
+  macos: IOS_CONFIG,
+  windows: IOS_CONFIG,
+  native: IOS_CONFIG
+});
+//# sourceMappingURL=constants.js.map

package/lib/module/components/ReorderableListCore/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["Platform","IOS_CONFIG","delay","increment","ANDROID_FABRIC_CONFIG","ANDROID_PAPER_CONFIG","IS_FABRIC","global","AUTOSCROLL_CONFIG","select","android","ios","web","macos","windows","native"],"sourceRoot":"../../../../src","sources":["components/ReorderableListCore/constants.ts"],"mappings":"AAAA,SAAQA,QAAQ,QAAO,cAAc;AAErC,MAAMC,UAAU,GAAG;EACjBC,KAAK,EAAE,EAAE;EACTC,SAAS,EAAE;AACb,CAAC;AAED,MAAMC,qBAAqB,GAAG;EAC5BF,KAAK,EAAE,EAAE;EACTC,SAAS,EAAE;AACb,CAAC;AAED,MAAME,oBAAoB,GAAG;EAC3BH,KAAK,EAAE,EAAE;EACTC,SAAS,EAAE;AACb,CAAC;AAED,OAAO,MAAMG,SAAS,GACpBC,MAAM,IAAI,OAAOA,MAAM,KAAK,QAAQ,IAAI,uBAAuB,IAAIA,MAAM;AAE3E,OAAO,MAAMC,iBAAiB,GAAGR,QAAQ,CAACS,MAAM,CAAC;EAC/C;EACAC,OAAO,EAAEJ,SAAS,GAAGF,qBAAqB,GAAGC,oBAAoB;EACjEM,GAAG,EAAEV,UAAU;EAEf;EACAW,GAAG,EAAEX,UAAU;EACfY,KAAK,EAAEZ,UAAU;EACjBa,OAAO,EAAEb,UAAU;EACnBc,MAAM,EAAEd;AACV,CAAC,CAAC","ignoreList":[]}

package/lib/module/components/ReorderableListCore/index.js

@@ -0,0 +1,2 @@
+export * from './ReorderableListCore';
+//# sourceMappingURL=index.js.map

package/lib/module/components/ReorderableListCore/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sourceRoot":"../../../../src","sources":["components/ReorderableListCore/index.ts"],"mappings":"AAAA,cAAc,uBAAuB","ignoreList":[]}

package/lib/module/components/{ReorderableList/useReorderableList.js → ReorderableListCore/useReorderableListCore.js}

@@ -1,12 +1,12 @@
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import { unstable_batchedUpdates } from 'react-native';
 import { Gesture, State } from 'react-native-gesture-handler';
-import { Easing, cancelAnimation, measure, runOnJS, runOnUI, scrollTo, useAnimatedReaction, useAnimatedRef, useAnimatedScrollHandler, useSharedValue, withDelay, withTiming } from 'react-native-reanimated';
-import { AUTOSCROLL_INCREMENT } from './constants';
+import { Easing, runOnJS, runOnUI, scrollTo, useAnimatedReaction, useAnimatedRef, useAnimatedScrollHandler, useSharedValue, withDelay, withTiming } from 'react-native-reanimated';
+import { AUTOSCROLL_CONFIG } from './constants';
 import { ReorderableListState } from '../../types';
 const version = React.version.split('.');
 const hasAutomaticBatching = version.length ? parseInt(version[0], 10) >= 18 : false;
-export const useReorderableList = ({
+export const useReorderableListCore = ({
   ref,
   autoscrollThreshold,
   autoscrollSpeedScale,
@@ -16,22 +16,30 @@ export const useReorderableList = ({
   onReorder,
   onDragEnd,
   onScroll,
-  onLayout
+  onLayout,
+  scrollViewContainerRef,
+  scrollViewHeightY,
+  scrollViewScrollOffsetY,
+  scrollViewScrollEnabled,
+  initialScrollEnabled,
+  initialScrollViewScrollEnabled,
+  nestedScrollable
 }) => {
-  const scrollEnabled = useSharedValue(true);
-  const flatList = useAnimatedRef();
+  const flatListRef = useAnimatedRef();
+  const scrollEnabled = useSharedValue(initialScrollEnabled);
   const gestureState = useSharedValue(State.UNDETERMINED);
   const currentY = useSharedValue(0);
   const currentTranslationY = useSharedValue(0);
-  const containerPositionY = useSharedValue(0);
-  const currentScrollOffsetY = useSharedValue(0);
+  const flatListScrollOffsetY = useSharedValue(0);
+  const flatListHeightY = useSharedValue(0);
+  const nestedFlatListPositionY = useSharedValue(0);
   const dragScrollTranslationY = useSharedValue(0);
   const dragInitialScrollOffsetY = useSharedValue(0);
+  const scrollViewDragScrollTranslationY = useSharedValue(0);
+  const scrollViewDragInitialScrollOffsetY = useSharedValue(0);
   const draggedHeight = useSharedValue(0);
   const itemOffset = useSharedValue([]);
   const itemHeight = useSharedValue([]);
-  const topAutoscrollArea = useSharedValue(0);
-  const bottomAutoscrollArea = useSharedValue(0);
   const autoscrollTrigger = useSharedValue(-1);
   const lastAutoscrollTrigger = useSharedValue(-1);
   const previousY = useSharedValue(0);
@@ -42,25 +50,22 @@ export const useReorderableList = ({
   const draggedIndex = useSharedValue(-1);
   const state = useSharedValue(ReorderableListState.IDLE);
   const dragEndHandlers = useSharedValue([]);
-
-  // animation duration as a shared value allows to avoid re-rendering of all cells on value change
+  const startY = useSharedValue(0);
   const duration = useSharedValue(animationDuration);
-  if (duration.value !== animationDuration) {
+  useEffect(() => {
     duration.value = animationDuration;
-  }
+  }, [duration, animationDuration]);
   const listContextValue = useMemo(() => ({
     draggedHeight,
     currentIndex,
     draggedIndex,
     dragEndHandlers
   }), [draggedHeight, currentIndex, draggedIndex, dragEndHandlers]);
-  const startY = useSharedValue(0);
   const panGestureHandler = useMemo(() => Gesture.Pan().onBegin(e => {
     // prevent new dragging until item is completely released
     if (state.value === ReorderableListState.IDLE) {
-      const relativeY = e.absoluteY - containerPositionY.value;
-      startY.value = relativeY;
-      currentY.value = relativeY;
+      startY.value = e.y;
+      currentY.value = e.y;
       currentTranslationY.value = e.translationY;
       if (draggedIndex.value >= 0) {
         dragY.value = e.translationY;
@@ -72,29 +77,40 @@ export const useReorderableList = ({
       currentY.value = startY.value + e.translationY;
       currentTranslationY.value = e.translationY;
       if (draggedIndex.value >= 0) {
-        dragY.value = e.translationY + dragScrollTranslationY.value;
+        dragY.value = e.translationY + dragScrollTranslationY.value + scrollViewDragScrollTranslationY.value;
       }
       gestureState.value = e.state;
     }
-  }).onEnd(e => gestureState.value = e.state).onFinalize(e => gestureState.value = e.state), [containerPositionY, currentTranslationY, currentY, dragScrollTranslationY, draggedIndex, gestureState, dragY, startY, state]);
+  }).onEnd(e => gestureState.value = e.state).onFinalize(e => gestureState.value = e.state), [currentTranslationY, currentY, dragScrollTranslationY, scrollViewDragScrollTranslationY, draggedIndex, gestureState, dragY, startY, state]);
   const gestureHandler = useMemo(() => Gesture.Simultaneous(Gesture.Native(), panGestureHandler), [panGestureHandler]);
   const setScrollEnabled = useCallback(enabled => {
-    var _flatList$current;
-    scrollEnabled.value = enabled;
-    (_flatList$current = flatList.current) === null || _flatList$current === void 0 || _flatList$current.setNativeProps({
-      scrollEnabled: enabled
-    });
-  }, [flatList, scrollEnabled]);
+    // if scroll is enabled on list props then we can toggle it
+    if (initialScrollEnabled) {
+      var _flatListRef$current;
+      scrollEnabled.value = enabled;
+      (_flatListRef$current = flatListRef.current) === null || _flatListRef$current === void 0 || _flatListRef$current.setNativeProps({
+        scrollEnabled: enabled
+      });
+    }
+    if (scrollViewContainerRef && scrollViewScrollEnabled && initialScrollViewScrollEnabled) {
+      var _scrollViewContainerR;
+      scrollViewScrollEnabled.value = enabled;
+      (_scrollViewContainerR = scrollViewContainerRef.current) === null || _scrollViewContainerR === void 0 || _scrollViewContainerR.setNativeProps({
+        scrollEnabled: enabled
+      });
+    }
+  }, [initialScrollEnabled, flatListRef, scrollEnabled, initialScrollViewScrollEnabled, scrollViewContainerRef, scrollViewScrollEnabled]);
   const resetSharedValues = useCallback(() => {
     'worklet';
 
-    draggedIndex.value = -1;
     // current index is reset on item render for the on end event
-    dragY.value = 0;
+    draggedIndex.value = -1;
     // released flag is reset after release is triggered in the item
     state.value = ReorderableListState.IDLE;
+    dragY.value = 0;
     dragScrollTranslationY.value = 0;
-  }, [draggedIndex, dragY, state, dragScrollTranslationY]);
+    scrollViewDragScrollTranslationY.value = 0;
+  }, [dragY, dragScrollTranslationY, scrollViewDragScrollTranslationY, draggedIndex, state]);
   const reorder = (fromIndex, toIndex) => {
     runOnUI(resetSharedValues)();
     if (fromIndex !== toIndex) {
@@ -114,7 +130,7 @@ export const useReorderableList = ({
   const getIndexFromY = useCallback(y => {
     'worklet';
 
-    const relativeY = currentScrollOffsetY.value + y;
+    const relativeY = flatListScrollOffsetY.value + y;
     const count = itemOffset.value.length;
     for (let i = 0; i < count; i++) {
       if (currentIndex.value === i) {
@@ -135,7 +151,7 @@ export const useReorderableList = ({
       index: currentIndex.value,
       direction: previousDirection.value
     };
-  }, [dragReorderThreshold, currentIndex, currentScrollOffsetY, previousDirection, itemOffset, itemHeight]);
+  }, [dragReorderThreshold, currentIndex, flatListScrollOffsetY, previousDirection, itemOffset, itemHeight]);
   const setCurrentIndex = useCallback(y => {
     'worklet';
 
@@ -203,52 +219,154 @@ export const useReorderableList = ({
       }
     }
   });
-  useAnimatedReaction(() => currentY.value, y => {
+  const calculateHiddenArea = useCallback(() => {
+    'worklet';
+
+    if (!scrollViewScrollOffsetY || !scrollViewHeightY) {
+      return {
+        top: 0,
+        bottom: 0
+      };
+    }
+
+    // hidden area cannot be negative
+    const top = Math.max(0, scrollViewScrollOffsetY.value - nestedFlatListPositionY.value);
+    const bottom = Math.max(0, nestedFlatListPositionY.value + flatListHeightY.value - (scrollViewScrollOffsetY.value + scrollViewHeightY.value));
+    return {
+      top,
+      bottom
+    };
+  }, [scrollViewScrollOffsetY, scrollViewHeightY, nestedFlatListPositionY, flatListHeightY]);
+  const calculateThresholdArea = useCallback(hiddenArea => {
+    'worklet';
+
+    const threshold = Math.max(0, Math.min(autoscrollThreshold, 0.4));
+    const visibleHeight = flatListHeightY.value - (hiddenArea.top + hiddenArea.bottom);
+    const top = visibleHeight * threshold;
+    const bottom = flatListHeightY.value - top;
+    return {
+      top,
+      bottom
+    };
+  }, [autoscrollThreshold, flatListHeightY]);
+  const calculateThresholdAreaParent = useCallback(hiddenArea => {
+    'worklet';
+
+    const threshold = Math.max(0, Math.min(autoscrollThreshold, 0.4));
+    const top = flatListHeightY.value * threshold;
+    const bottom = flatListHeightY.value - top;
+
+    // if the hidden area is 0 then we don't have a threshold area
+    // we might have floating errors like 0.0001 which we should ignore
+    return {
+      top: hiddenArea.top > 0.1 ? top + hiddenArea.top : 0,
+      bottom: hiddenArea.bottom > 0.1 ? bottom - hiddenArea.bottom : 0
+    };
+  }, [autoscrollThreshold, flatListHeightY]);
+  const shouldScrollParent = useCallback(y => {
+    'worklet';
+
+    const hiddenArea = calculateHiddenArea();
+    const thresholdAreaParent = calculateThresholdAreaParent(hiddenArea);
+
+    // we might have floating errors like 0.0001 which we should ignore
+    return hiddenArea.top > 0.1 && y <= thresholdAreaParent.top || hiddenArea.bottom > 0.1 && y >= thresholdAreaParent.bottom;
+  }, [calculateHiddenArea, calculateThresholdAreaParent]);
+  const scrollDirection = useCallback(y => {
+    'worklet';
+
+    const hiddenArea = calculateHiddenArea();
+    if (shouldScrollParent(y)) {
+      const thresholdAreaParent = calculateThresholdAreaParent(hiddenArea);
+      if (y <= thresholdAreaParent.top) {
+        return -1;
+      }
+      if (y >= thresholdAreaParent.bottom) {
+        return 1;
+      }
+      return 0;
+    } else if (nestedScrollable) {
+      const thresholdArea = calculateThresholdArea(hiddenArea);
+      if (y <= thresholdArea.top) {
+        return -1;
+      }
+      if (y >= thresholdArea.bottom) {
+        return 1;
+      }
+    }
+    return 0;
+  }, [nestedScrollable, shouldScrollParent, calculateHiddenArea, calculateThresholdArea, calculateThresholdAreaParent]);
+  useAnimatedReaction(() => currentY.value + scrollViewDragScrollTranslationY.value, y => {
     if (state.value === ReorderableListState.DRAGGING || state.value === ReorderableListState.AUTO_SCROLL) {
       setCurrentIndex(y);
-      if (y <= topAutoscrollArea.value || y >= bottomAutoscrollArea.value) {
+      if (scrollDirection(y) !== 0) {
         if (state.value !== ReorderableListState.AUTO_SCROLL) {
           // trigger autoscroll
           lastAutoscrollTrigger.value = autoscrollTrigger.value;
           autoscrollTrigger.value *= -1;
+          state.value = ReorderableListState.AUTO_SCROLL;
         }
-        state.value = ReorderableListState.AUTO_SCROLL;
-      } else {
+      } else if (state.value === ReorderableListState.AUTO_SCROLL) {
         state.value = ReorderableListState.DRAGGING;
       }
     }
   });
   useAnimatedReaction(() => autoscrollTrigger.value, () => {
     if (autoscrollTrigger.value !== lastAutoscrollTrigger.value && state.value === ReorderableListState.AUTO_SCROLL) {
-      const autoscrollIncrement = (currentY.value <= topAutoscrollArea.value ? -AUTOSCROLL_INCREMENT : AUTOSCROLL_INCREMENT) * autoscrollSpeedScale;
+      let y = currentY.value + scrollViewDragScrollTranslationY.value;
+      const autoscrollIncrement = scrollDirection(y) * AUTOSCROLL_CONFIG.increment * autoscrollSpeedScale;
       if (autoscrollIncrement !== 0) {
-        scrollTo(flatList, 0, currentScrollOffsetY.value + autoscrollIncrement, true);
+        let scrollOffset = flatListScrollOffsetY.value;
+        let listRef = flatListRef;
+        if (shouldScrollParent(y) && scrollViewScrollOffsetY) {
+          scrollOffset = scrollViewScrollOffsetY.value;
+          listRef = scrollViewContainerRef;
+        }
+        scrollTo(listRef, 0, scrollOffset + autoscrollIncrement, true);
       }
 
       // when autoscrolling user may not be moving his finger so we need
       // to update the current position of the dragged item here
-      setCurrentIndex(currentY.value);
+      setCurrentIndex(y);
     }
   });
+
+  // flatlist scroll handler
   const handleScroll = useAnimatedScrollHandler(e => {
-    currentScrollOffsetY.value = e.contentOffset.y;
+    flatListScrollOffsetY.value = e.contentOffset.y;
 
     // checking if the list is not scrollable instead of the scrolling state
     // fixes a bug on iOS where the item is shifted after autoscrolling and then
-    // moving await from autoscroll area
+    // moving away from autoscroll area
     if (!scrollEnabled.value) {
-      dragScrollTranslationY.value = currentScrollOffsetY.value - dragInitialScrollOffsetY.value;
+      dragScrollTranslationY.value = flatListScrollOffsetY.value - dragInitialScrollOffsetY.value;
     }
     if (state.value === ReorderableListState.AUTO_SCROLL) {
-      dragY.value = currentTranslationY.value + dragScrollTranslationY.value;
-      cancelAnimation(autoscrollTrigger);
+      dragY.value = currentTranslationY.value + dragScrollTranslationY.value + scrollViewDragScrollTranslationY.value;
       lastAutoscrollTrigger.value = autoscrollTrigger.value;
       autoscrollTrigger.value = withDelay(autoscrollDelay, withTiming(autoscrollTrigger.value * -1, {
         duration: 0
       }));
-    } else {}
-    if (onScroll) {
-      onScroll(e);
+    }
+    onScroll === null || onScroll === void 0 || onScroll(e);
+  });
+
+  // parent scroll handler
+  useAnimatedReaction(() => scrollViewScrollOffsetY === null || scrollViewScrollOffsetY === void 0 ? void 0 : scrollViewScrollOffsetY.value, value => {
+    if (value && scrollViewScrollEnabled) {
+      // checking if the list is not scrollable instead of the scrolling state
+      // fixes a bug on iOS where the item is shifted after autoscrolling and then
+      // moving await from autoscroll area
+      if (!scrollViewScrollEnabled.value) {
+        scrollViewDragScrollTranslationY.value = value - scrollViewDragInitialScrollOffsetY.value;
+      }
+      if (state.value === ReorderableListState.AUTO_SCROLL) {
+        dragY.value = currentTranslationY.value + scrollViewDragScrollTranslationY.value;
+        lastAutoscrollTrigger.value = autoscrollTrigger.value;
+        autoscrollTrigger.value = withDelay(autoscrollDelay, withTiming(autoscrollTrigger.value * -1, {
+          duration: 0
+        }));
+      }
     }
   });
   const startDrag = useCallback(index => {
@@ -256,38 +374,26 @@ export const useReorderableList = ({
 
     // allow new drag when item is completely released
     if (state.value === ReorderableListState.IDLE) {
+      // resetting shared values again fixes a flickeing bug in nested lists where
+      // after scrolling the parent list it would offset the new dragged item in another nested list
+      resetSharedValues();
+      dragInitialScrollOffsetY.value = flatListScrollOffsetY.value;
+      scrollViewDragInitialScrollOffsetY.value = scrollViewScrollOffsetY ? scrollViewScrollOffsetY.value : 0;
       draggedHeight.value = itemHeight.value[index];
       draggedIndex.value = index;
       previousIndex.value = -1;
       currentIndex.value = index;
       state.value = ReorderableListState.DRAGGING;
-      dragInitialScrollOffsetY.value = currentScrollOffsetY.value;
       runOnJS(setScrollEnabled)(false);
     }
-  }, [setScrollEnabled, currentIndex, previousIndex, draggedHeight, draggedIndex, state, currentScrollOffsetY, dragInitialScrollOffsetY, itemHeight]);
-  const measureFlatList = useCallback(() => {
-    'worklet';
-
-    const measurement = measure(flatList);
-    if (measurement === null) {
-      return;
-    }
-    containerPositionY.value = measurement.pageY;
-  }, [flatList, containerPositionY]);
+  }, [resetSharedValues, dragInitialScrollOffsetY, scrollViewScrollOffsetY, scrollViewDragInitialScrollOffsetY, setScrollEnabled, currentIndex, previousIndex, draggedHeight, draggedIndex, state, flatListScrollOffsetY, itemHeight]);
   const handleFlatListLayout = useCallback(e => {
-    runOnUI(measureFlatList)();
-    const threshold = Math.max(0, Math.min(autoscrollThreshold, 0.4));
-    const {
-      height
-    } = e.nativeEvent.layout;
-    topAutoscrollArea.value = height * threshold;
-    bottomAutoscrollArea.value = height * (1 - threshold);
-    if (onLayout) {
-      onLayout(e);
-    }
-  }, [measureFlatList, topAutoscrollArea, bottomAutoscrollArea, autoscrollThreshold, onLayout]);
+    nestedFlatListPositionY.value = e.nativeEvent.layout.y;
+    flatListHeightY.value = e.nativeEvent.layout.height;
+    onLayout === null || onLayout === void 0 || onLayout(e);
+  }, [nestedFlatListPositionY, flatListHeightY, onLayout]);
   const handleRef = value => {
-    flatList(value);
+    flatListRef(value);
     if (typeof ref === 'function') {
       ref(value);
     } else if (ref) {
@@ -308,4 +414,4 @@ export const useReorderableList = ({
     duration
   };
 };
-//# sourceMappingURL=useReorderableList.js.map
+//# sourceMappingURL=useReorderableListCore.js.map