@momo-kits/foundation 0.81.22 → 0.81.23-beta.2

package/Application/BottomTab.tsx

@@ -41,6 +41,7 @@ const BottomTab: React.FC<BottomTabProps> = ({
                 return (
                   <View style={{paddingHorizontal: 16}}>
                     <Text
+                      numberOfLines={1}
                       typography={focused ? 'label_xs' : 'description_xs'}
                       color={color}>
                       {item.label}

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) {
@@ -247,6 +234,8 @@ const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
       ]}>
       <StatusBar
         barStyle={headerImage || theme.dark ? 'light-content' : 'dark-content'}
+        translucent={true}
+        backgroundColor={'transparent'}
       />
       {!!headerImage && (
         <Image

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 () => {
+        navigator?.maxApi?.trackEvent('service_icon_clicked', {
+          ...tracking,
+          trigger_id: '111154000000000000',
+          icon_name: 'back',
+        });
+      };
     }
   }, []);
 

package/Layout/Card.tsx

@@ -140,6 +140,18 @@ const Card: React.FC<CardProps> = ({
   const {theme} = useContext(ApplicationContext);
   return (
     <GridContext.Provider value={gridContext}>
+      {!!backgroundImage && (
+        <Image
+          source={{uri: backgroundImage}}
+          style={[
+            styles.imageBackground,
+            {
+              width: widthSection,
+              marginHorizontal: margin,
+            },
+          ]}
+        />
+      )}
       <View
         accessibilityLabel={`Card`}
         style={[
@@ -149,16 +161,12 @@ const Card: React.FC<CardProps> = ({
           {
             width: widthSection,
             marginHorizontal: margin,
-            backgroundColor: theme.colors.background.surface,
+            backgroundColor: backgroundImage
+              ? undefined
+              : theme.colors.background.surface,
           },
           useShadow && Shadow.Light,
         ]}>
-        {!!backgroundImage && (
-          <Image
-            source={{uri: backgroundImage}}
-            style={styles.imageBackground}
-          />
-        )}
         {renderView(validateChildren(children, [Item, ItemList]))}
         {showGrid && renderOverlay()}
       </View>

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

@@ -33,29 +33,6 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
    * tracking
    */
   useEffect(() => {
-    onTracking('service_component_displayed', undefined, '111012100000000000');
-    return () => {
-      onTracking(
-        'service_popup_dismissed',
-        closeAction.current,
-        '111154100000000001',
-      );
-    };
-  }, []);
-  /**
-   * on action popup
-   * @param callback
-   */
-  const onAction = (callback?: () => void) => {
-    navigator?.pop();
-    callback?.();
-  };
-
-  const onTracking = (
-    event: string,
-    actionType: string | undefined,
-    trigger_id: string,
-  ) => {
     if (navigator?.trackingInfo) {
       const routes = navigator.ref.current?.getRootState()?.routes || [];
       const routesLength = routes.length;
@@ -63,7 +40,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
       if (routesLength > 1) {
         screen_name = routes[routesLength - 2]?.params?.screen?.name;
       }
-      navigator?.maxApi?.trackEvent(event, {
+      const tracking = {
         feature_code: navigator?.trackingInfo?.code,
         app_id: navigator?.trackingInfo?.appId,
         miniapp_version: navigator?.trackingInfo?.buildNumber,
@@ -71,11 +48,28 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
         screen_name,
         component_type: 'popup',
         component_name: 'PopupNotify',
-        error_code: error,
-        trigger_id,
-        action_type: actionType,
+        error_code: error ? error : undefined,
+      };
+      navigator?.maxApi?.trackEvent('service_component_displayed', {
+        ...tracking,
+        trigger_id: '111012100000000000',
       });
+      return () => {
+        navigator?.maxApi?.trackEvent('service_popup_dismissed', {
+          ...tracking,
+          trigger_id: '111154100000000001',
+          action_type: closeAction.current,
+        });
+      };
     }
+  }, []);
+  /**
+   * on action popup
+   * @param callback
+   */
+  const onAction = (callback?: () => void) => {
+    navigator?.pop();
+    callback?.();
   };
 
   /**
@@ -206,7 +200,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.22",
+    "version": "0.81.23-beta.2",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {