haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(notifications): support html descriptions

This commit is contained in:
Mihaela Dumitru 2022-01-26 12:10:48 +02:00 committed by Дамян Минков
parent 4e8d962027
commit c9941dedb9
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
react/features/notifications/components/web/Notification.js
View File

@ -8,7 +8,7 @@ import EditorWarningIcon from '@atlaskit/icon/glyph/editor/warning';
import PeopleIcon from '@atlaskit/icon/glyph/people'; import PeopleIcon from '@atlaskit/icon/glyph/people';
import PersonIcon from '@atlaskit/icon/glyph/person'; import PersonIcon from '@atlaskit/icon/glyph/person';
import QuestionsIcon from '@atlaskit/icon/glyph/questions'; import QuestionsIcon from '@atlaskit/icon/glyph/questions';
import React from 'react'; import React, { isValidElement } from 'react';
import { translate } from '../../../base/i18n'; import { translate } from '../../../base/i18n';
import Message from '../../../base/react/components/web/Message'; import Message from '../../../base/react/components/web/Message';
@ -78,12 +78,19 @@ class Notification extends AbstractNotification<Props> {
* @returns {ReactElement} * @returns {ReactElement}
*/ */
_renderDescription() { _renderDescription() {
const description = this._getDescription().join(' '); const description = this._getDescription();
// Keeping in mind that:
// - Notifications that use the `translateToHtml` function get an element-based description array with one entry
// - Message notifications receive string-based description arrays that might need additional parsing
// We look for ready-to-render elements, and if present, we roll with them
// Otherwise, we use the Message component that accepts a string `text` prop
const shouldRenderHtml = description.length === 1 && isValidElement(description[0]);
// the id is used for testing the UI // the id is used for testing the UI
return ( return (
<p data-testid = { this._getDescriptionKey() } > <p data-testid = { this._getDescriptionKey() } >
<Message text = { description } /> { shouldRenderHtml ? description : <Message text = { description.join(' ') } /> }
</p> </p>
); );
} }