Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@
"@react-native-firebase/app": "23.1.0",
"@react-native-firebase/messaging": "23.1.0",
"@react-native-google-signin/google-signin": "11.0.1",
"@react-navigation/bottom-tabs": "7.3.3",
Comment thread
MounirDhahri marked this conversation as resolved.
"@react-navigation/elements": "2.3.1",
"@react-navigation/material-top-tabs": "7.2.10",
"@react-navigation/native": "7.1.17",
"@react-navigation/native-stack": "7.3.3",
"@react-navigation/stack": "7.3.3",
"@react-navigation/bottom-tabs": "7.4.8",
"@react-navigation/elements": "2.6.5",
"@react-navigation/material-top-tabs": "7.3.8",
"@react-navigation/native": "7.1.18",
"@react-navigation/native-stack": "7.3.27",
"@react-navigation/stack": "7.4.9",
"@rnmapbox/maps": "10.1.44",
"@segment/analytics-react-native": "2.20.3",
"@segment/analytics-react-native-plugin-braze": "0.6.1",
Expand Down Expand Up @@ -186,7 +186,7 @@
"react-native-reanimated-zoom": "0.3.3",
"react-native-render-html": "6.3.4",
"react-native-safe-area-context": "5.4.1",
"react-native-screens": "4.11.1",
"react-native-screens": "^4.16.0",
Comment thread
MounirDhahri marked this conversation as resolved.
Outdated
"react-native-shake": "6.7.8",
"react-native-share": "12.0.9",
"react-native-svg": "15.12.0",
Expand Down Expand Up @@ -305,7 +305,7 @@
"json5": "2.2.3",
"lint-staged": "13.2.3",
"ora": "5.4.0",
"patch-package": "6.4.7",
"patch-package": "^8.0.1",
Comment thread
MounirDhahri marked this conversation as resolved.
Outdated
"pod-install": "0.3.10",
"postinstall-prepare": "1.0.1",
"prettier": "3.1.1",
Expand Down
80 changes: 0 additions & 80 deletions patches/@react-navigation+bottom-tabs+7.3.3.patch

This file was deleted.

35 changes: 35 additions & 0 deletions patches/@react-navigation+bottom-tabs+7.4.8.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
diff --git a/node_modules/@react-navigation/bottom-tabs/lib/module/views/BottomTabBar.js b/node_modules/@react-navigation/bottom-tabs/lib/module/views/BottomTabBar.js
index cb4e310..ecacb80 100644
--- a/node_modules/@react-navigation/bottom-tabs/lib/module/views/BottomTabBar.js
+++ b/node_modules/@react-navigation/bottom-tabs/lib/module/views/BottomTabBar.js
@@ -123,6 +123,7 @@ export function BottomTabBar({
tabBarShowLabel,
tabBarLabelPosition,
tabBarHideOnKeyboard = false,
+ tabBarVisible = false,
tabBarVisibilityAnimationConfig,
tabBarVariant = 'uikit',
tabBarStyle,
@@ -140,7 +141,7 @@ export function BottomTabBar({
}
const isKeyboardShown = useIsKeyboardShown();
const onHeightChange = React.useContext(BottomTabBarHeightCallbackContext);
- const shouldShowTabBar = !(tabBarHideOnKeyboard && isKeyboardShown);
+ const shouldShowTabBar = !(tabBarHideOnKeyboard && isKeyboardShown) && !tabBarVisible;
const visibilityAnimationConfigRef = React.useRef(tabBarVisibilityAnimationConfig);
React.useEffect(() => {
visibilityAnimationConfigRef.current = tabBarVisibilityAnimationConfig;
@@ -241,8 +242,12 @@ export function BottomTabBar({
translateY: visible.interpolate({
inputRange: [0, 1],
outputRange: [layout.height + insets[tabBarPosition === 'top' ? 'top' : 'bottom'] + StyleSheet.hairlineWidth, 0]
- })
+ }),
}],
+ opacity: visible.interpolate({
+ inputRange: [0, 1],
+ outputRange: [0, 1]
+ }),
// 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' : undefined
Loading