react-native-reorderable-list 0.13.0 → 0.14.0

package/lib/commonjs/components/ScrollViewContainer.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNativeGestureHandler","_reactNativeReanimated","_ScrollViewContainerContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","_extends","assign","bind","arguments","length","apply","ScrollViewContainer","onLayout","onScroll","scrollEnabled","rest","scrollViewScrollEnabled","useSharedValue","scrollViewContainerRef","useAnimatedRef","scrollViewScrollOffsetY","scrollViewHeightY","outerScrollGesture","useMemo","Gesture","Native","handleScroll","useAnimatedScrollHandler","value","contentOffset","y","composedScrollHandler","useComposedEventHandler","contextValue","initialScrollViewScrollEnabled","handleLayout","nativeEvent","layout","height","createElement","ScrollViewContainerContext","Provider","GestureDetector","gesture","ScrollView","ref","exports"],"sourceRoot":"../../../src","sources":["components/ScrollViewContainer.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,uBAAA,CAAAC,OAAA;AAGA,IAAAC,0BAAA,GAAAD,OAAA;AACA,IAAAE,sBAAA,GAAAH,uBAAA,CAAAC,OAAA;AAOA,IAAAG,2BAAA,GAAAH,OAAA;AAAkF,SAAAI,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAN,wBAAAM,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA,SAAAW,SAAA,WAAAA,QAAA,GAAAR,MAAA,CAAAS,MAAA,GAAAT,MAAA,CAAAS,MAAA,CAAAC,IAAA,eAAAb,CAAA,aAAAR,CAAA,MAAAA,CAAA,GAAAsB,SAAA,CAAAC,MAAA,EAAAvB,CAAA,UAAAG,CAAA,GAAAmB,SAAA,CAAAtB,CAAA,YAAAE,CAAA,IAAAC,CAAA,OAAAY,cAAA,CAAAC,IAAA,CAAAb,CAAA,EAAAD,CAAA,MAAAM,CAAA,CAAAN,CAAA,IAAAC,CAAA,CAAAD,CAAA,aAAAM,CAAA,KAAAW,QAAA,CAAAK,KAAA,OAAAF,SAAA;AAG3E,MAAMG,mBAAuD,GAAGA,CAAC;EACtEC,QAAQ;EACRC,QAAQ;EACRC,aAAa,GAAG,IAAI;EACpB,GAAGC;AACL,CAAC,KAAK;EACJ,MAAMC,uBAAuB,GAAG,IAAAC,qCAAc,EAACH,aAAa,CAAC;EAC7D,MAAMI,sBAAsB,GAAG,IAAAC,qCAAc,EAAsB,CAAC;EACpE,MAAMC,uBAAuB,GAAG,IAAAH,qCAAc,EAAC,CAAC,CAAC;EACjD,MAAMI,iBAAiB,GAAG,IAAAJ,qCAAc,EAAC,CAAC,CAAC;EAE3C,MAAMK,kBAAkB,GAAG,IAAAC,cAAO,EAAC,MAAMC,kCAAO,CAACC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC;EAE9D,MAAMC,YAAY,GAAG,IAAAC,+CAAwB,EAC3CzC,CAAC,IAAI;IACHkC,uBAAuB,CAACQ,KAAK,GAAG1C,CAAC,CAAC2C,aAAa,CAACC,CAAC;EACnD,CAAC,EACD,CAACV,uBAAuB,CAC1B,CAAC;EAED,MAAMW,qBAAqB,GAAG,IAAAC,8CAAuB,EAAC,CACpDN,YAAY,EACZb,QAAQ,IAAI,IAAI,CACjB,CAAC;EAEF,MAAMoB,YAAY,GAAG,IAAAV,cAAO,EAC1B,OAAO;IACLL,sBAAsB;IACtBG,iBAAiB;IACjBD,uBAAuB;IACvBJ,uBAAuB;IACvBM,kBAAkB;IAClBY,8BAA8B,EAAEpB;EAClC,CAAC,CAAC,EACF,CACEI,sBAAsB,EACtBG,iBAAiB,EACjBD,uBAAuB,EACvBJ,uBAAuB,EACvBM,kBAAkB,EAClBR,aAAa,CAEjB,CAAC;EAED,MAAMqB,YAAY,GAAIjD,CAAoB,IAAK;IAC7CmC,iBAAiB,CAACO,KAAK,GAAG1C,CAAC,CAACkD,WAAW,CAACC,MAAM,CAACC,MAAM;IAErD1B,QAAQ,aAARA,QAAQ,eAARA,QAAQ,CAAG1B,CAAC,CAAC;EACf,CAAC;EAED,oBACEP,MAAA,CAAAY,OAAA,CAAAgD,aAAA,CAACvD,2BAAA,CAAAwD,0BAA0B,CAACC,QAAQ;IAACb,KAAK,EAAEK;EAAa,gBACvDtD,MAAA,CAAAY,OAAA,CAAAgD,aAAA,CAACzD,0BAAA,CAAA4D,eAAe;IAACC,OAAO,EAAErB;EAAmB,gBAC3C3C,MAAA,CAAAY,OAAA,CAAAgD,aAAA,CAACxD,sBAAA,CAAAQ,OAAQ,CAACqD,UAAU,EAAAvC,QAAA,KACdU,IAAI;IACR8B,GAAG,EAAE3B,sBAAuB;IAC5BL,QAAQ,EAAEkB,qBAAsB;IAChCnB,QAAQ,EAAEuB,YAAa;IACvBrB,aAAa,EAAEA;EAAc,EAC9B,CACc,CACkB,CAAC;AAE1C,CAAC;AAACgC,OAAA,CAAAnC,mBAAA,GAAAA,mBAAA","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNativeGestureHandler","_reactNativeReanimated","_ScrollViewContainerContext","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","_extends","assign","bind","arguments","length","apply","ScrollViewContainerWithRef","onLayout","onScroll","scrollEnabled","rest","ref","scrollViewScrollEnabled","useSharedValue","scrollViewContainerRef","useAnimatedRef","scrollViewScrollOffsetY","scrollViewPageY","scrollViewHeightY","handleRef","useCallback","value","current","outerScrollGesture","useMemo","Gesture","Native","handleScroll","useAnimatedScrollHandler","contentOffset","y","composedScrollHandler","useComposedEventHandler","contextValue","initialScrollViewScrollEnabled","handleLayout","nativeEvent","layout","height","runOnUI","measurement","measure","pageY","createElement","ScrollViewContainerContext","Provider","GestureDetector","gesture","ScrollView","ScrollViewContainer","exports","forwardRef"],"sourceRoot":"../../../src","sources":["components/ScrollViewContainer.tsx"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/components/{ReorderableListCore/animationDefaults.js → constants.js}

