@momo-kits/foundation 0.77.1-optimzie.5 → 0.77.1-optimzie.7

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

@@ -193,7 +193,7 @@ const HeaderBackground: React.FC<HeaderBackgroundProps> = ({
     headerImage = undefined;
   }
   if (useSurface) {
-    backgroundColor = theme.colors.background.default;
+    backgroundColor = theme.colors.background.surface;
   }
   const opacity = animatedValue?.interpolate({
     inputRange: [0, 114],

package/Application/ModalScreen.tsx

@@ -85,11 +85,13 @@ const Modal: React.FC<ModalParams> = props => {
 
 const BottomSheet: React.FC<BottomSheetParams> = props => {
   const {theme, navigator} = useContext(ApplicationContext);
+  const insets = useSafeAreaInsets();
+
   const {
     screen: Screen,
     options,
     footerComponent,
-    flatListProps,
+    scrollViewProps,
     backgroundColor,
   }: BottomSheetParams = props.route.params;
 
@@ -101,14 +103,59 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   };
 
   delete params.screen;
-  const modalizeRef = useRef<Modalize>(null);
+  const modalRef = useRef<Modalize>(null);
 
   useEffect(() => {
-    modalizeRef.current?.open();
+    modalRef.current?.open();
   }, []);
 
   const handleClose = () => {
-    modalizeRef?.current?.close();
+    modalRef?.current?.close();
+  };
+
+  /**
+   * build header
+   * @param title
+   * @param onClose
+   */
+  const headerDefault = (title: string, onClose: () => void) => {
+    return (
+      <View
+        style={[
+          styles.header,
+          {borderBottomColor: theme.colors.border.default},
+        ]}>
+        <View style={styles.iconButton} />
+        <Text
+          style={styles.textOption}
+          numberOfLines={1}
+          typography="header_default_bold">
+          {title ?? ''}
+        </Text>
+        <TouchableOpacity style={styles.iconButton} onPress={onClose}>
+          <Icon source="navigation_close" />
+        </TouchableOpacity>
+      </View>
+    );
+  };
+
+  /**
+   * build footer
+   * @param footerComponent
+   */
+  const footerDefault = (footerComponent: React.ReactNode) => {
+    if (footerComponent) {
+      return (
+        <View
+          style={{
+            marginBottom: Math.min(insets.bottom, 21),
+            paddingHorizontal: Spacing.M,
+            paddingVertical: Spacing.S,
+          }}>
+          {footerComponent}
+        </View>
+      );
+    }
   };
 
   return (
@@ -121,9 +168,12 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
         onClosed={() => {
           navigator?.pop();
         }}
-        ref={modalizeRef}
-        withHandle={false}
-        flatListProps={flatListProps}
+        handlePosition="inside"
+        withHandle={true}
+        disableScrollIfPossible={true}
+        modalTopOffset={insets.top}
+        ref={modalRef}
+        scrollViewProps={scrollViewProps}
         HeaderComponent={headerDefault(
           options?.title ?? options?.customTitle?.title ?? '',
           handleClose,
@@ -140,40 +190,6 @@ const BottomSheet: React.FC<BottomSheetParams> = props => {
   );
 };
 
-const headerDefault = (title: string, onClose: () => void) => {
-  return (
-    <View style={styles.header}>
-      <Text
-        style={styles.textOption}
-        numberOfLines={1}
-        typography="header_default_bold">
-        {title ?? ''}
-      </Text>
-      <TouchableOpacity style={styles.buttonClose} onPress={onClose}>
-        <Icon source="navigation_close" />
-      </TouchableOpacity>
-    </View>
-  );
-};
-
-const footerDefault = (footerComponent: React.ReactNode) => {
-  const insets = useSafeAreaInsets();
-  return (
-    <View
-      style={{
-        marginBottom: Math.min(insets.bottom, 21),
-        paddingHorizontal: 12,
-      }}>
-      {footerComponent && (
-        <>
-          {footerComponent}
-          <View style={{height: Spacing.S}} />
-        </>
-      )}
-    </View>
-  );
-};
-
 const styles = StyleSheet.create({
   container: {flex: 1, flexDirection: 'row'},
   modalContent: {
@@ -214,10 +230,12 @@ const styles = StyleSheet.create({
     width: '100%',
   },
   header: {
-    height: 50,
+    marginTop: 10,
+    height: 56,
     width: '100%',
     alignItems: 'center',
-    justifyContent: 'center',
+    flexDirection: 'row',
+    borderBottomWidth: 1,
   },
   textOption: {
     fontSize: 16,
@@ -225,12 +243,14 @@ const styles = StyleSheet.create({
     textAlign: 'center',
     fontWeight: 'bold',
     paddingHorizontal: Spacing.L,
+    flex: 1,
   },
-
-  buttonClose: {
-    padding: 12,
-    position: 'absolute',
-    right: 0,
+  iconButton: {
+    width: 24,
+    height: 24,
+    alignItems: 'center',
+    justifyContent: 'center',
+    marginHorizontal: Spacing.M,
   },
   icon: {
     width: 24,

package/Application/types.ts

@@ -1,6 +1,6 @@
 import {StackNavigationOptions} from '@react-navigation/stack';
 import React from 'react';
-import {Animated, FlatListProps, ViewProps} from 'react-native';
+import {Animated, ScrollViewProps, ViewProps} from 'react-native';
 import {PopupNotifyProps} from '../Popup/types';
 import Navigation from './Navigation';
 import Navigator from './Navigator';
@@ -121,7 +121,7 @@ export interface BottomSheetParams extends ScreenParams {
   onDismiss?: () => void;
   backgroundColor?: string;
   footerComponent?: React.ReactNode;
-  flatListProps?: FlatListProps<any>;
+  scrollViewProps?: ScrollViewProps;
 }
 
 export type NavigationButtonProps = {

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/package.json

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