From 2017b84578b9692e3d6f293ec44c958e76fab78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Fri, 5 Mar 2021 11:58:52 +0100 Subject: [PATCH] fix some typescript bugs --- packages/vue-2/src/Editor.ts | 6 ------ packages/vue-2/src/VueNodeViewRenderer.ts | 4 ++-- packages/vue-2/src/index.ts | 2 +- packages/vue-3/src/Editor.ts | 7 ------- packages/vue-3/src/VueNodeViewRenderer.ts | 2 +- 5 files changed, 4 insertions(+), 17 deletions(-) diff --git a/packages/vue-2/src/Editor.ts b/packages/vue-2/src/Editor.ts index 5c6d2a6a..5d2aa86b 100644 --- a/packages/vue-2/src/Editor.ts +++ b/packages/vue-2/src/Editor.ts @@ -1,12 +1,6 @@ import { Editor as CoreEditor } from '@tiptap/core' import Vue from 'vue' -declare module '@tiptap/core' { - interface Editor { - contentComponent: Vue | null, - } -} - export class Editor extends CoreEditor { public contentComponent: Vue | null = null } diff --git a/packages/vue-2/src/VueNodeViewRenderer.ts b/packages/vue-2/src/VueNodeViewRenderer.ts index a5206a08..f36533f4 100644 --- a/packages/vue-2/src/VueNodeViewRenderer.ts +++ b/packages/vue-2/src/VueNodeViewRenderer.ts @@ -35,7 +35,7 @@ class VueNodeView implements NodeView { constructor(component: Vue | VueConstructor, props: NodeViewRendererProps, options?: Partial) { this.options = { ...this.options, ...options } - this.editor = props.editor + this.editor = props.editor as Editor this.extension = props.extension this.node = props.node this.getPos = props.getPos @@ -257,7 +257,7 @@ export function VueNodeViewRenderer(component: Vue | VueConstructor, options?: P // try to get the parent component // this is important for vue devtools to show the component hierarchy correctly // maybe it’s `undefined` because isn’t rendered yet - if (!props.editor.contentComponent) { + if (!(props.editor as Editor).contentComponent) { return {} } diff --git a/packages/vue-2/src/index.ts b/packages/vue-2/src/index.ts index c13271f2..9dbf56fb 100644 --- a/packages/vue-2/src/index.ts +++ b/packages/vue-2/src/index.ts @@ -1,7 +1,7 @@ export * from '@tiptap/core' export { Editor } from './Editor' +export * from './EditorContent' export * from './VueRenderer' export * from './VueNodeViewRenderer' -export * from './EditorContent' export * from './NodeViewWrapper' export * from './NodeViewContent' diff --git a/packages/vue-3/src/Editor.ts b/packages/vue-3/src/Editor.ts index ed7f3d4e..c516d663 100644 --- a/packages/vue-3/src/Editor.ts +++ b/packages/vue-3/src/Editor.ts @@ -36,13 +36,6 @@ export type ContentComponent = ComponentInternalInstance & { ctx: ComponentPublicInstance, } -declare module '@tiptap/core' { - interface Editor { - contentComponent: ContentComponent | null, - vueRenderers: Map, - } -} - export class Editor extends CoreEditor { private reactiveState: Ref diff --git a/packages/vue-3/src/VueNodeViewRenderer.ts b/packages/vue-3/src/VueNodeViewRenderer.ts index 21b3c537..634ca18c 100644 --- a/packages/vue-3/src/VueNodeViewRenderer.ts +++ b/packages/vue-3/src/VueNodeViewRenderer.ts @@ -258,7 +258,7 @@ export function VueNodeViewRenderer(component: Component, options?: Partial isn’t rendered yet - if (!props.editor.contentComponent) { + if (!(props.editor as Editor).contentComponent) { return {} }