@momo-kits/foundation 0.81.51-beta.0 → 0.81.52

package/Application/{BottomTab/index.tsx → BottomTab.tsx}

@@ -1,39 +1,28 @@
-import {createBottomTabNavigator} from '@react-navigation/bottom-tabs';
-import {NavigationContainer} from '@react-navigation/native';
-import {createStackNavigator} from '@react-navigation/stack';
 import React, {useContext, useEffect} from 'react';
 import {Platform} from 'react-native';
+import {BottomTabProps, NavigationScreenProps} from './types';
+import {createBottomTabNavigator} from '@react-navigation/bottom-tabs';
+import {createStackNavigator} from '@react-navigation/stack';
 import {useSafeAreaInsets} from 'react-native-safe-area-context';
-import {Colors} from '../../Consts';
-import {Icon} from '../../Icon';
-import {Text} from '../../Text';
-import {ApplicationContext} from '../index';
-import StackScreen from '../StackScreen';
-import {BottomTabProps, NavigationScreenProps} from '../types';
-import {getOptions, getStackOptions} from '../utils';
-import BottomTabBar from './BottomTabBar';
+import {NavigationContainer} from '@react-navigation/native';
+import {Icon} from '../Icon';
+import {Text} from '../Text';
+import {ApplicationContext} from './index';
+import {getStackOptions} from './utils';
+import StackScreen from './StackScreen';
 
 const Tab = createBottomTabNavigator();
 const Stack = createStackNavigator();
 
 const TabScreen: React.FC<NavigationScreenProps> = ({route}) => {
-  let options = {};
-  if (route.params?.options) {
-    options = getOptions(route.params?.options);
-  }
-
   if (route.params?.nested) {
     return (
       <Stack.Navigator>
         <Stack.Screen
           name="Stack"
           component={StackScreen}
-          initialParams={{
-            screen: route.params?.screen,
-            options,
-            initialParams: route.params?.initialParams,
-          }}
-          options={{...getStackOptions()}}
+          initialParams={{screen: route.params?.screen}}
+          options={{...getStackOptions(), ...route.params?.options}}
         />
       </Stack.Navigator>
     );
@@ -44,25 +33,19 @@ const TabScreen: React.FC<NavigationScreenProps> = ({route}) => {
         <Stack.Screen
           name="Stack"
           component={StackScreen}
-          initialParams={{
-            screen: route.params?.screen,
-            options,
-            initialParams: route.params?.initialParams,
-          }}
+          initialParams={{screen: route.params?.screen}}
           options={{...getStackOptions(), ...route.params?.options}}
         />
       </Stack.Navigator>
     </NavigationContainer>
   );
 };
-
 const BottomTab: React.FC<BottomTabProps> = ({
   nested,
   tabs,
   listeners,
   navigation,
   initialRouteName,
-  floatingButton,
 }) => {
   const {theme} = useContext(ApplicationContext);
   const insets = useSafeAreaInsets();
@@ -79,28 +62,23 @@ const BottomTab: React.FC<BottomTabProps> = ({
     <Tab.Navigator
       initialRouteName={initialRouteName}
       backBehavior={'firstRoute'}
-      tabBar={props => (
-        <BottomTabBar {...props} floatingButton={floatingButton} />
-      )}
       tabBarOptions={{
         style: {
-          height: 64 + Math.min(insets.bottom, 21),
+          height: 68 + Math.min(insets.bottom, 21),
         },
         tabStyle: {
           height: 68,
-          paddingVertical: 10,
+          paddingVertical: 8,
         },
       }}>
       {tabs.map(item => {
-        const isNum = !isNaN(parseInt(`${item?.badgeLabel}`));
-        const isDot = typeof item?.badgeLabel === 'string' && !item?.badgeLabel;
         return (
           <Tab.Screen
             key={item.name}
             name={item.name}
             component={TabScreen}
             initialParams={{...item, nested}}
-            listeners={item.listeners ?? listeners}
+            listeners={listeners}
             options={{
               tabBarLabel: ({color, focused}) => {
                 return (
@@ -109,8 +87,7 @@ const BottomTab: React.FC<BottomTabProps> = ({
                     typography={
                       focused ? 'label_xs_medium' : 'description_xs_regular'
                     }
-                    color={color}
-                    style={{width: '90%', textAlign: 'center'}}>
+                    color={color}>
                     {item.label}
                   </Text>
                 );
@@ -124,9 +101,8 @@ const BottomTab: React.FC<BottomTabProps> = ({
                 fontWeight: 'bold',
                 alignSelf: 'center',
                 fontFamily: `${theme.font}-Bold`,
-                left: isDot ? 8 : 4,
-                top: isDot ? -2 : -6,
-                backgroundColor: isNum ? Colors.red_03 : Colors.orange_03,
+                left: item?.showDot ? 8 : 4,
+                top: item?.showDot ? -2 : -6,
               },
               tabBarIcon: ({color}) => (
                 <Icon source={item.icon} color={color} size={28} />