@momo-kits/foundation 0.92.29-optimize.5 → 0.92.29-optimize.7

package/Application/Components.tsx

@@ -333,15 +333,7 @@ const HeaderToolkitAction: React.FC<any> = ({
 
   const onMore = () => {
     onAction?.('onMore');
-    navigator?.maxApi?.dispatchFunction?.(
-      'showTools',
-      {runtimeTools},
-      (res: {item: {action?: string; key: string}}) => {
-        const {item} = res;
-        navigator?.toolkitCallback?.(item.key);
-        getToolkitConfig();
-      }
-    );
+    navigator?.maxApi?.dispatchFunction?.('showToolkit', [undefined], () => {});
   };
 
   const onClose = () => {
@@ -385,7 +377,7 @@ const HeaderToolkitAction: React.FC<any> = ({
           onPress={() => {
             navigator?.maxApi?.dispatchFunction?.(
               'onToolAction',
-              [pinTool?.key],
+              {item: pinTool},
               () => {
                 getToolkitConfig();
               }

package/Application/Navigator.ts

@@ -12,7 +12,7 @@ class Navigator {
   toolkitConfig?: HeaderToolkitProps;
   maxApi?: any;
   dismissData?: any;
-  toolkitCallback?: (item: any) => void;
+  toolkitCallback?: (key: string) => void;
 
   constructor(navigation: any, isReady: any) {
     this.ref = navigation;
@@ -78,7 +78,7 @@ class Navigator {
         StackActions.push('Modal', {
           ...params,
           isBottomSheet: true,
-        }),
+        })
       );
     }
   };
@@ -103,7 +103,7 @@ class Navigator {
         CommonActions.navigate({
           name,
           params,
-        }),
+        })
       );
     }
   };
@@ -124,7 +124,7 @@ class Navigator {
               params,
             },
           ],
-        }),
+        })
       );
     }
   };
@@ -141,9 +141,7 @@ class Navigator {
    * set callback function for toolkit
    * @param callback
    */
-  setToolkitCallback = (
-    callback: (item: {key: string; action: string}) => void,
-  ) => {
+  setToolkitCallback = (callback: (key: string) => void) => {
     this.toolkitCallback = callback;
   };
 }

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';
@@ -146,6 +146,8 @@ const StackScreen: React.FC<ScreenParams> = props => {
     }, 5000);
 
     return () => {
+      clearTimeout(tracked.current.timeoutLoad);
+      clearTimeout(tracked.current.timeoutInteraction);
       onScreenLoad();
       onScreenInteraction();
     };
@@ -155,8 +157,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,
@@ -170,6 +174,9 @@ const StackScreen: React.FC<ScreenParams> = props => {
         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 +185,10 @@ 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;
+      }
       context.autoTracking?.({
         appId: context.appId,
         code: context.code,
@@ -194,6 +203,12 @@ const StackScreen: React.FC<ScreenParams> = props => {
         appId: `auto - ${context.appId}`,
         message: `${screenName} screen_interaction_time ${timeInteraction.current}`,
       });
+      if (
+        timeInteraction.current - timeLoad.current <= 0 &&
+        context.enableAutoId
+      ) {
+        Alert.alert(screenName, "Can't get screen interaction time");
+      }
       tracked.current.releaseInteraction = true;
     }
   };
@@ -203,12 +218,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/Input/common.tsx

@@ -87,7 +87,6 @@ export const ErrorView: FC<{
         <Text
           style={Styles.flex}
           color={errorMessage ? errorColor : hintColor}
-          numberOfLines={2}
           typography={'description_default_regular'}>
           {errorMessage ?? hintTextDefault}
         </Text>

package/package.json

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

package/publish.sh

@@ -7,16 +7,16 @@ rsync -r --exclude=/dist ./* dist
 cd dist
 
 if [ "$1" == "stable" ]; then
-  #npm version$(npm view @momo-kits/foundation@stable version)
-  #npm versionpatch
+  #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 versionprerelease --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 versionprerelease --preid=beta
+  #npm version $(npm view @momo-kits/foundation@beta version)
+  #npm version prerelease --preid=beta
   npm publish --tag beta --access=public
 fi