From 0ecc98d0de4bcc086902f83e14da529ce6569730 Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 24 Oct 2024 20:44:24 +0100 Subject: Display non-post embeds in composer preview (#5647) * Display non-post embeds in composer preview * Remove starter pack special case from ExternalLinkEmbed This should not be needed because starter pack composer preview now goes through the record preview codepath, just like in the feed/post view. * Hide record ext links if quote is present * Align remove buttons Remove the implicit top padding in record embeds and make it conditional, which is similar to how we treat external link embeds. This makes the X button appear in the same place for record embeds as with links. --- src/view/com/util/post-embeds/index.tsx | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'src/view/com/util/post-embeds/index.tsx') diff --git a/src/view/com/util/post-embeds/index.tsx b/src/view/com/util/post-embeds/index.tsx index d4982b0e2..70192c813 100644 --- a/src/view/com/util/post-embeds/index.tsx +++ b/src/view/com/util/post-embeds/index.tsx @@ -89,17 +89,29 @@ export function PostEmbeds({ if (AppBskyEmbedRecord.isView(embed)) { // custom feed embed (i.e. generator view) if (AppBskyFeedDefs.isGeneratorView(embed.record)) { - return + return ( + + + + ) } // list embed if (AppBskyGraphDefs.isListView(embed.record)) { - return + return ( + + + + ) } // starter pack embed if (AppBskyGraphDefs.isStarterPackViewBasic(embed.record)) { - return + return ( + + + + ) } // quote post @@ -203,7 +215,7 @@ export function PostEmbeds({ return } -function MaybeFeedCard({view}: {view: AppBskyFeedDefs.GeneratorView}) { +export function MaybeFeedCard({view}: {view: AppBskyFeedDefs.GeneratorView}) { const pal = usePalette('default') const moderationOpts = useModerationOpts() const moderation = React.useMemo(() => { @@ -223,7 +235,7 @@ function MaybeFeedCard({view}: {view: AppBskyFeedDefs.GeneratorView}) { ) } -function MaybeListCard({view}: {view: AppBskyGraphDefs.ListView}) { +export function MaybeListCard({view}: {view: AppBskyGraphDefs.ListView}) { const moderationOpts = useModerationOpts() const moderation = React.useMemo(() => { return moderationOpts ? moderateUserList(view, moderationOpts) : undefined @@ -238,7 +250,6 @@ function MaybeListCard({view}: {view: AppBskyGraphDefs.ListView}) { t.atoms.border_contrast_medium, a.p_md, a.rounded_sm, - a.mt_sm, ]}> @@ -264,7 +275,6 @@ const styles = StyleSheet.create({ customFeedOuter: { borderWidth: StyleSheet.hairlineWidth, borderRadius: 8, - marginTop: 4, paddingHorizontal: 12, paddingVertical: 12, }, -- cgit 1.4.1