ianhitchman/tiptap
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Philipp Kühn
2018-11-14 10:22:42 +01:00
parent d6c4c236a3
commit 0f15b14ca4
5 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/Components/Routes/Links/index.vue
View File

@@ -2,7 +2,7 @@
<div class="editor"> <div class="editor">
<editor-menu-bubble class="menububble" :editor="editor"> <editor-menu-bubble class="menububble" :editor="editor">
<div <div
slot-scope="{ commands, isActive, markAttrs, menu }" slot-scope="{ commands, isActive, getMarkAttrs, menu }"
class="menububble" class="menububble"
:class="{ 'is-active': menu.isActive }" :class="{ 'is-active': menu.isActive }"
:style="`left: ${menu.left}px; bottom: ${menu.bottom}px;`" :style="`left: ${menu.left}px; bottom: ${menu.bottom}px;`"
@@ -18,7 +18,7 @@
<template v-else> <template v-else>
<button <button
class="menububble__button" class="menububble__button"
@click="showLinkMenu(markAttrs('link'))" @click="showLinkMenu(getMarkAttrs('link'))"
:class="{ 'is-active': isActive.link() }" :class="{ 'is-active': isActive.link() }"
> >
<span>Add Link</span> <span>Add Link</span>

2
packages/tiptap/src/Components/EditorFloatingMenu.js
View File

@@ -43,7 +43,7 @@ export default {
focus: this.editor.focus, focus: this.editor.focus,
commands: this.editor.commands, commands: this.editor.commands,
isActive: this.editor.isActive, isActive: this.editor.isActive,
markAttrs: this.editor.markAttrs.bind(this.editor), getMarkAttrs: this.editor.getMarkAttrs.bind(this.editor),
menu: this.menu, menu: this.menu,
}) })
}, },

2
packages/tiptap/src/Components/EditorMenuBar.js
View File

@@ -15,7 +15,7 @@ export default {
focus: this.editor.focus, focus: this.editor.focus,
commands: this.editor.commands, commands: this.editor.commands,
isActive: this.editor.isActive, isActive: this.editor.isActive,
markAttrs: this.editor.markAttrs.bind(this.editor), getMarkAttrs: this.editor.getMarkAttrs.bind(this.editor),
}) })
}, },
} }

2
packages/tiptap/src/Components/EditorMenuBubble.js
View File

@@ -43,7 +43,7 @@ export default {
focus: this.editor.focus, focus: this.editor.focus,
commands: this.editor.commands, commands: this.editor.commands,
isActive: this.editor.isActive, isActive: this.editor.isActive,
markAttrs: this.editor.markAttrs.bind(this.editor), getMarkAttrs: this.editor.getMarkAttrs.bind(this.editor),
menu: this.menu, menu: this.menu,
}) })
}, },

21
packages/tiptap/src/utils/Editor.js
View File

@@ -280,23 +280,20 @@ export default class Editor {
} }
} }
markAttrs(type = null) { getMarkAttrs(type = null) {
return this.activeMarkAttrs[type] return this.activeMarkAttrs[type]
} }
get isActive() { get isActive() {
const types = { return Object
...this.activeMarks, .entries({
...this.activeNodes, ...this.activeMarks,
} ...this.activeNodes,
Object
.entries(types)
.forEach(([name, value]) => {
types[name] = (attrs = {}) => value(attrs)
}) })
.reduce((types, [name, value]) => ({
return types ...types,
[name]: (attrs = {}) => value(attrs),
}), {})
} }
destroy() { destroy() {