Skip to content

[FIX] Gap between message content and message header when there's no text. #27165

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
kodiakhq merged 14 commits into from
Nov 2, 2022
Merged

[FIX] Gap between message content and message header when there's no text. #27165

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0ca9aa1
Hide block when AST is empty
gabriellsh Nov 1, 2022
d89fffc
Merge branch 'develop' into fix/messageGap
gabriellsh Nov 1, 2022
88377db
Fix body inside body
gabriellsh Nov 1, 2022
349865f
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…
gabriellsh Nov 1, 2022
1832d99
Merge branch 'fix/messageGap' of github.com:RocketChat/Rocket.Chat in…
gabriellsh Nov 1, 2022
fd29d5d
Move MessageBody again
gabriellsh Nov 1, 2022
f040ba3
Oops
gabriellsh Nov 1, 2022
9ecbc7c
Merge branch 'develop' into fix/messageGap
kodiakhq[bot] Nov 1, 2022
cc30341
Merge branch 'develop' into fix/messageGap
kodiakhq[bot] Nov 2, 2022
d984943
Merge branch 'develop' into fix/messageGap
kodiakhq[bot] Nov 2, 2022
a4438af
Merge branch 'develop' into fix/messageGap
kodiakhq[bot] Nov 2, 2022
82ca91d
Merge branch 'develop' into fix/messageGap
kodiakhq[bot] Nov 2, 2022
b20922e
Merge branch 'develop' into fix/messageGap
kodiakhq[bot] Nov 2, 2022
af284ad
Merge branch 'develop' into fix/messageGap
kodiakhq[bot] Nov 2, 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
11 changes: 5 additions & 6 deletions apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable complexity */
import { IMessage, isDiscussionMessage, isThreadMainMessage, ISubscription, isE2EEMessage } from '@rocket.chat/core-typings';
import { MessageBody, MessageBlock } from '@rocket.chat/fuselage';
import { MessageBlock } from '@rocket.chat/fuselage';
import { useTranslation, useUserId, TranslationKey } from '@rocket.chat/ui-contexts';
import React, { FC, memo } from 'react';

Expand Down Expand Up @@ -54,14 +54,13 @@ const MessageContent: FC<{

return (
<>
{!message.blocks?.length && message.md && (
<MessageBody data-qa-type='message-body'>
{!isEncryptedMessage && <MessageContentBody md={message.md} mentions={message.mentions} channels={message.channels} />}
{isEncryptedMessage && message.e2e === 'done' && (
{!message.blocks?.length && !!message.md?.length && (
<>
{(!isEncryptedMessage || message.e2e === 'done') && (
<MessageContentBody md={message.md} mentions={message.mentions} channels={message.channels} />
)}
{isEncryptedMessage && message.e2e === 'pending' && t('E2E_message_encrypted_placeholder')}
</MessageBody>
</>
)}

{message.blocks && (
Expand Down
4 changes: 2 additions & 2 deletions apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { css } from '@rocket.chat/css-in-js';
import { Box, MessageBody, Palette } from '@rocket.chat/fuselage';
import { MessageBody, Box, Palette } from '@rocket.chat/fuselage';
import { MarkupInteractionContext, Markup, UserMention, ChannelMention } from '@rocket.chat/gazzodown';
import { escapeRegExp } from '@rocket.chat/string-helpers';
import { useLayout, useUserPreference } from '@rocket.chat/ui-contexts';
Expand Down Expand Up @@ -126,7 +126,7 @@ const MessageContentBody = ({ mentions, channels, md }: MessageContentBodyProps)
const convertAsciiToEmoji = useUserPreference<boolean>('convertAsciiEmoji', true);

return (
<MessageBody>
<MessageBody data-qa-type='message-body'>
<Box className={messageBodyAdditionalStyles}>
<MarkupInteractionContext.Provider
value={{
Expand Down