Skip to content

fix: correctly render nested quotes media attachments in quotes #1075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Khizarshah01 wants to merge 2 commits into
base: develop
Choose a base branch
from
+206 −119
Open

fix: correctly render nested quotes media attachments in quotes #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a208524
fix: correctly render nested media attachments in quotes
Khizarshah01 Jan 16, 2026
4d44d0e
chore: fix formatting in TextAttachment
Khizarshah01 Jan 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions packages/react/src/views/AttachmentHandler/AttachmentMetadata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,15 @@ const AttachmentMetadata = ({
} else if (attachment?.size) {
sizeInBytes = attachment.size;
} else {
sizeInBytes = 0;
return null;
}

const sizeInKB = (sizeInBytes / 1024).toFixed(2);
return `${sizeInKB} kB`;
};

const fileSize = getFormattedFileSize();

return (
<Box
css={[
Expand Down Expand Up @@ -116,17 +118,19 @@ const AttachmentMetadata = ({
: attachment?.title}
</p>
</Tooltip>
<Box
css={css`
font-size: 12px;
opacity: 0.7;
@media (max-width: 420px) {
margin-left: 0;
}
`}
>
({getFormattedFileSize()})
</Box>
{fileSize && (
<Box
css={css`
font-size: 12px;
opacity: 0.7;
@media (max-width: 420px) {
margin-left: 0;
}
`}
>
({fileSize})
</Box>
)}
</Box>

<Box
Expand Down
297 changes: 190 additions & 107 deletions packages/react/src/views/AttachmentHandler/TextAttachment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ import { parse } from '@rocket.chat/message-parser';
import AttachmentMetadata from './AttachmentMetadata';
import RCContext from '../../context/RCInstance';
import { Markdown } from '../Markdown';
import AudioAttachment from './AudioAttachment';
import VideoAttachment from './VideoAttachment';
import ImageAttachment from './ImageAttachment';

const FileAttachment = ({
attachment,
Expand Down Expand Up @@ -170,134 +173,214 @@ const FileAttachment = ({
)}
{attachment?.attachments &&
Array.isArray(attachment.attachments) &&
attachment.attachments.map((nestedAttachment, index) => (
<Box
css={[
css`
display: flex;
flex-direction: column;
letter-spacing: 0rem;
font-size: 0.875rem;
font-weight: 400;
word-break: break-word;
border-inline-start: 3px solid ${theme.colors.border};
margin-top: 0.75rem;
padding: 0.5rem;
`,
(nestedAttachment?.type ? variantStyles.pinnedContainer : '') ||
css`
${!attachment?.type
? `border: 2px solid ${theme.colors.border};`
: ''}
`,
css`
${variantStyles.name !== undefined &&
variantStyles.name.includes('bubble')
? `border-bottom-left-radius: 0.75rem; border-bottom-right-radius: 0.75rem`
: ''}
`,
]}
key={index}
>
attachment.attachments.map((nestedAttachment, index) => {
if (nestedAttachment?.audio_url) {
return (
<AudioAttachment
attachment={nestedAttachment}
host={host}
author={author}
variantStyles={variantStyles}
msg={msg}
key={index}
/>
);
}
if (nestedAttachment?.video_url) {
return (
<VideoAttachment
attachment={nestedAttachment}
host={host}
author={author}
variantStyles={variantStyles}
msg={msg}
key={index}
/>
);
}
if (nestedAttachment?.image_url) {
return (
<ImageAttachment
attachment={nestedAttachment}
host={host}
author={author}
variantStyles={variantStyles}
msg={msg}
key={index}
/>
);
}
// Check for wrapped attachments (mirroring Attachment.js logic)
if (nestedAttachment?.attachments?.[0]?.audio_url) {
return (
<AudioAttachment
attachment={nestedAttachment.attachments[0]}
host={host}
author={author}
variantStyles={variantStyles}
msg={msg}
key={index}
/>
);
}
if (nestedAttachment?.attachments?.[0]?.video_url) {
return (
<VideoAttachment
attachment={nestedAttachment.attachments[0]}
host={host}
author={author}
variantStyles={variantStyles}
msg={msg}
key={index}
/>
);
}
if (nestedAttachment?.attachments?.[0]?.image_url) {
return (
<ImageAttachment
attachment={nestedAttachment.attachments[0]}
host={host}
author={author}
variantStyles={variantStyles}
msg={msg}
key={index}
/>
);
}

return (
<Box
css={[
css`
display: flex;
gap: 0.3rem;
align-items: center;
flex-direction: column;
letter-spacing: 0rem;
font-size: 0.875rem;
font-weight: 400;
word-break: break-word;
border-inline-start: 3px solid ${theme.colors.border};
margin-top: 0.75rem;
padding: 0.5rem;
`,
(nestedAttachment?.type
? variantStyles.pinnedContainer
: '') ||
css`
${!attachment?.type
? `border: 2px solid ${theme.colors.border};`
: ''}
`,
css`
${variantStyles.name !== undefined &&
variantStyles.name.includes('bubble')
? `border-bottom-left-radius: 0.75rem; border-bottom-right-radius: 0.75rem`
: ''}
`,
variantStyles.textUserInfo,
]}
key={index}
>
{nestedAttachment?.author_name && (
<>
<Avatar
url={getUserAvatarUrl(nestedAttachment?.author_icon)}
alt="avatar"
size="1.2em"
/>
<Box>@{nestedAttachment?.author_name}</Box>
</>
)}
</Box>

<AttachmentMetadata
attachment={nestedAttachment}
url={host + (nestedAttachment?.title_link || '')}
variantStyles={variantStyles}
onExpandCollapseClick={toggleExpanded}
isExpanded={isExpanded}
/>

{isExpanded && (
<Box
css={css`
margin-top: 0.5rem;
white-space: pre-line;
`}
css={[
css`
display: flex;
gap: 0.3rem;
align-items: center;
`,
variantStyles.textUserInfo,
]}
>
{nestedAttachment?.text ? (
nestedAttachment.text[0] === '[' ? (
nestedAttachment.text.match(/\n(.*)/)?.[1] || ''
) : (
<Markdown
body={nestedAttachment.text}
md={nestedAttachment.md}
isReaction={false}
{nestedAttachment?.author_name && (
<>
<Avatar
url={getUserAvatarUrl(nestedAttachment?.author_icon)}
alt="avatar"
size="1.2em"
/>
)
) : (
<Box
css={css`
display: flex;
align-items: center;
margin-top: 0.5rem;
background: ${theme.colors.background};
padding: 8px 12px;
border-radius: 4px;
gap: 8px;
border: 1px solid ${theme.colors.border};
`}
>
<Icon name="file" size="40px" />
<Box>@{nestedAttachment?.author_name}</Box>
</>
)}
</Box>

{!nestedAttachment?.text && !nestedAttachment?.attachments && (
<AttachmentMetadata
attachment={nestedAttachment}
url={host + (nestedAttachment?.title_link || '')}
variantStyles={variantStyles}
onExpandCollapseClick={toggleExpanded}
isExpanded={isExpanded}
/>
)}

{isExpanded && (
<Box
css={css`
margin-top: 0.5rem;
white-space: pre-line;
`}
>
{nestedAttachment?.text ? (
nestedAttachment.text[0] === '[' ? (
nestedAttachment.text.match(/\n(.*)/)?.[1] || ''
) : (
<Markdown
body={nestedAttachment.text}
md={nestedAttachment.md}
isReaction={false}
/>
)
) : (
<Box
css={css`
display: flex;
flex-direction: column;
gap: 2px;
line-height: normal;
align-items: center;
margin-top: 0.5rem;
background: ${theme.colors.background};
padding: 8px 12px;
border-radius: 4px;
gap: 8px;
border: 1px solid ${theme.colors.border};
`}
>
<a
href={host + (nestedAttachment?.title_link || ' ')}
download={nestedAttachment?.title_link_download}
css={css`
text-decoration: none;
font-size: 0.875rem;
&:hover {
text-decoration: underline;
}
`}
>
{nestedAttachment?.title}
</a>
<Icon name="file" size="40px" />
<Box
css={css`
font-size: 0.75rem;
display: flex;
flex-direction: column;
gap: 2px;
line-height: normal;
`}
>
{getFileSizeWithFormat(
nestedAttachment?.size,
nestedAttachment?.format
)}
<a
href={host + (nestedAttachment?.title_link || ' ')}
download={nestedAttachment?.title_link_download}
css={css`
text-decoration: none;
font-size: 0.875rem;
&:hover {
text-decoration: underline;
}
`}
>
{nestedAttachment?.title}
</a>
<Box
css={css`
font-size: 0.75rem;
`}
>
{getFileSizeWithFormat(
nestedAttachment?.size,
nestedAttachment?.format
)}
</Box>
</Box>
</Box>
</Box>
)}
</Box>
)}
</Box>
))}
)}
</Box>
)}
</Box>
);
})}
</Box>
</Box>
);
Expand Down