@momo-kits/foundation 0.81.41-beta.5 → 0.81.41-beta.9

package/Application/Components.tsx

@@ -173,53 +173,57 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
   useEffect(() => {
     const backHandler = BackHandler.addEventListener(
       'hardwareBackPress',
-      goBack,
+      goBackSafe,
     );
 
     return () => backHandler.remove();
   }, []);
 
-  const goBack = () => {
-    const canGoBack = navigator?.ref.current?.canGoBack();
-    if (!canGoBack && navigator?.trackingInfo) {
-      const currentRoute = navigator?.ref?.current.getCurrentRoute();
-      navigator?.maxApi?.trackEvent('service_icon_clicked', {
-        feature_code: navigator.trackingInfo.code,
-        app_id: navigator.trackingInfo.appId,
-        miniapp_version: navigator.trackingInfo.buildNumber,
-        flow_partner_id: navigator.trackingInfo.flowPartnerId,
-        screen_name: currentRoute?.params?.screen?.name ?? currentRoute?.name,
-        trigger_id: '111154000000000000',
-        icon_name: 'back',
-      });
-    }
-    if (canGoBack) {
-      if (preventBack) {
-        navigator?.showModal({
-          screen: () => (
-            <PopupNotify
-              {...preventBack}
-              primary={{
-                title: preventBack.primary.title,
-                onPress: () => {
-                  preventBack?.primary.onPress();
-                  navigator?.ref.current?.goBack();
-                },
-              }}
-            />
-          ),
+  const goBackSafe = () => {
+    const goBack = () => {
+      const canGoBack = navigator?.ref.current?.canGoBack();
+      if (!canGoBack && navigator?.trackingInfo) {
+        const currentRoute = navigator?.ref?.current.getCurrentRoute();
+        navigator?.maxApi?.trackEvent?.('service_icon_clicked', {
+          feature_code: navigator.trackingInfo.code,
+          app_id: navigator.trackingInfo.appId,
+          miniapp_version: navigator.trackingInfo.buildNumber,
+          flow_partner_id: navigator.trackingInfo.flowPartnerId,
+          screen_name: currentRoute?.params?.screen?.name ?? currentRoute?.name,
+          trigger_id: '111154000000000000',
+          icon_name: 'back',
         });
-      } else {
+      }
+      if (canGoBack) {
         navigator?.ref.current?.goBack();
+      } else if (navigator?.maxApi) {
+        navigator?.maxApi?.dismiss(navigator.dismissData);
+      } else {
+        const currentTime = new Date().getTime();
+        const requestId = `navigationBackPress#${currentTime}`;
+        DeviceEventEmitter.emit('dismiss', {requestId});
       }
-    } else if (navigator?.maxApi) {
-      navigator?.maxApi?.dismiss(navigator.dismissData);
+      onPressLeftHeader?.();
+    };
+
+    if (preventBack) {
+      navigator?.showModal({
+        screen: () => (
+          <PopupNotify
+            {...preventBack}
+            primary={{
+              title: preventBack.primary.title,
+              onPress: () => {
+                preventBack?.primary.onPress();
+                goBack();
+              },
+            }}
+          />
+        ),
+      });
     } else {
-      const currentTime = new Date().getTime();
-      const requestId = `navigationBackPress#${currentTime}`;
-      DeviceEventEmitter.emit('dismiss', {requestId});
+      goBack();
     }
-    onPressLeftHeader?.();
     return true;
   };
 
@@ -228,7 +232,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
       <NavigationButton
         icon="ic_back"
         tintColor={tintColor}
-        onPress={goBack}
+        onPress={goBackSafe}
         accessibilityLabel={`${accessibilityLabel}Back`}
         useBorder={useBorder}
       />
@@ -343,7 +347,11 @@ const HeaderRightAction: React.FC<any> = ({children, ...restProps}) => {
   return <View style={styles.headerRightButton}>{renderAction()}</View>;
 };
 
-const HeaderToolkitAction: React.FC<any> = ({tintColor}) => {
+const HeaderToolkitAction: React.FC<any> = ({
+  tintColor,
+  pinnedTool,
+  preventBack,
+}) => {
   const {theme, navigator} = useContext(ApplicationContext);
   const [toolConfig, setToolConfig] = useState<any>();
   const {appCode, onAction} = toolConfig ?? {};
@@ -357,29 +365,21 @@ const HeaderToolkitAction: React.FC<any> = ({tintColor}) => {
     if (navigator?.toolkitConfig) {
       setToolConfig(navigator?.toolkitConfig);
     } else {
-      navigator?.requestApi('getToolkit', [undefined], (result: boolean) => {
-        if (result) {
-          navigator?.requestApi(
-            'getToolkitConfig',
-            [undefined],
-            (config: any) => {
-              navigator.toolkitConfig = {
-                configs: [
-                  ...config?.toolkitConfig?.customTools,
-                  ...config?.toolkitFeatureConfig,
-                ],
-                appCode: config?.appCode,
-              };
-              setToolConfig({
-                configs: [
-                  ...config?.toolkitConfig?.customTools,
-                  ...config?.toolkitFeatureConfig,
-                ],
-                appCode: config?.appCode,
-              });
-            },
-          );
-        }
+      navigator?.requestApi('getToolkitConfig', [undefined], (config: any) => {
+        navigator.toolkitConfig = {
+          configs: [
+            ...config?.miniappTools?.customTools,
+            ...config?.defaultTools,
+          ],
+          appCode: config?.appCode,
+        };
+        setToolConfig({
+          configs: [
+            ...config?.miniappTools?.customTools,
+            ...config?.defaultTools,
+          ],
+          appCode: config?.appCode,
+        });
       });
     }
   }, []);
@@ -435,23 +435,37 @@ const HeaderToolkitAction: React.FC<any> = ({tintColor}) => {
   };
 
   const onClose = () => {
-    onAction?.('onClose');
-    navigator?.requestApi('dismiss', undefined, undefined);
+    if (preventBack) {
+      navigator?.showModal({
+        screen: () => (
+          <PopupNotify
+            {...preventBack}
+            primary={{
+              title: preventBack.primary.title,
+              onPress: () => {
+                preventBack?.primary.onPress();
+                navigator?.requestApi('dismiss', undefined, undefined);
+              },
+            }}
+          />
+        ),
+      });
+    } else {
+      navigator?.requestApi('dismiss', undefined, undefined);
+    }
   };
 
   const renderPinnedTool = () => {
-    const pinTool = toolConfig?.configs?.find(
-      (i: any) => i.key === navigator?.pinnedTool,
-    );
+    const pinTool = toolConfig?.configs?.find((i: any) => i.key === pinnedTool);
     const {icon} = pinTool || '';
-    if (pinTool && navigator?.pinnedTool)
+    if (pinTool && pinnedTool)
       return (
         <NavigationButton
           accessibilityLabel={'UtilityTool'}
           icon={icon as string}
           tintColor={tintColor}
           onPress={() => {
-            navigator?.toolkitCallback?.(navigator?.pinnedTool);
+            navigator?.toolkitCallback?.(pinnedTool);
           }}
         />
       );

package/Application/Navigator.ts

@@ -13,7 +13,6 @@ class Navigator {
   maxApi?: any;
   trackingInfo?: TrackingInfo;
   dismissData?: any;
-  pinnedTool?: string;
   toolkitCallback?: (item: any) => void;
 
   constructor(navigation: any) {
@@ -79,6 +78,20 @@ class Navigator {
     this.ref.current.dispatch(StackActions.popToTop());
   };
 
+  /**
+   * navigate
+   * @param name
+   * @param params
+   */
+  navigate = (name: string, params: any) => {
+    this.ref.current.dispatch(
+      CommonActions.navigate({
+        name,
+        params,
+      }),
+    );
+  };
+
   /**
    * reset a navigation flow with new screen
    * @param params
@@ -110,10 +123,6 @@ class Navigator {
     }
   };
 
-  setPinnedTool = (key: string) => {
-    this.pinnedTool = key;
-  };
-
   setToolkitCallback = (
     callback: (item: {key: string; action: string}) => void,
   ) => {

package/Application/types.ts

@@ -138,6 +138,7 @@ export interface NavigationOptions extends StackNavigationOptions {
   surface?: boolean;
   hiddenBack?: boolean;
   customTitle?: TitleCustomProps;
+  pinnedTool?: string;
 }
 
 export interface HeaderBackProps extends NavigationButtonProps {

package/Application/utils.tsx

@@ -126,6 +126,21 @@ const getOptions = (params: NavigationOptions, theme: Theme) => {
     };
   }
 
+  if (params.pinnedTool) {
+    options = {
+      ...options,
+      headerRight: (props: any) => {
+        return (
+          <HeaderToolkitAction
+            preventBack={params.preventBack}
+            pinnedTool={params.pinnedTool}
+            {...props}
+          />
+        );
+      },
+    };
+  }
+
   return {
     ...params,
     ...options,

package/Input/InputMoney.tsx

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

package/package.json

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