@momo-kits/foundation 0.77.8-beta.3 → 0.77.8-beta.5

package/Application/BottomTab.tsx

@@ -8,17 +8,27 @@ import {ApplicationContext} from './index';
 
 const Tab = createBottomTabNavigator();
 
-const BottomTab: React.FC<BottomTabProps> = ({tabs, listeners}) => {
+const BottomTab: React.FC<BottomTabProps> = ({tabs, listeners, navigation}) => {
   const {theme} = useContext(ApplicationContext);
+
+  const defaultListener = {
+    focus: (item: any) => {
+      const focusItem = tabs.find(i => item.target.includes(i.name));
+      if (focusItem?.options) {
+        navigation?.setOptions?.(focusItem.options);
+      }
+    },
+  };
+
   return (
-    <Tab.Navigator>
+    <Tab.Navigator backBehavior={'firstRoute'}>
       {tabs.map(item => {
         return (
           <Tab.Screen
             key={item.name}
             name={item.name}
             component={item.screen}
-            listeners={listeners}
+            listeners={listeners ?? defaultListener}
             options={{
               tabBarLabel: ({color, focused}) => {
                 return (

package/Application/ModalScreen.tsx

@@ -1,12 +1,13 @@
-import React, {useContext, useEffect, useMemo, useRef} from 'react';
+import React, {useContext, useEffect, useRef} from 'react';
 import {
+  Dimensions,
   KeyboardAvoidingView,
   Platform,
   Pressable,
   StyleSheet,
   View,
 } from 'react-native';
-import {SafeAreaView, useSafeAreaInsets} from 'react-native-safe-area-context';
+import {SafeAreaView} from 'react-native-safe-area-context';
 import {BottomSheetBackdrop, BottomSheetModal} from '@gorhom/bottom-sheet';
 import Navigation from './Navigation';
 import {BottomSheetParams, ModalParams} from './types';
@@ -84,7 +85,12 @@ const Modal: React.FC<ModalParams> = props => {
 
 const BottomSheet: React.FC<BottomSheetParams> = props => {
   const {theme, navigator} = useContext(ApplicationContext);
-  const {screen, options}: BottomSheetParams = props.route.params;
+  const {height} = Dimensions.get('window');
+  const {
+    screen,
+    options,
+    snapPoints = [height * 0.5, height * 0.9],
+  }: BottomSheetParams = props.route.params;
   const Component = useRef(screen).current;
   const navigation = new Navigation(props.navigation, theme);
   const params = {
@@ -94,11 +100,14 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
 
   delete params.screen;
 
-  const snapPoints = useMemo(() => ['50%', '90%'], []);
-  const {bottom} = useSafeAreaInsets();
   const bottomSheetRef = useRef<any>(null);
   const mountedRef = useRef(true);
 
+  let backgroundColor = theme.colors.background.default;
+  if (options?.surface) {
+    backgroundColor = theme.colors.background.surface;
+  }
+
   useEffect(() => {
     bottomSheetRef.current?.present();
     return () => {
@@ -114,16 +123,11 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     />
   );
 
-  let backgroundColor = theme.colors.background.default;
-  if (options?.surface) {
-    backgroundColor = theme.colors.background.surface;
-  }
-
   return (
     <SafeAreaView style={Styles.flex}>
       <BottomSheetModal
         ref={bottomSheetRef}
-        snapPoints={snapPoints}
+        snapPoints={snapPoints?.map(item => item + 68)}
         onDismiss={() => {
           if (mountedRef.current) {
             navigator?.pop();
@@ -131,9 +135,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
         }}
         handleComponent={null}
         backdropComponent={backdropComponent}>
-        <View
-          style={{paddingBottom: bottom}}
-          accessibilityLabel={'BottomSheet'}>
+        <View accessibilityLabel={'BottomSheet'}>
           <View style={[styles.sheetContainer, {backgroundColor}]}>
             <View style={styles.indicatorContainer}>
               <View

package/Application/types.ts

@@ -108,6 +108,7 @@ export interface ModalParams extends ScreenParams {
 export interface BottomSheetParams extends ScreenParams {
   [key: string]: any;
   onDismiss?: () => void;
+  snapPoints?: ReadonlyArray<number>;
 }
 
 export type NavigationButtonProps = {
@@ -171,10 +172,12 @@ export type BottomTabItemProps = {
   showDot?: boolean;
   badgeLabel?: string;
   screen: Screen;
+  options: NavigationOptions;
 };
 
 export type BottomTabProps = {
   tabs: BottomTabItemProps[];
+  navigation: Navigation;
   listeners?: {
     tabPress?: any;
     focus?: any;

package/Button/index.tsx

@@ -11,6 +11,7 @@ import {Typography} from '../Text/types';
 import {Colors} from '../Consts';
 import styles from './styles';
 import {Icon} from '../Icon';
+import {Loader} from '../Loader';
 
 export interface ButtonProps extends TouchableOpacityProps {
   /**
@@ -55,6 +56,11 @@ export interface ButtonProps extends TouchableOpacityProps {
    */
   useTintColor?: boolean;
 
+  /**
+   *  If true, the icon of button will use be show indicator loading.
+   */
+  loading?: boolean;
+
   /**
    *  A callback function that is called when the button is pressed.
    */
@@ -68,6 +74,7 @@ const Button: FC<ButtonProps> = ({
   full = true,
   iconRight,
   iconLeft,
+  loading = false,
   title = 'Button',
   onPress,
   ...rest
@@ -223,6 +230,19 @@ const Button: FC<ButtonProps> = ({
   const renderTrailing = () => {
     const marginLeft = getIconSpace();
     const color = useTintColor ? getTextColor() : undefined;
+    if (loading) {
+      const iconSize = getIconSize();
+      const color = getTextColor();
+      return (
+        <View
+          style={[
+            styles.trailing,
+            {width: iconSize, height: iconSize, marginLeft},
+          ]}>
+          <Loader type="spinner" color={color} />
+        </View>
+      );
+    }
     if (iconRight) {
       const iconSize = getIconSize();
       return (

package/CheckBox/index.tsx

@@ -36,7 +36,7 @@ const CheckBox: FC<CheckBoxProps> = ({
 
   return (
     <TouchableOpacity
-      accessibilityLabel={`CheckBox/${label}`}
+      accessibilityLabel={`CheckBox/${label}/${value}`}
       activeOpacity={0.8}
       onPress={() => onChange?.(!value)}
       disabled={disabled}

package/CheckBox/styles.ts

@@ -11,5 +11,5 @@ export default StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
   },
-  container: {flexDirection: 'row'},
+  container: {flexDirection: 'row', alignItems: 'center'},
 });

package/Input/Input.tsx

@@ -1,4 +1,4 @@
-import React, {FC, useContext, useEffect, useRef, useState} from 'react';
+import React, {FC, forwardRef, useContext, useRef, useState} from 'react';
 import {
   NativeSyntheticEvent,
   TextInput,
@@ -12,124 +12,144 @@ import {ErrorView, FloatingView, getBorderColor, getSizeStyle} from './common';
 import {InputProps} from './index';
 import {Icon} from '../Icon';
 import {checkTyping} from './utils';
+import {Loader} from '../Loader';
 
-const Input: FC<InputProps> = ({
-  value,
-  onChangeText,
-  floatingValue,
-  floatingIcon,
-  size,
-  placeholder,
-  onBlur,
-  onFocus,
-  errorMessage,
-  icon,
-  disabled,
-  floatingIconColor,
-  iconColor,
-  required,
-  ...props
-}) => {
-  const {theme} = useContext(ApplicationContext);
-  const [focused, setFocused] = useState(false);
-  const [haveValue, setHaveValue] = useState(!!value || !!props.defaultValue);
+const Input: FC<InputProps> = forwardRef(
+  (
+    {
+      value,
+      onChangeText,
+      floatingValue,
+      floatingIcon,
+      size,
+      placeholder,
+      onBlur,
+      onFocus,
+      errorMessage,
+      icon,
+      disabled,
+      floatingIconColor,
+      iconColor,
+      required,
+      errorSpacing,
+      loading,
+      ...props
+    },
+    ref,
+  ) => {
+    const {theme} = useContext(ApplicationContext);
+    const [focused, setFocused] = useState(false);
+    const [haveValue, setHaveValue] = useState(!!value || !!props.defaultValue);
+    const inputRef = (ref as React.RefObject<TextInput>) ?? useRef<TextInput>();
 
-  const inputRef = useRef<any>(null);
+    const onClearText = () => {
+      inputRef?.current?.clear();
+      _onChangeText('');
+    };
 
-  const onClearText = () => {
-    inputRef?.current?.clear();
-    _onChangeText('');
-  };
+    const _onChangeText = (text: string) => {
+      checkTyping(text, haveValue, setHaveValue);
+      onChangeText?.(text);
+    };
 
-  const _onChangeText = (text: string) => {
-    checkTyping(text, haveValue, setHaveValue);
-    onChangeText?.(text);
-  };
+    const _onFocus = (e: NativeSyntheticEvent<TextInputFocusEventData>) => {
+      setFocused(true);
+      onFocus?.(e);
+    };
 
-  const _onFocus = (e: NativeSyntheticEvent<TextInputFocusEventData>) => {
-    setFocused(true);
-    onFocus?.(e);
-  };
+    const _onBlur = (e: NativeSyntheticEvent<TextInputFocusEventData>) => {
+      setFocused(false);
+      onBlur?.(e);
+    };
 
-  const _onBlur = (e: NativeSyntheticEvent<TextInputFocusEventData>) => {
-    setFocused(false);
-    onBlur?.(e);
-  };
+    const renderIcon = (color: string | undefined) => {
+      if (loading) {
+        return <Loader type={'spinner'} color={color} />;
+      }
+      if (icon) {
+        return <Icon color={color} source={icon} size={24} />;
+      }
+    };
 
-  const renderInputView = () => {
-    const disabledColor = theme.colors.text.disable;
-    let textColor = theme.colors.text.default;
-    let placeholderColor = theme.colors.text.hint;
-    let iconTintColor = iconColor;
+    const renderInputView = () => {
+      const disabledColor = theme.colors.text.disable;
+      let textColor = theme.colors.text.default;
+      let placeholderColor = theme.colors.text.hint;
+      let iconTintColor = iconColor;
 
-    if (disabled) {
-      textColor = disabledColor;
-      placeholderColor = disabledColor;
-      iconTintColor = disabledColor;
-    }
+      if (disabled) {
+        textColor = disabledColor;
+        placeholderColor = disabledColor;
+        iconTintColor = disabledColor;
+      }
 
-    return (
-      <View
-        style={[
-          getSizeStyle(size),
-          getBorderColor(focused, errorMessage, disabled),
-          styles.inputWrapper,
-          {backgroundColor: theme.colors.background.surface},
-        ]}>
-        <FloatingView
-          floatingValue={floatingValue}
-          floatingIconColor={floatingIconColor}
-          disabled={disabled}
-          required={required}
-          floatingIcon={floatingIcon}
-        />
-        <View style={styles.inputView}>
-          <TextInput
-            {...props}
-            accessibilityLabel={`TextInput`}
-            editable={!disabled}
-            textAlignVertical="top"
-            ref={inputRef}
-            style={[
-              styles.input,
-              {
-                color: textColor,
-                fontFamily: `${theme.font}-Regular`,
-              },
-            ]}
-            textBreakStrategy="highQuality"
-            value={value}
-            onChangeText={_onChangeText}
-            onFocus={_onFocus}
-            onBlur={_onBlur}
-            placeholder={placeholder}
-            selectionColor={theme.colors.primary}
-            placeholderTextColor={placeholderColor}
+      return (
+        <View
+          style={[
+            styles.inputWrapper,
+            {backgroundColor: theme.colors.background.surface},
+            getSizeStyle(size),
+            getBorderColor(theme, focused, errorMessage, disabled),
+          ]}>
+          <FloatingView
+            floatingValue={floatingValue}
+            floatingIconColor={floatingIconColor}
+            disabled={disabled}
+            required={required}
+            floatingIcon={floatingIcon}
           />
+          <View style={styles.inputView}>
+            <TextInput
+              {...props}
+              accessibilityLabel={`TextInput`}
+              editable={!disabled}
+              textAlignVertical="top"
+              ref={inputRef}
+              style={[
+                styles.input,
+                {
+                  color: textColor,
+                  fontFamily: `${theme.font}-Regular`,
+                },
+              ]}
+              textBreakStrategy="highQuality"
+              value={value}
+              onChangeText={_onChangeText}
+              onFocus={_onFocus}
+              onBlur={_onBlur}
+              placeholder={placeholder}
+              selectionColor={theme.colors.primary}
+              placeholderTextColor={placeholderColor}
+            />
+          </View>
+          <View style={styles.iconView}>
+            {focused && haveValue && (
+              <TouchableOpacity
+                style={styles.iconWrapper}
+                onPress={onClearText}>
+                <Icon
+                  source="24_navigation_close_circle_full"
+                  size={16}
+                  color={theme.colors.text.hint}
+                />
+              </TouchableOpacity>
+            )}
+            {renderIcon(iconTintColor)}
+          </View>
         </View>
-        <View style={styles.iconView}>
-          {focused && haveValue && (
-            <TouchableOpacity style={styles.iconWrapper} onPress={onClearText}>
-              <Icon
-                source="24_navigation_close_circle_full"
-                size={16}
-                color={theme.colors.text.hint}
-              />
-            </TouchableOpacity>
-          )}
-          {!!icon && <Icon color={iconTintColor} source={icon} size={24} />}
-        </View>
+      );
+    };
+
+    return (
+      <View
+        style={styles.wrapper}
+        accessibilityLabel={`Input/${floatingValue}`}>
+        {renderInputView()}
+        <ErrorView errorMessage={errorMessage} errorSpacing={errorSpacing} />
       </View>
     );
-  };
-
-  return (
-    <View style={styles.wrapper} accessibilityLabel={`Input/${floatingValue}`}>
-      {renderInputView()}
-      <ErrorView errorMessage={errorMessage} />
-    </View>
-  );
-};
+  },
+);
 
 Input.defaultProps = {
   size: 'small',