@momo-kits/foundation 0.161.2-beta.7 → 0.161.2-beta.9

package/Application/BottomSheet.tsx

@@ -37,7 +37,8 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   const action = useRef<undefined | string>(undefined);
   const insets = useSafeAreaInsets();
   const heightHeader = useHeaderHeight();
-  const keyboardOffset = heightHeader - Math.min(insets.bottom, 21);
+  const bottomInset = Platform.OS === 'ios' ? Math.min(insets.bottom, 21) : insets.bottom;
+  const keyboardOffset = heightHeader - bottomInset;
 
   const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
 
@@ -311,7 +312,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
           {useBottomInset && (
             <View
               style={{
-                height: Math.min(insets.bottom, 21),
+                height: bottomInset,
                 backgroundColor: backgroundColor,
               }}
             />

package/Application/BottomTab/index.tsx

@@ -296,7 +296,7 @@ const BottomTab: React.FC<BottomTabProps> = ({
           activeTintColor={theme.colors.primary}
           style={[
             {
-              height: 64 + Math.min(insets.bottom, 21),
+              height: 64 + (Platform.OS === 'ios' ? Math.min(insets.bottom, 21) : insets.bottom),
             },
           ]}
         />

package/Layout/Screen.tsx

@@ -209,9 +209,10 @@ const Screen = forwardRef(
     let handleScroll: any;
     let Component: any = View;
 
-    let keyboardOffset = heightHeader - Math.min(insets.bottom, 21);
+    const bottomInset = Platform.OS === 'ios' ? Math.min(insets.bottom, 21) : insets.bottom;
+    let keyboardOffset = heightHeader - bottomInset;
     if (headerType === 'extended' || animatedHeader || inputSearchProps) {
-      keyboardOffset = -Math.min(insets.bottom, 21);
+      keyboardOffset = -bottomInset;
     }
 
     /**
@@ -620,7 +621,7 @@ const Screen = forwardRef(
                 {...floatingButtonProps}
                 animatedValue={animatedValue}
                 bottom={
-                  Footer || isTab ? 12 : Math.min(insets.bottom, 21) + Spacing.S
+                  Footer || isTab ? 12 : bottomInset + Spacing.S
                 }
               />
             </View>
@@ -631,7 +632,7 @@ const Screen = forwardRef(
               style={[
                 styles.shadow,
                 {
-                  paddingBottom: Math.min(insets.bottom, 21) + Spacing.S,
+                  paddingBottom: bottomInset + Spacing.S,
                   backgroundColor: theme.colors.background.surface,
                 },
               ]}

package/package.json

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