@momo-kits/foundation 0.81.1-optimize.16 → 0.81.1-optimize.18

package/Application/BottomSheet.tsx

@@ -1,4 +1,4 @@
-import React, {useContext, useEffect, useRef, useState} from 'react';
+import React, {useCallback, useContext, useEffect, useRef} from 'react';
 import {
   Animated,
   Dimensions,
@@ -26,19 +26,20 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     options,
     surface,
     barrierDismissible = false,
-    snapPoint = 'content',
     draggable = true,
-    dragOnContent = false,
     useBottomInset = true,
   }: BottomSheetParams = props.route.params;
-  const [modalVisible, setModalVisible] = useState(false);
-  const animatedHeight = useRef(new Animated.Value(0)).current;
-  const pan = useRef(new Animated.ValueXY()).current;
+  const pan = useRef(
+    new Animated.ValueXY({
+      y: heightDevice,
+      x: 0,
+    }),
+  ).current;
   const panResponder = useRef(
     PanResponder.create({
       onStartShouldSetPanResponder: () => draggable,
       onMoveShouldSetPanResponder: (_, gestureState) => {
-        return draggable && dragOnContent && gestureState.dy > 0;
+        return draggable && gestureState.dy > 0;
       },
       onPanResponderMove: (e, gestureState) => {
         gestureState.dy > 0 &&
@@ -59,44 +60,26 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
       },
     }),
   ).current;
-  const [estimate, setEstimate] = useState(0.9);
-  const timeoutMount = useRef<any>();
 
   let backgroundColor = theme.colors.background.default;
   if (surface) {
     backgroundColor = theme.colors.background.surface;
   }
 
-  /**
-   * handle open & emit dismiss event
-   */
-  useEffect(() => {
-    clearTimeout(timeoutMount.current);
-    timeoutMount.current = setTimeout(() => {
-      const mapSnapPoint: any = {
-        '30%': 0.3,
-        '50%': 0.5,
-        '70%': 0.7,
-        '90%': 0.9,
-      };
-      const point = mapSnapPoint[snapPoint] ?? estimate;
-      setModalVisible(true);
-      Animated.timing(animatedHeight, {
-        useNativeDriver: false,
-        toValue: heightDevice * point,
-        duration: 150,
-      }).start();
-    }, 50);
-  }, [estimate]);
-
   /**
    * emit dismiss event
    */
   useEffect(() => {
+    Animated.timing(pan, {
+      toValue: {x: 0, y: 0},
+      useNativeDriver: false,
+      duration: 150,
+    }).start();
     return () => {
       props.route.params?.onDismiss?.();
     };
   }, []);
+
   /**
    * handler dismiss
    */
@@ -104,94 +87,74 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     if (barrierDismissible && !force) {
       return;
     }
