From 55a0a5126de940965ea5c3a951e4ab49af349c3e Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Sat, 1 Mar 2025 15:30:43 -0600 Subject: [PATCH] Replace other usages of old post-embeds --- src/components/Post/Embed/index.tsx | 4 +++- src/components/Post/Embed/types.ts | 10 +++++++++- src/view/com/post-thread/PostThreadItem.tsx | 6 +++--- src/view/com/post/Post.tsx | 4 ++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/components/Post/Embed/index.tsx b/src/components/Post/Embed/index.tsx index 8aef6625c5..529caa8943 100644 --- a/src/components/Post/Embed/index.tsx +++ b/src/components/Post/Embed/index.tsx @@ -38,6 +38,8 @@ import {ListEmbed} from './ListEmbed' import {PostPlaceholder as PostPlaceholderText} from './PostPlaceholder' import {CommonProps, EmbedProps} from './types' +export {PostEmbedViewContext, QuoteEmbedViewContext} from './types' + export function Embed({embed: rawEmbed, ...rest}: EmbedProps) { const embed = parseEmbed(rawEmbed) @@ -206,7 +208,7 @@ export function PostDetachedEmbed({ * Nests parent `Embed` component and therefore must live in this file to avoid * circular imports. */ -function QuoteEmbed({ +export function QuoteEmbed({ embed, onOpen, style, diff --git a/src/components/Post/Embed/types.ts b/src/components/Post/Embed/types.ts index 21829f61f9..7023258322 100644 --- a/src/components/Post/Embed/types.ts +++ b/src/components/Post/Embed/types.ts @@ -1,7 +1,15 @@ import {StyleProp, ViewStyle} from 'react-native' import {AppBskyFeedDefs, ModerationDecision} from '@atproto/api' -import {PostEmbedViewContext} from '#/view/com/util/post-embeds/types' +export enum PostEmbedViewContext { + ThreadHighlighted = 'ThreadHighlighted', + Feed = 'Feed', + FeedEmbedRecordWithMedia = 'FeedEmbedRecordWithMedia', +} + +export enum QuoteEmbedViewContext { + FeedEmbedRecordWithMedia = PostEmbedViewContext.FeedEmbedRecordWithMedia, +} export type CommonProps = { moderation?: ModerationDecision diff --git a/src/view/com/post-thread/PostThreadItem.tsx b/src/view/com/post-thread/PostThreadItem.tsx index f818e47a11..820e7bd665 100644 --- a/src/view/com/post-thread/PostThreadItem.tsx +++ b/src/view/com/post-thread/PostThreadItem.tsx @@ -37,7 +37,6 @@ import {ErrorMessage} from '#/view/com/util/error/ErrorMessage' import {Link, TextLink} from '#/view/com/util/Link' import {formatCount} from '#/view/com/util/numeric/format' import {PostCtrls} from '#/view/com/util/post-ctrls/PostCtrls' -import {PostEmbeds, PostEmbedViewContext} from '#/view/com/util/post-embeds' import {PostMeta} from '#/view/com/util/PostMeta' import {PreviewableUserAvatar} from '#/view/com/util/UserAvatar' import {atoms as a, useTheme} from '#/alf' @@ -53,6 +52,7 @@ import {LabelsOnMyPost} from '#/components/moderation/LabelsOnMe' import {PostAlerts} from '#/components/moderation/PostAlerts' import {PostHider} from '#/components/moderation/PostHider' import {AppModerationCause} from '#/components/Pills' +import {Embed, PostEmbedViewContext} from '#/components/Post/Embed' import * as Prompt from '#/components/Prompt' import {RichText} from '#/components/RichText' import {SubtleWebHover} from '#/components/SubtleWebHover' @@ -380,7 +380,7 @@ let PostThreadItemLoaded = ({ ) : undefined} {post.embed && ( - - ) : undefined} {post.embed ? ( -