@momo-kits/foundation 0.92.26-beta.24 → 0.92.26-beta.26

package/Application/StackScreen.tsx

@@ -158,6 +158,9 @@ const StackScreen: React.FC<ScreenParams> = props => {
    */
   const onScreenLoad = () => {
     if (!tracked.current?.releaseLoad) {
+      if (timeLoad.current === 0) {
+        timeLoad.current = endTime.current - startTime.current;
+      }
       context.autoTracking?.({
         appId: context.appId,
         code: context.code,
@@ -171,7 +174,7 @@ const StackScreen: React.FC<ScreenParams> = props => {
         appId: `auto - ${context.appId}`,
         message: `${screenName} screen_load_time ${timeLoad.current}`,
       });
-      if (timeLoad.current === 0) {
+      if (timeLoad.current === 0 && context.enableAutoId) {
         Alert.alert(screenName, "Can't get screen load time");
       }
       tracked.current.releaseLoad = true;
@@ -183,6 +186,9 @@ const StackScreen: React.FC<ScreenParams> = props => {
    */
   const onScreenInteraction = () => {
     if (!tracked.current?.releaseInteraction) {
+      if (timeLoad.current === 0) {
+        timeLoad.current = endTime.current - startTime.current;
+      }
       context.autoTracking?.({
         appId: context.appId,
         code: context.code,
@@ -197,7 +203,10 @@ const StackScreen: React.FC<ScreenParams> = props => {
         appId: `auto - ${context.appId}`,
         message: `${screenName} screen_interaction_time ${timeInteraction.current}`,
       });
-      if (timeInteraction.current - timeLoad.current <= 0) {
+      if (
+        timeInteraction.current - timeLoad.current <= 0 &&
+        context.enableAutoId
+      ) {
         Alert.alert(screenName, "Can't get screen interaction time");
       }
       tracked.current.releaseInteraction = true;

package/Input/Input.tsx

@@ -1,5 +1,6 @@
 import React, {
   forwardRef,
+  ReactNode,
   useContext,
   useImperativeHandle,
   useRef,
@@ -121,22 +122,26 @@ const Input = forwardRef(
         );
       }
       if (icon || trailing) {
-        const trailingValue = icon || trailing;
-        if (trailingValue?.includes('_') || trailingValue?.includes('http')) {
+        const renderIconTouchable = (icon: ReactNode) => {
           return (
             <TouchableOpacity
-              onPress={onPressIcon}
-              disabled={!onPressIcon}
+              onPress={onPressTrailing ?? onPressIcon}
               style={styles.icon}>
-              <Icon
-                color={color}
-                source={(icon || trailing) as string}
-                size={24}
-              />
+              {icon}
             </TouchableOpacity>
           );
+        };
+        const trailingValue = icon || trailing;
+        if (trailingValue?.includes('_') || trailingValue?.includes('http')) {
+          return renderIconTouchable(
+            <Icon
+              color={color}
+              source={(icon || trailing) as string}
+              size={24}
+            />
+          );
         }
-        return (
+        return renderIconTouchable(
           <Text
             typography="action_xs_bold"
             color={color ?? theme.colors.primary}
@@ -155,7 +160,7 @@ const Input = forwardRef(
       const secure = secureTextInput && secureTextEntry;
       let textColor = theme.colors.text.default;
       let placeholderColor = theme.colors.text.hint;
-      let iconTintColor = iconColor;
+      let iconTintColor = trailingColor ?? iconColor;
 
       if (disabled) {
         textColor = disabledColor;

package/Input/InputDropDown.tsx

@@ -1,4 +1,4 @@
-import React, {useContext} from 'react';
+import React, {ReactNode, useContext} from 'react';
 import {TextInput, TouchableOpacity, View} from 'react-native';
 import {ApplicationContext, ComponentContext} from '../Application';
 import {Styles} from '../Consts';
@@ -20,7 +20,7 @@ const InputDropDown = ({
   icon = 'arrow_chevron_down_small',
   iconColor,
   onPressIcon,
-  trailing,
+  trailing = 'arrow_chevron_down_small',
   trailingColor,
   onPressTrailing,
   disabled = false,
@@ -46,24 +46,23 @@ const InputDropDown = ({
     if (loading) {
       return <Loader type={'spinner'} color={color} style={styles.icon} />;
     }
-
     if (icon || trailing) {
-      const trailingValue = icon || trailing;
-      if (trailingValue?.includes('_') || trailingValue?.includes('http')) {
+      const renderIconTouchable = (icon: ReactNode) => {
         return (
           <TouchableOpacity
-            onPress={onPressIcon}
-            disabled={!onPressIcon}
+            onPress={onPressTrailing ?? onPressIcon}
             style={styles.icon}>
-            <Icon
-              color={color}
-              source={(icon || trailing) as string}
-              size={24}
-            />
+            {icon}
           </TouchableOpacity>
         );
+      };
+      const trailingValue = icon || trailing;
+      if (trailingValue?.includes('_') || trailingValue?.includes('http')) {
+        return renderIconTouchable(
+          <Icon color={color} source={(icon || trailing) as string} size={24} />
+        );
       }
-      return (
+      return renderIconTouchable(
         <Text
           typography="action_xs_bold"
           color={color ?? theme.colors.primary}
@@ -81,7 +80,7 @@ const InputDropDown = ({
     const disabledColor = theme.colors.text.disable;
     let textColor = theme.colors.text.default;
     let placeholderColor = theme.colors.text.hint;
-    let iconTintColor = iconColor;
+    let iconTintColor = trailingColor ?? iconColor;
 
     if (disabled) {
       textColor = disabledColor;

package/Input/InputMoney.tsx

@@ -1,5 +1,6 @@
 import React, {
   forwardRef,
+  ReactNode,
   useContext,
   useEffect,
   useImperativeHandle,
@@ -116,22 +117,26 @@ const InputMoney = forwardRef(
       }
 
       if (icon || trailing) {
-        const trailingValue = icon || trailing;
-        if (trailingValue?.includes('_') || trailingValue?.includes('http')) {
+        const renderIconTouchable = (icon: ReactNode) => {
           return (
             <TouchableOpacity
-              onPress={onPressIcon}
-              disabled={!onPressIcon}
+              onPress={onPressTrailing ?? onPressIcon}
               style={styles.icon}>
-              <Icon
-                color={color}
-                source={(icon || trailing) as string}
-                size={24}
-              />
+              {icon}
             </TouchableOpacity>
           );
+        };
+        const trailingValue = icon || trailing;
+        if (trailingValue?.includes('_') || trailingValue?.includes('http')) {
+          return renderIconTouchable(
+            <Icon
+              color={color}
+              source={(icon || trailing) as string}
+              size={24}
+            />
+          );
         }
-        return (
+        return renderIconTouchable(
           <Text
             typography="action_xs_bold"
             color={color ?? theme.colors.primary}
@@ -146,7 +151,7 @@ const InputMoney = forwardRef(
       const disabledColor = theme.colors.text.disable;
       let textColor = theme.colors.text.default;
       let placeholderColor = theme.colors.text.hint;
-      let iconTintColor = iconColor;
+      let iconTintColor = trailingColor ?? iconColor;
 
       if (disabled) {
         textColor = disabledColor;

package/Input/InputSearch.tsx

@@ -125,8 +125,7 @@ const InputSearch = forwardRef(
           {!!(icon || trailing) && (
             <TouchableOpacity
               style={Styles.row}
-              disabled={!!onPressTrailing}
-              onPress={onPressTrailing}>
+              onPress={onPressTrailing ?? onPressIcon}>
               <View
                 style={[
                   styles.divider,

package/package.json

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

package/verify.js

@@ -19,6 +19,12 @@ const miniInfo = JSON.parse(fs.readFileSync(miniJson, 'utf8'));
 const iOSAppTarget = appInfo?.client?.ios.deploymentTarget;
 const androidAppTarget = appInfo?.client?.android.deploymentTarget;
 
+if (
+  miniInfo?.dependencies?.['@momo-platform/momo-core']?.includes('optimize')
+) {
+  return;
+}
+
 if (packageVersion > iOSAppTarget || packageVersion > androidAppTarget) {
   throw new Error(
     `\x1b[41m Package ${packageInfo.name} version: ${packageInfo.version} require deploymentTarget ${packageVersion}`