@@ -3,8 +3,32 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SCALE_ANIMATION_CONFIG_DEFAULT = exports.OPACITY_ANIMATION_CONFIG_DEFAULT = void 0;
+exports.SCALE_ANIMATION_CONFIG_DEFAULT = exports.OPACITY_ANIMATION_CONFIG_DEFAULT = exports.IS_FABRIC = exports.AUTOSCROLL_CONFIG = void 0;
+var _reactNative = require("react-native");
 var _reactNativeReanimated = require("react-native-reanimated");
+const IOS_AUTOSCROLL_CONFIG = {
+  delay: 80,
+  increment: 100
+};
+const ANDROID_FABRIC_AUTOSCROLL_CONFIG = {
+  delay: 50,
+  increment: 80
+};
+const ANDROID_PAPER_AUTOSCROLL_CONFIG = {
+  delay: 10,
+  increment: 4
+};
+const IS_FABRIC = exports.IS_FABRIC = global && typeof global === 'object' && 'nativeFabricUIManager' in global;
+const AUTOSCROLL_CONFIG = exports.AUTOSCROLL_CONFIG = _reactNative.Platform.select({
+  // autoscroll behaves differently with Fabric and Paper on Android
+  android: IS_FABRIC ? ANDROID_FABRIC_AUTOSCROLL_CONFIG : ANDROID_PAPER_AUTOSCROLL_CONFIG,
+  ios: IOS_AUTOSCROLL_CONFIG,
+  // unsupported platforms
+  web: IOS_AUTOSCROLL_CONFIG,
+  macos: IOS_AUTOSCROLL_CONFIG,
+  windows: IOS_AUTOSCROLL_CONFIG,
+  native: IOS_AUTOSCROLL_CONFIG
+});
 const DURATION_START = 150;
 const DURATION_END = 200;
 const SCALE_ANIMATION_CONFIG_DEFAULT = exports.SCALE_ANIMATION_CONFIG_DEFAULT = {
@@ -31,4 +55,4 @@ const OPACITY_ANIMATION_CONFIG_DEFAULT = exports.OPACITY_ANIMATION_CONFIG_DEFAUL
     duration: DURATION_END
   }
 };
-//# sourceMappingURL=animationDefaults.js.map
+//# sourceMappingURL=constants.js.map

