@momo-kits/foundation 0.92.26 → 0.92.28

package/Application/BottomSheet.tsx

@@ -1,30 +1,30 @@
-import React, {useCallback, useContext, useEffect, useRef} from 'react';
+import React, {useRef, useEffect, useCallback, useContext} from 'react';
 import {
   Animated,
   Dimensions,
   KeyboardAvoidingView,
-  Modal,
   PanResponder,
   Platform,
   StyleSheet,
   TouchableOpacity,
   View,
+  Modal,
 } from 'react-native';
+import {useSafeAreaInsets} from 'react-native-safe-area-context';
 import {ApplicationContext} from './index';
 import {BottomSheetParams} from './types';
-import {useSafeAreaInsets} from 'react-native-safe-area-context';
 import {Colors, Radius, Spacing, Styles} from '../Consts';
 import {Text} from '../Text';
 import {Icon} from '../Icon';
 
 const BottomSheet: React.FC<BottomSheetParams> = props => {
   const {theme, navigator} = useContext(ApplicationContext);
-  const closed = useRef(false);
   const heightDevice = Dimensions.get('screen').height;
   const insets = useSafeAreaInsets();
   const {
     screen: Screen,
     options,
+    useNativeModal = false,
     surface,
     barrierDismissible = false,
     draggable = true,
@@ -37,6 +37,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
       x: 0,
     })
   ).current;
+
   const panResponder = useRef(
     PanResponder.create({
       onStartShouldSetPanResponder: () => draggable,
@@ -62,7 +63,10 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
       },
     })
   ).current;
-
+  let Container: any = View;
+  if (useNativeModal) {
+    Container = Modal;
+  }
   let backgroundColor = theme.colors.background.default;
   if (surface) {
     backgroundColor = theme.colors.background.surface;
@@ -78,9 +82,6 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
       duration: 150,
     }).start();
     return () => {
-      if (!closed.current) {
-        navigator?.pop();
-      }
       props.route.params?.onDismiss?.();
     };
   }, []);
@@ -93,21 +94,21 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
       return;
     }
     setTimeout(() => {
-      closed.current = true;
-      navigator?.pop();
       callback?.();
-    }, 350);
+    }, 300);
     Animated.timing(pan, {
       toValue: {x: 0, y: heightDevice},
       useNativeDriver: false,
       duration: 200,
-    }).start();
+    }).start(() => {
+      navigator?.pop();
+    });
   };
 
   /**
-   * manual close
+   * on request close
    */
-  const requestClose = useCallback((callback?: () => void) => {
+  const onRequestClose = useCallback((callback?: () => void) => {
     onDismiss(true, callback);
   }, []);
 
@@ -152,7 +153,11 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   }, []);
 
   return (
-    <Modal transparent visible={true} onRequestClose={() => onDismiss()}>
+    <Container
+      transparent
+      visible={true}
+      onRequestClose={() => onDismiss()}
+      style={styles.overlay}>
       <KeyboardAvoidingView
         behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
         keyboardVerticalOffset={keyboardVerticalOffset ?? -20}
@@ -168,7 +173,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
             <Screen
               {...props}
               {...props.route.params}
-              requestClose={requestClose}
+              onRequestClose={onRequestClose}
             />
             {useBottomInset && (
               <View style={{height: Math.min(insets.bottom, 21)}} />
@@ -176,23 +181,14 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
           </View>
         </Animated.View>
       </KeyboardAvoidingView>
-    </Modal>
+    </Container>
   );
 };
 
-export default BottomSheet;
-
 const styles = StyleSheet.create({
-  container: {
-    width: '100%',
-    height: 0,
-    overflow: 'hidden',
-    borderTopLeftRadius: Radius.M,
-    borderTopRightRadius: Radius.M,
-  },
-  draggableContainer: {
-    width: '100%',
-    alignItems: 'center',
+  overlay: {
+    ...StyleSheet.absoluteFillObject,
+    justifyContent: 'flex-end',
   },
   indicator: {
     width: 40,
@@ -216,3 +212,5 @@ const styles = StyleSheet.create({
     marginHorizontal: Spacing.M,
   },
 });
+
+export default BottomSheet;

package/Application/types.ts

@@ -115,6 +115,7 @@ export type BottomSheetParams = {
     title: string;
     surface?: boolean;
   };
+  useNativeModal?: boolean;
   surface?: boolean;
   onDismiss?: (type?: string) => void;
   barrierDismissible?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.92.26",
+    "version": "0.92.28",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},