@momo-kits/foundation 0.109.1-beta.13 → 0.109.1-beta.15

package/Application/Components/HeaderRight.tsx

@@ -9,7 +9,7 @@ import {
 import {ApplicationContext, MiniAppContext, NavigationButton} from '../index';
 import {Colors, Spacing, Styles} from '../../Consts';
 import {PopupNotify} from '../../Popup';
-import {Tool} from '../types';
+import {Tool, ToolGroup} from '../types';
 import {Icon} from '../../Icon';
 import {scaleSize, Text} from '../../Text';
 
@@ -70,7 +70,6 @@ const HeaderToolkitAction: React.FC<any> = ({
 }) => {
   const {navigator} = useContext(ApplicationContext);
   const context = useContext<any>(MiniAppContext);
-  const showIconMore = tools && tools.length > 1;
 
   const [isFavorite, setIsFavorite] = useState<boolean>(false);
   const [isLoading, setIsLoading] = useState(false);
@@ -154,26 +153,39 @@ const HeaderToolkitAction: React.FC<any> = ({
 
   const onPressIconMore = () => {
     navigator?.maxApi?.dispatchFunction?.('showTools', tools, (key: string) => {
-      const pressedTools = tools.find((tool: Tool) => tool.key === key);
-      if (pressedTools) {
-        pressedTools?.onPress();
+      for (const group of tools) {
+        const pressedTool = group.items.find((tool: Tool) => tool.key === key);
+        if (pressedTool) {
+          pressedTool?.onPress();
+          break;
+        }
       }
     });
   };
 
   let iconShortcut = isFavorite ? 'pin_star_checked' : 'pin_star';
   let shortcutOnPress = onPressShortcut;
-  let isHaveOneTool = tools && tools.length === 1;
+  const totalTools = tools.reduce(
+    (count: number, group: ToolGroup) => count + group.items.length,
+    0
+  );
+  const showIconMore = tools && totalTools > 1;
+  const isHaveOneTool = tools && totalTools === 1;
 
   if (showIconMore || (useMore && isHaveOneTool)) {
     iconShortcut = 'navigation_more_icon';
     shortcutOnPress = onPressIconMore;
   } else if (isHaveOneTool) {
-    iconShortcut = tools[0]?.icon;
-    shortcutOnPress = tools[0]?.onPress;
+    const singleTool = tools.find(
+      (group: ToolGroup) => group.items.length === 1
+    )?.items[0];
+    iconShortcut = singleTool?.icon;
+    shortcutOnPress = singleTool?.onPress;
   }
 
-  const showBadge = tools.some((tool: Tool) => tool.showBadge);
+  const showBadge = tools.some((group: ToolGroup) =>
+    group.items.some(tool => tool.showBadge)
+  );
 
   return (
     <View style={Styles.row}>

package/Application/StackScreen.tsx

@@ -76,9 +76,13 @@ const StackScreen: React.FC<ScreenParams> = props => {
         navigator?.maxApi?.setObserver('CURRENT_SCREEN', {screenName});
       });
     });
-    navigator?.maxApi?.startTraceScreenLoad?.(screenName, (data: any) => {
-      tracking.current.traceIdLoad = data?.traceId;
-    });
+    navigator?.maxApi?.startTraceScreenLoad?.(
+      screenName,
+      context,
+      (data: any) => {
+        tracking.current.traceIdLoad = data?.traceId;
+      }
+    );
     navigator?.maxApi?.startTraceScreenInteraction?.(
       screenName,
       (data: any) => {

package/Application/types.ts

@@ -83,9 +83,14 @@ export type LocalizationObject = {
   };
 };
 
+export type ToolGroup = {
+  title: LocalizationObject;
+  items: Tool[];
+};
+
 export type Tool = {
   icon: string;
-  name: string | {vi: string; en: string};
+  name: LocalizationObject;
   key: string;
   showBadge?: boolean;
   onPress: () => void;
@@ -164,7 +169,7 @@ export type OnBoarding = {
 
 export type HeaderRightToolkit = {
   useShortcut?: boolean;
-  tools?: Tool[];
+  tools?: ToolGroup[];
   preventClose?: PopupNotifyProps;
   useMore?: boolean;
 };

package/package.json

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