package/lib/commonjs/components/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_reactNative","require","_reactNativeReanimated","IOS_AUTOSCROLL_CONFIG","delay","increment","ANDROID_FABRIC_AUTOSCROLL_CONFIG","ANDROID_PAPER_AUTOSCROLL_CONFIG","IS_FABRIC","exports","global","AUTOSCROLL_CONFIG","Platform","select","android","ios","web","macos","windows","native","DURATION_START","DURATION_END","SCALE_ANIMATION_CONFIG_DEFAULT","start","toValue","easing","Easing","in","ease","duration","end","out","OPACITY_ANIMATION_CONFIG_DEFAULT"],"sourceRoot":"../../../src","sources":["components/constants.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,IAAAC,sBAAA,GAAAD,OAAA;AAEA,MAAME,qBAAqB,GAAG;EAC5BC,KAAK,EAAE,EAAE;EACTC,SAAS,EAAE;AACb,CAAC;AAED,MAAMC,gCAAgC,GAAG;EACvCF,KAAK,EAAE,EAAE;EACTC,SAAS,EAAE;AACb,CAAC;AAED,MAAME,+BAA+B,GAAG;EACtCH,KAAK,EAAE,EAAE;EACTC,SAAS,EAAE;AACb,CAAC;AAEM,MAAMG,SAAS,GAAAC,OAAA,CAAAD,SAAA,GACpBE,MAAM,IAAI,OAAOA,MAAM,KAAK,QAAQ,IAAI,uBAAuB,IAAIA,MAAM;AAEpE,MAAMC,iBAAiB,GAAAF,OAAA,CAAAE,iBAAA,GAAGC,qBAAQ,CAACC,MAAM,CAAC;EAC/C;EACAC,OAAO,EAAEN,SAAS,GACdF,gCAAgC,GAChCC,+BAA+B;EACnCQ,GAAG,EAAEZ,qBAAqB;EAE1B;EACAa,GAAG,EAAEb,qBAAqB;EAC1Bc,KAAK,EAAEd,qBAAqB;EAC5Be,OAAO,EAAEf,qBAAqB;EAC9BgB,MAAM,EAAEhB;AACV,CAAC,CAAC;AAEF,MAAMiB,cAAc,GAAG,GAAG;AAC1B,MAAMC,YAAY,GAAG,GAAG;AAOjB,MAAMC,8BAA+C,GAAAb,OAAA,CAAAa,8BAAA,GAAG;EAC7DC,KAAK,EAAE;IACLC,OAAO,EAAE,KAAK;IACdC,MAAM,EAAEC,6BAAM,CAACC,EAAE,CAACD,6BAAM,CAACE,IAAI,CAAC;IAC9BC,QAAQ,EAAET;EACZ,CAAC;EACDU,GAAG,EAAE;IACHN,OAAO,EAAE,CAAC;IACVC,MAAM,EAAEC,6BAAM,CAACK,GAAG,CAACL,6BAAM,CAACE,IAAI,CAAC;IAC/BC,QAAQ,EAAER;EACZ;AACF,CAAC;AAEM,MAAMW,gCAAiD,GAAAvB,OAAA,CAAAuB,gCAAA,GAAG;EAC/DT,KAAK,EAAE;IACLC,OAAO,EAAE,IAAI;IACbC,MAAM,EAAEC,6BAAM,CAACC,EAAE,CAACD,6BAAM,CAACE,IAAI,CAAC;IAC9BC,QAAQ,EAAET;EACZ,CAAC;EACDU,GAAG,EAAE;IACHN,OAAO,EAAE,CAAC;IACVC,MAAM,EAAEC,6BAAM,CAACK,GAAG,CAACL,6BAAM,CAACE,IAAI,CAAC;IAC/BC,QAAQ,EAAER;EACZ;AACF,CAAC","ignoreList":[]}

