From 7c757415e9169269acf27c7535edb48b3de71dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Sat, 3 Apr 2021 23:15:13 +0200 Subject: [PATCH 01/19] fix adding decoration classes to node views in vue --- packages/vue-2/src/NodeViewWrapper.ts | 4 +++- packages/vue-2/src/VueNodeViewRenderer.ts | 20 +++++++++++++++++++- packages/vue-3/src/NodeViewWrapper.ts | 4 +++- packages/vue-3/src/VueNodeViewRenderer.ts | 15 +++++++++++++++ 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/packages/vue-2/src/NodeViewWrapper.ts b/packages/vue-2/src/NodeViewWrapper.ts index 073c7614..c67bd24e 100644 --- a/packages/vue-2/src/NodeViewWrapper.ts +++ b/packages/vue-2/src/NodeViewWrapper.ts @@ -8,11 +8,13 @@ export const NodeViewWrapper = Vue.extend({ }, }, - inject: ['onDragStart'], + inject: ['onDragStart', 'decorationClasses'], render(createElement) { return createElement( this.as, { + // @ts-ignore + class: this.decorationClasses.value, style: { whiteSpace: 'normal', }, diff --git a/packages/vue-2/src/VueNodeViewRenderer.ts b/packages/vue-2/src/VueNodeViewRenderer.ts index 389638c0..0772b99b 100644 --- a/packages/vue-2/src/VueNodeViewRenderer.ts +++ b/packages/vue-2/src/VueNodeViewRenderer.ts @@ -51,6 +51,10 @@ class VueNodeView extends NodeView<(Vue | VueConstructor), Editor> { renderer!: VueRenderer + decorationClasses!: { + value: string + } + mount() { const props: NodeViewProps = { editor: this.editor, @@ -71,14 +75,19 @@ class VueNodeView extends NodeView<(Vue | VueConstructor), Editor> { isEditable.value = this.editor.isEditable }) + this.decorationClasses = Vue.observable({ + value: this.getDecorationClasses(), + }) + const Component = Vue .extend(this.component) .extend({ props: Object.keys(props), - provide() { + provide: () => { return { onDragStart, isEditable, + decorationClasses: this.decorationClasses, } }, }) @@ -122,6 +131,7 @@ class VueNodeView extends NodeView<(Vue | VueConstructor), Editor> { this.node = node this.decorations = decorations + this.decorationClasses.value = this.getDecorationClasses() this.renderer.updateProps({ node, decorations }) return true @@ -139,6 +149,14 @@ class VueNodeView extends NodeView<(Vue | VueConstructor), Editor> { }) } + getDecorationClasses() { + return this.decorations + // @ts-ignore + .map(item => item.type.attrs.class) + .flat() + .join(' ') + } + destroy() { this.renderer.destroy() } diff --git a/packages/vue-3/src/NodeViewWrapper.ts b/packages/vue-3/src/NodeViewWrapper.ts index 12870176..04d0b547 100644 --- a/packages/vue-3/src/NodeViewWrapper.ts +++ b/packages/vue-3/src/NodeViewWrapper.ts @@ -8,11 +8,13 @@ export const NodeViewWrapper = defineComponent({ }, }, - inject: ['onDragStart'], + inject: ['onDragStart', 'decorationClasses'], render() { return h( this.as, { + // @ts-ignore + class: this.decorationClasses.value, style: { whiteSpace: 'normal', }, diff --git a/packages/vue-3/src/VueNodeViewRenderer.ts b/packages/vue-3/src/VueNodeViewRenderer.ts index 3150b46e..cab63348 100644 --- a/packages/vue-3/src/VueNodeViewRenderer.ts +++ b/packages/vue-3/src/VueNodeViewRenderer.ts @@ -6,6 +6,7 @@ import { } from '@tiptap/core' import { ref, + Ref, provide, PropType, Component, @@ -56,6 +57,8 @@ class VueNodeView extends NodeView { renderer!: VueRenderer + decorationClasses!: Ref + mount() { const props: NodeViewProps = { editor: this.editor, @@ -74,12 +77,15 @@ class VueNodeView extends NodeView { isEditable.value = this.editor.isEditable }) + this.decorationClasses = ref(this.getDecorationClasses()) + const extendedComponent = defineComponent({ extends: { ...this.component }, props: Object.keys(props), setup: () => { provide('onDragStart', onDragStart) provide('isEditable', isEditable) + provide('decorationClasses', this.decorationClasses) return (this.component as any).setup?.(props) }, @@ -124,6 +130,7 @@ class VueNodeView extends NodeView { this.node = node this.decorations = decorations + this.decorationClasses.value = this.getDecorationClasses() this.renderer.updateProps({ node, decorations }) return true @@ -141,6 +148,14 @@ class VueNodeView extends NodeView { }) } + getDecorationClasses() { + return this.decorations + // @ts-ignore + .map(item => item.type.attrs.class) + .flat() + .join(' ') + } + destroy() { this.renderer.destroy() } From 177eed65a4467db511c49f56a31a999e3f611c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Sat, 3 Apr 2021 23:17:36 +0200 Subject: [PATCH 02/19] fix menus in vue 3 for now --- packages/vue-3/src/BubbleMenu.ts | 2 +- packages/vue-3/src/FloatingMenu.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/vue-3/src/BubbleMenu.ts b/packages/vue-3/src/BubbleMenu.ts index 8704e43a..bfea8dc3 100644 --- a/packages/vue-3/src/BubbleMenu.ts +++ b/packages/vue-3/src/BubbleMenu.ts @@ -42,6 +42,6 @@ export const BubbleMenu = defineComponent({ editor.unregisterPlugin(BubbleMenuPluginKey) }) - return () => h('div', { ref: root, style: { visibility: 'hidden' } }, slots.default?.()) + return () => h('div', { ref: root }, slots.default?.()) }, }) diff --git a/packages/vue-3/src/FloatingMenu.ts b/packages/vue-3/src/FloatingMenu.ts index 009b3b04..8a93315a 100644 --- a/packages/vue-3/src/FloatingMenu.ts +++ b/packages/vue-3/src/FloatingMenu.ts @@ -36,6 +36,6 @@ export const FloatingMenu = defineComponent({ editor.unregisterPlugin(FloatingMenuPluginKey) }) - return () => h('div', { ref: root, style: { visibility: 'hidden' } }, slots.default?.()) + return () => h('div', { ref: root }, slots.default?.()) }, }) From 550b8bd2166cf3747724295be9868fa9ffa957c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Sat, 3 Apr 2021 23:18:30 +0200 Subject: [PATCH 03/19] Publish - @tiptap/vue-2@2.0.0-beta.14 - @tiptap/vue-3@2.0.0-beta.15 --- packages/vue-2/CHANGELOG.md | 8 ++++++++ packages/vue-2/package.json | 2 +- packages/vue-3/CHANGELOG.md | 8 ++++++++ packages/vue-3/package.json | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/vue-2/CHANGELOG.md b/packages/vue-2/CHANGELOG.md index 26a113f4..7ed9d081 100644 --- a/packages/vue-2/CHANGELOG.md +++ b/packages/vue-2/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-2@2.0.0-beta.13...@tiptap/vue-2@2.0.0-beta.14) (2021-04-03) + +**Note:** Version bump only for package @tiptap/vue-2 + + + + + # [2.0.0-beta.13](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-2@2.0.0-beta.12...@tiptap/vue-2@2.0.0-beta.13) (2021-04-01) **Note:** Version bump only for package @tiptap/vue-2 diff --git a/packages/vue-2/package.json b/packages/vue-2/package.json index c9e8e02a..9f3cac5d 100644 --- a/packages/vue-2/package.json +++ b/packages/vue-2/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/vue-2", "description": "Vue components for tiptap", - "version": "2.0.0-beta.13", + "version": "2.0.0-beta.14", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/vue-3/CHANGELOG.md b/packages/vue-3/CHANGELOG.md index b2f1455a..cbcf4b98 100644 --- a/packages/vue-3/CHANGELOG.md +++ b/packages/vue-3/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.15](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-3@2.0.0-beta.14...@tiptap/vue-3@2.0.0-beta.15) (2021-04-03) + +**Note:** Version bump only for package @tiptap/vue-3 + + + + + # [2.0.0-beta.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-3@2.0.0-beta.13...@tiptap/vue-3@2.0.0-beta.14) (2021-04-01) **Note:** Version bump only for package @tiptap/vue-3 diff --git a/packages/vue-3/package.json b/packages/vue-3/package.json index 51b05271..ac273b6b 100644 --- a/packages/vue-3/package.json +++ b/packages/vue-3/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/vue-3", "description": "Vue components for tiptap", - "version": "2.0.0-beta.14", + "version": "2.0.0-beta.15", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", From 3a5cad6beaa67eb0f32b6f4a818bee414564d84f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Sun, 4 Apr 2021 09:50:36 +0200 Subject: [PATCH 04/19] check for contenteditable within nodeviews --- packages/core/src/NodeView.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/core/src/NodeView.ts b/packages/core/src/NodeView.ts index d0308685..6824b3e8 100644 --- a/packages/core/src/NodeView.ts +++ b/packages/core/src/NodeView.ts @@ -94,6 +94,7 @@ export class NodeView impleme } const isInput = ['INPUT', 'BUTTON', 'SELECT', 'TEXTAREA'].includes(target.tagName) + || target.isContentEditable // any input event within node views should be ignored by ProseMirror if (isInput) { From 5faf1ab10f1f11b28a6738d0373a224b4bab4b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Sun, 4 Apr 2021 09:52:29 +0200 Subject: [PATCH 05/19] Publish - @tiptap/core@2.0.0-beta.14 - @tiptap/extension-mention@2.0.0-beta.14 - @tiptap/html@2.0.0-beta.14 - @tiptap/starter-kit@2.0.0-beta.9 - @tiptap/suggestion@2.0.0-beta.14 - @tiptap/vue-starter-kit@2.0.0-beta.13 --- packages/core/CHANGELOG.md | 8 ++++++++ packages/core/package.json | 2 +- packages/extension-mention/CHANGELOG.md | 8 ++++++++ packages/extension-mention/package.json | 4 ++-- packages/html/CHANGELOG.md | 8 ++++++++ packages/html/package.json | 4 ++-- packages/starter-kit/CHANGELOG.md | 8 ++++++++ packages/starter-kit/package.json | 4 ++-- packages/suggestion/CHANGELOG.md | 8 ++++++++ packages/suggestion/package.json | 4 ++-- packages/vue-starter-kit/CHANGELOG.md | 8 ++++++++ packages/vue-starter-kit/package.json | 4 ++-- 12 files changed, 59 insertions(+), 11 deletions(-) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 05c9e429..a8238e1c 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/core@2.0.0-beta.13...@tiptap/core@2.0.0-beta.14) (2021-04-04) + +**Note:** Version bump only for package @tiptap/core + + + + + # [2.0.0-beta.13](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/core@2.0.0-beta.12...@tiptap/core@2.0.0-beta.13) (2021-04-02) **Note:** Version bump only for package @tiptap/core diff --git a/packages/core/package.json b/packages/core/package.json index c78a0ea1..adccb3b3 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/core", "description": "headless rich text editor", - "version": "2.0.0-beta.13", + "version": "2.0.0-beta.14", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/extension-mention/CHANGELOG.md b/packages/extension-mention/CHANGELOG.md index 80bad2f3..ef6c534d 100644 --- a/packages/extension-mention/CHANGELOG.md +++ b/packages/extension-mention/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-mention@2.0.0-beta.13...@tiptap/extension-mention@2.0.0-beta.14) (2021-04-04) + +**Note:** Version bump only for package @tiptap/extension-mention + + + + + # [2.0.0-beta.13](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-mention@2.0.0-beta.12...@tiptap/extension-mention@2.0.0-beta.13) (2021-04-02) **Note:** Version bump only for package @tiptap/extension-mention diff --git a/packages/extension-mention/package.json b/packages/extension-mention/package.json index 4a6d7b0d..49bf3f1d 100644 --- a/packages/extension-mention/package.json +++ b/packages/extension-mention/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/extension-mention", "description": "mention extension for tiptap", - "version": "2.0.0-beta.13", + "version": "2.0.0-beta.14", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -25,6 +25,6 @@ "@tiptap/core": "^2.0.0-beta.1" }, "dependencies": { - "@tiptap/suggestion": "^2.0.0-beta.13" + "@tiptap/suggestion": "^2.0.0-beta.14" } } diff --git a/packages/html/CHANGELOG.md b/packages/html/CHANGELOG.md index 1b63b078..cd291c9b 100644 --- a/packages/html/CHANGELOG.md +++ b/packages/html/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/html@2.0.0-beta.13...@tiptap/html@2.0.0-beta.14) (2021-04-04) + +**Note:** Version bump only for package @tiptap/html + + + + + # [2.0.0-beta.13](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/html@2.0.0-beta.12...@tiptap/html@2.0.0-beta.13) (2021-04-02) **Note:** Version bump only for package @tiptap/html diff --git a/packages/html/package.json b/packages/html/package.json index 86278eb0..b0e41319 100644 --- a/packages/html/package.json +++ b/packages/html/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/html", "description": "utility package to render tiptap JSON as HTML", - "version": "2.0.0-beta.13", + "version": "2.0.0-beta.14", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -22,7 +22,7 @@ "dist" ], "dependencies": { - "@tiptap/core": "^2.0.0-beta.13", + "@tiptap/core": "^2.0.0-beta.14", "hostic-dom": "^0.8.6", "prosemirror-model": "^1.13.3" } diff --git a/packages/starter-kit/CHANGELOG.md b/packages/starter-kit/CHANGELOG.md index d0c91919..1de06139 100644 --- a/packages/starter-kit/CHANGELOG.md +++ b/packages/starter-kit/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.9](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/starter-kit@2.0.0-beta.8...@tiptap/starter-kit@2.0.0-beta.9) (2021-04-04) + +**Note:** Version bump only for package @tiptap/starter-kit + + + + + # [2.0.0-beta.8](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/starter-kit@2.0.0-beta.7...@tiptap/starter-kit@2.0.0-beta.8) (2021-04-02) **Note:** Version bump only for package @tiptap/starter-kit diff --git a/packages/starter-kit/package.json b/packages/starter-kit/package.json index 6d471d07..58279e89 100644 --- a/packages/starter-kit/package.json +++ b/packages/starter-kit/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/starter-kit", "description": "starter kit for tiptap", - "version": "2.0.0-beta.8", + "version": "2.0.0-beta.9", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -22,7 +22,7 @@ "dist" ], "dependencies": { - "@tiptap/core": "^2.0.0-beta.13", + "@tiptap/core": "^2.0.0-beta.14", "@tiptap/extension-blockquote": "^2.0.0-beta.1", "@tiptap/extension-bold": "^2.0.0-beta.1", "@tiptap/extension-bullet-list": "^2.0.0-beta.1", diff --git a/packages/suggestion/CHANGELOG.md b/packages/suggestion/CHANGELOG.md index b9a33ed9..1e6a7551 100644 --- a/packages/suggestion/CHANGELOG.md +++ b/packages/suggestion/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/suggestion@2.0.0-beta.13...@tiptap/suggestion@2.0.0-beta.14) (2021-04-04) + +**Note:** Version bump only for package @tiptap/suggestion + + + + + # [2.0.0-beta.13](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/suggestion@2.0.0-beta.12...@tiptap/suggestion@2.0.0-beta.13) (2021-04-02) **Note:** Version bump only for package @tiptap/suggestion diff --git a/packages/suggestion/package.json b/packages/suggestion/package.json index 998b350f..7a44100d 100644 --- a/packages/suggestion/package.json +++ b/packages/suggestion/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/suggestion", "description": "suggestion plugin for tiptap", - "version": "2.0.0-beta.13", + "version": "2.0.0-beta.14", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -22,7 +22,7 @@ "dist" ], "dependencies": { - "@tiptap/core": "^2.0.0-beta.13", + "@tiptap/core": "^2.0.0-beta.14", "prosemirror-model": "^1.13.3", "prosemirror-state": "^1.3.4", "prosemirror-view": "^1.18.2" diff --git a/packages/vue-starter-kit/CHANGELOG.md b/packages/vue-starter-kit/CHANGELOG.md index 194e588e..ae17eb9e 100644 --- a/packages/vue-starter-kit/CHANGELOG.md +++ b/packages/vue-starter-kit/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.13](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.12...@tiptap/vue-starter-kit@2.0.0-beta.13) (2021-04-04) + +**Note:** Version bump only for package @tiptap/vue-starter-kit + + + + + # [2.0.0-beta.12](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.11...@tiptap/vue-starter-kit@2.0.0-beta.12) (2021-04-02) **Note:** Version bump only for package @tiptap/vue-starter-kit diff --git a/packages/vue-starter-kit/package.json b/packages/vue-starter-kit/package.json index 31d2ed68..cf7597c2 100644 --- a/packages/vue-starter-kit/package.json +++ b/packages/vue-starter-kit/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/vue-starter-kit", "description": "Vue starter kit for tiptap", - "version": "2.0.0-beta.12", + "version": "2.0.0-beta.13", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -22,7 +22,7 @@ "dist" ], "dependencies": { - "@tiptap/starter-kit": "^2.0.0-beta.8", + "@tiptap/starter-kit": "^2.0.0-beta.9", "@tiptap/vue": "^2.0.0-beta.5" } } From bdb5d724956c0c757e29be38fb2c9dd85d8fd36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Sun, 4 Apr 2021 21:43:48 +0200 Subject: [PATCH 06/19] feat: render wrapper element for inline node views as span, fix #242 --- packages/react/src/ReactNodeViewRenderer.tsx | 3 +++ packages/react/src/ReactRenderer.tsx | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/react/src/ReactNodeViewRenderer.tsx b/packages/react/src/ReactNodeViewRenderer.tsx index 60406795..13b2d922 100644 --- a/packages/react/src/ReactNodeViewRenderer.tsx +++ b/packages/react/src/ReactNodeViewRenderer.tsx @@ -66,6 +66,9 @@ class ReactNodeView extends NodeView { this.renderer = new ReactRenderer(ReactNodeViewProvider, { editor: this.editor, props, + as: this.node.isInline + ? 'span' + : 'div' }) } diff --git a/packages/react/src/ReactRenderer.tsx b/packages/react/src/ReactRenderer.tsx index db1011a6..b151f2eb 100644 --- a/packages/react/src/ReactRenderer.tsx +++ b/packages/react/src/ReactRenderer.tsx @@ -11,9 +11,9 @@ function isClassComponent(Component: any) { } export interface ReactRendererOptions { - as?: string, editor: Editor, props?: AnyObject, + as?: string, } export class ReactRenderer { @@ -31,12 +31,12 @@ export class ReactRenderer { ref: React.Component | null = null - constructor(component: React.Component | React.FunctionComponent, { props = {}, editor }: ReactRendererOptions) { + constructor(component: React.Component | React.FunctionComponent, { editor, props = {}, as = 'div' }: ReactRendererOptions) { this.id = Math.floor(Math.random() * 0xFFFFFFFF).toString() this.component = component this.editor = editor this.props = props - this.element = document.createElement('div') + this.element = document.createElement(as) this.element.classList.add('react-renderer') this.render() } From cdb57b2e39ca65b974c649abd1219f1212aa6e7d Mon Sep 17 00:00:00 2001 From: philippkuehn Date: Sun, 4 Apr 2021 19:44:43 +0000 Subject: [PATCH 07/19] ci: fix code style linting errors --- packages/react/src/ReactNodeViewRenderer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/src/ReactNodeViewRenderer.tsx b/packages/react/src/ReactNodeViewRenderer.tsx index 13b2d922..64e35bfd 100644 --- a/packages/react/src/ReactNodeViewRenderer.tsx +++ b/packages/react/src/ReactNodeViewRenderer.tsx @@ -68,7 +68,7 @@ class ReactNodeView extends NodeView { props, as: this.node.isInline ? 'span' - : 'div' + : 'div', }) } From 8bfcba3e62acc8e9b5b22025c13d31c229332001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Sun, 4 Apr 2021 21:46:14 +0200 Subject: [PATCH 08/19] Publish - @tiptap/react@2.0.0-beta.14 --- packages/react/CHANGELOG.md | 11 +++++++++++ packages/react/package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 6c20d89e..9c89efb2 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/react@2.0.0-beta.13...@tiptap/react@2.0.0-beta.14) (2021-04-04) + + +### Features + +* render wrapper element for inline node views as span, fix [#242](https://github.com/ueberdosis/tiptap-next/issues/242) ([bdb5d72](https://github.com/ueberdosis/tiptap-next/commit/bdb5d724956c0c757e29be38fb2c9dd85d8fd36b)) + + + + + # [2.0.0-beta.13](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/react@2.0.0-beta.12...@tiptap/react@2.0.0-beta.13) (2021-04-01) **Note:** Version bump only for package @tiptap/react diff --git a/packages/react/package.json b/packages/react/package.json index 8264b8d6..8ed49078 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/react", "description": "React components for tiptap", - "version": "2.0.0-beta.13", + "version": "2.0.0-beta.14", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", From 130023bca51979dc2ba05a07fb9e9347f754bc3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Mon, 5 Apr 2021 11:41:10 +0200 Subject: [PATCH 09/19] update dependencies --- docs/package.json | 2 +- packages/core/package.json | 2 +- packages/extension-dropcursor/package.json | 2 +- yarn.lock | 25 ++++++++++++++-------- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/docs/package.json b/docs/package.json index a974ef04..5cba929b 100644 --- a/docs/package.json +++ b/docs/package.json @@ -33,7 +33,7 @@ "y-prosemirror": "^1.0.7", "y-webrtc": "^10.1.7", "y-websocket": "^1.3.11", - "yjs": "^13.5.3" + "yjs": "^13.5.4" }, "devDependencies": { "@babel/plugin-proposal-class-properties": "^7.13.0", diff --git a/packages/core/package.json b/packages/core/package.json index adccb3b3..5707c143 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -38,7 +38,7 @@ "prosemirror-model": "^1.13.3", "prosemirror-schema-list": "^1.1.4", "prosemirror-state": "^1.3.4", - "prosemirror-transform": "^1.2.12", + "prosemirror-transform": "^1.3.1", "prosemirror-view": "^1.18.2" } } diff --git a/packages/extension-dropcursor/package.json b/packages/extension-dropcursor/package.json index a201aa0c..57bb47ec 100644 --- a/packages/extension-dropcursor/package.json +++ b/packages/extension-dropcursor/package.json @@ -26,6 +26,6 @@ }, "dependencies": { "@types/prosemirror-dropcursor": "^1.0.1", - "prosemirror-dropcursor": "^1.3.3" + "prosemirror-dropcursor": "^1.3.4" } } diff --git a/yarn.lock b/yarn.lock index 1f2291fe..6e27f103 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11658,10 +11658,10 @@ prosemirror-commands@^1.1.7: prosemirror-state "^1.0.0" prosemirror-transform "^1.0.0" -prosemirror-dropcursor@^1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.3.tgz#583d6a82b4960d468132c07c40803cc1d697fda4" - integrity sha512-zavE+wh+qkDcP7LaWn+jXVujGyQzBYSmM8E2HSngQ3KaaR+HJYgEBYGs9ynLHqKWLlLCXsxWdVYPV49v4caFyg== +prosemirror-dropcursor@^1.3.4: + version "1.3.4" + resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.4.tgz#a7f799ff9ecb520d3e1dbb3cb39d27ce41066618" + integrity sha512-eVmpMG5+fmvANT3xDzRirmG240rB/piI31ExIfW0Mkvo5/cYC/lm1fFMAOzjO22uc5OQXiodRqOnyE05+g3UqA== dependencies: prosemirror-state "^1.0.0" prosemirror-transform "^1.1.0" @@ -11736,13 +11736,20 @@ prosemirror-tables@^1.1.1: prosemirror-transform "^1.2.1" prosemirror-view "^1.13.3" -prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1, prosemirror-transform@^1.2.12: +prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1: version "1.2.12" resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.12.tgz#4398b568faf75a1540fbf5c659ca436a8657ed6f" integrity sha512-S73syqLcGBq6QiPaF7vriB8kpvK/aIFsnErrriKaFLSiE/GxMgBc62TPhNQAeGQr7/9GCDApIReTsJFcMt4o2w== dependencies: prosemirror-model "^1.0.0" +prosemirror-transform@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.3.1.tgz#56ea9b7ec8ce783b0f4b8e30bdec3fd5054eb894" + integrity sha512-KRo9TDaxyX+SB8jzByDdhkitCkzOUHNETt6UDpcjrXttKsn9AY0Ncj68EK8pmJuBujI3vfwQfLaTeXABEfe8Ig== + dependencies: + prosemirror-model "^1.0.0" + prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.18.2: version "1.18.2" resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.18.2.tgz#dd5d72e90266ec897464005eb6090fbc6acfeb11" @@ -15447,9 +15454,9 @@ yauzl@^2.10.0, yauzl@^2.4.2: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" -yjs@^13.5.3: - version "13.5.3" - resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.5.3.tgz#0efc5983ec287d24f4471f8f4184f9df80780835" - integrity sha512-LlkmCr68LCfkmoic6rBjDaD01vbdMhy07dXYo65sQ0wOYh8eylrU1b0lTo3YT/BmcyH5Jn4KewDxyJMsDwvERw== +yjs@^13.5.4: + version "13.5.4" + resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.5.4.tgz#c2f0a0300d8c97bda7bb6d6d115d5c9edec2d906" + integrity sha512-1dF3SRSoCQIZsFvTx5GwKiKLUFqQs4VIKlXEZIJWD6ScJxm97myWVbWpWm96F7WPFi4Xu5fzuqpIf1keugQAGQ== dependencies: lib0 "^0.2.38" From 66f02c4145e67bb78b4a45f24009ab37c2a594de Mon Sep 17 00:00:00 2001 From: kriskbx Date: Tue, 6 Apr 2021 11:01:41 +0200 Subject: [PATCH 10/19] enable indexeddb persistence again --- docs/src/demos/Examples/CollaborativeEditing/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue index 1ec75188..988851b7 100644 --- a/docs/src/demos/Examples/CollaborativeEditing/index.vue +++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue @@ -30,7 +30,7 @@ import TaskItem from '@tiptap/extension-task-item' import Highlight from '@tiptap/extension-highlight' import * as Y from 'yjs' import { WebsocketProvider } from 'y-websocket' -// import { IndexeddbPersistence } from 'y-indexeddb' +import { IndexeddbPersistence } from 'y-indexeddb' import MenuBar from './MenuBar.vue' const CustomTaskItem = TaskItem.extend({ @@ -70,7 +70,7 @@ export default { window.ydoc = ydoc - // this.indexdb = new IndexeddbPersistence('tiptap-collaboration-example', ydoc) + this.indexdb = new IndexeddbPersistence('tiptap-collaboration-example', ydoc) this.editor = new Editor({ extensions: [ From 5622deca30397170bae341a000b9fe4693280c9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Tue, 6 Apr 2021 18:57:39 +0200 Subject: [PATCH 11/19] fix: fix checkbox in firefox, fix #251 --- .../demos/Examples/CollaborativeEditing/index.vue | 2 +- docs/src/demos/Examples/Tasks/index.vue | 2 +- .../demos/Experiments/MultipleEditors/index.vue | 2 +- docs/src/demos/Nodes/TaskItem/index.vue | 2 +- docs/src/demos/Nodes/TaskList/index.vue | 2 +- packages/extension-task-item/src/task-item.ts | 15 ++++++++++----- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue index 988851b7..8543088a 100644 --- a/docs/src/demos/Examples/CollaborativeEditing/index.vue +++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue @@ -326,7 +326,7 @@ export default { display: flex; align-items: center; - > input { + > label { flex: 0 0 auto; margin-right: 0.5rem; } diff --git a/docs/src/demos/Examples/Tasks/index.vue b/docs/src/demos/Examples/Tasks/index.vue index e0b33508..dad4df4e 100644 --- a/docs/src/demos/Examples/Tasks/index.vue +++ b/docs/src/demos/Examples/Tasks/index.vue @@ -69,7 +69,7 @@ ul[data-type="taskList"] { display: flex; align-items: center; - > input { + > label { flex: 0 0 auto; margin-right: 0.5rem; } diff --git a/docs/src/demos/Experiments/MultipleEditors/index.vue b/docs/src/demos/Experiments/MultipleEditors/index.vue index 1f7350b2..ab9454e8 100644 --- a/docs/src/demos/Experiments/MultipleEditors/index.vue +++ b/docs/src/demos/Experiments/MultipleEditors/index.vue @@ -158,7 +158,7 @@ export default { display: flex; align-items: center; - > input { + > label { flex: 0 0 auto; margin-right: 0.5rem; } diff --git a/docs/src/demos/Nodes/TaskItem/index.vue b/docs/src/demos/Nodes/TaskItem/index.vue index 5db4b650..ba15b994 100644 --- a/docs/src/demos/Nodes/TaskItem/index.vue +++ b/docs/src/demos/Nodes/TaskItem/index.vue @@ -56,7 +56,7 @@ ul[data-type="taskList"] { display: flex; align-items: center; - > input { + > label { flex: 0 0 auto; margin-right: 0.5rem; } diff --git a/docs/src/demos/Nodes/TaskList/index.vue b/docs/src/demos/Nodes/TaskList/index.vue index 201ebb18..9b4f96ca 100644 --- a/docs/src/demos/Nodes/TaskList/index.vue +++ b/docs/src/demos/Nodes/TaskList/index.vue @@ -60,7 +60,7 @@ ul[data-type="taskList"] { display: flex; align-items: center; - > input { + > label { flex: 0 0 auto; margin-right: 0.5rem; } diff --git a/packages/extension-task-item/src/task-item.ts b/packages/extension-task-item/src/task-item.ts index 076a6e4e..3628f815 100644 --- a/packages/extension-task-item/src/task-item.ts +++ b/packages/extension-task-item/src/task-item.ts @@ -81,11 +81,13 @@ export const TaskItem = Node.create({ }) => { const { view } = editor const listItem = document.createElement('li') + const checkboxWrapper = document.createElement('label') + const checkboxStyler = document.createElement('span') const checkbox = document.createElement('input') const content = document.createElement('div') + checkboxWrapper.contentEditable = 'false' checkbox.type = 'checkbox' - checkbox.contentEditable = 'false' checkbox.addEventListener('change', event => { const { checked } = event.target as any @@ -101,11 +103,14 @@ export const TaskItem = Node.create({ checkbox.setAttribute('checked', 'checked') } - listItem.append(checkbox, content) + checkboxWrapper.append(checkbox, checkboxStyler) + listItem.append(checkboxWrapper, content) - Object.entries(HTMLAttributes).forEach(([key, value]) => { - listItem.setAttribute(key, value) - }) + Object + .entries(HTMLAttributes) + .forEach(([key, value]) => { + listItem.setAttribute(key, value) + }) return { dom: listItem, From cc5d8d3623face0edab152fe0edefc89d3e672de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Tue, 6 Apr 2021 19:09:37 +0200 Subject: [PATCH 12/19] dependencies: update dependencies --- packages/core/package.json | 4 +- packages/extension-placeholder/package.json | 2 +- packages/html/package.json | 2 +- packages/suggestion/package.json | 2 +- packages/vue-3/package.json | 2 +- yarn.lock | 83 ++++----------------- 6 files changed, 20 insertions(+), 75 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index 5707c143..f054c488 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -35,10 +35,10 @@ "prosemirror-commands": "^1.1.7", "prosemirror-inputrules": "^1.1.3", "prosemirror-keymap": "^1.1.3", - "prosemirror-model": "^1.13.3", + "prosemirror-model": "^1.14.0", "prosemirror-schema-list": "^1.1.4", "prosemirror-state": "^1.3.4", - "prosemirror-transform": "^1.3.1", + "prosemirror-transform": "^1.3.2", "prosemirror-view": "^1.18.2" } } diff --git a/packages/extension-placeholder/package.json b/packages/extension-placeholder/package.json index 1582b539..650000ee 100644 --- a/packages/extension-placeholder/package.json +++ b/packages/extension-placeholder/package.json @@ -25,7 +25,7 @@ "@tiptap/core": "^2.0.0-beta.1" }, "dependencies": { - "prosemirror-model": "^1.13.3", + "prosemirror-model": "^1.14.0", "prosemirror-state": "^1.3.4", "prosemirror-view": "^1.18.2" } diff --git a/packages/html/package.json b/packages/html/package.json index b0e41319..f87d1d0c 100644 --- a/packages/html/package.json +++ b/packages/html/package.json @@ -24,6 +24,6 @@ "dependencies": { "@tiptap/core": "^2.0.0-beta.14", "hostic-dom": "^0.8.6", - "prosemirror-model": "^1.13.3" + "prosemirror-model": "^1.14.0" } } diff --git a/packages/suggestion/package.json b/packages/suggestion/package.json index 7a44100d..3a77f24f 100644 --- a/packages/suggestion/package.json +++ b/packages/suggestion/package.json @@ -23,7 +23,7 @@ ], "dependencies": { "@tiptap/core": "^2.0.0-beta.14", - "prosemirror-model": "^1.13.3", + "prosemirror-model": "^1.14.0", "prosemirror-state": "^1.3.4", "prosemirror-view": "^1.18.2" } diff --git a/packages/vue-3/package.json b/packages/vue-3/package.json index ac273b6b..56bbe025 100644 --- a/packages/vue-3/package.json +++ b/packages/vue-3/package.json @@ -29,6 +29,6 @@ "@tiptap/extension-floating-menu": "^2.0.0-beta.2", "prosemirror-state": "^1.3.4", "prosemirror-view": "^1.18.2", - "vue": "^3.0.0" + "vue": "^2.6.12" } } diff --git a/yarn.lock b/yarn.lock index 6e27f103..14298538 100644 --- a/yarn.lock +++ b/yarn.lock @@ -267,7 +267,7 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.0.0", "@babel/parser@^7.12.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.13": +"@babel/parser@^7.0.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.13": version "7.13.13" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df" integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw== @@ -918,7 +918,7 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.13", "@babel/types@^7.13.14", "@babel/types@^7.4.4": +"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.13", "@babel/types@^7.13.14", "@babel/types@^7.4.4": version "7.13.14" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d" integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ== @@ -2582,25 +2582,6 @@ "@vue/babel-plugin-transform-vue-jsx" "^1.2.1" camelcase "^5.0.0" -"@vue/compiler-core@3.0.9": - version "3.0.9" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.9.tgz#ec7efa676889aee006fc43739ee4a67a952ac623" - integrity sha512-bHAPwfVoLhGx8d6KV/OfGf/3gwpymVirgfmSyhgv5YuXDybLa6BwjSLvhNMAyDP+4q4pp0p6g248LuoOy5W6OA== - dependencies: - "@babel/parser" "^7.12.0" - "@babel/types" "^7.12.0" - "@vue/shared" "3.0.9" - estree-walker "^2.0.1" - source-map "^0.6.1" - -"@vue/compiler-dom@3.0.9": - version "3.0.9" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.9.tgz#1fd554097d9ab36eca73bc6d0d9607fecf94e71c" - integrity sha512-tkq6umPSELaghvOExWfGNwrCRc7FTul3RLykKzBZWhb87sSESq0XxiKELfBOfEbzdhWg6BJ1WXKDeq+al/viEQ== - dependencies: - "@vue/compiler-core" "3.0.9" - "@vue/shared" "3.0.9" - "@vue/component-compiler-utils@^2.5.2": version "2.6.0" resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-2.6.0.tgz#aa46d2a6f7647440b0b8932434d22f12371e543b" @@ -2648,35 +2629,6 @@ sass "^1.18.0" stylus "^0.54.5" -"@vue/reactivity@3.0.9": - version "3.0.9" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.9.tgz#875f241b8c10262560b190ccdeff2d0ab7053e11" - integrity sha512-W1AbGhzphVjY+TL32lQDwLDNvLzZKOcUgaIaLOoALWMtjzN4ExOUJzrR1FC3ynlpMHIEfcUo8GPgfnNmvMGdgQ== - dependencies: - "@vue/shared" "3.0.9" - -"@vue/runtime-core@3.0.9": - version "3.0.9" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.9.tgz#9665f149468355a524a304cb8f260147a4d294e6" - integrity sha512-j94xZ/wRZTVhqpoUgmxBTlojnPFu6TTXNw1Vw8oQkW1ZTGD0IwiJe3ycsKd1bpleXEMVt55GzGlCopI33/Gdmg== - dependencies: - "@vue/reactivity" "3.0.9" - "@vue/shared" "3.0.9" - -"@vue/runtime-dom@3.0.9": - version "3.0.9" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.9.tgz#16a1d001dc746a9f346ee7fb9de90d52ad097b61" - integrity sha512-6NCjpwa5hNBFDdokquAgMl2tNEYyQD6kBy9Mh6M2776bxYLXZCqL4/e0UrpBuBiHTrkAlUGODD7PyYGaqH6fyA== - dependencies: - "@vue/runtime-core" "3.0.9" - "@vue/shared" "3.0.9" - csstype "^2.6.8" - -"@vue/shared@3.0.9": - version "3.0.9" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.9.tgz#09882d745ded52b07e4481d036659d733edd2a9a" - integrity sha512-lv20q1O5dybwro+V+vnxHCmSIxi9mvTORSgAbGrANGYK8zF4K1S9TOankIvdkcvfZ88IR95O2pTI2Pb3c3BaNg== - "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" @@ -4957,11 +4909,6 @@ csso@^4.0.2: dependencies: css-tree "^1.1.2" -csstype@^2.6.8: - version "2.6.16" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz#544d69f547013b85a40d15bff75db38f34fe9c39" - integrity sha512-61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q== - csstype@^3.0.2: version "3.0.7" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.7.tgz#2a5fb75e1015e84dd15692f71e89a1450290950b" @@ -11702,13 +11649,20 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.1.3: prosemirror-state "^1.0.0" w3c-keyname "^2.2.0" -prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.13.3, prosemirror-model@^1.8.1: +prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.8.1: version "1.13.3" resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.13.3.tgz#3ccfde73b9c9e706933c72bdf7462906509ff1c9" integrity sha512-wujIYYQEcxdkbKmIJiekVjqtylKxuoEcc+w2PnN7Itc58m/75J4rCUz2dibygVQJFi3gZrD2DNFLjOS6LP4w1g== dependencies: orderedmap "^1.1.0" +prosemirror-model@^1.14.0: + version "1.14.0" + resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.14.0.tgz#44042a16942dfc5dcd79daf6ec37b0efcfef53c8" + integrity sha512-+9J7YE2qD2lsRgaI5aF7u6LynBoHxb/8sW1gaMKRAhK+yeQ+motBIaxb2GxRWSadDWMOq5haAImSTBo6jDkv2A== + dependencies: + orderedmap "^1.1.0" + prosemirror-schema-list@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz#471f9caf2d2bed93641d2e490434c0d2d4330df1" @@ -11743,10 +11697,10 @@ prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transfor dependencies: prosemirror-model "^1.0.0" -prosemirror-transform@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.3.1.tgz#56ea9b7ec8ce783b0f4b8e30bdec3fd5054eb894" - integrity sha512-KRo9TDaxyX+SB8jzByDdhkitCkzOUHNETt6UDpcjrXttKsn9AY0Ncj68EK8pmJuBujI3vfwQfLaTeXABEfe8Ig== +prosemirror-transform@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.3.2.tgz#5620ebe7379e6fae4f34ecc881886cb22ce96579" + integrity sha512-/G6d/u9Mf6Bv3H1XR8VxhpjmUO75LYmnvj+s3ZfZpakU1hnQbsvCEybml1B3f2IWUAAQRFkbO1PnsbFhLZsYsw== dependencies: prosemirror-model "^1.0.0" @@ -14956,15 +14910,6 @@ vue@^2.6.10, vue@^2.6.12: resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123" integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg== -vue@^3.0.0: - version "3.0.9" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.9.tgz#c68ffc0e4aa2b0f1905124a9037b6e352de469ad" - integrity sha512-MOvqDpvDslMWJo5kyGW1nTsTIPAuSzgVqmlzSQInIEqkHOu16pNbXuTjnG7jc/yIvQYFSQZqv6Pvad0iO5QkyQ== - dependencies: - "@vue/compiler-dom" "3.0.9" - "@vue/runtime-dom" "3.0.9" - "@vue/shared" "3.0.9" - w3c-keyname@^2.2.0: version "2.2.4" resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.4.tgz#4ade6916f6290224cdbd1db8ac49eab03d0eef6b" From 2a64dda01d2b284f338d30ab87143753559ececc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Tue, 6 Apr 2021 19:11:40 +0200 Subject: [PATCH 13/19] Publish - @tiptap/core@2.0.0-beta.15 - @tiptap/extension-dropcursor@2.0.0-beta.2 - @tiptap/extension-mention@2.0.0-beta.15 - @tiptap/extension-placeholder@2.0.0-beta.4 - @tiptap/extension-task-item@2.0.0-beta.2 - @tiptap/html@2.0.0-beta.15 - @tiptap/starter-kit@2.0.0-beta.10 - @tiptap/suggestion@2.0.0-beta.15 - @tiptap/vue-3@2.0.0-beta.16 - @tiptap/vue-starter-kit@2.0.0-beta.14 --- packages/core/CHANGELOG.md | 8 ++++++++ packages/core/package.json | 2 +- packages/extension-dropcursor/CHANGELOG.md | 8 ++++++++ packages/extension-dropcursor/package.json | 2 +- packages/extension-mention/CHANGELOG.md | 8 ++++++++ packages/extension-mention/package.json | 4 ++-- packages/extension-placeholder/CHANGELOG.md | 8 ++++++++ packages/extension-placeholder/package.json | 2 +- packages/extension-task-item/CHANGELOG.md | 11 +++++++++++ packages/extension-task-item/package.json | 2 +- packages/html/CHANGELOG.md | 8 ++++++++ packages/html/package.json | 4 ++-- packages/starter-kit/CHANGELOG.md | 8 ++++++++ packages/starter-kit/package.json | 6 +++--- packages/suggestion/CHANGELOG.md | 8 ++++++++ packages/suggestion/package.json | 4 ++-- packages/vue-3/CHANGELOG.md | 8 ++++++++ packages/vue-3/package.json | 2 +- packages/vue-starter-kit/CHANGELOG.md | 8 ++++++++ packages/vue-starter-kit/package.json | 4 ++-- 20 files changed, 99 insertions(+), 16 deletions(-) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index a8238e1c..f7e41fc6 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.15](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/core@2.0.0-beta.14...@tiptap/core@2.0.0-beta.15) (2021-04-06) + +**Note:** Version bump only for package @tiptap/core + + + + + # [2.0.0-beta.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/core@2.0.0-beta.13...@tiptap/core@2.0.0-beta.14) (2021-04-04) **Note:** Version bump only for package @tiptap/core diff --git a/packages/core/package.json b/packages/core/package.json index f054c488..a5d2a8ac 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/core", "description": "headless rich text editor", - "version": "2.0.0-beta.14", + "version": "2.0.0-beta.15", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/extension-dropcursor/CHANGELOG.md b/packages/extension-dropcursor/CHANGELOG.md index 8304a3e7..864c6ac8 100644 --- a/packages/extension-dropcursor/CHANGELOG.md +++ b/packages/extension-dropcursor/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.2](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-dropcursor@2.0.0-beta.1...@tiptap/extension-dropcursor@2.0.0-beta.2) (2021-04-06) + +**Note:** Version bump only for package @tiptap/extension-dropcursor + + + + + # [2.0.0-beta.1](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-dropcursor@2.0.0-alpha.11...@tiptap/extension-dropcursor@2.0.0-beta.1) (2021-03-05) **Note:** Version bump only for package @tiptap/extension-dropcursor diff --git a/packages/extension-dropcursor/package.json b/packages/extension-dropcursor/package.json index 57bb47ec..b501ca0a 100644 --- a/packages/extension-dropcursor/package.json +++ b/packages/extension-dropcursor/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/extension-dropcursor", "description": "dropcursor extension for tiptap", - "version": "2.0.0-beta.1", + "version": "2.0.0-beta.2", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/extension-mention/CHANGELOG.md b/packages/extension-mention/CHANGELOG.md index ef6c534d..0f9c29a8 100644 --- a/packages/extension-mention/CHANGELOG.md +++ b/packages/extension-mention/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.15](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-mention@2.0.0-beta.14...@tiptap/extension-mention@2.0.0-beta.15) (2021-04-06) + +**Note:** Version bump only for package @tiptap/extension-mention + + + + + # [2.0.0-beta.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-mention@2.0.0-beta.13...@tiptap/extension-mention@2.0.0-beta.14) (2021-04-04) **Note:** Version bump only for package @tiptap/extension-mention diff --git a/packages/extension-mention/package.json b/packages/extension-mention/package.json index 49bf3f1d..a351f342 100644 --- a/packages/extension-mention/package.json +++ b/packages/extension-mention/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/extension-mention", "description": "mention extension for tiptap", - "version": "2.0.0-beta.14", + "version": "2.0.0-beta.15", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -25,6 +25,6 @@ "@tiptap/core": "^2.0.0-beta.1" }, "dependencies": { - "@tiptap/suggestion": "^2.0.0-beta.14" + "@tiptap/suggestion": "^2.0.0-beta.15" } } diff --git a/packages/extension-placeholder/CHANGELOG.md b/packages/extension-placeholder/CHANGELOG.md index 59d0da99..379835c2 100644 --- a/packages/extension-placeholder/CHANGELOG.md +++ b/packages/extension-placeholder/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-placeholder@2.0.0-beta.3...@tiptap/extension-placeholder@2.0.0-beta.4) (2021-04-06) + +**Note:** Version bump only for package @tiptap/extension-placeholder + + + + + # [2.0.0-beta.3](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-placeholder@2.0.0-beta.2...@tiptap/extension-placeholder@2.0.0-beta.3) (2021-03-31) **Note:** Version bump only for package @tiptap/extension-placeholder diff --git a/packages/extension-placeholder/package.json b/packages/extension-placeholder/package.json index 650000ee..e81a14c3 100644 --- a/packages/extension-placeholder/package.json +++ b/packages/extension-placeholder/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/extension-placeholder", "description": "placeholder extension for tiptap", - "version": "2.0.0-beta.3", + "version": "2.0.0-beta.4", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/extension-task-item/CHANGELOG.md b/packages/extension-task-item/CHANGELOG.md index 3200a9a6..57b4ad5c 100644 --- a/packages/extension-task-item/CHANGELOG.md +++ b/packages/extension-task-item/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.2](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-task-item@2.0.0-beta.1...@tiptap/extension-task-item@2.0.0-beta.2) (2021-04-06) + + +### Bug Fixes + +* fix checkbox in firefox, fix [#251](https://github.com/ueberdosis/tiptap-next/issues/251) ([5622dec](https://github.com/ueberdosis/tiptap-next/commit/5622deca30397170bae341a000b9fe4693280c9b)) + + + + + # [2.0.0-beta.1](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-task-item@2.0.0-alpha.12...@tiptap/extension-task-item@2.0.0-beta.1) (2021-03-05) **Note:** Version bump only for package @tiptap/extension-task-item diff --git a/packages/extension-task-item/package.json b/packages/extension-task-item/package.json index 2d6d9781..338ea946 100644 --- a/packages/extension-task-item/package.json +++ b/packages/extension-task-item/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/extension-task-item", "description": "task item extension for tiptap", - "version": "2.0.0-beta.1", + "version": "2.0.0-beta.2", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/html/CHANGELOG.md b/packages/html/CHANGELOG.md index cd291c9b..8631b92c 100644 --- a/packages/html/CHANGELOG.md +++ b/packages/html/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.15](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/html@2.0.0-beta.14...@tiptap/html@2.0.0-beta.15) (2021-04-06) + +**Note:** Version bump only for package @tiptap/html + + + + + # [2.0.0-beta.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/html@2.0.0-beta.13...@tiptap/html@2.0.0-beta.14) (2021-04-04) **Note:** Version bump only for package @tiptap/html diff --git a/packages/html/package.json b/packages/html/package.json index f87d1d0c..ea4cab44 100644 --- a/packages/html/package.json +++ b/packages/html/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/html", "description": "utility package to render tiptap JSON as HTML", - "version": "2.0.0-beta.14", + "version": "2.0.0-beta.15", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -22,7 +22,7 @@ "dist" ], "dependencies": { - "@tiptap/core": "^2.0.0-beta.14", + "@tiptap/core": "^2.0.0-beta.15", "hostic-dom": "^0.8.6", "prosemirror-model": "^1.14.0" } diff --git a/packages/starter-kit/CHANGELOG.md b/packages/starter-kit/CHANGELOG.md index 1de06139..fdcf755d 100644 --- a/packages/starter-kit/CHANGELOG.md +++ b/packages/starter-kit/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.10](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/starter-kit@2.0.0-beta.9...@tiptap/starter-kit@2.0.0-beta.10) (2021-04-06) + +**Note:** Version bump only for package @tiptap/starter-kit + + + + + # [2.0.0-beta.9](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/starter-kit@2.0.0-beta.8...@tiptap/starter-kit@2.0.0-beta.9) (2021-04-04) **Note:** Version bump only for package @tiptap/starter-kit diff --git a/packages/starter-kit/package.json b/packages/starter-kit/package.json index 58279e89..b05d8060 100644 --- a/packages/starter-kit/package.json +++ b/packages/starter-kit/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/starter-kit", "description": "starter kit for tiptap", - "version": "2.0.0-beta.9", + "version": "2.0.0-beta.10", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -22,14 +22,14 @@ "dist" ], "dependencies": { - "@tiptap/core": "^2.0.0-beta.14", + "@tiptap/core": "^2.0.0-beta.15", "@tiptap/extension-blockquote": "^2.0.0-beta.1", "@tiptap/extension-bold": "^2.0.0-beta.1", "@tiptap/extension-bullet-list": "^2.0.0-beta.1", "@tiptap/extension-code": "^2.0.0-beta.1", "@tiptap/extension-code-block": "^2.0.0-beta.2", "@tiptap/extension-document": "^2.0.0-beta.1", - "@tiptap/extension-dropcursor": "^2.0.0-beta.1", + "@tiptap/extension-dropcursor": "^2.0.0-beta.2", "@tiptap/extension-gapcursor": "^2.0.0-beta.4", "@tiptap/extension-hard-break": "^2.0.0-beta.1", "@tiptap/extension-heading": "^2.0.0-beta.1", diff --git a/packages/suggestion/CHANGELOG.md b/packages/suggestion/CHANGELOG.md index 1e6a7551..7b315aa2 100644 --- a/packages/suggestion/CHANGELOG.md +++ b/packages/suggestion/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.15](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/suggestion@2.0.0-beta.14...@tiptap/suggestion@2.0.0-beta.15) (2021-04-06) + +**Note:** Version bump only for package @tiptap/suggestion + + + + + # [2.0.0-beta.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/suggestion@2.0.0-beta.13...@tiptap/suggestion@2.0.0-beta.14) (2021-04-04) **Note:** Version bump only for package @tiptap/suggestion diff --git a/packages/suggestion/package.json b/packages/suggestion/package.json index 3a77f24f..f425cd40 100644 --- a/packages/suggestion/package.json +++ b/packages/suggestion/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/suggestion", "description": "suggestion plugin for tiptap", - "version": "2.0.0-beta.14", + "version": "2.0.0-beta.15", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -22,7 +22,7 @@ "dist" ], "dependencies": { - "@tiptap/core": "^2.0.0-beta.14", + "@tiptap/core": "^2.0.0-beta.15", "prosemirror-model": "^1.14.0", "prosemirror-state": "^1.3.4", "prosemirror-view": "^1.18.2" diff --git a/packages/vue-3/CHANGELOG.md b/packages/vue-3/CHANGELOG.md index cbcf4b98..1196419c 100644 --- a/packages/vue-3/CHANGELOG.md +++ b/packages/vue-3/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.16](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-3@2.0.0-beta.15...@tiptap/vue-3@2.0.0-beta.16) (2021-04-06) + +**Note:** Version bump only for package @tiptap/vue-3 + + + + + # [2.0.0-beta.15](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-3@2.0.0-beta.14...@tiptap/vue-3@2.0.0-beta.15) (2021-04-03) **Note:** Version bump only for package @tiptap/vue-3 diff --git a/packages/vue-3/package.json b/packages/vue-3/package.json index 56bbe025..de177a64 100644 --- a/packages/vue-3/package.json +++ b/packages/vue-3/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/vue-3", "description": "Vue components for tiptap", - "version": "2.0.0-beta.15", + "version": "2.0.0-beta.16", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/vue-starter-kit/CHANGELOG.md b/packages/vue-starter-kit/CHANGELOG.md index ae17eb9e..81b21209 100644 --- a/packages/vue-starter-kit/CHANGELOG.md +++ b/packages/vue-starter-kit/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-beta.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.13...@tiptap/vue-starter-kit@2.0.0-beta.14) (2021-04-06) + +**Note:** Version bump only for package @tiptap/vue-starter-kit + + + + + # [2.0.0-beta.13](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.12...@tiptap/vue-starter-kit@2.0.0-beta.13) (2021-04-04) **Note:** Version bump only for package @tiptap/vue-starter-kit diff --git a/packages/vue-starter-kit/package.json b/packages/vue-starter-kit/package.json index cf7597c2..a74e0086 100644 --- a/packages/vue-starter-kit/package.json +++ b/packages/vue-starter-kit/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/vue-starter-kit", "description": "Vue starter kit for tiptap", - "version": "2.0.0-beta.13", + "version": "2.0.0-beta.14", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -22,7 +22,7 @@ "dist" ], "dependencies": { - "@tiptap/starter-kit": "^2.0.0-beta.9", + "@tiptap/starter-kit": "^2.0.0-beta.10", "@tiptap/vue": "^2.0.0-beta.5" } } From 70daefa1ca5d2ddd98c49da3d5c7692449e28974 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Tue, 6 Apr 2021 19:15:46 +0200 Subject: [PATCH 14/19] remove deprecated packages --- packages/vue-starter-kit/CHANGELOG.md | 256 -------------- packages/vue-starter-kit/README.md | 14 - packages/vue-starter-kit/package.json | 28 -- packages/vue-starter-kit/src/index.ts | 2 - packages/vue/CHANGELOG.md | 160 --------- packages/vue/README.md | 14 - packages/vue/package.json | 31 -- packages/vue/src/VueNodeViewRenderer.ts | 331 ------------------- packages/vue/src/VueRenderer.ts | 38 --- packages/vue/src/components/EditorContent.ts | 36 -- packages/vue/src/index.ts | 4 - 11 files changed, 914 deletions(-) delete mode 100644 packages/vue-starter-kit/CHANGELOG.md delete mode 100644 packages/vue-starter-kit/README.md delete mode 100644 packages/vue-starter-kit/package.json delete mode 100644 packages/vue-starter-kit/src/index.ts delete mode 100644 packages/vue/CHANGELOG.md delete mode 100644 packages/vue/README.md delete mode 100644 packages/vue/package.json delete mode 100644 packages/vue/src/VueNodeViewRenderer.ts delete mode 100644 packages/vue/src/VueRenderer.ts delete mode 100644 packages/vue/src/components/EditorContent.ts delete mode 100644 packages/vue/src/index.ts diff --git a/packages/vue-starter-kit/CHANGELOG.md b/packages/vue-starter-kit/CHANGELOG.md deleted file mode 100644 index 81b21209..00000000 --- a/packages/vue-starter-kit/CHANGELOG.md +++ /dev/null @@ -1,256 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.0.0-beta.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.13...@tiptap/vue-starter-kit@2.0.0-beta.14) (2021-04-06) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-beta.13](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.12...@tiptap/vue-starter-kit@2.0.0-beta.13) (2021-04-04) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-beta.12](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.11...@tiptap/vue-starter-kit@2.0.0-beta.12) (2021-04-02) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-beta.11](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.10...@tiptap/vue-starter-kit@2.0.0-beta.11) (2021-04-01) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-beta.10](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.9...@tiptap/vue-starter-kit@2.0.0-beta.10) (2021-04-01) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-beta.9](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.8...@tiptap/vue-starter-kit@2.0.0-beta.9) (2021-03-31) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-beta.8](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.7...@tiptap/vue-starter-kit@2.0.0-beta.8) (2021-03-31) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-beta.7](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.6...@tiptap/vue-starter-kit@2.0.0-beta.7) (2021-03-28) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-beta.6](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.5...@tiptap/vue-starter-kit@2.0.0-beta.6) (2021-03-24) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-beta.5](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.4...@tiptap/vue-starter-kit@2.0.0-beta.5) (2021-03-18) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-beta.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.3...@tiptap/vue-starter-kit@2.0.0-beta.4) (2021-03-16) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-beta.3](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.2...@tiptap/vue-starter-kit@2.0.0-beta.3) (2021-03-09) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-beta.2](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-beta.1...@tiptap/vue-starter-kit@2.0.0-beta.2) (2021-03-08) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-beta.1](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.16...@tiptap/vue-starter-kit@2.0.0-beta.1) (2021-03-05) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.16](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.15...@tiptap/vue-starter-kit@2.0.0-alpha.16) (2021-02-26) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.15](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.14...@tiptap/vue-starter-kit@2.0.0-alpha.15) (2021-02-16) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.14](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.13...@tiptap/vue-starter-kit@2.0.0-alpha.14) (2021-02-07) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.13](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.12...@tiptap/vue-starter-kit@2.0.0-alpha.13) (2021-02-05) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.12](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.11...@tiptap/vue-starter-kit@2.0.0-alpha.12) (2021-01-29) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.11](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.10...@tiptap/vue-starter-kit@2.0.0-alpha.11) (2021-01-29) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.10](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.9...@tiptap/vue-starter-kit@2.0.0-alpha.10) (2021-01-28) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.9](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.8...@tiptap/vue-starter-kit@2.0.0-alpha.9) (2021-01-06) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.8](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.7...@tiptap/vue-starter-kit@2.0.0-alpha.8) (2020-12-18) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.7](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.6...@tiptap/vue-starter-kit@2.0.0-alpha.7) (2020-12-18) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.6](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.5...@tiptap/vue-starter-kit@2.0.0-alpha.6) (2020-12-02) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.5](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.4...@tiptap/vue-starter-kit@2.0.0-alpha.5) (2020-11-20) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.3...@tiptap/vue-starter-kit@2.0.0-alpha.4) (2020-11-19) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.3](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.2...@tiptap/vue-starter-kit@2.0.0-alpha.3) (2020-11-19) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.2](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@2.0.0-alpha.1...@tiptap/vue-starter-kit@2.0.0-alpha.2) (2020-11-19) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [2.0.0-alpha.1](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@1.0.0-alpha.2...@tiptap/vue-starter-kit@2.0.0-alpha.1) (2020-11-18) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# [1.0.0-alpha.2](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-starter-kit@1.0.0-alpha.1...@tiptap/vue-starter-kit@1.0.0-alpha.2) (2020-11-16) - -**Note:** Version bump only for package @tiptap/vue-starter-kit - - - - - -# 1.0.0-alpha.1 (2020-11-16) - -**Note:** Version bump only for package @tiptap/vue-starter-kit diff --git a/packages/vue-starter-kit/README.md b/packages/vue-starter-kit/README.md deleted file mode 100644 index 9d7d8e3a..00000000 --- a/packages/vue-starter-kit/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# @tiptap/vue-starter-kit -[![Version](https://img.shields.io/npm/v/@tiptap/vue-starter-kit.svg?label=version)](https://www.npmjs.com/package/@tiptap/vue-starter-kit) -[![Downloads](https://img.shields.io/npm/dm/@tiptap/vue-starter-kit.svg)](https://npmcharts.com/compare/tiptap?minimal=true) -[![License](https://img.shields.io/npm/l/@tiptap/vue-starter-kit.svg)](https://www.npmjs.com/package/@tiptap/vue-starter-kit) -[![Sponsor](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub)](https://github.com/sponsors/ueberdosis) - -## Introduction -tiptap is a headless wrapper around [ProseMirror](https://ProseMirror.net) – a toolkit for building rich text WYSIWYG editors, which is already in use at many well-known companies such as *New York Times*, *The Guardian* or *Atlassian*. - -## Offical Documentation -Documentation can be found on the [tiptap website](https://tiptap.dev). - -## License -tiptap is open-sourced software licensed under the [MIT license](https://github.com/ueberdosis/tiptap-next/blob/main/LICENSE.md). diff --git a/packages/vue-starter-kit/package.json b/packages/vue-starter-kit/package.json deleted file mode 100644 index a74e0086..00000000 --- a/packages/vue-starter-kit/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "@tiptap/vue-starter-kit", - "description": "Vue starter kit for tiptap", - "version": "2.0.0-beta.14", - "homepage": "https://tiptap.dev", - "keywords": [ - "tiptap", - "tiptap starter kit" - ], - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "main": "dist/tiptap-vue-starter-kit.cjs.js", - "umd": "dist/tiptap-vue-starter-kit.umd.js", - "module": "dist/tiptap-vue-starter-kit.esm.js", - "unpkg": "dist/tiptap-vue-starter-kit.bundle.umd.min.js", - "types": "dist/packages/vue-starter-kit/src/index.d.ts", - "files": [ - "src", - "dist" - ], - "dependencies": { - "@tiptap/starter-kit": "^2.0.0-beta.10", - "@tiptap/vue": "^2.0.0-beta.5" - } -} diff --git a/packages/vue-starter-kit/src/index.ts b/packages/vue-starter-kit/src/index.ts deleted file mode 100644 index 6f15af04..00000000 --- a/packages/vue-starter-kit/src/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from '@tiptap/starter-kit' -export * from '@tiptap/vue' diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md deleted file mode 100644 index 7eae9633..00000000 --- a/packages/vue/CHANGELOG.md +++ /dev/null @@ -1,160 +0,0 @@ -# Change Log - -All notable changes to this project will be documented in this file. -See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. - -# [2.0.0-beta.5](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-beta.4...@tiptap/vue@2.0.0-beta.5) (2021-03-31) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-beta.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-beta.3...@tiptap/vue@2.0.0-beta.4) (2021-03-28) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-beta.3](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-beta.2...@tiptap/vue@2.0.0-beta.3) (2021-03-24) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-beta.2](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-beta.1...@tiptap/vue@2.0.0-beta.2) (2021-03-18) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-beta.1](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.13...@tiptap/vue@2.0.0-beta.1) (2021-03-05) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-alpha.13](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.12...@tiptap/vue@2.0.0-alpha.13) (2021-02-26) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-alpha.12](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.11...@tiptap/vue@2.0.0-alpha.12) (2021-02-16) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-alpha.11](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.10...@tiptap/vue@2.0.0-alpha.11) (2021-02-07) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-alpha.10](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.9...@tiptap/vue@2.0.0-alpha.10) (2021-02-05) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-alpha.9](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.8...@tiptap/vue@2.0.0-alpha.9) (2021-01-29) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-alpha.8](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.7...@tiptap/vue@2.0.0-alpha.8) (2021-01-29) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-alpha.7](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.6...@tiptap/vue@2.0.0-alpha.7) (2021-01-28) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-alpha.6](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.5...@tiptap/vue@2.0.0-alpha.6) (2021-01-06) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-alpha.5](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.4...@tiptap/vue@2.0.0-alpha.5) (2020-12-18) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-alpha.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.3...@tiptap/vue@2.0.0-alpha.4) (2020-12-02) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-alpha.3](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.2...@tiptap/vue@2.0.0-alpha.3) (2020-11-19) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-alpha.2](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@2.0.0-alpha.1...@tiptap/vue@2.0.0-alpha.2) (2020-11-19) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [2.0.0-alpha.1](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@1.0.0-alpha.2...@tiptap/vue@2.0.0-alpha.1) (2020-11-18) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# [1.0.0-alpha.2](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue@1.0.0-alpha.1...@tiptap/vue@1.0.0-alpha.2) (2020-11-16) - -**Note:** Version bump only for package @tiptap/vue - - - - - -# 1.0.0-alpha.1 (2020-11-16) - -**Note:** Version bump only for package @tiptap/vue diff --git a/packages/vue/README.md b/packages/vue/README.md deleted file mode 100644 index 04538e9d..00000000 --- a/packages/vue/README.md +++ /dev/null @@ -1,14 +0,0 @@ -# @tiptap/vue -[![Version](https://img.shields.io/npm/v/@tiptap/vue.svg?label=version)](https://www.npmjs.com/package/@tiptap/vue) -[![Downloads](https://img.shields.io/npm/dm/@tiptap/vue.svg)](https://npmcharts.com/compare/tiptap?minimal=true) -[![License](https://img.shields.io/npm/l/@tiptap/vue.svg)](https://www.npmjs.com/package/@tiptap/vue) -[![Sponsor](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub)](https://github.com/sponsors/ueberdosis) - -## Introduction -tiptap is a headless wrapper around [ProseMirror](https://ProseMirror.net) – a toolkit for building rich text WYSIWYG editors, which is already in use at many well-known companies such as *New York Times*, *The Guardian* or *Atlassian*. - -## Offical Documentation -Documentation can be found on the [tiptap website](https://tiptap.dev). - -## License -tiptap is open-sourced software licensed under the [MIT license](https://github.com/ueberdosis/tiptap-next/blob/main/LICENSE.md). diff --git a/packages/vue/package.json b/packages/vue/package.json deleted file mode 100644 index 0a390159..00000000 --- a/packages/vue/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "@tiptap/vue", - "description": "Vue components for tiptap", - "version": "2.0.0-beta.5", - "homepage": "https://tiptap.dev", - "keywords": [ - "tiptap", - "tiptap vue components" - ], - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/ueberdosis" - }, - "main": "dist/tiptap-vue.cjs.js", - "umd": "dist/tiptap-vue.umd.js", - "module": "dist/tiptap-vue.esm.js", - "unpkg": "dist/tiptap-vue.bundle.umd.min.js", - "types": "dist/packages/vue/src/index.d.ts", - "files": [ - "src", - "dist" - ], - "peerDependencies": { - "@tiptap/core": "^2.0.0-beta.1", - "vue": "^2.6.12" - }, - "dependencies": { - "prosemirror-view": "^1.18.2" - } -} diff --git a/packages/vue/src/VueNodeViewRenderer.ts b/packages/vue/src/VueNodeViewRenderer.ts deleted file mode 100644 index 88203c6e..00000000 --- a/packages/vue/src/VueNodeViewRenderer.ts +++ /dev/null @@ -1,331 +0,0 @@ -import { - Editor, - Node, - NodeViewRenderer, - NodeViewRendererProps, -} from '@tiptap/core' -import { Decoration, NodeView } from 'prosemirror-view' -import { NodeSelection } from 'prosemirror-state' -import { Node as ProseMirrorNode } from 'prosemirror-model' -import Vue from 'vue' -import { VueConstructor } from 'vue/types/umd' -import VueRenderer from './VueRenderer' - -function getComponentFromElement(element: HTMLElement): Vue { - // @ts-ignore - // eslint-disable-next-line - return element.__vue__ -} - -interface VueNodeViewRendererOptions { - stopEvent: ((event: Event) => boolean) | null, - update: ((node: ProseMirrorNode, decorations: Decoration[]) => boolean) | null, -} - -class VueNodeView implements NodeView { - - renderer!: VueRenderer - - editor: Editor - - extension!: Node - - node!: ProseMirrorNode - - decorations!: Decoration[] - - id!: string - - getPos!: any - - isDragging = false - - options: VueNodeViewRendererOptions = { - stopEvent: null, - update: null, - } - - constructor(component: Vue | VueConstructor, props: NodeViewRendererProps, options?: Partial) { - this.options = { ...this.options, ...options } - this.editor = props.editor - this.extension = props.extension - this.node = props.node - this.getPos = props.getPos - this.createUniqueId() - this.mount(component) - } - - createUniqueId() { - this.id = `id_${Math.floor(Math.random() * 0xFFFFFFFF)}` - } - - createNodeViewWrapper() { - const { handleDragStart } = this - const dragstart = handleDragStart.bind(this) - - return Vue.extend({ - props: { - as: { - type: String, - default: 'div', - }, - }, - render(createElement) { - return createElement( - this.as, { - style: { - whiteSpace: 'normal', - }, - on: { - dragstart, - }, - }, - this.$slots.default, - ) - }, - }) - } - - handleDragStart(event: DragEvent) { - const { view } = this.editor - const target = (event.target as HTMLElement) - - if (this.contentDOM?.contains(target)) { - return - } - - // sometimes `event.target` is not the `dom` element - event.dataTransfer?.setDragImage(this.dom, 0, 0) - - const selection = NodeSelection.create(view.state.doc, this.getPos()) - const transaction = view.state.tr.setSelection(selection) - - view.dispatch(transaction) - } - - createNodeViewContent() { - const { id } = this - const { isEditable } = this.editor - - return Vue.extend({ - inheritAttrs: false, - props: { - as: { - type: String, - default: 'div', - }, - }, - render(createElement) { - return createElement( - this.as, { - style: { - whiteSpace: 'pre-wrap', - }, - domProps: { - id, - contenteditable: isEditable, - }, - }, - ) - }, - }) - } - - mount(component: Vue | VueConstructor) { - const NodeViewWrapper = this.createNodeViewWrapper() - const NodeViewContent = this.createNodeViewContent() - - const Component = Vue - .extend(component) - .extend({ - components: { - NodeViewWrapper, - NodeViewContent, - }, - }) - - const propsData = { - NodeViewWrapper, - NodeViewContent, - editor: this.editor, - node: this.node, - decorations: this.decorations, - selected: false, - extension: this.extension, - getPos: () => this.getPos(), - updateAttributes: (attributes = {}) => this.updateAttributes(attributes), - } - - const parent = this.editor.view.dom.parentElement - ? getComponentFromElement(this.editor.view.dom.parentElement) - : undefined - - this.renderer = new VueRenderer(Component, { - parent, - propsData, - }) - } - - get dom() { - return this.renderer.element - } - - get contentDOM() { - if (this.dom.id === this.id) { - return this.dom - } - - return this.dom.querySelector(`#${this.id}`) - } - - stopEvent(event: Event) { - if (typeof this.options.stopEvent === 'function') { - return this.options.stopEvent(event) - } - - const target = (event.target as HTMLElement) - const isInElement = this.dom.contains(target) && !this.contentDOM?.contains(target) - - // ignore all events from child nodes - if (!isInElement) { - return false - } - - const { isEditable } = this.editor - const { isDragging } = this - const isDraggable = !!this.node.type.spec.draggable - const isSelectable = NodeSelection.isSelectable(this.node) - const isCopyEvent = event.type === 'copy' - const isPasteEvent = event.type === 'paste' - const isCutEvent = event.type === 'cut' - const isClickEvent = event.type === 'mousedown' - const isDragEvent = event.type.startsWith('drag') || event.type === 'drop' - - // ProseMirror tries to drag selectable nodes - // even if `draggable` is set to `false` - // this fix prevents that - if (!isDraggable && isSelectable && isDragEvent) { - event.preventDefault() - } - - if (isDraggable && isDragEvent && !isDragging) { - event.preventDefault() - return false - } - - // we have to store that dragging started - if (isDraggable && isEditable && !isDragging && isClickEvent) { - const dragHandle = target.closest('[data-drag-handle]') - const isValidDragHandle = dragHandle - && (this.dom === dragHandle || (this.dom.contains(dragHandle))) - - if (isValidDragHandle) { - this.isDragging = true - document.addEventListener('dragend', () => { - this.isDragging = false - }, { once: true }) - } - } - - // these events are handled by prosemirror - if ( - isDragging - || isCopyEvent - || isPasteEvent - || isCutEvent - || (isClickEvent && isSelectable) - ) { - return false - } - - return true - } - - ignoreMutation(mutation: MutationRecord | { type: 'selection'; target: Element }) { - if (mutation.type === 'selection') { - if (this.node.isLeaf) { - return true - } - - return false - } - - if (!this.contentDOM) { - return true - } - - const contentDOMHasChanged = !this.contentDOM.contains(mutation.target) - || this.contentDOM === mutation.target - - return contentDOMHasChanged - } - - destroy() { - this.renderer.destroy() - } - - update(node: ProseMirrorNode, decorations: Decoration[]) { - if (typeof this.options.update === 'function') { - return this.options.update(node, decorations) - } - - if (node.type !== this.node.type) { - return false - } - - if (node === this.node && this.decorations === decorations) { - return true - } - - this.node = node - this.decorations = decorations - this.renderer.updateProps({ node, decorations }) - - return true - } - - updateAttributes(attributes: {}) { - if (!this.editor.view.editable) { - return - } - - const { state } = this.editor.view - const pos = this.getPos() - const transaction = state.tr.setNodeMarkup(pos, undefined, { - ...this.node.attrs, - ...attributes, - }) - - this.editor.view.dispatch(transaction) - } - - selectNode() { - this.renderer.updateProps({ - selected: true, - }) - } - - deselectNode() { - this.renderer.updateProps({ - selected: false, - }) - } - -} - -export default function VueNodeViewRenderer(component: Vue | VueConstructor, options?: Partial): NodeViewRenderer { - return (props: NodeViewRendererProps) => { - // 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 - const parent = props.editor.view.dom.parentElement - ? getComponentFromElement(props.editor.view.dom.parentElement) - : undefined - - if (!parent) { - return {} - } - - return new VueNodeView(component, props, options) as NodeView - } -} diff --git a/packages/vue/src/VueRenderer.ts b/packages/vue/src/VueRenderer.ts deleted file mode 100644 index f7d5c5af..00000000 --- a/packages/vue/src/VueRenderer.ts +++ /dev/null @@ -1,38 +0,0 @@ -import Vue from 'vue' -import { VueConstructor } from 'vue/types/umd' - -export default class VueRenderer { - vm!: Vue - - constructor(component: Vue | VueConstructor, props: any) { - const Component = Vue.extend(component) - - this.vm = new Component(props).$mount() - } - - get element() { - return this.vm.$el - } - - updateProps(props: { [key: string]: any } = {}) { - if (!this.vm.$props) { - return - } - - // prevents `Avoid mutating a prop directly` error message - const originalSilent = Vue.config.silent - Vue.config.silent = true - - Object - .entries(props) - .forEach(([key, value]) => { - this.vm.$props[key] = value - }) - - Vue.config.silent = originalSilent - } - - destroy() { - this.vm.$destroy() - } -} diff --git a/packages/vue/src/components/EditorContent.ts b/packages/vue/src/components/EditorContent.ts deleted file mode 100644 index 1bfa76ab..00000000 --- a/packages/vue/src/components/EditorContent.ts +++ /dev/null @@ -1,36 +0,0 @@ -import Vue from 'vue' - -export default Vue.extend({ - name: 'EditorContent', - - props: { - editor: { - default: null, - type: Object, - }, - }, - - watch: { - editor: { - immediate: true, - handler(editor) { - if (editor && editor.options.element) { - this.$nextTick(() => { - this.$el.appendChild(editor.options.element.firstChild) - editor.createNodeViews() - }) - } - }, - }, - }, - - render(createElement) { - return createElement('div') - }, - - beforeDestroy() { - this.editor.setOptions({ - element: this.$el, - }) - }, -}) diff --git a/packages/vue/src/index.ts b/packages/vue/src/index.ts deleted file mode 100644 index 5b55d288..00000000 --- a/packages/vue/src/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from '@tiptap/core' -export { default as VueRenderer } from './VueRenderer' -export { default as VueNodeViewRenderer } from './VueNodeViewRenderer' -export { default as EditorContent } from './components/EditorContent' From c190d26a465472aaf169b504b21635d1d69939ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Tue, 6 Apr 2021 19:35:29 +0200 Subject: [PATCH 15/19] fix docs --- docs/src/demos/Experiments/GlobalDragHandle/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/src/demos/Experiments/GlobalDragHandle/index.vue b/docs/src/demos/Experiments/GlobalDragHandle/index.vue index 90fec8b2..b3cbd121 100644 --- a/docs/src/demos/Experiments/GlobalDragHandle/index.vue +++ b/docs/src/demos/Experiments/GlobalDragHandle/index.vue @@ -5,7 +5,8 @@