@momo-kits/foundation 0.80.7 → 0.80.8-beta.10

package/Application/Components.tsx

@@ -1,4 +1,4 @@
-import React, {useContext, useEffect, useState} from 'react';
+import React, {Fragment, useContext, useEffect, useState} from 'react';
 import {
   Alert,
   Animated,
@@ -6,14 +6,15 @@ import {
   Platform,
   StatusBar,
   StyleSheet,
+  TouchableOpacity,
   View,
-  TouchableOpacity as TouchableRN,
 } from 'react-native';
 import {TouchableOpacity as TouchableGesture} from 'react-native-gesture-handler';
 import {ApplicationContext} from './index';
 import {Colors, Radius, Spacing, Styles} from '../Consts';
 import {Image} from '../Image';
 import {
+  HeaderAnimatedProps,
   HeaderBackgroundProps,
   HeaderBackProps,
   HeaderToolkitProps,
@@ -24,7 +25,8 @@ import {scaleSize, Text} from '../Text';
 import {Icon} from '../Icon';
 import {PopupNotify} from '../Popup';
 
-const Touchable = Platform.OS === 'android' ? TouchableGesture : TouchableRN;
+const Touchable =
+  Platform.OS === 'android' ? TouchableGesture : TouchableOpacity;
 
 const styles = StyleSheet.create({
   navigationButton: {
@@ -271,22 +273,23 @@ const HeaderCustom: React.FC<TitleCustomProps> = ({
 };
 
 const HeaderRightAction: React.FC<any> = ({children, ...restProps}) => {
-  const validType = (item: any) => {
-    if (__DEV__ && item.type !== NavigationButton) {
+  const validateType = (child: React.ReactElement) => {
+    const valid = child?.type === NavigationButton || child?.type == Fragment;
+    if (__DEV__ && !valid) {
       Alert.alert(
         'Rule',
         'HeaderRightAction contains element type of NavigationButton, Please check again.',
       );
-      return <View />;
     }
-    return item;
+    return child;
   };
+
   const renderAction = () => {
     if (Array.isArray(children)) {
       return children.map((child, index) => {
         return (
-          <View key={index} style={styles.headerButton}>
-            {React.cloneElement(validType(child), {...restProps})}
+          <View key={`HeaderRightAction ${index}`} style={styles.headerButton}>
+            {React.cloneElement(validateType(child), {...restProps})}
           </View>
         );
       });
@@ -294,7 +297,7 @@ const HeaderRightAction: React.FC<any> = ({children, ...restProps}) => {
 
     return (
       <View style={styles.headerButton}>
-        {React.cloneElement(validType(children), {...restProps})}
+        {React.cloneElement(validateType(children), {...restProps})}
       </View>
     );
   };
@@ -415,6 +418,41 @@ const HeaderToolkitAction: React.FC<any> = ({tintColor}) => {
   return <View />;
 };
 
+const HeaderAnimated: React.FC<HeaderAnimatedProps> = ({
+  animatedValue,
+  image,
+  onPress,
+}) => {
+  const scale = animatedValue.interpolate({
+    inputRange: [-300, 0, 300],
+    outputRange: [2, 1, 1],
+    extrapolate: 'clamp',
+  });
+  const opacity = animatedValue.interpolate({
+    inputRange: [0, 150, 300],
+    outputRange: [1, 0.5, 0],
+    extrapolate: 'clamp',
+  });
+
+  return (
+    <TouchableOpacity onPress={onPress}>
+      <Animated.View
+        style={{
+          aspectRatio: 1.75,
+          opacity: opacity,
+          transform: [{scale: scale}],
+        }}>
+        <Image
+          source={{
+            uri: image,
+          }}
+          style={{width: '100%', height: '100%'}}
+        />
+      </Animated.View>
+    </TouchableOpacity>
+  );
+};
+
 export {
   NavigationButton,
   HeaderTitle,
@@ -423,4 +461,5 @@ export {
   HeaderRightAction,
   HeaderToolkitAction,
   HeaderCustom,
+  HeaderAnimated,
 };

package/Application/ModalScreen.tsx

@@ -193,6 +193,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
                       />
                     );
                   },
+                  headerTintColor: theme.colors.text.default,
                   headerBackground: () => (
                     <HeaderBackground backgroundColor={backgroundColor} />
                   ),

package/Application/Navigation.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import {NavigationProp} from '@react-navigation/native';
 import {Alert} from 'react-native';
 import {NavigationOptions, Theme} from './types';
@@ -16,7 +17,7 @@ class Navigation {
 
   private filterParams = (params: NavigationOptions) => {
     if (params.headerRight) {
-      const headerRight = params.headerRight?.();
+      const headerRight = params.headerRight?.({}) as React.ReactElement;
       const type = headerRight?.type;
       if (type !== HeaderRightAction && type !== HeaderToolkitAction) {
         Alert.alert(

package/Application/NavigationContainer.tsx

@@ -93,12 +93,12 @@ const NavigationContainer: React.FC<NavigationContainerProps> = ({
                 name="Stack"
                 component={StackScreen}
                 initialParams={{screen}}
-                options={{...getStackOptions(theme), ...options}}
+                options={{...getStackOptions(), ...options}}
               />
               <Stack.Screen
                 name="Dialog"
                 component={StackScreen}
-                options={getDialogOptions(theme)}
+                options={getDialogOptions()}
                 initialParams={{screen}}
               />
               <Stack.Screen

package/Application/index.ts

@@ -1,24 +1,31 @@
 import {NavigationContainer} from './NavigationContainer';
 import Screen from '../Layout/Screen';
 import {
-  HeaderRightAction,
   NavigationButton,
-  HeaderToolkitAction,
   HeaderTitle,
+  HeaderLeft,
+  HeaderBackground,
+  HeaderRightAction,
+  HeaderToolkitAction,
+  HeaderCustom,
+  HeaderAnimated,
 } from './Components';
 import BottomTab from './BottomTab';
 import {createContext} from 'react';
 import {defaultContext} from '../Consts';
 
 const ApplicationContext = createContext(defaultContext);
-
 export {
   NavigationContainer,
   ApplicationContext,
   Screen,
+  BottomTab,
   NavigationButton,
+  HeaderTitle,
+  HeaderLeft,
+  HeaderBackground,
   HeaderRightAction,
   HeaderToolkitAction,
-  HeaderTitle,
-  BottomTab,
+  HeaderCustom,
+  HeaderAnimated,
 };

package/Application/types.ts

@@ -1,4 +1,5 @@
 import {Animated} from 'react-native';
+import {StackNavigationOptions} from '@react-navigation/stack';
 import React from 'react';
 import Navigator from './Navigator';
 import {PopupNotifyProps} from '../Popup/types';
@@ -119,19 +120,15 @@ export type NavigationButtonProps = {
   accessibilityLabel?: string;
 };
 
-export type NavigationOptions = {
+export interface NavigationOptions extends StackNavigationOptions {
   preventBack?: PopupNotifyProps;
   onPressLeftHeader?: () => void;
   surface?: boolean;
-  headerTransparent?: boolean;
   hiddenBack?: boolean;
-  title?: string;
-  headerTitle?: (props?: any) => React.ReactElement;
   headerTitleAlign?: 'left' | 'center';
   customTitle?: TitleCustomProps;
-  headerRight?: (props?: any) => React.ReactElement;
   animatedValue?: Animated.Value;
-};
+}
 
 export interface HeaderBackProps extends NavigationButtonProps {
   preventBack?: PopupNotifyProps;
@@ -164,6 +161,12 @@ export type HeaderToolkitProps = {
   onAction?: (action: string) => void;
 };
 
+export type HeaderAnimatedProps = {
+  animatedValue: Animated.Value;
+  image: string;
+  onPress?: () => void;
+};
+
 export type BottomTabItemProps = {
   name: string;
   label: string;

package/Application/utils.tsx

@@ -13,35 +13,24 @@ import {
 import {NavigationOptions, Theme} from './types';
 import {Colors} from '../Consts';
 
-const getTintColor = (theme: Theme): any => {
-  if (theme.assets?.headerBackground) {
-    return {
-      headerTintColor: Colors.black_01,
-    };
-  }
-  return {
-    headerTintColor: theme.colors.text.default,
-  };
-};
-
-const getStackOptions = (theme: Theme): StackNavigationOptions => {
+const getStackOptions = (): StackNavigationOptions => {
   return {
     headerTitleAlign: 'left',
     headerTitle: HeaderTitle,
-    headerBackground: HeaderBackground,
+    headerBackground: (props: any) => <HeaderBackground {...props} />,
     headerLeft: (props: any) => <HeaderLeft {...props} />,
     headerRight: (props: any) => <HeaderToolkitAction {...props} />,
-    ...getTintColor(theme),
+    headerTintColor: Colors.black_01,
   };
 };
 
-const getDialogOptions = (theme: Theme): StackNavigationOptions => {
+const getDialogOptions = (): StackNavigationOptions => {
   return {
     headerTitleAlign: 'left',
     headerTitle: HeaderTitle,
     headerLeft: (props: any) => <HeaderLeft {...props} />,
-    headerBackground: HeaderBackground,
-    ...getTintColor(theme),
+    headerBackground: (props: any) => <HeaderBackground {...props} />,
+    headerTintColor: Colors.black_01,
     ...TransitionPresets.ModalTransition,
   };
 };
@@ -72,54 +61,47 @@ const getModalOptions = (): StackNavigationOptions => {
 };
 
 const getOptions = (params: NavigationOptions, theme: Theme) => {
-  let backgroundProps = {};
-  let titleProps = {};
   let options = {};
 
-  if (typeof params.onPressLeftHeader === 'function') {
+  if (
+    typeof params.onPressLeftHeader === 'function' ||
+    params.preventBack !== undefined ||
+    typeof params.hiddenBack === 'boolean'
+  ) {
     options = {
       ...options,
-      headerLeft: (props: any) => (
-        <HeaderLeft
-          {...props}
-          preventBack={params.preventBack}
-          onPressLeftHeader={params.onPressLeftHeader}
-        />
-      ),
+      headerLeft: params.hiddenBack
+        ? null
+        : (props: any) => (
+            <HeaderLeft
+              {...props}
+              preventBack={params.preventBack}
+              onPressLeftHeader={params.onPressLeftHeader}
+            />
+          ),
     };
   }
 
-  if (params.preventBack) {
-    options = {
-      ...options,
-      headerLeft: (props: any) => (
-        <HeaderLeft {...props} preventBack={params.preventBack} />
-      ),
-    };
-  }
-
-  if (params.surface == true) {
-    options = {
-      ...options,
-      ...getTintColor({
-        ...theme,
-        assets: {...theme.assets, headerBackground: undefined},
-      }),
-    };
-    backgroundProps = {
-      ...backgroundProps,
-      image: null,
-      backgroundColor: theme.colors.background.surface,
-      useBorder: true,
-    };
-  } else {
-    backgroundProps = {};
-    options = {...options, ...getTintColor(theme)};
-  }
-
-  if (params.animatedValue) {
-    backgroundProps = {...backgroundProps, animatedValue: params.animatedValue};
-    titleProps = {...titleProps, animatedValue: params.animatedValue};
+  if (typeof params.surface == 'boolean') {
+    if (params.surface) {
+      options = {
+        ...options,
+        headerTintColor: theme.colors.text.default,
+        headerBackground: () => (
+          <HeaderBackground
+            image={null}
+            backgroundColor={theme.colors.background.surface}
+            useBorder={true}
+          />
+        ),
+      };
+    } else {
+      options = {
+        ...options,
+        headerTintColor: Colors.black_01,
+        headerBackground: HeaderBackground,
+      };
+    }
   }
 
   if (params.customTitle) {
@@ -130,26 +112,11 @@ const getOptions = (params: NavigationOptions, theme: Theme) => {
         return <HeaderCustom {...params.customTitle} {...props} />;
       },
     };
-  } else if (!params.headerTitle) {
-    options = {
-      ...options,
-      headerTitle: (props: any) => {
-        return <HeaderTitle {...titleProps} {...props} />;
-      },
-    };
-  }
-
-  if (params.hiddenBack) {
-    options = {
-      ...options,
-      headerLeft: null,
-    };
   }
 
   return {
     ...params,
     ...options,
-    headerBackground: () => <HeaderBackground {...backgroundProps} />,
   };
 };
 

package/Input/Input.tsx

@@ -35,6 +35,7 @@ const Input = forwardRef(
       loading,
       leadingIcon,
       leadingIconColor,
+      style,
       ...props
     }: InputProps,
     ref,
@@ -43,6 +44,7 @@ const Input = forwardRef(
     const [focused, setFocused] = useState(false);
     const [haveValue, setHaveValue] = useState(!!value || !!props.defaultValue);
     const inputRef = (ref as React.RefObject<TextInput>) ?? useRef<TextInput>();
+    const accessibilityLabel = `Input/${floatingValue ?? placeholder}`;
 
     const onClearText = () => {
       inputRef?.current?.clear();
@@ -112,7 +114,7 @@ const Input = forwardRef(
             )}
             <TextInput
               {...props}
-              accessibilityLabel={`TextInput`}
+              accessibilityLabel={accessibilityLabel}
               editable={!disabled}
               textAlignVertical="center"
               ref={inputRef}
@@ -153,8 +155,8 @@ const Input = forwardRef(
 
     return (
       <View
-        style={styles.wrapper}
-        accessibilityLabel={`Input/${floatingValue}`}>
+        style={[style, styles.wrapper]}
+        accessibilityLabel={accessibilityLabel}>
         {renderInputView()}
         <ErrorView errorMessage={errorMessage} errorSpacing={errorSpacing} />
       </View>

package/Input/InputDropDown.tsx

@@ -1,4 +1,4 @@
-import React, {forwardRef, useContext, useRef} from 'react';
+import React, {useContext} from 'react';
 import {TextInput, TouchableOpacity, View} from 'react-native';
 import {ApplicationContext} from '../Application';
 import styles from './styles';
@@ -8,117 +8,113 @@ import {Icon} from '../Icon';
 import {Loader} from '../Loader';
 import {Styles} from '../Consts';
 
-const InputDropDown = forwardRef(
-  (
-    {
-      value,
-      floatingValue,
-      floatingIcon,
-      size,
-      onPress,
-      placeholder,
-      errorMessage,
-      icon = 'arrow_chevron_down_small',
-      disabled,
-      floatingIconColor,
-      iconColor,
-      required,
-      errorSpacing,
-      loading,
-      leadingIcon,
-      leadingIconColor,
-      ...props
-    }: InputDropDownProps,
-    ref,
-  ) => {
-    const {theme} = useContext(ApplicationContext);
-    const inputRef = (ref as React.RefObject<TextInput>) ?? useRef<TextInput>();
-    const full = !!value || !!placeholder;
-    const renderIcon = (color: string | undefined) => {
-      if (loading) {
-        return <Loader type={'spinner'} color={color} />;
-      }
-      if (icon) {
-        return <Icon color={color} source={icon} size={24} />;
-      }
-    };
+const InputDropDown = ({
+  value,
+  floatingValue,
+  floatingIcon,
+  size,
+  onPress,
+  placeholder,
+  errorMessage,
+  icon = 'arrow_chevron_down_small',
+  disabled,
+  floatingIconColor,
+  iconColor,
+  required,
+  errorSpacing,
+  loading,
+  leadingIcon,
+  leadingIconColor,
+  style,
+  ...props
+}: InputDropDownProps) => {
+  const {theme} = useContext(ApplicationContext);
+  const full = !!value || !!placeholder;
+  const accessibilityLabel = `InputDropDown/${floatingValue ?? placeholder}`;
 
-    const renderInputView = () => {
-      const disabledColor = theme.colors.text.disable;
-      let textColor = theme.colors.text.default;
-      let placeholderColor = theme.colors.text.hint;
-      let iconTintColor = iconColor;
+  const renderIcon = (color: string | undefined) => {
+    if (loading) {
+      return <Loader type={'spinner'} color={color} />;
+    }
+    if (icon) {
+      return <Icon color={color} source={icon} size={24} />;
+    }
+  };
 
-      if (disabled) {
-        textColor = disabledColor;
-        placeholderColor = disabledColor;
-        iconTintColor = disabledColor;
-      }
+  const renderInputView = () => {
+    const disabledColor = theme.colors.text.disable;
+    let textColor = theme.colors.text.default;
+    let placeholderColor = theme.colors.text.hint;
+    let iconTintColor = iconColor;
 
-      return (
-        <View
-          style={[
-            styles.inputWrapper,
-            {backgroundColor: theme.colors.background.surface},
-            getSizeStyle(size),
-            getBorderColor(theme, false, errorMessage, disabled),
-          ]}>
-          <FloatingView
-            floatingValue={floatingValue}
-            floatingIconColor={floatingIconColor}
-            disabled={disabled}
-            required={required}
-            floatingIcon={floatingIcon}
-          />
-          <View style={full ? styles.inputView : Styles.row}>
-            {!!leadingIcon && (
-              <View style={styles.leadingIconContainer}>
-                <Icon
-                  color={leadingIconColor}
-                  source={leadingIcon}
-                  size={size === 'small' ? 24 : 32}
-                />
-              </View>
-            )}
-            {full && (
-              <TextInput
-                {...props}
-                onPressIn={onPress}
-                accessibilityLabel={`TextInput`}
-                editable={false}
-                textAlignVertical="top"
-                ref={inputRef}
-                style={[
-                  styles.input,
-                  {
-                    color: textColor,
-                    fontFamily: `${theme.font}-Regular`,
-                  },
-                ]}
-                textBreakStrategy="highQuality"
-                value={value}
-                placeholder={placeholder}
-                selectionColor={theme.colors.primary}
-                placeholderTextColor={placeholderColor}
-              />
-            )}
-          </View>
-          <View style={styles.iconView}>{renderIcon(iconTintColor)}</View>
-        </View>
-      );
-    };
+    if (disabled) {
+      textColor = disabledColor;
+      placeholderColor = disabledColor;
+      iconTintColor = disabledColor;
+    }
 
     return (
-      <TouchableOpacity
-        onPress={onPress}
-        style={full && styles.wrapper}
-        accessibilityLabel={`InputDropDown/${floatingValue}`}>
-        {renderInputView()}
-        <ErrorView errorMessage={errorMessage} errorSpacing={errorSpacing} />
-      </TouchableOpacity>
+      <View
+        style={[
+          styles.inputWrapper,
+          {backgroundColor: theme.colors.background.surface},
+          getSizeStyle(size),
+          getBorderColor(theme, false, errorMessage, disabled),
+        ]}>
+        <FloatingView
+          floatingValue={floatingValue}
+          floatingIconColor={floatingIconColor}
+          disabled={disabled}
+          required={required}
+          floatingIcon={floatingIcon}
+        />
+        <View style={full ? styles.inputView : Styles.row}>
+          {!!leadingIcon && (
+            <View style={styles.leadingIconContainer}>
+              <Icon
+                color={leadingIconColor}
+                source={leadingIcon}
+                size={size === 'small' ? 24 : 32}
+              />
+            </View>
+          )}
+          {full && (
+            <TextInput
+              {...props}
+              onPressIn={onPress}
+              accessibilityLabel={accessibilityLabel}
+              editable={false}
+              textAlignVertical="top"
+              style={[
+                styles.input,
+                {
+                  color: textColor,
+                  fontFamily: `${theme.font}-Regular`,
+                },
+              ]}
+              textBreakStrategy="highQuality"
+              value={value}
+              placeholder={placeholder}
+              selectionColor={theme.colors.primary}
+              placeholderTextColor={placeholderColor}
+            />
+          )}
+        </View>
+        <View style={styles.iconView}>{renderIcon(iconTintColor)}</View>
+      </View>
     );
-  },
-);
+  };
+
+  return (
+    <TouchableOpacity
+      onPress={onPress}
+      style={[style, full && styles.wrapper]}
+      accessibilityLabel={accessibilityLabel}>
+      {renderInputView()}
+      <ErrorView errorMessage={errorMessage} errorSpacing={errorSpacing} />
+    </TouchableOpacity>
+  );
+};
 
 InputDropDown.defaultProps = {
   size: 'small',