package/lib/commonjs/contexts/ScrollViewContainerContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","e","__esModule","default","ScrollViewContainerContext","exports","React","createContext","undefined"],"sourceRoot":"../../../src","sources":["contexts/ScrollViewContainerContext.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA0B,SAAAD,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAenB,MAAMG,0BAA0B,GAAAC,OAAA,CAAAD,0BAAA,gBAAGE,cAAK,CAACC,aAAa,CAE3DC,SAAS,CAAC","ignoreList":[]}
+{"version":3,"names":["_react","_interopRequireDefault","require","e","__esModule","default","ScrollViewContainerContext","exports","React","createContext","undefined"],"sourceRoot":"../../../src","sources":["contexts/ScrollViewContainerContext.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA0B,SAAAD,uBAAAE,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAgBnB,MAAMG,0BAA0B,GAAAC,OAAA,CAAAD,0BAAA,gBAAGE,cAAK,CAACC,aAAa,CAE3DC,SAAS,CAAC","ignoreList":[]}

package/lib/module/components/NestedReorderableList.js

@@ -11,6 +11,7 @@ const NestedReorderableListWithRef = ({
   const {
     scrollViewContainerRef,
     scrollViewScrollOffsetY,
+    scrollViewPageY,
     scrollViewHeightY,
     scrollViewScrollEnabled,
     outerScrollGesture,
@@ -20,6 +21,7 @@ const NestedReorderableListWithRef = ({
     ref: ref,
     scrollViewContainerRef: scrollViewContainerRef,
     scrollViewScrollOffsetY: scrollViewScrollOffsetY,
+    scrollViewPageY: scrollViewPageY,
     scrollViewHeightY: scrollViewHeightY,
     outerScrollGesture: outerScrollGesture,
     scrollViewScrollEnabled: scrollViewScrollEnabled,

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

@@ -1 +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":[]}
+{"version":3,"names":["React","forwardRef","ReorderableListCore","ScrollViewContainerContext","useContext","NestedReorderableListWithRef","scrollable","scrollEnabled","rest","ref","scrollViewContainerRef","scrollViewScrollOffsetY","scrollViewPageY","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,eAAe;IACfC,iBAAiB;IACjBC,uBAAuB;IACvBC,kBAAkB;IAClBC;EACF,CAAC,GAAGZ,UAAU,CAACD,0BAA0B,CAAC;EAE1C,oBACEH,KAAA,CAAAiB,aAAA,CAACf,mBAAmB,EAAAgB,QAAA,KACdV,IAAI;IACRC,GAAG,EAAEA,GAAI;IACTC,sBAAsB,EAAEA,sBAAuB;IAC/CC,uBAAuB,EAAEA,uBAAwB;IACjDC,eAAe,EAAEA,eAAgB;IACjCC,iBAAiB,EAAEA,iBAAkB;IACrCE,kBAAkB,EAAEA,kBAAmB;IACvCD,uBAAuB,EAAEA,uBAAwB;IACjDE,8BAA8B,EAAEA,8BAA+B;IAC/DV,UAAU,EAAEA,UAAW;IACvBC,aAAa,EAAEA,aAAc;IAC7BY,mBAAmB;EAAA,EACpB,CAAC;AAEN,CAAC;AAED,OAAO,MAAMC,qBAAqB,gBAAGnB,UAAU,CAC7CI,4BACF,CAEgB","ignoreList":[]}

package/lib/module/components/ReorderableList.js

@@ -7,13 +7,14 @@ const ReorderableListWithRef = ({
 }, ref) => /*#__PURE__*/React.createElement(ReorderableListCore, _extends({}, rest, {
   ref: ref,
   scrollEnabled: scrollEnabled,
-  initialScrollViewScrollEnabled: true,
-  scrollable: true,
   scrollViewContainerRef: undefined,
   scrollViewScrollOffsetY: undefined,
+  scrollViewPageY: undefined,
   scrollViewHeightY: undefined,
   outerScrollGesture: undefined,
-  scrollViewScrollEnabled: undefined
+  scrollViewScrollEnabled: undefined,
+  initialScrollViewScrollEnabled: true,
+  scrollable: true
 }));
 export const ReorderableList = /*#__PURE__*/forwardRef(ReorderableListWithRef);
 //# sourceMappingURL=ReorderableList.js.map

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

@@ -1 +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,kBAE3BN,KAAA,CAAAO,aAAA,CAACL,mBAAmB,EAAAM,QAAA,KACdH,IAAI;EACRC,GAAG,EAAEA,GAAI;EACTF,aAAa,EAAEA,aAAc;EAC7BK,8BAA8B,EAAE,IAAK;EACrCC,UAAU,EAAE,IAAK;EACjBC,sBAAsB,EAAEC,SAAU;EAClCC,uBAAuB,EAAED,SAAU;EACnCE,iBAAiB,EAAEF,SAAU;EAC7BG,kBAAkB,EAAEH,SAAU;EAC9BI,uBAAuB,EAAEJ;AAAU,EACpC,CACF;AAED,OAAO,MAAMK,eAAe,gBAAGhB,UAAU,CAACE,sBAAsB,CAEhD","ignoreList":[]}
+{"version":3,"names":["React","forwardRef","ReorderableListCore","ReorderableListWithRef","scrollEnabled","rest","ref","createElement","_extends","scrollViewContainerRef","undefined","scrollViewScrollOffsetY","scrollViewPageY","scrollViewHeightY","outerScrollGesture","scrollViewScrollEnabled","initialScrollViewScrollEnabled","scrollable","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,kBAE3BN,KAAA,CAAAO,aAAA,CAACL,mBAAmB,EAAAM,QAAA,KACdH,IAAI;EACRC,GAAG,EAAEA,GAAI;EACTF,aAAa,EAAEA,aAAc;EAC7BK,sBAAsB,EAAEC,SAAU;EAClCC,uBAAuB,EAAED,SAAU;EACnCE,eAAe,EAAEF,SAAU;EAC3BG,iBAAiB,EAAEH,SAAU;EAC7BI,kBAAkB,EAAEJ,SAAU;EAC9BK,uBAAuB,EAAEL,SAAU;EACnCM,8BAA8B;EAC9BC,UAAU;AAAA,EACX,CACF;AAED,OAAO,MAAMC,eAAe,gBAAGjB,UAAU,CAACE,sBAAsB,CAEhD","ignoreList":[]}

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

@@ -1,37 +1,45 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { unstable_batchedUpdates } from 'react-native';
-import { Gesture, State } from 'react-native-gesture-handler';
-import { Easing, runOnJS, runOnUI, scrollTo, useAnimatedReaction, useAnimatedRef, useAnimatedScrollHandler, useSharedValue, withDelay, withTiming } from 'react-native-reanimated';
-import { OPACITY_ANIMATION_CONFIG_DEFAULT, SCALE_ANIMATION_CONFIG_DEFAULT } from './animationDefaults';
-import { AUTOSCROLL_CONFIG } from './autoscrollConfig';
-import { ReorderableListState } from '../../types';
-const version = React.version.split('.');
-const hasAutomaticBatching = version.length ? parseInt(version[0], 10) >= 18 : false;
-export const useReorderableListCore = ({
-  ref,
-  autoscrollThreshold,
+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, useEffect, useMemo, useRef, useState } from 'react';
+import { FlatList, Platform } from 'react-native';
+import { Gesture, GestureDetector, State } from 'react-native-gesture-handler';
+import Animated, { Easing, measure, runOnJS, runOnUI, scrollTo, useAnimatedReaction, useAnimatedRef, useAnimatedScrollHandler, useComposedEventHandler, useDerivedValue, useSharedValue, withDelay, withTiming } from 'react-native-reanimated';
+import { ReorderableListContext } from '../contexts';
+import { ReorderableListState } from '../types';
+import { AUTOSCROLL_CONFIG, OPACITY_ANIMATION_CONFIG_DEFAULT, SCALE_ANIMATION_CONFIG_DEFAULT } from './constants';
+import { ReorderableListCell } from './ReorderableListCell';
+const AnimatedFlatList = Animated.createAnimatedComponent(FlatList);
+const ReorderableListCore = ({
+  autoscrollThreshold = 0.1,
   autoscrollThresholdOffset,
-  autoscrollSpeedScale,
-  autoscrollDelay,
-  autoscrollActivationDelta,
-  animationDuration,
+  autoscrollSpeedScale = 1,
+  autoscrollDelay = AUTOSCROLL_CONFIG.delay,
+  autoscrollActivationDelta = 5,
+  animationDuration = 200,
+  onLayout,
   onReorder,
+  onScroll,
   onDragStart,
   onDragEnd,
-  onLayout,
   onIndexChange,
   scrollViewContainerRef,
+  scrollViewPageY,
   scrollViewHeightY,
   scrollViewScrollOffsetY,
   scrollViewScrollEnabled,
-  initialScrollEnabled,
-  initialScrollViewScrollEnabled,
-  nestedScrollable,
+  scrollable,
+  outerScrollGesture,
   cellAnimations,
   shouldUpdateActiveItem,
+  panGesture,
+  panEnabled = true,
   panActivateAfterLongPress,
-  panEnabled
-}) => {
+  data,
+  ...rest
+}, ref) => {
+  // FlatList will default to true if we pass explicitly undefined,
+  // but internally we would treat it as false, so we force true.
+  const initialScrollEnabled = typeof rest.scrollEnabled === 'undefined' ? true : rest.scrollEnabled;
+  const initialScrollViewScrollEnabled = typeof rest.initialScrollViewScrollEnabled === 'undefined' ? true : rest.initialScrollViewScrollEnabled;
   const flatListRef = useAnimatedRef();
   const [activeIndex, setActiveIndex] = useState(-1);
   const scrollEnabled = useSharedValue(initialScrollEnabled);
@@ -42,7 +50,7 @@ export const useReorderableListCore = ({
   const startItemDragCenterY = useSharedValue(0);
   const flatListScrollOffsetY = useSharedValue(0);
   const flatListHeightY = useSharedValue(0);
-  const nestedFlatListPositionY = useSharedValue(0);
+  const flatListPageY = useSharedValue(0);
   // The scroll y translation of the list since drag start
   const dragScrollTranslationY = useSharedValue(0);
   // The initial scroll offset y of the list on drag start
@@ -54,6 +62,9 @@ export const useReorderableListCore = ({
   const draggedHeight = useSharedValue(0);
   const itemOffset = useSharedValue([]);
   const itemHeight = useSharedValue([]);
+  // We need to track data length since itemOffset and itemHeight might contain more data than we need.
+  // e.g. items are removed from the list, in which case layout data for those items is set to 0.
+  const itemCount = useSharedValue(data.length);
   const autoscrollTrigger = useSharedValue(-1);
   const lastAutoscrollTrigger = useSharedValue(-1);
   const dragY = useSharedValue(0);
@@ -68,10 +79,30 @@ export const useReorderableListCore = ({
   const dragDirection = useSharedValue(0);
   const lastDragDirectionPivot = useSharedValue(null);
   const autoscrollDelta = useSharedValue(autoscrollActivationDelta);
+  const prevItemCount = useRef(data.length);
+
+  // Position of the list relative to the scroll container
+  const nestedFlatListPositionY = useDerivedValue(() => flatListPageY.value - ((scrollViewPageY === null || scrollViewPageY === void 0 ? void 0 : scrollViewPageY.value) || 0));
   useEffect(() => {
     duration.value = animationDuration;
     autoscrollDelta.value = autoscrollActivationDelta;
-  }, [duration, animationDuration, autoscrollDelta, autoscrollActivationDelta]);
+  }, [duration, animationDuration, autoscrollDelta, autoscrollActivationDelta, itemCount]);
+  useEffect(() => {
+    itemCount.value = data.length;
+
+    // This could be done unmount of the removed cell, however it leads to bugs.
+    // Surprisingly the unmount gets sometimes called after the onLayout event
+    // setting all layout data to 0 and breaking the list. So we solve it like this.
+    if (data.length < prevItemCount.current) {
+      for (let i = data.length; i < prevItemCount.current; i++) {
+        runOnUI(() => {
+          itemHeight.value[i] = 0;
+          itemOffset.value[i] = 0;
+        })();
+      }
+    }
+    prevItemCount.current = data.length;
+  }, [data.length, itemHeight, itemOffset, itemCount]);
   const listContextValue = useMemo(() => ({
     draggedHeight,
     currentIndex,
@@ -123,7 +154,9 @@ export const useReorderableListCore = ({
       currentItemDragCenterY.value = startItemDragCenterY.value + e.translationY;
     }
   }, [currentItemDragCenterY, currentIndex, startItemDragCenterY, itemOffset, itemHeight, flatListScrollOffsetY, scrollViewDragScrollTranslationY]);
-  const panGestureHandler = useMemo(() => Gesture.Pan().onBegin(e => {
+  const panGestureHandler = useMemo(() => (panGesture || Gesture.Pan()).onBegin(e => {
+    'worklet';
+
     // prevent new dragging until item is completely released
     if (state.value === ReorderableListState.IDLE) {
       startY.value = e.y;
@@ -133,6 +166,8 @@ export const useReorderableListCore = ({
       gestureState.value = e.state;
     }
   }).onUpdate(e => {
+    'worklet';
+
     if (state.value === ReorderableListState.DRAGGED) {
       setDragDirection(e);
     }
@@ -143,8 +178,16 @@ export const useReorderableListCore = ({
       dragY.value = e.translationY + dragScrollTranslationY.value + scrollViewDragScrollTranslationY.value;
       gestureState.value = e.state;
     }
-  }).onEnd(e => gestureState.value = e.state).onFinalize(e => gestureState.value = e.state), [state, startY, currentY, currentTranslationY, dragY, gestureState, dragScrollTranslationY, scrollViewDragScrollTranslationY, setDragDirection, setCurrentItemDragCenterY]);
-  const panGestureHandlerWithOptions = useMemo(() => {
+  }).onEnd(e => {
+    'worklet';
+
+    gestureState.value = e.state;
+  }).onFinalize(e => {
+    'worklet';
+
+    gestureState.value = e.state;
+  }), [panGesture, state, startY, currentY, currentTranslationY, dragY, gestureState, dragScrollTranslationY, scrollViewDragScrollTranslationY, setDragDirection, setCurrentItemDragCenterY]);
+  const panGestureHandlerWithPropOptions = useMemo(() => {
     if (typeof panActivateAfterLongPress === 'number') {
       panGestureHandler.activateAfterLongPress(panActivateAfterLongPress);
     }
@@ -153,7 +196,7 @@ export const useReorderableListCore = ({
     }
     return panGestureHandler;
   }, [panActivateAfterLongPress, panEnabled, panGestureHandler]);
-  const gestureHandler = useMemo(() => Gesture.Simultaneous(Gesture.Native(), panGestureHandlerWithOptions), [panGestureHandlerWithOptions]);
+  const gestureHandler = useMemo(() => Gesture.Simultaneous(Gesture.Native(), panGestureHandlerWithPropOptions), [panGestureHandlerWithPropOptions]);
   const setScrollEnabled = useCallback(enabled => {
     // if scroll is enabled on list props then we can toggle it
     if (initialScrollEnabled) {
@@ -189,17 +232,10 @@ export const useReorderableListCore = ({
   const reorder = (fromIndex, toIndex) => {
     runOnUI(resetSharedValues)();
     if (fromIndex !== toIndex) {
-      const updateState = () => {
-        onReorder({
-          from: fromIndex,
-          to: toIndex
-        });
-      };
-      if (!hasAutomaticBatching) {
-        unstable_batchedUpdates(updateState);
-      } else {
-        updateState();
-      }
+      onReorder({
+        from: fromIndex,
+        to: toIndex
+      });
     }
   };
   const recomputeLayout = useCallback((from, to) => {
@@ -237,7 +273,7 @@ export const useReorderableListCore = ({
     const currentOffset = itemOffset.value[currentIndex.value];
     const currentHeight = itemHeight.value[currentIndex.value];
     const currentCenter = currentOffset + currentHeight * 0.5;
-    const max = itemOffset.value.length;
+    const max = itemCount.value;
     const possibleIndex = relativeDragCenterY < currentCenter ? Math.max(0, currentIndex.value - 1) : Math.min(max - 1, currentIndex.value + 1);
     if (currentIndex.value !== possibleIndex) {
       let possibleOffset = itemOffset.value[possibleIndex];
@@ -250,7 +286,7 @@ export const useReorderableListCore = ({
       return distanceFromCurrent <= distanceFromPossible ? currentIndex.value : possibleIndex;
     }
     return currentIndex.value;
-  }, [currentIndex, currentItemDragCenterY, itemOffset, itemHeight, flatListScrollOffsetY, scrollViewDragScrollTranslationY]);
+  }, [currentIndex, currentItemDragCenterY, itemCount, itemOffset, itemHeight, flatListScrollOffsetY, scrollViewDragScrollTranslationY]);
   const setCurrentIndex = useCallback(() => {
     'worklet';
 
@@ -322,7 +358,7 @@ export const useReorderableListCore = ({
       }
     }
   });
-  const calculateHiddenArea = useCallback(() => {
+  const computeHiddenArea = useCallback(() => {
     'worklet';
 
     if (!scrollViewScrollOffsetY || !scrollViewHeightY) {
@@ -340,9 +376,10 @@ export const useReorderableListCore = ({
       bottom
     };
   }, [scrollViewScrollOffsetY, scrollViewHeightY, nestedFlatListPositionY, flatListHeightY]);
-  const calculateThresholdArea = useCallback(hiddenArea => {
+  const computeThresholdArea = useCallback(() => {
     'worklet';
 
+    const hiddenArea = computeHiddenArea();
     const offsetTop = Math.max(0, (autoscrollThresholdOffset === null || autoscrollThresholdOffset === void 0 ? void 0 : autoscrollThresholdOffset.top) || 0);
     const offsetBottom = Math.max(0, (autoscrollThresholdOffset === null || autoscrollThresholdOffset === void 0 ? void 0 : autoscrollThresholdOffset.bottom) || 0);
     const threshold = Math.max(0, Math.min(autoscrollThreshold, 0.4));
@@ -354,58 +391,73 @@ export const useReorderableListCore = ({
       top,
       bottom
     };
-  }, [autoscrollThreshold, autoscrollThresholdOffset, flatListHeightY]);
-  const calculateThresholdAreaParent = useCallback(hiddenArea => {
+  }, [computeHiddenArea, autoscrollThreshold, autoscrollThresholdOffset, flatListHeightY]);
+  const computeContainerThresholdArea = useCallback(() => {
     'worklet';
 
+    if (!scrollViewHeightY) {
+      return {
+        top: -Infinity,
+        bottom: Infinity
+      };
+    }
     const offsetTop = Math.max(0, (autoscrollThresholdOffset === null || autoscrollThresholdOffset === void 0 ? void 0 : autoscrollThresholdOffset.top) || 0);
     const offsetBottom = Math.max(0, (autoscrollThresholdOffset === null || autoscrollThresholdOffset === void 0 ? void 0 : autoscrollThresholdOffset.bottom) || 0);
     const threshold = Math.max(0, Math.min(autoscrollThreshold, 0.4));
-    const area = flatListHeightY.value * threshold;
+    const visibleHeight = scrollViewHeightY.value - (offsetTop + offsetBottom);
+    const area = visibleHeight * threshold;
     const top = area + offsetTop;
-    const bottom = flatListHeightY.value - area - offsetBottom;
-
-    // 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
+    const bottom = visibleHeight - area - offsetBottom;
     return {
-      top: hiddenArea.top > 0.1 ? top + hiddenArea.top : 0,
-      bottom: hiddenArea.bottom > 0.1 ? bottom - hiddenArea.bottom : 0
+      top,
+      bottom
     };
-  }, [autoscrollThreshold, autoscrollThresholdOffset, flatListHeightY]);
-  const shouldScrollParent = useCallback(y => {
+  }, [autoscrollThreshold, autoscrollThresholdOffset, scrollViewHeightY]);
+  const shouldScrollContainer = useCallback(y => {
     'worklet';
 
-    const hiddenArea = calculateHiddenArea();
-    const thresholdAreaParent = calculateThresholdAreaParent(hiddenArea);
+    const containerThresholdArea = computeContainerThresholdArea();
+    const nestedListHiddenArea = computeHiddenArea();
+
+    // We should scroll the container if there's a hidden part of the nested list.
+    // We might have floating errors like 0.0001 which we should ignore.
+    return nestedListHiddenArea.top > 0.01 && y <= containerThresholdArea.top || nestedListHiddenArea.bottom > 0.01 && y >= containerThresholdArea.bottom;
+  }, [computeHiddenArea, computeContainerThresholdArea]);
+  const getRelativeContainerY = useCallback(() => {
+    'worklet';
 
-    // 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 => {
+    return currentY.value + nestedFlatListPositionY.value - scrollViewDragInitialScrollOffsetY.value;
+  }, [currentY, nestedFlatListPositionY, scrollViewDragInitialScrollOffsetY]);
+  const getRelativeListY = useCallback(() => {
     'worklet';
 
-    const hiddenArea = calculateHiddenArea();
-    if (shouldScrollParent(y)) {
-      const thresholdAreaParent = calculateThresholdAreaParent(hiddenArea);
-      if (y <= thresholdAreaParent.top) {
+    return currentY.value + scrollViewDragScrollTranslationY.value;
+  }, [currentY, scrollViewDragScrollTranslationY]);
+  const scrollDirection = useCallback(() => {
+    'worklet';
+
+    const relativeContainerY = getRelativeContainerY();
+    if (shouldScrollContainer(relativeContainerY)) {
+      const containerThresholdArea = computeContainerThresholdArea();
+      if (relativeContainerY <= containerThresholdArea.top) {
         return -1;
       }
-      if (y >= thresholdAreaParent.bottom) {
+      if (relativeContainerY >= containerThresholdArea.bottom) {
         return 1;
       }
-      return 0;
-    } else if (nestedScrollable) {
-      const thresholdArea = calculateThresholdArea(hiddenArea);
-      if (y <= thresholdArea.top) {
+    } else if (scrollable) {
+      const relativeListY = getRelativeListY();
+      const thresholdArea = computeThresholdArea();
+      if (relativeListY <= thresholdArea.top) {
         return -1;
       }
-      if (y >= thresholdArea.bottom) {
+      if (relativeListY >= thresholdArea.bottom) {
         return 1;
       }
     }
     return 0;
-  }, [nestedScrollable, shouldScrollParent, calculateHiddenArea, calculateThresholdArea, calculateThresholdAreaParent]);
-  useAnimatedReaction(() => currentY.value + scrollViewDragScrollTranslationY.value, y => {
+  }, [shouldScrollContainer, computeThresholdArea, computeContainerThresholdArea, getRelativeContainerY, getRelativeListY, scrollable]);
+  useAnimatedReaction(() => currentY.value, () => {
     if (state.value === ReorderableListState.DRAGGED || state.value === ReorderableListState.AUTOSCROLL) {
       setCurrentIndex();
 
@@ -413,7 +465,7 @@ export const useReorderableListCore = ({
       // 1. Within the threshold area (top or bottom of list)
       // 2. Have dragged in the same direction as the scroll
       // 3. Not already in autoscroll mode
-      if (dragDirection.value === scrollDirection(y)) {
+      if (dragDirection.value === scrollDirection()) {
         // When the first two conditions are met and it's already in autoscroll mode, we let it continue (no-op)
         if (state.value !== ReorderableListState.AUTOSCROLL) {
           state.value = ReorderableListState.AUTOSCROLL;
@@ -427,12 +479,15 @@ export const useReorderableListCore = ({
   });
   useAnimatedReaction(() => autoscrollTrigger.value, () => {
     if (autoscrollTrigger.value !== lastAutoscrollTrigger.value && state.value === ReorderableListState.AUTOSCROLL) {
-      let y = currentY.value + scrollViewDragScrollTranslationY.value;
-      const autoscrollIncrement = scrollDirection(y) * AUTOSCROLL_CONFIG.increment * autoscrollSpeedScale;
+      const autoscrollIncrement = dragDirection.value * AUTOSCROLL_CONFIG.increment * autoscrollSpeedScale;
       if (autoscrollIncrement !== 0) {
         let scrollOffset = flatListScrollOffsetY.value;
         let listRef = flatListRef;
-        if (shouldScrollParent(y) && scrollViewScrollOffsetY) {
+
+        // Checking on every autoscroll whether to scroll the container,
+        // this allows to smoothly pass the scroll from the container to the nested list
+        // without any gesture input.
+        if (scrollViewScrollOffsetY && shouldScrollContainer(getRelativeContainerY())) {
           scrollOffset = scrollViewScrollOffsetY.value;
           listRef = scrollViewContainerRef;
         }
@@ -464,7 +519,7 @@ export const useReorderableListCore = ({
     }
   });
 
-  // parent scroll handler
+  // container 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
@@ -508,30 +563,68 @@ export const useReorderableListCore = ({
     }
   }, [resetSharedValues, shouldUpdateActiveItem, dragInitialScrollOffsetY, scrollViewScrollOffsetY, scrollViewDragInitialScrollOffsetY, setScrollEnabled, currentIndex, draggedHeight, draggedIndex, state, flatListScrollOffsetY, itemHeight, onDragStart, runDefaultDragAnimations]);
   const handleFlatListLayout = useCallback(e => {
-    nestedFlatListPositionY.value = e.nativeEvent.layout.y;
     flatListHeightY.value = e.nativeEvent.layout.height;
+
+    // If nested in a scroll container.
+    if (scrollViewScrollOffsetY) {
+      // Timeout fixes a bug where measure returns height 0.
+      setTimeout(() => {
+        runOnUI(() => {
+          const measurement = measure(flatListRef);
+          if (!measurement) {
+            return;
+          }
+          flatListPageY.value = measurement.pageY;
+        })();
+      }, 100);
+    }
     onLayout === null || onLayout === void 0 || onLayout(e);
-  }, [nestedFlatListPositionY, flatListHeightY, onLayout]);
-  const handleRef = value => {
+  }, [flatListRef, flatListPageY, flatListHeightY, scrollViewScrollOffsetY, onLayout]);
+  const handleRef = useCallback(value => {
     flatListRef(value);
     if (typeof ref === 'function') {
       ref(value);
     } else if (ref) {
       ref.current = value;
     }
-  };
-  return {
-    gestureHandler,
-    handleScroll,
-    handleFlatListLayout,
-    handleRef,
-    startDrag,
-    listContextValue,
-    itemOffset,
-    itemHeight,
-    draggedIndex,
-    dragY,
-    duration
-  };
+  }, [flatListRef, ref]);
+  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 composedScrollHandler = useComposedEventHandler([handleScroll, onScroll || null]);
+  const renderAnimatedCell = useCallback(({
+    cellKey,
+    ...props
+  }) => /*#__PURE__*/React.createElement(ReorderableListCell, _extends({}, props, {
+    // forces remount with key change on reorder
+    key: `${cellKey}+${props.index}`,
+    itemOffset: itemOffset,
+    itemHeight: itemHeight,
+    dragY: dragY,
+    draggedIndex: draggedIndex,
+    animationDuration: duration,
+    startDrag: startDrag
+  })), [itemOffset, itemHeight, dragY, draggedIndex, duration, startDrag]);
+  return /*#__PURE__*/React.createElement(ReorderableListContext.Provider, {
+    value: listContextValue
+  }, /*#__PURE__*/React.createElement(GestureDetector, {
+    gesture: combinedGesture
+  }, /*#__PURE__*/React.createElement(AnimatedFlatList, _extends({}, rest, {
+    ref: handleRef,
+    data: data,
+    CellRendererComponent: renderAnimatedCell,
+    onLayout: handleFlatListLayout,
+    onScroll: composedScrollHandler,
+    scrollEventThrottle: 1,
+    horizontal: false,
+    removeClippedSubviews: false,
+    numColumns: 1
+  }))));
 };
-//# sourceMappingURL=useReorderableListCore.js.map
+const MemoizedReorderableListCore = /*#__PURE__*/React.memo(/*#__PURE__*/React.forwardRef(ReorderableListCore));
+export { MemoizedReorderableListCore as ReorderableListCore };
+//# sourceMappingURL=ReorderableListCore.js.map