@momo-kits/foundation 0.92.29-optimize.17 → 0.92.29-optimize.18

package/Application/Components.tsx

@@ -405,9 +405,7 @@ const HeaderToolkitAction: React.FC<any> = ({
   };
 
   const renderPinnedTool = () => {
-    const pinKey =
-      miniContext?.toolkitConfig?.pinnedTool?.key ||
-      toolConfig?.pinnedTool?.key;
+    const pinKey = pinnedTool?.key || toolConfig?.pinnedTool?.key;
     const pinTool = toolConfig?.tools?.find((i: any) => i.key === pinKey);
     const {badgeValue, badgeType} = pinnedTool ?? {};
 

package/Application/StackScreen.tsx

@@ -1,12 +1,6 @@
 import React, {useContext, useEffect, useLayoutEffect, useRef} from 'react';
 import {useHeaderHeight} from '@react-navigation/stack';
-import {
-  Alert,
-  InteractionManager,
-  Linking,
-  NativeModules,
-  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';
@@ -110,7 +104,6 @@ const StackScreen: React.FC<ScreenParams> = props => {
   });
   const interaction = useRef<any>();
   const context = useContext<any>(MiniAppContext);
-
   const {screen: Component, options, initialParams} = props.route.params;
   const navigation = new Navigation(props.navigation);
   const heightHeader = useHeaderHeight();
@@ -162,13 +155,7 @@ const StackScreen: React.FC<ScreenParams> = props => {
         navigator?.showModal({screen: EmptyScreen});
       }, 300);
     }
-
     navigator?.maxApi?.of?.({screenName});
-    NativeModules?.MiniAppModule?.setScreenName?.(
-      context.hostId ?? '',
-      screenName ?? ''
-    );
-
     tracked.current.timeoutLoad = setTimeout(() => {
       onScreenLoad();
     }, 5000);
@@ -191,23 +178,13 @@ const StackScreen: React.FC<ScreenParams> = props => {
     if (!tracked.current?.releaseLoad) {
       if (timeLoad.current === 0) {
         timeLoad.current = endTime.current - startTime.current;
-        if (context.enableAutoId) {
-          Alert.alert(screenName, "Can't get screen load time");
-        }
-      }
-      const container = NativeModules?.MiniAppModule?.getPreviousContainer?.();
-      const routes = props.navigation.getState()?.routes || [];
-      const routesLength = routes?.length ?? 0;
-      let preScreenName = container?.screenName;
-      if (routesLength > 1) {
-        preScreenName = routes?.[routesLength - 2]?.params?.screen?.name;
       }
+
       context.autoTracking?.({
         appId: context.appId,
         code: context.code,
         buildNumber: context.buildNumber,
         screenName,
-        preScreenName,
         action: 'push',
         componentName: 'Screen',
         state: 'load',
@@ -218,11 +195,18 @@ const StackScreen: React.FC<ScreenParams> = props => {
         {value: timeLoad.current / 1000},
         null
       );
+      tracked.current.releaseLoad = true;
+
+      /**
+       * debug
+       */
       navigator?.maxApi?.showToastDebug?.({
         appId: `auto - ${context.appId}`,
         message: `${screenName} screen_load_time ${timeLoad.current}`,
       });
-      tracked.current.releaseLoad = true;
+      if (timeLoad.current <= 0 && context.enableAutoId) {
+        Alert.alert(screenName, "Can't get screen load time");
+      }
     }
   };
 
@@ -236,9 +220,6 @@ const StackScreen: React.FC<ScreenParams> = props => {
       }
       if (timeInteraction.current === 0) {
         timeInteraction.current = timeLoad.current;
-        if (context.enableAutoId) {
-          Alert.alert(screenName, "Can't get screen interaction time");
-        }
       }
 
       context.autoTracking?.({
@@ -255,11 +236,18 @@ const StackScreen: React.FC<ScreenParams> = props => {
         {value: timeInteraction.current / 1000},
         null
       );
+      tracked.current.releaseInteraction = true;
+
+      /**
+       * debug toast
+       */
       navigator?.maxApi?.showToastDebug?.({
         appId: `auto - ${context.appId}`,
         message: `${screenName} screen_interaction_time ${timeInteraction.current}`,
       });
-      tracked.current.releaseInteraction = true;
+      if (timeInteraction.current <= 0 && context.enableAutoId) {
+        Alert.alert(screenName, "Can't get screen interaction time");
+      }
     }
   };
 

package/Layout/Screen.tsx

@@ -145,7 +145,7 @@ const Screen = forwardRef(
     let handleScroll;
     let Component: any = View;
     let keyboardOffset = heightHeader - 20;
-    if (headerType === 'extended' || animatedHeader) {
+    if (headerType === 'extended' || animatedHeader || inputSearchProps) {
       keyboardOffset = -20;
     }
 

package/package.json

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