Align on the offset hack we need for posts with no content
This commit is contained in:
@@ -1,3 +1,6 @@
|
|||||||
export const ITEM_GAP = 8 // tokens.space.sm
|
export const ITEM_GAP = 8 // tokens.space.sm
|
||||||
export const MIN_ASPECT_RATIO = 2 / 3 // portrait limit
|
export const MIN_ASPECT_RATIO = 2 / 3 // portrait limit
|
||||||
export const MAX_ASPECT_RATIO = 3 / 2 // landscape limit
|
export const MAX_ASPECT_RATIO = 3 / 2 // landscape limit
|
||||||
|
|
||||||
|
export const POST_META_NO_CONTENT_OFFSET = {paddingTop: 10}
|
||||||
|
export const POST_EMBED_NO_CONTENT_OFFSET = {paddingTop: 6}
|
||||||
|
|||||||
@@ -41,6 +41,8 @@ import {Text} from '#/components/Typography'
|
|||||||
import {useAnalytics} from '#/analytics'
|
import {useAnalytics} from '#/analytics'
|
||||||
import {IS_WEB} from '#/env'
|
import {IS_WEB} from '#/env'
|
||||||
|
|
||||||
|
export * from './const'
|
||||||
|
|
||||||
interface GalleryProps {
|
interface GalleryProps {
|
||||||
images: AppBskyEmbedImages.ViewImage[]
|
images: AppBskyEmbedImages.ViewImage[]
|
||||||
onPress?: (
|
onPress?: (
|
||||||
|
|||||||
@@ -408,7 +408,7 @@ const ThreadItemAnchorInner = memo(function ThreadItemAnchorInner({
|
|||||||
) : undefined}
|
) : undefined}
|
||||||
<TranslatedPost post={post} postTextStyle={[a.text_lg]} />
|
<TranslatedPost post={post} postTextStyle={[a.text_lg]} />
|
||||||
{post.embed && (
|
{post.embed && (
|
||||||
<View style={[a.py_xs]}>
|
<View style={[richText?.text ? a.py_xs : []]}>
|
||||||
<Embed
|
<Embed
|
||||||
embed={post.embed}
|
embed={post.embed}
|
||||||
moderation={moderation}
|
moderation={moderation}
|
||||||
|
|||||||
@@ -32,7 +32,11 @@ import {atoms as a, useTheme} from '#/alf'
|
|||||||
import {DebugFieldDisplay} from '#/components/DebugFieldDisplay'
|
import {DebugFieldDisplay} from '#/components/DebugFieldDisplay'
|
||||||
import {useInteractionState} from '#/components/hooks/useInteractionState'
|
import {useInteractionState} from '#/components/hooks/useInteractionState'
|
||||||
import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from '#/components/icons/Trash'
|
import {Trash_Stroke2_Corner0_Rounded as TrashIcon} from '#/components/icons/Trash'
|
||||||
import {GalleryBleed} from '#/components/images/Gallery'
|
import {
|
||||||
|
GalleryBleed,
|
||||||
|
POST_EMBED_NO_CONTENT_OFFSET,
|
||||||
|
POST_META_NO_CONTENT_OFFSET,
|
||||||
|
} from '#/components/images/Gallery'
|
||||||
import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe'
|
import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe'
|
||||||
import {PostAlerts} from '#/components/moderation/PostAlerts'
|
import {PostAlerts} from '#/components/moderation/PostAlerts'
|
||||||
import {PostHider} from '#/components/moderation/PostHider'
|
import {PostHider} from '#/components/moderation/PostHider'
|
||||||
@@ -298,7 +302,10 @@ const ThreadItemPostInner = memo(function ThreadItemPostInner({
|
|||||||
moderation={moderation}
|
moderation={moderation}
|
||||||
timestamp={post.indexedAt}
|
timestamp={post.indexedAt}
|
||||||
postHref={postHref}
|
postHref={postHref}
|
||||||
style={[a.pb_xs]}
|
style={[
|
||||||
|
a.pb_xs,
|
||||||
|
!richText?.text && POST_META_NO_CONTENT_OFFSET,
|
||||||
|
]}
|
||||||
/>
|
/>
|
||||||
<LabelsOnMyPost post={post} style={[a.pb_xs]} />
|
<LabelsOnMyPost post={post} style={[a.pb_xs]} />
|
||||||
<PostAlerts
|
<PostAlerts
|
||||||
@@ -326,7 +333,11 @@ const ThreadItemPostInner = memo(function ThreadItemPostInner({
|
|||||||
) : undefined}
|
) : undefined}
|
||||||
<TranslatedPost hideTranslateLink post={post} />
|
<TranslatedPost hideTranslateLink post={post} />
|
||||||
{post.embed && (
|
{post.embed && (
|
||||||
<View style={[a.pb_xs]}>
|
<View
|
||||||
|
style={[
|
||||||
|
!richText?.text ? POST_EMBED_NO_CONTENT_OFFSET : [],
|
||||||
|
a.pb_xs,
|
||||||
|
]}>
|
||||||
<Embed
|
<Embed
|
||||||
embed={post.embed}
|
embed={post.embed}
|
||||||
moderation={moderation}
|
moderation={moderation}
|
||||||
|
|||||||
@@ -27,6 +27,11 @@ import {Link} from '#/view/com/util/Link'
|
|||||||
import {PostMeta} from '#/view/com/util/PostMeta'
|
import {PostMeta} from '#/view/com/util/PostMeta'
|
||||||
import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar'
|
import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar'
|
||||||
import {atoms as a} from '#/alf'
|
import {atoms as a} from '#/alf'
|
||||||
|
import {
|
||||||
|
GalleryBleed,
|
||||||
|
POST_EMBED_NO_CONTENT_OFFSET,
|
||||||
|
POST_META_NO_CONTENT_OFFSET,
|
||||||
|
} from '#/components/images/Gallery'
|
||||||
import {ContentHider} from '#/components/moderation/ContentHider'
|
import {ContentHider} from '#/components/moderation/ContentHider'
|
||||||
import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe'
|
import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe'
|
||||||
import {PostAlerts} from '#/components/moderation/PostAlerts'
|
import {PostAlerts} from '#/components/moderation/PostAlerts'
|
||||||
@@ -155,6 +160,7 @@ function PostInner({
|
|||||||
const [hover, setHover] = useState(false)
|
const [hover, setHover] = useState(false)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
<GalleryBleed>
|
||||||
<Link
|
<Link
|
||||||
href={itemHref}
|
href={itemHref}
|
||||||
style={[
|
style={[
|
||||||
@@ -184,7 +190,7 @@ function PostInner({
|
|||||||
<View
|
<View
|
||||||
style={[
|
style={[
|
||||||
styles.layoutContent,
|
styles.layoutContent,
|
||||||
!richText.text && styles.layoutContentNoText,
|
!richText.text && POST_META_NO_CONTENT_OFFSET,
|
||||||
]}>
|
]}>
|
||||||
<PostMeta
|
<PostMeta
|
||||||
author={post.author}
|
author={post.author}
|
||||||
@@ -225,7 +231,10 @@ function PostInner({
|
|||||||
) : undefined}
|
) : undefined}
|
||||||
<TranslatedPost hideTranslateLink post={post} />
|
<TranslatedPost hideTranslateLink post={post} />
|
||||||
{post.embed ? (
|
{post.embed ? (
|
||||||
<View style={!richText.text ? {marginTop: 6} : undefined}>
|
<View
|
||||||
|
style={
|
||||||
|
!richText.text ? POST_EMBED_NO_CONTENT_OFFSET : undefined
|
||||||
|
}>
|
||||||
<Embed
|
<Embed
|
||||||
embed={post.embed}
|
embed={post.embed}
|
||||||
moderation={moderation}
|
moderation={moderation}
|
||||||
@@ -244,6 +253,7 @@ function PostInner({
|
|||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
</Link>
|
</Link>
|
||||||
|
</GalleryBleed>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -266,9 +276,6 @@ const styles = StyleSheet.create({
|
|||||||
layoutContent: {
|
layoutContent: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
},
|
},
|
||||||
layoutContentNoText: {
|
|
||||||
paddingTop: 10,
|
|
||||||
},
|
|
||||||
alert: {
|
alert: {
|
||||||
marginBottom: 6,
|
marginBottom: 6,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -34,7 +34,11 @@ import {Link} from '#/view/com/util/Link'
|
|||||||
import {PostMeta} from '#/view/com/util/PostMeta'
|
import {PostMeta} from '#/view/com/util/PostMeta'
|
||||||
import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar'
|
import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar'
|
||||||
import {atoms as a} from '#/alf'
|
import {atoms as a} from '#/alf'
|
||||||
import {GalleryBleed} from '#/components/images/Gallery'
|
import {
|
||||||
|
GalleryBleed,
|
||||||
|
POST_EMBED_NO_CONTENT_OFFSET,
|
||||||
|
POST_META_NO_CONTENT_OFFSET,
|
||||||
|
} from '#/components/images/Gallery'
|
||||||
import {ContentHider} from '#/components/moderation/ContentHider'
|
import {ContentHider} from '#/components/moderation/ContentHider'
|
||||||
import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe'
|
import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe'
|
||||||
import {PostAlerts} from '#/components/moderation/PostAlerts'
|
import {PostAlerts} from '#/components/moderation/PostAlerts'
|
||||||
@@ -364,7 +368,7 @@ let FeedItemInner = ({
|
|||||||
<View
|
<View
|
||||||
style={[
|
style={[
|
||||||
styles.layoutContent,
|
styles.layoutContent,
|
||||||
!richText.text && styles.layoutContentNoText,
|
!richText.text && POST_META_NO_CONTENT_OFFSET,
|
||||||
]}>
|
]}>
|
||||||
<PostMeta
|
<PostMeta
|
||||||
author={post.author}
|
author={post.author}
|
||||||
@@ -499,7 +503,7 @@ let PostContent = ({
|
|||||||
) : undefined}
|
) : undefined}
|
||||||
{record && <TranslatedPost hideTranslateLink post={post} />}
|
{record && <TranslatedPost hideTranslateLink post={post} />}
|
||||||
{postEmbed ? (
|
{postEmbed ? (
|
||||||
<View style={[a.pb_xs, !richText.text && {marginTop: 6}]}>
|
<View style={[a.pb_xs, !richText.text && POST_EMBED_NO_CONTENT_OFFSET]}>
|
||||||
<Embed
|
<Embed
|
||||||
embed={postEmbed}
|
embed={postEmbed}
|
||||||
moderation={moderation}
|
moderation={moderation}
|
||||||
@@ -535,9 +539,6 @@ const styles = StyleSheet.create({
|
|||||||
layoutContent: {
|
layoutContent: {
|
||||||
flex: 1,
|
flex: 1,
|
||||||
},
|
},
|
||||||
layoutContentNoText: {
|
|
||||||
paddingTop: 10,
|
|
||||||
},
|
|
||||||
alert: {
|
alert: {
|
||||||
marginTop: 6,
|
marginTop: 6,
|
||||||
marginBottom: 6,
|
marginBottom: 6,
|
||||||
|
|||||||
Reference in New Issue
Block a user