External/5chan
1
0
Fork 0
mirror of https://github.com/bitsocialnet/5chan.git synced 2026-08-03 07:41:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(spoiler): spoiler image wasn't showing for iframes

Browse Source
This commit is contained in:
Tom (plebeius.eth)
2024-07-04 21:38:01 +02:00
parent 8d766cc9e3
commit 85aeb86047
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/catalog-row/catalog-row.tsx
+1 -3
View File
@@ -188,9 +188,7 @@ const CatalogPost = ({ post }: { post: Comment }) => {
}); });
const postContent = ( const postContent = (
<div className={`${styles.teaser} ${hidden && styles.hidden}`}> <div className={`${styles.teaser} ${hidden && styles.hidden}`}>{hidden ? <b>({t('hidden')})</b> : <Markdown title={title} content={content} />}</div>
{hidden ? <b>({t('hidden')})</b> : <Markdown title={title} content={content} spoiler={spoiler} />}
</div>
); );
const { imageSize, showOPComment } = useCatalogStyleStore(); const { imageSize, showOPComment } = useCatalogStyleStore();
src/components/markdown/markdown.tsx
-1
View File
@@ -124,7 +124,6 @@ const blockquoteToGreentext = () => (tree: any) => {
interface MarkdownProps { interface MarkdownProps {
content: string; content: string;
spoiler?: boolean;
title?: string; title?: string;
} }
src/components/post-desktop/post-desktop.tsx
+3 -3
View File
@@ -207,7 +207,7 @@ const PostMedia = ({ post }: PostProps) => {
</span> </span>
)} )}
</div> </div>
{(hasThumbnail || (!hasThumbnail && !showThumbnail)) && ( {(hasThumbnail || (!hasThumbnail && !showThumbnail) || spoiler) && (
<div className={styles.fileThumbnail}> <div className={styles.fileThumbnail}>
<CommentMedia commentMediaInfo={commentMediaInfo} post={post} showThumbnail={showThumbnail} setShowThumbnail={setShowThumbnail} /> <CommentMedia commentMediaInfo={commentMediaInfo} post={post} showThumbnail={showThumbnail} setShowThumbnail={setShowThumbnail} />
</div> </div>
@@ -217,7 +217,7 @@ const PostMedia = ({ post }: PostProps) => {
}; };
const PostMessage = ({ post }: PostProps) => { const PostMessage = ({ post }: PostProps) => {
const { cid, content, deleted, edit, original, parentCid, postCid, reason, removed, spoiler, state, subplebbitAddress } = post || {}; const { cid, content, deleted, edit, original, parentCid, postCid, reason, removed, state, subplebbitAddress } = post || {};
// TODO: commentAuthor is not available outside of editedComment, update when available // TODO: commentAuthor is not available outside of editedComment, update when available
// const banned = !!post?.commentAuthor?.banExpiresAt; // const banned = !!post?.commentAuthor?.banExpiresAt;
const { t } = useTranslation(); const { t } = useTranslation();
@@ -252,7 +252,7 @@ const PostMessage = ({ post }: PostProps) => {
<Tooltip children={<span className={styles.deletedContent}>{t('user_deleted_this_post')}</span>} content={reason && `${t('reason')}: ${reason}`} /> <Tooltip children={<span className={styles.deletedContent}>{t('user_deleted_this_post')}</span>} content={reason && `${t('reason')}: ${reason}`} />
) : ( ) : (
<> <>
{!showOriginal && <Markdown content={displayContent} spoiler={spoiler} />} {!showOriginal && <Markdown content={displayContent} />}
{edit && original?.content !== post?.content && ( {edit && original?.content !== post?.content && (
<span className={styles.editedInfo}> <span className={styles.editedInfo}>
{showOriginal && <Markdown content={original?.content} />} {showOriginal && <Markdown content={original?.content} />}
src/components/post-mobile/post-mobile.tsx
+2 -2
View File
@@ -152,7 +152,7 @@ const ReplyBacklinks = ({ post }: PostProps) => {
const PostMessageMobile = ({ post }: PostProps) => { const PostMessageMobile = ({ post }: PostProps) => {
const { t } = useTranslation(); const { t } = useTranslation();
const { cid, commentAuthor, content, deleted, edit, original, parentCid, postCid, reason, removed, spoiler, state, subplebbitAddress } = post || {}; const { cid, content, deleted, edit, original, parentCid, postCid, reason, removed, state, subplebbitAddress } = post || {};
// TODO: commentAuthor is not available outside of editedComment, update when available // TODO: commentAuthor is not available outside of editedComment, update when available
// const banned = !!post?.commentAuthor?.banExpiresAt; // const banned = !!post?.commentAuthor?.banExpiresAt;
const [showOriginal, setShowOriginal] = useState(false); const [showOriginal, setShowOriginal] = useState(false);
@@ -188,7 +188,7 @@ const PostMessageMobile = ({ post }: PostProps) => {
<Tooltip children={<span className={styles.deletedContent}>{t('user_deleted_this_post')}</span>} content={reason && `${t('reason')}: ${reason}`} /> <Tooltip children={<span className={styles.deletedContent}>{t('user_deleted_this_post')}</span>} content={reason && `${t('reason')}: ${reason}`} />
) : ( ) : (
<> <>
{!showOriginal && <Markdown content={displayContent} spoiler={spoiler} />} {!showOriginal && <Markdown content={displayContent} />}
{edit && original?.content !== post?.content && ( {edit && original?.content !== post?.content && (
<span className={styles.editedInfo}> <span className={styles.editedInfo}>
{showOriginal && <Markdown content={original?.content} />} {showOriginal && <Markdown content={original?.content} />}