Regression: Thread Title not being escaped (#18356)

pull/18372/head
Guilherme Gazzo 5 years ago committed by GitHub
parent def02e97c6
commit 59ca315ce3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      client/channel/Discussions/ContextualBar/List.js
  2. 3
      client/channel/Threads/ContextualBar/List.js
  3. 5
      client/components/basic/VerticalBar.js

@ -13,7 +13,6 @@ import { getConfig } from '../../../../app/ui-utils/client/config';
import { Messages } from '../../../../app/models/client';
import VerticalBar from '../../../components/basic/VerticalBar';
import { useTranslation } from '../../../contexts/TranslationContext';
import RawText from '../../../components/basic/RawText';
import { useUserId } from '../../../contexts/UserContext';
import { useEndpointDataExperimental, ENDPOINT_STATES } from '../../../hooks/useEndpointDataExperimental';
import { useTimeAgo } from '../../../hooks/useTimeAgo';
@ -188,7 +187,7 @@ export function DiscussionList({ total = 10, discussions = [], loadMoreItems, lo
return <VerticalBar>
<VerticalBar.Header>
<VerticalBar.Icon name='discussion'/>
<Box flexShrink={1} flexGrow={1} withTruncatedText mi='x8'><RawText>{t('Discussions')}</RawText></Box>
<Box flexShrink={1} flexGrow={1} withTruncatedText mi='x8'>{t('Discussions')}</Box>
<VerticalBar.Close onClick={onClose}/>
</VerticalBar.Header>
<VerticalBar.Content paddingInline={0}>

@ -9,7 +9,6 @@ import { useDebouncedValue, useDebouncedState, useResizeObserver, useLocalStorag
import VerticalBar from '../../../components/basic/VerticalBar';
import { useTranslation } from '../../../contexts/TranslationContext';
import RawText from '../../../components/basic/RawText';
import { useRoute, useCurrentRoute } from '../../../contexts/RouterContext';
import { call, renderMessageBody } from '../../../../app/ui-utils/client';
import { useUserId } from '../../../contexts/UserContext';
@ -211,7 +210,7 @@ export function ThreadList({ total = 10, threads = [], room, unread = [], unread
return <VerticalBar>
<VerticalBar.Header>
<Icon name='thread' size='x20'/>
<Box flexShrink={1} flexGrow={1} withTruncatedText mi='x8'><RawText>{t('Threads')}</RawText></Box>
<Box flexShrink={1} flexGrow={1} withTruncatedText mi='x8'>{t('Threads')}</Box>
<VerticalBar.Close onClick={onClose}/>
</VerticalBar.Header>
<VerticalBar.Content paddingInline={0}>

@ -3,7 +3,6 @@ import { useDebouncedValue, useMediaQuery } from '@rocket.chat/fuselage-hooks';
import React from 'react';
import Page from './Page';
import RawText from './RawText';
function VerticalBar({ children, ...props }) {
const mobile = useDebouncedValue(useMediaQuery('(max-width: 500px)'), 50);
@ -79,8 +78,8 @@ function VerticalBarSkeleton(props) {
</VerticalBar>;
}
function VerticalBarText({ children, ...props }) {
return <Box flexShrink={1} flexGrow={1} withTruncatedText {...props}><RawText>{children}</RawText></Box>;
function VerticalBarText(props) {
return <Box flexShrink={1} flexGrow={1} withTruncatedText {...props}/>;
}
VerticalBar.Icon = React.memo(VerticalBarIcon);

Loading…
Cancel
Save