Merge branch 'master' into feature/suggestions

packages/tiptap-extensions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiptap-extensions",
-  "version": "0.14.1",
+  "version": "0.15.0",
   "description": "Extensions for tiptap",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",
@@ -25,7 +25,7 @@
     "prosemirror-history": "^1.0.2",
     "prosemirror-state": "^1.2.2",
     "prosemirror-view": "^1.5.1",
-    "tiptap": "^0.12.1",
+    "tiptap": "^0.13.0",
     "tiptap-commands": "^0.3.0"
   }
 }

packages/tiptap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiptap",
-  "version": "0.12.1",
+  "version": "0.13.0",
   "description": "A rich-text editor for Vue.js",
   "homepage": "https://tiptap.scrumpy.io",
   "license": "MIT",

packages/tiptap/src/components/editor.js

@@ -255,10 +255,25 @@ export default {
 			})
 		},
 
+		getDocFromContent(content) {
+			if (typeof content === 'object') {
+				return this.schema.nodeFromJSON(content)
+			}
+
+			if (typeof content === 'string') {
+				const element = document.createElement('div')
+				element.innerHTML = content.trim()
+
+				return DOMParser.fromSchema(this.schema).parse(element)
+			}
+
+			return false
+		},
+
 		setContent(content = {}, emitUpdate = false) {
 			this.state = EditorState.create({
 				schema: this.state.schema,
-				doc: this.schema.nodeFromJSON(content),
+				doc: this.getDocFromContent(content),
 				plugins: this.state.plugins,
 			})