move componentrenderer

This commit is contained in:
Philipp Kühn
2020-04-25 22:40:38 +02:00
parent 3cca79b960
commit 30d53d33a5
11 changed files with 45 additions and 19 deletions

View File

@@ -4,7 +4,7 @@
<script> <script>
import { Editor } from '@tiptap/core' import { Editor } from '@tiptap/core'
import { EditorContent } from '@tiptap/vue' import { EditorContent, Renderer } from '@tiptap/vue'
import extensions from '@tiptap/starter-kit' import extensions from '@tiptap/starter-kit'
export default { export default {
@@ -22,6 +22,7 @@ export default {
this.editor = new Editor({ this.editor = new Editor({
content: '<p>foo</p>', content: '<p>foo</p>',
extensions: extensions(), extensions: extensions(),
renderer: Renderer,
}) })
}, },

View File

@@ -2,6 +2,7 @@ import { Editor, CommandSpec } from './src/Editor'
export default Editor export default Editor
export { Editor, CommandSpec } export { Editor, CommandSpec }
export { default as ComponentRenderer } from './src/ComponentRenderer'
export { default as Extension } from './src/Extension' export { default as Extension } from './src/Extension'
export { default as Node } from './src/Node' export { default as Node } from './src/Node'
export { default as Mark } from './src/Mark' export { default as Mark } from './src/Mark'

View File

@@ -0,0 +1,3 @@
export default abstract class ComponentRenderer {
}

View File

@@ -34,6 +34,7 @@ interface EditorOptions {
content: EditorContent content: EditorContent
extensions: (Extension | Node | Mark)[] extensions: (Extension | Node | Mark)[]
injectCSS: Boolean, injectCSS: Boolean,
renderer: any,
} }
@magicMethods @magicMethods
@@ -50,6 +51,7 @@ export class Editor extends EventEmitter {
content: '', content: '',
injectCSS: true, injectCSS: true,
extensions: [], extensions: [],
renderer: null,
} }
private lastCommand = Promise.resolve() private lastCommand = Promise.resolve()

View File

@@ -1,11 +1,12 @@
import collect from 'collect.js' import collect from 'collect.js'
import { keymap } from 'prosemirror-keymap' import { keymap } from 'prosemirror-keymap'
import { inputRules } from 'prosemirror-inputrules' import { inputRules } from 'prosemirror-inputrules'
import { NodeSpec } from 'prosemirror-model' import { EditorView, Decoration } from 'prosemirror-view'
import { Node as ProsemirrorNode } from 'prosemirror-model'
import { Editor, CommandSpec } from './Editor' import { Editor, CommandSpec } from './Editor'
import Extension from './Extension' import Extension from './Extension'
import Node from './Node' import Node from './Node'
import ComponentView from './ComponentView' import capitalize from './utils/capitalize'
export default class ExtensionManager { export default class ExtensionManager {
@@ -88,12 +89,24 @@ export default class ExtensionManager {
} }
get nodeViews() { get nodeViews() {
const { renderer: Renderer } = this.editor.options
if (!Renderer || !Renderer.type) {
return {}
}
const prop = `to${capitalize(Renderer.type)}`
return collect(this.nodes) return collect(this.nodes)
.filter((schema: any) => schema.toVue) .filter((schema: any) => schema[prop])
.map((schema: any) => { .map((schema: any) => {
// @ts-ignore return (
return (node, view, getPos, decorations) => { node: ProsemirrorNode,
return new ComponentView(schema.toVue, { view: EditorView,
getPos: (() => number) | boolean,
decorations: Decoration[],
) => {
return new Renderer(schema[prop], {
node, node,
view, view,
getPos, getPos,

View File

@@ -0,0 +1,3 @@
export default function capitalize(value: string = ''): string {
return value.charAt(0).toUpperCase() + value.slice(1)
}

View File

@@ -12,7 +12,7 @@ export default class Paragraph extends Node {
group: 'block', group: 'block',
parseDOM: [{ tag: 'p' }], parseDOM: [{ tag: 'p' }],
toDOM: () => ['p', 0], toDOM: () => ['p', 0],
// toVue: ParagraphComponent, toVue: ParagraphComponent,
} }
} }

View File

@@ -1,5 +1,5 @@
<template> <template>
<p ref="content"></p> <p data-component="yeah" ref="content"></p>
</template> </template>
<script> <script>

View File

@@ -1 +1,2 @@
export { default as EditorContent } from './src/components/EditorContent' export { default as EditorContent } from './src/components/EditorContent'
export { default as Renderer } from './src/Renderer'

View File

@@ -12,6 +12,7 @@
"dist" "dist"
], ],
"peerDependencies": { "peerDependencies": {
"@tiptap/core": "2.x",
"vue": "2.x" "vue": "2.x"
} }
} }

View File

@@ -1,17 +1,20 @@
import Vue from 'vue' import Vue from 'vue'
import { ComponentRenderer } from '@tiptap/core'
export default class ComponentView { export default class Renderer extends ComponentRenderer {
// @ts-ignore
constructor(component, options) { static type: string = 'vue'
vm!: Vue
constructor(component: Vue, options: any) {
super()
this.mount(component) this.mount(component)
} }
// @ts-ignore mount(component: Vue) {
mount(component) {
// @ts-ignore
const Component = Vue.extend(component) const Component = Vue.extend(component)
// @ts-ignore
this.vm = new Component({ this.vm = new Component({
// parent: this.parent, // parent: this.parent,
// propsData: props, // propsData: props,
@@ -19,12 +22,10 @@ export default class ComponentView {
} }
get dom() { get dom() {
// @ts-ignore
return this.vm.$el return this.vm.$el
} }
get contentDOM() { get contentDOM() {
// @ts-ignore
return this.vm.$refs.content return this.vm.$refs.content
} }