Skip to content

[FIX] Pinned Message display cutting off information #25535

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

Merged
gabriellsh merged 8 commits into from
May 23, 2022
Merged

[FIX] Pinned Message display cutting off information #25535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
81d8329
fix(MessageAttachment): Pinned Message display
hugocostadev May 17, 2022
32c4b11
fix: fixing yarn lock file
hugocostadev May 17, 2022
47c6ee8
Merge branch 'develop' into fix/pinned-messages-display
hugocostadev May 19, 2022
cc35636
fix: adding white space style to Pinned Messages
hugocostadev May 23, 2022
0ddb4db
Merge branch 'develop' into fix/pinned-messages-display
hugocostadev May 23, 2022
d8708e8
fix: sending yarn.lock
hugocostadev May 23, 2022
e19b247
review
gabriellsh May 23, 2022
c2a8238
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…
gabriellsh May 23, 2022
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
17 changes: 16 additions & 1 deletion apps/meteor/client/components/Message/Attachments/Attachment/Attachment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
import { css } from '@rocket.chat/css-in-js';
import { Box } from '@rocket.chat/fuselage';
import { useAttachmentDimensions } from '@rocket.chat/ui-contexts';
import React, { ComponentProps, FC } from 'react';

const className = css`
white-space: normal;
`;

const Attachment: FC<ComponentProps<typeof Box>> = (props) => {
const { width } = useAttachmentDimensions();
return (
<Box rcx-message-attachment mb='x4' maxWidth={width} width='full' display='flex' overflow='hidden' flexDirection='column' {...props} />
<Box
rcx-message-attachment
mb='x4'
maxWidth={width}
width='full'
display='flex'
overflow='hidden'
flexDirection='column'
className={className}
{...props}
/>
);
};

Expand Down
9 changes: 6 additions & 3 deletions apps/meteor/client/components/Message/Attachments/DefaultAttachment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { isActionAttachment, MarkdownFields, MessageAttachmentDefault } from '@rocket.chat/core-typings';
import React, { FC, ReactNode } from 'react';
import React, { FC, ReactNode, ComponentProps } from 'react';

import MarkdownText from '../../MarkdownText';
import { ActionAttachment } from './ActionAttachtment';
Expand All @@ -11,7 +11,8 @@ const applyMarkdownIfRequires = (
list: MessageAttachmentDefault['mrkdwn_in'] = ['text', 'pretext'],
key: MarkdownFields,
text: string,
): ReactNode => (list?.includes(key) ? <MarkdownText parseEmoji variant='inline' content={text} /> : text);
variant: ComponentProps<typeof MarkdownText>['variant'] = 'inline',
): ReactNode => (list?.includes(key) ? <MarkdownText parseEmoji variant={variant} content={text} /> : text);

const DefaultAttachment: FC<MessageAttachmentDefault> = (attachment) => {
const [collapsed, collapse] = useCollapse(!!attachment.collapsed);
Expand Down Expand Up @@ -58,7 +59,9 @@ const DefaultAttachment: FC<MessageAttachmentDefault> = (attachment) => {
)}
{!collapsed && (
<>
{attachment.text && <Attachment.Text>{applyMarkdownIfRequires(attachment.mrkdwn_in, 'text', attachment.text)}</Attachment.Text>}
{attachment.text && (
<Attachment.Text>{applyMarkdownIfRequires(attachment.mrkdwn_in, 'text', attachment.text, 'document')}</Attachment.Text>
)}
{/* {attachment.fields && <FieldsAttachment fields={attachment.mrkdwn_in?.includes('fields') ? attachment.fields.map(({ value, ...rest }) => ({ ...rest, value: <MarkdownText withRichContent={null} content={value} /> })) : attachment.fields} />} */}
{attachment.fields && (
<FieldsAttachment
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/components/Message/Attachments/QuoteAttachment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export const QuoteAttachment: FC<MessageQuoteAttachment> = ({
</Box>
)}
</Attachment.Author>
<MarkdownText parseEmoji variant='inline' content={text} />
<MarkdownText parseEmoji variant='document' content={text} />
{attachments && (
<Attachment.Inner mbe='-12px'>
<Attachments attachments={attachments} />
Expand Down