@momo-kits/foundation 0.121.0-beta.1 → 0.121.0-beta.3

package/Application/NavigationContainer.tsx

@@ -62,8 +62,22 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
       }
     );
 
+    const onFocusApp = maxApi?.listen?.('onFocusApp', () => {
+      const routes = navigationRef.current?.getRootState?.()?.routes;
+      const currentRoute: any = routes?.[routes?.length - 1];
+      const previousRoute: any = routes?.[routes?.length - 2];
+      const current = currentRoute?.params?.screen;
+      const previous = previousRoute?.params?.screen;
+      const screenName = current?.name ?? current?.type?.name;
+      const preScreenName = previous?.name ?? previous?.type?.name;
+
+      onScreenNavigated(preScreenName, screenName, 'back', 'Screen');
+      maxApi?.setObserver('CURRENT_SCREEN', {screenName});
+    });
+
     return () => {
       subscription?.remove?.();
+      onFocusApp?.remove?.();
     };
   }, []);
 
@@ -159,16 +173,15 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
             onReady={() => {
               isReady.current = true;
               routes.current = navigationRef.current?.getRootState?.()?.routes;
+              const screenName = screen?.name ?? (screen as any)?.type?.name;
               maxApi?.getDataObserver('CURRENT_SCREEN', (data: any) => {
                 onScreenNavigated(
                   data?.screenName,
-                  screen?.name,
+                  screenName,
                   'push',
                   'Screen'
                 );
-                maxApi?.setObserver('CURRENT_SCREEN', {
-                  screenName: screen?.name,
-                });
+                maxApi?.setObserver('CURRENT_SCREEN', {screenName});
               });
             }}
             onStateChange={state => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/foundation",
-  "version": "0.121.0-beta.1",
+  "version": "0.121.0-beta.3",
   "minimumDeployTarget": 32,
   "deploymentTarget": 120,
   "description": "React Native Component Kits",

package/publish.sh

@@ -9,10 +9,13 @@ elif [ "$1" == "latest" ]; then
   npm version $(npm view @momo-kits/foundation@latest version)
   npm version prerelease --preid=rc
   npm publish --tag latest --access=public
-else
+elif [ "$1" == "beta" ]; then
   npm version $(npm view @momo-kits/foundation@beta version)
   npm version prerelease --preid=beta
   npm publish --tag beta --access=public
+else
+  npm publish --tag alpha --access=public
 fi
+
 PACKAGE_NAME=$(npm pkg get name)
 NEW_PACKAGE_VERSION=$(npm pkg get version)

package/Application/Components/BottomSheetHelpCenter.tsx

@@ -1,192 +0,0 @@
-import React, {useContext} from 'react';
-import {StyleSheet, TouchableOpacity, View} from 'react-native';
-import {ApplicationContext, MiniAppContext} from '../index';
-import {Colors, Radius, Spacing, Styles} from '../../Consts';
-import {Text} from '../../Text';
-import {Icon} from '../../Icon';
-
-const ServiceItem: React.FC<any> = ({service}) => {
-  const {theme, translate} = useContext(ApplicationContext);
-  const {title, description, icon, onPress} = service;
-  const serviceTitle = translate?.(title);
-  const serviceDescription = translate?.(description);
-
-  return (
-    <TouchableOpacity onPress={onPress} style={Styles.row}>
-      <View style={styles.iconWrapper}>
-        <Icon color={theme.colors.text.hint} source={icon} size={28} />
-      </View>
-      <View>
-        <View style={Styles.row}>
-          <Text typography={'action_xs_bold'}>{serviceTitle}</Text>
-          <Icon source={'arrow_chevron_right_small'} size={16} />
-        </View>
-        <Text
-          typography={'description_xs_regular'}
-          color={theme.colors.text.hint}>
-          {serviceDescription}
-        </Text>
-      </View>
-    </TouchableOpacity>
-  );
-};
-
-const BottomSheetHelpCenter: React.FC<any> = ({onRequestClose}) => {
-  const {theme, navigator} = useContext(ApplicationContext);
-  const context = useContext<any>(MiniAppContext);
-
-  const onPressFaq = () => {
-    const routes = navigator?.ref.current?.getRootState()?.routes || [];
-    const routesLength = routes.length;
-    let screenName = routes?.[0]?.params?.screen?.name;
-    if (routesLength > 1) {
-      screenName = routes[routesLength - 2]?.params?.screen?.name;
-    }
-
-    context?.autoTracking?.({
-      ...context,
-      componentName: 'TouchableOpacity',
-      componentId: 'bottomsheet_faq_item',
-      screenName: screenName,
-    });
-
-    onRequestClose?.(() => {
-      navigator?.maxApi?.startFeatureCode?.(
-        'helpcenter_problemlevel1',
-        context?.toolkitConfig?.faq
-      );
-    });
-  };
-
-  const onPressChatbot = () => {
-    const routes = navigator?.ref.current?.getRootState()?.routes || [];
-    const routesLength = routes.length;
-    let screenName = routes?.[0]?.params?.screen?.name;
-    if (routesLength > 1) {
-      screenName = routes[routesLength - 2]?.params?.screen?.name;
-    }
-
-    context?.autoTracking?.({
-      ...context,
-      componentName: 'TouchableOpacity',
-      componentId: 'bottomsheet_chatbot_item',
-      screenName: screenName,
-    });
-
-    onRequestClose?.(() => {
-      navigator?.maxApi?.getDataObserver('CURRENT_SCREEN', (data: any) => {
-        let screenName = data?.screenName;
-        navigator?.maxApi?.startFeatureCode?.('chatbot', {
-          botId: 'botGptCs',
-          forwardParams: {
-            forService: 'navigation',
-            mini_app_id: context?.appId,
-            feature_code: context?.code,
-            screen_name: screenName,
-          },
-        });
-      });
-    });
-  };
-
-  const onPressFeedback = () => {
-    const routes = navigator?.ref.current?.getRootState()?.routes || [];
-    const routesLength = routes.length;
-    let screenName = routes?.[0]?.params?.screen?.name;
-    if (routesLength > 1) {
-      screenName = routes[routesLength - 2]?.params?.screen?.name;
-    }
-
-    context?.autoTracking?.({
-      ...context,
-      componentName: 'TouchableOpacity',
-      componentId: 'bottomsheet_feedback_item',
-      screenName: screenName,
-    });
-
-    onRequestClose?.(() => {
-      navigator?.maxApi?.startFeatureCode?.('feedback', {
-        forService: 'navigation',
-        loggedStatus: true,
-        application: {
-          appId: context?.appId,
-          appCode: context?.code,
-          appName: context?.name?.['en'],
-          buildNumber: context?.buildNumber,
-        },
-        newUi: true,
-        stepFeedback: 1,
-      });
-    });
-  };
-
-  const services = [
-    {
-      title: {vi: 'Câu hỏi thường gặp', en: 'Câu hỏi thường gặp'},
-      description: {
-        vi: 'Giải đáp các thắc mắc mọi người thường gặp',
-        en: 'Giải đáp các thắc mắc mọi người thường gặp',
-      },
-      icon: 'notifications_circle_question',
-      onPress: onPressFaq,
-    },
-    {
-      title: {vi: 'Hỗ trợ trực tuyến', en: 'Hỗ trợ trực tuyến'},
-      description: {
-        vi: 'Trả lời mọi câu hỏi của bạn 24/7',
-        en: 'Trả lời mọi câu hỏi của bạn 24/7',
-      },
-      icon: 'ic_support',
-      onPress: onPressChatbot,
-    },
-    {
-      title: {vi: 'Chia sẻ góp ý', en: 'Chia sẻ góp ý'},
-      description: {
-        vi: 'Đề xuất cải thiện hoặc báo lỗi sản phẩm/dịch vụ',
-        en: 'Đề xuất cải thiện hoặc báo lỗi sản phẩm/dịch vụ',
-      },
-      icon: 'file_mail',
-      onPress: onPressFeedback,
-    },
-  ];
-
-  return (
-    <View
-      style={[
-        styles.container,
-        {
-          backgroundColor: theme.colors.background.surface,
-        },
-      ]}>
-      {services.map((item, index) => {
-        return (
-          <>
-            <ServiceItem service={item} />
-            {index !== services.length - 1 && <View style={styles.divider} />}
-          </>
-        );
-      })}
-    </View>
-  );
-};
-
-const styles = StyleSheet.create({
-  container: {height: 300, width: '100%', padding: Spacing.M},
-  divider: {
-    marginVertical: Spacing.M,
-    backgroundColor: Colors.black_02,
-    height: 1,
-    width: '100%',
-  },
-  iconWrapper: {
-    width: 36,
-    height: 36,
-    backgroundColor: Colors.black_02,
-    borderRadius: Radius.M,
-    marginRight: Spacing.S,
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
-});
-
-export {BottomSheetHelpCenter};