@momo-kits/foundation 0.92.26-beta.23 → 0.92.26-beta.25

package/Application/BottomTab/index.tsx

@@ -17,9 +17,10 @@ const Tab = createBottomTabNavigator();
 const Stack = createStackNavigator();
 
 const TabScreen: React.FC<NavigationScreenProps> = ({route}) => {
+  const {theme} = useContext(ApplicationContext);
   let options = {};
   if (route.params?.options) {
-    options = getOptions(route.params?.options);
+    options = getOptions(route.params?.options, theme);
   }
 
   if (route.params?.nested) {

package/Application/Components.tsx

@@ -1,16 +1,14 @@
 import React, {
-  Ref,
+  Fragment,
   useCallback,
   useContext,
   useEffect,
-  useRef,
   useState,
 } from 'react';
 import {
   Animated,
   BackHandler,
   DeviceEventEmitter,
-  Dimensions,
   StatusBar,
   StyleSheet,
   TouchableOpacity,
@@ -31,17 +29,7 @@ import {scaleSize, Text} from '../Text';
 import {Icon} from '../Icon';
 import {PopupNotify} from '../Popup';
 import {Badge, BadgeDot} from '../Badge';
-import {HeaderType} from '../Layout/types';
-import Navigation from './Navigation';
-import {InputRef, InputSearch, InputSearchProps} from '../Input';
 
-const SCREEN_PADDING = 12;
-const BACK_WIDTH = 28;
-const {width: screenWidth} = Dimensions.get('window');
-
-/**
- * default navigation button used header nav
- */
 const NavigationButton: React.FC<NavigationButtonProps> = ({
   icon,
   tintColor,
@@ -93,18 +81,13 @@ const NavigationButton: React.FC<NavigationButtonProps> = ({
   );
 };
 
-/**
- * default header title used for nav
- */
 const HeaderTitle: React.FC<any> = props => {
   const {theme} = useContext(ApplicationContext);
-  const opacity = props.animatedValue?.interpolate(
-    props.interpolate ?? {
-      inputRange: [0, 200],
-      outputRange: [0, 1],
-      extrapolate: 'clamp',
-    }
-  );
+  const opacity = props.animatedValue?.interpolate({
+    inputRange: [0, 200],
+    outputRange: [0, 1],
+    extrapolate: 'clamp',
+  });
 
   return (
     <Animated.Text
@@ -118,9 +101,6 @@ const HeaderTitle: React.FC<any> = props => {
   );
 };
 
-/**
- * default header left used for nav
- */
 const HeaderLeft: React.FC<HeaderBackProps> = ({
   tintColor,
   preventBack,
@@ -133,7 +113,7 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
   useEffect(() => {
     const backHandler = BackHandler.addEventListener(
       'hardwareBackPress',
-      goBackSafe
+      goBackSafe,
     );
 
     return () => backHandler.remove();
@@ -188,7 +168,6 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
     }
     return true;
   };
-
   return (
     <View style={styles.headerLeft}>
       <NavigationButton
@@ -202,9 +181,6 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
   );
 };
 
-/**
- * header background for default
- */
 const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
   image,
   animatedValue,
@@ -253,10 +229,6 @@ const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
   );
 };
 
-/**
- * Header custom with image, title, subtitle
- * @constructor
- */
 const HeaderCustom: React.FC<TitleCustomProps> = ({
   title,
   subTitle,
@@ -291,42 +263,37 @@ const HeaderCustom: React.FC<TitleCustomProps> = ({
   return <View style={styles.headerTitleContainer}>{content ?? header}</View>;
 };
 
-/**
- * main component for header right
- */
-const HeaderRight: React.FC<any> = ({type, children, onLayout, ...props}) => {
-  if (type === 'icon') {
-    let buttons = props?.buttons || [];
-    if (buttons?.length > 3) {
-      buttons = buttons.slice(0, 3);
+const HeaderRightAction: React.FC<any> = ({children, ...restProps}) => {
+  const validateType = (child: React.ReactElement) => {
+    const valid = child?.type === NavigationButton || child?.type === Fragment;
+    if (__DEV__ && !valid) {
+      console.warn(
+        'HeaderRightAction contains element type of NavigationButton, Please check again.',
+      );
     }
+    return child;
+  };
+
+  const renderAction = () => {
+    if (Array.isArray(children)) {
+      return children.map((child, index) => {
+        return (
+          <View key={`HeaderRightAction ${index}`} style={styles.headerButton}>
+            {React.cloneElement(validateType(child), {...restProps})}
+          </View>
+        );
+      });
+    }
+
     return (
-      <View style={styles.headerRightButton} onLayout={onLayout}>
-        {buttons?.map?.((item: NavigationButtonProps, index: number) => {
-          return (
-            <View
-              key={`HeaderRightAction ${index}`}
-              style={{
-                marginLeft: index !== 0 ? Spacing.S : 0,
-              }}>
-              <NavigationButton {...item} tintColor={props?.tintColor} />
-            </View>
-          );
-        })}
+      <View style={styles.headerButton}>
+        {React.cloneElement(validateType(children), {...restProps})}
       </View>
     );
-  }
-
-  return (
-    <View style={styles.headerRightButton} onLayout={onLayout}>
-      {children ?? <HeaderToolkitAction {...props} />}
-    </View>
-  );
+  };
+  return <View style={styles.headerRightButton}>{renderAction()}</View>;
 };
 
-/**
- * Header toolkit action
- */
 const HeaderToolkitAction: React.FC<any> = ({
   tintColor,
   pinnedTool,
@@ -360,7 +327,7 @@ const HeaderToolkitAction: React.FC<any> = ({
       (config: any) => {
         navigator.toolkitConfig = config;
         setToolConfig(navigator?.toolkitConfig);
-      }
+      },
     );
   };
 
@@ -373,7 +340,7 @@ const HeaderToolkitAction: React.FC<any> = ({
         const {item} = res;
         navigator?.toolkitCallback?.(item);
         getToolkitConfig();
-      }
+      },
     );
   };
 
@@ -390,7 +357,7 @@ const HeaderToolkitAction: React.FC<any> = ({
                 navigator?.maxApi?.dispatchFunction?.(
                   'dismiss',
                   undefined,
-                  undefined
+                  undefined,
                 );
               },
             }}
@@ -421,7 +388,7 @@ const HeaderToolkitAction: React.FC<any> = ({
               [pinTool?.key],
               () => {
                 getToolkitConfig();
-              }
+              },
             );
             navigator?.toolkitCallback?.(pinTool.key);
           }}
@@ -430,7 +397,7 @@ const HeaderToolkitAction: React.FC<any> = ({
   };
   if (toolConfig) {
     return (
-      <View style={Styles.row}>
+      <View style={styles.headerRightButton}>
         {renderPinnedTool()}
         <View
           style={[
@@ -438,7 +405,6 @@ const HeaderToolkitAction: React.FC<any> = ({
             {
               backgroundColor: backgroundColor ?? '#00000066',
               borderWidth: backgroundColor ? 0.5 : 0,
-              marginLeft: renderPinnedTool() ? Spacing.S : 0,
             },
           ]}>
           <TouchableOpacity
@@ -464,9 +430,6 @@ const HeaderToolkitAction: React.FC<any> = ({
   return <View />;
 };
 
-/**
- * default header banner for header animated
- */
 const HeaderAnimated: React.FC<HeaderAnimatedProps> = ({
   animatedValue,
   image,
@@ -507,160 +470,6 @@ const HeaderAnimated: React.FC<HeaderAnimatedProps> = ({
   );
 };
 
-/**
- * Header extended with background image
- * @constructor
- */
-const HeaderExtendHeader: React.FC<{
-  headerType?: HeaderType;
-  animatedValue: Animated.Value;
-  heightHeader: number;
-  inputSearchProps?: InputSearchProps;
-  inputSearchRef?: Ref<InputRef>;
-  navigation?: Navigation;
-}> = ({
-  headerType = 'default',
-  animatedValue,
-  heightHeader,
-  inputSearchProps,
-  inputSearchRef,
-  navigation,
-}) => {
-  const {theme} = useContext(ApplicationContext);
-  const [rightSpace, setRightSpace] = useState(0);
-  const animated = useRef(new Animated.Value(0));
-
-  useEffect(() => {
-    const listener = animatedValue.addListener(({value}) => {
-      animated.current.setValue(value);
-    });
-    return () => {
-      animatedValue?.removeListener(listener);
-    };
-  }, []);
-
-  const height = animated.current.interpolate({
-    inputRange: [0, 100],
-    outputRange: [heightHeader + 52, heightHeader],
-    extrapolate: 'clamp',
-  });
-
-  const translateX = animated.current.interpolate({
-    inputRange: [0, 100],
-    outputRange: [SCREEN_PADDING, BACK_WIDTH + SCREEN_PADDING * 2],
-    extrapolate: 'clamp',
-  });
-
-  if (navigation) {
-    navigation.onHeaderRightChange = (width: number) => {
-      setRightSpace(width);
-    };
-  }
-
-  const renderInputView = (hasColorBG: boolean = false) => {
-    return (
-      <Animated.View
-        style={{
-          justifyContent: 'flex-end',
-          height,
-        }}>
-        <Animated.View
-          style={{
-            transform: [{translateX}],
-            marginVertical: Spacing.S,
-            width: animated.current.interpolate({
-              inputRange: [0, 100],
-              outputRange: [
-                screenWidth - SCREEN_PADDING * 2,
-                screenWidth - SCREEN_PADDING * 3 - BACK_WIDTH - rightSpace,
-              ],
-              extrapolate: 'clamp',
-            }),
-          }}>
-          <InputSearch
-            {...inputSearchProps}
-            ref={inputSearchRef}
-            hasColorBG={hasColorBG}
-            showButtonText={false}
-          />
-        </Animated.View>
-      </Animated.View>
-    );
-  };
-
-  if (inputSearchProps) {
-    if (headerType === 'surface') {
-      return (
-        <>
-          <Animated.View
-            style={[
-              styles.headerBox,
-              {
-                backgroundColor: theme.colors.background.surface,
-                borderBottomWidth: 1,
-                borderColor: theme.colors.border.default,
-                height,
-              },
-            ]}
-          />
-          {renderInputView(true)}
-        </>
-      );
-    }
-
-    if (headerType === 'extended') {
-      return (
-        <>
-          <Animated.View
-            style={[
-              styles.headerBox,
-              {
-                height,
-              },
-            ]}>
-            <Image
-              source={{
-                uri: theme.assets?.headerBackground,
-              }}
-              style={styles.headerBackground}
-            />
-          </Animated.View>
-          {renderInputView()}
-        </>
-      );
-    }
-
-    return (
-      <>
-        <View style={[styles.headerBox, {height: heightHeader}]}>
-          <Image
-            source={{
-              uri: theme.assets?.headerBackground,
-            }}
-            style={styles.headerBackground}
-          />
-        </View>
-        {renderInputView()}
-      </>
-    );
-  }
-
-  if (headerType === 'extended') {
-    return (
-      <View style={{minHeight: heightHeader}}>
-        <Image
-          source={{
-            uri: theme.assets?.headerBackground,
-          }}
-          style={styles.extendedHeader}
-        />
-      </View>
-    );
-  }
-
-  return <View />;
-};
-
 const styles = StyleSheet.create({
   navigationButton: {
     height: 28,
@@ -700,6 +509,7 @@ const styles = StyleSheet.create({
     paddingRight: Spacing.M,
   },
   toolkitContainer: {
+    marginLeft: Spacing.S,
     padding: Spacing.XS,
     height: 28,
     borderRadius: 14,
@@ -731,17 +541,6 @@ const styles = StyleSheet.create({
     top: -Spacing.XS,
     right: -Spacing.XS,
   },
-  extendedHeader: {
-    aspectRatio: 1.75,
-    position: 'absolute',
-    width: '100%',
-    height: 210,
-  },
-  headerBox: {
-    width: '100%',
-    position: 'absolute',
-    overflow: 'hidden',
-  },
 });
 
 export {
@@ -749,9 +548,8 @@ export {
   HeaderTitle,
   HeaderLeft,
   HeaderBackground,
+  HeaderRightAction,
   HeaderToolkitAction,
   HeaderCustom,
   HeaderAnimated,
-  HeaderRight,
-  HeaderExtendHeader,
 };

package/Application/ModalScreen.tsx

@@ -21,10 +21,10 @@ const ModalScreen: React.FC<any> = props => {
 };
 
 const Modal: React.FC<ModalParams> = props => {
-  const {navigator} = useContext(ApplicationContext);
+  const {theme, navigator} = useContext(ApplicationContext);
   const {screen, barrierDismissible} = props.route.params;
   const Component = useRef(screen).current;
-  const navigation = new Navigation(props.navigation);
+  const navigation = new Navigation(props.navigation, theme);
   const params = {
     ...props.route.params,
     navigation,

package/Application/Navigation.ts

@@ -1,13 +1,17 @@
+import React from 'react';
 import {NavigationProp} from '@react-navigation/native';
-import {NavigationOptions} from './types';
+import {NavigationOptions, Theme} from './types';
+import {HeaderRightAction} from './index';
 import {getOptions} from './utils';
+import {HeaderToolkitAction} from './Components';
 
 class Navigation {
   instance: NavigationProp<any>;
-  onHeaderRightChange?: (width: number) => void;
+  readonly theme: Theme;
 
-  constructor(instance: any) {
+  constructor(instance: any, theme: Theme) {
     this.instance = instance;
+    this.theme = theme;
   }
 
   /**
@@ -15,6 +19,16 @@ class Navigation {
    * @param params
    */
   private filterParams = (params: NavigationOptions) => {
+    if (params.headerRight) {
+      const headerRight = params.headerRight?.({}) as React.ReactElement;
+      const type = headerRight?.type;
+      if (type !== HeaderRightAction && type !== HeaderToolkitAction) {
+        console.warn(
+          'headerRight contains element type of HeaderRightAction | HeaderToolkitAction, Please check again.',
+        );
+      }
+    }
+
     if (params.headerLeft) {
       console.warn('headerLeft not allow override render by design system!');
       delete params.headerLeft;
@@ -28,7 +42,7 @@ class Navigation {
    * @param params
    */
   setOptions = (params: NavigationOptions) => {
-    params = getOptions(this.filterParams(params), this);
+    params = getOptions(this.filterParams(params), this.theme);
     this.instance.setOptions(params);
   };
 }

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';
@@ -88,7 +88,7 @@ const EmptyScreen: React.FC = () => {
  * @constructor
  */
 const StackScreen: React.FC<ScreenParams> = props => {
-  const {showGrid, navigator} = useContext(ApplicationContext);
+  const {theme, showGrid, navigator} = useContext(ApplicationContext);
   const startTime = useRef(Date.now());
   const endTime = useRef(Date.now());
   const timeLoad = useRef(0);
@@ -104,7 +104,7 @@ const StackScreen: React.FC<ScreenParams> = props => {
   const context = useContext<any>(MiniAppContext);
 
   const {screen: Component, options, initialParams} = props.route.params;
-  const navigation = new Navigation(props.navigation);
+  const navigation = new Navigation(props.navigation, theme);
   const heightHeader = useHeaderHeight();
 
   const data = {
@@ -122,18 +122,9 @@ const StackScreen: React.FC<ScreenParams> = props => {
    * set options for screen
    */
   useLayoutEffect(() => {
-    let defaultOptions = {
-      headerRight: {
-        type: 'toolkit',
-      },
-    };
     if (options) {
-      defaultOptions = {
-        ...defaultOptions,
-        ...options,
-      };
+      navigation.setOptions(options);
     }
-    navigation.setOptions(defaultOptions);
   }, [options]);
 
   /**
@@ -155,6 +146,8 @@ const StackScreen: React.FC<ScreenParams> = props => {
     }, 5000);
 
     return () => {
+      clearTimeout(tracked.current.timeoutLoad);
+      clearTimeout(tracked.current.timeoutInteraction);
       onScreenLoad();
       onScreenInteraction();
     };
@@ -164,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,
@@ -179,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;
     }
   };
@@ -187,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,
@@ -203,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;
     }
   };
@@ -212,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/Application/index.ts

@@ -5,6 +5,7 @@ import {
   HeaderAnimated,
   HeaderBackground,
   HeaderCustom,
+  HeaderRightAction,
   HeaderTitle,
   NavigationButton,
 } from './Components';
@@ -30,6 +31,7 @@ export {
   NavigationButton,
   HeaderTitle,
   HeaderBackground,
+  HeaderRightAction,
   HeaderCustom,
   HeaderAnimated,
 };

package/Application/types.ts

@@ -146,29 +146,19 @@ export type RuntimeToolType = {
   key: string;
 };
 
-export interface NavigationOptions
-  extends Omit<StackNavigationOptions, 'headerRight'> {
+export interface NavigationOptions extends StackNavigationOptions {
   preventBack?: PopupNotifyProps;
   onPressLeftHeader?: () => void;
   surface?: boolean;
   hiddenBack?: boolean;
   customTitle?: TitleCustomProps;
-  headerRight?: HeaderRightToolkit | HeaderRightActions | any;
+  toolkitParams?: {
+    pinnedTool?: PinnedToolType;
+    runtimeTools?: RuntimeToolType[];
+    preventClose?: PopupNotifyProps;
+  };
 }
 
-export type HeaderRightToolkit = {
-  type?: 'toolkit';
-  pinnedTool?: PinnedToolType;
-  runtimeTools?: RuntimeToolType[];
-  preventClose?: PopupNotifyProps;
-  useMore?: boolean;
-};
-
-export type HeaderRightActions = {
-  type?: 'icon';
-  buttons: NavigationButtonProps[];
-};
-
 export interface HeaderBackProps extends NavigationButtonProps {
   preventBack?: PopupNotifyProps;
   onPressLeftHeader?: () => void;