@momo-kits/foundation 0.103.1-optimize.0 → 0.103.1-optimize.3

package/Application/Components.tsx

@@ -149,7 +149,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
   const goBackSafe = () => {
     const goBack = () => {
       const canGoBack = navigator?.ref?.current?.canGoBack?.();
-      const currentRoute = navigator?.ref?.current?.getCurrentRoute?.();
+      const currentRoute: any = navigator?.ref?.current?.getCurrentRoute?.();
       const params = {
         appId: context.appId,
         code: context.code,
@@ -337,7 +337,6 @@ const HeaderRight: React.FC<any> = ({type, children, onLayout, ...props}) => {
 const HeaderToolkitAction: React.FC<any> = ({
   tintColor,
   pinnedTool,
-  runtimeTools = [],
   preventClose,
 }) => {
   const {navigator} = useContext(ApplicationContext);
@@ -374,13 +373,15 @@ 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();
-      }
+      'showToolkit',
+      {
+        tools: miniContext?.toolkitConfig?.oldTools ?? [
+          'addFavorite',
+          'addShortcut',
+          'share',
+        ],
+      },
+      () => {}
     );
   };
 

package/Application/Localize.ts

@@ -17,6 +17,10 @@ class Localize {
     }
   }
 
+  get getCurrentLanguage() {
+    return this.currentLanguage;
+  }
+
   translate(key: string) {
     return this.assets[this.currentLanguage]?.[key] || key;
   }
@@ -26,7 +30,10 @@ class Localize {
   }
 
   addTranslations(translations: LocalizationObject) {
-    this.assets = translations;
+    this.assets = {
+      vi: {...translations?.vi, ...this.assets.vi},
+      en: {...translations?.en, ...this.assets.en},
+    };
   }
 
   setLanguage(language: 'en' | 'vi') {

package/Application/Navigator.ts

@@ -58,49 +58,79 @@ class Navigator {
    * push new stack screen
    * @param params
    */
-  push = (params: ScreenParams) => {
-    if (this.isReady.current) {
-      this.ref.current?.dispatch?.(StackActions.push('Stack', params));
-    }
+  push = (
+    params: ScreenParams,
+    callback?: (params: NavigatorCallbackParamsType) => void
+  ) => {
+    this.validateRefAndRunAction({
+      action: navigationRef => {
+        navigationRef.dispatch(StackActions.push('Stack', params));
+      },
+      callback,
+    });
   };
 
   /**
    * replace current screen with new screen
    * @param params
    */
-  replace = (params: ScreenParams) => {
-    if (this.isReady.current) {
-      this.ref.current?.dispatch?.(StackActions.replace('Stack', params));
-    }
+  replace = (
+    params: ScreenParams,
+    callback?: (params: NavigatorCallbackParamsType) => void
+  ) => {
+    this.validateRefAndRunAction({
+      action: navigationRef => {
+        navigationRef.dispatch(StackActions.replace('Stack', params));
+      },
+      callback,
+    });
   };
   /**
    * pop to dismiss a screen
    * @param count
    */
-  pop = (count?: number) => {
-    if (this.isReady.current) {
-      this.ref.current?.dispatch?.(StackActions.pop(count ?? 1));
-    }
+  pop = (
+    count?: number,
+    callback?: (params: NavigatorCallbackParamsType) => void
+  ) => {
+    this.validateRefAndRunAction({
+      action: navigationRef => {
+        navigationRef.dispatch(StackActions.pop(count ?? 1));
+      },
+      callback,
+    });
   };
 
   /**
    * present a new screen, show from bottom iOS
    * @param params
    */
-  present = (params: ScreenParams) => {
-    if (this.isReady.current) {
-      this.ref.current?.dispatch?.(StackActions.push('Dialog', params));
-    }
+  present = (
+    params: ScreenParams,
+    callback?: (params: NavigatorCallbackParamsType) => void
+  ) => {
+    this.validateRefAndRunAction({
+      action: navigationRef => {
+        navigationRef.dispatch(StackActions.push('Dialog', params));
+      },
+      callback,
+    });
   };
 
   /**
    * show a modal popup
    * @param params
    */
-  showModal = (params: ModalParams) => {
-    if (this.isReady.current) {
-      this.ref.current?.dispatch?.(StackActions.push('Modal', params));
-    }
+  showModal = (
+    params: ModalParams,
+    callback?: (params: NavigatorCallbackParamsType) => void
+  ) => {
+    this.validateRefAndRunAction({
+      action: navigationRef => {
+        navigationRef.dispatch(StackActions.push('Modal', params));
+      },
+      callback,
+    });
   };
 
   /**
@@ -128,10 +158,13 @@ class Navigator {
   /**
    * pop all screen route
    */
-  popToTop = () => {
-    if (this.isReady.current) {
-      this.ref.current?.dispatch?.(StackActions.popToTop());
-    }
+  popToTop = (callback?: (params: NavigatorCallbackParamsType) => void) => {
+    this.validateRefAndRunAction({
+      action: navigationRef => {
+        navigationRef.dispatch(StackActions.popToTop());
+      },
+      callback,
+    });
   };
 
   /**
@@ -139,36 +172,49 @@ class Navigator {
    * @param name
    * @param params
    */
-  navigate = (name: string, params: any) => {
-    if (this.isReady.current) {
-      this.ref.current?.dispatch?.(
-        CommonActions.navigate({
-          name,
-          params,
-        })
-      );
-    }
+  navigate = (
+    name: string,
+    params: any,
+    callback?: (params: NavigatorCallbackParamsType) => void
+  ) => {
+    this.validateRefAndRunAction({
+      action: navigationRef => {
+        navigationRef.dispatch(
+          CommonActions.navigate({
+            name,
+            params,
+          })
+        );
+      },
+      callback,
+    });
   };
 
   /**
    * reset a navigation flow with new screen
    * @param params
    */
-  reset = (params: ScreenParams) => {
-    if (this.isReady.current) {
-      this.ref.current?.dispatch?.(
-        CommonActions.reset({
-          index: 0,
-          routes: [
-            {
-              name: 'Stack',
-              key: `Stack_${new Date().getTime()}`,
-              params,
-            },
-          ],
-        })
-      );
-    }
+  reset = (
+    params: ScreenParams,
+    callback?: (params: NavigatorCallbackParamsType) => void
+  ) => {
+    this.validateRefAndRunAction({
+      action: navigationRef => {
+        navigationRef.dispatch(
+          CommonActions.reset({
+            index: 0,
+            routes: [
+              {
+                name: 'Stack',
+                key: `Stack_${new Date().getTime()}`,
+                params,
+              },
+            ],
+          })
+        );
+      },
+      callback,
+    });
   };
 
   /**

package/Popup/PopupNotify.tsx

@@ -33,7 +33,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
    * tracking
    */
   useEffect(() => {
-    const routes = navigator?.ref.current?.getRootState()?.routes || [];
+    const routes: any = navigator?.ref.current?.getRootState()?.routes || [];
     const routesLength = routes.length;
     let screen_name = routes?.[0]?.params?.screen?.name;
     if (routesLength > 1) {

package/Popup/PopupPromotion.tsx

@@ -19,7 +19,7 @@ const PopupPromotion: React.FC<PopupPromotionProps> = ({
    * tracking
    */
   useEffect(() => {
-    const routes = navigator?.ref.current?.getRootState()?.routes || [];
+    const routes: any = navigator?.ref.current?.getRootState()?.routes || [];
     const routesLength = routes.length;
     let screen_name = routes?.[0]?.params?.screen?.name;
     if (routesLength > 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.103.1-optimize.0",
+    "version": "0.103.1-optimize.3",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},
@@ -39,7 +39,8 @@
         "react-test-renderer": "17.0.1",
         "typescript": "^4.0.3",
         "@momo-platform/versions": "4.1.11",
-        "react-scanner": "^1.1.0"
+        "react-scanner": "^1.1.0",
+        "@types/color": "3.0.6"
     },
     "author": "@momo-kits/foundation",
     "license": "ISC"