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

package/Application/BottomSheet.tsx

@@ -19,6 +19,7 @@ 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 {
@@ -74,9 +75,12 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     Animated.timing(pan, {
       toValue: {x: 0, y: 0},
       useNativeDriver: false,
-      duration: 150,
+      duration: 200,
     }).start();
     return () => {
+      if (!closed.current) {
+        navigator?.pop();
+      }
       props.route.params?.onDismiss?.();
     };
   }, []);
@@ -88,17 +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: 100,
-    }).start(() => {
-      navigator?.pop();
-    });
+      duration: 200,
+    }).start();
   };
 
   /**
@@ -165,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/Layout/ItemList.tsx

@@ -20,7 +20,7 @@ const ItemList = forwardRef(
       contentContainerStyle,
       ...props
     }: ItemListProps,
-    ref,
+    ref
   ) => {
     const {gutterSize, numberOfColumns} = useContext(GridContext);
     const widthItem = (widthSpan ?? numberOfColumns) as SpanNumber;
@@ -41,6 +41,7 @@ const ItemList = forwardRef(
       <FlatList
         ref={ref as React.RefObject<FlatList>}
         {...props}
+        key={`ItemList-${numColumns}`}
         numColumns={numColumns}
         renderItem={_renderItem}
         horizontal={false}
@@ -49,7 +50,7 @@ const ItemList = forwardRef(
         contentContainerStyle={[contentContainerStyle, styles.protectedStyle]}
       />
     );
-  },
+  }
 );
 
 export default ItemList;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.92.24",
+    "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