Skip to content

Commit 95f5e3e

Browse files
authored
Merge pull request #6320 from nextcloud/backport/6315/stable29
[stable29] fix(mention): No extra whitespace in markdown before/after mentions
2 parents 5eb58d4 + 12e5fb2 commit 95f5e3e

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/extensions/Mention.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ export default TipTapMention.extend({
3535
},
3636

3737
toMarkdown(state, node) {
38-
state.write(' ')
3938
state.write(`@[${node.attrs.label}](mention://user/${encodeURIComponent(node.attrs.id)})`)
40-
state.write(' ')
4139
},
4240
})

src/tests/markdown.spec.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ describe('Markdown though editor', () => {
119119
})
120120

121121
test('mentions', () => {
122-
expect(markdownThroughEditor('@[username](mention://user/id)')).toBe(' @[username](mention://user/id) ')
122+
expect(markdownThroughEditor('@[username](mention://user/id)')).toBe('@[username](mention://user/id)')
123+
expect(markdownThroughEditor('pretext @[username](mention://user/id) posttext')).toBe('pretext @[username](mention://user/id) posttext')
123124
})
124125
})
125126

@@ -182,8 +183,9 @@ describe('Markdown serializer from html', () => {
182183
})
183184

184185
test('mentions', () => {
185-
expect(markdownThroughEditorHtml('<span class="mention" data-label="username" data-type="user" data-id="id">username</span>')).toBe(' @[username](mention://user/id) ')
186-
expect(markdownThroughEditorHtml('<span class="mention" data-label="whitespace user" data-type="user" data-id="whitespace user">whitespace user</span>')).toBe(' @[whitespace user](mention://user/whitespace%20user) ')
186+
expect(markdownThroughEditorHtml('<span class="mention" data-label="username" data-type="user" data-id="id">username</span>')).toBe('@[username](mention://user/id)')
187+
expect(markdownThroughEditorHtml('<span class="mention" data-label="whitespace user" data-type="user" data-id="whitespace user">whitespace user</span>')).toBe('@[whitespace user](mention://user/whitespace%20user)')
188+
expect(markdownThroughEditorHtml('pretext <span class="mention" data-label="username" data-type="user" data-id="id">username</span> posttext')).toBe('pretext @[username](mention://user/id) posttext')
187189
})
188190
})
189191

0 commit comments

Comments
 (0)