@momo-kits/foundation 0.92.26-beta.7 → 0.92.26-beta.8

package/Application/BottomSheet.tsx

@@ -8,6 +8,7 @@ import {
   StyleSheet,
   TouchableOpacity,
   View,
+  Modal,
 } from 'react-native';
 import {useSafeAreaInsets} from 'react-native-safe-area-context';
 import {ApplicationContext} from './index';
@@ -23,6 +24,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   const {
     screen: Screen,
     options,
+    useNativeModal = false,
     surface,
     barrierDismissible = false,
     draggable = true,
@@ -61,17 +63,23 @@ 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;
   }
 
+  /**
+   * emit dismiss event
+   */
   useEffect(() => {
     Animated.timing(pan, {
       toValue: {x: 0, y: 0},
       useNativeDriver: false,
-      duration: 50,
+      duration: 150,
     }).start();
     return () => {
       props.route.params?.onDismiss?.();
@@ -79,9 +87,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   }, []);
 
   /**
-   * on dismiss
-   * @param force
-   * @param callback
+   * handler dismiss
    */
   const onDismiss = (force = false, callback?: () => void) => {
     if (barrierDismissible && !force) {
@@ -106,6 +112,9 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     onDismiss(true, callback);
   }, []);
 
+  /**
+   * render header
+   */
   const renderHeader = useCallback(() => {
     return (
       <View
@@ -144,7 +153,11 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   }, []);
 
   return (
-    <View style={styles.overlay}>
+    <Container
+      transparent
+      visible={true}
+      onRequestClose={() => onDismiss()}
+      style={styles.overlay}>
       <KeyboardAvoidingView
         behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
         keyboardVerticalOffset={keyboardVerticalOffset ?? -20}
@@ -168,7 +181,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
           </View>
         </Animated.View>
       </KeyboardAvoidingView>
-    </View>
+    </Container>
   );
 };
 

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/Popup/PopupNotify.tsx

@@ -5,7 +5,7 @@ import {Button} from '../Button';
 import {Radius, Spacing, Styles} from '../Consts';
 import {Icon} from '../Icon';
 import {Image} from '../Image';
-import {Text} from '../Text';
+import {scaleSize, Text} from '../Text';
 import {PopupNotifyProps} from './types';
 
 const PopupNotify: React.FC<PopupNotifyProps> = ({
@@ -27,7 +27,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
   let Description: any = View;
   if (scrollContent) {
     Description = ScrollView;
-    descriptionStyle = {height: 80};
+    descriptionStyle = {maxHeight: scaleSize(164)};
   }
   /**
    * tracking

package/package.json

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