Merge branch 'better-still-emoji' into proper-attachments

* better-still-emoji:
  fix links sticking to mentionsline
This commit is contained in:
Henry Jameson 2021-08-15 18:11:57 +03:00
commit 5431d8fe55
3 changed files with 10 additions and 3 deletions

View File

@ -4,7 +4,7 @@
color: var(--link);
}
.mention-link:not(:last-child) {
.mention-link {
margin-right: 0.25em;
}
}

View File

@ -121,6 +121,13 @@ export default Vue.component('RichContent', {
// in MentionsLine
return currentMentions !== null ? item.trim() : item
}
// We add space with mentionsLine, otherwise non-text elements will
// stick to them.
if (currentMentions !== null) {
// single whitespace trim
item = item[0].match(/\s/) ? item.slice(1) : item
}
currentMentions = null
if (item.includes(':')) {
item = ['', processTextForEmoji(

View File

@ -59,7 +59,7 @@ describe('RichContent', () => {
it('replaces mention with mentionsline', () => {
const html = p(
makeMention('John'),
' how are you doing today?'
' how are you doing today?' // also testing single-trimming function
)
const wrapper = shallowMount(RichContent, {
localVue,
@ -74,7 +74,7 @@ describe('RichContent', () => {
expect(wrapper.html()).to.eql(compwrap(p(
mentionsLine(1),
' how are you doing today?'
' how are you doing today?' // space removed to compensate for <ML> padding
)))
})