@momo-kits/foundation 0.92.29-beta.1 → 0.92.29-beta.2

package/Application/Components.tsx

@@ -333,15 +333,7 @@ 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();
-      }
-    );
+    navigator?.maxApi?.dispatchFunction?.('showToolkit', [undefined], () => {});
   };
 
   const onClose = () => {
@@ -385,7 +377,7 @@ const HeaderToolkitAction: React.FC<any> = ({
           onPress={() => {
             navigator?.maxApi?.dispatchFunction?.(
               'onToolAction',
-              [pinTool?.key],
+              {item: pinTool},
               () => {
                 getToolkitConfig();
               }

package/Application/Navigator.ts

@@ -12,7 +12,7 @@ class Navigator {
   toolkitConfig?: HeaderToolkitProps;
   maxApi?: any;
   dismissData?: any;
-  toolkitCallback?: (item: any) => void;
+  toolkitCallback?: (key: string) => void;
 
   constructor(navigation: any, isReady: any) {
     this.ref = navigation;
@@ -78,7 +78,7 @@ class Navigator {
         StackActions.push('Modal', {
           ...params,
           isBottomSheet: true,
-        }),
+        })
       );
     }
   };
@@ -103,7 +103,7 @@ class Navigator {
         CommonActions.navigate({
           name,
           params,
-        }),
+        })
       );
     }
   };
@@ -124,7 +124,7 @@ class Navigator {
               params,
             },
           ],
-        }),
+        })
       );
     }
   };
@@ -141,9 +141,7 @@ class Navigator {
    * set callback function for toolkit
    * @param callback
    */
-  setToolkitCallback = (
-    callback: (item: {key: string; action: string}) => void,
-  ) => {
+  setToolkitCallback = (callback: (key: string) => void) => {
     this.toolkitCallback = callback;
   };
 }

package/Application/StackScreen.tsx

@@ -1,6 +1,6 @@
 import React, {useContext, useEffect, useLayoutEffect, useRef} from 'react';
 import {useHeaderHeight} from '@react-navigation/stack';
-import {InteractionManager, Linking, View} from 'react-native';
+import {Alert, InteractionManager, Linking, View} from 'react-native';
 import {ScreenParams} from './types';
 import Navigation from './Navigation';
 import {ApplicationContext, MiniAppContext, ScreenContext} from './index';
@@ -146,6 +146,8 @@ const StackScreen: React.FC<ScreenParams> = props => {
     }, 5000);
 
     return () => {
+      clearTimeout(tracked.current.timeoutLoad);
+      clearTimeout(tracked.current.timeoutInteraction);
       onScreenLoad();
       onScreenInteraction();
     };
