diff --git a/front/Navigation.tsx b/front/Navigation.tsx index 3b1bad3..9e31343 100644 --- a/front/Navigation.tsx +++ b/front/Navigation.tsx @@ -51,7 +51,7 @@ const Tabs = () => { key={'route-' + routeIndex} name={name} options={{ ...route.options, headerTransparent: true }} - component={RouteToScreen(route.component)} + component={route.component} /> ))} diff --git a/front/utils/navigator.tsx b/front/utils/navigator.tsx index 1dea477..922646b 100644 --- a/front/utils/navigator.tsx +++ b/front/utils/navigator.tsx @@ -22,7 +22,7 @@ import { BottomTabView } from '@react-navigation/bottom-tabs'; import { Screen, Header, getHeaderTitle, SafeAreaProviderCompat } from '@react-navigation/elements'; import ScaffoldMobileCC from '../components/UI/ScaffoldMobileCC'; -import { useBreakpointValue } from 'native-base'; +import { useBreakpointValue, useTheme } from 'native-base'; import ScaffoldDesktopCC from '../components/UI/ScaffoldDesktopCC'; type Props = DefaultNavigatorOptions< @@ -84,7 +84,7 @@ function BottomTabNavigator({ state={state} navigation={navigation} descriptors={descriptors} - sceneContainerStyle={sceneContainerStyle} + sceneContainerStyle={[sceneContainerStyle, { backgroundColor: "transparent" }]} /> ) : ( @@ -102,7 +102,7 @@ function BottomTabNavigator({ descriptor.navigation as BottomTabNavigationProp, options: descriptor.options, })} - style={sceneContainerStyle} + style={[sceneContainerStyle, { backgroundColor: "transparent" }]} > {descriptor.render()}