@momo-kits/foundation 0.92.26-beta.2 → 0.92.26-beta.3

package/Application/BottomSheet.tsx

@@ -1,18 +1,17 @@
-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,
 } 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';
@@ -67,9 +66,6 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     backgroundColor = theme.colors.background.surface;
   }
 
-  /**
-   * emit dismiss event
-   */
   useEffect(() => {
     Animated.timing(pan, {
       toValue: {x: 0, y: 0},
@@ -81,9 +77,6 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     };
   }, []);
 
-  /**
-   * handler dismiss
-   */
   const onDismiss = (force = false, callback?: () => void) => {
     if (barrierDismissible && !force) {
       return;
@@ -100,16 +93,10 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     });
   };
 
-  /**
-   * manual close
-   */
   const requestClose = useCallback((callback?: () => void) => {
     onDismiss(true, callback);
   }, []);
 
-  /**
-   * render header
-   */
   const renderHeader = useCallback(() => {
     return (
       <View
@@ -148,7 +135,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   }, []);
 
   return (
-    <Modal transparent visible={true} onRequestClose={() => onDismiss()}>
+    <View style={styles.overlay}>
       <KeyboardAvoidingView
         behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
         keyboardVerticalOffset={keyboardVerticalOffset ?? -20}
@@ -164,11 +151,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
             <Screen
               {...props}
               {...props.route.params}
-              // requestClose={
-              //   props.requestClose ??
-              //   props.route.params?.requestClose ??
-              //   requestClose
-              // }
+              requestClose={requestClose}
             />
             {useBottomInset && (
               <View style={{height: Math.min(insets.bottom, 21)}} />
@@ -176,23 +159,14 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
           </View>
         </Animated.View>
       </KeyboardAvoidingView>
-    </Modal>
+    </View>
   );
 };
 
-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 +190,5 @@ const styles = StyleSheet.create({
     marginHorizontal: Spacing.M,
   },
 });
+
+export default BottomSheet;

package/package.json

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