From 8ca65b8c5620964695aca5f1d1fd6392487a6138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Wed, 17 Mar 2021 23:49:03 +0100 Subject: [PATCH 01/18] fix scoped styles --- .../Guide/NodeViews/JavaScript/index.vue | 46 ++++++++++--------- .../NodeViews/VueComponent/Component.vue | 2 +- .../VueComponentContent/Component.vue | 2 +- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/docs/src/demos/Guide/NodeViews/JavaScript/index.vue b/docs/src/demos/Guide/NodeViews/JavaScript/index.vue index e2474ee1..53b723be 100644 --- a/docs/src/demos/Guide/NodeViews/JavaScript/index.vue +++ b/docs/src/demos/Guide/NodeViews/JavaScript/index.vue @@ -42,7 +42,7 @@ export default { } - diff --git a/docs/src/demos/Guide/NodeViews/VueComponent/Component.vue b/docs/src/demos/Guide/NodeViews/VueComponent/Component.vue index 41a2d903..32dbfbbd 100644 --- a/docs/src/demos/Guide/NodeViews/VueComponent/Component.vue +++ b/docs/src/demos/Guide/NodeViews/VueComponent/Component.vue @@ -30,7 +30,7 @@ export default { } - From df5908d42eb8c1c985aee63c226f918d4ad217ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Thu, 18 Mar 2021 09:38:10 +0100 Subject: [PATCH 04/18] add classname support for react components --- packages/react/src/NodeViewContent.tsx | 4 +++- packages/react/src/NodeViewWrapper.tsx | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/react/src/NodeViewContent.tsx b/packages/react/src/NodeViewContent.tsx index fbc64d8a..6d2a429a 100644 --- a/packages/react/src/NodeViewContent.tsx +++ b/packages/react/src/NodeViewContent.tsx @@ -2,7 +2,8 @@ import React from 'react' import { useReactNodeView } from './useReactNodeView' export interface NodeViewContentProps { - as: React.ElementType + className?: string, + as: React.ElementType, } export const NodeViewContent: React.FC = props => { @@ -11,6 +12,7 @@ export const NodeViewContent: React.FC = props => { return ( = props => { @@ -11,6 +12,7 @@ export const NodeViewWrapper: React.FC = props => { return ( Date: Thu, 18 Mar 2021 09:38:34 +0100 Subject: [PATCH 05/18] add react node view demo --- .../NodeViews/ReactComponent/Component.jsx | 22 ++++++++++++ .../Guide/NodeViews/ReactComponent/index.js | 35 +++++++++++++++++++ .../Guide/NodeViews/ReactComponent/index.jsx | 27 ++++++++++++++ .../NodeViews/ReactComponent/styles.scss | 32 +++++++++++++++++ 4 files changed, 116 insertions(+) create mode 100644 docs/src/demos/Guide/NodeViews/ReactComponent/Component.jsx create mode 100644 docs/src/demos/Guide/NodeViews/ReactComponent/index.js create mode 100644 docs/src/demos/Guide/NodeViews/ReactComponent/index.jsx create mode 100644 docs/src/demos/Guide/NodeViews/ReactComponent/styles.scss diff --git a/docs/src/demos/Guide/NodeViews/ReactComponent/Component.jsx b/docs/src/demos/Guide/NodeViews/ReactComponent/Component.jsx new file mode 100644 index 00000000..efe0d9b1 --- /dev/null +++ b/docs/src/demos/Guide/NodeViews/ReactComponent/Component.jsx @@ -0,0 +1,22 @@ +import React from 'react' +import { NodeViewWrapper } from '@tiptap/react' + +export default props => { + const increase = () => { + props.updateAttributes({ + count: props.node.attrs.count + 1, + }) + } + + return ( + + React Component + +
+ +
+ + ) +} diff --git a/docs/src/demos/Guide/NodeViews/ReactComponent/index.js b/docs/src/demos/Guide/NodeViews/ReactComponent/index.js new file mode 100644 index 00000000..36d61318 --- /dev/null +++ b/docs/src/demos/Guide/NodeViews/ReactComponent/index.js @@ -0,0 +1,35 @@ +import { Node, mergeAttributes } from '@tiptap/core' +import { ReactNodeViewRenderer } from '@tiptap/react' +import Component from './Component.jsx' + +export default Node.create({ + name: 'reactComponent', + + group: 'block', + + atom: true, + + addAttributes() { + return { + count: { + default: 0, + }, + } + }, + + parseHTML() { + return [ + { + tag: 'react-component', + }, + ] + }, + + renderHTML({ HTMLAttributes }) { + return ['react-component', mergeAttributes(HTMLAttributes)] + }, + + addNodeView() { + return ReactNodeViewRenderer(Component) + }, +}) diff --git a/docs/src/demos/Guide/NodeViews/ReactComponent/index.jsx b/docs/src/demos/Guide/NodeViews/ReactComponent/index.jsx new file mode 100644 index 00000000..905c86d6 --- /dev/null +++ b/docs/src/demos/Guide/NodeViews/ReactComponent/index.jsx @@ -0,0 +1,27 @@ +import React from 'react' +import { useEditor, EditorContent } from '@tiptap/react' +import { defaultExtensions } from '@tiptap/starter-kit' +import ReactComponent from './index.js' +import './styles.scss' + +export default () => { + const editor = useEditor({ + extensions: [ + ...defaultExtensions(), + ReactComponent, + ], + content: ` +

+ This is still the text editor you’re used to, but enriched with node views. +

+ +

+ Did you see that? That’s a React component. We are really living in the future. +

+ `, + }) + + return ( + + ) +} diff --git a/docs/src/demos/Guide/NodeViews/ReactComponent/styles.scss b/docs/src/demos/Guide/NodeViews/ReactComponent/styles.scss new file mode 100644 index 00000000..9fc7f3a6 --- /dev/null +++ b/docs/src/demos/Guide/NodeViews/ReactComponent/styles.scss @@ -0,0 +1,32 @@ +/* Basic editor styles */ +.ProseMirror { + > * + * { + margin-top: 0.75em; + } +} + +.react-component { + border: 1px solid #adb5bd; + border-radius: 0.5rem; + margin: 1rem 0; + position: relative; +} + +.label { + margin-left: 1rem; + background-color: #adb5bd; + font-size: 0.6rem; + letter-spacing: 1px; + font-weight: bold; + text-transform: uppercase; + color: #fff; + position: absolute; + top: 0; + padding: 0.25rem 0.75rem; + border-radius: 0 0 0.5rem 0.5rem; +} + +.content { + margin-top: 1.5rem; + padding: 1rem; +} From d524cd8c58fc30698609437087dd21f5aa165374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Thu, 18 Mar 2021 09:42:17 +0100 Subject: [PATCH 06/18] rename --- .../Guide/NodeViews/ReactComponent/{index.js => Extension.js} | 0 docs/src/demos/Guide/NodeViews/ReactComponent/index.jsx | 2 +- .../Guide/NodeViews/VueComponent/{index.js => Extension.js} | 0 docs/src/demos/Guide/NodeViews/VueComponent/index.vue | 2 +- .../NodeViews/VueComponentContent/{index.js => Extension.js} | 0 docs/src/demos/Guide/NodeViews/VueComponentContent/index.vue | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename docs/src/demos/Guide/NodeViews/ReactComponent/{index.js => Extension.js} (100%) rename docs/src/demos/Guide/NodeViews/VueComponent/{index.js => Extension.js} (100%) rename docs/src/demos/Guide/NodeViews/VueComponentContent/{index.js => Extension.js} (100%) diff --git a/docs/src/demos/Guide/NodeViews/ReactComponent/index.js b/docs/src/demos/Guide/NodeViews/ReactComponent/Extension.js similarity index 100% rename from docs/src/demos/Guide/NodeViews/ReactComponent/index.js rename to docs/src/demos/Guide/NodeViews/ReactComponent/Extension.js diff --git a/docs/src/demos/Guide/NodeViews/ReactComponent/index.jsx b/docs/src/demos/Guide/NodeViews/ReactComponent/index.jsx index 905c86d6..69c15fd6 100644 --- a/docs/src/demos/Guide/NodeViews/ReactComponent/index.jsx +++ b/docs/src/demos/Guide/NodeViews/ReactComponent/index.jsx @@ -1,7 +1,7 @@ import React from 'react' import { useEditor, EditorContent } from '@tiptap/react' import { defaultExtensions } from '@tiptap/starter-kit' -import ReactComponent from './index.js' +import ReactComponent from './Extension.js' import './styles.scss' export default () => { diff --git a/docs/src/demos/Guide/NodeViews/VueComponent/index.js b/docs/src/demos/Guide/NodeViews/VueComponent/Extension.js similarity index 100% rename from docs/src/demos/Guide/NodeViews/VueComponent/index.js rename to docs/src/demos/Guide/NodeViews/VueComponent/Extension.js diff --git a/docs/src/demos/Guide/NodeViews/VueComponent/index.vue b/docs/src/demos/Guide/NodeViews/VueComponent/index.vue index 51b8fc0c..5f8f3c8b 100644 --- a/docs/src/demos/Guide/NodeViews/VueComponent/index.vue +++ b/docs/src/demos/Guide/NodeViews/VueComponent/index.vue @@ -5,7 +5,7 @@ - From b44b63536638fc76ee95d80f70dbf0c010ac759f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Thu, 18 Mar 2021 11:13:25 +0100 Subject: [PATCH 12/18] scope experiment styles --- .../CollaborationAnnotation/index.vue | 20 ++-- docs/src/demos/Experiments/Commands/index.vue | 24 +++-- docs/src/demos/Experiments/Details/index.vue | 44 ++++---- docs/src/demos/Experiments/Embeds/index.vue | 10 +- docs/src/demos/Experiments/Linter/index.vue | 58 +++++----- .../Experiments/MultipleEditors/index.vue | 100 +++++++++--------- .../demos/Experiments/Placeholder/index.vue | 30 +++--- 7 files changed, 150 insertions(+), 136 deletions(-) diff --git a/docs/src/demos/Experiments/CollaborationAnnotation/index.vue b/docs/src/demos/Experiments/CollaborationAnnotation/index.vue index 6d39ed05..3637abf0 100644 --- a/docs/src/demos/Experiments/CollaborationAnnotation/index.vue +++ b/docs/src/demos/Experiments/CollaborationAnnotation/index.vue @@ -135,15 +135,17 @@ export default { } - diff --git a/docs/src/demos/Experiments/Commands/index.vue b/docs/src/demos/Experiments/Commands/index.vue index 20469d3f..45edc971 100644 --- a/docs/src/demos/Experiments/Commands/index.vue +++ b/docs/src/demos/Experiments/Commands/index.vue @@ -130,17 +130,19 @@ export default { } - diff --git a/docs/src/demos/Experiments/Details/index.vue b/docs/src/demos/Experiments/Details/index.vue index b460448a..faf9d37f 100644 --- a/docs/src/demos/Experiments/Details/index.vue +++ b/docs/src/demos/Experiments/Details/index.vue @@ -63,34 +63,36 @@ export default { } - diff --git a/docs/src/demos/Experiments/MultipleEditors/index.vue b/docs/src/demos/Experiments/MultipleEditors/index.vue index 9e28af90..1f7350b2 100644 --- a/docs/src/demos/Experiments/MultipleEditors/index.vue +++ b/docs/src/demos/Experiments/MultipleEditors/index.vue @@ -143,67 +143,69 @@ export default { } - diff --git a/docs/src/demos/Experiments/Placeholder/index.vue b/docs/src/demos/Experiments/Placeholder/index.vue index fd22ca84..c87895e1 100644 --- a/docs/src/demos/Experiments/Placeholder/index.vue +++ b/docs/src/demos/Experiments/Placeholder/index.vue @@ -37,20 +37,22 @@ export default { } - From 923775ae39a51767a363d1822b849cc1c35889cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Thu, 18 Mar 2021 11:42:20 +0100 Subject: [PATCH 13/18] Publish - @tiptap/core@2.0.0-beta.4 - @tiptap/extension-focus@2.0.0-beta.2 - @tiptap/extension-mention@2.0.0-beta.4 - @tiptap/extension-table@2.0.0-beta.2 - @tiptap/html@2.0.0-beta.4 - @tiptap/react@2.0.0-beta.4 - @tiptap/suggestion@2.0.0-beta.4 - @tiptap/vue-2@2.0.0-beta.4 - @tiptap/vue-3@2.0.0-beta.5 - @tiptap/vue-starter-kit@2.0.0-beta.5 - @tiptap/vue@2.0.0-beta.2 --- packages/core/CHANGELOG.md | 8 ++++++++ packages/core/package.json | 2 +- packages/extension-focus/CHANGELOG.md | 8 ++++++++ packages/extension-focus/package.json | 2 +- packages/extension-mention/CHANGELOG.md | 8 ++++++++ packages/extension-mention/package.json | 4 ++-- packages/extension-table/CHANGELOG.md | 8 ++++++++ packages/extension-table/package.json | 2 +- packages/html/CHANGELOG.md | 8 ++++++++ packages/html/package.json | 4 ++-- packages/react/CHANGELOG.md | 8 ++++++++ packages/react/package.json | 2 +- packages/suggestion/CHANGELOG.md | 8 ++++++++ packages/suggestion/package.json | 4 ++-- packages/vue-2/CHANGELOG.md | 8 ++++++++ packages/vue-2/package.json | 2 +- 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 ++-- packages/vue/CHANGELOG.md | 8 ++++++++ packages/vue/package.json | 2 +- 22 files changed, 103 insertions(+), 15 deletions(-) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index 8e2ace54..ef456793 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.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/core@2.0.0-beta.3...@tiptap/core@2.0.0-beta.4) (2021-03-18) + +**Note:** Version bump only for package @tiptap/core + + + + + # [2.0.0-beta.3](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/core@2.0.0-beta.2...@tiptap/core@2.0.0-beta.3) (2021-03-16) **Note:** Version bump only for package @tiptap/core diff --git a/packages/core/package.json b/packages/core/package.json index 10d78653..5fb419ba 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.3", + "version": "2.0.0-beta.4", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/extension-focus/CHANGELOG.md b/packages/extension-focus/CHANGELOG.md index 6e655c91..3b67e469 100644 --- a/packages/extension-focus/CHANGELOG.md +++ b/packages/extension-focus/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-focus@2.0.0-beta.1...@tiptap/extension-focus@2.0.0-beta.2) (2021-03-18) + +**Note:** Version bump only for package @tiptap/extension-focus + + + + + # [2.0.0-beta.1](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-focus@2.0.0-alpha.12...@tiptap/extension-focus@2.0.0-beta.1) (2021-03-05) **Note:** Version bump only for package @tiptap/extension-focus diff --git a/packages/extension-focus/package.json b/packages/extension-focus/package.json index ecb90dd0..6dadeb24 100644 --- a/packages/extension-focus/package.json +++ b/packages/extension-focus/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/extension-focus", "description": "focus 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 cf7bb918..55b0a2f7 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.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-mention@2.0.0-beta.3...@tiptap/extension-mention@2.0.0-beta.4) (2021-03-18) + +**Note:** Version bump only for package @tiptap/extension-mention + + + + + # [2.0.0-beta.3](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-mention@2.0.0-beta.2...@tiptap/extension-mention@2.0.0-beta.3) (2021-03-16) **Note:** Version bump only for package @tiptap/extension-mention diff --git a/packages/extension-mention/package.json b/packages/extension-mention/package.json index f64d2f28..84563e0c 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.3", + "version": "2.0.0-beta.4", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -25,6 +25,6 @@ "@tiptap/core": "^2.0.0-beta.1" }, "dependencies": { - "@tiptap/suggestion": "^2.0.0-beta.3" + "@tiptap/suggestion": "^2.0.0-beta.4" } } diff --git a/packages/extension-table/CHANGELOG.md b/packages/extension-table/CHANGELOG.md index c761e3ca..5691c055 100644 --- a/packages/extension-table/CHANGELOG.md +++ b/packages/extension-table/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-table@2.0.0-beta.1...@tiptap/extension-table@2.0.0-beta.2) (2021-03-18) + +**Note:** Version bump only for package @tiptap/extension-table + + + + + # [2.0.0-beta.1](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-table@2.0.0-alpha.12...@tiptap/extension-table@2.0.0-beta.1) (2021-03-05) **Note:** Version bump only for package @tiptap/extension-table diff --git a/packages/extension-table/package.json b/packages/extension-table/package.json index ea98b2c8..5976cfe5 100644 --- a/packages/extension-table/package.json +++ b/packages/extension-table/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/extension-table", "description": "table 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 9964e85a..564b9e57 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.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/html@2.0.0-beta.3...@tiptap/html@2.0.0-beta.4) (2021-03-18) + +**Note:** Version bump only for package @tiptap/html + + + + + # [2.0.0-beta.3](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/html@2.0.0-beta.2...@tiptap/html@2.0.0-beta.3) (2021-03-16) **Note:** Version bump only for package @tiptap/html diff --git a/packages/html/package.json b/packages/html/package.json index f9a5689d..ad7bab53 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.3", + "version": "2.0.0-beta.4", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -22,7 +22,7 @@ "dist" ], "dependencies": { - "@tiptap/core": "^2.0.0-beta.3", + "@tiptap/core": "^2.0.0-beta.4", "hostic-dom": "^0.8.6", "prosemirror-model": "^1.13.3" } diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 80e884ee..456b64e6 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/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/react@2.0.0-beta.3...@tiptap/react@2.0.0-beta.4) (2021-03-18) + +**Note:** Version bump only for package @tiptap/react + + + + + # [2.0.0-beta.3](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/react@2.0.0-beta.2...@tiptap/react@2.0.0-beta.3) (2021-03-16) **Note:** Version bump only for package @tiptap/react diff --git a/packages/react/package.json b/packages/react/package.json index 9d9d2f36..05a8e617 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.3", + "version": "2.0.0-beta.4", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/suggestion/CHANGELOG.md b/packages/suggestion/CHANGELOG.md index 09071483..8bda5a46 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.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/suggestion@2.0.0-beta.3...@tiptap/suggestion@2.0.0-beta.4) (2021-03-18) + +**Note:** Version bump only for package @tiptap/suggestion + + + + + # [2.0.0-beta.3](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/suggestion@2.0.0-beta.2...@tiptap/suggestion@2.0.0-beta.3) (2021-03-16) **Note:** Version bump only for package @tiptap/suggestion diff --git a/packages/suggestion/package.json b/packages/suggestion/package.json index e43e52a5..75378d3d 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.3", + "version": "2.0.0-beta.4", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -22,7 +22,7 @@ "dist" ], "dependencies": { - "@tiptap/core": "^2.0.0-beta.3", + "@tiptap/core": "^2.0.0-beta.4", "prosemirror-model": "^1.13.3", "prosemirror-state": "^1.3.4", "prosemirror-view": "^1.18.1" diff --git a/packages/vue-2/CHANGELOG.md b/packages/vue-2/CHANGELOG.md index 38271ab4..a268f15a 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.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-2@2.0.0-beta.3...@tiptap/vue-2@2.0.0-beta.4) (2021-03-18) + +**Note:** Version bump only for package @tiptap/vue-2 + + + + + # [2.0.0-beta.3](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-2@2.0.0-beta.2...@tiptap/vue-2@2.0.0-beta.3) (2021-03-17) **Note:** Version bump only for package @tiptap/vue-2 diff --git a/packages/vue-2/package.json b/packages/vue-2/package.json index cda14d0f..2d4f7360 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.3", + "version": "2.0.0-beta.4", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/vue-3/CHANGELOG.md b/packages/vue-3/CHANGELOG.md index f293e4e6..ed5968b2 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.5](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-3@2.0.0-beta.4...@tiptap/vue-3@2.0.0-beta.5) (2021-03-18) + +**Note:** Version bump only for package @tiptap/vue-3 + + + + + # [2.0.0-beta.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/vue-3@2.0.0-beta.3...@tiptap/vue-3@2.0.0-beta.4) (2021-03-17) **Note:** Version bump only for package @tiptap/vue-3 diff --git a/packages/vue-3/package.json b/packages/vue-3/package.json index 9de8618c..3d1b89c0 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.4", + "version": "2.0.0-beta.5", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/vue-starter-kit/CHANGELOG.md b/packages/vue-starter-kit/CHANGELOG.md index c5904fce..f154390a 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.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 diff --git a/packages/vue-starter-kit/package.json b/packages/vue-starter-kit/package.json index b04bb035..b156b1dd 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.4", + "version": "2.0.0-beta.5", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -23,6 +23,6 @@ ], "dependencies": { "@tiptap/starter-kit": "^2.0.0-beta.4", - "@tiptap/vue": "^2.0.0-beta.1" + "@tiptap/vue": "^2.0.0-beta.2" } } diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md index c3f52fe8..918244d5 100644 --- a/packages/vue/CHANGELOG.md +++ b/packages/vue/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/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 diff --git a/packages/vue/package.json b/packages/vue/package.json index 968e29a9..732abec1 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,7 +1,7 @@ { "name": "@tiptap/vue", "description": "Vue components for tiptap", - "version": "2.0.0-beta.1", + "version": "2.0.0-beta.2", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", From 1a74bbb0fbb8949a3aa26b9ccebe4bd3808666af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Thu, 18 Mar 2021 13:54:48 +0100 Subject: [PATCH 14/18] improve node view handling with inputs, fix #211 --- packages/core/src/NodeView.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/packages/core/src/NodeView.ts b/packages/core/src/NodeView.ts index 9ec74b52..d0308685 100644 --- a/packages/core/src/NodeView.ts +++ b/packages/core/src/NodeView.ts @@ -88,11 +88,18 @@ export class NodeView impleme const target = (event.target as HTMLElement) const isInElement = this.dom.contains(target) && !this.contentDOM?.contains(target) - // ignore all events from child nodes + // any event from child nodes should be handled by ProseMirror if (!isInElement) { return false } + const isInput = ['INPUT', 'BUTTON', 'SELECT', 'TEXTAREA'].includes(target.tagName) + + // any input event within node views should be ignored by ProseMirror + if (isInput) { + return true + } + const { isEditable } = this.editor const { isDragging } = this const isDraggable = !!this.node.type.spec.draggable @@ -123,9 +130,14 @@ export class NodeView impleme if (isValidDragHandle) { this.isDragging = true + document.addEventListener('dragend', () => { this.isDragging = false }, { once: true }) + + document.addEventListener('mouseup', () => { + this.isDragging = false + }, { once: true }) } } From 57bdf58cce9b2e310a0fefeeda5119c04ad7bc76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Thu, 18 Mar 2021 13:56:33 +0100 Subject: [PATCH 15/18] simplify release script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1953d865..714097ed 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "build:ci": "yarn clean:packages && for dir in packages/*; do package=${dir#'packages/'}; rollup -c --ci --scope @tiptap/$package || exit 1; done", "build:packages": "yarn clean:packages && lerna changed | while read package; do rollup -c --scope $package || exit 1; done", "build:allpackages": "yarn clean:packages && for dir in packages/*; do package=${dir#'packages/'}; rollup -c --scope @tiptap/$package || exit 1; done", - "release": "yarn lint && yarn test && yarn build:packages && lerna publish", + "release": "yarn build:packages && lerna publish", "clean:packages": "rm -rf ./packages/*/dist", "reset": "yarn clean:packages && rm -rf ./**/.cache && rm -rf ./**/node_modules && rm -rf ./yarn.lock && yarn install" }, From e5b808bd6788bac83612fe1e28307eb0b2c8503d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Thu, 18 Mar 2021 13:59:02 +0100 Subject: [PATCH 16/18] Publish - @tiptap/core@2.0.0-beta.5 - @tiptap/extension-mention@2.0.0-beta.5 - @tiptap/html@2.0.0-beta.5 - @tiptap/suggestion@2.0.0-beta.5 --- 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/suggestion/CHANGELOG.md | 8 ++++++++ packages/suggestion/package.json | 4 ++-- 8 files changed, 39 insertions(+), 7 deletions(-) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index ef456793..01b286fb 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.5](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/core@2.0.0-beta.4...@tiptap/core@2.0.0-beta.5) (2021-03-18) + +**Note:** Version bump only for package @tiptap/core + + + + + # [2.0.0-beta.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/core@2.0.0-beta.3...@tiptap/core@2.0.0-beta.4) (2021-03-18) **Note:** Version bump only for package @tiptap/core diff --git a/packages/core/package.json b/packages/core/package.json index 5fb419ba..1c6abd9d 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.4", + "version": "2.0.0-beta.5", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", diff --git a/packages/extension-mention/CHANGELOG.md b/packages/extension-mention/CHANGELOG.md index 55b0a2f7..dc6b59b0 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.5](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-mention@2.0.0-beta.4...@tiptap/extension-mention@2.0.0-beta.5) (2021-03-18) + +**Note:** Version bump only for package @tiptap/extension-mention + + + + + # [2.0.0-beta.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/extension-mention@2.0.0-beta.3...@tiptap/extension-mention@2.0.0-beta.4) (2021-03-18) **Note:** Version bump only for package @tiptap/extension-mention diff --git a/packages/extension-mention/package.json b/packages/extension-mention/package.json index 84563e0c..d97eafc9 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.4", + "version": "2.0.0-beta.5", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -25,6 +25,6 @@ "@tiptap/core": "^2.0.0-beta.1" }, "dependencies": { - "@tiptap/suggestion": "^2.0.0-beta.4" + "@tiptap/suggestion": "^2.0.0-beta.5" } } diff --git a/packages/html/CHANGELOG.md b/packages/html/CHANGELOG.md index 564b9e57..156c7e5b 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.5](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/html@2.0.0-beta.4...@tiptap/html@2.0.0-beta.5) (2021-03-18) + +**Note:** Version bump only for package @tiptap/html + + + + + # [2.0.0-beta.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/html@2.0.0-beta.3...@tiptap/html@2.0.0-beta.4) (2021-03-18) **Note:** Version bump only for package @tiptap/html diff --git a/packages/html/package.json b/packages/html/package.json index ad7bab53..c2b05e1b 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.4", + "version": "2.0.0-beta.5", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -22,7 +22,7 @@ "dist" ], "dependencies": { - "@tiptap/core": "^2.0.0-beta.4", + "@tiptap/core": "^2.0.0-beta.5", "hostic-dom": "^0.8.6", "prosemirror-model": "^1.13.3" } diff --git a/packages/suggestion/CHANGELOG.md b/packages/suggestion/CHANGELOG.md index 8bda5a46..cf879884 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.5](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/suggestion@2.0.0-beta.4...@tiptap/suggestion@2.0.0-beta.5) (2021-03-18) + +**Note:** Version bump only for package @tiptap/suggestion + + + + + # [2.0.0-beta.4](https://github.com/ueberdosis/tiptap-next/compare/@tiptap/suggestion@2.0.0-beta.3...@tiptap/suggestion@2.0.0-beta.4) (2021-03-18) **Note:** Version bump only for package @tiptap/suggestion diff --git a/packages/suggestion/package.json b/packages/suggestion/package.json index 75378d3d..ab202779 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.4", + "version": "2.0.0-beta.5", "homepage": "https://tiptap.dev", "keywords": [ "tiptap", @@ -22,7 +22,7 @@ "dist" ], "dependencies": { - "@tiptap/core": "^2.0.0-beta.4", + "@tiptap/core": "^2.0.0-beta.5", "prosemirror-model": "^1.13.3", "prosemirror-state": "^1.3.4", "prosemirror-view": "^1.18.1" From 6b1c272a6a154b05a4a7e93b2a48cccffe9c3675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= Date: Thu, 18 Mar 2021 14:14:20 +0100 Subject: [PATCH 17/18] update style --- docs/src/demos/Examples/InteractiveNodeViews/Component.vue | 4 ++-- .../Examples/InteractiveNodeViews/{index.js => Extension.js} | 0 docs/src/demos/Examples/InteractiveNodeViews/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename docs/src/demos/Examples/InteractiveNodeViews/{index.js => Extension.js} (100%) diff --git a/docs/src/demos/Examples/InteractiveNodeViews/Component.vue b/docs/src/demos/Examples/InteractiveNodeViews/Component.vue index 32dbfbbd..b1793b8c 100644 --- a/docs/src/demos/Examples/InteractiveNodeViews/Component.vue +++ b/docs/src/demos/Examples/InteractiveNodeViews/Component.vue @@ -32,7 +32,7 @@ export default {