Merge branch 'fix-hashtags' into 'develop'

fix hashtags by explicitly putting attributes

See merge request pleroma/pleroma-fe!1513
This commit is contained in:
HJ 2022-04-12 16:09:33 +00:00
commit 1041a38f14
2 changed files with 6 additions and 3 deletions

View file

@ -28,6 +28,10 @@ import './rich_content.scss'
*/
export default {
name: 'RichContent',
components: {
MentionsLine,
HashtagLink
},
props: {
// Original html content
html: {
@ -86,7 +90,8 @@ export default {
if (!encounteredTextReverse) {
lastTags.push(linkData)
}
return <HashtagLink { ...linkData }/>
const { url, tag, content } = linkData
return <HashtagLink url={url} tag={tag} content={content}/>
}
const renderMention = (attrs, children) => {

View file

@ -308,10 +308,8 @@ describe('RichContent', () => {
'<a href="http://macrochan.org/images/N/H/NHCMDUXJPPZ6M3Z2CQ6D2EBRSWGE7MZY.jpg" target="_blank">',
'NHCMDUXJPPZ6M3Z2CQ6D2EBRSWGE7MZY.jpg</a>',
' <hashtag-link-stub url="https://shitposter.club/tag/nou" content="#nou" tag="nou">',
'#nou',
'</hashtag-link-stub>',
' <hashtag-link-stub url="https://shitposter.club/tag/screencap" content="#screencap" tag="screencap">',
'#screencap',
'</hashtag-link-stub>',
' </p>'
].join('')