@momo-kits/foundation 0.161.2-rn.84.1 → 0.162.2-test.1

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

@@ -320,7 +320,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/Application/Components/HeaderLeft.tsx

@@ -86,7 +86,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
 
 const styles = StyleSheet.create({
   headerLeft: {
-    marginLeft: 8,
+    marginLeft: 12,
   },
 });
 

package/Divider/index.tsx

@@ -1,5 +1,5 @@
 import React, { useContext } from 'react';
-import { StyleProp, View, ViewStyle } from 'react-native';
+import { View, ViewStyle } from 'react-native';
 import { ApplicationContext } from '../Context';
 import { Spacing } from '../Consts';
 import { DashDivider } from './DashDivider';
@@ -8,7 +8,7 @@ export interface DividerProps {
   /**
    * Custom styles for divider
    */
-  style?: StyleProp<ViewStyle>;
+  style?: ViewStyle;
 
   /**
    * Enable margin vertical 4px
@@ -30,13 +30,13 @@ const Divider: React.FC<DividerProps> = ({
   return (
     <View
       style={[
+        style,
         {
           height: 1,
           width: '100%',
           backgroundColor: theme.colors.border.default,
           marginVertical: useMargin ? Spacing.XS : 0,
         },
-        style,
       ]}
     />
   );

package/Image/index.tsx

@@ -1,5 +1,5 @@
 import React, { useContext, useRef, useState } from 'react';
-import { Image as RNImage, StyleSheet, View } from 'react-native';
+import { StyleSheet, View } from 'react-native';
 import FastImage from 'react-native-fast-image';
 import styles from './styles';
 import {
@@ -23,10 +23,6 @@ export const getImageName = (source: any): string => {
   return '';
 };
 
-const isDataUriSource = (source: any): boolean => {
-  return typeof source?.uri === 'string' && source.uri.startsWith('data:');
-};
-
 const Image: React.FC<ImageProps> = ({
   style,
   source,
@@ -47,7 +43,6 @@ const Image: React.FC<ImageProps> = ({
   const [status, setStatus] = useState<Status>('success');
 
   const showBaseLineDebug = context?.features?.showBaseLineDebug ?? false;
-  const useFastImage = !isDataUriSource(source);
 
   let accessibilityLabel: any = `img|${getImageName(source)}`;
   if (component?.componentId) {
@@ -84,46 +79,6 @@ const Image: React.FC<ImageProps> = ({
     return children;
   };
 
-  if (!useFastImage) {
-    return (
-      <RNImage
-        {...rest}
-        {...{
-          accessibilityLabel: rest.accessibilityLabel ?? accessibilityLabel,
-        }}
-        source={source}
-        style={[
-          styles.container,
-          style,
-          showBaseLineDebug && styles.debugBaseLine,
-        ]}
-        onLoadStart={() => {
-          error.current = false;
-          if (status !== 'loading' && loading) {
-            setStatus('loading');
-          }
-        }}
-        onLoad={() => {
-          error.current = false;
-        }}
-        onLoadEnd={() => {
-          let current: Status = 'success';
-          if (error.current) {
-            current = 'error';
-          }
-          setStatus(prevState =>
-            prevState !== current ? current : prevState,
-          );
-        }}
-        onError={() => {
-          error.current = true;
-        }}
-      >
-        {renderContent()}
-      </RNImage>
-    );
-  }
-
   return (
     <FastImage
       {...rest}

package/Layout/Screen.tsx

@@ -204,9 +204,10 @@ const Screen = forwardRef(
     let handleScroll;
     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;
     }
 
     /**
@@ -616,7 +617,7 @@ const Screen = forwardRef(
                 {...floatingButtonProps}
                 animatedValue={animatedValue.current}
                 bottom={
-                  Footer || isTab ? 12 : Math.min(insets.bottom, 21) + Spacing.S
+                  Footer || isTab ? 12 : bottomInset + Spacing.S
                 }
               />
             </View>
@@ -627,7 +628,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,35 +1,35 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.161.2-rn.84.1",
+    "version": "0.162.2-test.1",
     "description": "React Native Component Kits",
+    "main": "index.ts",
+    "scripts": {},
     "keywords": [
         "@momo-kits/foundation"
     ],
-    "license": "MoMo",
-    "main": "index.ts",
-    "publishConfig": {
-        "registry": "https://registry.npmjs.org/"
-    },
-    "scripts": {},
     "dependencies": {
+        "react-native-fast-image": "git+https://oauth2:TGi6oBj-LdzsKpLXQSoH@gitlab.mservice.com.vn/momo-platform/public/react-native-fast-image.git#v8.11.0",
         "@react-navigation/bottom-tabs": "7.4.2",
         "@react-navigation/core": "7.12.1",
         "@react-navigation/elements": "2.5.2",
         "@react-navigation/native": "7.1.14",
         "@react-navigation/routers": "7.4.1",
         "@react-navigation/stack": "7.4.2",
-        "@shopify/flash-list": "2.1.0",
-        "lottie-react-native": "7.3.4",
-        "react-native-fast-image": "git+https://oauth2:TGi6oBj-LdzsKpLXQSoH@gitlab.mservice.com.vn/momo-platform/public/react-native-fast-image.git#v8.11.0",
-        "react-native-gesture-handler": "2.31.0",
+        "react-native-gesture-handler": "2.27.1",
         "react-native-linear-gradient": "git+https://oauth2:TGi6oBj-LdzsKpLXQSoH@gitlab.mservice.com.vn/momo-platform/public/react-native-linear-gradient#v3.0.0",
         "react-native-reanimated": "4.2.2",
-        "react-native-safe-area-context": "5.7.0"
+        "react-native-safe-area-context": "5.5.2",
+        "@shopify/flash-list": "2.1.0",
+        "lottie-react-native": "7.2.4"
+    },
+    "peerDependencies": {
+        "react-native": "*"
     },
     "devDependencies": {
         "@types/color": "3.0.6"
     },
-    "peerDependencies": {
-        "react-native": "*"
-    }
+    "publishConfig": {
+        "registry": "https://registry.npmjs.org/"
+    },
+    "license": "MoMo"
 }