Skip to content

[QU-305] Match width of message and emoji reactions #43

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
merged 1 commit into from
Oct 26, 2021
Merged

[QU-305] Match width of message and emoji reactions #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 17 additions & 2 deletions src/ui/MessageContent/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@
&.incoming { justify-content: flex-start; }
&.outgoing { justify-content: flex-end; }
.sendbird-message-content__middle {
.sendbird-message-content__middle__message-item-body.use-quote {
.sendbird-message-content__middle__body-container.use-quote {
top: -8px;
width: fit-content;
}
}
}
Expand Down Expand Up @@ -149,6 +148,10 @@
&.outgoing { justify-content: flex-end }
&.incoming { justify-content: flex-start }
}

.sendbird-message-content__middle__body-container {
width: fit-content;
}
}

.sendbird-message-content__right {
Expand All @@ -167,6 +170,18 @@
}
}

.sendbird-message-content__middle__body-container {
position: relative;
width: fit-content;
.sendbird-message-content__middle__message-item-body {
width: 100%;
box-sizing: border-box;
}
.sendbird-message-content-reactions {
width: 100%;
}
}

.sendbird-message-content-reactions {
position: relative;
width: 100%;
Expand Down
119 changes: 61 additions & 58 deletions src/ui/MessageContent/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,68 +185,71 @@ export default function MessageContent({
{/* quote message */}
{(useReplying) ? (
<div className={getClassName(['sendbird-message-content__middle__quote-message', isByMe ? 'outgoing' : 'incoming'])}>
<QuoteMessage message={message} isByMe={isByMe} />
<QuoteMessage message={message} isByMe={isByMe} />
</div>
): null}
{/* message item body components */}
{isTextMessage(message as UserMessage) && (
<TextMessageItemBody
className={['sendbird-message-content__middle__message-item-body', useReplyingClassName]}
message={message as UserMessage}
isByMe={isByMe}
mouseHover={mouseHover}
/>
)}
{(isOGMessage(message as UserMessage)) && (
<OGMessageItemBody
className={['sendbird-message-content__middle__message-item-body', useReplyingClassName]}
message={message as UserMessage}
isByMe={isByMe}
mouseHover={mouseHover}
/>
)}
{(getUIKitMessageType((message as FileMessage)) === messageTypes.FILE) && (
<FileMessageItemBody
className={['sendbird-message-content__middle__message-item-body', useReplyingClassName]}
message={message as FileMessage}
isByMe={isByMe}
mouseHover={mouseHover}
/>
)}
{(isThumbnailMessage(message as FileMessage)) && (
<ThumbnailMessageItemBody
className={['sendbird-message-content__middle__message-item-body', useReplyingClassName]}
message={message as FileMessage}
isByMe={isByMe}
mouseHover={mouseHover}
showFileViewer={showFileViewer}
/>
)}
{(getUIKitMessageType((message as FileMessage)) === messageTypes.UNKNOWN) && (
<UnknownMessageItemBody
className={['sendbird-message-content__middle__message-item-body', useReplyingClassName]}
message={message}
isByMe={isByMe}
mouseHover={mouseHover}
/>
)}
{/* reactions */}
{(useReaction && message?.reactions?.length > 0) && (
<div className={getClassName([
'sendbird-message-content-reactions',
(!isByMe || isThumbnailMessage(message as FileMessage) || isOGMessage(message as UserMessage)) ? '' : 'primary',
mouseHover ? 'mouse-hover' : '',
])}>
<EmojiReactions
userId={userId}
) : null}
{/* container: message item body + emoji reactions */}
<div className={getClassName(['sendbird-message-content__middle__body-container', useReplyingClassName])} >
{/* message item body components */}
{isTextMessage(message as UserMessage) && (
<TextMessageItemBody
className="sendbird-message-content__middle__message-item-body"
message={message as UserMessage}
isByMe={isByMe}
mouseHover={mouseHover}
/>
)}
{(isOGMessage(message as UserMessage)) && (
<OGMessageItemBody
className="sendbird-message-content__middle__message-item-body"
message={message as UserMessage}
isByMe={isByMe}
mouseHover={mouseHover}
/>
)}
{(getUIKitMessageType((message as FileMessage)) === messageTypes.FILE) && (
<FileMessageItemBody
className="sendbird-message-content__middle__message-item-body"
message={message as FileMessage}
isByMe={isByMe}
mouseHover={mouseHover}
/>
)}
{(isThumbnailMessage(message as FileMessage)) && (
<ThumbnailMessageItemBody
className="sendbird-message-content__middle__message-item-body"
message={message as FileMessage}
isByMe={isByMe}
mouseHover={mouseHover}
showFileViewer={showFileViewer}
/>
)}
{(getUIKitMessageType((message as FileMessage)) === messageTypes.UNKNOWN) && (
<UnknownMessageItemBody
className="sendbird-message-content__middle__message-item-body"
message={message}
isByMe={isByMe}
emojiContainer={emojiContainer}
memberNicknamesMap={nicknamesMap}
toggleReaction={toggleReaction}
mouseHover={mouseHover}
/>
</div>
)}
)}
{/* reactions */}
{(useReaction && message?.reactions?.length > 0) && (
<div className={getClassName([
'sendbird-message-content-reactions',
(!isByMe || isThumbnailMessage(message as FileMessage) || isOGMessage(message as UserMessage)) ? '' : 'primary',
mouseHover ? 'mouse-hover' : '',
])}>
<EmojiReactions
userId={userId}
message={message}
isByMe={isByMe}
emojiContainer={emojiContainer}
memberNicknamesMap={nicknamesMap}
toggleReaction={toggleReaction}
/>
</div>
)}
</div>
</div>
{/* right */}
<div className={getClassName(['sendbird-message-content__right', chainTopClassName, useReactionClassName, useReplyingClassName])}>
Expand Down