move header inside sticky area (#7163)
This commit is contained in:
+24
-24
@@ -107,34 +107,34 @@ export default function HashtagScreen({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen>
|
<Layout.Screen>
|
||||||
<Layout.Header.Outer noBottomBorder>
|
|
||||||
<Layout.Header.BackButton />
|
|
||||||
<Layout.Header.Content>
|
|
||||||
<Layout.Header.TitleText>{headerTitle}</Layout.Header.TitleText>
|
|
||||||
{author && (
|
|
||||||
<Layout.Header.SubtitleText>
|
|
||||||
{_(msg`From @${sanitizedAuthor}`)}
|
|
||||||
</Layout.Header.SubtitleText>
|
|
||||||
)}
|
|
||||||
</Layout.Header.Content>
|
|
||||||
<Layout.Header.Slot>
|
|
||||||
<Button
|
|
||||||
label={_(msg`Share`)}
|
|
||||||
size="small"
|
|
||||||
variant="ghost"
|
|
||||||
color="primary"
|
|
||||||
shape="round"
|
|
||||||
onPress={onShare}
|
|
||||||
hitSlop={HITSLOP_10}
|
|
||||||
style={[{right: -3}]}>
|
|
||||||
<ButtonIcon icon={Share} size="md" />
|
|
||||||
</Button>
|
|
||||||
</Layout.Header.Slot>
|
|
||||||
</Layout.Header.Outer>
|
|
||||||
<Pager
|
<Pager
|
||||||
onPageSelected={onPageSelected}
|
onPageSelected={onPageSelected}
|
||||||
renderTabBar={props => (
|
renderTabBar={props => (
|
||||||
<Layout.Center style={[a.z_10, web([a.sticky, {top: 0}])]}>
|
<Layout.Center style={[a.z_10, web([a.sticky, {top: 0}])]}>
|
||||||
|
<Layout.Header.Outer noBottomBorder>
|
||||||
|
<Layout.Header.BackButton />
|
||||||
|
<Layout.Header.Content>
|
||||||
|
<Layout.Header.TitleText>{headerTitle}</Layout.Header.TitleText>
|
||||||
|
{author && (
|
||||||
|
<Layout.Header.SubtitleText>
|
||||||
|
{_(msg`From @${sanitizedAuthor}`)}
|
||||||
|
</Layout.Header.SubtitleText>
|
||||||
|
)}
|
||||||
|
</Layout.Header.Content>
|
||||||
|
<Layout.Header.Slot>
|
||||||
|
<Button
|
||||||
|
label={_(msg`Share`)}
|
||||||
|
size="small"
|
||||||
|
variant="ghost"
|
||||||
|
color="primary"
|
||||||
|
shape="round"
|
||||||
|
onPress={onShare}
|
||||||
|
hitSlop={HITSLOP_10}
|
||||||
|
style={[{right: -3}]}>
|
||||||
|
<ButtonIcon icon={Share} size="md" />
|
||||||
|
</Button>
|
||||||
|
</Layout.Header.Slot>
|
||||||
|
</Layout.Header.Outer>
|
||||||
<TabBar items={sections.map(section => section.title)} {...props} />
|
<TabBar items={sections.map(section => section.title)} {...props} />
|
||||||
</Layout.Center>
|
</Layout.Center>
|
||||||
)}
|
)}
|
||||||
|
|||||||
+19
-19
@@ -88,29 +88,29 @@ export default function TopicScreen({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen>
|
<Layout.Screen>
|
||||||
<Layout.Header.Outer noBottomBorder>
|
|
||||||
<Layout.Header.BackButton />
|
|
||||||
<Layout.Header.Content>
|
|
||||||
<Layout.Header.TitleText>{headerTitle}</Layout.Header.TitleText>
|
|
||||||
</Layout.Header.Content>
|
|
||||||
<Layout.Header.Slot>
|
|
||||||
<Button
|
|
||||||
label={_(msg`Share`)}
|
|
||||||
size="small"
|
|
||||||
variant="ghost"
|
|
||||||
color="primary"
|
|
||||||
shape="round"
|
|
||||||
onPress={onShare}
|
|
||||||
hitSlop={HITSLOP_10}
|
|
||||||
style={[{right: -3}]}>
|
|
||||||
<ButtonIcon icon={Share} size="md" />
|
|
||||||
</Button>
|
|
||||||
</Layout.Header.Slot>
|
|
||||||
</Layout.Header.Outer>
|
|
||||||
<Pager
|
<Pager
|
||||||
onPageSelected={onPageSelected}
|
onPageSelected={onPageSelected}
|
||||||
renderTabBar={props => (
|
renderTabBar={props => (
|
||||||
<Layout.Center style={[a.z_10, web([a.sticky, {top: 0}])]}>
|
<Layout.Center style={[a.z_10, web([a.sticky, {top: 0}])]}>
|
||||||
|
<Layout.Header.Outer noBottomBorder>
|
||||||
|
<Layout.Header.BackButton />
|
||||||
|
<Layout.Header.Content>
|
||||||
|
<Layout.Header.TitleText>{headerTitle}</Layout.Header.TitleText>
|
||||||
|
</Layout.Header.Content>
|
||||||
|
<Layout.Header.Slot>
|
||||||
|
<Button
|
||||||
|
label={_(msg`Share`)}
|
||||||
|
size="small"
|
||||||
|
variant="ghost"
|
||||||
|
color="primary"
|
||||||
|
shape="round"
|
||||||
|
onPress={onShare}
|
||||||
|
hitSlop={HITSLOP_10}
|
||||||
|
style={[{right: -3}]}>
|
||||||
|
<ButtonIcon icon={Share} size="md" />
|
||||||
|
</Button>
|
||||||
|
</Layout.Header.Slot>
|
||||||
|
</Layout.Header.Outer>
|
||||||
<TabBar items={sections.map(section => section.title)} {...props} />
|
<TabBar items={sections.map(section => section.title)} {...props} />
|
||||||
</Layout.Center>
|
</Layout.Center>
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in New Issue
Block a user