@momo-kits/foundation 0.92.25 → 0.92.26-beta.0

package/Application/BottomSheet.tsx

@@ -1,10 +1,4 @@
-import React, {
-  useCallback,
-  useContext,
-  useEffect,
-  useRef,
-  useState,
-} from 'react';
+import React, {useCallback, useContext, useEffect, useRef} from 'react';
 import {
   Animated,
   Dimensions,
@@ -25,7 +19,7 @@ import {Icon} from '../Icon';
 
 const BottomSheet: React.FC<BottomSheetParams> = props => {
   const {theme, navigator} = useContext(ApplicationContext);
-  const [show, setShow] = useState(true);
+  const closed = useRef(false);
   const heightDevice = Dimensions.get('screen').height;
   const insets = useSafeAreaInsets();
   const {
@@ -81,10 +75,12 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     Animated.timing(pan, {
       toValue: {x: 0, y: 0},
       useNativeDriver: false,
-      duration: 150,
+      duration: 200,
     }).start();
     return () => {
-      setShow(false);
+      if (!closed.current) {
+        navigator?.pop();
+      }
       props.route.params?.onDismiss?.();
     };
   }, []);
@@ -96,16 +92,16 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     if (barrierDismissible && !force) {
       return;
     }
+    closed.current = true;
     setTimeout(() => {
+      navigator?.pop();
       callback?.();
-    }, 350);
+    }, 300);
     Animated.timing(pan, {
       toValue: {x: 0, y: heightDevice},
       useNativeDriver: false,
-      duration: 150,
-    }).start(() => {
-      navigator?.pop();
-    });
+      duration: 200,
+    }).start();
   };
 
   /**
@@ -156,7 +152,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   }, []);
 
   return (
-    <Modal transparent visible={show} onRequestClose={() => onDismiss()}>
+    <Modal transparent visible={true} onRequestClose={() => onDismiss()}>
       <KeyboardAvoidingView
         behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
         keyboardVerticalOffset={keyboardVerticalOffset ?? -20}
@@ -172,7 +168,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
             <Screen
               {...props}
               {...props.route.params}
-              requestClose={requestClose}
+              // requestClose={requestClose}
             />
             {useBottomInset && (
               <View style={{height: Math.min(insets.bottom, 21)}} />

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.92.25",
+    "version": "0.92.26-beta.0",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},
@@ -43,4 +43,4 @@
     },
     "author": "@momo-kits/foundation",
     "license": "ISC"
-}
+}

package/publish.sh

@@ -7,16 +7,16 @@ rsync -r --exclude=/dist ./* dist
 cd dist
 
 if [ "$1" == "stable" ]; then
-  npm version $(npm view @momo-kits/foundation@stable version)
-  npm version patch
+  #npm version $(npm view @momo-kits/foundation@stable version)
+  #npm version patch
   npm publish --tag stable --access=public
 elif [ "$1" == "latest" ]; then
-  npm version $(npm view @momo-kits/foundation@latest version)
-  npm version prerelease --preid=rc
+  #npm version $(npm view @momo-kits/foundation@latest version)
+  #npm version prerelease --preid=rc
   npm publish --tag latest --access=public
 else
-  npm version $(npm view @momo-kits/foundation@beta version)
-  npm version prerelease --preid=beta
+  #npm version $(npm view @momo-kits/foundation@beta version)
+  #npm version prerelease --preid=beta
   npm publish --tag beta --access=public
 fi