@momo-kits/foundation 0.102.6-beta.8 → 0.102.6-beta.9

package/Application/StackScreen.tsx

@@ -15,18 +15,19 @@ import {Colors, Radius, Spacing} from '../Consts';
  */
 const StackScreen: React.FC<ScreenParams> = props => {
   const {showGrid, navigator} = useContext(ApplicationContext);
-  const startTime = useRef(Date.now());
-  const endTime = useRef(Date.now());
-  const timeLoad = useRef(0);
-  const timeInteraction = useRef(0);
-  const timeoutLoad = useRef<any>();
-  const tracked = useRef<any>({
+  const tracking = useRef<any>({
+    timeoutLoad: undefined,
+    interaction: undefined,
+    startTime: Date.now(),
+    endTime: Date.now(),
     traceIdLoad: undefined,
     traceIdInteraction: undefined,
     releaseLoad: undefined,
     releaseInteraction: undefined,
+    timeLoad: 0,
+    timeInteraction: 0,
   });
-  const interaction = useRef<any>();
+
   const context = useContext<any>(MiniAppContext);
   const {screen: Component, options, initialParams} = props.route.params;
   const navigation = new Navigation(props.navigation);
@@ -71,19 +72,22 @@ const StackScreen: React.FC<ScreenParams> = props => {
       }, 300);
     }
     navigator?.maxApi?.of?.({screenName});
-    navigator?.maxApi?.getDataObserver('CURRENT_SCREEN', (data: any) => {
-      if (data) {
-        Alert.alert('getDataObserver', JSON.stringify(data));
-      }
-      navigator?.maxApi?.setObserver('CURRENT_SCREEN', {screenName});
+    props.navigation?.addListener?.('focus', () => {
+      navigator?.maxApi?.getDataObserver('CURRENT_SCREEN', (data: any) => {
+        if (data) {
+          Alert.alert('getDataObserver', JSON.stringify(data));
+        }
+        navigator?.maxApi?.setObserver('CURRENT_SCREEN', {screenName});
+      });
     });
+
     navigator?.maxApi?.startTraceScreenLoad?.(screenName, (data: any) => {
-      tracked.current.traceIdLoad = data?.traceId;
+      tracking.current.traceIdLoad = data?.traceId;
     });
     navigator?.maxApi?.startTraceScreenInteraction?.(
       screenName,
       (data: any) => {
-        tracked.current.traceIdInteraction = data?.traceId;
+        tracking.current.traceIdInteraction = data?.traceId;
       }
     );
     return () => {
@@ -96,9 +100,10 @@ const StackScreen: React.FC<ScreenParams> = props => {
    * tracking for screen load
    */
   const onScreenLoad = () => {
-    if (!tracked.current?.releaseLoad) {
-      if (timeLoad.current === 0) {
-        timeLoad.current = endTime.current - startTime.current;
+    if (!tracking.current?.releaseLoad) {
+      if (tracking.current.timeLoad === 0) {
+        tracking.current.timeLoad =
+          tracking.current.endTime - tracking.current.startTime;
       }
 
       context.autoTracking?.({
@@ -109,24 +114,24 @@ const StackScreen: React.FC<ScreenParams> = props => {
         action: 'push',
         componentName: 'Screen',
         state: 'load',
-        duration: timeLoad.current,
+        duration: tracking.current.timeLoad,
       });
       navigator?.maxApi?.stopTrace?.(
-        tracked.current.traceIdLoad,
-        {value: timeLoad.current / 1000},
+        tracking.current.traceIdLoad,
+        {value: tracking.current.timeLoad / 1000},
         null
       );
-      tracked.current.releaseLoad = true;
+      tracking.current.releaseLoad = true;
 
       /**
        * debug
        */
       navigator?.maxApi?.showToastDebug?.({
         appId: context.appId,
-        message: `${screenName} screen_load_time ${timeLoad.current}`,
+        message: `${screenName} screen_load_time ${tracking.current.timeLoad}`,
         type: 'ERROR',
       });
-      if (timeLoad.current <= 0 && context.enableAutoId) {
+      if (tracking.current.timeLoad <= 0 && context.enableAutoId) {
         Alert.alert(screenName, "Can't get screen load time");
       }
     }
@@ -136,12 +141,13 @@ const StackScreen: React.FC<ScreenParams> = props => {
    * tracking for screen load
    */
   const onScreenInteraction = () => {
-    if (!tracked.current?.releaseInteraction) {
-      if (timeLoad.current === 0) {
-        timeLoad.current = endTime.current - startTime.current;
+    if (!tracking.current?.releaseInteraction) {
+      if (tracking.current.timeLoad === 0) {
+        tracking.current.timeLoad =
+          tracking.current.endTime - tracking.current.startTime;
       }
-      if (timeInteraction.current === 0) {
-        timeInteraction.current = timeLoad.current;
+      if (tracking.current.timeInteraction === 0) {
+        tracking.current.timeInteraction = tracking.current.timeLoad;
       }
 
       context.autoTracking?.({
@@ -151,24 +157,24 @@ const StackScreen: React.FC<ScreenParams> = props => {
         screenName,
         componentName: 'Screen',
         state: 'interaction',
-        duration: timeInteraction.current - timeLoad.current,
+        duration: tracking.current.timeInteraction - tracking.current.timeLoad,
       });
       navigator?.maxApi?.stopTrace?.(
-        tracked.current.traceIdInteraction,
-        {value: timeInteraction.current / 1000},
+        tracking.current.traceIdInteraction,
+        {value: tracking.current.timeInteraction / 1000},
         null
       );
-      tracked.current.releaseInteraction = true;
+      tracking.current.releaseInteraction = true;
 
       /**
        * debug toast
        */
       navigator?.maxApi?.showToastDebug?.({
         appId: context.appId,
-        message: `${screenName} screen_interaction_time ${timeInteraction.current}`,
+        message: `${screenName} screen_interaction_time ${tracking.current.timeInteraction}`,
         type: 'ERROR',
       });
-      if (timeInteraction.current <= 0 && context.enableAutoId) {
+      if (tracking.current.timeInteraction <= 0 && context.enableAutoId) {
         Alert.alert(screenName, "Can't get screen interaction time");
       }
     }
@@ -179,15 +185,18 @@ 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;
-          });
-          timeoutLoad.current = setTimeout(() => {
-            if (timeLoad.current === 0) {
-              timeLoad.current = endTime.current - startTime.current;
+          clearTimeout(tracking.current.timeoutLoad);
+          tracking.current.endTime = Date.now();
+          tracking.current.interaction?.cancel?.();
+          tracking.current.interaction =
+            InteractionManager.runAfterInteractions(() => {
+              tracking.current.timeInteraction =
+                Date.now() - tracking.current.startTime;
+            });
+          tracking.current.timeoutLoad = setTimeout(() => {
+            if (tracking.current.timeLoad === 0) {
+              tracking.current.timeLoad =
+                tracking.current.endTime - tracking.current.startTime;
             }
             onScreenLoad();
             onScreenInteraction();

package/package.json

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