@momo-kits/foundation 0.81.14 → 0.81.17

package/Application/Components.tsx

@@ -169,6 +169,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
         feature_code: navigator.trackingInfo.code,
         app_id: navigator.trackingInfo.appId,
         miniapp_version: navigator.trackingInfo.buildNumber,
+        flow_partner_id: navigator.trackingInfo.flowPartnerId,
         screen_name: currentRoute?.params?.screen?.name ?? currentRoute?.name,
         trigger_id: '111154000000000000',
         icon_name: 'back',

package/Application/ModalScreen.tsx

@@ -69,6 +69,7 @@ const Modal: React.FC<ModalParams> = props => {
         feature_code: navigator.trackingInfo.code,
         app_id: navigator.trackingInfo.appId,
         miniapp_version: navigator.trackingInfo.buildNumber,
+        flow_partner_id: navigator.trackingInfo.flowPartnerId,
         screen_name,
         trigger_id: '111012100000000000',
         component_type: 'popup',

package/Application/StackScreen.tsx

@@ -43,6 +43,7 @@ const StackScreen: React.FC<ScreenParams> = props => {
         feature_code: navigator.trackingInfo.code,
         app_id: navigator.trackingInfo.appId,
         miniapp_version: navigator.trackingInfo.buildNumber,
+        flow_partner_id: navigator.trackingInfo.flowPartnerId,
         screen_name: Component.name,
         pre_screen_name,
         trigger_id: '111378000000000000',

package/Application/types.ts

@@ -84,6 +84,7 @@ export type TrackingInfo = {
   code: string;
   appId: string;
   buildNumber: number;
+  flowPartnerId?: string;
 };
 
 export type NavigationContainerProps = {

package/Image/index.tsx

@@ -1,28 +1,16 @@
 import React, {useContext, useRef, useState} from 'react';
-import {StyleProp, StyleSheet, View, ViewStyle} from 'react-native';
+import {StyleSheet, View} from 'react-native';
 import FastImage from 'react-native-fast-image';
 import styles from './styles';
 import {ApplicationContext} from '../Application';
 import {Skeleton} from '../Skeleton';
 import {Icon} from '../Icon';
 import {Styles} from '../Consts';
-import {FastImagePropsWithoutStyle} from './types';
-
-export interface ImageProps extends FastImagePropsWithoutStyle {
-  style?: StyleProp<ViewStyle>;
-  loading?: boolean;
-  accessibilityLabel?: string;
-}
+import {ImageProps} from './types';
 
 type Status = 'success' | 'loading' | 'error';
 
-const Image: React.FC<ImageProps> = ({
-  style,
-  source,
-  accessibilityLabel,
-  loading,
-  ...rest
-}) => {
+const Image: React.FC<ImageProps> = ({style, source, loading, ...rest}) => {
   const {theme} = useContext(ApplicationContext);
   const error = useRef(false);
   const [status, setStatus] = useState<Status>('success');
@@ -31,24 +19,15 @@ const Image: React.FC<ImageProps> = ({
    * render content loading | fail | rendered
    */
   const renderContent = () => {
-    if (status == 'loading' || status == 'error') {
-      let content = (
-        <Skeleton style={[StyleSheet.absoluteFill, styles.image]} />
-      );
-      if (status == 'error') {
+    if (status === 'loading' || status === 'error') {
+      let content = <Skeleton />;
+      if (status === 'error') {
         content = (
-          <View style={Styles.flexCenter}>
-            <Icon source="media_fail" color={theme.colors.text.disable} />
-          </View>
+          <Icon source="media_fail" color={theme.colors.text.disable} />
         );
       }
       return (
-        <View
-          style={[
-            StyleSheet.absoluteFill,
-            styles.image,
-            {backgroundColor: theme.colors.background.disable},
-          ]}>
+        <View style={[StyleSheet.absoluteFill, Styles.flexCenter]}>
           {content}
         </View>
       );
@@ -56,33 +35,32 @@ const Image: React.FC<ImageProps> = ({
   };
 
   return (
-    <View
+    <FastImage
+      {...rest}
+      source={source}
       style={[styles.container, style]}
-      accessibilityLabel={`Image/${
-        accessibilityLabel ?? (typeof source === 'number' ? source : source.uri)
-      }`}>
-      <FastImage
-        {...rest}
-        source={source}
-        fallback={false}
-        style={styles.image}
-        onProgress={() => {
-          if (status != 'loading' && loading) setStatus('loading');
-        }}
-        onLoadStart={() => {
-          error.current = false;
-        }}
-        onLoadEnd={() => {
-          let current: Status = 'success';
-          if (error.current) current = 'error';
-          if (status != current) setStatus(current);
-        }}
-        onError={() => {
-          error.current = true;
-        }}
-      />
+      onProgress={() => {
+        if (status !== 'loading' && loading) {
+          setStatus('loading');
+        }
+      }}
+      onLoadStart={() => {
+        error.current = false;
+      }}
+      onLoadEnd={() => {
+        let current: Status = 'success';
+        if (error.current) {
+          current = 'error';
+        }
+        if (status !== current) {
+          setStatus(current);
+        }
+      }}
+      onError={() => {
+        error.current = true;
+      }}>
       {renderContent()}
-    </View>
+    </FastImage>
   );
 };
 

package/Image/styles.ts

@@ -2,11 +2,8 @@ import {StyleSheet} from 'react-native';
 
 export default StyleSheet.create({
   container: {
-    overflow: 'hidden',
     alignItems: 'center',
     justifyContent: 'center',
-  },
-  image: {
     width: '100%',
     height: '100%',
   },

package/Image/types.ts

@@ -1,3 +1,5 @@
 import {FastImageProps} from 'react-native-fast-image';
 
-export type FastImagePropsWithoutStyle = Omit<FastImageProps, 'style'>;
+export interface ImageProps extends FastImageProps {
+  loading?: boolean;
+}

package/Input/Input.tsx

@@ -35,7 +35,7 @@ const Input = forwardRef(
       loading,
       leadingIcon,
       leadingIconColor,
-      fontWeight = 'normal',
+      fontWeight = 'Regular',
       style,
       ...props
     }: InputProps,
@@ -81,7 +81,6 @@ const Input = forwardRef(
       let textColor = theme.colors.text.default;
       let placeholderColor = theme.colors.text.hint;
       let iconTintColor = iconColor;
-      const inputTextWeight = fontWeight === 'bold' ? 'Bold' : 'Regular';
 
       if (disabled) {
         textColor = disabledColor;
@@ -124,7 +123,7 @@ const Input = forwardRef(
                 styles.input,
                 {
                   color: textColor,
-                  fontFamily: `${theme.font}-${inputTextWeight}`,
+                  fontFamily: `${theme.font}-${fontWeight}`,
                 },
               ]}
               textBreakStrategy="highQuality"

package/Input/index.tsx

@@ -77,7 +77,7 @@ export interface InputProps extends TextInputProps {
    */
   leadingIconColor?: string;
 
-  fontWeight?: 'normal' | 'bold';
+  fontWeight?: 'Regular' | 'Bold';
 }
 
 type InputPropsWithoutSizeAndIcon = Omit<

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.81.14",
+    "version": "0.81.17",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {
@@ -10,17 +10,17 @@
         "@momo-kits/foundation"
     ],
     "dependencies": {
-        "@gorhom/bottom-sheet": "git+https://gitlab.com/dung.huynh1/bottom-sheet.git#main",
+        "@gorhom/bottom-sheet": "https://gitlab.com/momo-platform/bottom-sheet.git",
         "react-native-safe-area-context": "3.1.4",
         "react-native-linear-gradient": "2.8.3",
         "react-native-gesture-handler": "1.10.3",
         "react-native-fast-image": "8.1.5",
-        "@react-navigation/bottom-tabs": "git+https://gitlab.com/dung.huynh1/react-navigation-bottom-tabs.git#main",
+        "@react-navigation/bottom-tabs": "https://gitlab.com/momo-platform/react-navigation-bottom-tabs.git#main",
         "@react-navigation/core": "5.16.1",
         "@react-navigation/native": "5.9.8",
         "@react-navigation/routers": "5.7.4",
         "lottie-react-native": "3.3.2",
-        "@react-navigation/stack": "git+https://gitlab.com/dung.huynh1/react-navigation-stack.git#main"
+        "@react-navigation/stack": "https://gitlab.com/momo-platform/react-navigation-stack.git"
     },
     "peerDependencies": {
         "react-native": "*"