@momo-kits/foundation 0.81.40 → 0.81.41-beta.2

package/Application/Components.tsx

@@ -183,7 +183,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
     const canGoBack = navigator?.ref.current?.canGoBack();
     if (!canGoBack && navigator?.trackingInfo) {
       const currentRoute = navigator?.ref?.current.getCurrentRoute();
-      navigator?.maxApi?.trackEvent?.('service_icon_clicked', {
+      navigator?.maxApi?.trackEvent('service_icon_clicked', {
         feature_code: navigator.trackingInfo.code,
         app_id: navigator.trackingInfo.appId,
         miniapp_version: navigator.trackingInfo.buildNumber,
@@ -345,8 +345,8 @@ const HeaderRightAction: React.FC<any> = ({children, ...restProps}) => {
 
 const HeaderToolkitAction: React.FC<any> = ({tintColor}) => {
   const {theme, navigator} = useContext(ApplicationContext);
-  const [toolConfig, setToolConfig] = useState<HeaderToolkitProps>();
-  const {appCode, hidden, type, onAction} = toolConfig ?? {};
+  const [toolConfig, setToolConfig] = useState<any>();
+  const {appCode, onAction} = toolConfig ?? {};
 
   let backgroundColor;
   if (tintColor != Colors.black_01) {
@@ -364,10 +364,19 @@ const HeaderToolkitAction: React.FC<any> = ({tintColor}) => {
             [undefined],
             (config: any) => {
               navigator.toolkitConfig = {
-                ...config?.utilityToolConfig,
+                configs: [
+                  ...config?.toolkitConfig?.customTools,
+                  ...config?.toolkitFeatureConfig,
+                ],
                 appCode: config?.appCode,
               };
-              setToolConfig(navigator?.toolkitConfig);
+              setToolConfig({
+                configs: [
+                  ...config?.toolkitConfig?.customTools,
+                  ...config?.toolkitFeatureConfig,
+                ],
+                appCode: config?.appCode,
+              });
             },
           );
         }
@@ -413,14 +422,16 @@ const HeaderToolkitAction: React.FC<any> = ({tintColor}) => {
     };
   }, [appCode]);
 
-  const onUtilityTool = () => {
-    onAction?.('onUtilityTool');
-    navigator?.requestApi(type, undefined, undefined);
-  };
-
   const onMore = () => {
     onAction?.('onMore');
-    navigator?.requestApi('showToolkit', [toolConfig], undefined);
+    navigator?.requestApi(
+      'showTools',
+      [toolConfig],
+      (res: {item: {action?: string; key: string}}) => {
+        const {item} = res;
+        navigator?.toolkitCallback?.(item);
+      },
+    );
   };
 
   const onClose = () => {
@@ -428,24 +439,28 @@ const HeaderToolkitAction: React.FC<any> = ({tintColor}) => {
     navigator?.requestApi('dismiss', undefined, undefined);
   };
 
-  const renderUtilityTool = () => {
-    if (hidden === false) {
+  const renderPinnedTool = () => {
+    const pinTool = toolConfig?.configs?.find(
+      (i: any) => i.key === navigator?.pinnedTool,
+    );
+    const {icon} = pinTool || '';
+    if (pinTool && navigator?.pinnedTool)
       return (
         <NavigationButton
           accessibilityLabel={'UtilityTool'}
-          icon={type as string}
+          icon={icon as string}
           tintColor={tintColor}
-          onPress={onUtilityTool}
+          onPress={() => {
+            navigator?.toolkitCallback?.(navigator?.pinnedTool);
+          }}
         />
       );
-    }
-    return null;
   };
 
   if (toolConfig) {
     return (
       <View style={styles.headerRightButton}>
-        {renderUtilityTool()}
+        {renderPinnedTool()}
         <View
           style={[
             styles.toolkitContainer,

package/Application/Navigator.ts

@@ -13,6 +13,8 @@ class Navigator {
   maxApi?: any;
   trackingInfo?: TrackingInfo;
   dismissData?: any;
+  pinnedTool?: string;
+  toolkitCallback?: (item: any) => void;
 
   constructor(navigation: any) {
     this.ref = navigation;
@@ -107,6 +109,16 @@ class Navigator {
       this.maxApi[func]?.(...args, callback);
     }
   };
+
+  setPinnedTool = (key: string) => {
+    this.pinnedTool = key;
+  };
+
+  setToolkitCallback = (
+    callback: (item: {key: string; action: string}) => void,
+  ) => {
+    this.toolkitCallback = callback;
+  };
 }
 
 export default Navigator;

package/Application/types.ts

@@ -166,9 +166,7 @@ export type TitleCustomProps = {
 export type HeaderToolkitProps = {
   [key: string]: any;
   appCode: string;
-  hidden: boolean;
-  type: string;
-  onAction?: (action: string) => void;
+  configs: any[];
 };
 
 export type HeaderAnimatedProps = {

package/Input/InputMoney.tsx

@@ -45,9 +45,7 @@ const InputMoney = forwardRef(
       return formatNumberToMoney(valueFormat, 'đ');
     };
 
-    const [value, setValue] = useState(
-      defaultValue ? validateText(defaultValue) : '',
-    );
+    const [value, setValue] = useState(validateText(defaultValue));
 
     const onClearText = () => {
       inputRef?.current?.clear();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.81.40",
+    "version": "0.81.41-beta.2",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {