fix conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>
nextcloud · Oct 6, 2021 · 7c63cb0 · 7c63cb0
1 parent 47f6bbf
commit 7c63cb0
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 18 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/js/vendors.js b/js/vendors.js
diff --git a/js/vendors.js.map b/js/vendors.js.map
diff --git a/src/EditorFactory.js b/src/EditorFactory.js
@@ -30,6 +30,7 @@ import {
 	CodeBlockHighlight,
 	HorizontalRule,
 	History,
+	TrailingNode,
 	Placeholder,
 } from 'tiptap-extensions'
 import { Strong, Italic, Strike, Link } from './marks'
@@ -103,6 +104,10 @@ const createEditor = ({ content, onInit, onUpdate, extensions, enableRichEditing
 		extensions: [
 			...richEditingExtensions,
 			new History(),
+			new TrailingNode({
+				node: 'paragraph',
+				notAfter: ['paragraph'],
+			  }),
 		].concat(extensions),
 		useBuiltInExtensions: enableRichEditing,
 	})