Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix parsing of HTML for the mention
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
juliusknorr committed Aug 25, 2022
commit c7af3297030803cae1a4eb8fadca18fcc937250e
12 changes: 8 additions & 4 deletions src/extensions/Mention.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,17 @@ import Mention from './Mention.vue'
import { VueNodeViewRenderer } from '@tiptap/vue-2'

export default TipTapMention.extend({

parseHTML() {
return [
{
tag: 'span[data-type="user"]',
getAttrs: element => ((element.getAttribute('data-type') === 'user')
&& (element.getAttribute('class') === 'mention')
&& null),
getAttrs: element => {
return {
id: element.getAttribute('data-id'),
label: element.innerText ?? element.getAttribute('data-id'),
}
},
priority: 100,
},
]
Expand All @@ -21,7 +25,7 @@ export default TipTapMention.extend({

toMarkdown(state, node) {
state.write(' ')
state.write(`@[${node.attrs.id}](mention://user/${node.attrs.label})`)
state.write(`@[${node.attrs.label}](mention://user/${node.attrs.id})`)
state.write(' ')
},
})
15 changes: 4 additions & 11 deletions src/extensions/Mention.vue
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<template>
<NodeViewWrapper as="span" class="mention" contenteditable="false">
<UserBubble :user="node.attrs.id" :display-name="username" class="mention-user-bubble">
<NcUserBubble :user="node.attrs.id" :display-name="username" class="mention-user-bubble">
@{{ username }}
</UserBubble>
</NcUserBubble>
</NodeViewWrapper>
</template>

<script>
import UserBubble from '@nextcloud/vue/dist/Components/UserBubble'
import NcUserBubble from '@nextcloud/vue/dist/Components/NcUserBubble'
import { NodeViewWrapper } from '@tiptap/vue-2'

export default {
name: 'Mention',
components: {
UserBubble,
NcUserBubble,
NodeViewWrapper,
},
props: {
Expand All @@ -39,11 +39,4 @@ export default {
.text-editor__wrapper div.ProseMirror .mention[contenteditable=false] :deep(*) {
-webkit-user-modify: read-only !important;
}

.mention-user-bubble /deep/ .user-bubble__content .user-bubble__title {
position: relative !important;
top: -20px !important;
left: -60px !important;
height: 40px;
}
</style>