@momo-kits/foundation 0.81.21 → 0.81.23-beta.1

package/Application/Components.tsx

@@ -159,19 +159,6 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
 
   const goBack = () => {
     const canGoBack = navigator?.ref.current?.canGoBack();
-    const currentRoute = navigator?.ref?.current.getCurrentRoute();
-
-    if (navigator?.trackingInfo) {
-      navigator?.maxApi?.trackEvent('service_icon_clicked', {
-        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',
-      });
-    }
 
     if (canGoBack) {
       if (preventBack) {

package/Application/ModalScreen.tsx

@@ -6,6 +6,7 @@ import {
   Platform,
   Pressable,
   StyleSheet,
+  TouchableHighlight,
   View,
 } from 'react-native';
 import {SafeAreaView, useSafeAreaInsets} from 'react-native-safe-area-context';
@@ -190,7 +191,11 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
                 ...theme,
                 assets: {...theme.assets, headerBackground: undefined},
               }}
-              screen={props => <Component {...props} {...params} />}
+              screen={props => (
+                <TouchableHighlight style={Styles.flex}>
+                  <Component {...props} {...params} />
+                </TouchableHighlight>
+              )}
               options={{
                 ...options,
                 ...{

package/Application/StackScreen.tsx

@@ -32,21 +32,34 @@ const StackScreen: React.FC<ScreenParams> = props => {
    */
   useEffect(() => {
     if (navigator?.trackingInfo) {
+      const tracking = {
+        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,
+      };
+
       const routes = props.navigation.getState()?.routes || [];
       const routesLength = routes.length;
       let pre_screen_name = '';
       if (routesLength > 1) {
         pre_screen_name = routes[routesLength - 2]?.params?.screen?.name;
       }
+
       navigator?.maxApi?.trackEvent('service_frame_displayed', {
-        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,
+        ...tracking,
         pre_screen_name,
         trigger_id: '111378000000000000',
       });
+
+      return props.navigation.addListener('beforeRemove', () => {
+        navigator?.maxApi?.trackEvent('service_icon_clicked', {
+          ...tracking,
+          trigger_id: '111154000000000000',
+          icon_name: 'back',
+        });
+      });
     }
   }, []);
 

package/Image/index.tsx

@@ -10,7 +10,13 @@ import {ImageProps} from './types';
 
 type Status = 'success' | 'loading' | 'error';
 
-const Image: React.FC<ImageProps> = ({style, source, loading, ...rest}) => {
+const Image: React.FC<ImageProps> = ({
+  style,
+  source,
+  loading,
+  children,
+  ...rest
+}) => {
   const {theme} = useContext(ApplicationContext);
   const error = useRef(false);
   const [status, setStatus] = useState<Status>('success');
@@ -32,6 +38,7 @@ const Image: React.FC<ImageProps> = ({style, source, loading, ...rest}) => {
         </View>
       );
     }
+    return children;
   };
 
   return (

package/Image/styles.ts

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

package/Layout/Screen.tsx

@@ -108,8 +108,13 @@ const Screen = forwardRef(
     let handleScroll;
     let headerBackground: string | undefined = undefined;
     let Component: any = View;
+    let keyboardVerticalOffset = heightHeader - 20;
     animatedValue.current = undefined;
 
+    if (useExtendedHeader || animatedHeader) {
+      keyboardVerticalOffset = -20;
+    }
+
     if (useExtendedHeader) {
       headerBackground = theme.assets?.headerBackground;
     }
@@ -267,7 +272,7 @@ const Screen = forwardRef(
         <KeyboardAvoidingView
           style={Styles.flex}
           enabled={enableKeyboardAvoidingView}
-          keyboardVerticalOffset={heightHeader - 20}
+          keyboardVerticalOffset={keyboardVerticalOffset}
           behavior={Platform.select({
             ios: 'padding',
             android: undefined,

package/Popup/PopupNotify.tsx

@@ -71,7 +71,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
         screen_name,
         component_type: 'popup',
         component_name: 'PopupNotify',
-        error_code: error,
+        error_code: error ? error : undefined,
         trigger_id,
         action_type: actionType,
       });
@@ -206,7 +206,6 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
         <Description style={[styles.description, descriptionStyle]}>
           <Text
             typography={'paragraph_default'}
-            numberOfLines={4}
             onTextLayout={({nativeEvent: {lines}}) => {
               const enableScroll = lines.length > 3;
               if (enableScroll != scrollContent) {

package/Text/index.tsx

@@ -88,6 +88,7 @@ const Text: React.FC<TextProps> = ({
       fontSize: scaleSize(fontSize),
       lineHeight: scaleSize(lineHeight),
       fontStyle,
+      fontWeight,
     };
   };
 

package/package.json

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