Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2524,7 +2524,7 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- RNScreens (4.11.1):
- RNScreens (4.16.0):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -3416,7 +3416,7 @@ SPEC CHECKSUMS:
RNPermissions: 92430517fd4353d5b2b7217cd1ca48ddd2875245
RNReactNativeHapticFeedback: 7601768ee65ffc86fc93d7c30dd917031144ed3d
RNReanimated: 7fe194cef376e772f1efbad325cb5d26ea3930df
RNScreens: 62fdbbc4c984150b34c36f095c6ba2510ca9b6a5
RNScreens: 0cba9551497bcf6ceaa75878c08f5cb9a2fac6a4
RNSentry: 892426b4ab3a4259e7e30bf14c5b231ba3c774a2
RNShare: ef61d9be34bf9881d515851d0710a023cdc4f0f4
RNSVG: 4d6e9f0087980e36e14e1739b9c1760e63de5b8c
Expand Down
14 changes: 7 additions & 7 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",
"@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",
"react-native-shake": "6.7.8",
"react-native-share": "12.0.9",
"react-native-svg": "15.12.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,80 +1,83 @@
diff --git a/node_modules/@react-navigation/bottom-tabs/lib/commonjs/views/BottomTabBar.js b/node_modules/@react-navigation/bottom-tabs/lib/commonjs/views/BottomTabBar.js
index 8f0fb1c..bfc1cfc 100644
--- a/node_modules/@react-navigation/bottom-tabs/lib/commonjs/views/BottomTabBar.js
+++ b/node_modules/@react-navigation/bottom-tabs/lib/commonjs/views/BottomTabBar.js
@@ -131,6 +131,7 @@ function BottomTabBar({
tabBarShowLabel,
tabBarLabelPosition,
tabBarHideOnKeyboard = false,
+ tabBarVisible = false,
tabBarVisibilityAnimationConfig,
tabBarVariant = 'uikit',
tabBarStyle,
@@ -149,7 +150,7 @@ function BottomTabBar({
const dimensions = (0, _reactNativeSafeAreaContext.useSafeAreaFrame)();
const isKeyboardShown = (0, _useIsKeyboardShown.useIsKeyboardShown)();
const onHeightChange = _react.default.useContext(_BottomTabBarHeightCallbackContext.BottomTabBarHeightCallbackContext);
- const shouldShowTabBar = !(tabBarHideOnKeyboard && isKeyboardShown);
+ const shouldShowTabBar = !(tabBarHideOnKeyboard && isKeyboardShown) && !tabBarVisible;
const visibilityAnimationConfigRef = _react.default.useRef(tabBarVisibilityAnimationConfig);
_react.default.useEffect(() => {
visibilityAnimationConfigRef.current = tabBarVisibilityAnimationConfig;
@@ -251,6 +252,10 @@ function BottomTabBar({
outputRange: [layout.height + insets[tabBarPosition === 'top' ? 'top' : 'bottom'] + _reactNative.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
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 dbde384..ec63cde 100644
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
@@ -124,6 +124,7 @@ export function BottomTabBar({
@@ -123,6 +123,7 @@ export function BottomTabBar({
tabBarShowLabel,
tabBarLabelPosition,
tabBarHideOnKeyboard = false,
+ tabBarVisible = false,
tabBarVisibilityAnimationConfig,
tabBarVariant = 'uikit',
tabBarStyle,
@@ -142,7 +143,7 @@ export function BottomTabBar({
const dimensions = useSafeAreaFrame();
@@ -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;
@@ -244,6 +245,10 @@ export function BottomTabBar({
@@ -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
diff --git a/node_modules/@react-navigation/bottom-tabs/src/types.tsx b/node_modules/@react-navigation/bottom-tabs/src/types.tsx
index 02f7119..01dfabc 100644
index 2438b03..eaa6d4b 100644
--- a/node_modules/@react-navigation/bottom-tabs/src/types.tsx
+++ b/node_modules/@react-navigation/bottom-tabs/src/types.tsx
@@ -224,6 +224,11 @@ export type BottomTabNavigationOptions = HeaderOptions & {
@@ -239,6 +239,11 @@ export type BottomTabNavigationOptions = HeaderOptions & {
*/
tabBarHideOnKeyboard?: boolean;
tabBarVariant?: Variant;

+ /**
+ * Whether the tab bar gets hidden when the screen is focused. Defaults to `false`.
+ */
+ tabBarVisible?: boolean;
+
/**
* Animation config for showing and hiding the tab bar when the keyboard is shown/hidden.
* Style object for the tab bar container.
*/
diff --git a/node_modules/@react-navigation/bottom-tabs/src/views/BottomTabBar.tsx b/node_modules/@react-navigation/bottom-tabs/src/views/BottomTabBar.tsx
index 55b9c8f..816b028 100644
--- a/node_modules/@react-navigation/bottom-tabs/src/views/BottomTabBar.tsx
+++ b/node_modules/@react-navigation/bottom-tabs/src/views/BottomTabBar.tsx
@@ -175,6 +175,7 @@ export function BottomTabBar({
tabBarVariant = 'uikit',
tabBarStyle,
tabBarBackground,
+ tabBarVisible = false,
tabBarActiveTintColor,
tabBarInactiveTintColor,
tabBarActiveBackgroundColor,
@@ -205,7 +206,7 @@ export function BottomTabBar({

const onHeightChange = React.useContext(BottomTabBarHeightCallbackContext);

- const shouldShowTabBar = !(tabBarHideOnKeyboard && isKeyboardShown);
+ const shouldShowTabBar = !(tabBarHideOnKeyboard && isKeyboardShown) && !tabBarVisible

const visibilityAnimationConfigRef = React.useRef(
tabBarVisibilityAnimationConfig
@@ -367,6 +368,10 @@ export function BottomTabBar({
0,
],
}),
+ opacity: visible.interpolate({
+ inputRange: [0, 1],
+ outputRange: [0, 1],
+ }),
},
],
// Absolutely position the tab bar so that the content is below it
Loading