Fix z-indexes to make tabbar scroll on Android (#7102)
This commit is contained in:
@@ -134,7 +134,7 @@ export default function HashtagScreen({
|
||||
<Pager
|
||||
onPageSelected={onPageSelected}
|
||||
renderTabBar={props => (
|
||||
<Layout.Center style={web([a.sticky, a.z_10, {top: 0}])}>
|
||||
<Layout.Center style={[a.z_10, web([a.sticky, {top: 0}])]}>
|
||||
<TabBar items={sections.map(section => section.title)} {...props} />
|
||||
</Layout.Center>
|
||||
)}
|
||||
|
||||
@@ -136,14 +136,12 @@ export const Pager = forwardRef<PagerRef, React.PropsWithChildren<Props>>(
|
||||
|
||||
return (
|
||||
<View testID={testID} style={[a.flex_1, native(a.overflow_hidden)]}>
|
||||
<View style={a.z_10 /* Let tabbar bottom border cover the glimmer */}>
|
||||
{renderTabBar({
|
||||
selectedPage,
|
||||
onSelect: onTabBarSelect,
|
||||
dragProgress,
|
||||
dragState,
|
||||
})}
|
||||
</View>
|
||||
{renderTabBar({
|
||||
selectedPage,
|
||||
onSelect: onTabBarSelect,
|
||||
dragProgress,
|
||||
dragState,
|
||||
})}
|
||||
<GestureDetector gesture={nativeGesture}>
|
||||
<AnimatedPagerView
|
||||
ref={pagerView}
|
||||
|
||||
@@ -134,14 +134,16 @@ let PagerTabBar = ({
|
||||
<Layout.Center>{renderHeader?.({setMinimumHeight: noop})}</Layout.Center>
|
||||
{tabBarAnchor}
|
||||
<Layout.Center
|
||||
style={web([
|
||||
a.sticky,
|
||||
style={[
|
||||
a.z_10,
|
||||
{
|
||||
top: 0,
|
||||
display: isHeaderReady ? undefined : 'none',
|
||||
},
|
||||
])}>
|
||||
web([
|
||||
a.sticky,
|
||||
{
|
||||
top: 0,
|
||||
display: isHeaderReady ? undefined : 'none',
|
||||
},
|
||||
]),
|
||||
]}>
|
||||
<TabBar
|
||||
testID={testID}
|
||||
items={items}
|
||||
|
||||
@@ -144,7 +144,7 @@ export function NotificationsScreen({}: Props) {
|
||||
<Pager
|
||||
onPageSelected={onPageSelected}
|
||||
renderTabBar={props => (
|
||||
<Layout.Center style={web([a.sticky, a.z_10, {top: 0}])}>
|
||||
<Layout.Center style={[a.z_10, web([a.sticky, {top: 0}])]}>
|
||||
<TabBar
|
||||
{...props}
|
||||
items={sections.map(section => section.title)}
|
||||
|
||||
@@ -532,7 +532,8 @@ let SearchScreenInner = ({
|
||||
renderTabBar={props => (
|
||||
<Layout.Center
|
||||
style={[
|
||||
web([a.sticky, a.z_10]),
|
||||
a.z_10,
|
||||
web([a.sticky]),
|
||||
{top: isWeb ? headerHeight : undefined},
|
||||
]}>
|
||||
<TabBar items={sections.map(section => section.title)} {...props} />
|
||||
|
||||
Reference in New Issue
Block a user