@momo-kits/foundation 0.92.31 → 0.92.33

package/Application/StackScreen.tsx

@@ -1,6 +1,6 @@
 import React, {useContext, useEffect, useLayoutEffect, useRef} from 'react';
 import {useHeaderHeight} from '@react-navigation/stack';
-import {InteractionManager, Linking, View} from 'react-native';
+import {Alert, InteractionManager, Linking, View} from 'react-native';
 import {ScreenParams} from './types';
 import Navigation from './Navigation';
 import {ApplicationContext, MiniAppContext, ScreenContext} from './index';
@@ -95,6 +95,8 @@ const StackScreen: React.FC<ScreenParams> = props => {
   const timeInteraction = useRef(0);
   const timeoutLoad = useRef<any>();
   const tracked = useRef<any>({
+    traceIdLoad: undefined,
+    traceIdInteraction: undefined,
     releaseLoad: undefined,
     releaseInteraction: undefined,
     timeoutLoad: undefined,
@@ -125,6 +127,15 @@ const StackScreen: React.FC<ScreenParams> = props => {
     if (options) {
       navigation.setOptions(options);
     }
+    navigator?.maxApi?.startTraceScreenLoad?.(screenName, (data: any) => {
+      tracked.current.traceIdLoad = data?.traceId;
+    });
+    navigator?.maxApi?.startTraceScreenInteraction?.(
+      screenName,
+      (data: any) => {
+        tracked.current.traceIdInteraction = data?.traceId;
+      }
+    );
   }, [options]);
 
   /**
@@ -146,6 +157,8 @@ const StackScreen: React.FC<ScreenParams> = props => {
     }, 5000);
 
     return () => {
+      clearTimeout(tracked.current.timeoutLoad);
+      clearTimeout(tracked.current.timeoutInteraction);
       onScreenLoad();
       onScreenInteraction();
     };
@@ -155,8 +168,10 @@ const StackScreen: React.FC<ScreenParams> = props => {
    * tracking for screen load
    */
   const onScreenLoad = () => {
-    clearTimeout(tracked.current.timeoutLoad);
     if (!tracked.current?.releaseLoad) {
+      if (timeLoad.current === 0) {
+        timeLoad.current = endTime.current - startTime.current;
+      }
       context.autoTracking?.({
         appId: context.appId,
         code: context.code,
@@ -166,10 +181,18 @@ const StackScreen: React.FC<ScreenParams> = props => {
         state: 'load',
         duration: timeLoad.current,
       });
+      navigator?.maxApi?.stopTrace?.(
+        tracked.current.traceIdLoad,
+        {value: timeLoad.current},
+        null
+      );
       navigator?.maxApi?.showToastDebug?.({
         appId: `auto - ${context.appId}`,
         message: `${screenName} screen_load_time ${timeLoad.current}`,
       });
+      if (timeLoad.current === 0 && context.enableAutoId) {
+        Alert.alert(screenName, "Can't get screen load time");
+      }
       tracked.current.releaseLoad = true;
     }
   };
@@ -178,8 +201,17 @@ const StackScreen: React.FC<ScreenParams> = props => {
    * tracking for screen load
    */
   const onScreenInteraction = () => {
-    clearTimeout(tracked.current.timeoutInteraction);
     if (!tracked.current?.releaseInteraction) {
+      if (timeLoad.current === 0) {
+        timeLoad.current = endTime.current - startTime.current;
+      }
+      if (timeInteraction.current === 0 && context.enableAutoId) {
+        if (context.enableAutoId) {
+          Alert.alert(screenName, "Can't get screen interaction time");
+        }
+        timeInteraction.current = timeLoad.current;
+      }
+
       context.autoTracking?.({
         appId: context.appId,
         code: context.code,
@@ -189,7 +221,11 @@ const StackScreen: React.FC<ScreenParams> = props => {
         state: 'interaction',
         duration: timeInteraction.current - timeLoad.current,
       });
-
+      navigator?.maxApi?.stopTrace?.(
+        tracked.current.traceIdInteraction,
+        {value: timeInteraction.current},
+        null
+      );
       navigator?.maxApi?.showToastDebug?.({
         appId: `auto - ${context.appId}`,
         message: `${screenName} screen_interaction_time ${timeInteraction.current}`,
@@ -203,12 +239,12 @@ const StackScreen: React.FC<ScreenParams> = props => {
       value={{
         screenName,
         onElementLoad: () => {
+          clearTimeout(timeoutLoad.current);
           endTime.current = Date.now();
           interaction.current?.cancel?.();
           interaction.current = InteractionManager.runAfterInteractions(() => {
             timeInteraction.current = Date.now() - startTime.current;
           });
-          clearTimeout(timeoutLoad.current);
           timeoutLoad.current = setTimeout(() => {
             if (timeLoad.current === 0) {
               timeLoad.current = endTime.current - startTime.current;

package/Tag/styles.ts

@@ -1,19 +1,20 @@
 import {StyleSheet} from 'react-native';
 import {Radius, Spacing} from '../Consts';
+import {scaleSize} from '../Text';
 
 export default StyleSheet.create({
   container: {
     paddingHorizontal: Spacing.S,
     borderRadius: Radius.S,
     flexDirection: 'row',
-    height: 24,
+    height: scaleSize(24),
     alignItems: 'center',
     justifyContent: 'center',
   },
   mediumContainer: {
     paddingHorizontal: Spacing.S,
     borderRadius: Radius.S,
-    height: 18,
+    height: scaleSize(18),
     alignItems: 'center',
     flexDirection: 'row',
     justifyContent: 'center',

package/package.json

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

package/publish.sh

@@ -1,28 +1,18 @@
 #!/bin/bash
 
-# Prepare dist files
-rm -rf dist
-mkdir dist
-rsync -r --exclude=/dist ./* dist
-cd dist
-
 if [ "$1" == "stable" ]; then
-  #npm version $(npm view @momo-kits/foundation@stable version)
-  #npm version patch
+  npm version $(npm view @momo-kits/foundation@stable version)
+  npm version patch
   npm publish --tag stable --access=public
 elif [ "$1" == "latest" ]; then
-  #npm version $(npm view @momo-kits/foundation@latest version)
-  #npm version prerelease --preid=rc
+  npm version $(npm view @momo-kits/foundation@latest version)
+  npm version prerelease --preid=rc
   npm publish --tag latest --access=public
 else
-  #npm version $(npm view @momo-kits/foundation@beta version)
-  #npm version prerelease --preid=beta
+  npm version $(npm view @momo-kits/foundation@beta version)
+  npm version prerelease --preid=beta
   npm publish --tag beta --access=public
 fi
 
 PACKAGE_NAME=$(npm pkg get name)
 NEW_PACKAGE_VERSION=$(npm pkg get version)
-
-# Clean up
-cd ..
-rm -rf dist