Skip to content

Commit 14b131c

Browse files
authored
regression: Collapsible quote not rendering after #6121 (#6677)
1 parent 6ce0dbc commit 14b131c

File tree

3 files changed

+2415
-1
lines changed

3 files changed

+2415
-1
lines changed

app/containers/message/Components/Attachments/Attachments.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { IAttachment } from '../../../../definitions';
1313
import { getMessageFromAttachment } from '../../utils';
1414

1515
const removeQuote = (file?: IAttachment) =>
16-
file?.image_url || file?.audio_url || file?.video_url || (file?.actions?.length || 0) > 0;
16+
file?.image_url || file?.audio_url || file?.video_url || (file?.actions?.length || 0) > 0 || file?.collapsed;
1717

1818
const Attachments: React.FC<IMessageAttachments> = React.memo(
1919
({ attachments, timeFormat, showAttachment, style, getCustomEmoji, isReply, author }: IMessageAttachments) => {

app/containers/message/Message.stories.tsx

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,3 +1985,33 @@ export const LongNameUserLargeFont = () => (
19851985
/>
19861986
</>
19871987
);
1988+
1989+
const collapsedAttachments = {
1990+
collapsed: true,
1991+
title: 'Title collapsed',
1992+
fields: [
1993+
{
1994+
title: 'Field 1',
1995+
value: 'Value 1'
1996+
},
1997+
{
1998+
title: 'Field 2',
1999+
value: 'Value 2'
2000+
}
2001+
]
2002+
};
2003+
export const CollapsedAttachments = () => (
2004+
<>
2005+
<Message msg='Message' attachments={[collapsedAttachments]} />
2006+
{/* technically not CollapsibleQuote, but it's similar enough to write a story for */}
2007+
<Message msg='Message' attachments={[{ ...collapsedAttachments, collapsed: false }]} />
2008+
</>
2009+
);
2010+
2011+
export const CollapsedAttachmentsLargeFont = () => (
2012+
<>
2013+
<MessageLargeFont msg='Message' attachments={[collapsedAttachments]} />
2014+
{/* technically not CollapsibleQuote, but it's similar enough to write a story for */}
2015+
<MessageLargeFont msg='Message' attachments={[{ ...collapsedAttachments, collapsed: false }]} />
2016+
</>
2017+
);

0 commit comments

Comments
 (0)