@momo-kits/foundation 0.103.1-optimize.9 → 0.103.2

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: any = navigator?.ref?.current?.getCurrentRoute?.();
+      const currentRoute = navigator?.ref?.current?.getCurrentRoute?.();
       const params = {
         appId: context.appId,
         code: context.code,
@@ -337,6 +337,7 @@ const HeaderRight: React.FC<any> = ({type, children, onLayout, ...props}) => {
 const HeaderToolkitAction: React.FC<any> = ({
   tintColor,
   pinnedTool,
+  runtimeTools = [],
   preventClose,
 }) => {
   const {navigator} = useContext(ApplicationContext);
@@ -373,15 +374,13 @@ const HeaderToolkitAction: React.FC<any> = ({
   const onMore = () => {
     onAction?.('onMore');
     navigator?.maxApi?.dispatchFunction?.(
-      'showToolkit',
-      {
-        tools: miniContext?.toolkitConfig?.oldTools ?? [
-          'addFavorite',
-          'addShortcut',
-          'share',
-        ],
-      },
-      () => {}
+      'showTools',
+      {runtimeTools},
+      (res: {item: {action?: string; key: string}}) => {
+        const {item} = res;
+        navigator?.toolkitCallback?.(item.key);
+        getToolkitConfig();
+      }
     );
   };
 

package/Application/NavigationContainer.tsx

@@ -13,12 +13,13 @@ import {getDialogOptions, getModalOptions, getStackOptions} from './utils';
 import {NavigationContainerProps} from './types';
 import {ApplicationContext} from './index';
 import Localize from './Localize';
+import {defaultTheme} from '../Consts';
 
 const Stack = createStackNavigator();
 
 const NavigationContainer: React.FC<NavigationContainerProps> = ({
   screen,
-  theme,
+  theme = defaultTheme,
   options,
   maxApi,
   initialParams,

package/Application/Navigator.ts

@@ -1,170 +1,95 @@
-import {
-  CommonActions,
-  NavigationContainerRef,
-  StackActions,
-} from '@react-navigation/native';
+import {CommonActions, StackActions} from '@react-navigation/native';
 import {
   BottomSheetParams,
   HeaderToolkitProps,
   ModalParams,
-  NavigatorCallbackParamsType,
   ScreenParams,
 } from './types';
-import React from 'react';
-import {
-  NavigationActionCallbackErrorEnum,
-  NavigationActionCallbackStatusEnum,
-} from './constants';
 
 class Navigator {
-  ref: React.RefObject<NavigationContainerRef>;
-  isReady: React.MutableRefObject<boolean>;
+  ref?: any;
+  isReady?: any;
   toolkitConfig?: HeaderToolkitProps;
   maxApi?: any;
-  dismissData?: unknown;
+  dismissData?: any;
   toolkitCallback?: (key: string) => void;
 
-  constructor(
-    navigation: React.RefObject<NavigationContainerRef>,
-    isReady: React.MutableRefObject<boolean>
-  ) {
+  constructor(navigation: any, isReady: any) {
     this.ref = navigation;
     this.isReady = isReady;
   }
 
-  private validateRefAndRunAction = (params: {
-    action: (navigationRef: NavigationContainerRef) => void;
-    callback?: (params: NavigatorCallbackParamsType) => void;
-  }) => {
-    try {
-      if (this.isReady.current && this.ref.current) {
-        params.action(this.ref.current);
-        params.callback?.({status: NavigationActionCallbackStatusEnum.Success});
-      } else {
-        params.callback?.({
-          status: NavigationActionCallbackStatusEnum.Failed,
-          type: NavigationActionCallbackErrorEnum.NotReady,
-        });
-      }
-    } catch (error) {
-      params.callback?.({
-        status: NavigationActionCallbackStatusEnum.Failed,
-        type: NavigationActionCallbackErrorEnum.Error,
-      });
-    }
-  };
-
   /**
    * push new stack screen
    * @param params
    */
-  push = (
-    params: ScreenParams,
-    callback?: (params: NavigatorCallbackParamsType) => void
-  ) => {
-    this.validateRefAndRunAction({
-      action: navigationRef => {
-        navigationRef.dispatch(StackActions.push('Stack', params));
-      },
-      callback,
-    });
+  push = (params: ScreenParams) => {
+    if (this.isReady.current) {
+      this.ref.current?.dispatch?.(StackActions.push('Stack', params));
+    }
   };
 
   /**
    * replace current screen with new screen
    * @param params
    */
-  replace = (
-    params: ScreenParams,
-    callback?: (params: NavigatorCallbackParamsType) => void
-  ) => {
-    this.validateRefAndRunAction({
-      action: navigationRef => {
-        navigationRef.dispatch(StackActions.replace('Stack', params));
-      },
-      callback,
-    });
+  replace = (params: ScreenParams) => {
+    if (this.isReady.current) {
+      this.ref.current?.dispatch?.(StackActions.replace('Stack', params));
+    }
   };
   /**
    * pop to dismiss a screen
    * @param count
    */
-  pop = (
-    count?: number,
-    callback?: (params: NavigatorCallbackParamsType) => void
-  ) => {
-    this.validateRefAndRunAction({
-      action: navigationRef => {
-        navigationRef.dispatch(StackActions.pop(count ?? 1));
-      },
-      callback,
-    });
+  pop = (count?: number) => {
+    if (this.isReady.current) {
+      this.ref.current?.dispatch?.(StackActions.pop(count ?? 1));
+    }
   };
 
   /**
    * present a new screen, show from bottom iOS
    * @param params
    */
-  present = (
-    params: ScreenParams,
-    callback?: (params: NavigatorCallbackParamsType) => void
-  ) => {
-    this.validateRefAndRunAction({
-      action: navigationRef => {
-        navigationRef.dispatch(StackActions.push('Dialog', params));
-      },
-      callback,
-    });
+  present = (params: ScreenParams) => {
+    if (this.isReady.current) {
+      this.ref.current?.dispatch?.(StackActions.push('Dialog', params));
+    }
   };
 
   /**
    * show a modal popup
    * @param params
    */
-  showModal = (
-    params: ModalParams,
-    callback?: (params: NavigatorCallbackParamsType) => void
-  ) => {
-    this.validateRefAndRunAction({
-      action: navigationRef => {
-        navigationRef.dispatch(StackActions.push('Modal', params));
-      },
-      callback,
-    });
+  showModal = (params: ModalParams) => {
+    if (this.isReady.current) {
+      this.ref.current?.dispatch?.(StackActions.push('Modal', params));
+    }
   };
 
   /**
    * show a bottom sheet
    * @param params
-   * @param callback
    */
-  showBottomSheet = (
-    params: BottomSheetParams,
-    callback?: (params: NavigatorCallbackParamsType) => void
-  ) => {
-    this.validateRefAndRunAction({
-      action: navigationRef => {
-        navigationRef.dispatch(
-          StackActions.push('Modal', {
-            ...params,
-            isBottomSheet: true,
-          })
-        );
-      },
-      callback,
-    });
+  showBottomSheet = (params: BottomSheetParams) => {
+    if (this.isReady.current) {
+      this.ref.current?.dispatch?.(
+        StackActions.push('Modal', {
+          ...params,
+          isBottomSheet: true,
+        })
+      );
+    }
   };
 
   /**
    * pop all screen route
    */
-  popToTop = (callback?: (params: NavigatorCallbackParamsType) => void) => {
-    this.validateRefAndRunAction({
-      action: navigationRef => {
-        navigationRef.dispatch(StackActions.popToTop());
-      },
-      callback,
-    });
+  popToTop = () => {
+    if (this.isReady.current) {
+      this.ref.current?.dispatch?.(StackActions.popToTop());
+    }
   };
 
   /**
@@ -172,56 +97,43 @@ class Navigator {
    * @param name
    * @param params
    */
-  navigate = (
-    name: string,
-    params: any,
-    callback?: (params: NavigatorCallbackParamsType) => void
-  ) => {
-    this.validateRefAndRunAction({
-      action: navigationRef => {
-        navigationRef.dispatch(
-          CommonActions.navigate({
-            name,
-            params,
-          })
-        );
-      },
-      callback,
-    });
+  navigate = (name: string, params: any) => {
+    if (this.isReady.current) {
+      this.ref.current?.dispatch?.(
+        CommonActions.navigate({
+          name,
+          params,
+        })
+      );
+    }
   };
 
   /**
    * reset a navigation flow with new screen
    * @param 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,
-    });
+  reset = (params: ScreenParams) => {
+    if (this.isReady.current) {
+      this.ref.current?.dispatch?.(
+        CommonActions.reset({
+          index: 0,
+          routes: [
+            {
+              name: 'Stack',
+              key: `Stack_${new Date().getTime()}`,
+              params,
+            },
+          ],
+        })
+      );
+    }
   };
 
   /**
    * dismiss a feature data
    * @param data
    */
-  setDismissData = (data: unknown) => {
+  setDismissData = (data: any) => {
     this.dismissData = data;
   };
 

package/Application/types.ts

@@ -6,10 +6,6 @@ import {PopupNotifyProps} from '../Popup/types';
 import Localize from './Localize';
 import Navigation from './Navigation';
 import Navigator from './Navigator';
-import {
-  NavigationActionCallbackErrorEnum,
-  NavigationActionCallbackStatusEnum,
-} from './constants';
 
 type Screen = React.ComponentType<NavigationScreenProps>;
 
@@ -247,16 +243,3 @@ export type AnimatedHeader = {
   component?: (props?: any) => React.ReactElement;
   headerTitle?: (props?: any) => React.ReactElement;
 };
-
-type NavigatorActionSuccessCallbackType = {
-  status: NavigationActionCallbackStatusEnum.Success;
-};
-
-type NavigatorActionFailCallbackType = {
-  status: NavigationActionCallbackStatusEnum.Failed;
-  type: NavigationActionCallbackErrorEnum;
-};
-
-export type NavigatorCallbackParamsType =
-  | NavigatorActionSuccessCallbackType
-  | NavigatorActionFailCallbackType;

package/Layout/styles.ts

@@ -42,7 +42,6 @@ export default StyleSheet.create({
     padding: 12,
   },
   item: {
-    overflow: 'hidden',
     margin: undefined,
     marginTop: undefined,
     marginBottom: undefined,

package/Popup/PopupNotify.tsx

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

package/index.ts

@@ -49,3 +49,10 @@ export * from './Title';
 export * from './Title/types';
 export * from './Badge';
 export * from './Badge/types';
+
+/**
+ * export trick for keep old mini app working
+ * @deprecated
+ */
+export * from 'react-native-modalize';
+export * from '@gorhom/bottom-sheet';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.103.1-optimize.9",
+    "version": "0.103.2",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},
@@ -8,9 +8,11 @@
         "@momo-kits/foundation"
     ],
     "dependencies": {
+        "@gorhom/bottom-sheet": "2.4.1",
         "react-native-safe-area-context": "3.1.4",
         "react-native-linear-gradient": "2.8.3",
         "react-native-gesture-handler": "1.10.3",
+        "react-native-modalize": "2.1.1",
         "react-native-fast-image": "8.1.5",
         "@react-navigation/bottom-tabs": "https://gitlab.mservice.com.vn/momo-platform/react-native-bottom-tabs.git",
         "@react-navigation/core": "5.16.1",

package/Application/constants.ts

@@ -1,9 +0,0 @@
-export enum NavigationActionCallbackStatusEnum {
-  Success = 'success',
-  Failed = 'failed',
-}
-
-export enum NavigationActionCallbackErrorEnum {
-  NotReady = 'not_ready',
-  Error = 'error',
-}