@momo-kits/foundation 0.92.6-rc.25 → 0.92.6-rc.27

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>

package/Application/ModalScreen.tsx

@@ -158,20 +158,18 @@ const headerDefault = (title: string, onClose: () => void) => {
 
 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>
-  );
+  if (footerComponent) {
+    return (
+      <View
+        style={{
+          marginBottom: Math.min(insets.bottom, 21),
+          paddingHorizontal: Spacing.M,
+          paddingVertical: Spacing.S,
+        }}>
+        {footerComponent}
+      </View>
+    );
+  }
 };
 
 const styles = StyleSheet.create({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/foundation",
-    "version": "0.92.6-rc.25",
+    "version": "0.92.6-rc.27",
     "description": "React Native Component Kits",
     "main": "index.ts",
     "scripts": {},