Skip to content

[FIX] Reactions list showing users in reactions option of message action. #20753

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
ggazzo merged 4 commits into from
Mar 22, 2021
Merged

[FIX] Reactions list showing users in reactions option of message action. #20753

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b949d1
Fixed reactions list
Darshilp326 Feb 13, 2021
c5298ac
Merge branch 'develop' into Reactions-list
Mar 4, 2021
cee9e16
fix reactions
Mar 4, 2021
94740c3
Merge branch 'develop' into Reactions-list
tiagoevanp Mar 16, 2021
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
16 changes: 8 additions & 8 deletions app/ui-utils/client/lib/ReactionListContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
import { useTranslation } from '../../../../client/contexts/TranslationContext';
import { useSetting } from '../../../../client/contexts/SettingsContext';
import Emoji from '../../../../client/components/Emoji';
import ScrollableContentWrapper from '../../../../client/components/ScrollableContentWrapper';
import { openUserCard } from '../../../ui/client/lib/UserCard';
import ScrollableContentWrapper from '../../../../client/components/ScrollableContentWrapper';

export function Reactions({ reactions, onClick }) {
const useRealName = useSetting('UI_Use_Real_Name');
return <ScrollableContentWrapper>
<Box>
return <Box display='flex' flexDirection='column' minHeight='22vh'>
<ScrollableContentWrapper>
{Object.entries(reactions).map(([reaction, { names = [], usernames }]) => <Box key={reaction}>
<Box display='flex' flexWrap='wrap' overflowX='hidden' mb='x8'>
<Box display='flex' alignItems='center' flexDirection='row' overflowX='hidden' mb='x8'>
<Emoji emojiHandle={reaction} />
<Box paddingBlock='x4' mis='x4'>
<Box display='flex' flexWrap='wrap' paddingBlock='x4' mis='x4'>
{usernames.map((username, i) => <Username
key={username}
displayName={useRealName ? names[i] || username : username}
Expand All @@ -25,13 +25,13 @@ export function Reactions({ reactions, onClick }) {
</Box>
</Box>
</Box>)}
</Box>
</ScrollableContentWrapper>;
</ScrollableContentWrapper>
</Box>;
}

export function Username({ username, onClick, displayName }) {
return (
<Box marginInlineEnd='x4' data-username={username} onClick={onClick} key={displayName}>
<Box mie='x4' mbe='x4' data-username={username} onClick={onClick} key={displayName}>
<Tag>{displayName}</Tag>
</Box>
);
Expand Down
36 changes: 18 additions & 18 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.