-    Animated.timing(animatedHeight, {
+    Animated.timing(pan, {
+      toValue: {x: 0, y: heightDevice},
       useNativeDriver: false,
-      toValue: 0,
-      duration: 200,
+      duration: 100,
     }).start(() => {
-      pan.setValue({x: 0, y: 0});
       navigator?.pop();
     });
   };
 
-  return (
-    <>
-      <Modal
-        transparent
-        visible={modalVisible}
-        onRequestClose={() => onDismiss()}>
-        <KeyboardAvoidingView
-          behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-          keyboardVerticalOffset={-20}
-          style={Styles.flex}>
+  const renderHeader = useCallback(() => {
+    return (
+      <View
+        style={{
+          backgroundColor,
+          borderTopLeftRadius: Radius.M,
+          borderTopRightRadius: Radius.M,
+        }}
+        {...panResponder.panHandlers}>
+        <View style={{height: 16}}>
+          <View style={styles.indicator} />
+        </View>
+        <View
+          style={[
+            styles.header,
+            surface && {
+              borderBottomColor: theme.colors.border.default,
+              borderBottomWidth: 1,
+            },
+          ]}>
+          <View style={styles.iconButton} />
+          <Text
+            style={[Styles.flex, {textAlign: 'center'}]}
+            numberOfLines={1}
+            typography="header_default_bold">
+            {options.title ?? ''}
+          </Text>
           <TouchableOpacity
-            style={Styles.flex}
-            activeOpacity={1}
-            onPress={() => onDismiss()}
-          />
-          <Animated.View
-            {...(dragOnContent && panResponder.panHandlers)}
-            style={[
-              styles.container,
-              {transform: pan.getTranslateTransform()},
-              {
-                height: animatedHeight,
-                backgroundColor,
-              },
-            ]}>
-            {draggable && (
-              <View
-                {...(!dragOnContent && panResponder.panHandlers)}
-                style={styles.draggableContainer}>
-                <View style={{height: 16}}>
-                  <View style={styles.indicator} />
-                </View>
-                <View
-                  style={[
-                    styles.header,
-                    surface && {
-                      borderBottomColor: theme.colors.border.default,
-                      borderBottomWidth: 1,
-                    },
-                  ]}>
-                  <View style={styles.iconButton} />
-                  <Text
-                    style={[Styles.flex, {textAlign: 'center'}]}
-                    numberOfLines={1}
-                    typography="header_default_bold">
-                    {options.title ?? ''}
-                  </Text>
-                  <TouchableOpacity
-                    style={styles.iconButton}
-                    onPress={() => onDismiss(true)}>
-                    <Icon source="navigation_close" />
-                  </TouchableOpacity>
-                </View>
-              </View>
-            )}
+            style={styles.iconButton}
+            onPress={() => onDismiss(true)}>
+            <Icon source="navigation_close" />
+          </TouchableOpacity>
+        </View>
+      </View>
+    );
+  }, []);
+
+  return (
+    <Modal transparent visible={true} onRequestClose={() => onDismiss()}>
+      <KeyboardAvoidingView
+        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+        keyboardVerticalOffset={-20}
+        style={[Styles.flex, {justifyContent: 'flex-end'}]}>
+        <TouchableOpacity
+          style={Styles.flex}
+          activeOpacity={1}
+          onPress={() => onDismiss()}
+        />
+        <Animated.View style={{transform: pan.getTranslateTransform()}}>
+          {renderHeader()}
+          <View style={{backgroundColor: backgroundColor}}>
             <Screen {...props} {...props.route.params} />
             {useBottomInset && (
               <View style={{height: Math.min(insets.bottom, 21)}} />
             )}
-          </Animated.View>
-        </KeyboardAvoidingView>
-      </Modal>
-      {snapPoint == 'content' && (
-        <View
-          style={styles.estimate}
-          onLayout={e => {
-            const current = (e.nativeEvent.layout.height + 72) / heightDevice;
-            if (current != estimate) {
-              setEstimate(current);
-            }
-          }}>
-          <Screen {...props} {...props.route.params} />
-          {useBottomInset && (
-            <View style={{height: Math.min(insets.bottom, 21)}} />
-          )}
-        </View>
-      )}
-    </>
+          </View>
+        </Animated.View>
+      </KeyboardAvoidingView>
+    </Modal>
   );
 };
 export default BottomSheet;

package/Application/types.ts

@@ -114,12 +114,10 @@ export type BottomSheetParams = {
     title: string;
     surface?: boolean;
   };
-  snapPoint?: '30%' | '50%' | '70%' | '90%' | 'content';
   surface?: boolean;
   onDismiss?: (type?: string) => void;
   barrierDismissible?: boolean;
   draggable?: boolean;
-  dragOnContent?: boolean;
   useBottomInset?: boolean;
 };
 

package/Layout/Screen.tsx

@@ -235,7 +235,7 @@ const Screen = forwardRef(
     if (scrollable) {
       Component = Animated.ScrollView;
       handleScroll = scrollViewProps?.onScroll;
-      if (animatedHeader || floatingButtonProps) {
+      if (animatedHeader || floatingButtonProps?.icon) {
         handleScroll = Animated.event(
           [
             {

package/package.json

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