diff --git a/src/components/middle/message/Message.scss b/src/components/middle/message/Message.scss index f57d730d3..d20d0b1a9 100644 --- a/src/components/middle/message/Message.scss +++ b/src/components/middle/message/Message.scss @@ -586,6 +586,10 @@ } .message-content { + &.has-replies:not(.custom-shape):not(.has-reactions) .WebPage.with-video .media-inner { + margin-bottom: 1.5rem !important; + } + &.has-replies:not(.custom-shape), &.text { .media-inner, diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx index 506f87b87..b0b866f0c 100644 --- a/src/components/middle/message/Message.tsx +++ b/src/components/middle/message/Message.tsx @@ -322,6 +322,7 @@ const Message: FC = ({ const hasThread = Boolean(threadInfo) && messageListType === 'thread'; const customShape = getMessageCustomShape(message); const hasAnimatedEmoji = localSticker || animatedEmoji; + const hasReactions = reactionMessage?.reactions && !areReactionsEmpty(reactionMessage.reactions); const asForwarded = ( forwardInfo && (!isChatWithSelf || isScheduled) @@ -457,6 +458,7 @@ const Message: FC = ({ forceSenderName, hasComments: threadInfo && threadInfo?.messagesCount > 0, hasActionButton: canForward || canFocus, + hasReactions, }); const withAppendix = contentClassName.includes('has-appendix'); @@ -478,7 +480,7 @@ const Message: FC = ({ let reactionsPosition!: ReactionsPosition; if (areReactionsInMeta) { reactionsPosition = 'in-meta'; - } else if (reactionMessage?.reactions && !areReactionsEmpty(reactionMessage.reactions)) { + } else if (hasReactions) { if (customShape || ((photo || video || hasAnimatedEmoji) && !textParts)) { reactionsPosition = 'outside'; } else if (asForwarded) { diff --git a/src/components/middle/message/WebPage.scss b/src/components/middle/message/WebPage.scss index 0f0734f42..1d66cb044 100644 --- a/src/components/middle/message/WebPage.scss +++ b/src/components/middle/message/WebPage.scss @@ -46,7 +46,7 @@ } } - &.with-video .media-inner{ + &.with-video .media-inner { margin-top: 0.5rem !important; margin-bottom: 1rem !important; } diff --git a/src/components/middle/message/helpers/buildContentClassName.ts b/src/components/middle/message/helpers/buildContentClassName.ts index df6a37afa..28649bf7c 100644 --- a/src/components/middle/message/helpers/buildContentClassName.ts +++ b/src/components/middle/message/helpers/buildContentClassName.ts @@ -17,6 +17,7 @@ export function buildContentClassName( forceSenderName, hasComments, hasActionButton, + hasReactions, }: { hasReply?: boolean; customShape?: boolean | number; @@ -26,6 +27,7 @@ export function buildContentClassName( forceSenderName?: boolean; hasComments?: boolean; hasActionButton?: boolean; + hasReactions?: boolean; } = {}, ) { const { @@ -89,6 +91,10 @@ export function buildContentClassName( classNames.push('has-replies'); } + if (hasReactions) { + classNames.push('has-reactions'); + } + if (isViaBot) { classNames.push('is-via-bot'); }