-
Notifications
You must be signed in to change notification settings - Fork 10.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[IMPROVE] Message rewrite code structure (#24723)
* improve code structure a little bit * fix types * Fix review
- Loading branch information
1 parent
7e3f19e
commit 27378db
Showing
11 changed files
with
150 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
import { IMessage } from '../../definition/IMessage'; | ||
|
||
export const isE2EEMessage = (message: IMessage): boolean => message.t === 'e2e'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
client/views/room/MessageList/components/MessageReactionsList.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
import { MessageReactions, MessageReactionAction } from '@rocket.chat/fuselage'; | ||
import React, { ReactElement } from 'react'; | ||
|
||
import { IMessage } from '../../../../../definition/IMessage'; | ||
import { useOpenEmojiPicker, useReactionsFilter, useReactToMessage, useUserHasReacted } from '../contexts/MessageListContext'; | ||
import { MessageReaction } from './MessageReaction'; | ||
|
||
const MessageReactionsList = ({ message }: { message: IMessage }): ReactElement | null => { | ||
const hasReacted = useUserHasReacted(message); | ||
const reactToMessage = useReactToMessage(message); | ||
const filterReactions = useReactionsFilter(message); | ||
const openEmojiPicker = useOpenEmojiPicker(message); | ||
|
||
return ( | ||
<MessageReactions> | ||
{message.reactions && | ||
Object.entries(message.reactions).map(([name, reactions]) => ( | ||
<MessageReaction | ||
key={name} | ||
counter={reactions.usernames.length} | ||
hasReacted={hasReacted} | ||
reactToMessage={reactToMessage} | ||
name={name} | ||
names={filterReactions(name)} | ||
/> | ||
))} | ||
<MessageReactionAction onClick={openEmojiPicker} /> | ||
</MessageReactions> | ||
); | ||
}; | ||
|
||
export default MessageReactionsList; |
17 changes: 17 additions & 0 deletions
17
client/views/room/MessageList/components/MessageReadReceipt.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import { css } from '@rocket.chat/css-in-js'; | ||
import { Box, Icon } from '@rocket.chat/fuselage'; | ||
import React, { ReactElement } from 'react'; | ||
|
||
const MessageReadReceipt = (): ReactElement | null => ( | ||
<Box | ||
position='absolute' | ||
className={css` | ||
top: 2px; | ||
right: 0.5rem; | ||
`} | ||
> | ||
<Icon name='check' size='x11' color='primary' /> | ||
</Box> | ||
); | ||
|
||
export default MessageReadReceipt; |
25 changes: 25 additions & 0 deletions
25
client/views/room/MessageList/components/MessageRolesList.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import { MessageRole, MessageRoles } from '@rocket.chat/fuselage'; | ||
import React, { ReactElement } from 'react'; | ||
|
||
import { useTranslation } from '../../../../contexts/TranslationContext'; | ||
import { UserPresence } from '../../../../lib/presence'; | ||
|
||
type MessageRolesListProps = { | ||
user: UserPresence; | ||
isBot?: boolean; | ||
}; | ||
|
||
const MessageRolesList = ({ user, isBot }: MessageRolesListProps): ReactElement | null => { | ||
const t = useTranslation(); | ||
|
||
return ( | ||
<MessageRoles> | ||
{user.roles?.map((role, index) => ( | ||
<MessageRole key={index}>{role}</MessageRole> | ||
))} | ||
{isBot && <MessageRole>{t('Bot')}</MessageRole>} | ||
</MessageRoles> | ||
); | ||
}; | ||
|
||
export default MessageRolesList; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.