@@ -155,8 +157,10 @@ const StackScreen: React.FC<ScreenParams> = props => {
    * tracking for screen load
    */
   const onScreenLoad = () => {
-    clearTimeout(tracked.current.timeoutLoad);
     if (!tracked.current?.releaseLoad) {
+      if (timeLoad.current === 0) {
+        timeLoad.current = endTime.current - startTime.current;
+      }
       context.autoTracking?.({
         appId: context.appId,
         code: context.code,
@@ -170,6 +174,9 @@ const StackScreen: React.FC<ScreenParams> = props => {
         appId: `auto - ${context.appId}`,
         message: `${screenName} screen_load_time ${timeLoad.current}`,
       });
+      if (timeLoad.current === 0 && context.enableAutoId) {
+        Alert.alert(screenName, "Can't get screen load time");
+      }
       tracked.current.releaseLoad = true;
     }
   };
@@ -178,8 +185,10 @@ const StackScreen: React.FC<ScreenParams> = props => {
    * tracking for screen load
    */
   const onScreenInteraction = () => {
-    clearTimeout(tracked.current.timeoutInteraction);
     if (!tracked.current?.releaseInteraction) {
+      if (timeLoad.current === 0) {
+        timeLoad.current = endTime.current - startTime.current;
+      }
       context.autoTracking?.({
         appId: context.appId,
         code: context.code,
@@ -194,6 +203,12 @@ const StackScreen: React.FC<ScreenParams> = props => {
         appId: `auto - ${context.appId}`,
         message: `${screenName} screen_interaction_time ${timeInteraction.current}`,
       });
+      if (
+        timeInteraction.current - timeLoad.current <= 0 &&
+        context.enableAutoId
+      ) {
+        Alert.alert(screenName, "Can't get screen interaction time");
+      }
       tracked.current.releaseInteraction = true;
     }
   };
@@ -203,12 +218,12 @@ 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;
           });
-          clearTimeout(timeoutLoad.current);
           timeoutLoad.current = setTimeout(() => {
             if (timeLoad.current === 0) {
               timeLoad.current = endTime.current - startTime.current;

package/Input/Input.tsx

@@ -59,6 +59,7 @@ const Input = forwardRef(
       hintText,
       accessibilityLabel,
       editable = true,
+      onPressFloatingIcon,
       ...props
     }: InputProps,
     ref
@@ -189,6 +190,7 @@ const Input = forwardRef(
             disabled={disabled}
             required={required}
             floatingIcon={floatingIcon}
+            onPress={onPressFloatingIcon}
           />
           <View style={styles.inputView}>
             {!!leadingIcon && (

package/Input/InputDropDown.tsx

@@ -12,6 +12,7 @@ const InputDropDown = ({
   value,
   floatingValue,
   floatingIcon,
+  onPressFloatingIcon,
   size = 'small',
   onPress,
   placeholder,
@@ -57,6 +58,7 @@ const InputDropDown = ({
           disabled={disabled}
           required={required}
           floatingIcon={floatingIcon}
+          onPress={onPressFloatingIcon}
         />
         <View style={styles.inputDropDownView}>
           {!!leadingIcon && (

package/Input/InputMoney.tsx

@@ -50,6 +50,7 @@ const InputMoney = forwardRef(
       accessibilityLabel,
       hintText,
       value: _value,
+      onPressFloatingIcon,
       ...props
     }: InputMoneyProps,
     ref
@@ -173,6 +174,7 @@ const InputMoney = forwardRef(
             disabled={disabled}
             required={required}
             floatingIcon={floatingIcon}
+            onPress={onPressFloatingIcon}
           />
           <View style={styles.inputView}>
             <TextInput

package/Input/common.tsx

@@ -1,5 +1,10 @@
 import React, {FC, useContext} from 'react';
-import {View, ViewStyle} from 'react-native';
+import {
+  GestureResponderEvent,
+  TouchableOpacity,
+  View,
+  ViewStyle,
+} from 'react-native';
 import {ApplicationContext} from '../Application';
 import {Theme} from '../Application/types';
 import {Styles} from '../Consts';
@@ -14,6 +19,7 @@ type FloatingViewProps = {
   floatingIcon?: string;
   required?: boolean;
   style?: ViewStyle;
+  onPress?: (e: GestureResponderEvent) => void;
 };
 
 export const DEFAULT_HEIGHT = scaleSize(104);
@@ -81,7 +87,6 @@ export const ErrorView: FC<{
         <Text
           style={Styles.flex}
           color={errorMessage ? errorColor : hintColor}
-          numberOfLines={2}
           typography={'description_default_regular'}>
           {errorMessage ?? hintTextDefault}
         </Text>
@@ -101,6 +106,7 @@ export const FloatingView: FC<FloatingViewProps> = ({
   floatingIcon,
   required,
   style,
+  onPress,
 }) => {
   const {theme} = useContext(ApplicationContext);
 
@@ -133,12 +139,14 @@ export const FloatingView: FC<FloatingViewProps> = ({
           )}
         </Text>
         {!!floatingIcon && (
-          <Icon
-            color={floatingIconTintColor}
-            source={floatingIcon}
-            size={16}
-            style={styles.floatingIcon}
-          />
+          <TouchableOpacity activeOpacity={onPress ? 0.6 : 1} onPress={onPress}>
+            <Icon
+              color={floatingIconTintColor}
+              source={floatingIcon}
+              size={16}
+              style={styles.floatingIcon}
+            />
+          </TouchableOpacity>
         )}
       </View>
     );

package/Input/index.tsx

@@ -1,4 +1,4 @@
-import {TextInputProps, ViewStyle} from 'react-native';
+import {GestureResponderEvent, TextInputProps, ViewStyle} from 'react-native';
 import Input from './Input';
 import InputDropDown from './InputDropDown';
 import InputMoney from './InputMoney';
@@ -116,6 +116,8 @@ export interface InputProps extends TextInputProps {
    * Optional. Represents text below the Input component.
    */
   hintText?: string;
+
+  onPressFloatingIcon?: (e: GestureResponderEvent) => void;
 }
 
 export interface InputTextAreaProps extends Omit<InputProps, 'size'> {

package/package.json

@@ -1,46 +1,46 @@
 {
-    "name": "@momo-kits/foundation",
-    "version": "0.92.29-beta.1",
-    "description": "React Native Component Kits",
-    "main": "index.ts",
-    "scripts": {},
-    "keywords": [
-        "@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://oauth2:5WXQLHPMxxCyvGt_Py4D@gitlab.mservice.com.vn/momo-platform/react-native-bottom-tabs.git",
-        "@react-navigation/core": "5.16.1",
-        "@react-navigation/native": "5.9.8",
-        "@react-navigation/routers": "5.7.4",
-        "lottie-react-native": "git+https://gitlab.mservice.com.vn/momo-platform/momo-lottie-react-native.git",
-        "@react-navigation/stack": "https://oauth2:eX-jVhzQdLc343AjD3Sc@gitlab.mservice.com.vn/momo-platform/react-navigation-stack.git"
-    },
-    "peerDependencies": {
-        "react-native": "*"
-    },
-    "devDependencies": {
-        "@babel/core": "^7.12.9",
-        "@babel/runtime": "^7.12.5",
-        "@react-native-community/eslint-config": "^2.0.0",
-        "@types/jest": "26.0.23",
-        "@types/react-native": "0.64.4",
-        "@types/react-test-renderer": "16.9.2",
-        "@types/d3-shape": "1.3.7",
-        "babel-jest": "^26.6.3",
-        "eslint": "^7.14.0",
-        "jest": "^26.6.3",
-        "metro-react-native-babel-preset": "^0.64.0",
-        "react-test-renderer": "17.0.1",
-        "typescript": "^4.0.3",
-        "@momo-platform/versions": "4.1.11",
-        "react-scanner": "^1.1.0"
-    },
-    "author": "@momo-kits/foundation",
-    "license": "ISC"
+  "name": "@momo-kits/foundation",
+  "version": "0.92.29-beta.2",
+  "description": "React Native Component Kits",
+  "main": "index.ts",
+  "scripts": {},
+  "keywords": [
+    "@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://oauth2:5WXQLHPMxxCyvGt_Py4D@gitlab.mservice.com.vn/momo-platform/react-native-bottom-tabs.git",
+    "@react-navigation/core": "5.16.1",
+    "@react-navigation/native": "5.9.8",
+    "@react-navigation/routers": "5.7.4",
+    "lottie-react-native": "git+https://gitlab.mservice.com.vn/momo-platform/momo-lottie-react-native.git",
+    "@react-navigation/stack": "https://oauth2:eX-jVhzQdLc343AjD3Sc@gitlab.mservice.com.vn/momo-platform/react-navigation-stack.git"
+  },
+  "peerDependencies": {
+    "react-native": "*"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.12.9",
+    "@babel/runtime": "^7.12.5",
+    "@react-native-community/eslint-config": "^2.0.0",
+    "@types/jest": "26.0.23",
+    "@types/react-native": "0.64.4",
+    "@types/react-test-renderer": "16.9.2",
+    "@types/d3-shape": "1.3.7",
+    "babel-jest": "^26.6.3",
+    "eslint": "^7.14.0",
+    "jest": "^26.6.3",
+    "metro-react-native-babel-preset": "^0.64.0",
+    "react-test-renderer": "17.0.1",
+    "typescript": "^4.0.3",
+    "@momo-platform/versions": "4.1.11",
+    "react-scanner": "^1.1.0"
+  },
+  "author": "@momo-kits/foundation",
+  "license": "ISC"
 }

package/publish.sh

@@ -15,7 +15,7 @@ elif [ "$1" == "latest" ]; then
   npm version prerelease --preid=rc
   npm publish --tag latest --access=public
 else
-  npm version $(npm view @momo-kits/foundation@beta version)
+#  npm version $(npm view @momo-kits/foundation@beta version)
   npm version prerelease --preid=beta
   npm publish --tag beta --access=public
 fi