Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix issue: Tooltip - Tooltip is below FAB when cancelling expense from Reports #169

Merged
merged 3 commits into from
Jan 23, 2025
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
4 changes: 2 additions & 2 deletions src/components/Navigation/TopLevelBottomTabBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ function TopLevelBottomTabBar() {
}, [shouldDisplayTopLevelBottomTabBar]);

return (
<View style={styles.topLevelBottomTabBar(shouldDisplayTopLevelBottomTabBar && isAfterClosingTransition, shouldUseNarrowLayout, paddingBottom)}>
<View style={styles.topLevelBottomTabBar(shouldDisplayTopLevelBottomTabBar || isAfterClosingTransition, shouldUseNarrowLayout, paddingBottom)}>
{/* We are not rendering BottomTabBar conditionally for two reasons
1. It's faster to hide/show it than mount a new when needed.
2. We need to hide tooltips as well if they were displayed. */}
<BottomTabBar
selectedTab={selectedTab}
isTooltipAllowed={shouldDisplayTopLevelBottomTabBar}
isTooltipAllowed={shouldDisplayTopLevelBottomTabBar || isAfterClosingTransition}
/>
</View>
);
Expand Down
2 changes: 0 additions & 2 deletions src/styles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -568,8 +568,6 @@ const styles = (theme: ThemeColors) =>
position: Platform.OS === 'web' ? 'fixed' : 'absolute',
width: shouldUseNarrowLayout ? '100%' : variables.sideBarWidth,
transform: [
{translateX: shouldUseNarrowLayout ? 0 : -variables.sideBarWidth},

// This conditional style is here to hide the bottom tab bar when it's not needed.
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason using the wrapper that fixed Safari issue, removed the need to use translateX 🤷

shouldDisplayTopLevelBottomTabBar ? {translateY: 0} : {translateY: bottomSafeAreaOffset + variables.bottomTabHeight},
],
Expand Down
Loading