Skip to content

fix: allow forwarding unsafeHTML to system messages (EventComponent) #2973

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

Open
arnautov-anton wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: allow forwarding unsafeHTML to system messages (EventComponent) #2973

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
21 changes: 18 additions & 3 deletions src/components/EventComponent/EventComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export type EventComponentProps = TimestampFormatterOptions & {
message: LocalMessage & {
event?: Event;
};
unsafeHTML?: boolean;
/** Custom UI component to display user avatar, defaults to and accepts same props as: [Avatar](https://github.com/GetStream/stream-chat-react/blob/master/src/components/Avatar/Avatar.tsx) */
Avatar?: React.ComponentType<AvatarProps>;
};
Expand All @@ -21,18 +22,32 @@ export type EventComponentProps = TimestampFormatterOptions & {
* Component to display system and channel event messages
*/
const UnMemoizedEventComponent = (props: EventComponentProps) => {
const { Avatar = DefaultAvatar, calendar, calendarFormats, format, message } = props;
const {
Avatar = DefaultAvatar,
calendar,
calendarFormats,
format,
message,
unsafeHTML = false,
} = props;

const { t, tDateTimeParser } = useTranslationContext('EventComponent');
const { created_at = '', event, text, type } = message;
const { created_at = '', event, type } = message;
const getDateOptions = { messageCreatedAt: created_at.toString(), tDateTimeParser };

if (type === 'system')
return (
<div className='str-chat__message--system' data-testid='message-system'>
<div className='str-chat__message--system__text'>
<div className='str-chat__message--system__line' />
<p>{text}</p>
{unsafeHTML ? (
<div
dangerouslySetInnerHTML={{ __html: message.html || '' }}
data-unsafe-inner-html
/>
) : (
<p>{message.text}</p>
)}
<div className='str-chat__message--system__line' />
</div>
<div className='str-chat__message--system__date'>
Expand Down
2 changes: 1 addition & 1 deletion src/components/MessageList/renderMessages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export function defaultRenderMessages({
data-message-id={message.id}
key={message.id || message.created_at.toISOString()}
>
<MessageSystem message={message} />
<MessageSystem message={message} unsafeHTML={messageProps.unsafeHTML} />
</MessageListItem>,
);
} else {
Expand Down
Loading