Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 2 additions & 2 deletions js/editor-rich.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor-rich.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/files-modal.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/files-modal.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions js/text-files.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-files.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-public.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-text.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-text.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-viewer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-viewer.js.map

Large diffs are not rendered by default.

32 changes: 23 additions & 9 deletions src/components/Mention/List.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@
@click.native="selectItem(index)" />
</div>
</template>
<div v-else class="item">
No result
<div v-else class="item-empty">
{{ t('text', 'No user found') }}
</div>
</div>
</template>

<script>
import { translate as t } from '@nextcloud/l10n'
import AutoCompleteResult from './AutoCompleteResult.vue'

export default {
components: {
AutoCompleteResult,
Expand Down Expand Up @@ -50,7 +52,13 @@ export default {
},

methods: {
t,
onKeyDown({ event }) {
// Ignore any key modifier combinations
if (event.ctrlKey || event.shiftKey || event.altKey || event.metaKey) {
return false
}

if (event.key === 'ArrowUp') {
this.upHandler()
return true
Expand All @@ -61,7 +69,7 @@ export default {
return true
}

if (event.key === 'Enter') {
if (event.key === 'Enter' || event.key === 'Tab') {
this.enterHandler()
return true
}
Expand Down Expand Up @@ -94,11 +102,17 @@ export default {

<style lang="scss">
.items {
position: relative;
border-radius: var(--border-radius);
background: var(--color-main-background);
overflow: hidden;
font-size: 0.9rem;
box-shadow: 0 1px 5px var(--color-box-shadow);
position: relative;
border-radius: var(--border-radius);
background: var(--color-main-background);
overflow: hidden;
font-size: 0.9rem;
box-shadow: 0 1px 5px var(--color-box-shadow);
min-width: 250px;
}

.item-empty {
padding: 4px 8px;
opacity: 0.8;
}
</style>
13 changes: 12 additions & 1 deletion src/extensions/Mention.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import TipTapMention from '@tiptap/extension-mention'
import Mention from './Mention.vue'
import { VueNodeViewRenderer } from '@tiptap/vue-2'
import { mergeAttributes } from '@tiptap/core'

export default TipTapMention.extend({

parseHTML() {
return [
{
Expand All @@ -19,6 +19,17 @@ export default TipTapMention.extend({
]
},

renderHTML({ node, HTMLAttributes }) {
return [
'span',
mergeAttributes({ 'data-type': 'user' }, this.options.HTMLAttributes, HTMLAttributes),
this.options.renderLabel({
options: this.options,
node,
}),
]
},

addNodeView() {
return VueNodeViewRenderer(Mention)
},
Expand Down
4 changes: 2 additions & 2 deletions src/tests/markdown.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -234,5 +234,5 @@ describe('Trailing nodes', () => {
const serializer = createMarkdownSerializer(tiptap.schema)
const md = serializer.serialize(tiptap.state.doc)
expect(md).toBe(source)
})
})
})
})