Skip to content

refactor: Update Message component structure and imports for consistency #38237

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 2 commits into from
Jan 19, 2026
Merged

refactor: Update Message component structure and imports for consistency #38237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d45df4
refactor: Update `Message` component structure and imports for consis…
tassoevan Jan 17, 2026
372a676
Merge branch 'develop' into refactor/message-component-namespace
kodiakhq[bot] Jan 19, 2026
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
44 changes: 29 additions & 15 deletions apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,20 @@
import type { IMessage, MessageReport, MessageAttachment } from '@rocket.chat/core-typings';
import { isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
import { Message, MessageName, MessageToolbarItem, MessageToolbarWrapper, MessageUsername } from '@rocket.chat/fuselage';
import {
Message,
MessageDivider,
MessageLeftContainer,
MessageContainer,
MessageHeader,
MessageTimestamp,
MessageRole,
MessageBody,
MessageName,
MessageToolbar,
MessageToolbarItem,
MessageToolbarWrapper,
MessageUsername,
} from '@rocket.chat/fuselage';
import { UserAvatar } from '@rocket.chat/ui-avatar';
import { useUserDisplayName } from '@rocket.chat/ui-client';
import { useSetting } from '@rocket.chat/ui-contexts';
Expand Down Expand Up @@ -53,22 +67,22 @@ const ContextMessage = ({

return (
<>
<Message.Divider>{formatDate(message._updatedAt)}</Message.Divider>
<MessageDivider>{formatDate(message._updatedAt)}</MessageDivider>
<Message>
<Message.LeftContainer>
<MessageLeftContainer>
<UserAvatar username={message.u.username} />
</Message.LeftContainer>
<Message.Container>
<Message.Header>
</MessageLeftContainer>
<MessageContainer>
<MessageHeader>
<MessageName>{displayName}</MessageName>
<>{useRealName && <MessageUsername>&nbsp;{`@${message.u.username}`}</MessageUsername>}</>
<Message.Timestamp title={formatDateAndTime(message._updatedAt)}>
<MessageTimestamp title={formatDateAndTime(message._updatedAt)}>
{formatTime(message._updatedAt !== message.ts ? message._updatedAt : message.ts)}
{message._updatedAt !== message.ts && ` (${t('edited')})`}
</Message.Timestamp>
<Message.Role>{room.name || room.fname || 'DM'}</Message.Role>
</Message.Header>
<Message.Body>
</MessageTimestamp>
<MessageRole>{room.name || room.fname || 'DM'}</MessageRole>
</MessageHeader>
<MessageBody>
{!!quotes?.length && <Attachments attachments={quotes} />}
{!message.blocks?.length && !!message.md?.length ? (
<>
Expand All @@ -83,21 +97,21 @@ const ContextMessage = ({

{!!attachments && <Attachments id={message.files?.[0]?._id} attachments={attachments} />}
{message.blocks && <UiKitMessageBlock rid={message.rid} mid={message._id} blocks={message.blocks} />}
</Message.Body>
</MessageBody>
<ReportReasonCollapsible>
<MessageReportInfo msgId={message._id} />
</ReportReasonCollapsible>
</Message.Container>
</MessageContainer>
<MessageToolbarWrapper>
<Message.Toolbar>
<MessageToolbar>
<MessageToolbarItem
icon='checkmark-circled'
title={t('Moderation_Dismiss_reports')}
onClick={() => dismissMsgReport.action()}
/>
<MessageToolbarItem icon='arrow-forward' title={t('Moderation_Go_to_message')} onClick={() => onRedirect(message._id)} />
<MessageToolbarItem disabled={deleted} icon='trash' title={t('Moderation_Delete_message')} onClick={() => deleteMessage()} />
</Message.Toolbar>
</MessageToolbar>
</MessageToolbarWrapper>
</Message>
</>
Expand Down
64 changes: 39 additions & 25 deletions apps/meteor/client/views/room/contextualBar/Discussions/components/DiscussionsListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
import type { IDiscussionMessage } from '@rocket.chat/core-typings';
import { Box, Message } from '@rocket.chat/fuselage';
import {
Box,
Message,
MessageLeftContainer,
MessageContainer,
MessageHeader,
MessageName,
MessageTimestamp,
MessageBody,
MessageBlock,
MessageMetrics,
MessageMetricsItem,
MessageMetricsItemLabel,
MessageMetricsItemIcon,
} from '@rocket.chat/fuselage';
import { MessageAvatar } from '@rocket.chat/ui-avatar';
import type { ComponentProps, ReactElement, ReactNode } from 'react';
import { memo } from 'react';
Expand Down Expand Up @@ -36,37 +50,37 @@ const DiscussionListItem = ({
const { t } = useTranslation();
return (
<Box is={Message} {...props} className={className} pbs={16} pbe={8}>
<Message.LeftContainer>
<MessageLeftContainer>
<MessageAvatar emoji={emoji ? <Emoji emojiHandle={emoji} fillContainer /> : undefined} username={username} size='x36' />
</Message.LeftContainer>
<Message.Container>
<Message.Header>
<Message.Name title={username}>{name}</Message.Name>
<Message.Timestamp>{formatDate(ts)}</Message.Timestamp>
</Message.Header>
<Message.Body clamp={2}>{msg}</Message.Body>
<Message.Block>
<Message.Metrics>
</MessageLeftContainer>
<MessageContainer>
<MessageHeader>
<MessageName title={username}>{name}</MessageName>
<MessageTimestamp>{formatDate(ts)}</MessageTimestamp>
</MessageHeader>
<MessageBody clamp={2}>{msg}</MessageBody>
<MessageBlock>
<MessageMetrics>
{!dcount && (
<Message.Metrics.Item>
<Message.Metrics.Item.Label>{t('No_messages_yet')}</Message.Metrics.Item.Label>
</Message.Metrics.Item>
<MessageMetricsItem>
<MessageMetricsItemLabel>{t('No_messages_yet')}</MessageMetricsItemLabel>
</MessageMetricsItem>
)}
{!!dcount && (
<Message.Metrics.Item>
<Message.Metrics.Item.Icon name='discussion' />
<Message.Metrics.Item.Label>{dcount}</Message.Metrics.Item.Label>
</Message.Metrics.Item>
<MessageMetricsItem>
<MessageMetricsItemIcon name='discussion' />
<MessageMetricsItemLabel>{dcount}</MessageMetricsItemLabel>
</MessageMetricsItem>
)}
{!!dcount && (
<Message.Metrics.Item>
<Message.Metrics.Item.Icon name='clock' />
<Message.Metrics.Item.Label>{dlm ? formatDate(dlm) : undefined}</Message.Metrics.Item.Label>
</Message.Metrics.Item>
<MessageMetricsItem>
<MessageMetricsItemIcon name='clock' />
<MessageMetricsItemLabel>{dlm ? formatDate(dlm) : undefined}</MessageMetricsItemLabel>
</MessageMetricsItem>
)}
</Message.Metrics>
</Message.Block>
</Message.Container>
</MessageMetrics>
</MessageBlock>
</MessageContainer>
</Box>
);
};
Expand Down
34 changes: 22 additions & 12 deletions apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
import type { IMessage } from '@rocket.chat/core-typings';
import { Message, Box } from '@rocket.chat/fuselage';
import {
Message,
MessageLeftContainer,
MessageContainer,
MessageHeader,
MessageName,
MessageTimestamp,
MessageBody,
MessageContainerFixed,
Box,
} from '@rocket.chat/fuselage';
import { MessageAvatar } from '@rocket.chat/ui-avatar';
import type { ComponentProps, ReactElement, ReactNode } from 'react';
import { memo } from 'react';
Expand Down Expand Up @@ -50,25 +60,25 @@ const ThreadListMessage = ({
return (
<Box className={className}>
<Box pbs={16} is={Message} {...props}>
<Message.LeftContainer>
<MessageLeftContainer>
<MessageAvatar emoji={emoji ? <Emoji emojiHandle={emoji} fillContainer /> : undefined} username={username} size='x36' />
</Message.LeftContainer>
<Message.Container>
<Message.Header>
<Message.Name title={username}>{name}</Message.Name>
<Message.Timestamp>{formatDate(ts)}</Message.Timestamp>
</Message.Header>
<Message.Body clamp={2}>{msg}</Message.Body>
</MessageLeftContainer>
<MessageContainer>
<MessageHeader>
<MessageName title={username}>{name}</MessageName>
<MessageTimestamp>{formatDate(ts)}</MessageTimestamp>
</MessageHeader>
<MessageBody clamp={2}>{msg}</MessageBody>
<ThreadListMetrics lm={tlm} participants={participants || []} counter={replies} />
</Message.Container>
<Message.ContainerFixed>
</MessageContainer>
<MessageContainerFixed>
<ThreadMetricsFollow following={following} mid={_id} rid={rid} mention={false} unread={false} all={false} />
{unread && (
<Box mbs={24}>
<ThreadMetricsUnreadBadge unread={unread} mention={mention} all={all} />
</Box>
)}
</Message.ContainerFixed>
</MessageContainerFixed>
</Box>
</Box>
);
Expand Down
37 changes: 26 additions & 11 deletions ...eteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
import type { VideoConference } from '@rocket.chat/core-typings';
import { css } from '@rocket.chat/css-in-js';
import { Button, Message, Box, Palette, IconButton, ButtonGroup, AvatarStack } from '@rocket.chat/fuselage';
import {
Button,
Message,
MessageLeftContainer,
MessageContainer,
MessageHeader,
MessageName,
MessageTimestamp,
MessageBody,
MessageBlock,
Box,
Palette,
IconButton,
ButtonGroup,
AvatarStack,
} from '@rocket.chat/fuselage';
import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
import { UserAvatar } from '@rocket.chat/ui-avatar';
import { useUserDisplayName } from '@rocket.chat/ui-client';
Expand Down Expand Up @@ -65,15 +80,15 @@ const VideoConfListItem = ({
pb={8}
>
<Message {...props}>
<Message.LeftContainer>{username && <UserAvatar username={username} size='x36' />}</Message.LeftContainer>
<Message.Container>
<Message.Header>
<Message.Name title={username}>{displayName}</Message.Name>
<Message.Timestamp>{formatDate(createdAt)}</Message.Timestamp>
</Message.Header>
<Message.Body clamp={2} />
<MessageLeftContainer>{username && <UserAvatar username={username} size='x36' />}</MessageLeftContainer>
<MessageContainer>
<MessageHeader>
<MessageName title={username}>{displayName}</MessageName>
<MessageTimestamp>{formatDate(createdAt)}</MessageTimestamp>
</MessageHeader>
<MessageBody clamp={2} />
<Box display='flex'></Box>
<Message.Block flexDirection='row' alignItems='center'>
<MessageBlock flexDirection='row' alignItems='center'>
<ButtonGroup>
<Button disabled={Boolean(endedAt)} small alignItems='center' display='flex' onClick={handleJoinConference}>
{endedAt ? t('Call_ended') : t('Join_call')}
Expand Down Expand Up @@ -117,8 +132,8 @@ const VideoConfListItem = ({
{t('Be_the_first_to_join')}
</Box>
)}
</Message.Block>
</Message.Container>
</MessageBlock>
</MessageContainer>
</Message>
</Box>
);
Expand Down
56 changes: 35 additions & 21 deletions apps/uikit-playground/src/Components/Preview/Display/Surface/MessageSurface.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,46 @@
import { Message, Avatar } from '@rocket.chat/fuselage';
import {
Message,
MessageLeftContainer,
MessageContainer,
MessageHeader,
MessageName,
MessageUsername,
MessageRole,
MessageTimestamp,
MessageBody,
MessageToolbarWrapper,
MessageToolbar,
MessageToolbarItem,
Avatar,
} from '@rocket.chat/fuselage';
import type { ReactNode } from 'react';

const MessageSurface = ({ children }: { children: ReactNode }) => (
<Message>
<Message.LeftContainer>
<MessageLeftContainer>
<Avatar
url="data:image/jpeg;base64,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"
size={'x36'}
/>
</Message.LeftContainer>
<Message.Container>
<Message.Header>
<Message.Name>Vivek Srivastava</Message.Name>
<Message.Username>@vivek.srivastava</Message.Username>
<Message.Role>Admin</Message.Role>
<Message.Role>User</Message.Role>
<Message.Role>Owner</Message.Role>
<Message.Timestamp>12:00 PM</Message.Timestamp>
</Message.Header>
<Message.Body>{children}</Message.Body>
</Message.Container>
<Message.Toolbar.Wrapper>
<Message.Toolbar>
<Message.Toolbar.Item icon="quote" />
<Message.Toolbar.Item icon="clock" />
<Message.Toolbar.Item icon="thread" />
</Message.Toolbar>
</Message.Toolbar.Wrapper>
</MessageLeftContainer>
<MessageContainer>
<MessageHeader>
<MessageName>Vivek Srivastava</MessageName>
<MessageUsername>@vivek.srivastava</MessageUsername>
<MessageRole>Admin</MessageRole>
<MessageRole>User</MessageRole>
<MessageRole>Owner</MessageRole>
<MessageTimestamp>12:00 PM</MessageTimestamp>
</MessageHeader>
<MessageBody>{children}</MessageBody>
</MessageContainer>
<MessageToolbarWrapper>
<MessageToolbar>
<MessageToolbarItem icon="quote" />
<MessageToolbarItem icon="clock" />
<MessageToolbarItem icon="thread" />
</MessageToolbar>
</MessageToolbarWrapper>
</Message>
);

Expand Down
Loading
Loading