Skip to content
Open
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
7 changes: 4 additions & 3 deletions src/components/Navigation/DebugTabView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,14 @@ function DebugTabView({selectedTab}: Props) {
return null;
}

let positionStyle: {bottom?: number; left: number; right?: number; width?: number};
let positionStyle: {bottom?: number; top?: number; left: number; right?: number; width?: number};
const verticalAnchor = selectedTab === NAVIGATION_TABS.SETTINGS && !shouldUseNarrowLayout ? {top: 0} : {bottom: 0};
if (shouldUseNarrowLayout) {
positionStyle = {bottom: 0, left: 0, right: 0};
} else if (isOnFullWidthTabRoot) {
positionStyle = {bottom: 0, left: variables.navigationTabBarSize, width: windowWidth - variables.navigationTabBarSize};
positionStyle = {...verticalAnchor, left: variables.navigationTabBarSize, width: windowWidth - variables.navigationTabBarSize};
} else {
positionStyle = {bottom: 0, left: variables.navigationTabBarSize, width: variables.sideBarWithLHBWidth - variables.cropBorderWidth};
positionStyle = {...verticalAnchor, left: variables.navigationTabBarSize, width: variables.sideBarWithLHBWidth - variables.cropBorderWidth};
}

// pAbsolute is only applied on wide layouts. On narrow layout the bar is placed by its parent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,10 @@ function TabNavigatorBar({state}: Pick<BottomTabBarProps, 'state'>) {
);
}

// When the screen is not blocking the view, we need to raise the tab bar above the screen content so the DebugTabView is visible.
return (
<View
style={[styles.tabNavigatorBarContainer]}
style={[styles.tabNavigatorBarContainer, !isBlockingViewVisible && {zIndex: 1}]}
pointerEvents="box-none"
>
<NavigationTabBar selectedTab={selectedTab} />
Expand Down
1 change: 0 additions & 1 deletion src/styles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,6 @@ const staticStyles = (theme: ThemeColors) =>
},

tabNavigatorBarContainer: {
zIndex: 1,
width: variables.navigationTabBarSize + variables.sideBarWithLHBWidth,
marginRight: -variables.sideBarWithLHBWidth,
overflow: 'visible',
Expand Down
Loading