@momo-kits/foundation 0.102.6-beta.7 → 0.102.6-beta.9

package/Application/Components.tsx

@@ -35,7 +35,6 @@ import {Badge, BadgeDot} from '../Badge';
 import {HeaderType} from '../Layout/types';
 import Navigation from './Navigation';
 import {InputRef, InputSearch, InputSearchProps} from '../Input';
-import {BadgeDotAnimation} from '../Badge';
 
 const SCREEN_PADDING = 12;
 const BACK_WIDTH = 28;
@@ -72,11 +71,6 @@ const NavigationButton: React.FC<NavigationButtonProps> = ({
     if (badgeType === 'dot') {
       return <BadgeDot size="small" style={styles.badgeDot} />;
     }
-    if (badgeType === 'dot-animation') {
-      return (
-        <BadgeDotAnimation size="small" style={styles.badgeDotAnimation} />
-      );
-    }
 
     if (isNumber(badgeValue)) {
       return <Badge label={badgeValue} style={styles.badge} />;
@@ -769,11 +763,6 @@ const styles = StyleSheet.create({
     top: -Spacing.XS,
     right: -Spacing.XS,
   },
-  badgeDotAnimation: {
-    position: 'absolute',
-    top: -Spacing.XS,
-    right: -Spacing.XS,
-  },
   extendedHeader: {
     aspectRatio: 1.75,
     position: 'absolute',

package/Application/StackScreen.tsx

@@ -8,80 +8,6 @@ import {GridSystem} from '../Layout';
 import {Text} from '../Text';
 import {Colors, Radius, Spacing} from '../Consts';
 
-/**
- * Empty screen for unvalidated screen name
- * @constructor
- */
-const EmptyScreen: React.FC = () => {
-  return (
-    <View
-      style={{
-        backgroundColor: Colors.black_01,
-        padding: Spacing.M,
-        borderRadius: Radius.M,
-      }}>
-      <Text typography={'header_m_bold'}>Unvalidated screen name</Text>
-      <Text
-        typography={'description_default_regular'}
-        style={{paddingVertical: Spacing.S}}>
-        Your screen has not been rendered because Platform has not detected the
-        screen name. Please migrate to support this feature.
-      </Text>
-      <Text typography={'header_default'} style={{width: '100%'}}>
-        Possible fixes:
-      </Text>
-      <View style={{marginLeft: Spacing.S}}>
-        <Text typography={'body_default_regular'}>1. Off webpack config</Text>
-        <Text typography={'body_default_regular'}>
-          2. Screen name refactoring
-        </Text>
-        <View style={{marginLeft: Spacing.S}}>
-          <Text
-            typography={'description_default_regular'}
-            style={{marginBottom: Spacing.S}}>
-            - Với các screen push/import dạng arrow function ={'>'} đổi thành
-            named function
-          </Text>
-          <Text
-            typography={'description_default_regular'}
-            style={{marginBottom: Spacing.S}}>
-            - Với các screen import dạng High Order Component ={'>'} rename
-            generic function thành named function
-          </Text>
-          <Text
-            typography={'description_default_regular'}
-            style={{marginBottom: Spacing.S}}>
-            - Với Tab Navigator, Platform sẽ lấy Tab Container làm screen name.
-            Trong trường hợp miniapp muốn track riêng action cho từng tab, tham
-            khảo theo docs
-          </Text>
-        </View>
-      </View>
-      <Text typography={'header_s_semibold'}>More information: </Text>
-      <Text
-        typography={'body_default_regular'}
-        color={Colors.blue_01}
-        onPress={() => {
-          Linking.openURL(
-            'https://gitlab.mservice.com.vn/momo-platform/mini-app/-/tree/vn.momo.uikits/dev/app'
-          );
-        }}>
-        Mini App: vn.momo.uikits/dev
-      </Text>
-      <Text
-        typography={'body_default_regular'}
-        color={Colors.blue_01}
-        onPress={() => {
-          Linking.openURL(
-            'https://docs.google.com/presentation/d/1bIFoh8gRXb6hsnGJz4O1Kxg4_oNikB1KuuEt2wULCDM/edit?usp=sharing'
-          );
-        }}>
-        https://docs.google.com/presentation/d/1bIFoh8gRXb6hsnGJz4O1Kxg4_oNikB1KuuEt2wULCDM/edit?usp=sharing
-      </Text>
-    </View>
-  );
-};
-
 /**
  * container for stack screen
  * @param props
@@ -89,20 +15,19 @@ const EmptyScreen: React.FC = () => {
  */
 const StackScreen: React.FC<ScreenParams> = props => {
   const {showGrid, navigator} = useContext(ApplicationContext);
-  const startTime = useRef(Date.now());
-  const endTime = useRef(Date.now());
-  const timeLoad = useRef(0);
-  const timeInteraction = useRef(0);
-  const timeoutLoad = useRef<any>();
-  const tracked = useRef<any>({
+  const tracking = useRef<any>({
+    timeoutLoad: undefined,
+    interaction: undefined,
+    startTime: Date.now(),
+    endTime: Date.now(),
     traceIdLoad: undefined,
     traceIdInteraction: undefined,
     releaseLoad: undefined,
     releaseInteraction: undefined,
-    timeoutLoad: undefined,
-    timeoutInteraction: undefined,
+    timeLoad: 0,
+    timeInteraction: 0,
   });
-  const interaction = useRef<any>();
+
   const context = useContext<any>(MiniAppContext);
   const {screen: Component, options, initialParams} = props.route.params;
   const navigation = new Navigation(props.navigation);
@@ -135,15 +60,6 @@ const StackScreen: React.FC<ScreenParams> = props => {
       };
     }
     navigation.setOptions(defaultOptions);
-    navigator?.maxApi?.startTraceScreenLoad?.(screenName, (data: any) => {
-      tracked.current.traceIdLoad = data?.traceId;
-    });
-    navigator?.maxApi?.startTraceScreenInteraction?.(
-      screenName,
-      (data: any) => {
-        tracked.current.traceIdInteraction = data?.traceId;
-      }
-    );
   }, [options]);
 
   /**
@@ -156,16 +72,25 @@ const StackScreen: React.FC<ScreenParams> = props => {
       }, 300);
     }
     navigator?.maxApi?.of?.({screenName});
-    tracked.current.timeoutLoad = setTimeout(() => {
-      onScreenLoad();
-    }, 5000);
-    tracked.current.timeoutInteraction = setTimeout(() => {
-      onScreenInteraction();
-    }, 5000);
+    props.navigation?.addListener?.('focus', () => {
+      navigator?.maxApi?.getDataObserver('CURRENT_SCREEN', (data: any) => {
+        if (data) {
+          Alert.alert('getDataObserver', JSON.stringify(data));
+        }
+        navigator?.maxApi?.setObserver('CURRENT_SCREEN', {screenName});
+      });
+    });
 
+    navigator?.maxApi?.startTraceScreenLoad?.(screenName, (data: any) => {
+      tracking.current.traceIdLoad = data?.traceId;
+    });
+    navigator?.maxApi?.startTraceScreenInteraction?.(
+      screenName,
+      (data: any) => {
+        tracking.current.traceIdInteraction = data?.traceId;
+      }
+    );
     return () => {
-      clearTimeout(tracked.current.timeoutLoad);
-      clearTimeout(tracked.current.timeoutInteraction);
       onScreenLoad();
       onScreenInteraction();
     };
@@ -175,9 +100,10 @@ const StackScreen: React.FC<ScreenParams> = props => {
    * tracking for screen load
    */
   const onScreenLoad = () => {
-    if (!tracked.current?.releaseLoad) {
-      if (timeLoad.current === 0) {
-        timeLoad.current = endTime.current - startTime.current;
+    if (!tracking.current?.releaseLoad) {
+      if (tracking.current.timeLoad === 0) {
+        tracking.current.timeLoad =
+          tracking.current.endTime - tracking.current.startTime;
       }
 
       context.autoTracking?.({
@@ -188,23 +114,24 @@ const StackScreen: React.FC<ScreenParams> = props => {
         action: 'push',
         componentName: 'Screen',
         state: 'load',
-        duration: timeLoad.current,
+        duration: tracking.current.timeLoad,
       });
       navigator?.maxApi?.stopTrace?.(
-        tracked.current.traceIdLoad,
-        {value: timeLoad.current / 1000},
+        tracking.current.traceIdLoad,
+        {value: tracking.current.timeLoad / 1000},
         null
       );
-      tracked.current.releaseLoad = true;
+      tracking.current.releaseLoad = true;
 
       /**
        * debug
        */
       navigator?.maxApi?.showToastDebug?.({
-        appId: `auto - ${context.appId}`,
-        message: `${screenName} screen_load_time ${timeLoad.current}`,
+        appId: context.appId,
+        message: `${screenName} screen_load_time ${tracking.current.timeLoad}`,
+        type: 'ERROR',
       });
-      if (timeLoad.current <= 0 && context.enableAutoId) {
+      if (tracking.current.timeLoad <= 0 && context.enableAutoId) {
         Alert.alert(screenName, "Can't get screen load time");
       }
     }
@@ -214,12 +141,13 @@ const StackScreen: React.FC<ScreenParams> = props => {
    * tracking for screen load
    */
   const onScreenInteraction = () => {
-    if (!tracked.current?.releaseInteraction) {
-      if (timeLoad.current === 0) {
-        timeLoad.current = endTime.current - startTime.current;
+    if (!tracking.current?.releaseInteraction) {
+      if (tracking.current.timeLoad === 0) {
+        tracking.current.timeLoad =
+          tracking.current.endTime - tracking.current.startTime;
       }
-      if (timeInteraction.current === 0) {
-        timeInteraction.current = timeLoad.current;
+      if (tracking.current.timeInteraction === 0) {
+        tracking.current.timeInteraction = tracking.current.timeLoad;
       }
 
       context.autoTracking?.({
@@ -229,23 +157,24 @@ const StackScreen: React.FC<ScreenParams> = props => {
         screenName,
         componentName: 'Screen',
         state: 'interaction',
-        duration: timeInteraction.current - timeLoad.current,
+        duration: tracking.current.timeInteraction - tracking.current.timeLoad,
       });
       navigator?.maxApi?.stopTrace?.(
-        tracked.current.traceIdInteraction,
-        {value: timeInteraction.current / 1000},
+        tracking.current.traceIdInteraction,
+        {value: tracking.current.timeInteraction / 1000},
         null
       );
-      tracked.current.releaseInteraction = true;
+      tracking.current.releaseInteraction = true;
 
       /**
        * debug toast
        */
       navigator?.maxApi?.showToastDebug?.({
-        appId: `auto - ${context.appId}`,
-        message: `${screenName} screen_interaction_time ${timeInteraction.current}`,
+        appId: context.appId,
+        message: `${screenName} screen_interaction_time ${tracking.current.timeInteraction}`,
+        type: 'ERROR',
       });
-      if (timeInteraction.current <= 0 && context.enableAutoId) {
+      if (tracking.current.timeInteraction <= 0 && context.enableAutoId) {
         Alert.alert(screenName, "Can't get screen interaction time");
       }
     }
@@ -256,16 +185,21 @@ const StackScreen: React.FC<ScreenParams> = props => {
       value={{
         screenName,
         onElementLoad: () => {
-          clearTimeout(timeoutLoad.current);
-          endTime.current = Date.now();
-          interaction.current?.cancel?.();
-          interaction.current = InteractionManager.runAfterInteractions(() => {
-            timeInteraction.current = Date.now() - startTime.current;
-          });
-          timeoutLoad.current = setTimeout(() => {
-            if (timeLoad.current === 0) {
-              timeLoad.current = endTime.current - startTime.current;
+          clearTimeout(tracking.current.timeoutLoad);
+          tracking.current.endTime = Date.now();
+          tracking.current.interaction?.cancel?.();
+          tracking.current.interaction =
+            InteractionManager.runAfterInteractions(() => {
+              tracking.current.timeInteraction =
+                Date.now() - tracking.current.startTime;
+            });
+          tracking.current.timeoutLoad = setTimeout(() => {
+            if (tracking.current.timeLoad === 0) {
+              tracking.current.timeLoad =
+                tracking.current.endTime - tracking.current.startTime;
             }
+            onScreenLoad();
+            onScreenInteraction();
           }, 2000);
         },
       }}>
@@ -280,4 +214,78 @@ const StackScreen: React.FC<ScreenParams> = props => {
   );
 };
 
+/**
+ * Empty screen for unvalidated screen name
+ * @constructor
+ */
+const EmptyScreen: React.FC = () => {
+  return (
+    <View
+      style={{
+        backgroundColor: Colors.black_01,
+        padding: Spacing.M,
+        borderRadius: Radius.M,
+      }}>
+      <Text typography={'header_m_bold'}>Unvalidated screen name</Text>
+      <Text
+        typography={'description_default_regular'}
+        style={{paddingVertical: Spacing.S}}>
+        Your screen has not been rendered because Platform has not detected the
+        screen name. Please migrate to support this feature.
+      </Text>
+      <Text typography={'header_default'} style={{width: '100%'}}>
+        Possible fixes:
+      </Text>
+      <View style={{marginLeft: Spacing.S}}>
+        <Text typography={'body_default_regular'}>1. Off webpack config</Text>
+        <Text typography={'body_default_regular'}>
+          2. Screen name refactoring
+        </Text>
+        <View style={{marginLeft: Spacing.S}}>
+          <Text
+            typography={'description_default_regular'}
+            style={{marginBottom: Spacing.S}}>
+            - Với các screen push/import dạng arrow function ={'>'} đổi thành
+            named function
+          </Text>
+          <Text
+            typography={'description_default_regular'}
+            style={{marginBottom: Spacing.S}}>
+            - Với các screen import dạng High Order Component ={'>'} rename
+            generic function thành named function
+          </Text>
+          <Text
+            typography={'description_default_regular'}
+            style={{marginBottom: Spacing.S}}>
+            - Với Tab Navigator, Platform sẽ lấy Tab Container làm screen name.
+            Trong trường hợp miniapp muốn track riêng action cho từng tab, tham
+            khảo theo docs
+          </Text>
+        </View>
+      </View>
+      <Text typography={'header_s_semibold'}>More information: </Text>
+      <Text
+        typography={'body_default_regular'}
+        color={Colors.blue_01}
+        onPress={() => {
+          Linking.openURL(
+            'https://gitlab.mservice.com.vn/momo-platform/mini-app/-/tree/vn.momo.uikits/dev/app'
+          );
+        }}>
+        Mini App: vn.momo.uikits/dev
+      </Text>
+      <Text
+        typography={'body_default_regular'}
+        color={Colors.blue_01}
+        onPress={() => {
+          Linking.openURL(
+            'https://docs.google.com/presentation/d/1bIFoh8gRXb6hsnGJz4O1Kxg4_oNikB1KuuEt2wULCDM/edit?usp=sharing'
+          );
+        }}>
+        https://docs.google.com/presentation/d/1bIFoh8gRXb6hsnGJz4O1Kxg4_oNikB1KuuEt2wULCDM/edit?usp=sharing
+      </Text>
+    </View>
+  );
+};
+
 export default StackScreen;

package/Application/types.ts

@@ -129,7 +129,7 @@ export type NavigationButtonProps = {
   tintColor?: string;
   useBorder?: boolean;
   onPress: () => void;
-  badgeType?: 'dot' | 'number' | 'dot-animation';
+  badgeType?: 'dot' | 'number';
   badgeValue?: number;
   accessibilityLabel?: string;
 };
@@ -137,7 +137,7 @@ export type NavigationButtonProps = {
 export type PinnedToolType = {
   key: string;
   badgeValue?: number;
-  badgeType?: 'number' | 'dot' | 'dot-animation';
+  badgeType?: 'number' | 'dot';
 };
 
 export type RuntimeToolType = {

package/Badge/BadgeDotAnimation.tsx

@@ -1,7 +1,7 @@
 import React, {useEffect, useRef} from 'react';
-import {Animated, View} from 'react-native';
+import {Animated, StyleSheet, View} from 'react-native';
 import {BadgeDotProps} from './types';
-import styles from './styles';
+import CommonStyle from './styles';
 
 const DURATION = 500;
 
@@ -11,8 +11,7 @@ const BadgeDotAnimation = ({size, style}: BadgeDotProps) => {
   const waveScaleAnim = useRef(new Animated.Value(1)).current;
   const waveOpacityAnim = useRef(new Animated.Value(0)).current;
 
-  const dotStyle =
-    size === 'small' ? styles.dotAnimationSmall : styles.dotAnimation;
+  const dotStyle = size === 'small' ? styles.dotSmall : styles.dot;
   const waveStyle = size === 'small' ? styles.waveSmall : styles.wave;
 
   useEffect(() => {
@@ -68,7 +67,7 @@ const BadgeDotAnimation = ({size, style}: BadgeDotProps) => {
   }, []);
 
   return (
-    <View style={[styles.dotAnimationContainer, style]}>
+    <View style={[styles.container, style]}>
       {/* Wave Animation */}
       <Animated.View
         style={[
@@ -92,4 +91,32 @@ const BadgeDotAnimation = ({size, style}: BadgeDotProps) => {
   );
 };
 
+const styles = StyleSheet.create({
+  ...CommonStyle,
+  container: {
+    position: 'relative',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  dot: {
+    ...CommonStyle.dot,
+    borderWidth: 0,
+  },
+  dotSmall: {
+    ...CommonStyle.dotSmall,
+    borderWidth: 0,
+  },
+  wave: {
+    ...CommonStyle.dot,
+    opacity: 0,
+    position: 'absolute',
+    borderWidth: 0,
+  },
+  waveSmall: {
+    ...CommonStyle.dotSmall,
+    borderWidth: 0,
+    position: 'absolute',
+  },
+});
+
 export default BadgeDotAnimation;

package/Badge/index.tsx

@@ -1,8 +1,7 @@
 import Badge from './Badge';
 import BadgeDot from './BadgeDot';
 import BadgeRibbon from './BadgeRibbon';
-import BadgeDotAnimation from './BadgeDotAnimation';
 import {BadgeProps, BadgeDotProps, BadgeRibbonProps} from './types';
 
-export {Badge, BadgeRibbon, BadgeDot, BadgeDotAnimation};
+export {Badge, BadgeRibbon, BadgeDot};
 export type {BadgeProps, BadgeDotProps, BadgeRibbonProps};

package/Badge/styles.ts

@@ -2,10 +2,6 @@ import {StyleSheet} from 'react-native';
 import {Colors, Radius, Spacing} from '../Consts';
 import {scaleSize} from '../Text';
 
-const DOT_SIZE = 16;
-
-const DOT_SMALL_SIZE = 10;
-
 export default StyleSheet.create({
   badge: {
     paddingHorizontal: Spacing.XS,
@@ -19,61 +15,21 @@ export default StyleSheet.create({
     borderColor: Colors.black_01,
     alignSelf: 'baseline',
   },
-  dotAnimationContainer: {
-    position: 'relative',
-    alignItems: 'center',
-    justifyContent: 'center',
-  },
   dot: {
-    width: DOT_SIZE,
-    height: DOT_SIZE,
+    width: 16,
+    height: 16,
     borderWidth: 2,
     borderColor: Colors.black_01,
     backgroundColor: Colors.red_03,
-    borderRadius: DOT_SIZE / 2,
+    borderRadius: 8,
   },
   dotSmall: {
-    width: DOT_SMALL_SIZE,
-    height: DOT_SMALL_SIZE,
+    width: 10,
+    height: 10,
     borderWidth: 1,
     borderColor: Colors.black_01,
     backgroundColor: Colors.red_03,
-    borderRadius: DOT_SMALL_SIZE / 2,
-  },
-  dotAnimation: {
-    width: DOT_SIZE,
-    height: DOT_SIZE,
-    borderColor: Colors.black_01,
-    backgroundColor: Colors.red_03,
-    borderRadius: DOT_SIZE / 2,
-    borderWidth: 0,
-  },
-  dotAnimationSmall: {
-    width: DOT_SMALL_SIZE,
-    height: DOT_SMALL_SIZE,
-    borderColor: Colors.black_01,
-    backgroundColor: Colors.red_03,
-    borderRadius: DOT_SMALL_SIZE / 2,
-    borderWidth: 0,
-  },
-  wave: {
-    width: DOT_SIZE,
-    height: DOT_SIZE,
-    borderColor: Colors.black_01,
-    backgroundColor: Colors.red_03,
-    borderRadius: DOT_SIZE / 2,
-    opacity: 0,
-    position: 'absolute',
-    borderWidth: 0,
-  },
-  waveSmall: {
-    width: DOT_SMALL_SIZE,
-    height: DOT_SMALL_SIZE,
-    borderColor: Colors.black_01,
-    backgroundColor: Colors.red_03,
-    borderRadius: DOT_SMALL_SIZE / 2,
-    borderWidth: 0,
-    position: 'absolute',
+    borderRadius: 5,
   },
   ribbon: {
     alignSelf: 'baseline',

package/package.json

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