@r0b0t3d/react-native-collapsible 1.5.0-alpha.0 → 1.5.0-alpha.1

package/lib/commonjs/components/scrollable/CollapsibleFlashList.js

@@ -26,13 +26,10 @@ function CollapsibleFlatList(_ref) {
     headerHeight
   } = (0, _useCollapsibleContext.default)();
   const {
-    contentMinHeight,
     scrollViewRef,
     fixedHeaderHeight
   } = (0, _useInternalCollapsibleContext.default)();
   const mounted = (0, _react.useRef)(true);
-  const contentHeight = (0, _react.useRef)(0);
-  const [internalContentMinHeight, setInternalContentMinHeight] = (0, _react.useState)(contentMinHeight.value);
   const [internalProgressViewOffset, setInternalProgressViewOffset] = (0, _react.useState)(0);
   (0, _react.useEffect)(() => {
     return () => {
@@ -62,25 +59,11 @@ function CollapsibleFlatList(_ref) {
     scrollToIndex,
     scrollToLocation
   });
-  const handleInternalContentHeight = (0, _react.useCallback)(value => {
-    if (mounted.current) {
-      setInternalContentMinHeight(value);
-    }
-  }, []);
   const handleInternalProgressViewOffset = (0, _react.useCallback)(value => {
     if (mounted.current) {
       setInternalProgressViewOffset(value);
     }
   }, []);
-  (0, _reactNativeReanimated.useAnimatedReaction)(() => {
-    return contentMinHeight.value;
-  }, (result, previous) => {
-    if (result !== previous) {
-      if (contentHeight.current < result && internalContentMinHeight !== result) {
-        (0, _reactNativeReanimated.runOnJS)(handleInternalContentHeight)(result);
-      }
-    }
-  });
   (0, _reactNativeReanimated.useAnimatedReaction)(() => {
     return fixedHeaderHeight.value;
   }, (result, previous) => {
@@ -88,35 +71,28 @@ function CollapsibleFlatList(_ref) {
       (0, _reactNativeReanimated.runOnJS)(handleInternalProgressViewOffset)(result);
     }
   });
-  const contentContainerStyle = (0, _react.useMemo)(() => [styles.contentContainer, {
-    minHeight: internalContentMinHeight
-  }, props.contentContainerStyle], [props.contentContainerStyle, internalContentMinHeight]);
-  const handleContentSizeChange = (0, _react.useCallback)((_, height) => {
-    contentHeight.current = height;
-  }, []);
   const handleScrollToIndexFailed = (0, _react.useCallback)(() => {}, []);
   function renderListHeader() {
     return /*#__PURE__*/_react.default.createElement(_reactNative.View, null, /*#__PURE__*/_react.default.createElement(_AnimatedTopView.default, {
       height: headerHeight
     }), props.ListHeaderComponent);
   }
-  return /*#__PURE__*/_react.default.createElement(AnimatedFlashList, _extends({
+  return /*#__PURE__*/_react.default.createElement(_reactNative.View, {
+    style: [styles.container, props.style]
+  }, /*#__PURE__*/_react.default.createElement(AnimatedFlashList, _extends({
     ref: scrollViewRef,
     keyboardDismissMode: "on-drag",
     keyboardShouldPersistTaps: "handled",
     scrollEventThrottle: 1,
     onScrollToIndexFailed: handleScrollToIndexFailed
   }, props, {
-    style: [styles.container, props.style]
+    onScroll: scrollHandler,
+    ListHeaderComponent: renderListHeader()
     //@ts-ignore
     ,
-    contentContainerStyle: contentContainerStyle,
-    onScroll: scrollHandler,
-    ListHeaderComponent: renderListHeader(),
-    onContentSizeChange: handleContentSizeChange,
     simultaneousHandlers: [],
     progressViewOffset: internalProgressViewOffset
-  }));
+  })));
 }
 const styles = _reactNative.StyleSheet.create({
   container: {

package/lib/commonjs/components/scrollable/CollapsibleFlashList.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_reactNativeReanimated","_flashList","_useAnimatedScroll","_interopRequireDefault","_useInternalCollapsibleContext","_AnimatedTopView","_useCollapsibleContext","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","_extends","assign","bind","target","i","arguments","length","source","apply","AnimatedFlashList","Animated","createAnimatedComponent","FlashList","CollapsibleFlatList","_ref","headerSnappable","props","headerHeight","useCollapsibleContext","contentMinHeight","scrollViewRef","fixedHeaderHeight","useInternalCollapsibleContext","mounted","useRef","contentHeight","internalContentMinHeight","setInternalContentMinHeight","useState","value","internalProgressViewOffset","setInternalProgressViewOffset","useEffect","current","scrollTo","useCallback","yValue","_scrollViewRef$curren","animated","undefined","scrollToOffset","offset","scrollToIndex","params","_scrollViewRef$curren2","scrollToLocation","console","warn","scrollHandler","useAnimatedScroll","handleInternalContentHeight","handleInternalProgressViewOffset","useAnimatedReaction","result","previous","runOnJS","contentContainerStyle","useMemo","styles","contentContainer","minHeight","handleContentSizeChange","_","height","handleScrollToIndexFailed","renderListHeader","createElement","View","ListHeaderComponent","ref","keyboardDismissMode","keyboardShouldPersistTaps","scrollEventThrottle","onScrollToIndexFailed","style","container","onScroll","onContentSizeChange","simultaneousHandlers","progressViewOffset","StyleSheet","create","absoluteFillObject","flexGrow","topView","position","top","left","right"],"sourceRoot":"../../../../src","sources":["components/scrollable/CollapsibleFlashList.tsx"],"mappings":"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"}
+{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_reactNativeReanimated","_flashList","_useAnimatedScroll","_interopRequireDefault","_useInternalCollapsibleContext","_AnimatedTopView","_useCollapsibleContext","obj","__esModule","default","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","_extends","assign","bind","target","i","arguments","length","source","apply","AnimatedFlashList","Animated","createAnimatedComponent","FlashList","CollapsibleFlatList","_ref","headerSnappable","props","headerHeight","useCollapsibleContext","scrollViewRef","fixedHeaderHeight","useInternalCollapsibleContext","mounted","useRef","internalProgressViewOffset","setInternalProgressViewOffset","useState","useEffect","current","scrollTo","useCallback","yValue","_scrollViewRef$curren","animated","undefined","scrollToOffset","offset","scrollToIndex","params","_scrollViewRef$curren2","scrollToLocation","console","warn","scrollHandler","useAnimatedScroll","handleInternalProgressViewOffset","value","useAnimatedReaction","result","previous","runOnJS","handleScrollToIndexFailed","renderListHeader","createElement","View","height","ListHeaderComponent","style","styles","container","ref","keyboardDismissMode","keyboardShouldPersistTaps","scrollEventThrottle","onScrollToIndexFailed","onScroll","simultaneousHandlers","progressViewOffset","StyleSheet","create","absoluteFillObject","contentContainer","flexGrow","topView","position","top","left","right"],"sourceRoot":"../../../../src","sources":["components/scrollable/CollapsibleFlashList.tsx"],"mappings":"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"}

package/lib/module/components/scrollable/CollapsibleFlashList.js

@@ -1,6 +1,6 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 /* eslint-disable react-hooks/exhaustive-deps */
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { View, StyleSheet } from 'react-native';
 import Animated, { runOnJS, useAnimatedReaction } from 'react-native-reanimated';
 import { FlashList } from '@shopify/flash-list';
@@ -18,13 +18,10 @@ export default function CollapsibleFlatList(_ref) {
     headerHeight
   } = useCollapsibleContext();
   const {
-    contentMinHeight,
     scrollViewRef,
     fixedHeaderHeight
   } = useInternalCollapsibleContext();
   const mounted = useRef(true);
-  const contentHeight = useRef(0);
-  const [internalContentMinHeight, setInternalContentMinHeight] = useState(contentMinHeight.value);
   const [internalProgressViewOffset, setInternalProgressViewOffset] = useState(0);
   useEffect(() => {
     return () => {
@@ -54,25 +51,11 @@ export default function CollapsibleFlatList(_ref) {
     scrollToIndex,
     scrollToLocation
   });
-  const handleInternalContentHeight = useCallback(value => {
-    if (mounted.current) {
-      setInternalContentMinHeight(value);
-    }
-  }, []);
   const handleInternalProgressViewOffset = useCallback(value => {
     if (mounted.current) {
       setInternalProgressViewOffset(value);
     }
   }, []);
-  useAnimatedReaction(() => {
-    return contentMinHeight.value;
-  }, (result, previous) => {
-    if (result !== previous) {
-      if (contentHeight.current < result && internalContentMinHeight !== result) {
-        runOnJS(handleInternalContentHeight)(result);
-      }
-    }
-  });
   useAnimatedReaction(() => {
     return fixedHeaderHeight.value;
   }, (result, previous) => {
@@ -80,35 +63,28 @@ export default function CollapsibleFlatList(_ref) {
       runOnJS(handleInternalProgressViewOffset)(result);
     }
   });
-  const contentContainerStyle = useMemo(() => [styles.contentContainer, {
-    minHeight: internalContentMinHeight
-  }, props.contentContainerStyle], [props.contentContainerStyle, internalContentMinHeight]);
-  const handleContentSizeChange = useCallback((_, height) => {
-    contentHeight.current = height;
-  }, []);
   const handleScrollToIndexFailed = useCallback(() => {}, []);
   function renderListHeader() {
     return /*#__PURE__*/React.createElement(View, null, /*#__PURE__*/React.createElement(AnimatedTopView, {
       height: headerHeight
     }), props.ListHeaderComponent);
   }
-  return /*#__PURE__*/React.createElement(AnimatedFlashList, _extends({
+  return /*#__PURE__*/React.createElement(View, {
+    style: [styles.container, props.style]
+  }, /*#__PURE__*/React.createElement(AnimatedFlashList, _extends({
     ref: scrollViewRef,
     keyboardDismissMode: "on-drag",
     keyboardShouldPersistTaps: "handled",
     scrollEventThrottle: 1,
     onScrollToIndexFailed: handleScrollToIndexFailed
   }, props, {
-    style: [styles.container, props.style]
+    onScroll: scrollHandler,
+    ListHeaderComponent: renderListHeader()
     //@ts-ignore
     ,
-    contentContainerStyle: contentContainerStyle,
-    onScroll: scrollHandler,
-    ListHeaderComponent: renderListHeader(),
-    onContentSizeChange: handleContentSizeChange,
     simultaneousHandlers: [],
     progressViewOffset: internalProgressViewOffset
-  }));
+  })));
 }
 const styles = StyleSheet.create({
   container: {

package/lib/module/components/scrollable/CollapsibleFlashList.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useCallback","useEffect","useMemo","useRef","useState","View","StyleSheet","Animated","runOnJS","useAnimatedReaction","FlashList","useAnimatedScroll","useInternalCollapsibleContext","AnimatedTopView","useCollapsibleContext","AnimatedFlashList","createAnimatedComponent","CollapsibleFlatList","_ref","headerSnappable","props","headerHeight","contentMinHeight","scrollViewRef","fixedHeaderHeight","mounted","contentHeight","internalContentMinHeight","setInternalContentMinHeight","value","internalProgressViewOffset","setInternalProgressViewOffset","current","scrollTo","yValue","_scrollViewRef$curren","animated","arguments","length","undefined","scrollToOffset","offset","scrollToIndex","params","_scrollViewRef$curren2","scrollToLocation","console","warn","scrollHandler","handleInternalContentHeight","handleInternalProgressViewOffset","result","previous","contentContainerStyle","styles","contentContainer","minHeight","handleContentSizeChange","_","height","handleScrollToIndexFailed","renderListHeader","createElement","ListHeaderComponent","_extends","ref","keyboardDismissMode","keyboardShouldPersistTaps","scrollEventThrottle","onScrollToIndexFailed","style","container","onScroll","onContentSizeChange","simultaneousHandlers","progressViewOffset","create","absoluteFillObject","flexGrow","topView","position","top","left","right"],"sourceRoot":"../../../../src","sources":["components/scrollable/CollapsibleFlashList.tsx"],"mappings":"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"}
+{"version":3,"names":["React","useCallback","useEffect","useRef","useState","View","StyleSheet","Animated","runOnJS","useAnimatedReaction","FlashList","useAnimatedScroll","useInternalCollapsibleContext","AnimatedTopView","useCollapsibleContext","AnimatedFlashList","createAnimatedComponent","CollapsibleFlatList","_ref","headerSnappable","props","headerHeight","scrollViewRef","fixedHeaderHeight","mounted","internalProgressViewOffset","setInternalProgressViewOffset","current","scrollTo","yValue","_scrollViewRef$curren","animated","arguments","length","undefined","scrollToOffset","offset","scrollToIndex","params","_scrollViewRef$curren2","scrollToLocation","console","warn","scrollHandler","handleInternalProgressViewOffset","value","result","previous","handleScrollToIndexFailed","renderListHeader","createElement","height","ListHeaderComponent","style","styles","container","_extends","ref","keyboardDismissMode","keyboardShouldPersistTaps","scrollEventThrottle","onScrollToIndexFailed","onScroll","simultaneousHandlers","progressViewOffset","create","absoluteFillObject","contentContainer","flexGrow","topView","position","top","left","right"],"sourceRoot":"../../../../src","sources":["components/scrollable/CollapsibleFlashList.tsx"],"mappings":"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"}

package/lib/typescript/components/scrollable/CollapsibleFlashList.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-import { FlatListProps } from 'react-native';
+import { FlashListProps } from '@shopify/flash-list';
 import type { CollapsibleProps } from '../../types';
-type Props<Data> = Omit<FlatListProps<Data>, 'scrollEnabled'> & CollapsibleProps;
+type Props<Data> = Omit<FlashListProps<Data>, 'scrollEnabled'> & CollapsibleProps;
 export default function CollapsibleFlatList<Data>({ headerSnappable, ...props }: Props<Data>): React.JSX.Element;
 export {};
 //# sourceMappingURL=CollapsibleFlashList.d.ts.map

package/lib/typescript/components/scrollable/CollapsibleFlashList.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CollapsibleFlashList.d.ts","sourceRoot":"","sources":["../../../../src/components/scrollable/CollapsibleFlashList.tsx"],"names":[],"mappings":"AACA,OAAO,KAMN,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,aAAa,EAAoB,MAAM,cAAc,CAAC;AAQ/D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAMpD,KAAK,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,GAC3D,gBAAgB,CAAC;AAEnB,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,IAAI,EAAE,EAChD,eAAsB,EACtB,GAAG,KAAK,EACT,EAAE,KAAK,CAAC,IAAI,CAAC,qBAyHb"}
+{"version":3,"file":"CollapsibleFlashList.d.ts","sourceRoot":"","sources":["../../../../src/components/scrollable/CollapsibleFlashList.tsx"],"names":[],"mappings":"AACA,OAAO,KAAmD,MAAM,OAAO,CAAC;AAMxE,OAAO,EAAa,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAGhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAMpD,KAAK,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,eAAe,CAAC,GAC5D,gBAAgB,CAAC;AAEnB,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,IAAI,EAAE,EAChD,eAAsB,EACtB,GAAG,KAAK,EACT,EAAE,KAAK,CAAC,IAAI,CAAC,qBAgFb"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@r0b0t3d/react-native-collapsible",
-  "version": "1.5.0-alpha.0",
+  "version": "1.5.0-alpha.1",
   "description": "Fully customizable collapsible views",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/components/scrollable/CollapsibleFlashList.tsx

@@ -1,17 +1,11 @@
 /* eslint-disable react-hooks/exhaustive-deps */
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from 'react';
-import { FlatListProps, View, StyleSheet } from 'react-native';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { View, StyleSheet } from 'react-native';
 import Animated, {
   runOnJS,
   useAnimatedReaction,
 } from 'react-native-reanimated';
-import { FlashList } from '@shopify/flash-list';
+import { FlashList, FlashListProps } from '@shopify/flash-list';
 import useAnimatedScroll from './useAnimatedScroll';
 import useInternalCollapsibleContext from '../../hooks/useInternalCollapsibleContext';
 import type { CollapsibleProps } from '../../types';
@@ -20,7 +14,7 @@ import useCollapsibleContext from '../../hooks/useCollapsibleContext';
 
 const AnimatedFlashList = Animated.createAnimatedComponent(FlashList);
 
-type Props<Data> = Omit<FlatListProps<Data>, 'scrollEnabled'> &
+type Props<Data> = Omit<FlashListProps<Data>, 'scrollEnabled'> &
   CollapsibleProps;
 
 export default function CollapsibleFlatList<Data>({
@@ -28,13 +22,8 @@ export default function CollapsibleFlatList<Data>({
   ...props
 }: Props<Data>) {
   const { headerHeight } = useCollapsibleContext();
-  const { contentMinHeight, scrollViewRef, fixedHeaderHeight } =
-    useInternalCollapsibleContext();
+  const { scrollViewRef, fixedHeaderHeight } = useInternalCollapsibleContext();
   const mounted = useRef(true);
-  const contentHeight = useRef(0);
-  const [internalContentMinHeight, setInternalContentMinHeight] = useState(
-    contentMinHeight.value
-  );
   const [internalProgressViewOffset, setInternalProgressViewOffset] =
     useState(0);
 
@@ -66,34 +55,12 @@ export default function CollapsibleFlatList<Data>({
     scrollToLocation,
   });
 
-  const handleInternalContentHeight = useCallback((value: number) => {
-    if (mounted.current) {
-      setInternalContentMinHeight(value);
-    }
-  }, []);
-
   const handleInternalProgressViewOffset = useCallback((value: number) => {
     if (mounted.current) {
       setInternalProgressViewOffset(value);
     }
   }, []);
 
-  useAnimatedReaction(
-    () => {
-      return contentMinHeight.value;
-    },
-    (result, previous) => {
-      if (result !== previous) {
-        if (
-          contentHeight.current < result &&
-          internalContentMinHeight !== result
-        ) {
-          runOnJS(handleInternalContentHeight)(result);
-        }
-      }
-    }
-  );
-
   useAnimatedReaction(
     () => {
       return fixedHeaderHeight.value;
@@ -105,19 +72,6 @@ export default function CollapsibleFlatList<Data>({
     }
   );
 
-  const contentContainerStyle = useMemo(
-    () => [
-      styles.contentContainer,
-      { minHeight: internalContentMinHeight },
-      props.contentContainerStyle,
-    ],
-    [props.contentContainerStyle, internalContentMinHeight]
-  );
-
-  const handleContentSizeChange = useCallback((_, height) => {
-    contentHeight.current = height;
-  }, []);
-
   const handleScrollToIndexFailed = useCallback(() => {}, []);
 
   function renderListHeader() {
@@ -130,22 +84,21 @@ export default function CollapsibleFlatList<Data>({
   }
 
   return (
-    <AnimatedFlashList
-      ref={scrollViewRef}
-      keyboardDismissMode="on-drag"
-      keyboardShouldPersistTaps="handled"
-      scrollEventThrottle={1}
-      onScrollToIndexFailed={handleScrollToIndexFailed}
-      {...props}
-      style={[styles.container, props.style]}
-      //@ts-ignore
-      contentContainerStyle={contentContainerStyle}
-      onScroll={scrollHandler}
-      ListHeaderComponent={renderListHeader()}
-      onContentSizeChange={handleContentSizeChange}
-      simultaneousHandlers={[]}
-      progressViewOffset={internalProgressViewOffset}
-    />
+    <View style={[styles.container, props.style]}>
+      <AnimatedFlashList
+        ref={scrollViewRef}
+        keyboardDismissMode="on-drag"
+        keyboardShouldPersistTaps="handled"
+        scrollEventThrottle={1}
+        onScrollToIndexFailed={handleScrollToIndexFailed}
+        {...props}
+        onScroll={scrollHandler}
+        ListHeaderComponent={renderListHeader()}
+        //@ts-ignore
+        simultaneousHandlers={[]}
+        progressViewOffset={internalProgressViewOffset}
+      />
+    </View>
   );
 }