@momo-kits/foundation 0.77.1-optimzie.4 → 0.77.1-optimzie.6

package/Application/BottomTab/BottomTabBar.tsx

@@ -293,21 +293,19 @@ export default function BottomTabBar({
   );
 
   const renderCenterComponent = useCallback(() => {
-    const renderFloatingButton = () => {
-      if (typeof floatingButton?.icon == 'string') {
-        return <Icon source={floatingButton?.icon} size={32} color={'white'} />;
-      } else if (floatingButton?.icon) {
-        return floatingButton?.icon;
-      } else {
-        return null;
-      }
-    };
     if (floatingButton?.icon && state.routes.length !== 4) {
       console.warn(
         "Can't render floating button with icon when routes length is not 4",
       );
       return null;
     }
+    const renderFloatingButton = () => {
+      if (typeof floatingButton?.icon == 'string') {
+        return <Icon source={floatingButton?.icon} size={32} color={'white'} />;
+      }
+      return floatingButton?.icon;
+    };
+
     return (
       <View style={{flex: 1}}>
         <TouchableOpacity
@@ -370,8 +368,6 @@ export default function BottomTabBar({
               }),
             },
           ],
-          // Absolutely position the tab bar so that the content is below it
-          // This is needed to avoid gap at bottom when the tab bar is hidden
           position: isTabBarHidden ? 'absolute' : (null as any),
         },
         {
@@ -430,8 +426,8 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     height: 48,
     width: 48,
-    borderRadius: 100,
-    top: -12,
+    borderRadius: 24,
+    top: -10,
   },
   indicator: {
     height: 2,

package/Application/BottomTab/index.tsx

@@ -10,21 +10,26 @@ import {Text} from '../../Text';
 import {ApplicationContext} from '../index';
 import StackScreen from '../StackScreen';
 import {BottomTabProps, NavigationScreenProps} from '../types';
-import {getStackOptions} from '../utils';
+import {getOptions, getStackOptions} from '../utils';
 import BottomTabBar from './BottomTabBar';
 
 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, theme);
+  }
   if (route.params?.nested) {
     return (
       <Stack.Navigator>
         <Stack.Screen
           name="Stack"
           component={StackScreen}
-          initialParams={{screen: route.params?.screen}}
-          options={{...getStackOptions(), ...route.params?.options}}
+          initialParams={{screen: route.params?.screen, options}}
+          options={{...getStackOptions()}}
         />
       </Stack.Navigator>
     );
@@ -35,7 +40,7 @@ const TabScreen: React.FC<NavigationScreenProps> = ({route}) => {
         <Stack.Screen
           name="Stack"
           component={StackScreen}
-          initialParams={{screen: route.params?.screen}}
+          initialParams={{screen: route.params?.screen, options}}
           options={{...getStackOptions(), ...route.params?.options}}
         />
       </Stack.Navigator>
@@ -83,6 +88,8 @@ const BottomTab: React.FC<BottomTabProps> = ({
         },
       }}>
       {tabs.map(item => {
+        const isNum = !isNaN(parseInt(`${item?.badgeLabel}`));
+        const isDot = typeof item?.badgeLabel == 'string' && !item?.badgeLabel;
         return (
           <Tab.Screen
             key={item.name}
@@ -113,12 +120,9 @@ const BottomTab: React.FC<BottomTabProps> = ({
                 fontWeight: 'bold',
                 alignSelf: 'center',
                 fontFamily: `${theme.font}-Bold`,
-                left: item?.showDot ? 8 : 4,
-                top: item?.showDot ? -2 : -6,
-                backgroundColor:
-                  typeof item?.badgeLabel === 'string'
-                    ? Colors.orange_03
-                    : Colors.red_03,
+                left: isDot ? 8 : 4,
+                top: isDot ? -2 : -6,
+                backgroundColor: isNum ? Colors.orange_03 : Colors.red_03,
               },
               tabBarIcon: ({color}) => (
                 <Icon source={item.icon} color={color} size={28} />

package/Application/Components.tsx

@@ -183,15 +183,18 @@ const HeaderLeft: React.FC<HeaderBackProps> = ({
 
 const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
   image,
-  backgroundColor,
   animatedValue,
-  useBorder = false,
+  useSurface = false,
 }) => {
   const {theme} = useContext(ApplicationContext);
   let headerImage = theme.assets?.headerBackground;
+  let backgroundColor;
   if (image === null) {
     headerImage = undefined;
   }
+  if (useSurface) {
+    backgroundColor = theme.colors.background.surface;
+  }
   const opacity = animatedValue?.interpolate({
     inputRange: [0, 114],
     outputRange: [0, 1],
@@ -203,9 +206,9 @@ const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
       style={[
         Styles.flex,
         {
-          backgroundColor: backgroundColor ?? theme.colors.background.default,
+          backgroundColor,
           overflow: 'hidden',
-          borderBottomWidth: useBorder ? 1 : 0,
+          borderBottomWidth: useSurface ? 1 : 0,
           borderColor: theme.colors.border.default,
           opacity,
         },

package/Application/ModalScreen.tsx

@@ -90,6 +90,7 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
     options,
     footerComponent,
     flatListProps,
+    backgroundColor,
   }: BottomSheetParams = props.route.params;
 
   const navigation = new Navigation(props.navigation, theme);
@@ -127,6 +128,9 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
           options?.title ?? options?.customTitle?.title ?? '',
           handleClose,
         )}
+        modalStyle={{
+          backgroundColor: backgroundColor ?? theme.colors.background.surface,
+        }}
         FooterComponent={footerDefault(footerComponent)}>
         <View style={styles.bottomSheetContainer}>
           <Screen {...props} {...params} />
@@ -141,7 +145,7 @@ const headerDefault = (title: string, onClose: () => void) => {
     <View style={styles.header}>
       <Text
         style={styles.textOption}
-        numberOfLines={2}
+        numberOfLines={1}
         typography="header_default_bold">
         {title ?? ''}
       </Text>
@@ -154,16 +158,18 @@ const headerDefault = (title: string, onClose: () => void) => {
 
 const footerDefault = (footerComponent: React.ReactNode) => {
   const insets = useSafeAreaInsets();
-  if (!footerComponent) return;
-  return (
-    <View
-      style={{
-        marginBottom: Math.min(insets.bottom, 21) + Spacing.S,
-        paddingHorizontal: 12,
-      }}>
-      {footerComponent}
-    </View>
-  );
+  if (footerComponent) {
+    return (
+      <View
+        style={{
+          marginBottom: Math.min(insets.bottom, 21),
+          paddingHorizontal: Spacing.M,
+          paddingVertical: Spacing.S,
+        }}>
+        {footerComponent}
+      </View>
+    );
+  }
 };
 
 const styles = StyleSheet.create({
@@ -204,9 +210,6 @@ const styles = StyleSheet.create({
   },
   bottomSheetContainer: {
     width: '100%',
-    backgroundColor: 'white',
-    borderTopRightRadius: 16,
-    borderTopLeftRadius: 16,
   },
   header: {
     height: 50,
@@ -219,15 +222,9 @@ const styles = StyleSheet.create({
     color: '#303233',
     textAlign: 'center',
     fontWeight: 'bold',
-    paddingHorizontal: 60,
-  },
-  imageOption: {
-    height: 1,
-    backgroundColor: '#ebebeb',
-    width: '100%',
-    position: 'absolute',
-    bottom: 1,
+    paddingHorizontal: Spacing.L,
   },
+
   buttonClose: {
     padding: 12,
     position: 'absolute',

package/Application/types.ts

@@ -119,6 +119,7 @@ export interface ModalParams extends ScreenParams {
 export interface BottomSheetParams extends ScreenParams {
   [key: string]: any;
   onDismiss?: () => void;
+  backgroundColor?: string;
   footerComponent?: React.ReactNode;
   flatListProps?: FlatListProps<any>;
 }
@@ -165,9 +166,8 @@ export interface HeaderBackProps extends NavigationButtonProps {
 
 export type HeaderBackgroundProps = {
   image?: string | null;
-  backgroundColor?: string | null;
   animatedValue?: Animated.Value;
-  useBorder?: boolean;
+  useSurface?: boolean;
 };
 
 export type TitleCustomProps = {
@@ -223,4 +223,5 @@ export type FloatingButtonProps = {
 export type AnimatedHeader = {
   type: 'default' | 'surface';
   component?: (props?: any) => React.ReactElement;
+  headerTitle?: (props?: any) => React.ReactElement;
 };

package/Application/utils.tsx

@@ -100,11 +100,7 @@ const getOptions = (params: NavigationOptions, theme: Theme) => {
         ...options,
         headerTintColor: theme.colors.text.default,
         headerBackground: () => (
-          <HeaderBackground
-            image={null}
-            backgroundColor={theme.colors.background.surface}
-            useBorder={true}
-          />
+          <HeaderBackground image={null} useSurface={true} />
         ),
       };
     } else {

package/Button/index.tsx

@@ -58,7 +58,7 @@ export interface ButtonProps extends TouchableOpacityProps {
   /**
    *  If true, the icon of button will use the tint color provided by its container.
    */
-  useTintColor?: boolean;
+  tintColor?: string;
 
   /**
    *  If true, the icon of button will use be show indicator loading.
@@ -76,7 +76,7 @@ export interface ButtonProps extends TouchableOpacityProps {
 const Button: FC<ButtonProps> = ({
   type = 'primary',
   size = 'large',
-  useTintColor = true,
+  tintColor = null,
   full = true,
   iconRight,
   iconLeft,
@@ -231,7 +231,7 @@ const Button: FC<ButtonProps> = ({
   const renderLeading = () => {
     const iconSize = getIconSize();
     const marginRight = getIconSpace();
-    const color = useTintColor ? getTextColor() : undefined;
+    const color = tintColor ?? getTextColor();
 
     if (loading) {
       return (
@@ -245,7 +245,7 @@ const Button: FC<ButtonProps> = ({
               borderRadius: Spacing.M,
             },
           ]}>
-          <Loader type="spinner" color={color} />
+          <Loader type="spinner" color={getTextColor()} />
         </View>
       );
     }
@@ -266,7 +266,7 @@ const Button: FC<ButtonProps> = ({
    * render trailing
    */
   const renderTrailing = () => {
-    const color = useTintColor ? getTextColor() : undefined;
+    const color = tintColor ?? getTextColor();
     const marginLeft = getIconSpace();
 
     if (iconRight) {

package/Input/InputMoney.tsx

@@ -76,7 +76,6 @@ const InputMoney = forwardRef(
         clear: onClearText,
         focus: () => inputRef.current?.focus(),
         blur: () => inputRef.current?.blur(),
-        changeText: (text: string) => _onChangeText(text),
         setText: _onChangeText,
       };
     });

package/Input/common.tsx

@@ -16,13 +16,6 @@ type FloatingViewProps = {
   style?: ViewStyle;
 };
 
-export interface InputRef {
-  focus: () => void;
-  blur: () => void;
-  clear: () => void;
-  setText: (text: string) => void;
-}
-
 export const DEFAULT_HEIGHT = scaleSize(104);
 export const MAX_LENGTH = 300;
 

package/Input/index.tsx

@@ -6,6 +6,13 @@ import InputOTP from './InputOTP';
 import InputSearch from './InputSearch';
 import InputTextArea from './InputTextArea';
 
+export interface InputRef {
+  focus: () => void;
+  blur: () => void;
+  clear: () => void;
+  setText: (text: string) => void;
+}
+
 export interface InputProps extends TextInputProps {
   /**
    *  Optional. Defines the size of the Input component.

package/Layout/FloatingButton.tsx

@@ -45,7 +45,7 @@ export const FloatingButton: React.FC<FloatingButtonProps> = ({
     if (!label) return;
 
     const listener = animatedValue?.addListener(({value}) => {
-      if (value !== lastOffset.current) {
+      if (value !== lastOffset.current && value > 0) {
         const direction = value > lastOffset.current ? 'down' : 'up';
         lastOffset.current = value;
         if (lastDirection.current !== direction) {

package/Layout/Screen.tsx

@@ -89,6 +89,10 @@ export interface ScreenProps extends ViewProps {
    */
   floatingButtonProps?: Omit<FloatingButtonProps, 'animatedValue' | 'bottom'>;
 
+  /**
+   * optional animated value
+   */
+  animatedValue?: Animated.Value;
   /**
    * Optional. If `true`, the screen content is using grid layout by span.
    */
@@ -111,10 +115,13 @@ const Screen = forwardRef(
       headerType = 'default',
       floatingButtonProps,
       useGridLayout = true,
+      animatedValue: animated,
     }: ScreenProps,
     ref,
   ) => {
-    const animatedValue = useRef<Animated.Value>(new Animated.Value(0));
+    const animatedValue = useRef<Animated.Value>(
+      animated ?? new Animated.Value(0),
+    );
     const {theme} = useContext(ApplicationContext);
     const insets = useSafeAreaInsets();
     const heightHeader = useHeaderHeight();
@@ -151,18 +158,27 @@ const Screen = forwardRef(
         };
         if (animatedHeader.type == 'surface') {
           styleAnimatedHeader = {
-            headerTransparent: true,
+            ...styleAnimatedHeader,
             headerBackground: (props: any) => (
               <HeaderBackground
                 {...props}
                 image={null}
-                backgroundColor={theme.colors.background.surface}
-                useBorder={true}
+                useSurface={true}
                 animatedValue={animatedValue.current}
               />
             ),
           };
         }
+        if (animatedHeader.headerTitle) {
+          styleAnimatedHeader = {
+            ...styleAnimatedHeader,
+            headerTitle: (props: any) =>
+              animatedHeader.headerTitle?.({
+                ...props,
+                animatedValue: animatedValue.current,
+              }),
+          };
+        }
         navigation?.setOptions(styleAnimatedHeader);
       }
     }, [animatedHeader]);
@@ -185,12 +201,7 @@ const Screen = forwardRef(
               headerShown: true,
               headerTintColor: theme.colors.text.default,
               headerBackground: (props: any) => (
-                <HeaderBackground
-                  {...props}
-                  image={null}
-                  backgroundColor={theme.colors.background.surface}
-                  useBorder={true}
-                />
+                <HeaderBackground {...props} image={null} useSurface={true} />
               ),
               headerTitle: (props: any) => <HeaderTitle {...props} />,
             };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.77.1-optimzie.4",
+    "version": "0.77.1-optimzie.6",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},