@momo-kits/foundation 0.103.2-rc.13 → 0.103.2-rc.14

package/Application/Components.tsx

@@ -10,7 +10,6 @@ import {
   Alert,
   Animated,
   BackHandler,
-  DeviceEventEmitter,
   Dimensions,
   StatusBar,
   StyleSheet,
@@ -31,11 +30,10 @@ import {
 import {scaleSize, Text} from '../Text';
 import {Icon} from '../Icon';
 import {PopupNotify} from '../Popup';
-import {Badge, BadgeDot} from '../Badge';
+import {Badge, BadgeDot, BadgeDotAnimation} from '../Badge';
 import {HeaderType} from '../Layout/types';
 import Navigation from './Navigation';
 import {InputRef, InputSearch, InputSearchProps} from '../Input';
-import {BadgeDotAnimation} from '../Badge';
 
 const SCREEN_PADDING = 12;
 const BACK_WIDTH = 28;
@@ -151,8 +149,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
       const canGoBack = navigator?.ref?.current?.canGoBack?.();
       const currentRoute = navigator?.ref?.current?.getCurrentRoute?.();
       const params = {
-        appId: context.appId,
-        code: context.code,
+        ...context,
         screen_name: currentRoute?.params?.screen?.name ?? currentRoute?.name,
         trigger_id: '111154000000000000',
         icon_name: 'back',
@@ -168,9 +165,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
       } else if (navigator?.maxApi) {
         navigator?.maxApi?.dismiss?.(navigator?.dismissData);
       } else {
-        const currentTime = new Date().getTime();
-        const requestId = `navigationBackPress#${currentTime}`;
-        DeviceEventEmitter.emit('dismiss', {requestId});
+        (global as any)?.miniAppApi?.dispatch?.('dismiss', context);
       }
       onPressLeftHeader?.();
     };
@@ -341,7 +336,7 @@ const HeaderToolkitAction: React.FC<any> = ({
   preventClose,
 }) => {
   const {navigator} = useContext(ApplicationContext);
-  const miniContext = useContext<any>(MiniAppContext);
+  const context = useContext<any>(MiniAppContext);
   const [toolConfig, setToolConfig] = useState<any>();
   const {onAction} = toolConfig ?? {};
 
@@ -351,7 +346,7 @@ const HeaderToolkitAction: React.FC<any> = ({
   }
 
   useEffect(() => {
-    if (miniContext?.toolkitConfig?.hidden === false) {
+    if (context?.toolkitConfig?.hidden === false) {
       if (navigator?.toolkitConfig) {
         setToolConfig(navigator?.toolkitConfig);
       } else {

package/Application/StackScreen.tsx

@@ -114,23 +114,21 @@ const StackScreen: React.FC<ScreenParams> = props => {
    */
   const onScreenLoad = () => {
     if (!tracking.current?.releaseLoad) {
-      if (tracking.current.timeLoad === 0) {
-        tracking.current.timeLoad =
-          tracking.current.endTime - tracking.current.startTime;
+      let timeLoad = tracking.current.timeLoad;
+      if (timeLoad === 0) {
+        timeLoad = tracking.current.endTime - tracking.current.startTime;
       }
 
       context.autoTracking?.({
-        appId: context.appId,
-        code: context.code,
-        buildNumber: context.buildNumber,
+        ...context,
         screenName,
         componentName: 'Screen',
         state: 'load',
-        duration: tracking.current.timeLoad,
+        duration: timeLoad,
       });
       navigator?.maxApi?.stopTrace?.(
         tracking.current.traceIdLoad,
-        {value: tracking.current.timeLoad / 1000},
+        {value: timeLoad / 1000},
         null
       );
       tracking.current.releaseLoad = true;
@@ -140,10 +138,10 @@ const StackScreen: React.FC<ScreenParams> = props => {
        */
       navigator?.maxApi?.showToastDebug?.({
         appId: context.appId,
-        message: `${screenName} screen_load_time ${tracking.current.timeLoad}`,
+        message: `${screenName} screen_load_time ${timeLoad}`,
         type: 'ERROR',
       });
-      if (tracking.current.timeLoad <= 0 && context.enableAutoId) {
+      if (timeLoad <= 0 && context.enableAutoId) {
         Alert.alert(screenName, "Can't get screen load time");
       }
     }
@@ -154,22 +152,20 @@ const StackScreen: React.FC<ScreenParams> = props => {
    */
   const onScreenInteraction = () => {
     if (!tracking.current?.releaseInteraction) {
-      if (tracking.current.timeLoad === 0) {
-        tracking.current.timeLoad =
-          tracking.current.endTime - tracking.current.startTime;
+      let timeLoad = tracking.current.timeLoad;
+      if (timeLoad === 0) {
+        timeLoad = tracking.current.endTime - tracking.current.startTime;
       }
       if (tracking.current.timeInteraction === 0) {
-        tracking.current.timeInteraction = tracking.current.timeLoad;
+        tracking.current.timeInteraction = timeLoad;
       }
 
       context.autoTracking?.({
-        appId: context.appId,
-        code: context.code,
-        buildNumber: context.buildNumber,
+        ...context,
         screenName,
         componentName: 'Screen',
         state: 'interaction',
-        duration: tracking.current.timeInteraction - tracking.current.timeLoad,
+        duration: tracking.current.timeInteraction - timeLoad,
         totalDuration: tracking.current.timeInteraction,
       });
       navigator?.maxApi?.stopTrace?.(
@@ -198,9 +194,7 @@ const StackScreen: React.FC<ScreenParams> = props => {
    */
   const onScreenNavigated = (preScreenName: string) => {
     context.autoTracking?.({
-      appId: context.appId,
-      code: context.code,
-      buildNumber: context.buildNumber,
+      ...context,
       preScreenName,
       screenName,
       componentName: 'Screen',
@@ -231,9 +225,9 @@ const StackScreen: React.FC<ScreenParams> = props => {
                 Date.now() - tracking.current.startTime;
             });
           tracking.current.timeoutLoad = setTimeout(() => {
+            const time = tracking.current.endTime - tracking.current.startTime;
             if (tracking.current.timeLoad === 0) {
-              tracking.current.timeLoad =
-                tracking.current.endTime - tracking.current.startTime;
+              tracking.current.timeLoad = time;
             }
             onScreenLoad();
             onScreenInteraction();

package/Popup/PopupNotify.tsx

@@ -40,8 +40,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
       screen_name = routes[routesLength - 2]?.params?.screen?.name;
     }
     const tracking = {
-      appId: context.appId,
-      code: context.code,
+      ...context,
       screen_name,
       component_type: 'popup',
       component_name: id,

package/Popup/PopupPromotion.tsx

@@ -26,8 +26,7 @@ const PopupPromotion: React.FC<PopupPromotionProps> = ({
       screen_name = routes[routesLength - 2]?.params?.screen?.name;
     }
     const tracking = {
-      appId: context.appId,
-      code: context.code,
+      ...context,
       screen_name,
       component_type: 'popup',
       component_name: id,

package/package.json

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