@momo-kits/foundation 0.77.8 → 0.78.1

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.
    */
@@ -62,13 +68,14 @@ export interface ButtonProps extends TouchableOpacityProps {
 }
 
 const Button: FC<ButtonProps> = ({
-  type,
-  size,
-  useTintColor,
-  full,
+  type = 'primary',
+  size = 'large',
+  useTintColor = true,
+  full = true,
   iconRight,
   iconLeft,
-  title,
+  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 (
@@ -266,13 +286,4 @@ const Button: FC<ButtonProps> = ({
   );
 };
 
-Button.defaultProps = {
-  type: 'primary',
-  size: 'large',
-  full: true,
-  disabled: false,
-  title: 'Button',
-  useTintColor: true,
-};
-
 export {Button};

package/CheckBox/index.tsx

@@ -6,41 +6,46 @@ import {ApplicationContext} from '../Application';
 import {Text} from '../Text';
 import {Icon} from '../Icon';
 
-const CheckBox: FC<CheckBoxProps> = props => {
+const CheckBox: FC<CheckBoxProps> = ({
+  value,
+  disabled,
+  onChange,
+  style,
+  label,
+  indeterminate,
+}) => {
   const {theme} = useContext(ApplicationContext);
-  const {value, disabled, onChange, style, label, indeterminated} = props;
+  const haveValue = value || indeterminate;
+  const iconSource = indeterminate ? 'ic_minus' : 'ic_checked';
+  let borderColor = theme.colors.text.default;
+  let backgroundColor = theme.colors.background.surface;
 
-  const haveValue = value || indeterminated;
-  let borderColor = haveValue
-    ? theme.colors.primary
-    : theme.colors.text.default;
-  let backgroundColor = haveValue
-    ? theme.colors.primary
-    : theme.colors.background.surface;
-
-  let iconSource = indeterminated ? 'ic_minus' : 'ic_checked';
+  if (haveValue) {
+    borderColor = theme.colors.primary;
+    backgroundColor = theme.colors.primary;
+  }
 
   if (disabled) {
-    borderColor = haveValue
-      ? theme.colors.background.tonal
-      : theme.colors.border.disable;
-    backgroundColor = haveValue
-      ? theme.colors.background.tonal
-      : theme.colors.background.surface;
+    borderColor = theme.colors.border.disable;
+    backgroundColor = theme.colors.background.surface;
+    if (haveValue) {
+      borderColor = theme.colors.background.tonal;
+      backgroundColor = theme.colors.background.tonal;
+    }
   }
-  const checkboxStyle = {borderColor, backgroundColor, borderWidth: 1};
 
-  const onChangeValue = () => {
-    onChange?.(!value);
-  };
   return (
     <TouchableOpacity
-      accessibilityLabel={`CheckBox/${label}`}
+      accessibilityLabel={`CheckBox/${label}/${value}`}
       activeOpacity={0.8}
-      onPress={onChangeValue}
+      onPress={() => onChange?.(!value)}
       disabled={disabled}
       style={[style, styles.container]}>
-      <View style={[checkboxStyle, styles.checkbox]}>
+      <View
+        style={[
+          {borderColor, backgroundColor, borderWidth: 1},
+          styles.checkbox,
+        ]}>
         {haveValue && (
           <Icon
             color={theme.colors.background.surface}

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/CheckBox/types.ts

@@ -28,7 +28,7 @@ export type CheckBoxProps = {
    * which is typically used to represent a "mixed" or "partial" selection state.
    * Defaults to `false` if not provided.
    */
-  indeterminated?: boolean;
+  indeterminate?: boolean;
 
   /**
    * Optional. Used to apply custom styling to the CheckBox component.

package/Consts/styles.ts

@@ -47,32 +47,6 @@ const Styles = StyleSheet.create({
     alignItems: 'flex-end',
     justifyContent: 'center',
   },
-  //paddingHorizontal
-  paddingHorizontal4: {
-    paddingHorizontal: 4,
-  },
-  paddingHorizontal8: {
-    paddingHorizontal: 8,
-  },
-  paddingHorizontal16: {
-    paddingHorizontal: 16,
-  },
-  paddingHorizontal24: {
-    paddingHorizontal: 24,
-  },
-  //paddingVertical
-  paddingVertical4: {
-    paddingVertical: 4,
-  },
-  paddingVertical8: {
-    paddingVertical: 8,
-  },
-  paddingVertical16: {
-    paddingVertical: 16,
-  },
-  paddingVertical24: {
-    paddingVertical: 24,
-  },
 });
 
 export {Styles};

package/Divider/index.tsx

@@ -1,6 +1,7 @@
 import React, {useContext} from 'react';
 import {View} from 'react-native';
 import {ApplicationContext} from '../Application';
+import {Spacing} from '../Consts';
 
 const Divider = () => {
   const {theme} = useContext(ApplicationContext);
@@ -11,6 +12,7 @@ const Divider = () => {
         height: 1,
         width: '100%',
         backgroundColor: theme.colors.border.default,
+        marginVertical: Spacing.XS,
       }}
     />
   );

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',