Merge origin/main into terry-media-adaptive-trial
Combine collapsible long-text (main) with adaptive image frame (this branch). Resolved conflict in ImageWithTextBubble.tsx by keeping both SingleImageFrame and CollapsibleText imports.
This commit is contained in:
@@ -2,6 +2,7 @@ import { useI18n } from "../../../i18n";
|
||||
import type { Post } from "../../../types/post";
|
||||
import { autolink } from "../utils/autolink";
|
||||
import { postDisplayText } from "../utils/postText";
|
||||
import { CollapsibleText } from "../CollapsibleText";
|
||||
import { SingleImageFrame } from "./SingleImageFrame";
|
||||
|
||||
export function ImageWithTextBubble({ post }: { post: Post }) {
|
||||
@@ -13,9 +14,12 @@ export function ImageWithTextBubble({ post }: { post: Post }) {
|
||||
<div className="flex flex-col">
|
||||
<SingleImageFrame postId={post.id} attachment={att} text={text} />
|
||||
{text ? (
|
||||
<div className="message-stream-copyable-text select-text whitespace-pre-wrap break-words px-4 pt-3 text-[14px] leading-6 text-neutral-100">
|
||||
<CollapsibleText
|
||||
wrapperClassName="px-4 pt-3"
|
||||
className="message-stream-copyable-text select-text whitespace-pre-wrap break-words text-[14px] leading-6 text-neutral-100"
|
||||
>
|
||||
{autolink(text)}
|
||||
</div>
|
||||
</CollapsibleText>
|
||||
) : null}
|
||||
</div>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user