@momo-kits/foundation 0.88.1 → 0.89.1-beta.10

package/Application/Components.tsx

@@ -15,7 +15,7 @@ import {
   View,
   ViewStyle,
 } from 'react-native';
-import {ApplicationContext} from './index';
+import {ApplicationContext, MiniAppContext} from './index';
 import {Colors, Radius, Spacing, Styles} from '../Consts';
 import {Image} from '../Image';
 import {
@@ -108,6 +108,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
   useBorder,
   accessibilityLabel = '',
 }) => {
+  const context = useContext(MiniAppContext);
   const {navigator} = useContext(ApplicationContext);
 
   useEffect(() => {
@@ -122,13 +123,10 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
   const goBackSafe = () => {
     const goBack = () => {
       const canGoBack = navigator?.ref.current?.canGoBack();
-      if (!canGoBack && navigator?.trackingInfo) {
+      if (!canGoBack) {
         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,
+          ...context,
           screen_name: currentRoute?.params?.screen?.name ?? currentRoute?.name,
           trigger_id: '111154000000000000',
           icon_name: 'back',
@@ -290,6 +288,7 @@ const HeaderRightAction: React.FC<any> = ({children, ...restProps}) => {
 const HeaderToolkitAction: React.FC<any> = ({
   tintColor,
   pinnedTool,
+  runtimeTools = [],
   preventBack,
 }) => {
   const {theme, navigator} = useContext(ApplicationContext);
@@ -310,17 +309,21 @@ const HeaderToolkitAction: React.FC<any> = ({
   }, []);
 
   const getToolkitConfig = () => {
-    navigator?.requestApi('getToolsConfig', [undefined], (config: any) => {
-      navigator.toolkitConfig = config;
-      setToolConfig(navigator?.toolkitConfig);
-    });
+    navigator?.maxApi?.dispatchFunction?.(
+      'getToolsConfig',
+      [undefined],
+      (config: any) => {
+        navigator.toolkitConfig = config;
+        setToolConfig(navigator?.toolkitConfig);
+      },
+    );
   };
 
   const onMore = () => {
     onAction?.('onMore');
-    navigator?.requestApi(
+    navigator?.maxApi?.dispatchFunction?.(
       'showTools',
-      [undefined],
+      {runtimeTools},
       (res: {item: {action?: string; key: string}}) => {
         const {item} = res;
         navigator?.toolkitCallback?.(item);
@@ -339,14 +342,18 @@ const HeaderToolkitAction: React.FC<any> = ({
               title: preventBack.primary.title,
               onPress: () => {
                 preventBack?.primary.onPress();
-                navigator?.requestApi('dismiss', undefined, undefined);
+                navigator?.maxApi?.dispatchFunction?.(
+                  'dismiss',
+                  undefined,
+                  undefined,
+                );
               },
             }}
           />
         ),
       });
     } else {
-      navigator?.requestApi('dismiss', undefined, undefined);
+      navigator?.maxApi?.dispatchFunction?.('dismiss', undefined, undefined);
     }
   };
 
@@ -364,9 +371,13 @@ const HeaderToolkitAction: React.FC<any> = ({
           badgeValue={badgeValue}
           badgeType={badgeType}
           onPress={() => {
-            navigator?.requestApi('onToolAction', [pinTool?.key], () => {
-              getToolkitConfig();
-            });
+            navigator?.maxApi?.dispatchFunction?.(
+              'onToolAction',
+              pinTool?.key,
+              () => {
+                getToolkitConfig();
+              },
+            );
             navigator?.toolkitCallback?.(pinTool.key);
           }}
         />

package/Application/ModalScreen.tsx

@@ -178,7 +178,6 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
               />
             </View>
             <NavigationContainer
-              trackingInfo={navigator?.trackingInfo}
               maxApi={navigator?.maxApi}
               theme={{
                 ...theme,

package/Application/NavigationContainer.tsx

@@ -23,7 +23,6 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
   options,
   maxApi,
   localization,
-  trackingInfo,
 }) => {
   const navigationRef = React.useRef<NavigationContainerRef>(null);
   const navigator = useRef(new Navigator(navigationRef));
@@ -68,7 +67,6 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
    * inject data for navigator
    */
   navigator.current.maxApi = maxApi;
-  navigator.current.trackingInfo = trackingInfo;
 
   /**
    * translate

package/Application/Navigator.ts

@@ -4,14 +4,12 @@ import {
   HeaderToolkitProps,
   ModalParams,
   ScreenParams,
-  TrackingInfo,
 } from './types';
 
 class Navigator {
   ref?: any;
   toolkitConfig?: HeaderToolkitProps;
   maxApi?: any;
-  trackingInfo?: TrackingInfo;
   dismissData?: any;
   toolkitCallback?: (item: any) => void;
 
@@ -111,18 +109,6 @@ class Navigator {
     );
   };
 
-  /**
-   * request max api for mini app
-   * @param func
-   * @param args
-   * @param callback
-   */
-  requestApi = (func: any, args: any = [], callback: any) => {
-    if (this.maxApi) {
-      this.maxApi[func]?.(...args, callback);
-    }
-  };
-
   setToolkitCallback = (
     callback: (item: {key: string; action: string}) => void,
   ) => {

package/Application/StackScreen.tsx

@@ -1,13 +1,15 @@
 import React, {useContext, useEffect, useLayoutEffect} from 'react';
 import {ScreenParams} from './types';
 import Navigation from './Navigation';
-import {ApplicationContext} from './index';
+import {ApplicationContext, MiniAppContext} from './index';
 import {GridSystem} from '../Layout';
 import {useHeaderHeight} from '@react-navigation/stack';
 
 const StackScreen: React.FC<ScreenParams> = props => {
-  const {screen: Component, options}: ScreenParams = props.route.params;
   const {theme, showGrid, navigator} = useContext(ApplicationContext);
+  const context = useContext(MiniAppContext);
+
+  const {screen: Component, options}: ScreenParams = props.route.params;
   const navigation = new Navigation(props.navigation, theme);
   const heightHeader = useHeaderHeight();
 
@@ -31,36 +33,31 @@ const StackScreen: React.FC<ScreenParams> = props => {
    * tracking for screen
    */
   useEffect(() => {
-    if (navigator?.trackingInfo) {
-      const tracking = {
-        feature_code: navigator.trackingInfo.code,
-        app_id: navigator.trackingInfo.appId,
-        miniapp_version: navigator.trackingInfo.buildNumber,
-        flow_partner_id: navigator.trackingInfo.flowPartnerId,
-        screen_name: Component.name,
-      };
+    const tracking = {
+      ...context,
+      screen_name: Component.name,
+    };
+
+    const routes = props.navigation.getState()?.routes || [];
+    const routesLength = routes.length;
+    let pre_screen_name = '';
+    if (routesLength > 1) {
+      pre_screen_name = routes[routesLength - 2]?.params?.screen?.name;
+    }
 
-      const routes = props.navigation.getState()?.routes || [];
-      const routesLength = routes.length;
-      let pre_screen_name = '';
-      if (routesLength > 1) {
-        pre_screen_name = routes[routesLength - 2]?.params?.screen?.name;
-      }
+    navigator?.maxApi?.trackEvent?.('service_frame_displayed', {
+      ...tracking,
+      pre_screen_name,
+      trigger_id: '111378000000000000',
+    });
 
-      navigator?.maxApi?.trackEvent?.('service_frame_displayed', {
+    return props.navigation.addListener('beforeRemove', () => {
+      navigator?.maxApi?.trackEvent?.('service_icon_clicked', {
         ...tracking,
-        pre_screen_name,
-        trigger_id: '111378000000000000',
-      });
-
-      return props.navigation.addListener('beforeRemove', () => {
-        navigator?.maxApi?.trackEvent?.('service_icon_clicked', {
-          ...tracking,
-          trigger_id: '111154000000000000',
-          icon_name: 'back',
-        });
+        trigger_id: '111154000000000000',
+        icon_name: 'back',
       });
-    }
+    });
   }, []);
 
   return (

package/Application/index.ts

@@ -13,12 +13,21 @@ import {
 import BottomTab from './BottomTab';
 import {createContext} from 'react';
 import {defaultContext} from '../Consts';
+import {MiniAppInfo} from './types';
 
 const ApplicationContext = createContext(defaultContext);
+const MiniAppContext = createContext<MiniAppInfo>({
+  appId: '',
+  buildNumber: 0,
+  code: '',
+  toolkitConfig: {},
+  fromCode: '',
+});
 
 export {
-  NavigationContainer,
   ApplicationContext,
+  MiniAppContext,
+  NavigationContainer,
   Screen,
   BottomTab,
   NavigationButton,

package/Application/types.ts

@@ -71,6 +71,16 @@ export type Context = {
   translate?: (key: string) => string;
 };
 
+export type MiniAppInfo = {
+  [key: string]: any;
+  code: string;
+  appId: string;
+  buildNumber: number;
+  flowPartnerId?: string;
+  toolkitConfig?: object;
+  fromCode?: string;
+};
+
 export type LocalizationObject = {
   vi: {
     [key: string]: string;
@@ -80,21 +90,12 @@ export type LocalizationObject = {
   };
 };
 
-export type TrackingInfo = {
-  [key: string]: any;
-  code: string;
-  appId: string;
-  buildNumber: number;
-  flowPartnerId?: string;
-};
-
 export type NavigationContainerProps = {
   screen: Screen;
   options?: NavigationOptions;
   theme: Theme;
   maxApi: any;
   localization?: LocalizationObject;
-  trackingInfo?: TrackingInfo;
 };
 
 export type NavigationScreenProps = {
@@ -138,13 +139,22 @@ export type PinnedToolType = {
   badgeType?: 'number' | 'dot';
 };
 
+export type RuntimeToolType = {
+  title: {vi: string; en: string};
+  icon: string;
+  key: string;
+};
+
 export interface NavigationOptions extends StackNavigationOptions {
   preventBack?: PopupNotifyProps;
   onPressLeftHeader?: () => void;
   surface?: boolean;
   hiddenBack?: boolean;
   customTitle?: TitleCustomProps;
-  pinnedTool?: PinnedToolType;
+  toolkitParams?: {
+    pinnedTool?: PinnedToolType;
+    runtimeTools?: RuntimeToolType[];
+  };
 }
 
 export interface HeaderBackProps extends NavigationButtonProps {

package/Application/utils.tsx

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

package/Input/InputMoney.tsx

@@ -1,4 +1,10 @@
-import React, {forwardRef, useContext, useRef, useState} from 'react';
+import React, {
+  forwardRef,
+  useContext,
+  useImperativeHandle,
+  useRef,
+  useState,
+} from 'react';
 import {
   NativeSyntheticEvent,
   TextInput,
@@ -63,6 +69,12 @@ const InputMoney = forwardRef(
       onChangeText?.(formatMoneyToNumber(text, 'đ').toString());
     };
 
+    useImperativeHandle(ref, () => {
+      return {
+        setText: _onChangeText,
+      };
+    });
+
     const _onFocus = (e: NativeSyntheticEvent<TextInputFocusEventData>) => {
       setFocused(true);
       onFocus?.(e);

package/Popup/PopupNotify.tsx

@@ -4,7 +4,7 @@ import {PopupNotifyProps} from './types';
 import {Radius, Spacing, Styles} from '../Consts';
 import {Image} from '../Image';
 import {Text} from '../Text';
-import {ApplicationContext} from '../Application';
+import {ApplicationContext, MiniAppContext} from '../Application';
 import {Button} from '../Button';
 import {Icon} from '../Icon';
 
@@ -19,6 +19,7 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
   buttonDirection = 'row',
   onIconClose,
 }) => {
+  const context = useContext(MiniAppContext);
   const {theme, navigator, translate} = useContext(ApplicationContext);
   const [scrollContent, setScrollContent] = useState(false);
   const closeAction = useRef('touch_outside');
@@ -34,35 +35,31 @@ const PopupNotify: React.FC<PopupNotifyProps> = ({
    * tracking
    */
   useEffect(() => {
-    if (navigator?.trackingInfo) {
-      const routes = navigator.ref.current?.getRootState()?.routes || [];
-      const routesLength = routes.length;
-      let screen_name = routes?.[0]?.params?.screen?.name;
-      if (routesLength > 1) {
-        screen_name = routes[routesLength - 2]?.params?.screen?.name;
-      }
-      const tracking = {
-        feature_code: navigator?.trackingInfo?.code,
-        app_id: navigator?.trackingInfo?.appId,
-        miniapp_version: navigator?.trackingInfo?.buildNumber,
-        flow_partner_id: navigator?.trackingInfo?.flowPartnerId,
-        screen_name,
-        component_type: 'popup',
-        component_name: id,
-        error_code: error ? error : undefined,
-      };
-      navigator?.maxApi?.trackEvent?.('service_component_displayed', {
+    const routes = navigator?.ref.current?.getRootState()?.routes || [];
+    const routesLength = routes.length;
+    let screen_name = routes?.[0]?.params?.screen?.name;
+    if (routesLength > 1) {
+      screen_name = routes[routesLength - 2]?.params?.screen?.name;
+    }
+    const tracking = {
+      ...context,
+      screen_name,
+      component_type: 'popup',
+      component_name: id,
+      error_code: error ? error : undefined,
+    };
+    navigator?.maxApi?.trackEvent?.('service_component_displayed', {
+      ...tracking,
+      trigger_id: '111012100000000000',
+    });
+
+    return () => {
+      navigator?.maxApi?.trackEvent?.('service_popup_dismissed', {
         ...tracking,
-        trigger_id: '111012100000000000',
+        trigger_id: '111154100000000001',
+        action_type: closeAction.current,
       });
-      return () => {
-        navigator?.maxApi?.trackEvent?.('service_popup_dismissed', {
-          ...tracking,
-          trigger_id: '111154100000000001',
-          action_type: closeAction.current,
-        });
-      };
-    }
+    };
   }, []);
 
   /**

package/Popup/PopupPromotion.tsx

@@ -1,7 +1,7 @@
 import React, {useContext, useEffect, useRef} from 'react';
 import {StyleSheet, TouchableOpacity, View} from 'react-native';
 import {PopupPromotionProps} from './types';
-import {ApplicationContext} from '../Application';
+import {ApplicationContext, MiniAppContext} from '../Application';
 import {Image} from '../Image';
 import {Radius, Spacing} from '../Consts';
 import {Icon} from '../Icon';
@@ -11,6 +11,7 @@ const PopupPromotion: React.FC<PopupPromotionProps> = ({
   image,
   onIconClose,
 }) => {
+  const context = useContext(MiniAppContext);
   const {theme, navigator} = useContext(ApplicationContext);
   const closeAction = useRef('touch_outside');
 
@@ -18,34 +19,29 @@ const PopupPromotion: React.FC<PopupPromotionProps> = ({
    * tracking
    */
   useEffect(() => {
-    if (navigator?.trackingInfo) {
-      const routes = navigator.ref.current?.getRootState()?.routes || [];
-      const routesLength = routes.length;
-      let screen_name = routes?.[0]?.params?.screen?.name;
-      if (routesLength > 1) {
-        screen_name = routes[routesLength - 2]?.params?.screen?.name;
-      }
-      const tracking = {
-        feature_code: navigator?.trackingInfo?.code,
-        app_id: navigator?.trackingInfo?.appId,
-        miniapp_version: navigator?.trackingInfo?.buildNumber,
-        flow_partner_id: navigator?.trackingInfo?.flowPartnerId,
-        screen_name,
-        component_type: 'popup',
-        component_name: id,
-      };
-      navigator?.maxApi?.trackEvent?.('service_component_displayed', {
+    const routes = navigator?.ref.current?.getRootState()?.routes || [];
+    const routesLength = routes.length;
+    let screen_name = routes?.[0]?.params?.screen?.name;
+    if (routesLength > 1) {
+      screen_name = routes[routesLength - 2]?.params?.screen?.name;
+    }
+    const tracking = {
+      ...context,
+      screen_name,
+      component_type: 'popup',
+      component_name: id,
+    };
+    navigator?.maxApi?.trackEvent?.('service_component_displayed', {
+      ...tracking,
+      trigger_id: '111012100000000000',
+    });
+    return () => {
+      navigator?.maxApi?.trackEvent?.('service_popup_dismissed', {
         ...tracking,
-        trigger_id: '111012100000000000',
+        trigger_id: '111154100000000001',
+        action_type: closeAction.current,
       });
-      return () => {
-        navigator?.maxApi?.trackEvent?.('service_popup_dismissed', {
-          ...tracking,
-          trigger_id: '111154100000000001',
-          action_type: closeAction.current,
-        });
-      };
-    }
+    };
   }, []);
 
   /**

package/package.json

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