From d8e82959ec828c5b40c8785088ea759d362dc9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 27 Oct 2020 21:38:29 +0100
Subject: [PATCH 001/113] add some random image

---
 docs/src/demos/Extensions/Image/index.vue | 2 +-
 docs/src/layouts/App/base.scss            | 5 +++++
 packages/extension-image/index.ts         | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/src/demos/Extensions/Image/index.vue b/docs/src/demos/Extensions/Image/index.vue
index 52615a3b4..699814693 100644
--- a/docs/src/demos/Extensions/Image/index.vue
+++ b/docs/src/demos/Extensions/Image/index.vue
@@ -33,7 +33,7 @@ export default {
       ],
       content: `
         <p>This is basic example of implementing images. Try to drop new images here. Reordering also works.</p>
-        <img src="https://66.media.tumblr.com/dcd3d24b79d78a3ee0f9192246e727f1/tumblr_o00xgqMhPM1qak053o1_400.gif" />
+        <img src="https://source.unsplash.com/8xznAGy4HcY/800x600" />
       `,
     })
   },
diff --git a/docs/src/layouts/App/base.scss b/docs/src/layouts/App/base.scss
index 95b824ad9..39e5629b7 100644
--- a/docs/src/layouts/App/base.scss
+++ b/docs/src/layouts/App/base.scss
@@ -109,6 +109,11 @@ code {
     }
   }
 
+  img {
+    width: 100%;
+    height: auto;
+  }
+
   hr {
     margin: 1rem 0;
   }
diff --git a/packages/extension-image/index.ts b/packages/extension-image/index.ts
index 605a4b52c..73264e60f 100644
--- a/packages/extension-image/index.ts
+++ b/packages/extension-image/index.ts
@@ -10,6 +10,8 @@ const Image = createNode({
 
   group: 'inline',
 
+  draggable: true,
+
   addAttributes() {
     return {
       src: {

From a731ff8ea2b42453ab6a39d02bfd3b4ca54b0b13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 27 Oct 2020 22:35:31 +0100
Subject: [PATCH 002/113] refactoring

---
 docs/src/demos/Extensions/Image/index.vue | 11 ++++
 docs/src/layouts/App/base.scss            |  2 +-
 packages/extension-image/index.ts         | 71 +++--------------------
 3 files changed, 19 insertions(+), 65 deletions(-)

diff --git a/docs/src/demos/Extensions/Image/index.vue b/docs/src/demos/Extensions/Image/index.vue
index 699814693..f390a7ac5 100644
--- a/docs/src/demos/Extensions/Image/index.vue
+++ b/docs/src/demos/Extensions/Image/index.vue
@@ -1,5 +1,8 @@
 <template>
   <div v-if="editor">
+    <button @click="addImage">
+      image
+    </button>
     <editor-content :editor="editor" />
   </div>
 </template>
@@ -23,6 +26,14 @@ export default {
     }
   },
 
+  methods: {
+    addImage() {
+      const url = window.prompt('URL')
+
+      this.editor.chain().focus().image({ src: url }).run()
+    },
+  },
+
   mounted() {
     this.editor = new Editor({
       extensions: [
diff --git a/docs/src/layouts/App/base.scss b/docs/src/layouts/App/base.scss
index 39e5629b7..2efeb9e11 100644
--- a/docs/src/layouts/App/base.scss
+++ b/docs/src/layouts/App/base.scss
@@ -110,7 +110,7 @@ code {
   }
 
   img {
-    width: 100%;
+    max-width: 100%;
     height: auto;
   }
 
diff --git a/packages/extension-image/index.ts b/packages/extension-image/index.ts
index 73264e60f..424cffc5f 100644
--- a/packages/extension-image/index.ts
+++ b/packages/extension-image/index.ts
@@ -1,7 +1,6 @@
 import { Command, createNode, nodeInputRule } from '@tiptap/core'
-import { Plugin } from 'prosemirror-state'
 
-const IMAGE_INPUT_REGEX = /!\[(.+|:?)]\((\S+)(?:(?:\s+)["'](\S+)["'])?\)/
+export const inputRegex = /!\[(.+|:?)]\((\S+)(?:(?:\s+)["'](\S+)["'])?\)/
 
 const Image = createNode({
   name: 'image',
@@ -40,13 +39,11 @@ const Image = createNode({
 
   addCommands() {
     return {
-      image: (attrs: any): Command => ({ tr }) => {
+      image: (options: { src: string, alt?: string, title?: string }): Command => ({ tr }) => {
         const { selection } = tr
-        console.log({ selection })
-        // const position = selection.$cursor ? selection.$cursor.pos : selection.$to.pos
-        const position = selection.$anchor ? selection.$anchor.pos : selection.$to.pos
-        const node = this.type.create(attrs)
-        tr.insert(position, node)
+        const node = this.type.create(options)
+
+        tr.replaceRangeWith(selection.from, selection.to, node)
 
         return true
       },
@@ -55,64 +52,10 @@ const Image = createNode({
 
   addInputRules() {
     return [
-      nodeInputRule(IMAGE_INPUT_REGEX, this.type, match => {
+      nodeInputRule(inputRegex, this.type, match => {
         const [, alt, src, title] = match
-        return {
-          src,
-          alt,
-          title,
-        }
-      }),
-    ]
-  },
 
-  addProseMirrorPlugins() {
-    return [
-      new Plugin({
-        props: {
-          handleDOMEvents: {
-            drop(view, event) {
-              const hasFiles = event.dataTransfer
-                && event.dataTransfer.files
-                && event.dataTransfer.files.length
-
-              if (!hasFiles) {
-                return false
-              }
-
-              const images = Array
-                // @ts-ignore
-                .from(event.dataTransfer.files)
-                .filter(file => (/image/i).test(file.type))
-
-              if (images.length === 0) {
-                return false
-              }
-
-              event.preventDefault()
-
-              const { schema } = view.state
-              const coordinates = view.posAtCoords({ left: event.clientX, top: event.clientY })
-
-              images.forEach(image => {
-                const reader = new FileReader()
-
-                reader.onload = readerEvent => {
-                  const node = schema.nodes.image.create({
-                    // @ts-ignore
-                    src: readerEvent.target.result,
-                  })
-                  // @ts-ignore
-                  const transaction = view.state.tr.insert(coordinates.pos, node)
-                  view.dispatch(transaction)
-                }
-                reader.readAsDataURL(image)
-              })
-
-              return true
-            },
-          },
-        },
+        return { src, alt, title }
       }),
     ]
   },

From 2c787625d3d19512da52b26985d4f9cb6eb563e9 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Tue, 27 Oct 2020 22:40:07 +0100
Subject: [PATCH 003/113] code style

---
 packages/extension-strike/index.ts    | 3 +--
 packages/extension-underline/index.ts | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/extension-strike/index.ts b/packages/extension-strike/index.ts
index caedb10ac..1e31a8a01 100644
--- a/packages/extension-strike/index.ts
+++ b/packages/extension-strike/index.ts
@@ -20,8 +20,7 @@ const Strike = createMark({
         tag: 'strike',
       },
       {
-        style: 'text-decoration',
-        getAttrs: node => (node === 'line-through' ? {} : false),
+        style: 'text-decoration=line-through',
       },
     ]
   },
diff --git a/packages/extension-underline/index.ts b/packages/extension-underline/index.ts
index a9eeba867..91d342c69 100644
--- a/packages/extension-underline/index.ts
+++ b/packages/extension-underline/index.ts
@@ -9,8 +9,7 @@ const Underline = createMark({
         tag: 'u',
       },
       {
-        style: 'text-decoration',
-        getAttrs: node => (node === 'underline' ? {} : false),
+        style: 'text-decoration=underline',
       },
     ]
   },

From bfb52ebfa637071e385491745e0156648839847b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 27 Oct 2020 22:41:19 +0100
Subject: [PATCH 004/113] update image content

---
 docs/src/demos/Extensions/Image/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/src/demos/Extensions/Image/index.vue b/docs/src/demos/Extensions/Image/index.vue
index f390a7ac5..1808e6faa 100644
--- a/docs/src/demos/Extensions/Image/index.vue
+++ b/docs/src/demos/Extensions/Image/index.vue
@@ -43,8 +43,9 @@ export default {
         Image(),
       ],
       content: `
-        <p>This is basic example of implementing images. Try to drop new images here. Reordering also works.</p>
+        <p>This is a basic example of implementing images. Drag to re-order.</p>
         <img src="https://source.unsplash.com/8xznAGy4HcY/800x600" />
+        <img src="https://source.unsplash.com/K9QHL52rE2k/800x600" />
       `,
     })
   },

From 9c8cb574fb437cb047a993a5819a7648d9f6be37 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Tue, 27 Oct 2020 22:43:38 +0100
Subject: [PATCH 005/113] add new extension links to the overview

---
 docs/src/docPages/api/extensions.md            | 2 ++
 docs/src/docPages/api/extensions/text-align.md | 2 +-
 docs/src/links.yaml                            | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/src/docPages/api/extensions.md b/docs/src/docPages/api/extensions.md
index c7dfc51ba..fb64e40f7 100644
--- a/docs/src/docPages/api/extensions.md
+++ b/docs/src/docPages/api/extensions.md
@@ -26,6 +26,7 @@ You don’t have to use it, but we prepared a `@tiptap/vue-starter-kit` which in
 | [Heading](/api/extensions/heading)                          | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-heading/)              |
 | [History](/api/extensions/history)                          | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-history/)              |
 | [HorizontalRule](/api/extensions/horizontal-rule)           | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-horizontal-rule/)      |
+| [Image](/api/extensions/image)                              | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-image/)                |
 | [Italic](/api/extensions/italic)                            | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-italic/)               |
 | [Link](/api/extensions/link)                                | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-link/)                 |
 | [ListItem](/api/extensions/list-item)                       | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-list-item/)            |
@@ -33,6 +34,7 @@ You don’t have to use it, but we prepared a `@tiptap/vue-starter-kit` which in
 | [Paragraph](/api/extensions/paragraph)                      | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-paragraph/)            |
 | [Strike](/api/extensions/strike)                            | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-strike/)               |
 | [Text](/api/extensions/text)                                | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-text/)                 |
+| [TextAlign](/api/extensions/text-align)                     | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-text-align/)           |
 | [Underline](/api/extensions/underline)                      | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-underline/)            |
 
 <!-- | [CodeBlockHighlight](/api/extensions/code-block-highlight) | – | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packagescode-block-highlight/extension-/) -->
diff --git a/docs/src/docPages/api/extensions/text-align.md b/docs/src/docPages/api/extensions/text-align.md
index fdb3680af..4ebd9d234 100644
--- a/docs/src/docPages/api/extensions/text-align.md
+++ b/docs/src/docPages/api/extensions/text-align.md
@@ -1,4 +1,4 @@
-# Text Align
+# TextAlign
 
 ## Installation
 ```bash
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index 1b6e7e8d2..7ca0c43c6 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -164,7 +164,7 @@
         #   draft: true
         - title: Text
           link: /api/extensions/text
-        - title: Text Align
+        - title: TextAlign
           link: /api/extensions/text-align
           draft: true
         # - title: TodoItem

From af74a87820a7be8c9e1d2cd51aa1080677eeab37 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Tue, 27 Oct 2020 23:04:18 +0100
Subject: [PATCH 006/113] add note regarding vue 3 to the upgrade guide

---
 docs/src/docPages/overview/upgrade-guide.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/src/docPages/overview/upgrade-guide.md b/docs/src/docPages/overview/upgrade-guide.md
index e996d06c9..b787f3001 100644
--- a/docs/src/docPages/overview/upgrade-guide.md
+++ b/docs/src/docPages/overview/upgrade-guide.md
@@ -14,6 +14,9 @@ Yes, it’s tedious work to upgrade your favorite text editor to a new API, but
 ## Upgrading from 1.x to 2.x
 The new API will look pretty familiar too you, but there are a ton of changes though. To make the upgrade a little bit easier, here is everything you need to know:
 
+### Upgrade to Vue.js 3
+…
+
 ### Explicitly register the Document, Text and Paragraph extensions
 Tiptap 1 tried to hide a few required extensions from you with the default setting `useBuiltInExtensions: true`. That setting has been removed and you’re required to import all extensions. Be sure to explicitly import at least the [Document](/api/extensions/document), [Paragraph](/api/extensions/paragraph) and [Text](/api/extensions/text) extensions.
 

From 079c39a7d0ebca72e25f82bec5f480ebcf930a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 27 Oct 2020 23:16:45 +0100
Subject: [PATCH 007/113] refactor splitblock command

---
 packages/core/src/extensions/splitBlock.ts | 74 ++++++++++++++--------
 1 file changed, 48 insertions(+), 26 deletions(-)

diff --git a/packages/core/src/extensions/splitBlock.ts b/packages/core/src/extensions/splitBlock.ts
index b82be5e54..37aaa7da2 100644
--- a/packages/core/src/extensions/splitBlock.ts
+++ b/packages/core/src/extensions/splitBlock.ts
@@ -1,12 +1,8 @@
-// import {
-//   baseKeymap, chainCommands, newlineInCode, createParagraphNear, liftEmptyBlock, splitBlock,
-// } from 'prosemirror-commands'
 import { canSplit } from 'prosemirror-transform'
 import { ContentMatch, Fragment } from 'prosemirror-model'
 import { NodeSelection, TextSelection } from 'prosemirror-state'
 import { Command } from '../Editor'
 import { createExtension } from '../Extension'
-// import getNodeType from '../utils/getNodeType'
 
 function defaultBlockAt(match: ContentMatch) {
   for (let i = 0; i < match.edgeCount; i + 1) {
@@ -20,41 +16,67 @@ function defaultBlockAt(match: ContentMatch) {
 export const SplitBlock = createExtension({
   addCommands() {
     return {
-      splitBlock: (copyAttributes = false): Command => ({ state, dispatch }) => {
-        // const type = getNodeType(typeOrName, state.schema)
+      splitBlock: (copyAttributes = false): Command => ({ tr, dispatch }) => {
+        const { selection, doc } = tr
+        const { $from, $to } = selection
+
+        if (selection instanceof NodeSelection && selection.node.isBlock) {
+          if (!$from.parentOffset || !canSplit(doc, $from.pos)) {
+            return false
+          }
+
+          if (dispatch) {
+            dispatch(tr.split($from.pos).scrollIntoView())
+          }
 
-        const { $from, $to } = state.selection
-        if (state.selection instanceof NodeSelection && state.selection.node.isBlock) {
-          if (!$from.parentOffset || !canSplit(state.doc, $from.pos)) return false
-          if (dispatch) dispatch(state.tr.split($from.pos).scrollIntoView())
           return true
         }
 
-        if (!$from.parent.isBlock) return false
+        if (!$from.parent.isBlock) {
+          return false
+        }
 
         if (dispatch) {
           const atEnd = $to.parentOffset === $to.parent.content.size
-          const { tr } = state
-          if (state.selection instanceof TextSelection) tr.deleteSelection()
-          const deflt = $from.depth === 0 ? null : defaultBlockAt($from.node(-1).contentMatchAt($from.indexAfter(-1)))
-          let types = atEnd && deflt ? [{ type: deflt, attrs: copyAttributes ? $from.node().attrs : {} }] : null
-          // let types = atEnd && deflt ? [{ type: deflt }] : null
-          // @ts-ignore
+
+          if (selection instanceof TextSelection) {
+            tr.deleteSelection()
+          }
+
+          const deflt = $from.depth === 0
+            ? undefined
+            : defaultBlockAt($from.node(-1).contentMatchAt($from.indexAfter(-1)))
+
+          let types = atEnd && deflt
+            ? [{ type: deflt, attrs: copyAttributes ? $from.node().attrs : {} }]
+            : undefined
+
           let can = canSplit(tr.doc, tr.mapping.map($from.pos), 1, types)
-          // @ts-ignore
-          if (!types && !can && canSplit(tr.doc, tr.mapping.map($from.pos), 1, deflt && [{ type: deflt }])) {
-            // @ts-ignore
-            types = [{ type: deflt, attrs: copyAttributes ? $from.node().attrs : {} }]
-            // types = [{ type: deflt }]
+
+          if (
+            !types
+            && !can
+            && canSplit(tr.doc, tr.mapping.map($from.pos), 1, deflt ? [{ type: deflt }] : undefined)
+          ) {
             can = true
+            types = deflt
+              ? [{ type: deflt, attrs: copyAttributes ? $from.node().attrs : {} }]
+              : undefined
           }
+
           if (can) {
-            // @ts-ignore
             tr.split(tr.mapping.map($from.pos), 1, types)
-            if (!atEnd && !$from.parentOffset && $from.parent.type !== deflt
-            // @ts-ignore
-                && $from.node(-1).canReplace($from.index(-1), $from.indexAfter(-1), Fragment.from(deflt.create(), $from.parent))) { tr.setNodeMarkup(tr.mapping.map($from.before()), deflt) }
+
+            if (
+              !atEnd
+              && !$from.parentOffset
+              && $from.parent.type !== deflt
+              && $from.node(-1).canReplace($from.index(-1), $from.indexAfter(-1), Fragment.from(deflt?.create()))
+            ) {
+              tr.setNodeMarkup(tr.mapping.map($from.before()), deflt || undefined)
+            }
           }
+
           dispatch(tr.scrollIntoView())
         }
 

From 4a78ad15231b954c15de15ff2cc1e95094a3780f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 28 Oct 2020 08:53:03 +0100
Subject: [PATCH 008/113] smaller images

---
 docs/src/demos/Extensions/Image/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/src/demos/Extensions/Image/index.vue b/docs/src/demos/Extensions/Image/index.vue
index 1808e6faa..b44f48028 100644
--- a/docs/src/demos/Extensions/Image/index.vue
+++ b/docs/src/demos/Extensions/Image/index.vue
@@ -44,8 +44,8 @@ export default {
       ],
       content: `
         <p>This is a basic example of implementing images. Drag to re-order.</p>
-        <img src="https://source.unsplash.com/8xznAGy4HcY/800x600" />
-        <img src="https://source.unsplash.com/K9QHL52rE2k/800x600" />
+        <img src="https://source.unsplash.com/8xznAGy4HcY/800x400" />
+        <img src="https://source.unsplash.com/K9QHL52rE2k/800x400" />
       `,
     })
   },

From 8c3a2b7d1c3b656c1cf8636a9e1295dd4e0ab9d3 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Wed, 28 Oct 2020 15:25:06 +0100
Subject: [PATCH 009/113] rename table of contents to keep the search results
 clean

---
 docs/src/docPages/api/commands.md                | 2 +-
 docs/src/docPages/api/editor.md                  | 2 +-
 docs/src/docPages/api/events.md                  | 2 +-
 docs/src/docPages/api/extensions.md              | 2 +-
 docs/src/docPages/api/keyboard-shortcuts.md      | 2 +-
 docs/src/docPages/api/schema.md                  | 2 +-
 docs/src/docPages/guide/build-your-editor.md     | 2 +-
 docs/src/docPages/guide/collaborative-editing.md | 2 +-
 docs/src/docPages/guide/configuration.md         | 2 +-
 docs/src/docPages/guide/custom-extensions.md     | 4 ++--
 docs/src/docPages/guide/custom-styling.md        | 2 +-
 docs/src/docPages/guide/getting-started.md       | 2 +-
 docs/src/docPages/guide/store-content.md         | 2 +-
 docs/src/docPages/overview/contributing.md       | 2 +-
 docs/src/docPages/overview/installation.md       | 2 +-
 docs/src/docPages/overview/upgrade-guide.md      | 2 +-
 docs/src/templates/DocPage/style.scss            | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/docs/src/docPages/api/commands.md b/docs/src/docPages/api/commands.md
index 3192ed56d..80dd59c97 100644
--- a/docs/src/docPages/api/commands.md
+++ b/docs/src/docPages/api/commands.md
@@ -1,6 +1,6 @@
 # Commands
 
-## Table of Contents
+## toc
 
 ## Introduction
 The editor provides a ton of commands to programmtically add or change content or alter the selection. If you want to build your own editor you definitely want to learn more about them.
diff --git a/docs/src/docPages/api/editor.md b/docs/src/docPages/api/editor.md
index 1e0f0c730..42422893f 100644
--- a/docs/src/docPages/api/editor.md
+++ b/docs/src/docPages/api/editor.md
@@ -1,6 +1,6 @@
 # Editor
 
-## Table of Contents
+## toc
 
 ## Introduction
 This class is a central building block of tiptap. It does most of the heavy lifting of creating a working  [ProseMirror](https://ProseMirror.net/) editor such as creating the [`EditorView`](https://ProseMirror.net/docs/ref/#view.EditorView), setting the initial [`EditorState`](https://ProseMirror.net/docs/ref/#state.Editor_State) and so on.
diff --git a/docs/src/docPages/api/events.md b/docs/src/docPages/api/events.md
index 45a6bb3c0..afd01daac 100644
--- a/docs/src/docPages/api/events.md
+++ b/docs/src/docPages/api/events.md
@@ -1,6 +1,6 @@
 # Events
 
-## Table of Contents
+## toc
 
 ## Introduction
 The editor fires a few different events that you can hook into. There are two ways to register event listeners:
diff --git a/docs/src/docPages/api/extensions.md b/docs/src/docPages/api/extensions.md
index fb64e40f7..b06f53731 100644
--- a/docs/src/docPages/api/extensions.md
+++ b/docs/src/docPages/api/extensions.md
@@ -1,6 +1,6 @@
 # Extensions
 
-## Table of Contents
+## toc
 
 ## Introduction
 Extensions are the way to add functionality to tiptap. By default tiptap comes bare, without any of them, but we have a long list of extensions that are ready to be used with tiptap.
diff --git a/docs/src/docPages/api/keyboard-shortcuts.md b/docs/src/docPages/api/keyboard-shortcuts.md
index 39ff02980..bb0eee9b4 100644
--- a/docs/src/docPages/api/keyboard-shortcuts.md
+++ b/docs/src/docPages/api/keyboard-shortcuts.md
@@ -1,6 +1,6 @@
 # Keyboard Shortcuts
 
-## Table of Contents
+## toc
 
 ## Introduction
 Keyboard shortcuts may be strings like `'Shift-Control-Enter'`. Keys are based on the strings that can appear in `event.key`, concatenated with a `-`. There is a little tool called [keycode.info](https://keycode.info/), which shows the `event.key` interactively.
diff --git a/docs/src/docPages/api/schema.md b/docs/src/docPages/api/schema.md
index 37a4b3fc5..a0bc6b8bd 100644
--- a/docs/src/docPages/api/schema.md
+++ b/docs/src/docPages/api/schema.md
@@ -1,6 +1,6 @@
 # Schema
 
-## Table of Contents
+## toc
 
 ## Introduction
 Unlike many other editors, tiptap is based on a [schema](https://prosemirror.net/docs/guide/#schema) that defines how your content is structured. That enables you to define the kind of nodes that may occur in the document, its attributes and the way they can be nested.
diff --git a/docs/src/docPages/guide/build-your-editor.md b/docs/src/docPages/guide/build-your-editor.md
index 0d0474785..f688551a2 100644
--- a/docs/src/docPages/guide/build-your-editor.md
+++ b/docs/src/docPages/guide/build-your-editor.md
@@ -1,6 +1,6 @@
 # Build your editor
 
-## Table of Contents
+## toc
 
 ## Introduction
 In its simplest version tiptap comes very raw. There is no menu, no buttons, no styling. That’s intended. See tiptap as your building blocks to build exactly the editor you would like to have.
diff --git a/docs/src/docPages/guide/collaborative-editing.md b/docs/src/docPages/guide/collaborative-editing.md
index 9bbe3895c..284ee2368 100644
--- a/docs/src/docPages/guide/collaborative-editing.md
+++ b/docs/src/docPages/guide/collaborative-editing.md
@@ -1,6 +1,6 @@
 # Collaborative editing
 
-## Table of Contents
+## toc
 
 ## Introduction
 
diff --git a/docs/src/docPages/guide/configuration.md b/docs/src/docPages/guide/configuration.md
index 0b9539e7f..ee58cfc99 100644
--- a/docs/src/docPages/guide/configuration.md
+++ b/docs/src/docPages/guide/configuration.md
@@ -1,6 +1,6 @@
 # Configuration
 
-## Table of Contents
+## toc
 
 ## Introduction
 tiptap is all about customization. There are a ton of options to configure the behavior and functionality of the editor. Most of those settings can be set before creating the Editor. Give tiptap a JSON with all the settings you would like to overwrite.
diff --git a/docs/src/docPages/guide/custom-extensions.md b/docs/src/docPages/guide/custom-extensions.md
index 0e6d430ae..d03ede31d 100644
--- a/docs/src/docPages/guide/custom-extensions.md
+++ b/docs/src/docPages/guide/custom-extensions.md
@@ -1,6 +1,6 @@
-# Custom Extensions
+# Custom extensions
 
-## Table of Contents
+## toc
 
 ## Introduction
 One of the strength of tiptap is it’s extendability. You don’t depend on the provided extensions, it’s intended to extend the editor to your liking. With custom extensions you can add new content types and new functionalities, on top of what already exists or on top of that.
diff --git a/docs/src/docPages/guide/custom-styling.md b/docs/src/docPages/guide/custom-styling.md
index b3c53c02d..0a759ae45 100644
--- a/docs/src/docPages/guide/custom-styling.md
+++ b/docs/src/docPages/guide/custom-styling.md
@@ -1,6 +1,6 @@
 # Custom styling
 
-## Table of Contents
+## toc
 
 ## Introduction
 Tiptap is renderless, that doesn’t mean there is no styling provided. You can decided how your editor should look like.
diff --git a/docs/src/docPages/guide/getting-started.md b/docs/src/docPages/guide/getting-started.md
index fbfac4ad5..62e6ab187 100644
--- a/docs/src/docPages/guide/getting-started.md
+++ b/docs/src/docPages/guide/getting-started.md
@@ -1,6 +1,6 @@
 # Getting started
 
-## Table of Contents
+## toc
 
 ## Introduction
 tiptap is framework-agnostic and works with Vue.js and React. It even works with plain JavaScript, if that’s your thing. To keep everything as small as possible, we put the code to use tiptap with those frameworks in different packages.
diff --git a/docs/src/docPages/guide/store-content.md b/docs/src/docPages/guide/store-content.md
index d69d267fa..72c8b0778 100644
--- a/docs/src/docPages/guide/store-content.md
+++ b/docs/src/docPages/guide/store-content.md
@@ -1,6 +1,6 @@
 # Store content
 
-## Table of Contents
+## toc
 
 ## Introduction
 You can store your content as a JSON object or as a good old HTML string. Both work fine. And of course, you can pass both formats to the editor to restore your content.
diff --git a/docs/src/docPages/overview/contributing.md b/docs/src/docPages/overview/contributing.md
index 1f024d29e..e52253972 100644
--- a/docs/src/docPages/overview/contributing.md
+++ b/docs/src/docPages/overview/contributing.md
@@ -1,6 +1,6 @@
 # Contributing
 
-## Table of Contents
+## toc
 
 ## Introduction
 Tiptap would be nothing without its lively community. Contributions have always been and will always be welcome. Here is a little bit you should know, before you send your contribution:
diff --git a/docs/src/docPages/overview/installation.md b/docs/src/docPages/overview/installation.md
index 57fc588cc..b3331e6cd 100644
--- a/docs/src/docPages/overview/installation.md
+++ b/docs/src/docPages/overview/installation.md
@@ -1,6 +1,6 @@
 # Installation
 
-## Table of Contents
+## toc
 
 ## Introduction
 You’re free to use tiptap with the framework of your choice. Depending on what you want to do, there are a few different ways to install tiptap in your project. Choose the way that fits your workflow.
diff --git a/docs/src/docPages/overview/upgrade-guide.md b/docs/src/docPages/overview/upgrade-guide.md
index b787f3001..4bdf8d084 100644
--- a/docs/src/docPages/overview/upgrade-guide.md
+++ b/docs/src/docPages/overview/upgrade-guide.md
@@ -1,6 +1,6 @@
 # Upgrade Guide
 
-## Table of Contents
+## toc
 
 ## Reasons to upgrade to tiptap 2.x
 Yes, it’s tedious work to upgrade your favorite text editor to a new API, but we made sure you’ve got enough reasons to upgrade to the newest version
diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss
index b08a90f8a..ab7f0b456 100644
--- a/docs/src/templates/DocPage/style.scss
+++ b/docs/src/templates/DocPage/style.scss
@@ -95,7 +95,7 @@
       text-decoration: underline;
     }
 
-    #table-of-contents {
+    #toc {
       display: none;
 
       & + ul {

From 3518943e62b60343765e23254c77e413cc206f6e Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Wed, 28 Oct 2020 16:32:06 +0100
Subject: [PATCH 010/113] update content

---
 docs/src/demos/Examples/Links/index.vue       |  10 +-
 docs/src/docPages/api/keyboard-shortcuts.md   | 130 +++++++-------
 .../docPages/guide/build-custom-extensions.md | 161 ++++++++++++++++++
 ...d-your-editor.md => create-your-editor.md} |   0
 docs/src/docPages/guide/custom-extensions.md  | 142 ---------------
 docs/src/docPages/guide/custom-styling.md     |  26 ++-
 docs/src/docPages/overview/upgrade-guide.md   |  66 +++----
 docs/src/links.yaml                           |   8 +-
 packages/extension-blockquote/index.ts        |   2 +-
 9 files changed, 288 insertions(+), 257 deletions(-)
 create mode 100644 docs/src/docPages/guide/build-custom-extensions.md
 rename docs/src/docPages/guide/{build-your-editor.md => create-your-editor.md} (100%)
 delete mode 100644 docs/src/docPages/guide/custom-extensions.md

diff --git a/docs/src/demos/Examples/Links/index.vue b/docs/src/demos/Examples/Links/index.vue
index e3240fc78..0bdfe621b 100644
--- a/docs/src/demos/Examples/Links/index.vue
+++ b/docs/src/demos/Examples/Links/index.vue
@@ -11,13 +11,19 @@
 </template>
 
 <script>
-import { Editor } from '@tiptap/core'
+import { Editor, mergeAttributes } from '@tiptap/core'
 import { EditorContent } from '@tiptap/vue'
 import Document from '@tiptap/extension-document'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
 import Link from '@tiptap/extension-link'
 
+const CustomLink = Link.extend({
+  renderHTML({ attributes }) {
+    return ['strong', mergeAttributes(attributes, { rel: this.options.rel }), 0]
+  },
+})
+
 export default {
   components: {
     EditorContent,
@@ -35,7 +41,7 @@ export default {
         Document(),
         Paragraph(),
         Text(),
-        Link(),
+        CustomLink(),
       ],
       content: `
         <p>
diff --git a/docs/src/docPages/api/keyboard-shortcuts.md b/docs/src/docPages/api/keyboard-shortcuts.md
index bb0eee9b4..ef795cb04 100644
--- a/docs/src/docPages/api/keyboard-shortcuts.md
+++ b/docs/src/docPages/api/keyboard-shortcuts.md
@@ -3,77 +3,49 @@
 ## toc
 
 ## Introduction
-Keyboard shortcuts may be strings like `'Shift-Control-Enter'`. Keys are based on the strings that can appear in `event.key`, concatenated with a `-`. There is a little tool called [keycode.info](https://keycode.info/), which shows the `event.key` interactively.
-
-Use lowercase letters to refer to letter keys (or uppercase letters if you want shift to be held). You may use `Space` as an alias for the <code>&nbsp;</code>.
-
-Modifiers can be given in any order. `Shift`, `Alt`, `Control` and `Cmd` are recognized. For characters that are created by holding shift, the `Shift` prefix is implied, and should not be added explicitly.
-
-You can use `Mod` as a shorthand for `Cmd` on Mac and `Control` on other platforms.
-
-## Overwrite keyboard shortcuts
-
-```js
-// 1. Import the extension
-import BulletList from '@tiptap/extension-bullet-list'
-
-// 2. Overwrite the keyboard shortcuts
-const CustomBulletList = BulletList()
-  .keys(({ editor }) => ({
-    // ↓ your new keyboard shortcut
-    'Mod-l': () => editor.bulletList(),
-  }))
-  .create() // Don’t forget that!
-
-// 3. Add the custom extension to your editor
-new Editor({
-  extensions: [
-      CustomBulletList(),
-      // …
-  ]
-})
-```
+Tiptap comes with sensible keyboard shortcut defaults. Depending on what you want to use it for, you’ll probably want to change those keyboard shortcuts to your liking. Let’s have a look at what we defined for you, and show you how to change it then!
 
 ## Predefined keyboard shortcuts
+Most of the core extensions register their own keyboard shortcuts. Depending on what set of extension you use, not all of the below listed keyboard shortcuts work for your editor.
 
 ### Essentials
-| Action                   | Windows/Linux         | macOS             |
-| ------------------------ | --------------------- | ----------------- |
-| Copy                     | `Control`&nbsp;`C`         | `Cmd`&nbsp;`C`         |
-| Cut                      | `Control`&nbsp;`X`         | `Cmd`&nbsp;`X`         |
-| Paste                    | `Control`&nbsp;`V`         | `Cmd`&nbsp;`V`         |
+| Action                   | Windows/Linux                   | macOS                       |
+| ------------------------ | ------------------------------- | --------------------------- |
+| Copy                     | `Control`&nbsp;`C`              | `Cmd`&nbsp;`C`              |
+| Cut                      | `Control`&nbsp;`X`              | `Cmd`&nbsp;`X`              |
+| Paste                    | `Control`&nbsp;`V`              | `Cmd`&nbsp;`V`              |
 | Paste without formatting | `Control`&nbsp;`Shift`&nbsp;`V` | `Cmd`&nbsp;`Shift`&nbsp;`V` |
-| Undo                     | `Control`&nbsp;`Z`         | `Cmd`&nbsp;`Z`         |
+| Undo                     | `Control`&nbsp;`Z`              | `Cmd`&nbsp;`Z`              |
 | Redo                     | `Control`&nbsp;`Shift`&nbsp;`Z` | `Cmd`&nbsp;`Shift`&nbsp;`Z` |
-| Insert or edit link      | `Control`&nbsp;`K`         | `Cmd`&nbsp;`K`         |
-| Open link                | `Alt`&nbsp;`Enter`         | `Alt`&nbsp;`Enter`     |
-| Find                     | `Control`&nbsp;`F`         | `Cmd`&nbsp;`F`         |
-| Find and replace         | `Control`&nbsp;`H`         | `Cmd`&nbsp;`Shift`&nbsp;`H` |
-| Find again               | `Control`&nbsp;`G`         | `Cmd`&nbsp;`G`         |
+| Insert or edit link      | `Control`&nbsp;`K`              | `Cmd`&nbsp;`K`              |
+| Open link                | `Alt`&nbsp;`Enter`              | `Alt`&nbsp;`Enter`          |
+| Find                     | `Control`&nbsp;`F`              | `Cmd`&nbsp;`F`              |
+| Find and replace         | `Control`&nbsp;`H`              | `Cmd`&nbsp;`Shift`&nbsp;`H` |
+| Find again               | `Control`&nbsp;`G`              | `Cmd`&nbsp;`G`              |
 | Find previous            | `Control`&nbsp;`Shift`&nbsp;`G` | `Cmd`&nbsp;`Shift`&nbsp;`G` |
-| Repeat last action       | `Control`&nbsp;`Y`         | `Cmd`&nbsp;`Y`         |
-| Add a line break         | `Shift`&nbsp;`Enter`       | `Shift`&nbsp;`Enter`   |
+| Repeat last action       | `Control`&nbsp;`Y`              | `Cmd`&nbsp;`Y`              |
+| Add a line break         | `Shift`&nbsp;`Enter`            | `Shift`&nbsp;`Enter`        |
 
 ### Text Formatting
-| Action                | Windows/Linux                                 | macOS             |
-| --------------------- | --------------------------------------------- | ----------------- |
-| Bold                  | `Control`&nbsp;`B`                                 | `Cmd`&nbsp;`B`         |
-| Italicize             | `Control`&nbsp;`I`                                 | `Cmd`&nbsp;`I`         |
-| Underline             | `Control`&nbsp;`U`                                 | `Cmd`&nbsp;`U`         |
+| Action                | Windows/Linux                                           | macOS                       |
+| --------------------- | ------------------------------------------------------- | --------------------------- |
+| Bold                  | `Control`&nbsp;`B`                                      | `Cmd`&nbsp;`B`              |
+| Italicize             | `Control`&nbsp;`I`                                      | `Cmd`&nbsp;`I`              |
+| Underline             | `Control`&nbsp;`U`                                      | `Cmd`&nbsp;`U`              |
 | Strikethrough         | `Alt`&nbsp;`Shift`&nbsp;`5`                             | `Cmd`&nbsp;`Shift`&nbsp;`X` |
-| Superscript           | `Control`&nbsp;`.`                                 | `Cmd`&nbsp;`.`         |
-| Subscript             | `Control`&nbsp;`,`                                 | `Cmd`&nbsp;`,`         |
+| Superscript           | `Control`&nbsp;`.`                                      | `Cmd`&nbsp;`.`              |
+| Subscript             | `Control`&nbsp;`,`                                      | `Cmd`&nbsp;`,`              |
 | Copy text formatting  | `Control`&nbsp;`Alt`&nbsp;`C`                           | `Cmd`&nbsp;`Alt`&nbsp;`C`   |
 | Paste text formatting | `Control`&nbsp;`Alt`&nbsp;`V`                           | `Cmd`&nbsp;`Alt`&nbsp;`V`   |
-| Clear text formatting | `Control`&nbsp;<code>\</code><br>`Control`&nbsp;`Space` | `Cmd`&nbsp;`\`         |
+| Clear text formatting | `Control`&nbsp;<code>\</code><br>`Control`&nbsp;`Space` | `Cmd`&nbsp;`\`              |
 | Increase font size    | `Control`&nbsp;`Shift`&nbsp;`>`                         | `Cmd`&nbsp;`Shift`&nbsp;`>` |
 | Decrease font size    | `Control`&nbsp;`Shift`&nbsp;`<`                         | `Cmd`&nbsp;`Shift`&nbsp;`<` |
 
 ### Paragraph Formatting
-| Action                         | Windows/Linux         | macOS                 |
-| ------------------------------ | --------------------- | --------------------- |
-| Increase paragraph indentation | `Control`&nbsp;`]`         | `Cmd`&nbsp;`]`             |
-| Decrease paragraph indentation | `Control`&nbsp;`[`         | `Cmd`&nbsp;`[`             |
+| Action                         | Windows/Linux                   | macOS                           |
+| ------------------------------ | ------------------------------- | ------------------------------- |
+| Increase paragraph indentation | `Control`&nbsp;`]`              | `Cmd`&nbsp;`]`                  |
+| Decrease paragraph indentation | `Control`&nbsp;`[`              | `Cmd`&nbsp;`[`                  |
 | Apply normal text style        | `Control`&nbsp;`Alt`&nbsp;`0`   | `Cmd`&nbsp;`Alt`&nbsp;`0`       |
 | Apply heading style 1          | `Control`&nbsp;`Alt`&nbsp;`1`   | `Cmd`&nbsp;`Alt`&nbsp;`1`       |
 | Apply heading style 2          | `Control`&nbsp;`Alt`&nbsp;`2`   | `Cmd`&nbsp;`Alt`&nbsp;`2`       |
@@ -91,14 +63,48 @@ new Editor({
 | Move paragraph down            | `Control`&nbsp;`Shift`&nbsp;`↓` | `Control`&nbsp;`Shift`&nbsp;`↓` |
 
 ### Text Selection
-| Action                                            | Windows/Linux         | macOS             |
-| ------------------------------------------------- | --------------------- | ----------------- |
-| Select all                                        | `Control`&nbsp;`A`         | `Cmd`&nbsp;`A`         |
-| Extend selection one character to left            | `Shift`&nbsp;`←`           | `Shift`&nbsp;`←`       |
-| Extend selection one character to right           | `Shift`&nbsp;`→`           | `Shift`&nbsp;`→`       |
-| Extend selection one line up                      | `Shift`&nbsp;`↑`           | `Shift`&nbsp;`↑`       |
-| Extend selection one line down                    | `Shift`&nbsp;`↓`           | `Shift`&nbsp;`↓`       |
+| Action                                            | Windows/Linux                   | macOS                       |
+| ------------------------------------------------- | ------------------------------- | --------------------------- |
+| Select all                                        | `Control`&nbsp;`A`              | `Cmd`&nbsp;`A`              |
+| Extend selection one character to left            | `Shift`&nbsp;`←`                | `Shift`&nbsp;`←`            |
+| Extend selection one character to right           | `Shift`&nbsp;`→`                | `Shift`&nbsp;`→`            |
+| Extend selection one line up                      | `Shift`&nbsp;`↑`                | `Shift`&nbsp;`↑`            |
+| Extend selection one line down                    | `Shift`&nbsp;`↓`                | `Shift`&nbsp;`↓`            |
 | Extend selection one paragraph up                 | `Alt`&nbsp;`Shift`&nbsp;`↑`     | `Alt`&nbsp;`Shift`&nbsp;`↑` |
 | Extend selection one paragraph down               | `Alt`&nbsp;`Shift`&nbsp;`↓`     | `Alt`&nbsp;`Shift`&nbsp;`↓` |
 | Extend selection to the beginning of the document | `Control`&nbsp;`Shift`&nbsp;`↑` | `Cmd`&nbsp;`Shift`&nbsp;`↑` |
 | Extend selection to the end of the document       | `Control`&nbsp;`Shift`&nbsp;`↓` | `Cmd`&nbsp;`Shift`&nbsp;`↓` |
+
+## Overwrite keyboard shortcuts
+Keyboard shortcuts may be strings like `'Shift-Control-Enter'`. Keys are based on the strings that can appear in `event.key`, concatenated with a `-`. There is a little tool called [keycode.info](https://keycode.info/), which shows the `event.key` interactively.
+
+Use lowercase letters to refer to letter keys (or uppercase letters if you want shift to be held). You may use `Space` as an alias for the <code>&nbsp;</code>.
+
+Modifiers can be given in any order. `Shift`, `Alt`, `Control` and `Cmd` are recognized. For characters that are created by holding shift, the `Shift` prefix is implied, and should not be added explicitly.
+
+You can use `Mod` as a shorthand for `Cmd` on Mac and `Control` on other platforms.
+
+Here is an example how you can overwrite the keyboard shortcuts for an existing extension:
+
+```js
+// 1. Import the extension
+import BulletList from '@tiptap/extension-bullet-list'
+
+// 2. Overwrite the keyboard shortcuts
+const CustomBulletList = BulletList.extend({
+  addKeyboardShortcuts() {
+    return {
+      // ↓ your new keyboard shortcut
+      'Mod-l': () => this.editor.bulletList(),
+    }
+  },
+})
+
+// 3. Add the custom extension to your editor
+new Editor({
+  extensions: [
+    CustomBulletList(),
+    // …
+  ]
+})
+```
diff --git a/docs/src/docPages/guide/build-custom-extensions.md b/docs/src/docPages/guide/build-custom-extensions.md
new file mode 100644
index 000000000..46716c458
--- /dev/null
+++ b/docs/src/docPages/guide/build-custom-extensions.md
@@ -0,0 +1,161 @@
+# Build custom extensions
+
+## toc
+
+## Introduction
+One of the strength of tiptap is it’s extendability. You don’t depend on the provided extensions, it’s intended to extend the editor to your liking. With custom extensions you can add new content types and new functionalities, on top of what already exists or starting from scratch.
+
+## Option 1: Extend existing extensions
+Let’s say you want to change the keyboard shortcuts for the bullet list. You should start by looking at [the source code of the `BulletList` extension](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-bullet-list/index.ts) and find the part you would like to change. In that case, the keyboard shortcut, and just that.
+
+Every extension has an `extend()` method, which takes an object with everything you want to change or add to it. For the bespoken example, your code could like that:
+
+```js
+// 1. Import the extension
+import BulletList from '@tiptap/extension-bullet-list'
+
+// 2. Overwrite the keyboard shortcuts
+const CustomBulletList = BulletList.extend({
+  addKeyboardShortcuts() {
+    return {
+      'Mod-l': () => this.editor.bulletList(),
+    }
+  },
+})
+
+// 3. Add the custom extension to your editor
+new Editor({
+  extensions: [
+    CustomBulletList(),
+    // …
+  ]
+})
+```
+
+The same applies to every aspect of an existing extension, except to the name. Let’s look at all the things that you can change through the extend method. We focus on one aspect in every example, but you can combine all those examples and change multiple aspects in one `extend()` call too.
+
+### Name
+The extension name is used in a whole lot of places and changing it isn’t too easy. If you want to change the name of an extension, it’s recommended to copy the whole extension and change the name in all occurrences.
+
+The extension name is also part of the JSON. If you [store your content as JSON](http://localhost:3000/guide/store-content#option-1-json), you need to change the name in there too.
+
+### Settings
+
+All settings can be overwritten through the extension anyway, but if you want to change the defaults, for example to provide a library on top of tiptap for other developers, you can do it like that:
+
+```js
+import Heading from '@tiptap/extension-heading'
+
+const CustomHeading = Heading.extend({
+  defaultOptions: {
+    levels: [1, 2, 3],
+  },
+})
+```
+
+### Schema
+
+Tiptap works with a [strict schema](/api/schema), which configures how the content can be structured, nested, how it behaves and many more things. You can change all aspects of the schema for existing extensions. Let’s walk through a few common use cases.
+
+The default `Blockquote` extension can wrap other nodes, like headings. If you want to allow nothing but paragraphs in your blockquotes, this is how you could achieve it:
+
+```js
+// blockquotes include paragraphs only
+import Blockquote from '@tiptap/extension-blockquote'
+
+const CustomBlockquote = Blockquote.extend({
+  content: 'paragraph block*',
+})
+```
+
+The schema even allows to make your nodes draggable, that’s what the `draggable` option is for, which defaults to `false`. Here is an example for draggable paragraphs:
+
+```js
+// draggable paragraphs
+import Paragraph from '@tiptap/extension-paragraph'
+
+const CustomParagraph = Paragraph.extend({
+  draggable: true,
+})
+```
+
+### Commands
+
+```js
+import Paragraph from '@tiptap/extension-paragraph'
+
+const CustomParagraph = Paragraph.extend({
+  addCommands() {
+    return {
+      paragraph: () => ({ commands }) => {
+        return commands.toggleBlockType('paragraph', 'paragraph')
+      },
+    }
+  },
+})
+```
+
+### Keyboard shortcuts
+Most core extensions come with sensible keyboard shortcut defaults. Depending on what you want to build, you’ll likely want to change them though. With the `addKeyboardShortcuts()` method you can overwrite the predefined shortcut map:
+
+```js
+// change the bullet list keyboard shortcut
+import BulletList from '@tiptap/extension-bullet-list'
+
+const CustomBulletList = BulletList.extend({
+  addKeyboardShortcuts() {
+    return {
+      'Mod-l': () => this.editor.bulletList(),
+    }
+  },
+})
+```
+
+### Input rules
+
+```js
+// use the ~single tilde~ markdown shortcut
+import Strike from '@tiptap/extension-strike'
+import { markInputRule } from '@tiptap/core'
+
+const inputRegex = /(?:^|\s)((?:~)((?:[^~]+))(?:~))$/gm
+
+const CustomStrike = Strike.extend({
+  addInputRules() {
+    return [
+      markInputRule(inputRegex, this.type),
+    ]
+  },
+})
+```
+
+### Paste rules
+
+```js
+// overwrite the underline regex for pasted text
+import Underline from '@tiptap/extension-underline'
+import { markPasteRule } from '@tiptap/core'
+
+const pasteRegex = /(?:^|\s)((?:~)((?:[^~]+))(?:~))$/gm
+
+const CustomUnderline = Underline.extend({
+  addPasteRules() {
+    return [
+      markPasteRule(inputRegex, this.type),
+    ]
+  },
+})
+```
+
+## Option 2: Start from scratch
+
+### Read the documentation
+Although tiptap tries to hide most of the complexity of ProseMirror, it’s built on top of its APIs and we recommend you to read through the [ProseMirror Guide](https://ProseMirror.net/docs/guide/) for advanced usage. You’ll have a better understanding of how everything works under the hood and get more familiar with many terms and jargon used by tiptap.
+
+### Have a look at existing extensions
+
+### Get started
+
+### Ask questions
+
+### Share your extension
diff --git a/docs/src/docPages/guide/build-your-editor.md b/docs/src/docPages/guide/create-your-editor.md
similarity index 100%
rename from docs/src/docPages/guide/build-your-editor.md
rename to docs/src/docPages/guide/create-your-editor.md
diff --git a/docs/src/docPages/guide/custom-extensions.md b/docs/src/docPages/guide/custom-extensions.md
deleted file mode 100644
index d03ede31d..000000000
--- a/docs/src/docPages/guide/custom-extensions.md
+++ /dev/null
@@ -1,142 +0,0 @@
-# Custom extensions
-
-## toc
-
-## Introduction
-One of the strength of tiptap is it’s extendability. You don’t depend on the provided extensions, it’s intended to extend the editor to your liking. With custom extensions you can add new content types and new functionalities, on top of what already exists or on top of that.
-
-## Option 1: Change defaults
-
-Let’s say you want to change the keyboard shortcuts for the bullet list. You should start by looking at [the source code of the `BulletList` extension](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-bullet-list/index.ts) and find the default you’d like to change. In that case, the keyboard shortcut, and just that.
-
-```js
-// 1. Import the extension
-import BulletList from '@tiptap/extension-bullet-list'
-
-// 2. Overwrite the keyboard shortcuts
-const CustomBulletList = BulletList()
-  .keys(({ editor }) => ({
-    'Mod-l': () => editor.bulletList(),
-  }))
-  .create() // Don’t forget that!
-
-// 3. Add the custom extension to your editor
-new Editor({
-  extensions: [
-      CustomBulletList(),
-      // …
-  ]
-})
-```
-
-You can overwrite every aspect of an existing extension:
-
-### Name
-
-```js
-import Document from '@tiptap/extension-document'
-
-const CustomDocument = Document()
-  .name('doc')
-  .create()
-```
-
-### Settings
-
-```js
-import Heading from '@tiptap/extension-heading'
-
-const CustomHeading = Heading()
-  .defaults({
-    levels: [1, 2, 3],
-    class: 'my-custom-heading',
-  })
-  .create()
-```
-
-### Schema
-
-```js
-import Code from '@tiptap/extension-code'
-
-const CustomCode = Code()
-  .schema(() => ({
-    excludes: '_',
-    parseDOM: [
-      { tag: 'code' },
-    ],
-    toDOM: () => ['code', { 'data-attribute': 'foobar' }, 0],
-  }))
-  .create()
-```
-
-### Commands
-
-```js
-import Paragraph from '@tiptap/extension-paragraph'
-
-const CustomParagraph = Paragraph()
-  .commands(() => ({
-    paragraph: () => ({ commands }) => {
-      return commands.toggleBlockType(name, 'paragraph')
-    },
-  }))
-  .create()
-```
-
-### Keyboard shortcuts
-
-```js
-import BulletList from '@tiptap/extension-bullet-list'
-
-const CustomBulletList = BulletList()
-  .keys(({ editor }) => ({
-    'Mod-l': () => editor.bulletList(),
-  }))
-  .create()
-```
-
-### Input rules
-
-```js
-import Strike from '@tiptap/extension-strike'
-import { markInputRule } from '@tiptap/core'
-
-const inputRegex = /(?:^|\s)((?:~)((?:[^~]+))(?:~))$/gm
-
-const CustomStrike = Strike()
-  .inputRules(({ type }) => [
-    markInputRule(inputRegex, type),
-  ])
-  .create()
-```
-
-### Paste rules
-
-```js
-import Underline from '@tiptap/extension-underline'
-import { markPasteRule } from '@tiptap/core'
-
-const pasteRegex = /(?:^|\s)((?:~)((?:[^~]+))(?:~))$/gm
-
-const CustomUnderline = Underline()
-  .pasteRules(({ type }) => [
-    markPasteRule(pasteRegex, type),
-  ])
-  .create()
-```
-
-## Option 2: Extend existing extensions
-
-## Option 3: Start from scratch
-
-### 1. Read the documentation
-Although tiptap tries to hide most of the complexity of ProseMirror, it’s built on top of its APIs and we recommend you to read through the [ProseMirror Guide](https://ProseMirror.net/docs/guide/) for advanced usage. You’ll have a better understanding of how everything works under the hood and get more familiar with many terms and jargon used by tiptap.
-
-### 2. Have a look at existing extensions
-
-### 3. Get started
-
-### 4. Ask questions
-
-### 5. Publish a community extension
diff --git a/docs/src/docPages/guide/custom-styling.md b/docs/src/docPages/guide/custom-styling.md
index 0a759ae45..596cb451b 100644
--- a/docs/src/docPages/guide/custom-styling.md
+++ b/docs/src/docPages/guide/custom-styling.md
@@ -28,15 +28,21 @@ p {
 ## Option 2: Add custom classes
 Most extensions have a `class` option, which you can use to add a custom CSS class to the HTML tag.
 
+Most extensions allow you to add attributes to the rendered HTML through the `attributes` configuration. You can use that to add a custom class (or any other attribute):
+
 ```js
 new Editor({
   extensions: [
     Document(),
     Paragraph({
-      class: 'my-custom-paragraph',
+      attributes: {
+        class: 'my-custom-paragraph',
+      },
     }),
     Heading({
-      class: 'my-custom-heading',
+      attributes: {
+        class: 'my-custom-heading',
+      },
     }),
     Text(),
   ]
@@ -50,17 +56,21 @@ The rendered HTML will look like that:
 <p class="my-custom-paragraph">Wow, that’s really custom.</p>
 ```
 
+If there are already classes defined by the extensions, your classes will be added.
+
 ## Option 3: Customize the HTML
 You can even customize the markup for every extension. This will make a custom bold extension that doesn’t render a `<strong>` tag, but a `<b>` tag:
 
 ```js
 import Bold from '@tiptap/extension-bold'
 
-const CustomBold = Bold
-  .schema(() => ({
-    toDOM: () => ['b', 0],
-  }))
-  .create()
+const CustomBold = Bold.extend({
+  renderHTML({ attributes }) {
+    // Original:
+    // return ['strong', attributes, 0]
+    return ['b', attributes, 0]
+  },
+})
 
 new Editor({
   extensions: [
@@ -70,4 +80,4 @@ new Editor({
 })
 ```
 
-You should put your custom extensions in separate files though, but I think you’ve got the idea.
+You should put your custom extensions in separate files though, but I think you got the idea.
diff --git a/docs/src/docPages/overview/upgrade-guide.md b/docs/src/docPages/overview/upgrade-guide.md
index 4bdf8d084..c63828643 100644
--- a/docs/src/docPages/overview/upgrade-guide.md
+++ b/docs/src/docPages/overview/upgrade-guide.md
@@ -36,48 +36,39 @@ new Editor({
 ```
 
 ### New document type
-**We renamed the default `Document` type from `doc` to `document`.** To keep it like that, use your own implementation of the `Document` node or migrate the stored JSON to use the new name.
-
-```js
-import Document from '@tiptap/extension-document'
-
-const CustomDocument = Document.name('doc').create()
-
-new Editor({
-  extensions: [
-    CustomDocument(),
-    // …
-  ]
-})
-```
+~~**We renamed the default `Document` type from `doc` to `document`.** To keep it like that, use your own implementation of the `Document` node or migrate the stored JSON to use the new name.~~
 
 ### New extension API
 In case you’ve built some custom extensions for your project, you’re required to rewrite them to fit the new API. No worries, you can keep a lot of your work though. The `schema`, `commands`, `keys`, `inputRules` and `pasteRules` all work like they did before. It’s just different how you register them.
 
 ```js
-import { Node } from '@tiptap/core'
+import { createNode } from '@tiptap/core'
 
-const CustomExtension = new Node()
-  .name('custom_extension')
-  .defaults({
-    // …
-  })
-  .schema(() => ({
-    // …
-  }))
-  .commands(({ editor, name }) => ({
-    // …
-  }))
-  .keys(({ editor }) => ({
-    // …
-  }))
-  .inputRules(({ type }) => [
-    // …
-  ])
-  .pasteRules(({ type }) => [
-    // …
-  ])
-  .create()
+const CustomExtension = createNode({
+  name: 'custom_extension'
+  defaultOptions: {
+    …
+  },
+  addAttributes() {
+    …
+  },
+  parseHTML() {
+    …
+  },
+  renderHTML({ node, attributes }) {
+    …
+  },
+  addCommands() {
+    …
+  },
+  addKeyboardShortcuts() {
+    …
+  },
+  addInputRules() {
+    …
+  },
+  // and more …
+})
 ```
 
 Don’t forget to call `create()` in the end! Read more about [all the nifty details building custom extensions](/guide/custom-extensions) in our guide.
@@ -87,8 +78,7 @@ Don’t forget to call `create()` in the end! Read more about [all the nifty det
 
 | Old method name | New method name |
 | --------------- | --------------- |
-| ~~`getHTML`~~   | `html`          |
-| ~~`getJSON`~~   | `json`          |
+| ~~`…`~~         | `…`             |
 
 ### Commands can be chained now
 
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index 7ca0c43c6..33b15554f 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -78,15 +78,15 @@
       link: /guide/getting-started
     - title: Configuration
       link: /guide/configuration
-    - title: Build your editor
-      link: /guide/build-your-editor
+    - title: Create your editor
+      link: /guide/create-your-editor
       draft: true
     - title: Custom styling
       link: /guide/custom-styling
     - title: Store content
       link: /guide/store-content
-    - title: Custom extensions
-      link: /guide/custom-extensions
+    - title: Build custom extensions
+      link: /guide/build-custom-extensions
     # - title: Use Vue Components
     #   link: /guide/use-vue-components
     #   draft: true
diff --git a/packages/extension-blockquote/index.ts b/packages/extension-blockquote/index.ts
index dc6d5a019..bd36fee8a 100644
--- a/packages/extension-blockquote/index.ts
+++ b/packages/extension-blockquote/index.ts
@@ -6,7 +6,7 @@ export const inputRegex = /^\s*>\s$/gm
 const Blockquote = createNode({
   name: 'blockquote',
 
-  content: 'block*',
+  content: 'paragraph block*',
 
   group: 'block',
 

From 9e2ee850652595b389f5e4d2da3d1bc823d68f1e Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Wed, 28 Oct 2020 16:32:37 +0100
Subject: [PATCH 011/113] move edit link & made with <3 to the page footer

---
 docs/src/layouts/App/index.vue | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/docs/src/layouts/App/index.vue b/docs/src/layouts/App/index.vue
index 1c9bf00bc..eb5132d65 100644
--- a/docs/src/layouts/App/index.vue
+++ b/docs/src/layouts/App/index.vue
@@ -125,15 +125,6 @@
       <main class="app__main">
         <div class="app__inner">
           <slot />
-          <p>
-            <br>
-            <a :href="editLink" target="_blank">
-              <span>Edit this page on GitHub</span>
-            </a>
-          </p>
-          <p>
-            Made with 🖤 by <a href="https://twitter.com/_ueberdosis">überdosis</a>
-          </p>
         </div>
       </main>
       <div class="app__page-navigation">
@@ -141,6 +132,13 @@
           <page-navigation />
         </div>
       </div>
+      <!-- TODO: -->
+      <div>
+        <a :href="editLink" target="_blank">
+          <span>Edit this page on GitHub</span> &middot;
+        </a>
+        Made with 🖤 by <a href="https://twitter.com/_ueberdosis">überdosis</a>
+      </div>
     </div>
 
     <portal :to="portal">

From 0d1bf1da67b161525507c866e1ed2a291da56986 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Wed, 28 Oct 2020 16:49:37 +0100
Subject: [PATCH 012/113] fix blockquotes

---
 packages/extension-blockquote/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/extension-blockquote/index.ts b/packages/extension-blockquote/index.ts
index bd36fee8a..dc6d5a019 100644
--- a/packages/extension-blockquote/index.ts
+++ b/packages/extension-blockquote/index.ts
@@ -6,7 +6,7 @@ export const inputRegex = /^\s*>\s$/gm
 const Blockquote = createNode({
   name: 'blockquote',
 
-  content: 'paragraph block*',
+  content: 'block*',
 
   group: 'block',
 

From 9347dd167f20c709511f84a328ec5f89f07169f2 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Wed, 28 Oct 2020 16:49:44 +0100
Subject: [PATCH 013/113] update content

---
 docs/src/docPages/api/extensions/collaboration.md |  6 +++++-
 docs/src/docPages/api/overview.md                 | 13 ++++++++-----
 docs/src/links.yaml                               |  5 +++++
 docs/src/templates/DocPage/style.scss             |  6 ++++++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/docs/src/docPages/api/extensions/collaboration.md b/docs/src/docPages/api/extensions/collaboration.md
index fa5bbab94..c19acbb79 100644
--- a/docs/src/docPages/api/extensions/collaboration.md
+++ b/docs/src/docPages/api/extensions/collaboration.md
@@ -1,5 +1,9 @@
 # Collaboration
-Enables you to collaborate with others on one document.
+The Collaboration extension enables you to collaborate with others on one document. The implementation is based on [Y.js by Kevin Jahns](https://github.com/yjs/yjs), which is the coolest thing to [integrate collaborative editing](/guide/collaborative-editing) in your project.
+
+:::pro Premium Extension
+Using this in production requires a **tiptap pro** license. [Read more](/license)
+:::
 
 ## Installation
 ```bash
diff --git a/docs/src/docPages/api/overview.md b/docs/src/docPages/api/overview.md
index f7b813bbb..d8ff4f5c7 100644
--- a/docs/src/docPages/api/overview.md
+++ b/docs/src/docPages/api/overview.md
@@ -1,10 +1,13 @@
 # Overview
- tiptap is a friendly wrapper around [ProseMirror](https://ProseMirror.net).
+tiptap is a friendly wrapper around [ProseMirror](https://ProseMirror.net).
 
- ProseMirror works with a strict [Schema](/api/schema), which defines the allowed structure of a document. A document is a tree of headings, paragraphs and others elements, so called nodes. Marks can be attached to a node, e. g. to emphasize part of it. [Commands](/api/commands) change that document programmatically.
+### Structure
+ProseMirror works with a strict [Schema](/api/schema), which defines the allowed structure of a document. A document is a tree of headings, paragraphs and others elements, so called nodes. Marks can be attached to a node, e. g. to emphasize part of it. [Commands](/api/commands) change that document programmatically.
 
- The document is stored in a state. All changes are applied as transactions to the state. The state has details about the current content, cursor position and selection. You can hook into a few different [events](/api/events), for example to alter transactions before they get applied.
+### Content
+The document is stored in a state. All changes are applied as transactions to the state. The state has details about the current content, cursor position and selection. You can hook into a few different [events](/api/events), for example to alter transactions before they get applied.
 
- [Extensions](/api/extensions) add functionality like nodes, marks and/or commands to the editor. A huge amount of commands are bound to common [keyboard shortcuts](/api/keyboard-shortcuts).
+### Extensions
+[Extensions](/api/extensions) add functionality like nodes, marks and/or commands to the editor. A huge amount of commands are bound to common [keyboard shortcuts](/api/keyboard-shortcuts).
 
-All of those concepts are explained in detail on the following pages.
+All those concepts are explained in detail on the following pages.
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index 33b15554f..b68d84fa7 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -183,3 +183,8 @@
       link: /api/schema
     - title: Keyboard Shortcuts
       link: /api/keyboard-shortcuts
+
+- title: tiptap pro
+  items:
+    - title: License
+      link: /license
diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss
index ab7f0b456..fc43d067e 100644
--- a/docs/src/templates/DocPage/style.scss
+++ b/docs/src/templates/DocPage/style.scss
@@ -247,6 +247,12 @@
         color: $colorRed;
       }
 
+      &.pro {
+        border-color: rgba($colorRed, 0.1);
+        background-color: rgba($colorRed, 0.1);
+        color: $colorRed;
+      }
+
       .remark-container-title {
         font-weight: 600;
       }

From 32e0a945a8aa2b241277c6848a88364b1f1645f0 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Wed, 28 Oct 2020 16:54:11 +0100
Subject: [PATCH 014/113] improve custom blockquote example

---
 docs/src/docPages/guide/build-custom-extensions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/docPages/guide/build-custom-extensions.md b/docs/src/docPages/guide/build-custom-extensions.md
index 46716c458..aaa5d3b05 100644
--- a/docs/src/docPages/guide/build-custom-extensions.md
+++ b/docs/src/docPages/guide/build-custom-extensions.md
@@ -64,7 +64,7 @@ The default `Blockquote` extension can wrap other nodes, like headings. If you w
 import Blockquote from '@tiptap/extension-blockquote'
 
 const CustomBlockquote = Blockquote.extend({
-  content: 'paragraph block*',
+  content: 'paragraph*',
 })
 ```
 

From 4af60497922a81a858987def172518c512104988 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Wed, 28 Oct 2020 17:12:25 +0100
Subject: [PATCH 015/113] add hostic-dom

---
 .../demos/Api/Schema/GenerateHtml/index.vue   |  13 +-
 packages/html/getHtmlFromFragment.ts          |  18 +-
 packages/html/index.ts                        |   2 +-
 packages/html/package.json                    |   2 +-
 .../integration/core/generateHtml.spec.ts     |  29 ++
 yarn.lock                                     | 294 +-----------------
 6 files changed, 68 insertions(+), 290 deletions(-)
 create mode 100644 tests/cypress/integration/core/generateHtml.spec.ts

diff --git a/docs/src/demos/Api/Schema/GenerateHtml/index.vue b/docs/src/demos/Api/Schema/GenerateHtml/index.vue
index 5673dcd25..81295caac 100644
--- a/docs/src/demos/Api/Schema/GenerateHtml/index.vue
+++ b/docs/src/demos/Api/Schema/GenerateHtml/index.vue
@@ -1,9 +1,13 @@
 <template>
-  <pre>{{ html }}</pre>
+  <div>
+    <pre>{{ html }}</pre>
+    <pre>{{ otherHtml }}</pre>
+  </div>
 </template>
 
 <script>
 import { generateHtml } from '@tiptap/core'
+import { generateHtml as generateHtmlWithoutEditor } from '@tiptap/html'
 import Document from '@tiptap/extension-document'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
@@ -22,6 +26,7 @@ export default {
         }],
       },
       html: '',
+      otherHtml: '',
     }
   },
 
@@ -31,6 +36,12 @@ export default {
       Paragraph(),
       Text(),
     ])
+
+    this.otherHtml = generateHtmlWithoutEditor(this.json, [
+      Document(),
+      Paragraph(),
+      Text(),
+    ])
   },
 }
 </script>
diff --git a/packages/html/getHtmlFromFragment.ts b/packages/html/getHtmlFromFragment.ts
index 644c9ab67..d1f8aa5c5 100644
--- a/packages/html/getHtmlFromFragment.ts
+++ b/packages/html/getHtmlFromFragment.ts
@@ -1,15 +1,13 @@
 import { Node, DOMSerializer, Schema } from 'prosemirror-model'
-
-import { JSDOM } from 'jsdom'
+// @ts-ignore
+import { createHTMLDocument } from 'hostic-dom'
 
 export default function getHtmlFromFragment(doc: Node, schema: Schema): string {
-  const fragment = DOMSerializer
+  return DOMSerializer
     .fromSchema(schema)
-    .serializeFragment(doc.content)
-
-  const temporaryDocument = new JSDOM('<!DOCTYPE html>').window.document
-  const container = temporaryDocument.createElement('div')
-  container.appendChild(fragment)
-
-  return container.innerHTML
+    .serializeFragment(doc.content, {
+      document: createHTMLDocument(),
+    })
+    // @ts-ignore
+    .render()
 }
diff --git a/packages/html/index.ts b/packages/html/index.ts
index c64156bb9..56e8c07b6 100644
--- a/packages/html/index.ts
+++ b/packages/html/index.ts
@@ -2,7 +2,7 @@ import { Extensions, getSchema } from '@tiptap/core'
 import { Node } from 'prosemirror-model'
 import getHtmlFromFragment from './getHtmlFromFragment'
 
-export default function generateHtml(doc: object, extensions: Extensions): string {
+export function generateHtml(doc: object, extensions: Extensions): string {
   const schema = getSchema(extensions)
   const contentNode = Node.fromJSON(schema, doc)
 
diff --git a/packages/html/package.json b/packages/html/package.json
index 404f86c43..ddf655a3b 100644
--- a/packages/html/package.json
+++ b/packages/html/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@tiptap/core": "2.x",
     "@types/jsdom": "^16.2.4",
-    "jsdom": "^16.4.0",
+    "hostic-dom": "^0.8.5",
     "prosemirror-model": "^1.12.0"
   }
 }
diff --git a/tests/cypress/integration/core/generateHtml.spec.ts b/tests/cypress/integration/core/generateHtml.spec.ts
new file mode 100644
index 000000000..8ffc178c0
--- /dev/null
+++ b/tests/cypress/integration/core/generateHtml.spec.ts
@@ -0,0 +1,29 @@
+/// <reference types="cypress" />
+
+import generateHtml from '@tiptap/html'
+import Document from '@tiptap/extension-document'
+import Paragraph from '@tiptap/extension-paragraph'
+import Text from '@tiptap/extension-text'
+
+describe('generateHtml', () => {
+  it('generate HTML from JSON without an editor instance', () => {
+    const json = {
+      type: 'document',
+      content: [{
+        type: 'paragraph',
+        content: [{
+          type: 'text',
+          text: 'Example Text',
+        }],
+      }],
+    }
+
+    const html = generateHtml(json, [
+      Document(),
+      Paragraph(),
+      Text(),
+    ])
+
+    expect(html).to.eq('<p>Example Text</p>')
+  })
+})
diff --git a/yarn.lock b/yarn.lock
index 6c86bc703..5eb812c97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2847,11 +2847,6 @@ JSONStream@^1.0.4, JSONStream@^1.3.4:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
 
-abab@^2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
-  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
-
 abbrev@1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
@@ -2870,24 +2865,11 @@ acorn-dynamic-import@^4.0.0:
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
   integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
 
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
-  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
-  dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
-
 acorn-jsx@^5.0.1, acorn-jsx@^5.2.0:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
   integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
-acorn-walk@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
-
 acorn@^6.1.1, acorn@^6.4.1:
   version "6.4.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
@@ -3564,11 +3546,6 @@ brotli-size@^4.0.0:
   dependencies:
     duplexer "0.1.1"
 
-browser-process-hrtime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
-  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
-
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
@@ -4769,7 +4746,7 @@ css-what@2.1:
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
   integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
 
-css-what@^3.2.1:
+css-what@^3.2.1, css-what@^3.4.2:
   version "3.4.2"
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
   integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
@@ -4864,23 +4841,6 @@ csso@^4.0.2:
   dependencies:
     css-tree "1.0.0-alpha.39"
 
-cssom@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
-  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
-
-cssom@~0.3.6:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
-  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-
-cssstyle@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
-  integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
-  dependencies:
-    cssom "~0.3.6"
-
 csstype@^3.0.2:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.4.tgz#b156d7be03b84ff425c9a0a4b1e5f4da9c5ca888"
@@ -4965,15 +4925,6 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-data-urls@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
-  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
-  dependencies:
-    abab "^2.0.3"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
-
 date-fns@^1.27.2:
   version "1.30.1"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
@@ -5040,11 +4991,6 @@ decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decimal.js@^10.2.0:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3"
-  integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==
-
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -5134,7 +5080,7 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-deep-is@^0.1.3, deep-is@~0.1.3:
+deep-is@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
@@ -5348,13 +5294,6 @@ domelementtype@^2.0.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz#f3b6e549201e46f588b59463dd77187131fe6971"
   integrity sha512-wFwTwCVebUrMgGeAwRL/NhZtHAUyT9n9yg4IMDwf10+6iCMxSkVq9MGCVEH+QZWo1nNidy8kNvwmv4zWHDTqvA==
 
-domexception@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
-  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
-  dependencies:
-    webidl-conversions "^5.0.0"
-
 domhandler@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
@@ -5709,18 +5648,6 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escodegen@^1.14.1:
-  version "1.14.3"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
-  integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==
-  dependencies:
-    esprima "^4.0.1"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    optionator "^0.8.1"
-  optionalDependencies:
-    source-map "~0.6.1"
-
 eslint-config-airbnb-base@^14.2.0:
   version "14.2.0"
   resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-14.2.0.tgz#fe89c24b3f9dc8008c9c0d0d88c28f95ed65e9c4"
@@ -5883,7 +5810,7 @@ espree@^7.3.0:
     acorn-jsx "^5.2.0"
     eslint-visitor-keys "^1.3.0"
 
-esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0:
+esprima@^4.0.0, esprima@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
@@ -5902,7 +5829,7 @@ esrecurse@^4.1.0, esrecurse@^4.3.0:
   dependencies:
     estraverse "^5.2.0"
 
-estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.1.1:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
@@ -6225,7 +6152,7 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -7407,6 +7334,14 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
   integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
 
+hostic-dom@^0.8.5:
+  version "0.8.5"
+  resolved "https://registry.yarnpkg.com/hostic-dom/-/hostic-dom-0.8.5.tgz#500de796842454a745ce160d9cb0483c82643e28"
+  integrity sha512-0H5DTaE2/u3pSM5bPf7CaS9SunFASc0zlmw1R6hk0i6ozalRl0ePnAhm4YUYRG6pDbg0BYqCbjgwuFWOc3SskA==
+  dependencies:
+    css-what "^3.4.2"
+    he "^1.2.0"
+
 hsl-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
@@ -7422,13 +7357,6 @@ html-comment-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
   integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
 
-html-encoding-sniffer@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
-  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
-  dependencies:
-    whatwg-encoding "^1.0.5"
-
 html-entities@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz#fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"
@@ -7889,11 +7817,6 @@ invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
-ip-regex@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
-  integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
-
 ip@1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
@@ -8212,11 +8135,6 @@ is-png@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-png/-/is-png-1.1.0.tgz#d574b12bf275c0350455570b0e5b57ab062077ce"
   integrity sha1-1XSxK/J1wDUEVVcLDltXqwYgd84=
 
-is-potential-custom-element-name@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
-  integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
-
 is-promise@^2.1.0:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
@@ -8432,38 +8350,6 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsdom@^16.4.0:
-  version "16.4.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb"
-  integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==
-  dependencies:
-    abab "^2.0.3"
-    acorn "^7.1.1"
-    acorn-globals "^6.0.0"
-    cssom "^0.4.4"
-    cssstyle "^2.2.0"
-    data-urls "^2.0.0"
-    decimal.js "^10.2.0"
-    domexception "^2.0.1"
-    escodegen "^1.14.1"
-    html-encoding-sniffer "^2.0.1"
-    is-potential-custom-element-name "^1.0.0"
-    nwsapi "^2.2.0"
-    parse5 "5.1.1"
-    request "^2.88.2"
-    request-promise-native "^1.0.8"
-    saxes "^5.0.0"
-    symbol-tree "^3.2.4"
-    tough-cookie "^3.0.1"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.1.0"
-    whatwg-encoding "^1.0.5"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
-    ws "^7.2.3"
-    xml-name-validator "^3.0.0"
-
 jsesc@^2.5.1:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
@@ -8674,14 +8560,6 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 lib0@^0.2.12, lib0@^0.2.28, lib0@^0.2.32, lib0@^0.2.33:
   version "0.2.34"
   resolved "https://registry.yarnpkg.com/lib0/-/lib0-0.2.34.tgz#c4479f5f2083894687fcfa9d0b9d9935e35ea008"
@@ -10047,11 +9925,6 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
-
 oauth-sign@~0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
@@ -10183,18 +10056,6 @@ optimize-css-assets-webpack-plugin@^5.0.1:
     cssnano "^4.1.10"
     last-call-webpack-plugin "^3.0.0"
 
-optionator@^0.8.1:
-  version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
-  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.6"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    word-wrap "~1.2.3"
-
 optionator@^0.9.1:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
@@ -10548,11 +10409,6 @@ parse-url@^5.0.0:
     parse-path "^4.0.0"
     protocols "^1.4.0"
 
-parse5@5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
-  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
-
 parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -11204,11 +11060,6 @@ prelude-ls@^1.2.1:
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
-prelude-ls@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
 prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
@@ -12084,23 +11935,7 @@ request-progress@^3.0.0:
   dependencies:
     throttleit "^1.0.0"
 
-request-promise-core@1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
-  integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
-  dependencies:
-    lodash "^4.17.19"
-
-request-promise-native@^1.0.8:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
-  integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
-  dependencies:
-    request-promise-core "1.1.4"
-    stealthy-require "^1.1.1"
-    tough-cookie "^2.3.3"
-
-request@^2.83.0, request@^2.87.0, request@^2.88.0, request@^2.88.2:
+request@^2.83.0, request@^2.87.0, request@^2.88.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -12446,13 +12281,6 @@ sax@~1.2.4:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-saxes@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
-  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
-  dependencies:
-    xmlchars "^2.2.0"
-
 scheduler@^0.20.1:
   version "0.20.1"
   resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
@@ -13077,11 +12905,6 @@ stdout-stream@^1.4.0:
   dependencies:
     readable-stream "^2.0.1"
 
-stealthy-require@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-  integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
-
 stream-browserify@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -13410,11 +13233,6 @@ symbol-observable@^1.1.0:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
-symbol-tree@^3.2.4:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
-  integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
-
 table@^5.2.3:
   version "5.4.6"
   resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
@@ -13713,7 +13531,7 @@ toposort@^1.0.0:
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
   integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
 
-tough-cookie@^2.3.3, tough-cookie@~2.5.0:
+tough-cookie@~2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
@@ -13721,15 +13539,6 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2"
-  integrity sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==
-  dependencies:
-    ip-regex "^2.1.0"
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
@@ -13737,13 +13546,6 @@ tr46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
-tr46@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
-  integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
-  dependencies:
-    punycode "^2.1.1"
-
 trim-lines@^1.0.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.3.tgz#839514be82428fd9e7ec89e35081afe8f6f93115"
@@ -13860,13 +13662,6 @@ type-check@^0.4.0, type-check@~0.4.0:
   dependencies:
     prelude-ls "^1.2.1"
 
-type-check@~0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
-  dependencies:
-    prelude-ls "~1.1.2"
-
 type-fest@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934"
@@ -14563,25 +14358,11 @@ vue@^2.6.10, vue@^2.6.12:
   resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123"
   integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==
 
-w3c-hr-time@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
-  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
-  dependencies:
-    browser-process-hrtime "^1.0.0"
-
 w3c-keyname@^2.2.0:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.4.tgz#4ade6916f6290224cdbd1db8ac49eab03d0eef6b"
   integrity sha512-tOhfEwEzFLJzf6d1ZPkYfGj+FWhIpBux9ppoP3rlclw3Z0BZv3N7b7030Z1kYth+6rDuAsXUFr+d0VE6Ed1ikw==
 
-w3c-xmlserializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
-  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
-  dependencies:
-    xml-name-validator "^3.0.0"
-
 walkes@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/walkes/-/walkes-0.2.1.tgz#7eca144fe67ed32782fffe6e8e95fb4481864796"
@@ -14617,16 +14398,6 @@ webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
   integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
 
-webidl-conversions@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
-  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
-
-webidl-conversions@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
-  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
-
 webpack-chain@^5.2.0:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/webpack-chain/-/webpack-chain-5.2.4.tgz#cc3665a296a6edcda738324599103ac6e215dda3"
@@ -14722,18 +14493,6 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
-whatwg-encoding@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
-  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
-  dependencies:
-    iconv-lite "0.4.24"
-
-whatwg-mimetype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
-  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
-
 whatwg-url@^7.0.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06"
@@ -14743,15 +14502,6 @@ whatwg-url@^7.0.0:
     tr46 "^1.0.1"
     webidl-conversions "^4.0.2"
 
-whatwg-url@^8.0.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837"
-  integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==
-  dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^2.0.2"
-    webidl-conversions "^6.1.0"
-
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
@@ -14797,7 +14547,7 @@ windows-release@^3.1.0:
   dependencies:
     execa "^1.0.0"
 
-word-wrap@^1.2.3, word-wrap@~1.2.3:
+word-wrap@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
@@ -14894,7 +14644,7 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@^7.2.0, ws@^7.2.3:
+ws@^7.2.0:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
   integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
@@ -14909,16 +14659,6 @@ xdg-basedir@^4.0.0:
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
   integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
-xml-name-validator@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
-  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
-
-xmlchars@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
-  integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
-
 xss@^1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz#32feb87feb74b3dcd3d404b7a68ababf10700535"

From 4dad818f7dfbb6ce867f1c1cb7cd4be4b5005668 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Wed, 28 Oct 2020 17:20:38 +0100
Subject: [PATCH 016/113] rename HTML function names

---
 docs/src/demos/Api/Schema/GenerateHtml/index.vue          | 8 ++++----
 packages/core/index.ts                                    | 4 ++--
 packages/core/src/Editor.ts                               | 4 ++--
 .../core/src/utils/{generateHtml.ts => generateHTML.ts}   | 6 +++---
 .../{getHtmlFromFragment.ts => getHTMLFromFragment.ts}    | 2 +-
 packages/html/example.js                                  | 4 ++--
 .../{getHtmlFromFragment.ts => getHTMLFromFragment.ts}    | 2 +-
 packages/html/index.ts                                    | 6 +++---
 .../core/{generateHtml.spec.ts => generateHTML.spec.ts}   | 6 +++---
 9 files changed, 21 insertions(+), 21 deletions(-)
 rename packages/core/src/utils/{generateHtml.ts => generateHTML.ts} (57%)
 rename packages/core/src/utils/{getHtmlFromFragment.ts => getHTMLFromFragment.ts} (85%)
 rename packages/html/{getHtmlFromFragment.ts => getHTMLFromFragment.ts} (82%)
 rename tests/cypress/integration/core/{generateHtml.spec.ts => generateHTML.spec.ts} (82%)

diff --git a/docs/src/demos/Api/Schema/GenerateHtml/index.vue b/docs/src/demos/Api/Schema/GenerateHtml/index.vue
index 81295caac..e0e9226d6 100644
--- a/docs/src/demos/Api/Schema/GenerateHtml/index.vue
+++ b/docs/src/demos/Api/Schema/GenerateHtml/index.vue
@@ -6,8 +6,8 @@
 </template>
 
 <script>
-import { generateHtml } from '@tiptap/core'
-import { generateHtml as generateHtmlWithoutEditor } from '@tiptap/html'
+import { generateHTML } from '@tiptap/core'
+import { generateHTML as generateHTMLWithoutEditor } from '@tiptap/html'
 import Document from '@tiptap/extension-document'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
@@ -31,13 +31,13 @@ export default {
   },
 
   mounted() {
-    this.html = generateHtml(this.json, [
+    this.html = generateHTML(this.json, [
       Document(),
       Paragraph(),
       Text(),
     ])
 
-    this.otherHtml = generateHtmlWithoutEditor(this.json, [
+    this.otherHtml = generateHTMLWithoutEditor(this.json, [
       Document(),
       Paragraph(),
       Text(),
diff --git a/packages/core/index.ts b/packages/core/index.ts
index 1eb42fff0..07abccb2d 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -15,7 +15,7 @@ export { default as markPasteRule } from './src/pasteRules/markPasteRule'
 
 export { default as capitalize } from './src/utils/capitalize'
 export { default as getSchema } from './src/utils/getSchema'
-export { default as generateHtml } from './src/utils/generateHtml'
-export { default as getHtmlFromFragment } from './src/utils/getHtmlFromFragment'
+export { default as generateHTML } from './src/utils/generateHTML'
+export { default as getHTMLFromFragment } from './src/utils/getHTMLFromFragment'
 export { default as getMarkAttrs } from './src/utils/getMarkAttrs'
 export { default as mergeAttributes } from './src/utils/mergeAttributes'
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 35feebaa0..c49cd3deb 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -9,7 +9,7 @@ import getNodeAttrs from './utils/getNodeAttrs'
 import getMarkAttrs from './utils/getMarkAttrs'
 import removeElement from './utils/removeElement'
 import getSchemaTypeNameByName from './utils/getSchemaTypeNameByName'
-import getHtmlFromFragment from './utils/getHtmlFromFragment'
+import getHTMLFromFragment from './utils/getHTMLFromFragment'
 import createStyleTag from './utils/createStyleTag'
 import CommandManager from './CommandManager'
 import ExtensionManager from './ExtensionManager'
@@ -384,7 +384,7 @@ export class Editor extends EventEmitter {
    * Get the document as HTML.
    */
   public getHTML() {
-    return getHtmlFromFragment(this.state.doc, this.schema)
+    return getHTMLFromFragment(this.state.doc, this.schema)
   }
 
   /**
diff --git a/packages/core/src/utils/generateHtml.ts b/packages/core/src/utils/generateHTML.ts
similarity index 57%
rename from packages/core/src/utils/generateHtml.ts
rename to packages/core/src/utils/generateHTML.ts
index 45d723ab5..4436b7eef 100644
--- a/packages/core/src/utils/generateHtml.ts
+++ b/packages/core/src/utils/generateHTML.ts
@@ -1,11 +1,11 @@
 import { Node } from 'prosemirror-model'
 import getSchema from './getSchema'
-import getHtmlFromFragment from './getHtmlFromFragment'
+import getHTMLFromFragment from './getHTMLFromFragment'
 import { Extensions } from '../types'
 
-export default function generateHtml(doc: object, extensions: Extensions): string {
+export default function generateHTML(doc: object, extensions: Extensions): string {
   const schema = getSchema(extensions)
   const contentNode = Node.fromJSON(schema, doc)
 
-  return getHtmlFromFragment(contentNode, schema)
+  return getHTMLFromFragment(contentNode, schema)
 }
diff --git a/packages/core/src/utils/getHtmlFromFragment.ts b/packages/core/src/utils/getHTMLFromFragment.ts
similarity index 85%
rename from packages/core/src/utils/getHtmlFromFragment.ts
rename to packages/core/src/utils/getHTMLFromFragment.ts
index a1332b2f8..f2a6659d3 100644
--- a/packages/core/src/utils/getHtmlFromFragment.ts
+++ b/packages/core/src/utils/getHTMLFromFragment.ts
@@ -1,6 +1,6 @@
 import { Node, DOMSerializer, Schema } from 'prosemirror-model'
 
-export default function getHtmlFromFragment(doc: Node, schema: Schema): string {
+export default function getHTMLFromFragment(doc: Node, schema: Schema): string {
   const fragment = DOMSerializer
     .fromSchema(schema)
     .serializeFragment(doc.content)
diff --git a/packages/html/example.js b/packages/html/example.js
index 44f843266..058b05803 100644
--- a/packages/html/example.js
+++ b/packages/html/example.js
@@ -1,11 +1,11 @@
-import { generateHtml } from '@tiptap/html'
+import { generateHTML } from '@tiptap/html'
 
 import Document from '@tiptap/extension-document'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
 
 // eslint-disable-next-line
-const html = generateHtml({
+const html = generateHTML({
   type: 'document',
   content: [{
     type: 'paragraph',
diff --git a/packages/html/getHtmlFromFragment.ts b/packages/html/getHTMLFromFragment.ts
similarity index 82%
rename from packages/html/getHtmlFromFragment.ts
rename to packages/html/getHTMLFromFragment.ts
index d1f8aa5c5..73b30e5e6 100644
--- a/packages/html/getHtmlFromFragment.ts
+++ b/packages/html/getHTMLFromFragment.ts
@@ -2,7 +2,7 @@ import { Node, DOMSerializer, Schema } from 'prosemirror-model'
 // @ts-ignore
 import { createHTMLDocument } from 'hostic-dom'
 
-export default function getHtmlFromFragment(doc: Node, schema: Schema): string {
+export default function getHTMLFromFragment(doc: Node, schema: Schema): string {
   return DOMSerializer
     .fromSchema(schema)
     .serializeFragment(doc.content, {
diff --git a/packages/html/index.ts b/packages/html/index.ts
index 56e8c07b6..a9ec036ac 100644
--- a/packages/html/index.ts
+++ b/packages/html/index.ts
@@ -1,10 +1,10 @@
 import { Extensions, getSchema } from '@tiptap/core'
 import { Node } from 'prosemirror-model'
-import getHtmlFromFragment from './getHtmlFromFragment'
+import getHTMLFromFragment from './getHTMLFromFragment'
 
-export function generateHtml(doc: object, extensions: Extensions): string {
+export function generateHTML(doc: object, extensions: Extensions): string {
   const schema = getSchema(extensions)
   const contentNode = Node.fromJSON(schema, doc)
 
-  return getHtmlFromFragment(contentNode, schema)
+  return getHTMLFromFragment(contentNode, schema)
 }
diff --git a/tests/cypress/integration/core/generateHtml.spec.ts b/tests/cypress/integration/core/generateHTML.spec.ts
similarity index 82%
rename from tests/cypress/integration/core/generateHtml.spec.ts
rename to tests/cypress/integration/core/generateHTML.spec.ts
index 8ffc178c0..05b553dd1 100644
--- a/tests/cypress/integration/core/generateHtml.spec.ts
+++ b/tests/cypress/integration/core/generateHTML.spec.ts
@@ -1,11 +1,11 @@
 /// <reference types="cypress" />
 
-import generateHtml from '@tiptap/html'
+import { generateHTML } from '@tiptap/html'
 import Document from '@tiptap/extension-document'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
 
-describe('generateHtml', () => {
+describe('generateHTML', () => {
   it('generate HTML from JSON without an editor instance', () => {
     const json = {
       type: 'document',
@@ -18,7 +18,7 @@ describe('generateHtml', () => {
       }],
     }
 
-    const html = generateHtml(json, [
+    const html = generateHTML(json, [
       Document(),
       Paragraph(),
       Text(),

From 83eac2ddd8cef5de176d5d20ae23ed443c13ddff Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Wed, 28 Oct 2020 17:31:51 +0100
Subject: [PATCH 017/113] rename demo, add more content

---
 .../{GenerateHtml => GenerateHTML}/index.vue      | 15 ++-------------
 docs/src/docPages/api/schema.md                   | 10 ++++------
 2 files changed, 6 insertions(+), 19 deletions(-)
 rename docs/src/demos/Api/Schema/{GenerateHtml => GenerateHTML}/index.vue (63%)

diff --git a/docs/src/demos/Api/Schema/GenerateHtml/index.vue b/docs/src/demos/Api/Schema/GenerateHTML/index.vue
similarity index 63%
rename from docs/src/demos/Api/Schema/GenerateHtml/index.vue
rename to docs/src/demos/Api/Schema/GenerateHTML/index.vue
index e0e9226d6..875fe64a0 100644
--- a/docs/src/demos/Api/Schema/GenerateHtml/index.vue
+++ b/docs/src/demos/Api/Schema/GenerateHTML/index.vue
@@ -1,13 +1,9 @@
 <template>
-  <div>
-    <pre>{{ html }}</pre>
-    <pre>{{ otherHtml }}</pre>
-  </div>
+  <pre>{{ html }}</pre>
 </template>
 
 <script>
-import { generateHTML } from '@tiptap/core'
-import { generateHTML as generateHTMLWithoutEditor } from '@tiptap/html'
+import { generateHTML } from '@tiptap/html'
 import Document from '@tiptap/extension-document'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
@@ -26,7 +22,6 @@ export default {
         }],
       },
       html: '',
-      otherHtml: '',
     }
   },
 
@@ -36,12 +31,6 @@ export default {
       Paragraph(),
       Text(),
     ])
-
-    this.otherHtml = generateHTMLWithoutEditor(this.json, [
-      Document(),
-      Paragraph(),
-      Text(),
-    ])
   },
 }
 </script>
diff --git a/docs/src/docPages/api/schema.md b/docs/src/docPages/api/schema.md
index a0bc6b8bd..6db220209 100644
--- a/docs/src/docPages/api/schema.md
+++ b/docs/src/docPages/api/schema.md
@@ -126,15 +126,13 @@ const schema = getSchema([
 
 ## Generate HTML from ProseMirror JSON
 
-If you need to render the content on the server side, e. g. for a blog post that was written with tiptap, you’ll probably need a way to do just that without an actual editor instance.
+If you need to render the content on the server side, for example to render a blog post which was written with tiptap, you’ll probably need a way to do just that without an actual editor instance. That’s what `generateHTML()` is for. It’s a utility function that renders HTML without an actual editor instance.
 
-That’s what `generategetHTML()` is for. It’s a utility function that renders HTML without an actual editor instance.
-
-:::warning Work in progress
-Currently, that works only in the browser (client side), but we plan to bring this to Node.js (to use it on the server side).
+:::info Browser-only rendering
+Import a lightweight implementation from `@tiptap/core` if you’re using the function in a browser context only.
 :::
 
-<demo name="Api/Schema/GenerateHtml" highlight="6,29-33"/>
+<demo name="Api/Schema/GenerateHTML" highlight="6,29-33"/>
 
 ### Converting JSON<>HTML with PHP
 

From 86c528830cdb922efff161201de2f3e733182be1 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Wed, 28 Oct 2020 18:05:20 +0100
Subject: [PATCH 018/113] add premium hints everywhere, add premium flags to
 the navigation, add a license page

---
 .../Examples/CollaborativeEditing/index.vue   |  2 +-
 .../CollaborationCursor/index.spec.js         |  5 +
 .../Extensions/CollaborationCursor/index.vue  | 91 +++++++++++++++++++
 .../api/extensions/collaboration-cursor.md    | 33 +++++++
 .../docPages/api/extensions/collaboration.md  |  4 +-
 .../examples/collaborative-editing.md         |  5 +
 .../docPages/guide/collaborative-editing.md   |  5 +-
 docs/src/docPages/tiptap-pro.md               |  3 +
 docs/src/layouts/App/index.vue                |  4 +-
 docs/src/layouts/App/style.scss               | 11 +++
 docs/src/links.yaml                           | 11 ++-
 docs/src/templates/DocPage/style.scss         |  6 +-
 12 files changed, 168 insertions(+), 12 deletions(-)
 create mode 100644 docs/src/demos/Extensions/CollaborationCursor/index.spec.js
 create mode 100644 docs/src/demos/Extensions/CollaborationCursor/index.vue
 create mode 100644 docs/src/docPages/tiptap-pro.md

diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue
index e4f7fe0cb..db76709ff 100644
--- a/docs/src/demos/Examples/CollaborativeEditing/index.vue
+++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue
@@ -197,7 +197,7 @@ export default {
 /* This renders the username above the caret */
 .collaboration-cursor__label {
   position: absolute;
-  top: -1.6em;
+  top: -1.4em;
   left: -1px;
   font-size: 13px;
   font-style: normal;
diff --git a/docs/src/demos/Extensions/CollaborationCursor/index.spec.js b/docs/src/demos/Extensions/CollaborationCursor/index.spec.js
new file mode 100644
index 000000000..cb36824e0
--- /dev/null
+++ b/docs/src/demos/Extensions/CollaborationCursor/index.spec.js
@@ -0,0 +1,5 @@
+context('/api/extensions/collaboration', () => {
+  before(() => {
+    cy.visit('/api/extensions/collaboration')
+  })
+})
diff --git a/docs/src/demos/Extensions/CollaborationCursor/index.vue b/docs/src/demos/Extensions/CollaborationCursor/index.vue
new file mode 100644
index 000000000..bf290cb14
--- /dev/null
+++ b/docs/src/demos/Extensions/CollaborationCursor/index.vue
@@ -0,0 +1,91 @@
+<template>
+  <editor-content :editor="editor" />
+</template>
+
+<script>
+import { Editor, EditorContent } from '@tiptap/vue-starter-kit'
+import Document from '@tiptap/extension-document'
+import Paragraph from '@tiptap/extension-paragraph'
+import Text from '@tiptap/extension-text'
+import Collaboration from '@tiptap/extension-collaboration'
+import CollaborationCursor from '@tiptap/extension-collaboration-cursor'
+import * as Y from 'yjs'
+import { WebrtcProvider } from 'y-webrtc'
+
+export default {
+  components: {
+    EditorContent,
+  },
+
+  data() {
+    return {
+      documentName: 'tiptap-collaboration-cursor-extension',
+      ydoc: null,
+      provider: null,
+      type: null,
+      editor: null,
+    }
+  },
+
+  mounted() {
+    this.ydoc = new Y.Doc()
+    this.provider = new WebrtcProvider(this.documentName, this.ydoc)
+    this.type = this.ydoc.getXmlFragment('prosemirror')
+
+    this.editor = new Editor({
+      // TODO: This is added by every new user.
+      // content: `
+      //   <p>Example Text</p>
+      // `,
+      extensions: [
+        Document(),
+        Paragraph(),
+        Text(),
+        Collaboration({
+          provider: this.provider,
+          type: this.type,
+        }),
+        CollaborationCursor({
+          provider: this.provider,
+          name: 'Cyndi Lauper',
+          color: '#f783ac',
+        }),
+      ],
+    })
+  },
+
+  beforeDestroy() {
+    this.editor.destroy()
+    this.provider.destroy()
+  },
+}
+</script>
+
+<style lang="scss">
+/* This gives the remote user caret */
+.collaboration-cursor__caret {
+  position: relative;
+  margin-left: -1px;
+  margin-right: -1px;
+  border-left: 1px solid black;
+  border-right: 1px solid black;
+  word-break: normal;
+  pointer-events: none;
+}
+
+/* This renders the username above the caret */
+.collaboration-cursor__label {
+  position: absolute;
+  top: -1.4em;
+  left: -1px;
+  font-size: 13px;
+  font-style: normal;
+  font-weight: normal;
+  line-height: normal;
+  user-select: none;
+  color: white;
+  padding: 0.1rem 0.3rem;
+  border-radius: 3px;
+  white-space: nowrap;
+}
+</style>
diff --git a/docs/src/docPages/api/extensions/collaboration-cursor.md b/docs/src/docPages/api/extensions/collaboration-cursor.md
index 7f003c1aa..cf8b74d0a 100644
--- a/docs/src/docPages/api/extensions/collaboration-cursor.md
+++ b/docs/src/docPages/api/extensions/collaboration-cursor.md
@@ -1,2 +1,35 @@
 # Collaboration Cursor
 
+:::premium Premium Extension
+Using this in production requires a **tiptap pro** license. [Read more](/tiptap-pro)
+:::
+
+## Installation
+```bash
+# With npm
+npm install @tiptap/extension-collaboration-cursor
+
+# Or: With Yarn
+yarn add @tiptap/extension-collaboration-cursor
+```
+
+## Settings
+| Option   | Type | Default | Description |
+| -------- | ---- | ------- | ----------- |
+| provider |      |         |             |
+| type     |      |         |             |
+
+## Commands
+*None*
+
+## Keyboard shortcuts
+*None*
+
+## Source code
+[packages/extension-collaboration-cursor/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-collaboration-cursor/)
+
+## Usage
+:::warning Public
+The content of this editor is shared with other users.
+:::
+<demo name="Extensions/CollaborationCursor" highlight="" />
diff --git a/docs/src/docPages/api/extensions/collaboration.md b/docs/src/docPages/api/extensions/collaboration.md
index c19acbb79..16f00fd67 100644
--- a/docs/src/docPages/api/extensions/collaboration.md
+++ b/docs/src/docPages/api/extensions/collaboration.md
@@ -1,8 +1,8 @@
 # Collaboration
 The Collaboration extension enables you to collaborate with others on one document. The implementation is based on [Y.js by Kevin Jahns](https://github.com/yjs/yjs), which is the coolest thing to [integrate collaborative editing](/guide/collaborative-editing) in your project.
 
-:::pro Premium Extension
-Using this in production requires a **tiptap pro** license. [Read more](/license)
+:::premium Premium Extension
+Using this in production requires a **tiptap pro** license. [Read more](/tiptap-pro)
 :::
 
 ## Installation
diff --git a/docs/src/docPages/examples/collaborative-editing.md b/docs/src/docPages/examples/collaborative-editing.md
index c085612e3..e77555535 100644
--- a/docs/src/docPages/examples/collaborative-editing.md
+++ b/docs/src/docPages/examples/collaborative-editing.md
@@ -1,4 +1,9 @@
 # Collaborative editing
+
+:::premium Requires Premium Extensions
+Using this example in production requires a **tiptap pro** license. [Read more](/tiptap-pro)
+:::
+
 This example shows how you can use tiptap to let different users collaboratively work on the same text in real-time.
 
 It connects client with WebRTC and merges changes to the document (no matter where they come from) with the awesome library [Y.js](https://github.com/yjs/yjs) by Kevin Jahns. Be aware that in a real-world scenario you would probably add a server, which is also able to merge changes with Y.js.
diff --git a/docs/src/docPages/guide/collaborative-editing.md b/docs/src/docPages/guide/collaborative-editing.md
index 284ee2368..053334b6a 100644
--- a/docs/src/docPages/guide/collaborative-editing.md
+++ b/docs/src/docPages/guide/collaborative-editing.md
@@ -1,9 +1,12 @@
 # Collaborative editing
 
+:::premium Requires Premium Extensions
+Using the collaborative editing in production requires a **tiptap pro** license. [Read more](/tiptap-pro)
+:::
+
 ## toc
 
 ## Introduction
-
 Collaborative editing allows multiple users to work on the same text document in real-time. It’s a complex topic that you should be aware before adding it blindly to you app. No worries though, here is everything you need to know.
 
 ## Configure collaboration
diff --git a/docs/src/docPages/tiptap-pro.md b/docs/src/docPages/tiptap-pro.md
new file mode 100644
index 000000000..391c3559e
--- /dev/null
+++ b/docs/src/docPages/tiptap-pro.md
@@ -0,0 +1,3 @@
+# tiptap pro
+
+[Sponsor us on GitHub](https://github.com/sponsors/ueberdosis)
diff --git a/docs/src/layouts/App/index.vue b/docs/src/layouts/App/index.vue
index eb5132d65..11b6f281b 100644
--- a/docs/src/layouts/App/index.vue
+++ b/docs/src/layouts/App/index.vue
@@ -149,13 +149,13 @@
           </div>
           <ul class="app__link-list">
             <li v-for="(item, j) in linkGroup.items" :key="j">
-              <g-link :class="{ 'app__link': true, 'app__link--draft': item.draft === true, 'app__link--with-children': item.items }" :to="item.link" :exact="item.link === '/'">
+              <g-link :class="{ 'app__link': true, 'app__link--draft': item.draft === true, 'app__link--premium': item.premium === true, 'app__link--with-children': item.items }" :to="item.link" :exact="item.link === '/'">
                 {{ item.title }}
               </g-link>
 
               <ul v-if="item.items" class="app__link-list">
                 <li v-for="(item, k) in item.items" :key="k">
-                  <g-link :class="{ 'app__link': true, 'app__link--draft': item.draft === true }" :to="item.link" exact>
+                  <g-link :class="{ 'app__link': true, 'app__link--draft': item.draft === true, 'app__link--premium': item.premium === true }" :to="item.link" exact>
                     {{ item.title }}
                   </g-link>
                 </li>
diff --git a/docs/src/layouts/App/style.scss b/docs/src/layouts/App/style.scss
index 2c2243893..447a1816d 100644
--- a/docs/src/layouts/App/style.scss
+++ b/docs/src/layouts/App/style.scss
@@ -183,6 +183,17 @@ $menuBreakPoint: 800px;
       color: rgba($colorWhite, 0.2);
     }
 
+    &--premium {
+      &::after {
+        content: 'PRO';
+        color: $colorPurple;
+        background-color: rgba($colorPurple, 0.1);
+        box-decoration-break: clone;
+        padding: 0 0.5em;
+        border-radius: 5px;
+      }
+    }
+
     &--with-children::after {
       content: '↓';
       color: rgba($colorWhite, 0.2);
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index b68d84fa7..c983fd38a 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -15,6 +15,7 @@
           link: /examples/basic
         - title: Collaborative editing
           link: /examples/collaborative-editing
+          premium: true
         - title: Markdown shortcuts
           link: /examples/markdown-shortcuts
         # - title: Menu Bubble
@@ -93,6 +94,7 @@
     - title: Collaborative editing
       link: /guide/collaborative-editing
       draft: true
+      premium: true
 
 - title: API
   items:
@@ -118,10 +120,11 @@
         #   draft: true
         - title: Collaboration
           link: /api/extensions/collaboration
-          draft: true
+          premium: true
         - title: CollaborationCursor
           link: /api/extensions/collaboration-cursor
           draft: true
+          premium: true
         - title: Document
           link: /api/extensions/document
         - title: HardBreak
@@ -184,7 +187,7 @@
     - title: Keyboard Shortcuts
       link: /api/keyboard-shortcuts
 
-- title: tiptap pro
+- title:
   items:
-    - title: License
-      link: /license
+    - title: tiptap pro
+      link: /tiptap-pro
diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss
index fc43d067e..627c60e81 100644
--- a/docs/src/templates/DocPage/style.scss
+++ b/docs/src/templates/DocPage/style.scss
@@ -247,10 +247,12 @@
         color: $colorRed;
       }
 
-      &.pro {
+      &.premium {
         border-color: rgba($colorRed, 0.1);
         background-color: rgba($colorRed, 0.1);
-        color: $colorRed;
+        color: $colorPurple;
+        background-color: rgba($colorPurple, 0.1);
+        border-color: rgba($colorPurple, 0.1);
       }
 
       .remark-container-title {

From f642c8ecadff021010b7b3e823194daeabc5096f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 28 Oct 2020 20:44:59 +0100
Subject: [PATCH 019/113] remove @types/jsdom

---
 packages/html/package.json |  1 -
 yarn.lock                  | 19 -------------------
 2 files changed, 20 deletions(-)

diff --git a/packages/html/package.json b/packages/html/package.json
index ddf655a3b..ccc083e6a 100644
--- a/packages/html/package.json
+++ b/packages/html/package.json
@@ -8,7 +8,6 @@
   ],
   "dependencies": {
     "@tiptap/core": "2.x",
-    "@types/jsdom": "^16.2.4",
     "hostic-dom": "^0.8.5",
     "prosemirror-model": "^1.12.0"
   }
diff --git a/yarn.lock b/yarn.lock
index 5eb812c97..175b899dc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2210,15 +2210,6 @@
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/jsdom@^16.2.4":
-  version "16.2.4"
-  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-16.2.4.tgz#527ca99943e00561ca4056b1904fd5f4facebc3b"
-  integrity sha512-RssgLa5ptjVKRkHho/Ex0+DJWkVsYuV8oh2PSG3gKxFp8n/VNyB7kOrZGQkk2zgPlcBkIKOItUc/T5BXit9uhg==
-  dependencies:
-    "@types/node" "*"
-    "@types/parse5" "*"
-    "@types/tough-cookie" "*"
-
 "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
@@ -2266,11 +2257,6 @@
   resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
-"@types/parse5@*":
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109"
-  integrity sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==
-
 "@types/prop-types@*":
   version "15.7.3"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
@@ -2403,11 +2389,6 @@
   resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.2.tgz#a811b8c18e2babab7d542b3365887ae2e4d9de47"
   integrity sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==
 
-"@types/tough-cookie@*":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.0.tgz#fef1904e4668b6e5ecee60c52cc6a078ffa6697d"
-  integrity sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==
-
 "@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3":
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"

From 490a9fbb51f0b7ea2ddfd165290dc5ed5a9e3f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 28 Oct 2020 21:06:00 +0100
Subject: [PATCH 020/113] update colors

---
 docs/src/layouts/App/style.scss       |  6 +++---
 docs/src/templates/DocPage/style.scss | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/src/layouts/App/style.scss b/docs/src/layouts/App/style.scss
index 447a1816d..d3f3515f9 100644
--- a/docs/src/layouts/App/style.scss
+++ b/docs/src/layouts/App/style.scss
@@ -186,9 +186,9 @@ $menuBreakPoint: 800px;
     &--premium {
       &::after {
         content: 'PRO';
-        color: $colorPurple;
-        background-color: rgba($colorPurple, 0.1);
-        box-decoration-break: clone;
+        font-family: 'JetBrainsMono', monospace;
+        color: $colorOrange;
+        background-color: rgba($colorOrange, 0.1);
         padding: 0 0.5em;
         border-radius: 5px;
       }
diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss
index 627c60e81..11306b00f 100644
--- a/docs/src/templates/DocPage/style.scss
+++ b/docs/src/templates/DocPage/style.scss
@@ -80,16 +80,18 @@
     }
 
     > p code,
-    > li code,
+    > ul code,
+    > ol code,
     > table code,
     > .remark-container code {
-      color: $colorPurple;
-      background-color: rgba($colorPurple, 0.1);
+      color: $colorYellow;
+      background-color: rgba($colorYellow, 0.1);
       box-decoration-break: clone;
     }
 
     > p a,
-    > li a,
+    > ul a,
+    > ol a,
     > table a,
     > .remark-container a {
       text-decoration: underline;
@@ -248,11 +250,9 @@
       }
 
       &.premium {
-        border-color: rgba($colorRed, 0.1);
-        background-color: rgba($colorRed, 0.1);
-        color: $colorPurple;
-        background-color: rgba($colorPurple, 0.1);
-        border-color: rgba($colorPurple, 0.1);
+        border-color: rgba($colorOrange, 0.1);
+        background-color: rgba($colorOrange, 0.1);
+        color: $colorOrange;
       }
 
       .remark-container-title {

From 541356a3214649efaec7a4f1935fa27fc1e47ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 28 Oct 2020 21:13:29 +0100
Subject: [PATCH 021/113] improve basic styling

---
 docs/src/layouts/App/base.scss | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/docs/src/layouts/App/base.scss b/docs/src/layouts/App/base.scss
index 2efeb9e11..a891b92ad 100644
--- a/docs/src/layouts/App/base.scss
+++ b/docs/src/layouts/App/base.scss
@@ -91,16 +91,22 @@ code {
 }
 
 .ProseMirror {
-  p {
-    margin: 0.5rem 0;
+
+  > * + * {
+    margin-top: 0.75em;
+  }
+
+  ul,
+  ol {
+    padding: 0 1rem;
   }
 
   pre {
-    background: rgba($colorBlack, 0.9);
-    color: rgba($colorWhite, 0.9);
+    background: $colorBlack;
+    color: $colorWhite;
+    font-family: 'JetBrainsMono', monospace;
     padding: 0.75rem 1rem;
-    margin: 0.5rem 0;
-    border-radius: 0.25rem;
+    border-radius: 0.5rem;
 
     code {
       color: inherit;
@@ -120,6 +126,6 @@ code {
 
   blockquote {
     padding-left: 1rem;
-    border-left: 3px solid rgba($colorBlack, 0.1);
+    border-left: 2px solid rgba($colorBlack, 0.1);
   }
 }

From a46514468b98e99fa87e7cdb0cb24c057f323367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 28 Oct 2020 21:23:22 +0100
Subject: [PATCH 022/113] add footer styling

---
 docs/src/layouts/App/index.vue  | 12 ++++++------
 docs/src/layouts/App/style.scss | 11 +++++++++++
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/docs/src/layouts/App/index.vue b/docs/src/layouts/App/index.vue
index 11b6f281b..06a50f55e 100644
--- a/docs/src/layouts/App/index.vue
+++ b/docs/src/layouts/App/index.vue
@@ -132,12 +132,12 @@
           <page-navigation />
         </div>
       </div>
-      <!-- TODO: -->
-      <div>
-        <a :href="editLink" target="_blank">
-          <span>Edit this page on GitHub</span> &middot;
-        </a>
-        Made with 🖤 by <a href="https://twitter.com/_ueberdosis">überdosis</a>
+      <div class="app__page-footer">
+        <div class="app__inner">
+          <a :href="editLink" target="_blank">Edit this page on GitHub</a>
+          &middot;
+          Made with 🖤 by <a href="https://twitter.com/_ueberdosis">überdosis</a>
+        </div>
       </div>
     </div>
 
diff --git a/docs/src/layouts/App/style.scss b/docs/src/layouts/App/style.scss
index d3f3515f9..d2b851b55 100644
--- a/docs/src/layouts/App/style.scss
+++ b/docs/src/layouts/App/style.scss
@@ -212,6 +212,17 @@ $menuBreakPoint: 800px;
     border-top: 1px solid rgba($colorWhite, 0.1);
   }
 
+  &__page-footer {
+    font-size: 0.85rem;
+    padding: 1.5rem 0;
+    text-align: center;
+    border-top: 1px solid rgba($colorWhite, 0.1);
+
+    a {
+      text-decoration: underline;
+    }
+  }
+
   &__mobile-nav {
     padding: 1rem;
     flex: 1 1 auto;

From 12b783c4d276457dfb77223a2073fee66ac74dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 28 Oct 2020 21:30:50 +0100
Subject: [PATCH 023/113] formatting

---
 packages/core/src/pasteRules/markPasteRule.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/core/src/pasteRules/markPasteRule.ts b/packages/core/src/pasteRules/markPasteRule.ts
index 85f5a93c4..0dc63d992 100644
--- a/packages/core/src/pasteRules/markPasteRule.ts
+++ b/packages/core/src/pasteRules/markPasteRule.ts
@@ -2,7 +2,6 @@ import { Plugin } from 'prosemirror-state'
 import { Slice, Fragment, MarkType } from 'prosemirror-model'
 
 export default function (regexp: RegExp, type: MarkType, getAttrs?: (match: any) => any): Plugin {
-
   const handler = (fragment: Fragment, parent?: any) => {
     const nodes: any[] = []
 
@@ -33,7 +32,6 @@ export default function (regexp: RegExp, type: MarkType, getAttrs?: (match: any)
             // adding the markdown part to nodes
             nodes.push(child
               .cut(textStart, textEnd)
-              // @ts-ignore
               .mark(type.create(attrs).addToSet(child.marks)))
 
             pos = matchEnd
@@ -59,5 +57,4 @@ export default function (regexp: RegExp, type: MarkType, getAttrs?: (match: any)
       },
     },
   })
-
 }

From 89465e6d552f433faca04c87776602a98a74e165 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Wed, 28 Oct 2020 21:53:40 +0100
Subject: [PATCH 024/113] update the content structure

---
 .../docPages/api/extensions/collaboration-cursor.md    |  2 +-
 docs/src/docPages/api/extensions/collaboration.md      |  2 +-
 docs/src/docPages/examples/collaborative-editing.md    |  2 +-
 docs/src/docPages/guide/collaborative-editing.md       |  2 +-
 docs/src/docPages/{tiptap-pro.md => sponsor.md}        |  2 +-
 docs/src/links.yaml                                    | 10 +++++++---
 6 files changed, 12 insertions(+), 8 deletions(-)
 rename docs/src/docPages/{tiptap-pro.md => sponsor.md} (77%)

diff --git a/docs/src/docPages/api/extensions/collaboration-cursor.md b/docs/src/docPages/api/extensions/collaboration-cursor.md
index cf8b74d0a..29f257828 100644
--- a/docs/src/docPages/api/extensions/collaboration-cursor.md
+++ b/docs/src/docPages/api/extensions/collaboration-cursor.md
@@ -1,7 +1,7 @@
 # Collaboration Cursor
 
 :::premium Premium Extension
-Using this in production requires a **tiptap pro** license. [Read more](/tiptap-pro)
+Using this in production requires a **tiptap pro** license. [Read more](/sponsor)
 :::
 
 ## Installation
diff --git a/docs/src/docPages/api/extensions/collaboration.md b/docs/src/docPages/api/extensions/collaboration.md
index 16f00fd67..d7f2cd0fc 100644
--- a/docs/src/docPages/api/extensions/collaboration.md
+++ b/docs/src/docPages/api/extensions/collaboration.md
@@ -2,7 +2,7 @@
 The Collaboration extension enables you to collaborate with others on one document. The implementation is based on [Y.js by Kevin Jahns](https://github.com/yjs/yjs), which is the coolest thing to [integrate collaborative editing](/guide/collaborative-editing) in your project.
 
 :::premium Premium Extension
-Using this in production requires a **tiptap pro** license. [Read more](/tiptap-pro)
+Using this in production requires a **tiptap pro** license. [Read more](/sponsor)
 :::
 
 ## Installation
diff --git a/docs/src/docPages/examples/collaborative-editing.md b/docs/src/docPages/examples/collaborative-editing.md
index e77555535..7c0f45668 100644
--- a/docs/src/docPages/examples/collaborative-editing.md
+++ b/docs/src/docPages/examples/collaborative-editing.md
@@ -1,7 +1,7 @@
 # Collaborative editing
 
 :::premium Requires Premium Extensions
-Using this example in production requires a **tiptap pro** license. [Read more](/tiptap-pro)
+Using this example in production requires a **tiptap pro** license. [Read more](/sponsor)
 :::
 
 This example shows how you can use tiptap to let different users collaboratively work on the same text in real-time.
diff --git a/docs/src/docPages/guide/collaborative-editing.md b/docs/src/docPages/guide/collaborative-editing.md
index 053334b6a..98b73209c 100644
--- a/docs/src/docPages/guide/collaborative-editing.md
+++ b/docs/src/docPages/guide/collaborative-editing.md
@@ -1,7 +1,7 @@
 # Collaborative editing
 
 :::premium Requires Premium Extensions
-Using the collaborative editing in production requires a **tiptap pro** license. [Read more](/tiptap-pro)
+Using the collaborative editing in production requires a **tiptap pro** license. [Read more](/sponsor)
 :::
 
 ## toc
diff --git a/docs/src/docPages/tiptap-pro.md b/docs/src/docPages/sponsor.md
similarity index 77%
rename from docs/src/docPages/tiptap-pro.md
rename to docs/src/docPages/sponsor.md
index 391c3559e..fcea3ceea 100644
--- a/docs/src/docPages/tiptap-pro.md
+++ b/docs/src/docPages/sponsor.md
@@ -1,3 +1,3 @@
-# tiptap pro
+# Become a sponsor
 
 [Sponsor us on GitHub](https://github.com/sponsors/ueberdosis)
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index c983fd38a..f5a3d9130 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -187,7 +187,11 @@
     - title: Keyboard Shortcuts
       link: /api/keyboard-shortcuts
 
-- title:
+- title: Sponsoring
   items:
-    - title: tiptap pro
-      link: /tiptap-pro
+    # - title: Benefits for sponsors
+    #   link: /benefits-for-sponsors
+    # - title: Sponsoring reports
+    #   link: /open
+    - title: Become a sponsor
+      link: /sponsor

From 516d0da41c5ffbbbb2e4fd9f73b84973b5898315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Thu, 29 Oct 2020 09:26:24 +0100
Subject: [PATCH 025/113] nothing works

---
 packages/core/src/Editor.ts           |  1 +
 packages/core/src/ExtensionManager.ts | 38 ++++++++++-
 packages/core/src/NodeExtension.ts    |  6 ++
 packages/core/src/NodeView.ts         |  3 +
 packages/extension-image/index.ts     |  7 ++
 packages/vue/index.ts                 |  3 +
 packages/vue/src/VueRenderer.ts       | 96 +++++++++++++++++++++++++++
 7 files changed, 151 insertions(+), 3 deletions(-)
 create mode 100644 packages/core/src/NodeView.ts
 create mode 100644 packages/vue/src/VueRenderer.ts

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index c49cd3deb..e925f4227 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -256,6 +256,7 @@ export class Editor extends EventEmitter {
    * Creates a ProseMirror view.
    */
   private createView() {
+    console.log('CREATE VIEW')
     this.view = new EditorView(this.options.element, {
       state: EditorState.create({
         doc: this.createDocument(this.options.content),
diff --git a/packages/core/src/ExtensionManager.ts b/packages/core/src/ExtensionManager.ts
index 2da65cd55..ab26ef840 100644
--- a/packages/core/src/ExtensionManager.ts
+++ b/packages/core/src/ExtensionManager.ts
@@ -1,14 +1,14 @@
 import { Plugin } from 'prosemirror-state'
 import { keymap } from 'prosemirror-keymap'
-// import { Schema, Node as ProsemirrorNode } from 'prosemirror-model'
+import { Schema, Node as ProsemirrorNode } from 'prosemirror-model'
 import { inputRules } from 'prosemirror-inputrules'
-// import { EditorView, Decoration } from 'prosemirror-view'
-import { Schema } from 'prosemirror-model'
+import { EditorView, Decoration } from 'prosemirror-view'
 import { Editor } from './Editor'
 // import capitalize from './utils/capitalize'
 import { Extensions } from './types'
 import getSchema from './utils/getSchema'
 import getSchemaTypeByName from './utils/getSchemaTypeByName'
+import splitExtensions from './utils/splitExtensions'
 
 export default class ExtensionManager {
 
@@ -98,6 +98,38 @@ export default class ExtensionManager {
   }
 
   get nodeViews() {
+    const { nodeExtensions } = splitExtensions(this.extensions)
+
+    return Object.fromEntries(nodeExtensions
+      .filter(extension => !!extension.addNodeView)
+      .map(extension => {
+        const context = {
+          options: extension.options,
+          editor: this.editor,
+          type: getSchemaTypeByName(extension.name, this.schema),
+        }
+
+        const renderer = extension.addNodeView?.bind(context)?.()
+
+        const nodeview = (
+          node: ProsemirrorNode,
+          view: EditorView,
+          getPos: (() => number) | boolean,
+          decorations: Decoration[],
+        ) => {
+          // @ts-ignore
+          return new renderer({
+            editor: this.editor,
+            view,
+            node,
+            getPos,
+            decorations,
+          })
+        }
+
+        return [extension.name, nodeview]
+      }))
+
     // const { renderer: Renderer } = this.editor
 
     // if (!Renderer || !Renderer.type) {
diff --git a/packages/core/src/NodeExtension.ts b/packages/core/src/NodeExtension.ts
index 76dba8164..8de0c678c 100644
--- a/packages/core/src/NodeExtension.ts
+++ b/packages/core/src/NodeExtension.ts
@@ -139,6 +139,11 @@ export interface NodeExtensionSpec<Options = {}, Commands = {}> extends Overwrit
     editor: Editor,
     type: NodeType,
   }) => Plugin[],
+
+  /**
+   * Node View
+   */
+  addNodeView?: (() => any) | null,
 }> {}
 
 export type NodeExtension = Required<Omit<NodeExtensionSpec, 'defaultOptions'> & {
@@ -166,6 +171,7 @@ const defaultNode: NodeExtension = {
   parseHTML: () => null,
   renderHTML: null,
   addAttributes: () => ({}),
+  addNodeView: null,
 }
 
 export function createNode<Options extends {}, Commands extends {}>(config: NodeExtensionSpec<Options, Commands>) {
diff --git a/packages/core/src/NodeView.ts b/packages/core/src/NodeView.ts
new file mode 100644
index 000000000..30a8e8949
--- /dev/null
+++ b/packages/core/src/NodeView.ts
@@ -0,0 +1,3 @@
+export class NodeView {
+
+}
diff --git a/packages/extension-image/index.ts b/packages/extension-image/index.ts
index 424cffc5f..bf9750766 100644
--- a/packages/extension-image/index.ts
+++ b/packages/extension-image/index.ts
@@ -1,4 +1,5 @@
 import { Command, createNode, nodeInputRule } from '@tiptap/core'
+import { VueRenderer } from '@tiptap/vue'
 
 export const inputRegex = /!\[(.+|:?)]\((\S+)(?:(?:\s+)["'](\S+)["'])?\)/
 
@@ -59,6 +60,12 @@ const Image = createNode({
       }),
     ]
   },
+
+  addNodeView() {
+    return VueRenderer({
+      template: '<div>vue component</div>',
+    })
+  },
 })
 
 export default Image
diff --git a/packages/vue/index.ts b/packages/vue/index.ts
index 79050a058..f1e855cc4 100644
--- a/packages/vue/index.ts
+++ b/packages/vue/index.ts
@@ -1,7 +1,10 @@
 import { Editor as CoreEditor } from '@tiptap/core'
 import Renderer from './src/Renderer'
+import VueRenderer from './src/VueRenderer'
 
 export * from '@tiptap/core'
+export { Renderer }
+export { VueRenderer }
 export { default as EditorContent } from './src/components/EditorContent'
 
 export class Editor extends CoreEditor {
diff --git a/packages/vue/src/VueRenderer.ts b/packages/vue/src/VueRenderer.ts
new file mode 100644
index 000000000..e58ab7268
--- /dev/null
+++ b/packages/vue/src/VueRenderer.ts
@@ -0,0 +1,96 @@
+// @ts-nocheck
+
+// export default (component: any) => {
+//   console.log('vue renderer', component)
+
+//   // return (node, view, getPos) => {
+//   return what => {
+
+//     console.log(what)
+//     // return new class ImageView {
+//     //   constructor(node, view, getPos) {
+//     //     this.dom = document.createElement('img')
+//     //     this.dom.src = node.attrs.src
+//     //     this.dom.alt = node.attrs.alt
+//     //     this.dom.addEventListener('click', e => {
+//     //       e.preventDefault()
+//     //       const alt = prompt('New alt text:', '')
+//     //       if (alt) {
+//     //         view.dispatch(view.state.tr.setNodeMarkup(getPos(), null, {
+//     //           src: node.attrs.src,
+//     //           alt,
+//     //         }))
+//     //       }
+//     //     })
+//     //   }
+
+//     //   stopEvent() { return true }
+//     // }(node, view, getPos)
+
+//   }
+// }
+
+import { Editor } from '@tiptap/core'
+import { Node as ProsemirrorNode } from 'prosemirror-model'
+import { EditorView } from 'prosemirror-view'
+import Vue from 'vue'
+
+export default (component: any) => class ImageView {
+
+  vm!: Vue
+
+  constructor(props: { editor: Editor, node: ProsemirrorNode, view: EditorView, getPos: any }) {
+    const {
+      node, editor, getPos, view,
+    } = props
+    // const { view } = editor
+
+    // this.dom = document.createElement('div')
+    // this.dom.innerHTML = 'hello node view'
+
+    this.mount(component)
+  }
+
+  mount(component: Vue) {
+    const Component = Vue.extend(component)
+
+    this.vm = new Component({
+      // parent: this.parent,
+      // propsData: props,
+    }).$mount()
+  }
+
+  get dom() {
+    return this.vm.$el
+  }
+
+  get contentDOM() {
+    return this.vm.$refs.content
+  }
+
+  stopEvent() {
+    return true
+  }
+
+  // console.log(what)
+  // return new class ImageView {
+  //   constructor(node, view, getPos) {
+  //     this.dom = document.createElement('img')
+  //     this.dom.src = node.attrs.src
+  //     this.dom.alt = node.attrs.alt
+  //     this.dom.addEventListener('click', e => {
+  //       e.preventDefault()
+  //       const alt = prompt('New alt text:', '')
+  //       if (alt) {
+  //         view.dispatch(view.state.tr.setNodeMarkup(getPos(), null, {
+  //           src: node.attrs.src,
+  //           alt,
+  //         }))
+  //       }
+  //     })
+  //   }
+
+  //   stopEvent() { return true }
+  // }(node, view, getPos)
+
+}

From 3bbadc551755452d865cdfae2cb85eba5f3eb476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Thu, 29 Oct 2020 09:32:11 +0100
Subject: [PATCH 026/113] add colored lists

---
 docs/src/templates/DocPage/style.scss | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss
index 11306b00f..e4ced33e8 100644
--- a/docs/src/templates/DocPage/style.scss
+++ b/docs/src/templates/DocPage/style.scss
@@ -149,12 +149,13 @@
           display: inline-block;
           margin-right: 0.75rem;
           content: "\2022";
-          opacity: 0.2;
+          color: $colorYellow;
         }
       }
     }
 
     > ol {
+      list-style: none;
       counter-reset: item;
 
       li {
@@ -171,9 +172,9 @@
           justify-content: center;
           height: 1.5rem;
           width: 1.5rem;
-          background-color: rgba($colorWhite, 0.1);
+          background-color: rgba($colorYellow, 0.1);
           border-radius: 9999px;
-          color: rgba($colorWhite, 0.4);
+          color: $colorYellow;
           font-size: 0.75rem;
           font-weight: 700;
           content: counter(item);

From be86773fc27b2bc9d1b613416899685ae15a3bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Thu, 29 Oct 2020 09:42:39 +0100
Subject: [PATCH 027/113] show always full menu on mobile

---
 docs/src/layouts/App/style.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/src/layouts/App/style.scss b/docs/src/layouts/App/style.scss
index d2b851b55..281c22e45 100644
--- a/docs/src/layouts/App/style.scss
+++ b/docs/src/layouts/App/style.scss
@@ -157,6 +157,10 @@ $menuBreakPoint: 800px;
     margin-top: 0.5rem;
   }
 
+  &__mobile-nav &__link-list &__link-list {
+    display: block;
+  }
+
   .active + &__link-list {
     display: block;
   }
@@ -200,6 +204,10 @@ $menuBreakPoint: 800px;
     }
   }
 
+  &__mobile-nav &__link--with-children::after {
+    display: none;
+  }
+
   &__main {
     padding: 1rem 0;
 

From f4fdb4306c1fd4f5d02f639bc460cf5d44e47944 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Thu, 29 Oct 2020 13:13:27 +0100
Subject: [PATCH 028/113] fix links

---
 docs/src/docPages/api/commands.md           | 2 +-
 docs/src/docPages/api/extensions.md         | 2 +-
 docs/src/docPages/overview/upgrade-guide.md | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/src/docPages/api/commands.md b/docs/src/docPages/api/commands.md
index 80dd59c97..ff158b869 100644
--- a/docs/src/docPages/api/commands.md
+++ b/docs/src/docPages/api/commands.md
@@ -67,4 +67,4 @@ Have a look at all of the core commands listed below. They should give you a goo
 | .selectAll()       | Select the whole document.              |
 
 ### Extensions
-All extension can add additional commands (and most do), check out the specific [documentation for the provided extensions](/api/extensions) to learn more about that. Of course, you can [add your custom extensions](/guide/custom-extensions) with custom commands aswell.
+All extension can add additional commands (and most do), check out the specific [documentation for the provided extensions](/api/extensions) to learn more about that. Of course, you can [add your custom extensions](/guide/build-custom-extensions) with custom commands aswell.
diff --git a/docs/src/docPages/api/extensions.md b/docs/src/docPages/api/extensions.md
index b06f53731..6f4ca1cf2 100644
--- a/docs/src/docPages/api/extensions.md
+++ b/docs/src/docPages/api/extensions.md
@@ -52,4 +52,4 @@ This section is not ready yet. Meanwhile, [search through GitHub issues](https:/
 :::
 
 ## Your custom extensions
-Didn’t find what you’re looking for? No worries, [you can build your own extensions](/guide/custom-extensions).
+Didn’t find what you’re looking for? No worries, [you can build your own extensions](/guide/build-custom-extensions).
diff --git a/docs/src/docPages/overview/upgrade-guide.md b/docs/src/docPages/overview/upgrade-guide.md
index c63828643..297c77abb 100644
--- a/docs/src/docPages/overview/upgrade-guide.md
+++ b/docs/src/docPages/overview/upgrade-guide.md
@@ -71,7 +71,7 @@ const CustomExtension = createNode({
 })
 ```
 
-Don’t forget to call `create()` in the end! Read more about [all the nifty details building custom extensions](/guide/custom-extensions) in our guide.
+Don’t forget to call `create()` in the end! Read more about [all the nifty details building custom extensions](/guide/build-custom-extensions) in our guide.
 
 ### Renamed API methods
 [We renamed a lot of commands](/api/commands), hopefully you can migrate to the new API with search & replace. Here is a list of what changed:

From f9089932ff58a5819e677de9eb5df78ce76fbd70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 11:08:23 +0100
Subject: [PATCH 029/113] add basic implementation for node views

---
 packages/core/src/Editor.ts           | 11 ++--
 packages/core/src/ExtensionManager.ts | 52 +++---------------
 packages/core/src/NodeExtension.ts    |  4 +-
 packages/core/src/NodeView.ts         |  3 --
 packages/core/src/types.ts            | 12 +++++
 packages/extension-image/index.ts     |  7 ++-
 packages/vue/index.ts                 | 11 +---
 packages/vue/src/Renderer.ts          | 32 -----------
 packages/vue/src/VueRenderer.ts       | 78 +++++----------------------
 9 files changed, 47 insertions(+), 163 deletions(-)
 delete mode 100644 packages/core/src/NodeView.ts
 delete mode 100644 packages/vue/src/Renderer.ts

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index e925f4227..238140df4 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -75,8 +75,6 @@ declare module './Editor' {
 @magicMethods
 export class Editor extends EventEmitter {
 
-  public renderer!: any
-
   private proxy!: Editor
 
   private commandManager!: CommandManager
@@ -256,7 +254,6 @@ export class Editor extends EventEmitter {
    * Creates a ProseMirror view.
    */
   private createView() {
-    console.log('CREATE VIEW')
     this.view = new EditorView(this.options.element, {
       state: EditorState.create({
         doc: this.createDocument(this.options.content),
@@ -266,10 +263,16 @@ export class Editor extends EventEmitter {
         ],
       }),
       dispatchTransaction: this.dispatchTransaction.bind(this),
+    })
+
+    // `editor.view` is not yet available at this time.
+    // Therefore we will add all node views directly afterwards.
+    this.view.setProps({
       nodeViews: this.extensionManager.nodeViews,
     })
 
-    // store editor in dom element for better testing
+    // Let’s store the editor instance in the DOM element.
+    // So we’ll have access to it for tests.
     const dom = this.view.dom as HTMLElement
     dom.editor = this.proxy
   }
diff --git a/packages/core/src/ExtensionManager.ts b/packages/core/src/ExtensionManager.ts
index ab26ef840..2d27f0872 100644
--- a/packages/core/src/ExtensionManager.ts
+++ b/packages/core/src/ExtensionManager.ts
@@ -4,8 +4,7 @@ import { Schema, Node as ProsemirrorNode } from 'prosemirror-model'
 import { inputRules } from 'prosemirror-inputrules'
 import { EditorView, Decoration } from 'prosemirror-view'
 import { Editor } from './Editor'
-// import capitalize from './utils/capitalize'
-import { Extensions } from './types'
+import { Extensions, NodeViewRenderer } from './types'
 import getSchema from './utils/getSchema'
 import getSchemaTypeByName from './utils/getSchemaTypeByName'
 import splitExtensions from './utils/splitExtensions'
@@ -109,57 +108,22 @@ export default class ExtensionManager {
           type: getSchemaTypeByName(extension.name, this.schema),
         }
 
-        const renderer = extension.addNodeView?.bind(context)?.()
+        const renderer = extension.addNodeView?.bind(context)?.() as NodeViewRenderer
 
         const nodeview = (
           node: ProsemirrorNode,
           view: EditorView,
           getPos: (() => number) | boolean,
           decorations: Decoration[],
-        ) => {
-          // @ts-ignore
-          return new renderer({
-            editor: this.editor,
-            view,
-            node,
-            getPos,
-            decorations,
-          })
-        }
+        ) => renderer({
+          editor: this.editor,
+          node,
+          getPos,
+          decorations,
+        })
 
         return [extension.name, nodeview]
       }))
-
-    // const { renderer: Renderer } = this.editor
-
-    // if (!Renderer || !Renderer.type) {
-    //   return {}
-    // }
-
-    // const prop = `to${capitalize(Renderer.type)}`
-
-    // return collect(this.extensions)
-    //   .where('extensionType', 'node')
-    //   .filter((extension: any) => extension.schema()[prop])
-    //   .map((extension: any) => {
-    //     return (
-    //       node: ProsemirrorNode,
-    //       view: EditorView,
-    //       getPos: (() => number) | boolean,
-    //       decorations: Decoration[],
-    //     ) => {
-    //       return new Renderer(extension.schema()[prop], {
-    //         extension,
-    //         editor: this.editor,
-    //         node,
-    //         getPos,
-    //         decorations,
-    //       })
-    //     }
-    //   })
-    //   .all()
-
-    return {}
   }
 
 }
diff --git a/packages/core/src/NodeExtension.ts b/packages/core/src/NodeExtension.ts
index 8de0c678c..17d6e91d6 100644
--- a/packages/core/src/NodeExtension.ts
+++ b/packages/core/src/NodeExtension.ts
@@ -3,7 +3,7 @@ import {
 } from 'prosemirror-model'
 import { Plugin } from 'prosemirror-state'
 import { ExtensionSpec, defaultExtension } from './Extension'
-import { Attributes, Overwrite } from './types'
+import { Attributes, NodeViewRenderer, Overwrite } from './types'
 import { Editor } from './Editor'
 
 export interface NodeExtensionSpec<Options = {}, Commands = {}> extends Overwrite<ExtensionSpec<Options, Commands>, {
@@ -143,7 +143,7 @@ export interface NodeExtensionSpec<Options = {}, Commands = {}> extends Overwrit
   /**
    * Node View
    */
-  addNodeView?: (() => any) | null,
+  addNodeView?: (() => NodeViewRenderer) | null,
 }> {}
 
 export type NodeExtension = Required<Omit<NodeExtensionSpec, 'defaultOptions'> & {
diff --git a/packages/core/src/NodeView.ts b/packages/core/src/NodeView.ts
deleted file mode 100644
index 30a8e8949..000000000
--- a/packages/core/src/NodeView.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export class NodeView {
-
-}
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index 5533a4fd9..d13851064 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -1,6 +1,9 @@
+import { Node } from 'prosemirror-model'
+import { Decoration, NodeView } from 'prosemirror-view'
 import { Extension } from './Extension'
 import { NodeExtension } from './NodeExtension'
 import { MarkExtension } from './MarkExtension'
+import Editor from '..'
 
 export type Extensions = (Extension | NodeExtension | MarkExtension)[]
 
@@ -40,3 +43,12 @@ export type Overwrite<T, U> = Pick<T, Diff<keyof T, keyof U>> & U;
 export type AnyObject = {
   [key: string]: any
 }
+
+export type NodeViewRendererProps = {
+  editor: Editor,
+  node: Node,
+  getPos: (() => number) | boolean,
+  decorations: Decoration[]
+}
+
+export type NodeViewRenderer = (props: NodeViewRendererProps) => NodeView
diff --git a/packages/extension-image/index.ts b/packages/extension-image/index.ts
index bf9750766..fccc8ff8d 100644
--- a/packages/extension-image/index.ts
+++ b/packages/extension-image/index.ts
@@ -1,5 +1,6 @@
 import { Command, createNode, nodeInputRule } from '@tiptap/core'
 import { VueRenderer } from '@tiptap/vue'
+import Vue from 'vue'
 
 export const inputRegex = /!\[(.+|:?)]\((\S+)(?:(?:\s+)["'](\S+)["'])?\)/
 
@@ -62,9 +63,11 @@ const Image = createNode({
   },
 
   addNodeView() {
-    return VueRenderer({
-      template: '<div>vue component</div>',
+    const Component = Vue.extend({
+      template: '<div>this is a vue component</div>',
     })
+
+    return VueRenderer(Component)
   },
 })
 
diff --git a/packages/vue/index.ts b/packages/vue/index.ts
index f1e855cc4..80cb8873b 100644
--- a/packages/vue/index.ts
+++ b/packages/vue/index.ts
@@ -1,12 +1,3 @@
-import { Editor as CoreEditor } from '@tiptap/core'
-import Renderer from './src/Renderer'
-import VueRenderer from './src/VueRenderer'
-
 export * from '@tiptap/core'
-export { Renderer }
-export { VueRenderer }
+export { default as VueRenderer } from './src/VueRenderer'
 export { default as EditorContent } from './src/components/EditorContent'
-
-export class Editor extends CoreEditor {
-  renderer = Renderer
-}
diff --git a/packages/vue/src/Renderer.ts b/packages/vue/src/Renderer.ts
deleted file mode 100644
index 67d3e6ec5..000000000
--- a/packages/vue/src/Renderer.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import Vue from 'vue'
-import { ComponentRenderer } from '@tiptap/core'
-
-export default class Renderer extends ComponentRenderer {
-
-  static type = 'vue'
-
-  vm!: Vue
-
-  constructor(component: Vue) {
-    super()
-    this.mount(component)
-  }
-
-  mount(component: Vue) {
-    const Component = Vue.extend(component)
-
-    this.vm = new Component({
-      // parent: this.parent,
-      // propsData: props,
-    }).$mount()
-  }
-
-  get dom() {
-    return this.vm.$el
-  }
-
-  get contentDOM() {
-    return this.vm.$refs.content
-  }
-
-}
diff --git a/packages/vue/src/VueRenderer.ts b/packages/vue/src/VueRenderer.ts
index e58ab7268..9bfd525c8 100644
--- a/packages/vue/src/VueRenderer.ts
+++ b/packages/vue/src/VueRenderer.ts
@@ -1,57 +1,20 @@
-// @ts-nocheck
-
-// export default (component: any) => {
-//   console.log('vue renderer', component)
-
-//   // return (node, view, getPos) => {
-//   return what => {
-
-//     console.log(what)
-//     // return new class ImageView {
-//     //   constructor(node, view, getPos) {
-//     //     this.dom = document.createElement('img')
-//     //     this.dom.src = node.attrs.src
-//     //     this.dom.alt = node.attrs.alt
-//     //     this.dom.addEventListener('click', e => {
-//     //       e.preventDefault()
-//     //       const alt = prompt('New alt text:', '')
-//     //       if (alt) {
-//     //         view.dispatch(view.state.tr.setNodeMarkup(getPos(), null, {
-//     //           src: node.attrs.src,
-//     //           alt,
-//     //         }))
-//     //       }
-//     //     })
-//     //   }
-
-//     //   stopEvent() { return true }
-//     // }(node, view, getPos)
-
-//   }
-// }
-
-import { Editor } from '@tiptap/core'
-import { Node as ProsemirrorNode } from 'prosemirror-model'
-import { EditorView } from 'prosemirror-view'
+import { NodeViewRendererProps } from '@tiptap/core'
+import { NodeView } from 'prosemirror-view'
 import Vue from 'vue'
+import { VueConstructor } from 'vue/types/umd'
 
-export default (component: any) => class ImageView {
+class VueNodeView implements NodeView {
 
   vm!: Vue
 
-  constructor(props: { editor: Editor, node: ProsemirrorNode, view: EditorView, getPos: any }) {
-    const {
-      node, editor, getPos, view,
-    } = props
+  constructor(component: Vue | VueConstructor, props: NodeViewRendererProps) {
+    // const { node, editor, getPos } = props
     // const { view } = editor
 
-    // this.dom = document.createElement('div')
-    // this.dom.innerHTML = 'hello node view'
-
     this.mount(component)
   }
 
-  mount(component: Vue) {
+  mount(component: Vue | VueConstructor) {
     const Component = Vue.extend(component)
 
     this.vm = new Component({
@@ -65,32 +28,15 @@ export default (component: any) => class ImageView {
   }
 
   get contentDOM() {
-    return this.vm.$refs.content
+    return this.vm.$refs.content as Element
   }
 
   stopEvent() {
     return true
   }
 
-  // console.log(what)
-  // return new class ImageView {
-  //   constructor(node, view, getPos) {
-  //     this.dom = document.createElement('img')
-  //     this.dom.src = node.attrs.src
-  //     this.dom.alt = node.attrs.alt
-  //     this.dom.addEventListener('click', e => {
-  //       e.preventDefault()
-  //       const alt = prompt('New alt text:', '')
-  //       if (alt) {
-  //         view.dispatch(view.state.tr.setNodeMarkup(getPos(), null, {
-  //           src: node.attrs.src,
-  //           alt,
-  //         }))
-  //       }
-  //     })
-  //   }
-
-  //   stopEvent() { return true }
-  // }(node, view, getPos)
-
+}
+
+export default function VueRenderer(component: Vue | VueConstructor) {
+  return (props: NodeViewRendererProps) => new VueNodeView(component, props) as NodeView
 }

From 3e00fadcaa3f70eb4f881a2b34aa4d645c4e3fd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 13:19:06 +0100
Subject: [PATCH 030/113] add basic task list and task item extension

---
 docs/src/demos/Extensions/TaskList/index.vue  | 53 +++++++++++++++++
 docs/src/docPages/api/extensions/task-list.md | 31 ++++++++++
 docs/src/links.yaml                           |  3 +
 packages/extension-bullet-list/index.ts       |  4 +-
 packages/extension-list-item/index.ts         |  4 +-
 packages/extension-ordered-list/index.ts      |  4 +-
 packages/extension-task-item/index.ts         | 59 +++++++++++++++++++
 packages/extension-task-item/package.json     | 17 ++++++
 packages/extension-task-list/index.ts         | 45 ++++++++++++++
 packages/extension-task-list/package.json     | 17 ++++++
 10 files changed, 232 insertions(+), 5 deletions(-)
 create mode 100644 docs/src/demos/Extensions/TaskList/index.vue
 create mode 100644 docs/src/docPages/api/extensions/task-list.md
 create mode 100644 packages/extension-task-item/index.ts
 create mode 100644 packages/extension-task-item/package.json
 create mode 100644 packages/extension-task-list/index.ts
 create mode 100644 packages/extension-task-list/package.json

diff --git a/docs/src/demos/Extensions/TaskList/index.vue b/docs/src/demos/Extensions/TaskList/index.vue
new file mode 100644
index 000000000..bae41d95e
--- /dev/null
+++ b/docs/src/demos/Extensions/TaskList/index.vue
@@ -0,0 +1,53 @@
+<template>
+  <div v-if="editor">
+    <button @click="editor.chain().focus().taskList().run()" :class="{ 'is-active': editor.isActive('task_list') }">
+      task list
+    </button>
+
+    <editor-content :editor="editor" />
+  </div>
+</template>
+
+<script>
+import { Editor } from '@tiptap/core'
+import { EditorContent } from '@tiptap/vue'
+import Document from '@tiptap/extension-document'
+import Paragraph from '@tiptap/extension-paragraph'
+import Text from '@tiptap/extension-text'
+import TaskList from '@tiptap/extension-task-list'
+import TaskItem from '@tiptap/extension-task-item'
+
+export default {
+  components: {
+    EditorContent,
+  },
+
+  data() {
+    return {
+      editor: null,
+    }
+  },
+
+  mounted() {
+    this.editor = new Editor({
+      extensions: [
+        Document(),
+        Paragraph(),
+        Text(),
+        TaskList(),
+        TaskItem(),
+      ],
+      content: `
+        <ul data-type="task_list">
+          <li>A list item</li>
+          <li>And another one</li>
+        </ul>
+      `,
+    })
+  },
+
+  beforeDestroy() {
+    this.editor.destroy()
+  },
+}
+</script>
diff --git a/docs/src/docPages/api/extensions/task-list.md b/docs/src/docPages/api/extensions/task-list.md
new file mode 100644
index 000000000..3cc62c655
--- /dev/null
+++ b/docs/src/docPages/api/extensions/task-list.md
@@ -0,0 +1,31 @@
+# TaskList
+This extension enables you to use task lists in the editor. They are rendered as `<ul>` HTML tags.
+
+## Installation
+::: warning Use with TaskItem
+The `TaskList` extension is intended to be used with the [`TaskItem`](/api/extensions/task-item) extension. Make sure to import that one too, otherwise you’ll get a SyntaxError.
+:::
+
+```bash
+# With npm
+npm install @tiptap/extension-task-list @tiptap/extension-task-item
+
+# Or: With Yarn
+yarn add @tiptap/extension-task-list @tiptap/extension-task-item
+```
+
+## Settings
+| Option | Type   | Default | Description                                  |
+| ------ | ------ | ------- | -------------------------------------------- |
+| class  | string | –       | Add a custom class to the rendered HTML tag. |
+
+## Commands
+| Command     | Options | Description           |
+| ----------- | ------- | --------------------- |
+| task_list | —       | Toggle a task list. |
+
+## Source code
+[packages/extension-task-list/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-task-list/)
+
+## Usage
+<demo name="Extensions/TaskList" />
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index f5a3d9130..4c7cd5151 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -156,6 +156,9 @@
         #   draft: true
         - title: Strike
           link: /api/extensions/strike
+        - title: TaskList
+          link: /api/extensions/task-list
+          draft: true
         # - title: TableCell
         #   link: /api/extensions/table-cell
         #   draft: true
diff --git a/packages/extension-bullet-list/index.ts b/packages/extension-bullet-list/index.ts
index 45e6bc18b..cb949d707 100644
--- a/packages/extension-bullet-list/index.ts
+++ b/packages/extension-bullet-list/index.ts
@@ -4,10 +4,10 @@ import { wrappingInputRule } from 'prosemirror-inputrules'
 const BulletList = createNode({
   name: 'bullet_list',
 
-  content: 'list_item+',
-
   group: 'block',
 
+  content: 'list_item+',
+
   parseHTML() {
     return [
       { tag: 'ul' },
diff --git a/packages/extension-list-item/index.ts b/packages/extension-list-item/index.ts
index 3bfa852ac..88cfca70d 100644
--- a/packages/extension-list-item/index.ts
+++ b/packages/extension-list-item/index.ts
@@ -9,7 +9,9 @@ const ListItem = createNode({
 
   parseHTML() {
     return [
-      { tag: 'li' },
+      {
+        tag: 'li',
+      },
     ]
   },
 
diff --git a/packages/extension-ordered-list/index.ts b/packages/extension-ordered-list/index.ts
index 0b6787282..6c0aef3bb 100644
--- a/packages/extension-ordered-list/index.ts
+++ b/packages/extension-ordered-list/index.ts
@@ -4,10 +4,10 @@ import { wrappingInputRule } from 'prosemirror-inputrules'
 const OrderedList = createNode({
   name: 'ordered_list',
 
-  content: 'list_item+',
-
   group: 'block',
 
+  content: 'list_item+',
+
   addAttributes() {
     return {
       start: {
diff --git a/packages/extension-task-item/index.ts b/packages/extension-task-item/index.ts
new file mode 100644
index 000000000..6ac329435
--- /dev/null
+++ b/packages/extension-task-item/index.ts
@@ -0,0 +1,59 @@
+import { createNode, mergeAttributes } from '@tiptap/core'
+
+export interface TaskItemOptions {
+  nested: boolean,
+}
+
+const TaskItem = createNode({
+  name: 'task_item',
+
+  content: 'paragraph+',
+
+  // TODO: allow content to be a callback function
+  // content() {
+  //   return this.options.nested ? '(paragraph|todo_list)+' : 'paragraph+',
+  // },
+
+  defining: true,
+
+  defaultOptions: <TaskItemOptions>{
+    nested: false,
+  },
+
+  addAttributes() {
+    return {
+      done: {
+        default: false,
+      },
+    }
+  },
+
+  parseHTML() {
+    return [
+      {
+        tag: 'li[data-type="task_item"]',
+        priority: 51,
+      },
+    ]
+  },
+
+  renderHTML({ attributes }) {
+    return ['li', mergeAttributes(attributes, { 'data-type': 'task_item' }), 0]
+  },
+
+  addKeyboardShortcuts() {
+    return {
+      Enter: () => this.editor.splitListItem('task_item'),
+      Tab: () => this.editor.sinkListItem('task_item'),
+      'Shift-Tab': () => this.editor.liftListItem('task_item'),
+    }
+  },
+})
+
+export default TaskItem
+
+declare module '@tiptap/core/src/Editor' {
+  interface AllExtensions {
+    TaskItem: typeof TaskItem,
+  }
+}
diff --git a/packages/extension-task-item/package.json b/packages/extension-task-item/package.json
new file mode 100644
index 000000000..cb3e4b38b
--- /dev/null
+++ b/packages/extension-task-item/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@tiptap/extension-task-item",
+  "version": "1.0.0",
+  "source": "index.ts",
+  "main": "dist/tiptap-extension-task-item.js",
+  "umd:main": "dist/tiptap-extension-task-item.umd.js",
+  "module": "dist/tiptap-extension-task-item.mjs",
+  "unpkg": "dist/tiptap-extension-task-item.js",
+  "jsdelivr": "dist/tiptap-extension-task-item.js",
+  "files": [
+    "src",
+    "dist"
+  ],
+  "peerDependencies": {
+    "@tiptap/core": "2.x"
+  }
+}
diff --git a/packages/extension-task-list/index.ts b/packages/extension-task-list/index.ts
new file mode 100644
index 000000000..76a61da6f
--- /dev/null
+++ b/packages/extension-task-list/index.ts
@@ -0,0 +1,45 @@
+import { Command, createNode, mergeAttributes } from '@tiptap/core'
+import { wrappingInputRule } from 'prosemirror-inputrules'
+
+const TaskList = createNode({
+  name: 'task_list',
+
+  group: 'block',
+
+  content: 'task_item+',
+
+  parseHTML() {
+    return [
+      {
+        tag: 'ul[data-type="task_list"]',
+        priority: 51,
+      },
+    ]
+  },
+
+  renderHTML({ attributes }) {
+    return ['ul', mergeAttributes(attributes, { 'data-type': 'task_list' }), 0]
+  },
+
+  addCommands() {
+    return {
+      taskList: (): Command => ({ commands }) => {
+        return commands.toggleList('task_list', 'task_item')
+      },
+    }
+  },
+
+  addInputRules() {
+    return [
+      wrappingInputRule(/^\s*(\[ \])\s$/, this.type),
+    ]
+  },
+})
+
+export default TaskList
+
+declare module '@tiptap/core/src/Editor' {
+  interface AllExtensions {
+    TaskList: typeof TaskList,
+  }
+}
diff --git a/packages/extension-task-list/package.json b/packages/extension-task-list/package.json
new file mode 100644
index 000000000..50add09ad
--- /dev/null
+++ b/packages/extension-task-list/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@tiptap/extension-task-list",
+  "version": "1.0.0",
+  "source": "index.ts",
+  "main": "dist/tiptap-extension-task-list.js",
+  "umd:main": "dist/tiptap-extension-task-list.umd.js",
+  "module": "dist/tiptap-extension-task-list.mjs",
+  "unpkg": "dist/tiptap-extension-task-list.js",
+  "jsdelivr": "dist/tiptap-extension-task-list.js",
+  "files": [
+    "src",
+    "dist"
+  ],
+  "peerDependencies": {
+    "@tiptap/core": "2.x"
+  }
+}

From cf8956bca1e081e8ef60572a99a81b2724bd6ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 13:20:27 +0100
Subject: [PATCH 031/113] remove node view from image extension

---
 packages/extension-image/index.ts | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/extension-image/index.ts b/packages/extension-image/index.ts
index fccc8ff8d..424cffc5f 100644
--- a/packages/extension-image/index.ts
+++ b/packages/extension-image/index.ts
@@ -1,6 +1,4 @@
 import { Command, createNode, nodeInputRule } from '@tiptap/core'
-import { VueRenderer } from '@tiptap/vue'
-import Vue from 'vue'
 
 export const inputRegex = /!\[(.+|:?)]\((\S+)(?:(?:\s+)["'](\S+)["'])?\)/
 
@@ -61,14 +59,6 @@ const Image = createNode({
       }),
     ]
   },
-
-  addNodeView() {
-    const Component = Vue.extend({
-      template: '<div>this is a vue component</div>',
-    })
-
-    return VueRenderer(Component)
-  },
 })
 
 export default Image

From 25f4078996b4402f5ca51966152470b1248f4489 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Fri, 30 Oct 2020 14:24:16 +0100
Subject: [PATCH 032/113] update content

---
 .../Examples/CollaborativeEditing/index.vue   | 60 +++++++++++--------
 .../demos/Examples/ExportHtmlOrJson/index.vue | 19 ++++--
 docs/src/demos/Examples/Focus/index.vue       |  2 +-
 docs/src/demos/Examples/ReadOnly/index.vue    |  2 +-
 .../Extensions/CollaborationCursor/index.vue  |  6 +-
 .../src/demos/Overview/Installation/index.vue |  2 +-
 .../src/docPages/api/extensions/blockquote.md |  4 +-
 docs/src/docPages/api/extensions/bold.md      |  4 +-
 .../docPages/api/extensions/bullet-list.md    |  4 +-
 .../src/docPages/api/extensions/code-block.md |  4 +-
 docs/src/docPages/api/extensions/code.md      |  4 +-
 .../api/extensions/collaboration-cursor.md    |  4 +-
 .../docPages/api/extensions/collaboration.md  |  4 +-
 docs/src/docPages/api/extensions/document.md  |  6 +-
 .../src/docPages/api/extensions/hard-break.md |  4 +-
 docs/src/docPages/api/extensions/heading.md   |  4 +-
 docs/src/docPages/api/extensions/history.md   |  4 +-
 .../api/extensions/horizontal-rule.md         |  4 +-
 docs/src/docPages/api/extensions/image.md     |  4 +-
 docs/src/docPages/api/extensions/italic.md    |  4 +-
 docs/src/docPages/api/extensions/link.md      |  4 +-
 docs/src/docPages/api/extensions/list-item.md |  4 +-
 .../docPages/api/extensions/ordered-list.md   |  4 +-
 docs/src/docPages/api/extensions/paragraph.md |  4 +-
 docs/src/docPages/api/extensions/strike.md    |  4 +-
 .../src/docPages/api/extensions/text-align.md |  4 +-
 docs/src/docPages/api/extensions/text.md      |  6 +-
 docs/src/docPages/api/extensions/underline.md |  4 +-
 docs/src/docPages/examples.md                 |  8 +--
 docs/src/docPages/examples/basic.md           |  1 -
 docs/src/docPages/examples/read-only.md       |  2 +-
 .../docPages/guide/build-custom-extensions.md |  5 +-
 docs/src/docPages/guide/store-content.md      |  2 +-
 docs/src/docPages/introduction.md             | 17 ++++--
 docs/src/docPages/overview/contributing.md    |  5 +-
 docs/src/docPages/overview/installation.md    | 15 ++---
 36 files changed, 131 insertions(+), 107 deletions(-)

diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue
index db76709ff..a52ec0d1a 100644
--- a/docs/src/demos/Examples/CollaborativeEditing/index.vue
+++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue
@@ -1,10 +1,13 @@
 <template>
   <div>
     <button @click="setName">
-      set username
+      Set Name
+    </button>
+    <button @click="changeName">
+      Random Name
     </button>
     <button @click="changeColor">
-      change color
+      Random Color
     </button>
 
     <div class="collaboration-status">
@@ -89,7 +92,16 @@ export default {
 
   methods: {
     setName() {
-      this.name = window.prompt('Name')
+      const name = window.prompt('Name')
+
+      if (name) {
+        this.name = name
+        return this.updateUser()
+      }
+    },
+
+    changeName() {
+      this.name = this.getRandomName()
       this.updateUser()
     },
 
@@ -108,28 +120,26 @@ export default {
     },
 
     getRandomColor() {
-      const colors = [
-        '#f03e3e',
-        '#d6336c',
-        '#ae3ec9',
-        '#7048e8',
-        '#4263eb',
-        '#1c7ed6',
-        '#1098ad',
-        '#0ca678',
-        '#37b24d',
-        '#74b816',
-        '#f59f00',
-        '#f76707',
-      ]
-
-      return colors[Math.floor(Math.random() * colors.length)]
+      return this.getRandomElement([
+        '#616161',
+        '#A975FF',
+        '#FB5151',
+        '#fd9170',
+        '#FFCB6B',
+        '#68CEF8',
+        '#80cbc4',
+        '#9DEF8F',
+      ])
     },
 
     getRandomName() {
-      const names = ['🙈', '🙉', '🙊', '💥', '💫', '💦', '💨', '🐵', '🐒', '🦍', '🦧', '🐶', '🐕', '🦮', '🐕‍🦺', '🐩', '🐺', '🦊', '🦝', '🐱', '🐈', '🦁', '🐯', '🐅', '🐆', '🐴', '🐎', '🦄', '🦓', '🦌', '🐮', '🐂', '🐃', '🐄', '🐷', '🐖', '🐗', '🐽', '🐏', '🐑', '🐐', '🐪', '🐫', '🦙', '🦒', '🐘', '🦏', '🦛', '🐭', '🐁', '🐀', '🐹', '🐰', '🐇', '🐿', '🦔', '🦇', '🐻', '🐨', '🐼', '🦥', '🦦', '🦨', '🦘', '🦡', '🐾', '🦃', '🐔', '🐓', '🐣', '🐤', '🐥', '🐦', '🐧', '🕊', '🦅', '🦆', '🦢', '🦉', '🦩', '🦚', '🦜', '🐸', '🐊', '🐢', '🦎', '🐍', '🐲', '🐉', '🦕', '🦖', '🐳', '🐋', '🐬', '🐟', '🐠', '🐡', '🦈', '🐙', '🐚', '🐌', '🦋', '🐛', '🐜', '🐝', '🐞', '🦗', '🕷', '🕸', '🦂', '🦟', '🦠']
+      return this.getRandomElement([
+        'Lea Thompson', 'Cyndi Lauper', 'Tom Cruise', 'Madonna', 'Jerry Hall', 'Joan Collins', 'Winona Ryder', 'Christina Applegate', 'Alyssa Milano', 'Molly Ringwald', 'Ally Sheedy', 'Debbie Harry', 'Olivia Newton-John', 'Elton John', 'Michael J. Fox', 'Axl Rose', 'Emilio Estevez', 'Ralph Macchio', 'Rob Lowe', 'Jennifer Grey', 'Mickey Rourke', 'John Cusack', 'Matthew Broderick', 'Justine Bateman', 'Lisa Bonet',
+      ])
+    },
 
-      return names[Math.floor(Math.random() * names.length)]
+    getRandomElement(list) {
+      return list[Math.floor(Math.random() * list.length)]
     },
 
     updateState() {
@@ -151,7 +161,8 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+/* A list of all available users */
 .collaboration-users {
   margin-top: 0.5rem;
 
@@ -165,6 +176,7 @@ export default {
   }
 }
 
+/* Some information about the status */
 .collaboration-status {
   background: #eee;
   color: #666;
@@ -183,7 +195,7 @@ export default {
   }
 }
 
-/* This gives the remote user caret */
+/* Give a remote user a caret */
 .collaboration-cursor__caret {
   position: relative;
   margin-left: -1px;
@@ -194,7 +206,7 @@ export default {
   pointer-events: none;
 }
 
-/* This renders the username above the caret */
+/* Render the username above the caret */
 .collaboration-cursor__label {
   position: absolute;
   top: -1.4em;
diff --git a/docs/src/demos/Examples/ExportHtmlOrJson/index.vue b/docs/src/demos/Examples/ExportHtmlOrJson/index.vue
index b20e1907f..e318805da 100644
--- a/docs/src/demos/Examples/ExportHtmlOrJson/index.vue
+++ b/docs/src/demos/Examples/ExportHtmlOrJson/index.vue
@@ -7,6 +7,12 @@
       <button class="button" @click="clearContent">
         Clear Content
       </button>
+      <button @click="editor.chain().focus().bold().run()" :class="{ 'is-active': editor.isActive('bold') }">
+        Bold
+      </button>
+      <button @click="editor.chain().focus().italic().run()" :class="{ 'is-active': editor.isActive('italic') }">
+        Italic
+      </button>
     </div>
 
     <editor-content :editor="editor" />
@@ -70,7 +76,7 @@ export default {
           content: [
             {
               type: 'text',
-              text: 'This is some inserted text. 👋',
+              text: 'It’s 19871. You can’t turn on a radio, or go to a mall without hearing Olivia Newton-John’s hit song, Physical.',
             },
           ],
         }],
@@ -95,11 +101,14 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .export {
+  padding: 1rem 0 0;
+
   h3 {
-    margin: 0.5rem 0;
+    margin: 1rem 0 0.5rem;
   }
+
   pre {
     border-radius: 5px;
     color: #333;
@@ -109,7 +118,9 @@ export default {
     display: block;
     white-space: pre-wrap;
     font-size: 0.8rem;
-    padding: 1rem;
+    padding: 0.75rem 1rem;
+    background-color:#e9ecef;
+    color: #495057;
   }
 }
 </style>
diff --git a/docs/src/demos/Examples/Focus/index.vue b/docs/src/demos/Examples/Focus/index.vue
index b7a2408ce..5f7193585 100644
--- a/docs/src/demos/Examples/Focus/index.vue
+++ b/docs/src/demos/Examples/Focus/index.vue
@@ -58,7 +58,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .has-focus {
   border-radius: 3px;
   box-shadow: 0 0 0 3px #3ea4ffe6;
diff --git a/docs/src/demos/Examples/ReadOnly/index.vue b/docs/src/demos/Examples/ReadOnly/index.vue
index 08e61ba57..d1c137603 100644
--- a/docs/src/demos/Examples/ReadOnly/index.vue
+++ b/docs/src/demos/Examples/ReadOnly/index.vue
@@ -52,7 +52,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .checkbox {
   margin-bottom: 1rem;
 
diff --git a/docs/src/demos/Extensions/CollaborationCursor/index.vue b/docs/src/demos/Extensions/CollaborationCursor/index.vue
index bf290cb14..86e0d4426 100644
--- a/docs/src/demos/Extensions/CollaborationCursor/index.vue
+++ b/docs/src/demos/Extensions/CollaborationCursor/index.vue
@@ -61,8 +61,8 @@ export default {
 }
 </script>
 
-<style lang="scss">
-/* This gives the remote user caret */
+<style lang="scss" scoped>
+/* Give a remote user a caret */
 .collaboration-cursor__caret {
   position: relative;
   margin-left: -1px;
@@ -73,7 +73,7 @@ export default {
   pointer-events: none;
 }
 
-/* This renders the username above the caret */
+/* Render the username above the caret */
 .collaboration-cursor__label {
   position: absolute;
   top: -1.4em;
diff --git a/docs/src/demos/Overview/Installation/index.vue b/docs/src/demos/Overview/Installation/index.vue
index 06e4677fc..9e3447271 100644
--- a/docs/src/demos/Overview/Installation/index.vue
+++ b/docs/src/demos/Overview/Installation/index.vue
@@ -18,7 +18,7 @@ export default {
 
   mounted() {
     this.editor = new Editor({
-      content: '<p>Hello, I’m tiptap running in Vue.js! 👋</p>',
+      content: '<p>Hello, here is tiptap! 👋</p>',
       extensions: defaultExtensions(),
     })
   },
diff --git a/docs/src/docPages/api/extensions/blockquote.md b/docs/src/docPages/api/extensions/blockquote.md
index 533c1a0aa..dbd5038e3 100644
--- a/docs/src/docPages/api/extensions/blockquote.md
+++ b/docs/src/docPages/api/extensions/blockquote.md
@@ -6,10 +6,10 @@ Type <code>>&nbsp;</code> at the beginning of a new line and it will magically t
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-blockquote
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-blockquote
 ```
 
diff --git a/docs/src/docPages/api/extensions/bold.md b/docs/src/docPages/api/extensions/bold.md
index 9cecd7449..d9b14f65d 100644
--- a/docs/src/docPages/api/extensions/bold.md
+++ b/docs/src/docPages/api/extensions/bold.md
@@ -9,10 +9,10 @@ The extension will generate the corresponding `<strong>` HTML tags when reading
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-bold
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-bold
 ```
 
diff --git a/docs/src/docPages/api/extensions/bullet-list.md b/docs/src/docPages/api/extensions/bullet-list.md
index 91cbdb765..2535a9c1e 100644
--- a/docs/src/docPages/api/extensions/bullet-list.md
+++ b/docs/src/docPages/api/extensions/bullet-list.md
@@ -9,10 +9,10 @@ The `BulletList` extension is intended to be used with the [`ListItem`](/api/ext
 :::
 
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-bullet-list @tiptap/extension-list-item
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-bullet-list @tiptap/extension-list-item
 ```
 
diff --git a/docs/src/docPages/api/extensions/code-block.md b/docs/src/docPages/api/extensions/code-block.md
index e8a45b6d2..67d95523e 100644
--- a/docs/src/docPages/api/extensions/code-block.md
+++ b/docs/src/docPages/api/extensions/code-block.md
@@ -9,10 +9,10 @@ The CodeBlock extension doesn’t come with styling and has no syntax highlighti
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-code-block
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-code-block
 ```
 
diff --git a/docs/src/docPages/api/extensions/code.md b/docs/src/docPages/api/extensions/code.md
index 2c00086c2..ac5b1148d 100644
--- a/docs/src/docPages/api/extensions/code.md
+++ b/docs/src/docPages/api/extensions/code.md
@@ -5,10 +5,10 @@ Type something with <code>\`back-ticks around\`</code> and it will magically tra
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-code
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-code
 ```
 
diff --git a/docs/src/docPages/api/extensions/collaboration-cursor.md b/docs/src/docPages/api/extensions/collaboration-cursor.md
index 29f257828..05fe4c059 100644
--- a/docs/src/docPages/api/extensions/collaboration-cursor.md
+++ b/docs/src/docPages/api/extensions/collaboration-cursor.md
@@ -6,10 +6,10 @@ Using this in production requires a **tiptap pro** license. [Read more](/sponsor
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-collaboration-cursor
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-collaboration-cursor
 ```
 
diff --git a/docs/src/docPages/api/extensions/collaboration.md b/docs/src/docPages/api/extensions/collaboration.md
index d7f2cd0fc..1815948b0 100644
--- a/docs/src/docPages/api/extensions/collaboration.md
+++ b/docs/src/docPages/api/extensions/collaboration.md
@@ -7,10 +7,10 @@ Using this in production requires a **tiptap pro** license. [Read more](/sponsor
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-collaboration yjs y-webrtc
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-collaboration yjs y-webrtc
 ```
 
diff --git a/docs/src/docPages/api/extensions/document.md b/docs/src/docPages/api/extensions/document.md
index 246932a82..6199533d3 100644
--- a/docs/src/docPages/api/extensions/document.md
+++ b/docs/src/docPages/api/extensions/document.md
@@ -9,10 +9,10 @@ Tiptap 1 tried to hide that node from you, but it has always been there. A tiny,
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-document
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-document
 ```
 
@@ -20,4 +20,4 @@ yarn add @tiptap/extension-document
 [packages/extension-document/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-document/)
 
 ## Usage
-<demo name="Extensions/Document" highlight="10,28" />
\ No newline at end of file
+<demo name="Extensions/Document" highlight="10,28" />
diff --git a/docs/src/docPages/api/extensions/hard-break.md b/docs/src/docPages/api/extensions/hard-break.md
index ae6687f49..0f38111c7 100644
--- a/docs/src/docPages/api/extensions/hard-break.md
+++ b/docs/src/docPages/api/extensions/hard-break.md
@@ -3,10 +3,10 @@ The HardBreak extensions adds support for the `<br>` HTML tag, which forces a li
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-hard-break
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-hard-break
 ```
 
diff --git a/docs/src/docPages/api/extensions/heading.md b/docs/src/docPages/api/extensions/heading.md
index fefd6835a..efca21496 100644
--- a/docs/src/docPages/api/extensions/heading.md
+++ b/docs/src/docPages/api/extensions/heading.md
@@ -5,10 +5,10 @@ Type <code>#&nbsp;</code> at the beginning of a new line and it will magically t
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-heading
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-heading
 ```
 
diff --git a/docs/src/docPages/api/extensions/history.md b/docs/src/docPages/api/extensions/history.md
index 6d41c532e..c60438fd0 100644
--- a/docs/src/docPages/api/extensions/history.md
+++ b/docs/src/docPages/api/extensions/history.md
@@ -3,10 +3,10 @@ This extension provides history support. All changes to the document will be tra
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-history
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-history
 ```
 
diff --git a/docs/src/docPages/api/extensions/horizontal-rule.md b/docs/src/docPages/api/extensions/horizontal-rule.md
index 2363e8b5a..1de9d59da 100644
--- a/docs/src/docPages/api/extensions/horizontal-rule.md
+++ b/docs/src/docPages/api/extensions/horizontal-rule.md
@@ -5,10 +5,10 @@ Type three dashes (<code>---</code>) or three underscores and a space (<code>___
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-horizontal-rule
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-horizontal-rule
 ```
 
diff --git a/docs/src/docPages/api/extensions/image.md b/docs/src/docPages/api/extensions/image.md
index e811d826b..3c463ea5e 100644
--- a/docs/src/docPages/api/extensions/image.md
+++ b/docs/src/docPages/api/extensions/image.md
@@ -2,10 +2,10 @@
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-image
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-image
 ```
 
diff --git a/docs/src/docPages/api/extensions/italic.md b/docs/src/docPages/api/extensions/italic.md
index b917844d1..d9e558679 100644
--- a/docs/src/docPages/api/extensions/italic.md
+++ b/docs/src/docPages/api/extensions/italic.md
@@ -9,10 +9,10 @@ The extension will generate the corresponding `<em>` HTML tags when reading cont
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-italic
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-italic
 ```
 
diff --git a/docs/src/docPages/api/extensions/link.md b/docs/src/docPages/api/extensions/link.md
index 0eb0c14f3..779a63775 100644
--- a/docs/src/docPages/api/extensions/link.md
+++ b/docs/src/docPages/api/extensions/link.md
@@ -7,10 +7,10 @@ Pasted URLs will be linked automatically.
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-link
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-link
 ```
 
diff --git a/docs/src/docPages/api/extensions/list-item.md b/docs/src/docPages/api/extensions/list-item.md
index 8a81fb385..37e9b0719 100644
--- a/docs/src/docPages/api/extensions/list-item.md
+++ b/docs/src/docPages/api/extensions/list-item.md
@@ -7,10 +7,10 @@ This extensions is intended to be used with the [`BulletList`](/api/extensions/b
 :::
 
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-list-item
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-list-item
 ```
 
diff --git a/docs/src/docPages/api/extensions/ordered-list.md b/docs/src/docPages/api/extensions/ordered-list.md
index 3e9c2fd85..c6235978b 100644
--- a/docs/src/docPages/api/extensions/ordered-list.md
+++ b/docs/src/docPages/api/extensions/ordered-list.md
@@ -9,10 +9,10 @@ The `OrderedList` extension is intended to be used with the [`ListItem`](/api/ex
 :::
 
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-ordered-list @tiptap/extension-list-item
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-ordered-list @tiptap/extension-list-item
 ```
 
diff --git a/docs/src/docPages/api/extensions/paragraph.md b/docs/src/docPages/api/extensions/paragraph.md
index feac7701c..621c61088 100644
--- a/docs/src/docPages/api/extensions/paragraph.md
+++ b/docs/src/docPages/api/extensions/paragraph.md
@@ -7,10 +7,10 @@ Tiptap 1 tried to hide that node from you, but it has always been there. You hav
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-paragraph
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-paragraph
 ```
 
diff --git a/docs/src/docPages/api/extensions/strike.md b/docs/src/docPages/api/extensions/strike.md
index 4cff00dd6..bb6660dba 100644
--- a/docs/src/docPages/api/extensions/strike.md
+++ b/docs/src/docPages/api/extensions/strike.md
@@ -9,10 +9,10 @@ The extension will generate the corresponding `<s>` HTML tags when reading conte
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-strike
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-strike
 ```
 
diff --git a/docs/src/docPages/api/extensions/text-align.md b/docs/src/docPages/api/extensions/text-align.md
index 4ebd9d234..dad00adfd 100644
--- a/docs/src/docPages/api/extensions/text-align.md
+++ b/docs/src/docPages/api/extensions/text-align.md
@@ -2,10 +2,10 @@
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-text-align
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-text-align
 ```
 
diff --git a/docs/src/docPages/api/extensions/text.md b/docs/src/docPages/api/extensions/text.md
index d6664a5fa..158c515d9 100644
--- a/docs/src/docPages/api/extensions/text.md
+++ b/docs/src/docPages/api/extensions/text.md
@@ -7,10 +7,10 @@ Tiptap 1 tried to hide that node from you, but it has always been there. You hav
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-text
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-text
 ```
 
@@ -18,4 +18,4 @@ yarn add @tiptap/extension-text
 [packages/extension-text/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-text/)
 
 ## Usage
-<demo name="Extensions/Text" highlight="12,30" />
\ No newline at end of file
+<demo name="Extensions/Text" highlight="12,30" />
diff --git a/docs/src/docPages/api/extensions/underline.md b/docs/src/docPages/api/extensions/underline.md
index 08b4616c3..fb478db38 100644
--- a/docs/src/docPages/api/extensions/underline.md
+++ b/docs/src/docPages/api/extensions/underline.md
@@ -9,10 +9,10 @@ The extension will generate the corresponding `<u>` HTML tags when reading conte
 
 ## Installation
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-underline
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-underline
 ```
 
diff --git a/docs/src/docPages/examples.md b/docs/src/docPages/examples.md
index 555e143ec..4b61ec780 100644
--- a/docs/src/docPages/examples.md
+++ b/docs/src/docPages/examples.md
@@ -1,9 +1,3 @@
 # Examples
 
-We put together a few examples to show the capabilities of tiptap, but keep in mind: tiptap is renderless and highly customizable. Everything you see can be changed, modified, combined or remixed. Feel free to copy the code to your project and change it to your liking.
-
-A few examples show what you’d probably expect from a text editor anyway: [Basic](/examples/basic), [Links](/examples/links), [History](/examples/history), [Read-only](/examples/read-only), [Export HTML or JSON](/examples/export-html-or-json).
-
-Some examples show how you can improve the user experience: [Markdown shortcuts](/examples/markdown-shortcuts).
-
-Or they show advanced use cases, like the [Collaborative editing](/examples/collaborative-editing) example, which is basically tiptap in multiplayer mode.
+TODO: This page should redirect to [/examples/basic](/examples/basic).
diff --git a/docs/src/docPages/examples/basic.md b/docs/src/docPages/examples/basic.md
index 91004db31..c33b8158a 100644
--- a/docs/src/docPages/examples/basic.md
+++ b/docs/src/docPages/examples/basic.md
@@ -1,4 +1,3 @@
 # Basic
-BUG: Headings can’t be transformed to a bullet or ordered list.
 
 <demo name="Examples/Basic" />
diff --git a/docs/src/docPages/examples/read-only.md b/docs/src/docPages/examples/read-only.md
index fea24ee54..048465a76 100644
--- a/docs/src/docPages/examples/read-only.md
+++ b/docs/src/docPages/examples/read-only.md
@@ -1,3 +1,3 @@
 # Read-only
 
-<demo name="Examples/ReadOnly" highlight="3-6,22,28,40-46" />
+<demo name="Examples/ReadOnly" highlight="3-6,22,28,41-47" />
diff --git a/docs/src/docPages/guide/build-custom-extensions.md b/docs/src/docPages/guide/build-custom-extensions.md
index aaa5d3b05..c41d63c2d 100644
--- a/docs/src/docPages/guide/build-custom-extensions.md
+++ b/docs/src/docPages/guide/build-custom-extensions.md
@@ -40,7 +40,6 @@ The extension name is used in a whole lot of places and changing it isn’t too
 The extension name is also part of the JSON. If you [store your content as JSON](http://localhost:3000/guide/store-content#option-1-json), you need to change the name in there too.
 
 ### Settings
-
 All settings can be overwritten through the extension anyway, but if you want to change the defaults, for example to provide a library on top of tiptap for other developers, you can do it like that:
 
 ```js
@@ -54,7 +53,6 @@ const CustomHeading = Heading.extend({
 ```
 
 ### Schema
-
 Tiptap works with a [strict schema](/api/schema), which configures how the content can be structured, nested, how it behaves and many more things. You can change all aspects of the schema for existing extensions. Let’s walk through a few common use cases.
 
 The default `Blockquote` extension can wrap other nodes, like headings. If you want to allow nothing but paragraphs in your blockquotes, this is how you could achieve it:
@@ -95,6 +93,9 @@ const CustomParagraph = Paragraph.extend({
 })
 ```
 
+### Attributes
+
+
 ### Keyboard shortcuts
 Most core extensions come with sensible keyboard shortcut defaults. Depending on what you want to build, you’ll likely want to change them though. With the `addKeyboardShortcuts()` method you can overwrite the predefined shortcut map:
 
diff --git a/docs/src/docPages/guide/store-content.md b/docs/src/docPages/guide/store-content.md
index 72c8b0778..7e42b9cde 100644
--- a/docs/src/docPages/guide/store-content.md
+++ b/docs/src/docPages/guide/store-content.md
@@ -85,6 +85,6 @@ Unfortunately, **tiptap doesn’t support Markdown as an input or output format*
 
 You should really consider to work with HTML or JSON to store your content, they are perfectly fine for most use cases.
 
-If you still think you need Markdown, [Nextcloud Text](https://github.com/nextcloud/text) uses tiptap to work with Markdown. Their code is open source, so maybe you can learn from them.
+If you still think you need Markdown, [Nextcloud Text](https://github.com/nextcloud/text) uses tiptap 1 to work with Markdown. Their code is open source, so maybe you can learn from them.
 
 That said, tiptap **does** support Markdown shortcuts to format your content. Try typing `**two asterisks**` to make your text bold for example.
diff --git a/docs/src/docPages/introduction.md b/docs/src/docPages/introduction.md
index 5c6afa8b0..b69aaaaf5 100644
--- a/docs/src/docPages/introduction.md
+++ b/docs/src/docPages/introduction.md
@@ -1,15 +1,17 @@
-:::warning Don’t try this at home
-This version of tiptap is not production-ready, don’t use it anywhere.
+:::error Don’t try this at home
+Nothing here is production-ready, don’t use it anywhere.
 :::
 
 # Introduction
 
-[![Version](https://img.shields.io/npm/v/@tiptap/core.svg?label=version)](https://www.npmjs.com/package/@tiptap/core)
-[![Downloads](https://img.shields.io/npm/dm/@tiptap/core.svg)](https://npmcharts.com/compare/@tiptap/core?minimal=true)
-[![License](https://img.shields.io/npm/l/@tiptap/core.svg)](https://www.npmjs.com/package/@tiptap/core)
+<!-- [![Version](https://img.shields.io/npm/v/@tiptap/core.svg?label=version)](https://www.npmjs.com/package/@tiptap/core) -->
+<!-- [![Downloads](https://img.shields.io/npm/dm/@tiptap/core.svg)](https://npmcharts.com/compare/@tiptap/core?minimal=true) -->
+<!-- [![License](https://img.shields.io/npm/l/@tiptap/core.svg)](https://www.npmjs.com/package/@tiptap/core) -->
+<!-- [![Filesize](https://img.badgesize.io/https://unpkg.com/tiptap/dist/tiptap.min.js?compression=gzip&label=size&colorB=000000)](https://www.npmjs.com/package/tiptap) -->
+<!-- [![Build Status](https://github.com/ueberdosis/tiptap-next/workflows/build/badge.svg)](https://github.com/ueberdosis/tiptap-next/actions) -->
 [![Sponsor](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub)](https://github.com/sponsors/ueberdosis)
 
-tiptap is a renderless wrapper around [ProseMirror](https://ProseMirror.net) – a toolkit for building rich-text editors that is already in use at many well-known companies such as *New York Times*, *The Guardian* or *Atlassian*.
+tiptap is a renderless 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*.
 
 Although tiptap tries to hide most of the complexity of ProseMirror, it’s built on top of its APIs and we recommend you to read through the [ProseMirror Guide](https://ProseMirror.net/docs/guide/) for advanced usage. You’ll have a better understanding of how everything works under the hood and get more familiar with many terms and jargon used by tiptap.
 
@@ -29,3 +31,6 @@ Although tiptap tries to hide most of the complexity of ProseMirror, it’s buil
 - [Directus CMS](https://directus.io)
 - [Nextcloud](https://apps.nextcloud.com/apps/text)
 - [and many more →](https://github.com/ueberdosis/tiptap/network/dependents?package_id=UGFja2FnZS0xMzE5OTg0ODc%3D)
+
+## License
+Tiptap is licensed under MIT, so you’re free to whatever you want. Anyway, we kindly ask you to [become a sponsor](https://github.com/sponsors/ueberdosis) on GitHub to fund the development, maintenance and support of tiptap.
diff --git a/docs/src/docPages/overview/contributing.md b/docs/src/docPages/overview/contributing.md
index e52253972..3f66a6d27 100644
--- a/docs/src/docPages/overview/contributing.md
+++ b/docs/src/docPages/overview/contributing.md
@@ -6,8 +6,9 @@
 Tiptap would be nothing without its lively community. Contributions have always been and will always be welcome. Here is a little bit you should know, before you send your contribution:
 
 ## Welcome examples
-* Improve the documentation, e. g. fix a typo, add a section
-* New features for existing extensions, e. g. a new option
+* Failing regression tests as bug reports
+* Documentation improvements, e. g. fix a typo, add a section
+* New features for existing extensions, e. g. a new configureable option
 * New extensions, which don’t require changes to the core or other core extensions
 * Well explained, non-breaking changes to the core
 
diff --git a/docs/src/docPages/overview/installation.md b/docs/src/docPages/overview/installation.md
index b3331e6cd..2324a3f8f 100644
--- a/docs/src/docPages/overview/installation.md
+++ b/docs/src/docPages/overview/installation.md
@@ -9,10 +9,10 @@ You’re free to use tiptap with the framework of your choice. Depending on what
 Use tiptap with vanilla JavaScript for a very lightweight and raw experience. If you feel like it, you can even use it to connect tiptap with other frameworks not mentioned here.
 
 ```bash
-# With npm
+# with npm
 npm install @tiptap/core @tiptap/starter-kit
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/core @tiptap/starter-kit
 ```
 
@@ -33,10 +33,10 @@ new Editor({
 To use tiptap with Vue.js (and tools that are based on Vue.js) install tiptap together with the Vue.js adapter in your project. We even prepared a Vue.js starter kit, which gives you a good headstart.
 
 ```bash
-# With npm
+# with npm
 npm install @tiptap/core @tiptap/vue @tiptap/vue-starter-kit
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/core @tiptap/vue @tiptap/vue-starter-kit
 ```
 
@@ -44,9 +44,10 @@ Create a new component and add the following content to get a basic version of t
 
 <demo name="Overview/Installation" />
 
-::: warning Nuxt.js
-If you use Nuxt.js, note that tiptap needs to run in the client, not on the server. It’s required to wrap the editor in a `<client-only>` tag.
-:::
+### Nuxt.js
+Note that tiptap needs to run in the client, not on the server. It’s required to wrap the editor in a `<client-only>` tag.
+
+[Read more](https://nuxtjs.org/api/components-client-only)
 
 <!-- ## Option 3: CodeSandbox
 

From b28a322d8be6282e985ac5ba4c430a9627b4943c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 14:55:48 +0100
Subject: [PATCH 033/113] add node view to task item

---
 docs/src/demos/Extensions/TaskList/index.vue  |  4 +-
 packages/core/src/ExtensionManager.ts         | 24 ++++++---
 packages/core/src/extensions/toggleList.ts    |  2 +-
 packages/core/src/types.ts                    |  3 +-
 .../core/src/utils/getRenderedAttributes.ts   |  4 +-
 packages/extension-task-item/index.ts         | 53 ++++++++++++++++++-
 6 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/docs/src/demos/Extensions/TaskList/index.vue b/docs/src/demos/Extensions/TaskList/index.vue
index bae41d95e..06d1f1beb 100644
--- a/docs/src/demos/Extensions/TaskList/index.vue
+++ b/docs/src/demos/Extensions/TaskList/index.vue
@@ -39,8 +39,8 @@ export default {
       ],
       content: `
         <ul data-type="task_list">
-          <li>A list item</li>
-          <li>And another one</li>
+          <li data-type="task_item" data-checked="true">A list item</li>
+          <li data-type="task_item" data-checked="false">And another one</li>
         </ul>
       `,
     })
diff --git a/packages/core/src/ExtensionManager.ts b/packages/core/src/ExtensionManager.ts
index 2d27f0872..23b91aace 100644
--- a/packages/core/src/ExtensionManager.ts
+++ b/packages/core/src/ExtensionManager.ts
@@ -8,6 +8,8 @@ import { Extensions, NodeViewRenderer } from './types'
 import getSchema from './utils/getSchema'
 import getSchemaTypeByName from './utils/getSchemaTypeByName'
 import splitExtensions from './utils/splitExtensions'
+import getAttributesFromExtensions from './utils/getAttributesFromExtensions'
+import getRenderedAttributes from './utils/getRenderedAttributes'
 
 export default class ExtensionManager {
 
@@ -97,14 +99,17 @@ export default class ExtensionManager {
   }
 
   get nodeViews() {
+    const { editor } = this
     const { nodeExtensions } = splitExtensions(this.extensions)
+    const allAttributes = getAttributesFromExtensions(this.extensions)
 
     return Object.fromEntries(nodeExtensions
       .filter(extension => !!extension.addNodeView)
       .map(extension => {
+        const extensionAttributes = allAttributes.filter(attribute => attribute.type === extension.name)
         const context = {
           options: extension.options,
-          editor: this.editor,
+          editor,
           type: getSchemaTypeByName(extension.name, this.schema),
         }
 
@@ -115,12 +120,17 @@ export default class ExtensionManager {
           view: EditorView,
           getPos: (() => number) | boolean,
           decorations: Decoration[],
-        ) => renderer({
-          editor: this.editor,
-          node,
-          getPos,
-          decorations,
-        })
+        ) => {
+          const attributes = getRenderedAttributes(node, extensionAttributes)
+
+          return renderer({
+            editor,
+            node,
+            getPos,
+            decorations,
+            attributes,
+          })
+        }
 
         return [extension.name, nodeview]
       }))
diff --git a/packages/core/src/extensions/toggleList.ts b/packages/core/src/extensions/toggleList.ts
index 2f7a15d32..26f97ea51 100644
--- a/packages/core/src/extensions/toggleList.ts
+++ b/packages/core/src/extensions/toggleList.ts
@@ -8,7 +8,7 @@ import getNodeType from '../utils/getNodeType'
 function isList(node: Node, schema: Schema) {
   return (node.type === schema.nodes.bullet_list
     || node.type === schema.nodes.ordered_list
-    || node.type === schema.nodes.todo_list)
+    || node.type === schema.nodes.task_list)
 }
 
 export const ToggleList = createExtension({
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index d13851064..e0f09679e 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -48,7 +48,8 @@ export type NodeViewRendererProps = {
   editor: Editor,
   node: Node,
   getPos: (() => number) | boolean,
-  decorations: Decoration[]
+  decorations: Decoration[],
+  attributes: AnyObject,
 }
 
 export type NodeViewRenderer = (props: NodeViewRendererProps) => NodeView
diff --git a/packages/core/src/utils/getRenderedAttributes.ts b/packages/core/src/utils/getRenderedAttributes.ts
index da92012d6..48fd7021c 100644
--- a/packages/core/src/utils/getRenderedAttributes.ts
+++ b/packages/core/src/utils/getRenderedAttributes.ts
@@ -1,8 +1,8 @@
 import { Node, Mark } from 'prosemirror-model'
-import { ExtensionAttribute } from '../types'
+import { ExtensionAttribute, AnyObject } from '../types'
 import mergeAttributes from './mergeAttributes'
 
-export default function getRenderedAttributes(nodeOrMark: Node | Mark, extensionAttributes: ExtensionAttribute[]): { [key: string]: any } {
+export default function getRenderedAttributes(nodeOrMark: Node | Mark, extensionAttributes: ExtensionAttribute[]): AnyObject {
   return extensionAttributes
     .filter(item => item.attribute.rendered)
     .map(item => {
diff --git a/packages/extension-task-item/index.ts b/packages/extension-task-item/index.ts
index 6ac329435..283296cf2 100644
--- a/packages/extension-task-item/index.ts
+++ b/packages/extension-task-item/index.ts
@@ -22,8 +22,14 @@ const TaskItem = createNode({
 
   addAttributes() {
     return {
-      done: {
+      checked: {
         default: false,
+        parseHTML: element => ({
+          checked: element.getAttribute('data-checked') === 'true',
+        }),
+        renderHTML: attributes => ({
+          'data-checked': attributes.checked,
+        }),
       },
     }
   },
@@ -42,12 +48,55 @@ const TaskItem = createNode({
   },
 
   addKeyboardShortcuts() {
-    return {
+    const shortcuts = {
       Enter: () => this.editor.splitListItem('task_item'),
+    }
+
+    if (!this.options.nested) {
+      return shortcuts
+    }
+
+    return {
+      ...shortcuts,
       Tab: () => this.editor.sinkListItem('task_item'),
       'Shift-Tab': () => this.editor.liftListItem('task_item'),
     }
   },
+
+  addNodeView() {
+    return ({ attributes, getPos, editor }) => {
+      const { view } = editor
+      const listItem = document.createElement('li')
+      const checkbox = document.createElement('input')
+      const content = document.createElement('div')
+
+      checkbox.type = 'checkbox'
+      checkbox.addEventListener('change', event => {
+        const { checked } = event.target as any
+
+        if (typeof getPos === 'function') {
+          view.dispatch(view.state.tr.setNodeMarkup(getPos(), undefined, {
+            checked,
+          }))
+        }
+      })
+
+      if (attributes['data-checked'] === true) {
+        checkbox.setAttribute('checked', 'checked')
+      }
+
+      listItem.append(checkbox, content)
+
+      Object.entries(attributes).forEach(([key, value]) => {
+        listItem.setAttribute(key, value)
+      })
+
+      return {
+        dom: listItem,
+        contentDOM: content,
+      }
+    }
+  },
 })
 
 export default TaskItem

From 4482ad00d5d631d9ed6fc0a3aeead815365527f1 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Fri, 30 Oct 2020 14:59:27 +0100
Subject: [PATCH 034/113] add content

---
 .../docPages/guide/build-custom-extensions.md | 138 +++++++++++++++++-
 1 file changed, 130 insertions(+), 8 deletions(-)

diff --git a/docs/src/docPages/guide/build-custom-extensions.md b/docs/src/docPages/guide/build-custom-extensions.md
index c41d63c2d..0bc151937 100644
--- a/docs/src/docPages/guide/build-custom-extensions.md
+++ b/docs/src/docPages/guide/build-custom-extensions.md
@@ -52,11 +52,15 @@ const CustomHeading = Heading.extend({
 })
 ```
 
-### Schema
+### Node Schema
 Tiptap works with a [strict schema](/api/schema), which configures how the content can be structured, nested, how it behaves and many more things. You can change all aspects of the schema for existing extensions. Let’s walk through a few common use cases.
 
 The default `Blockquote` extension can wrap other nodes, like headings. If you want to allow nothing but paragraphs in your blockquotes, this is how you could achieve it:
 
+
+#### Content
+> The content expression for this node, as described in the schema guide. When not given, the node does not allow any content.
+
 ```js
 // blockquotes include paragraphs only
 import Blockquote from '@tiptap/extension-blockquote'
@@ -66,10 +70,28 @@ const CustomBlockquote = Blockquote.extend({
 })
 ```
 
+#### Marks
+> The marks that are allowed inside of this node. May be a space-separated string referring to mark names or groups, "_" to explicitly allow all marks, or "" to disallow marks. When not given, nodes with inline content default to allowing all marks, other nodes default to not allowing marks.
+
+#### Group
+> The group or space-separated groups to which this node belongs, which can be referred to in the content expressions for the schema.
+
+#### Inline
+> Should be set to true for inline nodes. (Implied for text nodes.)
+
+#### Atom
+> Can be set to true to indicate that, though this isn't a leaf node, it doesn't have directly editable content and should be treated as a single unit in the view.
+
+#### Selectable
+> Controls whether nodes of this type can be selected as a node selection. Defaults to true for non-text nodes.
+
+#### Draggable
+> Determines whether nodes of this type can be dragged without being selected. Defaults to false.
+
 The schema even allows to make your nodes draggable, that’s what the `draggable` option is for, which defaults to `false`. Here is an example for draggable paragraphs:
 
 ```js
-// draggable paragraphs
+// Draggable paragraphs
 import Paragraph from '@tiptap/extension-paragraph'
 
 const CustomParagraph = Paragraph.extend({
@@ -77,6 +99,109 @@ const CustomParagraph = Paragraph.extend({
 })
 ```
 
+#### Code
+> Can be used to indicate that this node contains code, which causes some commands to behave differently.
+
+#### Defining
+> Determines whether this node is considered an important parent node during replace operations (such as paste). Non-defining (the default) nodes get dropped when their entire content is replaced, whereas defining nodes persist and wrap the inserted content. Likewise, in inserted content the defining parents of the content are preserved when possible. Typically, non-default-paragraph textblock types, and possibly list items, are marked as defining.
+
+#### Isolating
+> When enabled (default is false), the sides of nodes of this type count as boundaries that regular editing operations, like backspacing or lifting, won't cross. An example of a node that should probably have this enabled is a table cell.
+
+### Mark Schema
+#### Inclusive
+> Whether this mark should be active when the cursor is positioned at its end (or at its start when that is also the start of the parent node). Defaults to true.
+
+#### Excludes
+> Determines which other marks this mark can coexist with. Should be a space-separated strings naming other marks or groups of marks When a mark is added to a set, all marks that it excludes are removed in the process. If the set contains any mark that excludes the new mark but is not, itself, excluded by the new mark, the mark can not be added an the set. You can use the value "_" to indicate that the mark excludes all marks in the schema.
+
+> Defaults to only being exclusive with marks of the same type. You can set it to an empty string (or any string not containing the mark's own name) to allow multiple marks of a given type to coexist (as long as they have different attributes).
+
+#### Group
+> The group or space-separated groups to which this mark belongs.
+
+#### Spanning
+> Determines whether marks of this type can span multiple adjacent nodes when serialized to DOM/HTML. Defaults to true.
+
+### Attributes
+You can use attributes to store additional information in the content. Let’s say you want to extend the default paragraph extension with a color attribute to allow paragraphs to have different colors:
+
+```js
+const CustomParagraph = Paragraph.extend({
+  addAttributes() {
+    return {
+      color: {
+        default: 'pink',
+      },
+    },
+  },
+})
+
+// Result:
+// <p data-color="pink">Example Text</p>
+```
+
+That’s already enough to tell tiptap about the new attribute, and set `'pink'` as the default value. All attributes will be rendered as a data-attributes by default, and parsed as data-attributes from the content.
+
+Let’s stick with the color example and assume you’ll probably want to add an inline style to actually color the text. Add a `renderHTML` function and return the attributes that should be added to the rendered HTML. This examples adds a style attribute based on the value of color:
+
+```js
+const CustomParagraph = Paragraph.extend({
+  addAttributes() {
+    return {
+      color: {
+        default: null,
+        renderHTML: attributes => {
+          return {
+            style: `color: ${attributes.color}`,
+          }
+        },
+      },
+    }
+  },
+})
+
+// Result:
+// <p data-color="pink" style="color: pink">Example Text</p>
+```
+
+You can also control how the attribute is parsed from the HTML. Let’s say you want to store the color in an attribute called `data-my-fancy-color-attribute`. Legit, right? Anyway, here’s how you would do that:
+
+```js
+const CustomParagraph = Paragraph.extend({
+  addAttributes() {
+    return {
+      color: {
+        default: null,
+        parseHTML: element => {
+          return {
+            color: element.getAttribute('data-my-fancy-color-attribute'),
+          }
+        },
+        renderHTML: attributes => {
+          return {
+            'data-my-fancy-color-attribute': atttributes.color,
+            style: `color: ${attributes.color}`,
+          }
+        },
+      },
+    }
+  },
+})
+
+// Result:
+// <p data-my-fancy-color-attribute="pink" style="color: pink">Example Text</p>
+```
+
+### Global Attributes
+> TextAlign
+
+### Parse HTML
+> Associates DOM parser information with this mark (see the corresponding node spec field). The mark field in the rules is implied.
+
+### Render HTML
+> Defines the default way marks of this type should be serialized to DOM/HTML. When the resulting spec contains a hole, that is where the marked content is placed. Otherwise, it is appended to the top node.
+
 ### Commands
 
 ```js
@@ -93,14 +218,11 @@ const CustomParagraph = Paragraph.extend({
 })
 ```
 
-### Attributes
-
-
 ### Keyboard shortcuts
 Most core extensions come with sensible keyboard shortcut defaults. Depending on what you want to build, you’ll likely want to change them though. With the `addKeyboardShortcuts()` method you can overwrite the predefined shortcut map:
 
 ```js
-// change the bullet list keyboard shortcut
+// Change the bullet list keyboard shortcut
 import BulletList from '@tiptap/extension-bullet-list'
 
 const CustomBulletList = BulletList.extend({
@@ -115,7 +237,7 @@ const CustomBulletList = BulletList.extend({
 ### Input rules
 
 ```js
-// use the ~single tilde~ markdown shortcut
+// Use the ~single tilde~ markdown shortcut
 import Strike from '@tiptap/extension-strike'
 import { markInputRule } from '@tiptap/core'
 
@@ -133,7 +255,7 @@ const CustomStrike = Strike.extend({
 ### Paste rules
 
 ```js
-// overwrite the underline regex for pasted text
+// Overwrite the underline regex for pasted text
 import Underline from '@tiptap/extension-underline'
 import { markPasteRule } from '@tiptap/core'
 

From 073ef2ee0df3e708b86f962344f0719f680edd20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 15:20:10 +0100
Subject: [PATCH 035/113] add optional callback functions to schema fields

---
 packages/core/src/MarkExtension.ts      |  8 +++----
 packages/core/src/NodeExtension.ts      | 20 ++++++++---------
 packages/core/src/utils/callOrReturn.ts | 17 +++++++++++++++
 packages/core/src/utils/getSchema.ts    | 29 +++++++++++++------------
 packages/extension-task-item/index.ts   |  9 +++-----
 5 files changed, 49 insertions(+), 34 deletions(-)
 create mode 100644 packages/core/src/utils/callOrReturn.ts

diff --git a/packages/core/src/MarkExtension.ts b/packages/core/src/MarkExtension.ts
index 4627b681d..da1d1f41f 100644
--- a/packages/core/src/MarkExtension.ts
+++ b/packages/core/src/MarkExtension.ts
@@ -10,22 +10,22 @@ export interface MarkExtensionSpec<Options = {}, Commands = {}> extends Overwrit
   /**
    * Inclusive
    */
-  inclusive?: MarkSpec['inclusive'],
+  inclusive?: MarkSpec['inclusive'] | ((this: { options: Options }) => MarkSpec['inclusive']),
 
   /**
    * Excludes
    */
-  excludes?: MarkSpec['excludes'],
+  excludes?: MarkSpec['excludes'] | ((this: { options: Options }) => MarkSpec['excludes']),
 
   /**
    * Group
    */
-  group?: MarkSpec['group'],
+  group?: MarkSpec['group'] | ((this: { options: Options }) => MarkSpec['group']),
 
   /**
    * Spanning
    */
-  spanning?: MarkSpec['spanning'],
+  spanning?: MarkSpec['spanning'] | ((this: { options: Options }) => MarkSpec['spanning']),
 
   /**
    * Parse HTML
diff --git a/packages/core/src/NodeExtension.ts b/packages/core/src/NodeExtension.ts
index 17d6e91d6..37e6f2fcb 100644
--- a/packages/core/src/NodeExtension.ts
+++ b/packages/core/src/NodeExtension.ts
@@ -15,52 +15,52 @@ export interface NodeExtensionSpec<Options = {}, Commands = {}> extends Overwrit
   /**
    * Content
    */
-  content?: NodeSpec['content'],
+  content?: NodeSpec['content'] | ((this: { options: Options }) => NodeSpec['content']),
 
   /**
    * Marks
    */
-  marks?: NodeSpec['marks'],
+  marks?: NodeSpec['marks'] | ((this: { options: Options }) => NodeSpec['marks']),
 
   /**
    * Group
    */
-  group?: NodeSpec['group'],
+  group?: NodeSpec['group'] | ((this: { options: Options }) => NodeSpec['group']),
 
   /**
    * Inline
    */
-  inline?: NodeSpec['inline'],
+  inline?: NodeSpec['inline'] | ((this: { options: Options }) => NodeSpec['inline']),
 
   /**
    * Atom
    */
-  atom?: NodeSpec['atom'],
+  atom?: NodeSpec['atom'] | ((this: { options: Options }) => NodeSpec['atom']),
 
   /**
    * Selectable
    */
-  selectable?: NodeSpec['selectable'],
+  selectable?: NodeSpec['selectable'] | ((this: { options: Options }) => NodeSpec['selectable']),
 
   /**
    * Draggable
    */
-  draggable?: NodeSpec['draggable'],
+  draggable?: NodeSpec['draggable'] | ((this: { options: Options }) => NodeSpec['draggable']),
 
   /**
    * Code
    */
-  code?: NodeSpec['code'],
+  code?: NodeSpec['code'] | ((this: { options: Options }) => NodeSpec['code']),
 
   /**
    * Defining
    */
-  defining?: NodeSpec['defining'],
+  defining?: NodeSpec['defining'] | ((this: { options: Options }) => NodeSpec['defining']),
 
   /**
    * Isolating
    */
-  isolating?: NodeSpec['isolating'],
+  isolating?: NodeSpec['isolating'] | ((this: { options: Options }) => NodeSpec['isolating']),
 
   /**
    * Parse HTML
diff --git a/packages/core/src/utils/callOrReturn.ts b/packages/core/src/utils/callOrReturn.ts
new file mode 100644
index 000000000..55e78e0db
--- /dev/null
+++ b/packages/core/src/utils/callOrReturn.ts
@@ -0,0 +1,17 @@
+/**
+ * Optionally calls `value` as a function.
+ * Otherwise it is returned directly.
+ * @param value Function or any value.
+ * @param context Optional context to bind to function.
+ */
+export default function callOrReturn(value: any, context?: any) {
+  if (typeof value === 'function') {
+    if (context) {
+      return value.bind(context)()
+    }
+
+    return value()
+  }
+
+  return value
+}
diff --git a/packages/core/src/utils/getSchema.ts b/packages/core/src/utils/getSchema.ts
index 817ed7a8d..1a191f50f 100644
--- a/packages/core/src/utils/getSchema.ts
+++ b/packages/core/src/utils/getSchema.ts
@@ -5,6 +5,7 @@ import getAttributesFromExtensions from './getAttributesFromExtensions'
 import getRenderedAttributes from './getRenderedAttributes'
 import isEmptyObject from './isEmptyObject'
 import injectExtensionAttributesToParseRule from './injectExtensionAttributesToParseRule'
+import callOrReturn from './callOrReturn'
 
 function cleanUpSchemaItem<T>(data: T) {
   return Object.fromEntries(Object.entries(data).filter(([key, value]) => {
@@ -25,16 +26,16 @@ export default function getSchema(extensions: Extensions): Schema {
     const extensionAttributes = allAttributes.filter(attribute => attribute.type === extension.name)
     const context = { options: extension.options }
     const schema: NodeSpec = cleanUpSchemaItem({
-      content: extension.content,
-      marks: extension.marks,
-      group: extension.group,
-      inline: extension.inline,
-      atom: extension.atom,
-      selectable: extension.selectable,
-      draggable: extension.draggable,
-      code: extension.code,
-      defining: extension.defining,
-      isolating: extension.isolating,
+      content: callOrReturn(extension.content, context),
+      marks: callOrReturn(extension.marks, context),
+      group: callOrReturn(extension.group, context),
+      inline: callOrReturn(extension.inline, context),
+      atom: callOrReturn(extension.atom, context),
+      selectable: callOrReturn(extension.selectable, context),
+      draggable: callOrReturn(extension.draggable, context),
+      code: callOrReturn(extension.code, context),
+      defining: callOrReturn(extension.defining, context),
+      isolating: callOrReturn(extension.isolating, context),
       attrs: Object.fromEntries(extensionAttributes.map(extensionAttribute => {
         return [extensionAttribute.name, { default: extensionAttribute?.attribute?.default }]
       })),
@@ -60,10 +61,10 @@ export default function getSchema(extensions: Extensions): Schema {
     const extensionAttributes = allAttributes.filter(attribute => attribute.type === extension.name)
     const context = { options: extension.options }
     const schema: MarkSpec = cleanUpSchemaItem({
-      inclusive: extension.inclusive,
-      excludes: extension.excludes,
-      group: extension.group,
-      spanning: extension.spanning,
+      inclusive: callOrReturn(extension.inclusive, context),
+      excludes: callOrReturn(extension.excludes, context),
+      group: callOrReturn(extension.group, context),
+      spanning: callOrReturn(extension.spanning, context),
       attrs: Object.fromEntries(extensionAttributes.map(extensionAttribute => {
         return [extensionAttribute.name, { default: extensionAttribute?.attribute?.default }]
       })),
diff --git a/packages/extension-task-item/index.ts b/packages/extension-task-item/index.ts
index 283296cf2..dc91de8a7 100644
--- a/packages/extension-task-item/index.ts
+++ b/packages/extension-task-item/index.ts
@@ -7,12 +7,9 @@ export interface TaskItemOptions {
 const TaskItem = createNode({
   name: 'task_item',
 
-  content: 'paragraph+',
-
-  // TODO: allow content to be a callback function
-  // content() {
-  //   return this.options.nested ? '(paragraph|todo_list)+' : 'paragraph+',
-  // },
+  content() {
+    return this.options.nested ? '(paragraph|task_list)+' : 'paragraph+'
+  },
 
   defining: true,
 

From e5e47aaa48a743c0be7784feaec69f1547bc7fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 15:46:15 +0100
Subject: [PATCH 036/113] add list option to nodes

---
 packages/core/src/NodeExtension.ts         |  6 ++++++
 packages/core/src/extensions/toggleList.ts | 16 ++++++----------
 packages/core/src/utils/isList.ts          | 13 +++++++++++++
 packages/extension-bullet-list/index.ts    |  2 ++
 packages/extension-ordered-list/index.ts   |  2 ++
 packages/extension-task-list/index.ts      |  2 ++
 6 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 packages/core/src/utils/isList.ts

diff --git a/packages/core/src/NodeExtension.ts b/packages/core/src/NodeExtension.ts
index 37e6f2fcb..cfb304d94 100644
--- a/packages/core/src/NodeExtension.ts
+++ b/packages/core/src/NodeExtension.ts
@@ -12,6 +12,11 @@ export interface NodeExtensionSpec<Options = {}, Commands = {}> extends Overwrit
    */
   topNode?: boolean,
 
+  /**
+   * List
+   */
+  list?: boolean,
+
   /**
    * Content
    */
@@ -158,6 +163,7 @@ const defaultNode: NodeExtension = {
   type: 'node',
   name: 'node',
   topNode: false,
+  list: false,
   content: null,
   marks: null,
   group: null,
diff --git a/packages/core/src/extensions/toggleList.ts b/packages/core/src/extensions/toggleList.ts
index 26f97ea51..a0bc3288a 100644
--- a/packages/core/src/extensions/toggleList.ts
+++ b/packages/core/src/extensions/toggleList.ts
@@ -1,23 +1,19 @@
 import { wrapInList, liftListItem } from 'prosemirror-schema-list'
 import { findParentNode } from 'prosemirror-utils'
-import { Node, NodeType, Schema } from 'prosemirror-model'
+import { NodeType } from 'prosemirror-model'
 import { Command } from '../Editor'
 import { createExtension } from '../Extension'
 import getNodeType from '../utils/getNodeType'
-
-function isList(node: Node, schema: Schema) {
-  return (node.type === schema.nodes.bullet_list
-    || node.type === schema.nodes.ordered_list
-    || node.type === schema.nodes.task_list)
-}
+import isList from '../utils/isList'
 
 export const ToggleList = createExtension({
   addCommands() {
     return {
       toggleList: (listTypeOrName: string | NodeType, itemTypeOrName: string | NodeType): Command => ({ tr, state, dispatch }) => {
+        const { extensions } = this.editor.options
         const listType = getNodeType(listTypeOrName, state.schema)
         const itemType = getNodeType(itemTypeOrName, state.schema)
-        const { schema, selection } = state
+        const { selection } = state
         const { $from, $to } = selection
         const range = $from.blockRange($to)
 
@@ -25,14 +21,14 @@ export const ToggleList = createExtension({
           return false
         }
 
-        const parentList = findParentNode(node => isList(node, schema))(selection)
+        const parentList = findParentNode(node => isList(node.type.name, extensions))(selection)
 
         if (range.depth >= 1 && parentList && range.depth - parentList.depth <= 1) {
           if (parentList.node.type === listType) {
             return liftListItem(itemType)(state, dispatch)
           }
 
-          if (isList(parentList.node, schema) && listType.validContent(parentList.node.content)) {
+          if (isList(parentList.node.type.name, extensions) && listType.validContent(parentList.node.content)) {
             tr.setNodeMarkup(parentList.pos, listType)
 
             return false
diff --git a/packages/core/src/utils/isList.ts b/packages/core/src/utils/isList.ts
new file mode 100644
index 000000000..3a5a23059
--- /dev/null
+++ b/packages/core/src/utils/isList.ts
@@ -0,0 +1,13 @@
+import { Extensions } from '../types'
+import splitExtensions from './splitExtensions'
+
+export default function isList(name: string, extensions: Extensions) {
+  const { nodeExtensions } = splitExtensions(extensions)
+  const extension = nodeExtensions.find(item => item.name === name)
+
+  if (!extension) {
+    return false
+  }
+
+  return extension.list
+}
diff --git a/packages/extension-bullet-list/index.ts b/packages/extension-bullet-list/index.ts
index cb949d707..d4d572463 100644
--- a/packages/extension-bullet-list/index.ts
+++ b/packages/extension-bullet-list/index.ts
@@ -4,6 +4,8 @@ import { wrappingInputRule } from 'prosemirror-inputrules'
 const BulletList = createNode({
   name: 'bullet_list',
 
+  list: true,
+
   group: 'block',
 
   content: 'list_item+',
diff --git a/packages/extension-ordered-list/index.ts b/packages/extension-ordered-list/index.ts
index 6c0aef3bb..3255ad56f 100644
--- a/packages/extension-ordered-list/index.ts
+++ b/packages/extension-ordered-list/index.ts
@@ -4,6 +4,8 @@ import { wrappingInputRule } from 'prosemirror-inputrules'
 const OrderedList = createNode({
   name: 'ordered_list',
 
+  list: true,
+
   group: 'block',
 
   content: 'list_item+',
diff --git a/packages/extension-task-list/index.ts b/packages/extension-task-list/index.ts
index 76a61da6f..28f5a3d1f 100644
--- a/packages/extension-task-list/index.ts
+++ b/packages/extension-task-list/index.ts
@@ -4,6 +4,8 @@ import { wrappingInputRule } from 'prosemirror-inputrules'
 const TaskList = createNode({
   name: 'task_list',
 
+  list: true,
+
   group: 'block',
 
   content: 'task_item+',

From b99cdcdb6fb79bded3d142e6d85f41d7766b482c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 16:06:24 +0100
Subject: [PATCH 037/113] improve default styling for node views

---
 packages/core/src/style.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/core/src/style.ts b/packages/core/src/style.ts
index ce819062b..e98e74b83 100644
--- a/packages/core/src/style.ts
+++ b/packages/core/src/style.ts
@@ -9,6 +9,14 @@ const style = `.ProseMirror {
   font-variant-ligatures: none;
 }
 
+.ProseMirror [contenteditable="false"] {
+  white-space: normal;
+}
+
+.ProseMirror [contenteditable="false"] [contenteditable="true"] {
+  white-space: pre-wrap;
+}
+
 .ProseMirror pre {
   white-space: pre-wrap;
 }

From 62149cc5b2f3b16369eb5e4e1056f48f9e2a5db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 16:06:30 +0100
Subject: [PATCH 038/113] refactoring

---
 packages/extension-bullet-list/index.ts  | 4 +++-
 packages/extension-ordered-list/index.ts | 4 +++-
 packages/extension-task-list/index.ts    | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/extension-bullet-list/index.ts b/packages/extension-bullet-list/index.ts
index d4d572463..e116ca3c3 100644
--- a/packages/extension-bullet-list/index.ts
+++ b/packages/extension-bullet-list/index.ts
@@ -1,6 +1,8 @@
 import { Command, createNode } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
+export const inputRegex = /^\s*([-+*])\s$/
+
 const BulletList = createNode({
   name: 'bullet_list',
 
@@ -36,7 +38,7 @@ const BulletList = createNode({
 
   addInputRules() {
     return [
-      wrappingInputRule(/^\s*([-+*])\s$/, this.type),
+      wrappingInputRule(inputRegex, this.type),
     ]
   },
 })
diff --git a/packages/extension-ordered-list/index.ts b/packages/extension-ordered-list/index.ts
index 3255ad56f..e9d6e4694 100644
--- a/packages/extension-ordered-list/index.ts
+++ b/packages/extension-ordered-list/index.ts
@@ -1,6 +1,8 @@
 import { Command, createNode } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
+export const inputRegex = /^(\d+)\.\s$/
+
 const OrderedList = createNode({
   name: 'ordered_list',
 
@@ -56,7 +58,7 @@ const OrderedList = createNode({
   addInputRules() {
     return [
       wrappingInputRule(
-        /^(\d+)\.\s$/,
+        inputRegex,
         this.type,
         match => ({ order: +match[1] }),
         (match, node) => node.childCount + node.attrs.order === +match[1],
diff --git a/packages/extension-task-list/index.ts b/packages/extension-task-list/index.ts
index 28f5a3d1f..cada9581a 100644
--- a/packages/extension-task-list/index.ts
+++ b/packages/extension-task-list/index.ts
@@ -1,6 +1,9 @@
 import { Command, createNode, mergeAttributes } from '@tiptap/core'
 import { wrappingInputRule } from 'prosemirror-inputrules'
 
+// TODO: add suport for [ ] and [x]
+export const inputRegex = /^\s*(\[ \])\s$/
+
 const TaskList = createNode({
   name: 'task_list',
 
@@ -33,7 +36,7 @@ const TaskList = createNode({
 
   addInputRules() {
     return [
-      wrappingInputRule(/^\s*(\[ \])\s$/, this.type),
+      wrappingInputRule(inputRegex, this.type),
     ]
   },
 })

From e7c7ea16c7c4e19541330b472c3884bde54e37fc Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Fri, 30 Oct 2020 16:13:47 +0100
Subject: [PATCH 039/113] add new example, update content

---
 docs/src/demos/Examples/Formatting/index.vue  |  97 ++++++++++++++++
 docs/src/demos/Extensions/Paragraph/index.vue |  24 +++-
 docs/src/docPages/api/extensions/document.md  |   2 +-
 docs/src/docPages/api/extensions/paragraph.md |   2 +-
 docs/src/docPages/api/extensions/text.md      |   2 +-
 docs/src/docPages/api/keyboard-shortcuts.md   |   2 +-
 docs/src/docPages/api/schema.md               |  50 +++++++++
 docs/src/docPages/examples/formatting.md      |   3 +
 .../docPages/guide/build-custom-extensions.md | 105 +++++++++---------
 docs/src/docPages/guide/create-your-editor.md |   2 +-
 docs/src/docPages/guide/custom-styling.md     |   2 +-
 docs/src/docPages/guide/getting-started.md    |   2 +-
 docs/src/docPages/introduction.md             |   6 +-
 docs/src/docPages/overview/contributing.md    |   2 +-
 docs/src/docPages/overview/upgrade-guide.md   |   2 +-
 docs/src/links.yaml                           |   2 +
 16 files changed, 236 insertions(+), 69 deletions(-)
 create mode 100644 docs/src/demos/Examples/Formatting/index.vue
 create mode 100644 docs/src/docPages/examples/formatting.md

diff --git a/docs/src/demos/Examples/Formatting/index.vue b/docs/src/demos/Examples/Formatting/index.vue
new file mode 100644
index 000000000..6dedb0e50
--- /dev/null
+++ b/docs/src/demos/Examples/Formatting/index.vue
@@ -0,0 +1,97 @@
+<template>
+  <div>
+    <div v-if="editor">
+      <button @click="editor.chain().focus().bold().run()" :class="{ 'is-active': editor.isActive('bold') }">
+        bold
+      </button>
+      <button @click="editor.chain().focus().italic().run()" :class="{ 'is-active': editor.isActive('italic') }">
+        italic
+      </button>
+      <button @click="editor.chain().focus().heading({ level: 1 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 1 }) }">
+        h1
+      </button>
+      <button @click="editor.chain().focus().heading({ level: 2 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 2 }) }">
+        h2
+      </button>
+      <button @click="editor.chain().focus().heading({ level: 3 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 3 }) }">
+        h3
+      </button>
+      <button @click="editor.chain().focus().paragraph().run()" :class="{ 'is-active': editor.isActive('paragraph') }">
+        paragraph
+      </button>
+      <button @click="editor.chain().focus().textAlign('left').run()">
+        left
+      </button>
+      <button @click="editor.chain().focus().textAlign('center').run()">
+        center
+      </button>
+      <button @click="editor.chain().focus().textAlign('right').run()">
+        right
+      </button>
+    </div>
+    <editor-content :editor="editor" />
+  </div>
+</template>
+
+<script>
+import { Editor, EditorContent } from '@tiptap/vue-starter-kit'
+import Document from '@tiptap/extension-document'
+import Paragraph from '@tiptap/extension-paragraph'
+import Text from '@tiptap/extension-text'
+import Heading from '@tiptap/extension-heading'
+import Bold from '@tiptap/extension-bold'
+import Italic from '@tiptap/extension-italic'
+import TextAlign from '@tiptap/extension-text-align'
+import HardBreak from '@tiptap/extension-hard-break'
+
+export default {
+  components: {
+    EditorContent,
+  },
+
+  data() {
+    return {
+      editor: null,
+    }
+  },
+
+  mounted() {
+    this.editor = new Editor({
+      extensions: [
+        Document(),
+        Paragraph(),
+        Text(),
+        Heading({
+          level: [1, 2, 3],
+        }),
+        Bold(),
+        Italic(),
+        TextAlign(),
+        HardBreak(),
+      ],
+      content: `
+        <h2>Cyndi Lauper – Girls Just Want to Have Fun</h2>
+        <p>I come home in the morning light
+        My mother says, “When you gonna live your life right?”
+        Oh mother dear we’re not the fortunate ones
+        And girls, they wanna have fun
+        Oh girls just want to have fun</p>
+        <p>The phone rings in the middle of the night
+        My father yells, "What you gonna do with your life?"
+        Oh daddy dear, you know you’re still number one
+        But girls, they wanna have fun
+        Oh girls just want to have</p>
+        <p>That’s all they really want
+        Some fun
+        When the working day is done
+        Oh girls, they wanna have fun
+        Oh girls just wanna have fun (girls, they wanna, wanna have fun, girls wanna have)</p>
+      `,
+    })
+  },
+
+  beforeDestroy() {
+    this.editor.destroy()
+  },
+}
+</script>
diff --git a/docs/src/demos/Extensions/Paragraph/index.vue b/docs/src/demos/Extensions/Paragraph/index.vue
index 971711b89..104683a1d 100644
--- a/docs/src/demos/Extensions/Paragraph/index.vue
+++ b/docs/src/demos/Extensions/Paragraph/index.vue
@@ -11,6 +11,26 @@ import Document from '@tiptap/extension-document'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
 
+const CustomParagraph = Paragraph.extend({
+  addAttributes() {
+    return {
+      color: {
+        default: null,
+        parseHTML: element => {
+          return {
+            color: element.getAttribute('data-color'),
+          }
+        },
+        renderHTML: attributes => {
+          return {
+            style: `color: ${attributes.color}`,
+          }
+        },
+      },
+    }
+  },
+})
+
 export default {
   components: {
     EditorContent,
@@ -26,11 +46,11 @@ export default {
     this.editor = new Editor({
       extensions: [
         Document(),
-        Paragraph(),
+        CustomParagraph(),
         Text(),
       ],
       content: `
-        <p>The Paragraph extension is not required, but it’s very likely you want to use it. It’s needed to write paragraphs of text. 🤓</p>
+        <p data-color="blue">The Paragraph extension is not required, but it’s very likely you want to use it. It’s needed to write paragraphs of text. 🤓</p>
       `,
     })
   },
diff --git a/docs/src/docPages/api/extensions/document.md b/docs/src/docPages/api/extensions/document.md
index 6199533d3..6e269e619 100644
--- a/docs/src/docPages/api/extensions/document.md
+++ b/docs/src/docPages/api/extensions/document.md
@@ -4,7 +4,7 @@
 The node is very tiny though. It defines a name of the node (`document`), is configured to be a top node (`topNode: true`) and that it can contain multiple other nodes (`block`). That’s all. But have a look yourself:
 
 :::warning Breaking Change from 1.x → 2.x
-Tiptap 1 tried to hide that node from you, but it has always been there. A tiny, but important change though: **We renamed the default type from `doc` to `document`.** To keep it like that, use your own implementation of the `Document` node or migrate the stored JSON to use the new name.
+tiptap 1 tried to hide that node from you, but it has always been there. A tiny, but important change though: **We renamed the default type from `doc` to `document`.** To keep it like that, use your own implementation of the `Document` node or migrate the stored JSON to use the new name.
 :::
 
 ## Installation
diff --git a/docs/src/docPages/api/extensions/paragraph.md b/docs/src/docPages/api/extensions/paragraph.md
index 621c61088..7cae8a4cf 100644
--- a/docs/src/docPages/api/extensions/paragraph.md
+++ b/docs/src/docPages/api/extensions/paragraph.md
@@ -2,7 +2,7 @@
 Yes, the schema is very strict. Without this extension you won’t even be able to use paragraphs in the editor.
 
 :::warning Breaking Change from 1.x → 2.x
-Tiptap 1 tried to hide that node from you, but it has always been there. You have to explicitly import it from now on (or use `defaultExtensions()`).
+tiptap 1 tried to hide that node from you, but it has always been there. You have to explicitly import it from now on (or use `defaultExtensions()`).
 :::
 
 ## Installation
diff --git a/docs/src/docPages/api/extensions/text.md b/docs/src/docPages/api/extensions/text.md
index 158c515d9..5502739be 100644
--- a/docs/src/docPages/api/extensions/text.md
+++ b/docs/src/docPages/api/extensions/text.md
@@ -2,7 +2,7 @@
 **The `Text` extension is required**, at least if you want to work with text of any kind and that’s very likely. This extension is a little bit different, it doesn’t even render HTML. It’s plain text, that’s all.
 
 :::warning Breaking Change from 1.x → 2.x
-Tiptap 1 tried to hide that node from you, but it has always been there. You have to explicitly import it from now on (or use `defaultExtensions()`).
+tiptap 1 tried to hide that node from you, but it has always been there. You have to explicitly import it from now on (or use `defaultExtensions()`).
 :::
 
 ## Installation
diff --git a/docs/src/docPages/api/keyboard-shortcuts.md b/docs/src/docPages/api/keyboard-shortcuts.md
index ef795cb04..b1b7afce5 100644
--- a/docs/src/docPages/api/keyboard-shortcuts.md
+++ b/docs/src/docPages/api/keyboard-shortcuts.md
@@ -3,7 +3,7 @@
 ## toc
 
 ## Introduction
-Tiptap comes with sensible keyboard shortcut defaults. Depending on what you want to use it for, you’ll probably want to change those keyboard shortcuts to your liking. Let’s have a look at what we defined for you, and show you how to change it then!
+tiptap comes with sensible keyboard shortcut defaults. Depending on what you want to use it for, you’ll probably want to change those keyboard shortcuts to your liking. Let’s have a look at what we defined for you, and show you how to change it then!
 
 ## Predefined keyboard shortcuts
 Most of the core extensions register their own keyboard shortcuts. Depending on what set of extension you use, not all of the below listed keyboard shortcuts work for your editor.
diff --git a/docs/src/docPages/api/schema.md b/docs/src/docPages/api/schema.md
index 6db220209..b41af9bc0 100644
--- a/docs/src/docPages/api/schema.md
+++ b/docs/src/docPages/api/schema.md
@@ -141,3 +141,53 @@ We needed to do the same thing in PHP at some point, so we published libraries t
 * [ueberdosis/prosemirror-php](https://github.com/ueberdosis/prosemirror-php) (PHP)
 * [ueberdosis/prosemirror-to-html](https://github.com/ueberdosis/prosemirror-to-html) (PHP)
 * [ueberdosis/html-to-prosemirror](https://github.com/ueberdosis/html-to-prosemirror) (PHP)
+
+
+### Node Schema
+
+
+#### Content
+> The content expression for this node, as described in the schema guide. When not given, the node does not allow any content.
+
+
+#### Marks
+> The marks that are allowed inside of this node. May be a space-separated string referring to mark names or groups, "_" to explicitly allow all marks, or "" to disallow marks. When not given, nodes with inline content default to allowing all marks, other nodes default to not allowing marks.
+
+#### Group
+> The group or space-separated groups to which this node belongs, which can be referred to in the content expressions for the schema.
+
+#### Inline
+> Should be set to true for inline nodes. (Implied for text nodes.)
+
+#### Atom
+> Can be set to true to indicate that, though this isn't a leaf node, it doesn't have directly editable content and should be treated as a single unit in the view.
+
+#### Selectable
+> Controls whether nodes of this type can be selected as a node selection. Defaults to true for non-text nodes.
+
+#### Draggable
+> Determines whether nodes of this type can be dragged without being selected. Defaults to false.
+
+#### Code
+> Can be used to indicate that this node contains code, which causes some commands to behave differently.
+
+#### Defining
+> Determines whether this node is considered an important parent node during replace operations (such as paste). Non-defining (the default) nodes get dropped when their entire content is replaced, whereas defining nodes persist and wrap the inserted content. Likewise, in inserted content the defining parents of the content are preserved when possible. Typically, non-default-paragraph textblock types, and possibly list items, are marked as defining.
+
+#### Isolating
+> When enabled (default is false), the sides of nodes of this type count as boundaries that regular editing operations, like backspacing or lifting, won't cross. An example of a node that should probably have this enabled is a table cell.
+
+### Mark Schema
+#### Inclusive
+> Whether this mark should be active when the cursor is positioned at its end (or at its start when that is also the start of the parent node). Defaults to true.
+
+#### Excludes
+> Determines which other marks this mark can coexist with. Should be a space-separated strings naming other marks or groups of marks When a mark is added to a set, all marks that it excludes are removed in the process. If the set contains any mark that excludes the new mark but is not, itself, excluded by the new mark, the mark can not be added an the set. You can use the value "_" to indicate that the mark excludes all marks in the schema.
+
+> Defaults to only being exclusive with marks of the same type. You can set it to an empty string (or any string not containing the mark's own name) to allow multiple marks of a given type to coexist (as long as they have different attributes).
+
+#### Group
+> The group or space-separated groups to which this mark belongs.
+
+#### Spanning
+> Determines whether marks of this type can span multiple adjacent nodes when serialized to DOM/HTML. Defaults to true.
diff --git a/docs/src/docPages/examples/formatting.md b/docs/src/docPages/examples/formatting.md
new file mode 100644
index 000000000..e6e0f8ce2
--- /dev/null
+++ b/docs/src/docPages/examples/formatting.md
@@ -0,0 +1,3 @@
+# Formatting
+
+<demo name="Examples/Formatting" />
diff --git a/docs/src/docPages/guide/build-custom-extensions.md b/docs/src/docPages/guide/build-custom-extensions.md
index 0bc151937..3fe9ce920 100644
--- a/docs/src/docPages/guide/build-custom-extensions.md
+++ b/docs/src/docPages/guide/build-custom-extensions.md
@@ -35,12 +35,12 @@ new Editor({
 The same applies to every aspect of an existing extension, except to the name. Let’s look at all the things that you can change through the extend method. We focus on one aspect in every example, but you can combine all those examples and change multiple aspects in one `extend()` call too.
 
 ### Name
-The extension name is used in a whole lot of places and changing it isn’t too easy. If you want to change the name of an extension, it’s recommended to copy the whole extension and change the name in all occurrences.
+The extension name is used in a whole lot of places and changing it isn’t too easy. If you want to change the name of an existing extension, we would recommended to copy the whole extension and change the name in all occurrences.
 
-The extension name is also part of the JSON. If you [store your content as JSON](http://localhost:3000/guide/store-content#option-1-json), you need to change the name in there too.
+The extension name is also part of the JSON. If you [store your content as JSON](/guide/store-content#option-1-json), you need to change the name there too.
 
 ### Settings
-All settings can be overwritten through the extension anyway, but if you want to change the defaults, for example to provide a library on top of tiptap for other developers, you can do it like that:
+All settings can be configured through the extension anyway, but if you want to change the default settings, for example to provide a library on top of tiptap for other developers, you can do it like that:
 
 ```js
 import Heading from '@tiptap/extension-heading'
@@ -52,17 +52,13 @@ const CustomHeading = Heading.extend({
 })
 ```
 
-### Node Schema
-Tiptap works with a [strict schema](/api/schema), which configures how the content can be structured, nested, how it behaves and many more things. You can change all aspects of the schema for existing extensions. Let’s walk through a few common use cases.
+### Schema
+tiptap works with a strict schema, which configures how the content can be structured, nested, how it behaves and many more things. You [can change all aspects of the schema](/api/schema) for existing extensions. Let’s walk through a few common use cases.
 
 The default `Blockquote` extension can wrap other nodes, like headings. If you want to allow nothing but paragraphs in your blockquotes, this is how you could achieve it:
 
-
-#### Content
-> The content expression for this node, as described in the schema guide. When not given, the node does not allow any content.
-
 ```js
-// blockquotes include paragraphs only
+// Blockquotes must only include paragraphs
 import Blockquote from '@tiptap/extension-blockquote'
 
 const CustomBlockquote = Blockquote.extend({
@@ -70,25 +66,7 @@ const CustomBlockquote = Blockquote.extend({
 })
 ```
 
-#### Marks
-> The marks that are allowed inside of this node. May be a space-separated string referring to mark names or groups, "_" to explicitly allow all marks, or "" to disallow marks. When not given, nodes with inline content default to allowing all marks, other nodes default to not allowing marks.
-
-#### Group
-> The group or space-separated groups to which this node belongs, which can be referred to in the content expressions for the schema.
-
-#### Inline
-> Should be set to true for inline nodes. (Implied for text nodes.)
-
-#### Atom
-> Can be set to true to indicate that, though this isn't a leaf node, it doesn't have directly editable content and should be treated as a single unit in the view.
-
-#### Selectable
-> Controls whether nodes of this type can be selected as a node selection. Defaults to true for non-text nodes.
-
-#### Draggable
-> Determines whether nodes of this type can be dragged without being selected. Defaults to false.
-
-The schema even allows to make your nodes draggable, that’s what the `draggable` option is for, which defaults to `false`. Here is an example for draggable paragraphs:
+The schema even allows to make your nodes draggable, that’s what the `draggable` option is for, which defaults to `false`.
 
 ```js
 // Draggable paragraphs
@@ -99,36 +77,15 @@ const CustomParagraph = Paragraph.extend({
 })
 ```
 
-#### Code
-> Can be used to indicate that this node contains code, which causes some commands to behave differently.
-
-#### Defining
-> Determines whether this node is considered an important parent node during replace operations (such as paste). Non-defining (the default) nodes get dropped when their entire content is replaced, whereas defining nodes persist and wrap the inserted content. Likewise, in inserted content the defining parents of the content are preserved when possible. Typically, non-default-paragraph textblock types, and possibly list items, are marked as defining.
-
-#### Isolating
-> When enabled (default is false), the sides of nodes of this type count as boundaries that regular editing operations, like backspacing or lifting, won't cross. An example of a node that should probably have this enabled is a table cell.
-
-### Mark Schema
-#### Inclusive
-> Whether this mark should be active when the cursor is positioned at its end (or at its start when that is also the start of the parent node). Defaults to true.
-
-#### Excludes
-> Determines which other marks this mark can coexist with. Should be a space-separated strings naming other marks or groups of marks When a mark is added to a set, all marks that it excludes are removed in the process. If the set contains any mark that excludes the new mark but is not, itself, excluded by the new mark, the mark can not be added an the set. You can use the value "_" to indicate that the mark excludes all marks in the schema.
-
-> Defaults to only being exclusive with marks of the same type. You can set it to an empty string (or any string not containing the mark's own name) to allow multiple marks of a given type to coexist (as long as they have different attributes).
-
-#### Group
-> The group or space-separated groups to which this mark belongs.
-
-#### Spanning
-> Determines whether marks of this type can span multiple adjacent nodes when serialized to DOM/HTML. Defaults to true.
+That’s just two tiny examples, but [the underlying ProseMirror schema](https://prosemirror.net/docs/ref/#model.SchemaSpec) is really powerful. You should definitely read the documentation to understand all the nifty details.
 
 ### Attributes
-You can use attributes to store additional information in the content. Let’s say you want to extend the default paragraph extension with a color attribute to allow paragraphs to have different colors:
+You can use attributes to store additional information in the content. Let’s say you want to extend the default paragraph extension to enable paragraphs to have different colors:
 
 ```js
 const CustomParagraph = Paragraph.extend({
   addAttributes() {
+    // Return an object with attribute configuration
     return {
       color: {
         default: 'pink',
@@ -143,7 +100,9 @@ const CustomParagraph = Paragraph.extend({
 
 That’s already enough to tell tiptap about the new attribute, and set `'pink'` as the default value. All attributes will be rendered as a data-attributes by default, and parsed as data-attributes from the content.
 
-Let’s stick with the color example and assume you’ll probably want to add an inline style to actually color the text. Add a `renderHTML` function and return the attributes that should be added to the rendered HTML. This examples adds a style attribute based on the value of color:
+Let’s stick with the color example and assume you’ll want to add an inline style to actually color the text. With the `renderHTML` function you can return HTML attributes which will be rendered in the output.
+
+This examples adds a style HTML attribute based on the value of color:
 
 ```js
 const CustomParagraph = Paragraph.extend({
@@ -151,7 +110,9 @@ const CustomParagraph = Paragraph.extend({
     return {
       color: {
         default: null,
+        // Take the attribute values
         renderHTML: attributes => {
+          // … and return an object with HTML attributes.
           return {
             style: `color: ${attributes.color}`,
           }
@@ -173,11 +134,13 @@ const CustomParagraph = Paragraph.extend({
     return {
       color: {
         default: null,
+        // Customize the HTML parsing (for example, to load the initial content)
         parseHTML: element => {
           return {
             color: element.getAttribute('data-my-fancy-color-attribute'),
           }
         },
+        // … and customize the HTML rendering.
         renderHTML: attributes => {
           return {
             'data-my-fancy-color-attribute': atttributes.color,
@@ -194,7 +157,39 @@ const CustomParagraph = Paragraph.extend({
 ```
 
 ### Global Attributes
-> TextAlign
+Attributes can be applied to multiple extensions at once. That’s useful for text alignment, line height, color, font family, and other styling related attributes.
+
+Take a closer look at the full source code of the [`TextAlign`](/api/extensions/text-align) extension to see a more complex example. But here is how it works in a nutshell:
+
+```js
+import { createExtension } from '@tiptap/core'
+
+const TextAlign = createExtension({
+  addGlobalAttributes() {
+    return [
+      {
+        // Extend the following extensions
+        types: [
+          'heading',
+          'paragraph',
+        ],
+        // … with those attributes
+        attributes: {
+          textAlign: {
+            default: 'left',
+            renderHTML: attributes => ({
+              style: `text-align: ${attributes.textAlign}`,
+            }),
+            parseHTML: element => ({
+              textAlign: element.style.textAlign || 'left',
+            }),
+          },
+        },
+      },
+    ]
+  },
+})
+```
 
 ### Parse HTML
 > Associates DOM parser information with this mark (see the corresponding node spec field). The mark field in the rules is implied.
diff --git a/docs/src/docPages/guide/create-your-editor.md b/docs/src/docPages/guide/create-your-editor.md
index f688551a2..1977a0eed 100644
--- a/docs/src/docPages/guide/create-your-editor.md
+++ b/docs/src/docPages/guide/create-your-editor.md
@@ -18,7 +18,7 @@ You might wonder what features tiptap supports out of the box. In the above exam
 * [List of available commands](/api/commands)
 
 ## Configure extensions
-You are free to choose which parts of tiptap you want to use. Tiptap has support for different nodes (paragraphs, blockquotes, tables and many more) and different marks (bold, italic, links). If you want to explicitly configure what kind of nodes and marks are allowed and which are not allowed, you can configure those.
+You are free to choose which parts of tiptap you want to use. tiptap has support for different nodes (paragraphs, blockquotes, tables and many more) and different marks (bold, italic, links). If you want to explicitly configure what kind of nodes and marks are allowed and which are not allowed, you can configure those.
 
 Note that `Document`, `Paragraph` and `Text` are required. Otherwise you won’t be able to add any plain text.
 
diff --git a/docs/src/docPages/guide/custom-styling.md b/docs/src/docPages/guide/custom-styling.md
index 596cb451b..5fdf2c942 100644
--- a/docs/src/docPages/guide/custom-styling.md
+++ b/docs/src/docPages/guide/custom-styling.md
@@ -3,7 +3,7 @@
 ## toc
 
 ## Introduction
-Tiptap is renderless, that doesn’t mean there is no styling provided. You can decided how your editor should look like.
+tiptap is renderless, that doesn’t mean there is no styling provided. You can decided how your editor should look like.
 
 ## Option 1: Style the plain HTML
 The whole editor is rendered inside of a container with the class `.ProseMirror`. You can use that to scope your styling to the editor content:
diff --git a/docs/src/docPages/guide/getting-started.md b/docs/src/docPages/guide/getting-started.md
index 62e6ab187..2ebbd29ff 100644
--- a/docs/src/docPages/guide/getting-started.md
+++ b/docs/src/docPages/guide/getting-started.md
@@ -19,7 +19,7 @@ yarn add @tiptap/vue @tiptap/vue-starter-kit
 The `@tiptap/vue-starter-kit` includes a few basics you would probably need anyway. Cool, you have got everything in place to set up tiptap! 🙌
 
 ## 2. Create a new component
-Create a new Vue component (you can call it `<Tiptap />`) and add the following content. This is the fastest way to get tiptap up and running with Vue.js. It will give you a very basic version of tiptap, without any buttons. No worries, you will be able to add more functionality soon.
+Create a new Vue component (you can call it `<tiptap />`) and add the following content. This is the fastest way to get tiptap up and running with Vue.js. It will give you a very basic version of tiptap, without any buttons. No worries, you will be able to add more functionality soon.
 
 <demo name="Guide/GettingStarted" />
 
diff --git a/docs/src/docPages/introduction.md b/docs/src/docPages/introduction.md
index b69aaaaf5..b8a3280b7 100644
--- a/docs/src/docPages/introduction.md
+++ b/docs/src/docPages/introduction.md
@@ -19,9 +19,9 @@ Although tiptap tries to hide most of the complexity of ProseMirror, it’s buil
 
 **Renderless.** We don’t tell you what a menu should look like or where it should be rendered in the DOM. That’s why tiptap is renderless and comes without any CSS. You are in full control over markup and styling.
 
-**Framework-agnostic.** We don’t care what framework you use. Tiptap is ready to be used with plain JavaScript or Vue.js. That makes it even possible to write a renderer for React, Svelte and others.
+**Framework-agnostic.** We don’t care what framework you use. tiptap is ready to be used with plain JavaScript or Vue.js. That makes it even possible to write a renderer for React, Svelte and others.
 
-**TypeScript.** Tiptap 2 is written in TypeScript. That gives you a nice autocomplete for the API (if your IDE supports that), helps to find bugs early and makes it possible to generate [a complete API documentation](#) on top of the extensive human written documentation.
+**TypeScript.** tiptap 2 is written in TypeScript. That gives you a nice autocomplete for the API (if your IDE supports that), helps to find bugs early and makes it possible to generate [a complete API documentation](#) on top of the extensive human written documentation.
 
 ## Who uses tiptap?
 - [GitLab](https://gitlab.com)
@@ -33,4 +33,4 @@ Although tiptap tries to hide most of the complexity of ProseMirror, it’s buil
 - [and many more →](https://github.com/ueberdosis/tiptap/network/dependents?package_id=UGFja2FnZS0xMzE5OTg0ODc%3D)
 
 ## License
-Tiptap is licensed under MIT, so you’re free to whatever you want. Anyway, we kindly ask you to [become a sponsor](https://github.com/sponsors/ueberdosis) on GitHub to fund the development, maintenance and support of tiptap.
+tiptap is licensed under MIT, so you’re free to whatever you want. Anyway, we kindly ask you to [become a sponsor](https://github.com/sponsors/ueberdosis) on GitHub to fund the development, maintenance and support of tiptap.
diff --git a/docs/src/docPages/overview/contributing.md b/docs/src/docPages/overview/contributing.md
index 3f66a6d27..f28771ea2 100644
--- a/docs/src/docPages/overview/contributing.md
+++ b/docs/src/docPages/overview/contributing.md
@@ -3,7 +3,7 @@
 ## toc
 
 ## Introduction
-Tiptap would be nothing without its lively community. Contributions have always been and will always be welcome. Here is a little bit you should know, before you send your contribution:
+tiptap would be nothing without its lively community. Contributions have always been and will always be welcome. Here is a little bit you should know, before you send your contribution:
 
 ## Welcome examples
 * Failing regression tests as bug reports
diff --git a/docs/src/docPages/overview/upgrade-guide.md b/docs/src/docPages/overview/upgrade-guide.md
index 297c77abb..49157057e 100644
--- a/docs/src/docPages/overview/upgrade-guide.md
+++ b/docs/src/docPages/overview/upgrade-guide.md
@@ -18,7 +18,7 @@ The new API will look pretty familiar too you, but there are a ton of changes th
 …
 
 ### Explicitly register the Document, Text and Paragraph extensions
-Tiptap 1 tried to hide a few required extensions from you with the default setting `useBuiltInExtensions: true`. That setting has been removed and you’re required to import all extensions. Be sure to explicitly import at least the [Document](/api/extensions/document), [Paragraph](/api/extensions/paragraph) and [Text](/api/extensions/text) extensions.
+tiptap 1 tried to hide a few required extensions from you with the default setting `useBuiltInExtensions: true`. That setting has been removed and you’re required to import all extensions. Be sure to explicitly import at least the [Document](/api/extensions/document), [Paragraph](/api/extensions/paragraph) and [Text](/api/extensions/text) extensions.
 
 ```js
 import Document from '@tiptap/extension-document'
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index f5a3d9130..94fc555c2 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -24,6 +24,8 @@
         # - title: Floating Menu
         #   link: /examples/floating-menu
         #   draft: true
+        - title: Formatting
+          link: /examples/formatting
         - title: Links
           link: /examples/links
         # - title: Images

From 88f09479450a376ee49dc2a0b7b4ebc36792d07b Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Fri, 30 Oct 2020 16:19:46 +0100
Subject: [PATCH 040/113] add link

---
 docs/src/docPages/guide/build-custom-extensions.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/docPages/guide/build-custom-extensions.md b/docs/src/docPages/guide/build-custom-extensions.md
index 3fe9ce920..47d4a5f89 100644
--- a/docs/src/docPages/guide/build-custom-extensions.md
+++ b/docs/src/docPages/guide/build-custom-extensions.md
@@ -159,7 +159,7 @@ const CustomParagraph = Paragraph.extend({
 ### Global Attributes
 Attributes can be applied to multiple extensions at once. That’s useful for text alignment, line height, color, font family, and other styling related attributes.
 
-Take a closer look at the full source code of the [`TextAlign`](/api/extensions/text-align) extension to see a more complex example. But here is how it works in a nutshell:
+Take a closer look at [the full source code](https://github.com/ueberdosis/tiptap-next/tree/main/packages/extension-text-align) of the [`TextAlign`](/api/extensions/text-align) extension to see a more complex example. But here is how it works in a nutshell:
 
 ```js
 import { createExtension } from '@tiptap/core'

From a8216d08407fc529c76baea40da48efa2df11763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 16:51:25 +0100
Subject: [PATCH 041/113] move inputrule from task_list to task_item

---
 packages/extension-task-item/index.ts | 15 +++++++++++++++
 packages/extension-task-list/index.ts | 10 ----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/packages/extension-task-item/index.ts b/packages/extension-task-item/index.ts
index dc91de8a7..ac64dcebf 100644
--- a/packages/extension-task-item/index.ts
+++ b/packages/extension-task-item/index.ts
@@ -1,4 +1,7 @@
 import { createNode, mergeAttributes } from '@tiptap/core'
+import { wrappingInputRule } from 'prosemirror-inputrules'
+
+export const inputRegex = /^\s*(\[([ |x])\])\s$/
 
 export interface TaskItemOptions {
   nested: boolean,
@@ -94,6 +97,18 @@ const TaskItem = createNode({
       }
     }
   },
+
+  addInputRules() {
+    return [
+      wrappingInputRule(
+        inputRegex,
+        this.type,
+        match => ({
+          checked: match[match.length - 1] === 'x',
+        }),
+      ),
+    ]
+  },
 })
 
 export default TaskItem
diff --git a/packages/extension-task-list/index.ts b/packages/extension-task-list/index.ts
index cada9581a..bd73d1e23 100644
--- a/packages/extension-task-list/index.ts
+++ b/packages/extension-task-list/index.ts
@@ -1,8 +1,4 @@
 import { Command, createNode, mergeAttributes } from '@tiptap/core'
-import { wrappingInputRule } from 'prosemirror-inputrules'
-
-// TODO: add suport for [ ] and [x]
-export const inputRegex = /^\s*(\[ \])\s$/
 
 const TaskList = createNode({
   name: 'task_list',
@@ -33,12 +29,6 @@ const TaskList = createNode({
       },
     }
   },
-
-  addInputRules() {
-    return [
-      wrappingInputRule(inputRegex, this.type),
-    ]
-  },
 })
 
 export default TaskList

From 3e3dd26ca59578fcf825f5142dc518c773bdf1ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 16:57:55 +0100
Subject: [PATCH 042/113] add inline option to image node

---
 docs/src/docPages/api/extensions/image.md |  7 ++++++-
 packages/extension-image/index.ts         | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/docs/src/docPages/api/extensions/image.md b/docs/src/docPages/api/extensions/image.md
index 3c463ea5e..1c3c9132b 100644
--- a/docs/src/docPages/api/extensions/image.md
+++ b/docs/src/docPages/api/extensions/image.md
@@ -9,8 +9,13 @@ npm install @tiptap/extension-image
 yarn add @tiptap/extension-image
 ```
 
+## Settings
+| Option | Type    | Default | Description              |
+| ------ | ------- | ------- | ------------------------ |
+| inline | boolean | false   | Renders the node inline. |
+
 ## Source code
 [packages/extension-image/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-image/)
 
 ## Usage
-<demo name="Extensions/Image" highlight="12,30" />
+<demo name="Extensions/Image" />
diff --git a/packages/extension-image/index.ts b/packages/extension-image/index.ts
index 424cffc5f..67e9c04aa 100644
--- a/packages/extension-image/index.ts
+++ b/packages/extension-image/index.ts
@@ -1,13 +1,25 @@
 import { Command, createNode, nodeInputRule } from '@tiptap/core'
 
+export interface ImageOptions {
+  inline: boolean,
+}
+
 export const inputRegex = /!\[(.+|:?)]\((\S+)(?:(?:\s+)["'](\S+)["'])?\)/
 
 const Image = createNode({
   name: 'image',
 
-  inline: true,
+  defaultOptions: <ImageOptions>{
+    inline: false,
+  },
 
-  group: 'inline',
+  inline() {
+    return this.options.inline
+  },
+
+  group() {
+    return this.options.inline ? 'inline' : 'block'
+  },
 
   draggable: true,
 

From 9a6a2b0c89c4f49973acdf4a88a94c6ee0cb2d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 17:00:38 +0100
Subject: [PATCH 043/113] improve code styling

---
 docs/src/templates/DocPage/style.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss
index e4ced33e8..caf489475 100644
--- a/docs/src/templates/DocPage/style.scss
+++ b/docs/src/templates/DocPage/style.scss
@@ -95,6 +95,10 @@
     > table a,
     > .remark-container a {
       text-decoration: underline;
+
+      code {
+        text-decoration: underline;
+      }
     }
 
     #toc {

From 8f37817a42ebaace4d954878b78f5da3070ed030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 17:01:54 +0100
Subject: [PATCH 044/113] fix linting

---
 packages/vue/src/VueRenderer.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/vue/src/VueRenderer.ts b/packages/vue/src/VueRenderer.ts
index 9bfd525c8..60ba426c4 100644
--- a/packages/vue/src/VueRenderer.ts
+++ b/packages/vue/src/VueRenderer.ts
@@ -8,8 +8,10 @@ class VueNodeView implements NodeView {
   vm!: Vue
 
   constructor(component: Vue | VueConstructor, props: NodeViewRendererProps) {
-    // const { node, editor, getPos } = props
-    // const { view } = editor
+    // eslint-disable-next-line
+    const { node, editor, getPos } = props
+    // eslint-disable-next-line
+    const { view } = editor
 
     this.mount(component)
   }

From cc3dcf1c29b55d8f32e19a6f7bfee1979a0a3e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 17:12:28 +0100
Subject: [PATCH 045/113] fix tests

---
 docs/src/demos/Extensions/Paragraph/index.vue | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/docs/src/demos/Extensions/Paragraph/index.vue b/docs/src/demos/Extensions/Paragraph/index.vue
index 104683a1d..971711b89 100644
--- a/docs/src/demos/Extensions/Paragraph/index.vue
+++ b/docs/src/demos/Extensions/Paragraph/index.vue
@@ -11,26 +11,6 @@ import Document from '@tiptap/extension-document'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
 
-const CustomParagraph = Paragraph.extend({
-  addAttributes() {
-    return {
-      color: {
-        default: null,
-        parseHTML: element => {
-          return {
-            color: element.getAttribute('data-color'),
-          }
-        },
-        renderHTML: attributes => {
-          return {
-            style: `color: ${attributes.color}`,
-          }
-        },
-      },
-    }
-  },
-})
-
 export default {
   components: {
     EditorContent,
@@ -46,11 +26,11 @@ export default {
     this.editor = new Editor({
       extensions: [
         Document(),
-        CustomParagraph(),
+        Paragraph(),
         Text(),
       ],
       content: `
-        <p data-color="blue">The Paragraph extension is not required, but it’s very likely you want to use it. It’s needed to write paragraphs of text. 🤓</p>
+        <p>The Paragraph extension is not required, but it’s very likely you want to use it. It’s needed to write paragraphs of text. 🤓</p>
       `,
     })
   },

From 2450576cf5aabceeb6abc0ff318252e319d0b750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 17:21:02 +0100
Subject: [PATCH 046/113] typo

---
 docs/src/docPages/api/extensions/task-list.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/src/docPages/api/extensions/task-list.md b/docs/src/docPages/api/extensions/task-list.md
index 3cc62c655..44b8d962f 100644
--- a/docs/src/docPages/api/extensions/task-list.md
+++ b/docs/src/docPages/api/extensions/task-list.md
@@ -20,9 +20,9 @@ yarn add @tiptap/extension-task-list @tiptap/extension-task-item
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
 ## Commands
-| Command     | Options | Description           |
-| ----------- | ------- | --------------------- |
-| task_list | —       | Toggle a task list. |
+| Command  | Options | Description         |
+| -------- | ------- | ------------------- |
+| taskList | —       | Toggle a task list. |
 
 ## Source code
 [packages/extension-task-list/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-task-list/)

From a56f396e02a275a8e9c2a2ae4feb79af7e145216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 17:21:20 +0100
Subject: [PATCH 047/113] add basic styling to task list

---
 docs/src/demos/Extensions/TaskList/index.vue | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/src/demos/Extensions/TaskList/index.vue b/docs/src/demos/Extensions/TaskList/index.vue
index 06d1f1beb..b307660ef 100644
--- a/docs/src/demos/Extensions/TaskList/index.vue
+++ b/docs/src/demos/Extensions/TaskList/index.vue
@@ -51,3 +51,20 @@ export default {
   },
 }
 </script>
+
+<style lang="scss">
+ul[data-type="task_list"] {
+  list-style: none;
+  padding: 0;
+
+  li {
+    display: flex;
+    align-items: center;
+
+    > input {
+      flex: 0 0 auto;
+      margin-right: 0.5rem;
+    }
+  }
+}
+</style>

From a71221d8df8dbce2d3648f9c76c330814c7b9d7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 17:43:59 +0100
Subject: [PATCH 048/113] fix types

---
 packages/core/src/ExtensionManager.ts | 1 +
 packages/core/src/NodeExtension.ts    | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/ExtensionManager.ts b/packages/core/src/ExtensionManager.ts
index 23b91aace..80ec7e715 100644
--- a/packages/core/src/ExtensionManager.ts
+++ b/packages/core/src/ExtensionManager.ts
@@ -113,6 +113,7 @@ export default class ExtensionManager {
           type: getSchemaTypeByName(extension.name, this.schema),
         }
 
+        // @ts-ignore
         const renderer = extension.addNodeView?.bind(context)?.() as NodeViewRenderer
 
         const nodeview = (
diff --git a/packages/core/src/NodeExtension.ts b/packages/core/src/NodeExtension.ts
index cfb304d94..e11610b87 100644
--- a/packages/core/src/NodeExtension.ts
+++ b/packages/core/src/NodeExtension.ts
@@ -148,7 +148,11 @@ export interface NodeExtensionSpec<Options = {}, Commands = {}> extends Overwrit
   /**
    * Node View
    */
-  addNodeView?: (() => NodeViewRenderer) | null,
+  addNodeView?: ((this: {
+    options: Options,
+    editor: Editor,
+    type: NodeType,
+  }) => NodeViewRenderer) | null,
 }> {}
 
 export type NodeExtension = Required<Omit<NodeExtensionSpec, 'defaultOptions'> & {

From a4211303df05b137627d1e057d32bc808829f126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 17:44:13 +0100
Subject: [PATCH 049/113] improve node view rendering for task items

---
 packages/extension-task-item/index.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/extension-task-item/index.ts b/packages/extension-task-item/index.ts
index ac64dcebf..7ebc8006d 100644
--- a/packages/extension-task-item/index.ts
+++ b/packages/extension-task-item/index.ts
@@ -78,6 +78,7 @@ const TaskItem = createNode({
           view.dispatch(view.state.tr.setNodeMarkup(getPos(), undefined, {
             checked,
           }))
+          editor.focus()
         }
       })
 
@@ -94,6 +95,13 @@ const TaskItem = createNode({
       return {
         dom: listItem,
         contentDOM: content,
+        update: node => {
+          if (node.type !== this.type) {
+            return false
+          }
+
+          return true
+        },
       }
     }
   },

From 2aab7c3659101a69dc7b36a5177cccf45da0a0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 17:48:41 +0100
Subject: [PATCH 050/113] fix shortcuts for task item

---
 packages/extension-task-item/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/extension-task-item/index.ts b/packages/extension-task-item/index.ts
index 7ebc8006d..d59115913 100644
--- a/packages/extension-task-item/index.ts
+++ b/packages/extension-task-item/index.ts
@@ -50,6 +50,7 @@ const TaskItem = createNode({
   addKeyboardShortcuts() {
     const shortcuts = {
       Enter: () => this.editor.splitListItem('task_item'),
+      'Shift-Tab': () => this.editor.liftListItem('task_item'),
     }
 
     if (!this.options.nested) {
@@ -59,7 +60,6 @@ const TaskItem = createNode({
     return {
       ...shortcuts,
       Tab: () => this.editor.sinkListItem('task_item'),
-      'Shift-Tab': () => this.editor.liftListItem('task_item'),
     }
   },
 

From 1ab817295cd703631ed023d7095afc58f42b771a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 17:52:46 +0100
Subject: [PATCH 051/113] dont use scoped styles for demos

---
 docs/src/demos/Examples/CollaborativeEditing/index.vue  | 2 +-
 docs/src/demos/Examples/ExportHtmlOrJson/index.vue      | 2 +-
 docs/src/demos/Examples/Focus/index.vue                 | 2 +-
 docs/src/demos/Examples/ReadOnly/index.vue              | 2 +-
 docs/src/demos/Extensions/CollaborationCursor/index.vue | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/src/demos/Examples/CollaborativeEditing/index.vue b/docs/src/demos/Examples/CollaborativeEditing/index.vue
index a52ec0d1a..d5bf961c7 100644
--- a/docs/src/demos/Examples/CollaborativeEditing/index.vue
+++ b/docs/src/demos/Examples/CollaborativeEditing/index.vue
@@ -161,7 +161,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 /* A list of all available users */
 .collaboration-users {
   margin-top: 0.5rem;
diff --git a/docs/src/demos/Examples/ExportHtmlOrJson/index.vue b/docs/src/demos/Examples/ExportHtmlOrJson/index.vue
index e318805da..218d17e98 100644
--- a/docs/src/demos/Examples/ExportHtmlOrJson/index.vue
+++ b/docs/src/demos/Examples/ExportHtmlOrJson/index.vue
@@ -101,7 +101,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .export {
   padding: 1rem 0 0;
 
diff --git a/docs/src/demos/Examples/Focus/index.vue b/docs/src/demos/Examples/Focus/index.vue
index 5f7193585..b7a2408ce 100644
--- a/docs/src/demos/Examples/Focus/index.vue
+++ b/docs/src/demos/Examples/Focus/index.vue
@@ -58,7 +58,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .has-focus {
   border-radius: 3px;
   box-shadow: 0 0 0 3px #3ea4ffe6;
diff --git a/docs/src/demos/Examples/ReadOnly/index.vue b/docs/src/demos/Examples/ReadOnly/index.vue
index d1c137603..08e61ba57 100644
--- a/docs/src/demos/Examples/ReadOnly/index.vue
+++ b/docs/src/demos/Examples/ReadOnly/index.vue
@@ -52,7 +52,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .checkbox {
   margin-bottom: 1rem;
 
diff --git a/docs/src/demos/Extensions/CollaborationCursor/index.vue b/docs/src/demos/Extensions/CollaborationCursor/index.vue
index 86e0d4426..a7314bdff 100644
--- a/docs/src/demos/Extensions/CollaborationCursor/index.vue
+++ b/docs/src/demos/Extensions/CollaborationCursor/index.vue
@@ -61,7 +61,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 /* Give a remote user a caret */
 .collaboration-cursor__caret {
   position: relative;

From 5723b1b76103a69239c6704bb768b3211ef4b58c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Fri, 30 Oct 2020 18:11:54 +0100
Subject: [PATCH 052/113] open files in vscode in development

---
 docs/gridsome.client.js        | 8 ++++++++
 docs/gridsome.server.js        | 4 ++++
 docs/src/layouts/App/index.vue | 4 ++++
 3 files changed, 16 insertions(+)

diff --git a/docs/gridsome.client.js b/docs/gridsome.client.js
index 65d2f3f2f..6c5bcc172 100644
--- a/docs/gridsome.client.js
+++ b/docs/gridsome.client.js
@@ -1,5 +1,13 @@
 export default function (Vue, options, context) {
 
+  Vue.mixin({
+    data() {
+      return {
+        cwd: options.cwd,
+      }
+    },
+  })
+
   context.router.afterEach(to => {
     if (to.hash) {
       setTimeout(() => {
diff --git a/docs/gridsome.server.js b/docs/gridsome.server.js
index 24b1b86b0..214db7421 100644
--- a/docs/gridsome.server.js
+++ b/docs/gridsome.server.js
@@ -52,6 +52,10 @@ const globby = require('globby')
 
 module.exports = function (api) {
 
+  api.setClientOptions({
+    cwd: process.cwd(),
+  })
+
   api.loadSource(({ addCollection }) => {
     const appCollection = addCollection({ typeName: 'Package' })
 
diff --git a/docs/src/layouts/App/index.vue b/docs/src/layouts/App/index.vue
index 06a50f55e..c3bb8eaa6 100644
--- a/docs/src/layouts/App/index.vue
+++ b/docs/src/layouts/App/index.vue
@@ -214,6 +214,10 @@ export default {
       const { currentPath } = this
       const filePath = currentPath === '' ? '/introduction' : currentPath
 
+      if (process.env.NODE_ENV === 'development') {
+        return `vscode://file${this.cwd}/src/docPages${filePath}.md`
+      }
+
       return `https://github.com/ueberdosis/tiptap-next/blob/main/docs/src/docPages${filePath}.md`
     },
   },

From abbed1587ad52bb0c6572e0ae3f1968e4c870425 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Fri, 30 Oct 2020 20:11:11 +0100
Subject: [PATCH 053/113] add content

---
 .../docPages/guide/build-custom-extensions.md | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/docs/src/docPages/guide/build-custom-extensions.md b/docs/src/docPages/guide/build-custom-extensions.md
index 47d4a5f89..f4dd16f3b 100644
--- a/docs/src/docPages/guide/build-custom-extensions.md
+++ b/docs/src/docPages/guide/build-custom-extensions.md
@@ -191,12 +191,36 @@ const TextAlign = createExtension({
 })
 ```
 
+### Render HTML
+With the `renderHTML` function you can control how an extension is rendered to HTML. We pass an attributes object to it, with all local attributes, global attributes, and configured CSS classes. Here is an example from the `Bold` extension:
+
+```js
+renderHTML({ attributes }) {
+  return ['strong', attributes, 0]
+},
+```
+
+The first value in the array should be the name of HTML tag. If the second element is an object, it’s interpreted as a set of attributes. Any elements after that are rendered as children.
+
+The number zero (representing a hole) is used to indicate where the content should be inserted. Let’s look at the rendering of the `CodeBlock` extension with two nested tags:
+
+```js
+renderHTML({ attributes }) {
+  return ['pre', ['code', attributes, 0]]
+},
+```
+
+If you want to add some specific attributes there, import the `mergeAttributes` helper from `@tiptap/core`:
+
+```js
+renderHTML({ attributes }) {
+  return ['a', mergeAttributes(attributes, { rel: this.options.rel }), 0]
+},
+```
+
 ### Parse HTML
 > Associates DOM parser information with this mark (see the corresponding node spec field). The mark field in the rules is implied.
 
-### Render HTML
-> Defines the default way marks of this type should be serialized to DOM/HTML. When the resulting spec contains a hole, that is where the marked content is placed. Otherwise, it is appended to the top node.
-
 ### Commands
 
 ```js

From b570fcb5604ade91a5e302c061ef03918c67c512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 31 Oct 2020 23:35:30 +0100
Subject: [PATCH 054/113] add fromString method

---
 packages/core/src/utils/fromString.ts             | 15 +++++++++++++++
 .../utils/injectExtensionAttributesToParseRule.ts |  3 ++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 packages/core/src/utils/fromString.ts

diff --git a/packages/core/src/utils/fromString.ts b/packages/core/src/utils/fromString.ts
new file mode 100644
index 000000000..5371abcc9
--- /dev/null
+++ b/packages/core/src/utils/fromString.ts
@@ -0,0 +1,15 @@
+export default function fromString(value: any) {
+  if (value.match(/^\d*(\.\d+)?$/)) {
+    return Number(value)
+  }
+
+  if (value === 'true') {
+    return true
+  }
+
+  if (value === 'false') {
+    return false
+  }
+
+  return value
+}
diff --git a/packages/core/src/utils/injectExtensionAttributesToParseRule.ts b/packages/core/src/utils/injectExtensionAttributesToParseRule.ts
index 0cd42dd69..185d7098e 100644
--- a/packages/core/src/utils/injectExtensionAttributesToParseRule.ts
+++ b/packages/core/src/utils/injectExtensionAttributesToParseRule.ts
@@ -1,5 +1,6 @@
 import { ParseRule } from 'prosemirror-model'
 import { ExtensionAttribute } from '../types'
+import fromString from './fromString'
 
 /**
  * This function merges extension attributes into parserule attributes (`attrs` or `getAttrs`).
@@ -29,7 +30,7 @@ export default function injectExtensionAttributesToParseRule(parseRule: ParseRul
           const attributes = item.attribute.parseHTML
             ? item.attribute.parseHTML(node as HTMLElement) || {}
             : {
-              [item.name]: (node as HTMLElement).getAttribute(item.name),
+              [item.name]: fromString((node as HTMLElement).getAttribute(item.name)),
             }
 
           const filteredAttributes = Object.fromEntries(Object.entries(attributes)

From cb647de0435b89250268c06995e6c483a8f4ecb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 31 Oct 2020 23:45:36 +0100
Subject: [PATCH 055/113] add tests to fromString

---
 packages/core/index.ts                        |  1 +
 .../integration/core/fromString.spec.ts       | 41 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 tests/cypress/integration/core/fromString.spec.ts

diff --git a/packages/core/index.ts b/packages/core/index.ts
index 07abccb2d..fe31eb214 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -19,3 +19,4 @@ export { default as generateHTML } from './src/utils/generateHTML'
 export { default as getHTMLFromFragment } from './src/utils/getHTMLFromFragment'
 export { default as getMarkAttrs } from './src/utils/getMarkAttrs'
 export { default as mergeAttributes } from './src/utils/mergeAttributes'
+export { default as fromString } from './src/utils/fromString'
diff --git a/tests/cypress/integration/core/fromString.spec.ts b/tests/cypress/integration/core/fromString.spec.ts
new file mode 100644
index 000000000..6ecb92bf7
--- /dev/null
+++ b/tests/cypress/integration/core/fromString.spec.ts
@@ -0,0 +1,41 @@
+/// <reference types="cypress" />
+
+import { fromString } from '@tiptap/core'
+
+describe('fromString', () => {
+  it('parse a string', () => {
+    const value = fromString('test')
+
+    expect(value).to.eq('test')
+  })
+
+  it('parse a number', () => {
+    const value = fromString('1')
+
+    expect(value).to.eq(1)
+  })
+
+  it('parse a floating number', () => {
+    const value = fromString('1.2')
+
+    expect(value).to.eq(1.2)
+  })
+
+  it('parse not a number with exponent', () => {
+    const value = fromString('1e1')
+
+    expect(value).to.eq('1e1')
+  })
+
+  it('parse a boolean (true)', () => {
+    const value = fromString('true')
+
+    expect(value).to.eq(true)
+  })
+
+  it('parse a boolean (false)', () => {
+    const value = fromString('false')
+
+    expect(value).to.eq(false)
+  })
+})

From d81005449242e7f96345597a5651a8dcaef168de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 31 Oct 2020 23:56:31 +0100
Subject: [PATCH 056/113] refactor tests

---
 packages/core/index.ts                        |  2 --
 packages/core/src/utils/capitalize.ts         |  3 ---
 packages/core/src/utils/fromString.ts         |  4 ++++
 .../integration/core/capitalize.spec.ts       | 11 ----------
 .../cypress/integration/core/example.spec.ts  |  5 -----
 .../integration/core/fromString.spec.ts       | 20 ++++++++++++-------
 6 files changed, 17 insertions(+), 28 deletions(-)
 delete mode 100644 packages/core/src/utils/capitalize.ts
 delete mode 100644 tests/cypress/integration/core/capitalize.spec.ts
 delete mode 100644 tests/cypress/integration/core/example.spec.ts

diff --git a/packages/core/index.ts b/packages/core/index.ts
index fe31eb214..30272f8bb 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -13,10 +13,8 @@ export { default as nodeInputRule } from './src/inputRules/nodeInputRule'
 export { default as markInputRule } from './src/inputRules/markInputRule'
 export { default as markPasteRule } from './src/pasteRules/markPasteRule'
 
-export { default as capitalize } from './src/utils/capitalize'
 export { default as getSchema } from './src/utils/getSchema'
 export { default as generateHTML } from './src/utils/generateHTML'
 export { default as getHTMLFromFragment } from './src/utils/getHTMLFromFragment'
 export { default as getMarkAttrs } from './src/utils/getMarkAttrs'
 export { default as mergeAttributes } from './src/utils/mergeAttributes'
-export { default as fromString } from './src/utils/fromString'
diff --git a/packages/core/src/utils/capitalize.ts b/packages/core/src/utils/capitalize.ts
deleted file mode 100644
index 0b9c9d48b..000000000
--- a/packages/core/src/utils/capitalize.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function capitalize(value = ''): string {
-  return value.charAt(0).toUpperCase() + value.slice(1)
-}
diff --git a/packages/core/src/utils/fromString.ts b/packages/core/src/utils/fromString.ts
index 5371abcc9..2ef70c767 100644
--- a/packages/core/src/utils/fromString.ts
+++ b/packages/core/src/utils/fromString.ts
@@ -1,4 +1,8 @@
 export default function fromString(value: any) {
+  if (typeof value !== 'string') {
+    return value
+  }
+
   if (value.match(/^\d*(\.\d+)?$/)) {
     return Number(value)
   }
diff --git a/tests/cypress/integration/core/capitalize.spec.ts b/tests/cypress/integration/core/capitalize.spec.ts
deleted file mode 100644
index 2693a958e..000000000
--- a/tests/cypress/integration/core/capitalize.spec.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/// <reference types="cypress" />
-
-import { capitalize } from '@tiptap/core'
-
-describe('capitalize test', () => {
-  it('capitalize a word', () => {
-    const capitalized = capitalize('test')
-
-    expect(capitalized).to.eq('Test')
-  })
-})
diff --git a/tests/cypress/integration/core/example.spec.ts b/tests/cypress/integration/core/example.spec.ts
deleted file mode 100644
index 985f70dab..000000000
--- a/tests/cypress/integration/core/example.spec.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-describe('example test', () => {
-  it('should work', () => {
-    expect('<p>Example Text</p>').to.eq('<p>Example Text</p>')
-  })
-})
diff --git a/tests/cypress/integration/core/fromString.spec.ts b/tests/cypress/integration/core/fromString.spec.ts
index 6ecb92bf7..2aa6aaa15 100644
--- a/tests/cypress/integration/core/fromString.spec.ts
+++ b/tests/cypress/integration/core/fromString.spec.ts
@@ -1,41 +1,47 @@
 /// <reference types="cypress" />
 
-import { fromString } from '@tiptap/core'
+import fromString from '@tiptap/core/src/utils/fromString'
 
 describe('fromString', () => {
-  it('parse a string', () => {
+  it('should return a string', () => {
     const value = fromString('test')
 
     expect(value).to.eq('test')
   })
 
-  it('parse a number', () => {
+  it('should convert to a number', () => {
     const value = fromString('1')
 
     expect(value).to.eq(1)
   })
 
-  it('parse a floating number', () => {
+  it('should convert to a floating number', () => {
     const value = fromString('1.2')
 
     expect(value).to.eq(1.2)
   })
 
-  it('parse not a number with exponent', () => {
+  it('should not convert to a number with exponent', () => {
     const value = fromString('1e1')
 
     expect(value).to.eq('1e1')
   })
 
-  it('parse a boolean (true)', () => {
+  it('should convert to true', () => {
     const value = fromString('true')
 
     expect(value).to.eq(true)
   })
 
-  it('parse a boolean (false)', () => {
+  it('should convert to false', () => {
     const value = fromString('false')
 
     expect(value).to.eq(false)
   })
+
+  it('should return non-strings', () => {
+    const value = fromString(null)
+
+    expect(value).to.eq(null)
+  })
 })

From 4ce0eef6c08f0aa186240b31de41dbb9c4d02609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sun, 1 Nov 2020 00:16:28 +0100
Subject: [PATCH 057/113] move dropcursor and gapcursor to its own package

---
 docs/src/demos/Extensions/Image/index.vue  |   2 +
 packages/core/package.json                 |   4 -
 packages/core/src/plugins/index.ts         |   4 -
 packages/extension-dropcursor/index.ts     |  18 ++
 packages/extension-dropcursor/package.json |  21 ++
 packages/extension-gapcursor/index.ts      |  18 ++
 packages/extension-gapcursor/package.json  |  21 ++
 packages/starter-kit/index.ts              |   4 +
 packages/starter-kit/package.json          |   2 +
 yarn.lock                                  | 339 +++++++++++----------
 10 files changed, 268 insertions(+), 165 deletions(-)
 create mode 100644 packages/extension-dropcursor/index.ts
 create mode 100644 packages/extension-dropcursor/package.json
 create mode 100644 packages/extension-gapcursor/index.ts
 create mode 100644 packages/extension-gapcursor/package.json

diff --git a/docs/src/demos/Extensions/Image/index.vue b/docs/src/demos/Extensions/Image/index.vue
index b44f48028..a101cda51 100644
--- a/docs/src/demos/Extensions/Image/index.vue
+++ b/docs/src/demos/Extensions/Image/index.vue
@@ -14,6 +14,7 @@ import Document from '@tiptap/extension-document'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
 import Image from '@tiptap/extension-image'
+import Dropcursor from '@tiptap/extension-dropcursor'
 
 export default {
   components: {
@@ -41,6 +42,7 @@ export default {
         Paragraph(),
         Text(),
         Image(),
+        Dropcursor(),
       ],
       content: `
         <p>This is a basic example of implementing images. Drag to re-order.</p>
diff --git a/packages/core/package.json b/packages/core/package.json
index 4044ffe3f..d85943668 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -12,12 +12,8 @@
     "dist"
   ],
   "dependencies": {
-    "@types/prosemirror-dropcursor": "^1.0.0",
-    "@types/prosemirror-gapcursor": "^1.0.1",
     "@types/prosemirror-schema-list": "^1.0.1",
     "prosemirror-commands": "^1.1.3",
-    "prosemirror-dropcursor": "^1.3.2",
-    "prosemirror-gapcursor": "^1.1.5",
     "prosemirror-inputrules": "^1.1.3",
     "prosemirror-keymap": "^1.1.3",
     "prosemirror-model": "^1.12.0",
diff --git a/packages/core/src/plugins/index.ts b/packages/core/src/plugins/index.ts
index 3f6305218..6c83f2f43 100644
--- a/packages/core/src/plugins/index.ts
+++ b/packages/core/src/plugins/index.ts
@@ -1,14 +1,10 @@
 import { keymap } from 'prosemirror-keymap'
 import { baseKeymap } from 'prosemirror-commands'
-import { dropCursor } from 'prosemirror-dropcursor'
-import { gapCursor } from 'prosemirror-gapcursor'
 import { undoInputRule } from 'prosemirror-inputrules'
 import editable from './editable'
 import focus from './focus'
 
 export default [
-  () => dropCursor(),
-  () => gapCursor(),
   () => keymap({ Backspace: undoInputRule }),
   () => keymap(baseKeymap),
   editable,
diff --git a/packages/extension-dropcursor/index.ts b/packages/extension-dropcursor/index.ts
new file mode 100644
index 000000000..ab6ba960d
--- /dev/null
+++ b/packages/extension-dropcursor/index.ts
@@ -0,0 +1,18 @@
+import { createExtension } from '@tiptap/core'
+import { dropCursor } from 'prosemirror-dropcursor'
+
+const Dropcursor = createExtension({
+  addProseMirrorPlugins() {
+    return [
+      dropCursor(),
+    ]
+  },
+})
+
+export default Dropcursor
+
+declare module '@tiptap/core/src/Editor' {
+  interface AllExtensions {
+    Dropcursor: typeof Dropcursor,
+  }
+}
diff --git a/packages/extension-dropcursor/package.json b/packages/extension-dropcursor/package.json
new file mode 100644
index 000000000..28e10cda2
--- /dev/null
+++ b/packages/extension-dropcursor/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@tiptap/extension-dropcursor",
+  "version": "1.0.0",
+  "source": "index.ts",
+  "main": "dist/tiptap-extension-dropcursor.js",
+  "umd:main": "dist/tiptap-extension-dropcursor.umd.js",
+  "module": "dist/tiptap-extension-dropcursor.mjs",
+  "unpkg": "dist/tiptap-extension-dropcursor.js",
+  "jsdelivr": "dist/tiptap-extension-dropcursor.js",
+  "files": [
+    "src",
+    "dist"
+  ],
+  "peerDependencies": {
+    "@tiptap/core": "2.x"
+  },
+  "dependencies": {
+    "@types/prosemirror-dropcursor": "^1.0.0",
+    "prosemirror-dropcursor": "^1.1.3"
+  }
+}
diff --git a/packages/extension-gapcursor/index.ts b/packages/extension-gapcursor/index.ts
new file mode 100644
index 000000000..f7c267a10
--- /dev/null
+++ b/packages/extension-gapcursor/index.ts
@@ -0,0 +1,18 @@
+import { createExtension } from '@tiptap/core'
+import { gapCursor } from 'prosemirror-gapcursor'
+
+const Gapcursor = createExtension({
+  addProseMirrorPlugins() {
+    return [
+      gapCursor(),
+    ]
+  },
+})
+
+export default Gapcursor
+
+declare module '@tiptap/core/src/Editor' {
+  interface AllExtensions {
+    Gapcursor: typeof Gapcursor,
+  }
+}
diff --git a/packages/extension-gapcursor/package.json b/packages/extension-gapcursor/package.json
new file mode 100644
index 000000000..7ea582056
--- /dev/null
+++ b/packages/extension-gapcursor/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@tiptap/extension-gapcursor",
+  "version": "1.0.0",
+  "source": "index.ts",
+  "main": "dist/tiptap-extension-gapcursor.js",
+  "umd:main": "dist/tiptap-extension-gapcursor.umd.js",
+  "module": "dist/tiptap-extension-gapcursor.mjs",
+  "unpkg": "dist/tiptap-extension-gapcursor.js",
+  "jsdelivr": "dist/tiptap-extension-gapcursor.js",
+  "files": [
+    "src",
+    "dist"
+  ],
+  "peerDependencies": {
+    "@tiptap/core": "2.x"
+  },
+  "dependencies": {
+    "@types/prosemirror-gapcursor": "^1.0.1",
+    "prosemirror-gapcursor": "^1.1.5"
+  }
+}
diff --git a/packages/starter-kit/index.ts b/packages/starter-kit/index.ts
index c5610596a..db62e673f 100644
--- a/packages/starter-kit/index.ts
+++ b/packages/starter-kit/index.ts
@@ -1,3 +1,5 @@
+import Dropcursor from '@tiptap/extension-dropcursor'
+import Gapcursor from '@tiptap/extension-gapcursor'
 import Document from '@tiptap/extension-document'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
@@ -17,6 +19,8 @@ import ListItem from '@tiptap/extension-list-item'
 
 export default function defaultExtensions() {
   return [
+    Dropcursor(),
+    Gapcursor(),
     Document(),
     History(),
     Paragraph(),
diff --git a/packages/starter-kit/package.json b/packages/starter-kit/package.json
index 875e10cae..4c8501b86 100644
--- a/packages/starter-kit/package.json
+++ b/packages/starter-kit/package.json
@@ -20,6 +20,8 @@
     "@tiptap/extension-italic": "1.x",
     "@tiptap/extension-code": "1.x",
     "@tiptap/extension-code-block": "1.x",
+    "@tiptap/extension-dropcursor": "1.x",
+    "@tiptap/extension-gapcursor": "1.x",
     "@tiptap/extension-heading": "1.x",
     "@tiptap/extension-hard-break": "1.x",
     "@tiptap/extension-strike": "1.x",
diff --git a/yarn.lock b/yarn.lock
index 175b899dc..96c5238eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2000,9 +2000,9 @@
     "@octokit/types" "^2.0.1"
 
 "@octokit/plugin-request-log@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.1.tgz#07e3bfeb94559a2538cdf54d435b097fba6d6fd3"
-  integrity sha512-d8vmiGAUGswxErdIGfpd0I2UHo2Cs7EaBDpFUZQ9UqYmA0s5/4XoMO4HBld73xGpCj2BvyVyQe2qd9e+/nvKwQ==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz#394d59ec734cd2f122431fbaf05099861ece3c44"
+  integrity sha512-oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg==
 
 "@octokit/plugin-rest-endpoint-methods@2.4.0":
   version "2.4.0"
@@ -2238,9 +2238,9 @@
   integrity sha1-aaI6OtKcrwCX8G7aWbNh7i8GOfY=
 
 "@types/node@*", "@types/node@>= 8":
-  version "14.14.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.2.tgz#d25295f9e4ca5989a2c610754dc02a9721235eeb"
-  integrity sha512-jeYJU2kl7hL9U5xuI/BhKPZ4vqGM/OmK6whiFAXVhlstzZhVamWhDSmHyGLIp+RVyuF9/d0dqr2P85aFj4BvJg==
+  version "14.14.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.6.tgz#146d3da57b3c636cc0d1769396ce1cfa8991147f"
+  integrity sha512-6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -2358,9 +2358,9 @@
   integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==
 
 "@types/react@^16.8.12":
-  version "16.9.53"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.53.tgz#40cd4f8b8d6b9528aedd1fff8fcffe7a112a3d23"
-  integrity sha512-4nW60Sd4L7+WMXH1D6jCdVftuW7j4Za6zdp6tJ33Rqv0nk1ZAmQKML9ZLD4H0dehA3FZxXR/GM8gXplf82oNGw==
+  version "16.9.55"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.55.tgz#47078587f5bfe028a23b6b46c7b94ac0d436acff"
+  integrity sha512-6KLe6lkILeRwyyy7yG9rULKJ0sXplUsl98MGoCfpteXf9sPWFWWMknDcsvubcpaTdBuxtsLF6HDUwdApZL/xIg==
   dependencies:
     "@types/prop-types" "*"
     csstype "^3.0.2"
@@ -2539,14 +2539,14 @@
     semver "^6.1.0"
 
 "@vue/babel-preset-jsx@^1.1.2":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.2.3.tgz#355f59206b691a558bc95e4dbd8e59cd27dd76cb"
-  integrity sha512-yMPoPFH6kiNFAhJknjLKAre7JQNWRPjH1K9EyzTPi/J5T5oDC8sEumSjWI6lBQxcSaBboXpQp92mvxZdXCfiFw==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.2.4.tgz#92fea79db6f13b01e80d3a0099e2924bdcbe4e87"
+  integrity sha512-oRVnmN2a77bYDJzeGSt92AuHXbkIxbf/XXSE3klINnh9AXBmVS1DGa1f0d+dDYpLfsAKElMnqKTQfKn7obcL4w==
   dependencies:
     "@vue/babel-helper-vue-jsx-merge-props" "^1.2.1"
     "@vue/babel-plugin-transform-vue-jsx" "^1.2.1"
     "@vue/babel-sugar-composition-api-inject-h" "^1.2.1"
-    "@vue/babel-sugar-composition-api-render-instance" "^1.2.1"
+    "@vue/babel-sugar-composition-api-render-instance" "^1.2.4"
     "@vue/babel-sugar-functional-vue" "^1.2.2"
     "@vue/babel-sugar-inject-h" "^1.2.2"
     "@vue/babel-sugar-v-model" "^1.2.3"
@@ -2559,10 +2559,10 @@
   dependencies:
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
-"@vue/babel-sugar-composition-api-render-instance@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.2.1.tgz#745cf4608ed71476c66434203d0603f32b4c025b"
-  integrity sha512-F2gQbEMOUPyapqc85/O1Tbw0qBuvgXC/qBcBsjMKqC7KWJ4hK1eJUvU3iLHHTbre6V7zzIjrqEe0SoE1lR4mfw==
+"@vue/babel-sugar-composition-api-render-instance@^1.2.4":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.2.4.tgz#e4cbc6997c344fac271785ad7a29325c51d68d19"
+  integrity sha512-joha4PZznQMsxQYXtR3MnTgCASC9u3zt9KfBxIeuI5g2gscpTsSKRDzWQt4aqNIpx6cv8On7/m6zmmovlNsG7Q==
   dependencies:
     "@babel/plugin-syntax-jsx" "^7.2.0"
 
@@ -3020,9 +3020,9 @@ aproba@^2.0.0:
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
 arch@^2.1.0, arch@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.2.tgz#0c52bbe7344bb4fa260c443d2cbad9c00ff2f0bf"
-  integrity sha512-NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
+  integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==
 
 archive-type@^4.0.0:
   version "4.0.0"
@@ -3248,9 +3248,9 @@ aws-sign2@~0.7.0:
   integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
 
 aws4@^1.8.0:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428"
-  integrity sha512-zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA==
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
+  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
 babel-loader@8.0.5:
   version "8.0.5"
@@ -3300,7 +3300,7 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-base64-js@^1.0.2:
+base64-js@^1.0.2, base64-js@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
   integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
@@ -3660,12 +3660,12 @@ buffer@^4.3.0:
     isarray "^1.0.0"
 
 buffer@^5.2.1, buffer@^5.5.0:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.6.0.tgz#a31749dc7d81d84db08abf937b6b8c4033f62786"
-  integrity sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.0.tgz#88afbd29fc89fa7b58e82b39206f31f2cf34feed"
+  integrity sha512-cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg==
   dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
+    base64-js "^1.3.1"
+    ieee754 "^1.1.13"
 
 builtin-modules@^3.1.0:
   version "3.1.0"
@@ -3775,6 +3775,14 @@ cachedir@^2.3.0:
   resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
   integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
 
+call-bind@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce"
+  integrity sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.0"
+
 call-me-maybe@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
@@ -3862,9 +3870,9 @@ camelcase@^5.0.0, camelcase@^5.2.0, camelcase@^5.3.1:
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 camelcase@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.1.0.tgz#27dc176173725fb0adf8a48b647f4d7871944d78"
-  integrity sha512-WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ==
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
+  integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
 caniuse-api@^3.0.0:
   version "3.0.0"
@@ -3877,9 +3885,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001135:
-  version "1.0.30001150"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001150.tgz#6d0d829da654b0b233576de00335586bc2004df1"
-  integrity sha512-kiNKvihW0m36UhAFnl7bOAv0i1K1f6wpfVtTF5O5O82XzgtBnb05V0XeV3oZ968vfg2sRNChsHw8ASH2hDfoYQ==
+  version "1.0.30001154"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz#f3bbc245ce55e4c1cd20fa731b097880181a7f17"
+  integrity sha512-y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org==
 
 case-sensitive-paths-webpack-plugin@^2.2.0:
   version "2.3.0"
@@ -3902,9 +3910,9 @@ caw@^2.0.0, caw@^2.0.1:
     url-to-options "^1.0.1"
 
 ccount@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.5.tgz#ac82a944905a65ce204eb03023157edf29425c17"
-  integrity sha512-MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.1.0.tgz#246687debb6014735131be8abab2d93898f8d043"
+  integrity sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==
 
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
@@ -4332,9 +4340,9 @@ configstore@^5.0.1:
     xdg-basedir "^4.0.0"
 
 confusing-browser-globals@^1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz#72bc13b483c0276801681871d4898516f8f54fdd"
-  integrity sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz#30d1e7f3d1b882b25ec4933d1d1adac353d20a59"
+  integrity sha512-gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA==
 
 connect-history-api-fallback@^1.6.0:
   version "1.6.0"
@@ -4714,12 +4722,12 @@ css-tree@1.0.0-alpha.37:
     mdn-data "2.0.4"
     source-map "^0.6.1"
 
-css-tree@1.0.0-alpha.39:
-  version "1.0.0-alpha.39"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz#2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"
-  integrity sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==
+css-tree@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0.tgz#21993fa270d742642a90409a2c0cb3ac0298adf6"
+  integrity sha512-CdVYz/Yuqw0VdKhXPBIgi8DO3NicJVYZNWeX9XcIuSp9ZoFT5IcleVRW07O5rMjdcx1mb+MEJPknTTEW7DdsYw==
   dependencies:
-    mdn-data "2.0.6"
+    mdn-data "2.0.12"
     source-map "^0.6.1"
 
 css-what@2.1:
@@ -4816,11 +4824,11 @@ cssnano@^4.1.10:
     postcss "^7.0.0"
 
 csso@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz#0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"
-  integrity sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-4.1.0.tgz#1d31193efa99b87aa6bad6c0cef155e543d09e8b"
+  integrity sha512-h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg==
   dependencies:
-    css-tree "1.0.0-alpha.39"
+    css-tree "^1.0.0"
 
 csstype@^3.0.2:
   version "3.0.4"
@@ -4947,7 +4955,7 @@ debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1"
   integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==
@@ -5156,12 +5164,17 @@ destroy@~1.0.4:
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
 detab@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.3.tgz#33e5dd74d230501bd69985a0d2b9a3382699a130"
-  integrity sha512-Up8P0clUVwq0FnFjDclzZsy9PadzRn5FFxrr47tQQvMHqyiFYVbpH8oXDzWtF0Q7pYy3l+RPmtBl+BsFF6wH0A==
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/detab/-/detab-2.0.4.tgz#b927892069aff405fbb9a186fe97a44a92a94b43"
+  integrity sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g==
   dependencies:
     repeat-string "^1.5.4"
 
+detect-browser@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.2.0.tgz#c9cd5afa96a6a19fda0bbe9e9be48a6b6e1e9c97"
+  integrity sha512-tr7XntDAu50BVENgQfajMLzacmSe34D+qZc4zjnniz0ZVuw/TZcLcyxHQjYpJTM36sGEkZZlYLnIM1hH7alTMA==
+
 detect-indent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
@@ -5415,9 +5428,9 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.571:
-  version "1.3.583"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.583.tgz#47a9fde74740b1205dba96db2e433132964ba3ee"
-  integrity sha512-L9BwLwJohjZW9mQESI79HRzhicPk1DFgM+8hOCfGgGCFEcA3Otpv7QK6SGtYoZvfQfE3wKLh0Hd5ptqUFv3gvQ==
+  version "1.3.585"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.585.tgz#71cdb722c73488b9475ad1c572cf43a763ef9081"
+  integrity sha512-xoeqjMQhgHDZM7FiglJAb2aeOxHZWFruUc3MbAGTgE7GB8rr5fTn1Sdh5THGuQtndU3GuXlu91ZKqRivxoCZ/A==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -5522,6 +5535,11 @@ err-code@^1.0.0:
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
   integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
 
+err-code@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
+  integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
+
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -5560,7 +5578,7 @@ es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstrac
     string.prototype.trimend "^1.0.1"
     string.prototype.trimstart "^1.0.1"
 
-es-abstract@^1.18.0-next.0, es-abstract@^1.18.0-next.1:
+es-abstract@^1.18.0-next.1:
   version "1.18.0-next.1"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
   integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
@@ -5931,9 +5949,9 @@ execa@^1.0.0:
     strip-eof "^1.0.0"
 
 execa@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.0.3.tgz#0a34dabbad6d66100bd6f2c576c8669403f317f2"
-  integrity sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
   dependencies:
     cross-spawn "^7.0.0"
     get-stream "^5.0.0"
@@ -6144,9 +6162,9 @@ fastparse@^1.1.2:
   integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
 
 fastq@^1.6.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
-  integrity sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.9.0.tgz#e16a72f338eaca48e91b5c23593bcc2ef66b7947"
+  integrity sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==
   dependencies:
     reusify "^1.0.4"
 
@@ -6551,11 +6569,11 @@ genfun@^5.0.0:
   integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
 
 gensync@^1.0.0-beta.1:
-  version "1.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
-  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
+  version "1.0.0-beta.2"
+  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-browser-rtc@^1.0.0:
+get-browser-rtc@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz#bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"
   integrity sha1-u81AyEUaftTvXDc7gWmkCd0dEdk=
@@ -6565,6 +6583,15 @@ get-caller-file@^2.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-intrinsic@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be"
+  integrity sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
 get-pkg-repo@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
@@ -7207,9 +7234,9 @@ hast-util-is-element@^1.0.0:
   integrity sha512-oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ==
 
 hast-util-parse-selector@^2.0.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz#60c99d0b519e12ab4ed32e58f150ec3f61ed1974"
-  integrity sha512-gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA==
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz#d57c23f4da16ae3c63b3b6ca4616683313499c3a"
+  integrity sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==
 
 hast-util-sanitize@^1.0.0:
   version "1.3.1"
@@ -7292,9 +7319,9 @@ hex-color-regex@^1.1.0:
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
 highlight.js@^10.2.0:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.3.1.tgz#3ca6bf007377faae347e8135ff25900aac734b9a"
-  integrity sha512-jeW8rdPdhshYKObedYg5XGbpVgb1/DT4AHvDFXhkU7UnGSIjy9kkJ7zHG7qplhFHMitTSzh5/iClKQk3Kb2RFQ==
+  version "10.3.2"
+  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.3.2.tgz#135fd3619a00c3cbb8b4cd6dbc78d56bfcbc46f1"
+  integrity sha512-3jRT7OUYsVsKvukNKZCtnvRcFyCJqSEIuIMsEybAXRiFSwpt65qjPd/Pr+UOdYt7WJlt+lj3+ypUsHiySBp/Jw==
 
 hirestime@^3.2.1:
   version "3.2.2"
@@ -7545,10 +7572,10 @@ icss-utils@^4.1.0:
   dependencies:
     postcss "^7.0.14"
 
-ieee754@^1.1.4:
-  version "1.1.13"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
-  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+ieee754@^1.1.13, ieee754@^1.1.4:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 iferr@^0.1.5:
   version "0.1.5"
@@ -8413,11 +8440,11 @@ jsonfile@^4.0.0:
     graceful-fs "^4.1.6"
 
 jsonfile@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.0.1.tgz#98966cba214378c8c84b82e085907b40bf614179"
-  integrity sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
   dependencies:
-    universalify "^1.0.0"
+    universalify "^2.0.0"
   optionalDependencies:
     graceful-fs "^4.1.6"
 
@@ -9066,9 +9093,9 @@ mdast-util-to-string@^1.0.0, mdast-util-to-string@^1.0.5:
   integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==
 
 mdast-util-toc@^5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/mdast-util-toc/-/mdast-util-toc-5.0.3.tgz#5fb1503e3655688929d596799a6910cc6548e420"
-  integrity sha512-A3xzcgC1XFHK0+abFmbINOxjwo7Bi0Nsfp3yTgTy5JHo2q2V6YZ5BVJreDWoK3szcLlSMvHqe8WPbjY50wAkow==
+  version "5.0.4"
+  resolved "https://registry.yarnpkg.com/mdast-util-toc/-/mdast-util-toc-5.0.4.tgz#5c7bc8ff64914546384d81ea155478ba34802c12"
+  integrity sha512-JjLlJfcnsQlAJKWCY8CfTp9gA5A2Mk5PeDmPmCLLvq+2SjlJKyGUQTiDdSO5WvPRzpwnghO3ByyJc4OngadB3w==
   dependencies:
     "@types/mdast" "^3.0.3"
     "@types/unist" "^2.0.3"
@@ -9078,16 +9105,16 @@ mdast-util-toc@^5.0.0:
     unist-util-is "^4.0.0"
     unist-util-visit "^2.0.0"
 
+mdn-data@2.0.12:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.12.tgz#bbb658d08b38f574bbb88f7b83703defdcc46844"
+  integrity sha512-ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q==
+
 mdn-data@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.4.tgz#699b3c38ac6f1d728091a64650b65d388502fd5b"
   integrity sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==
 
-mdn-data@2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz#852dc60fcaa5daa2e8cf6c9189c440ed3e042978"
-  integrity sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==
-
 mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
@@ -9710,9 +9737,9 @@ node-libs-browser@^2.2.1:
     vm-browserify "^1.0.1"
 
 node-releases@^1.1.61:
-  version "1.1.64"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.64.tgz#71b4ae988e9b1dd7c1ffce58dd9e561752dfebc5"
-  integrity sha512-Iec8O9166/x2HRMJyLLLWkd0sFFLrFNy+Xf+JQfSQsdBJzPcHpNl3JQ9gD4j+aJxmCa25jNsIbM4bmACtSbkSg==
+  version "1.1.65"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.65.tgz#52d9579176bd60f23eba05c4438583f341944b81"
+  integrity sha512-YpzJOe2WFIW0V4ZkJQd/DGR/zdVwc/pI4Nl1CZrBO19FdRcSTmsuhdttw9rsTzzJLrNcSloLiBbEYx1C4f6gpA==
 
 node-sass@^4.14.1:
   version "4.14.1"
@@ -9948,12 +9975,12 @@ object-visit@^1.0.0:
     isobject "^3.0.0"
 
 object.assign@^4.1.0, object.assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
-  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
+  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
   dependencies:
+    call-bind "^1.0.0"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.0"
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
@@ -11168,7 +11195,7 @@ prosemirror-commands@^1.1.3:
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.0.0"
 
-prosemirror-dropcursor@^1.3.2:
+prosemirror-dropcursor@^1.1.3:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.2.tgz#28738c4ed7102e814d7a8a26d70018523fc7cd6d"
   integrity sha512-4c94OUGyobGnwcQI70OXyMhE/9T4aTgjU+CHxkd5c7D+jH/J0mKM/lk+jneFVKt7+E4/M0D9HzRPifu8U28Thw==
@@ -11258,16 +11285,7 @@ prosemirror-utils@^1.0.0-0:
   resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-1.0.0-0.tgz#7dfd112abf69001508a76200f9c8660fda7fa85f"
   integrity sha512-11hTMG4Qwqlux6Vwp/4m16mLDg6IwWb0/odsWXGtWvvRJo61SfG0RGYlA8H72vExmbnWpiXa7PNenZ6t12Rkqw==
 
-prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.16.0.tgz#024440a8e9acbbb5826572eef58c21c11cd1e454"
-  integrity sha512-iFtStCw2byF0yLc3mm1ezGdFSd6SWM4pnJod+ZaJiU5ju36QdYM4Xwa+qNm/AaI2/MgxpJqi8jsGWOJNkeBQ/Q==
-  dependencies:
-    prosemirror-model "^1.1.0"
-    prosemirror-state "^1.0.0"
-    prosemirror-transform "^1.1.0"
-
-prosemirror-view@^1.16.1:
+prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.16.1:
   version "1.16.1"
   resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.16.1.tgz#375794a253151205394bb1ece07bcc2a647c85da"
   integrity sha512-7iDdRf2PAIgOnstcxqUxzf8IbHGfxygQs5covfxOHLWKyx7SSLRnBIlwVda54Hr6N26F4t5Kj2jfK7uIBcAKAw==
@@ -11369,9 +11387,9 @@ punycode@^2.1.0, punycode@^2.1.1:
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 pupa@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.0.tgz#9e4ec587952b5e4f2c06fe577b0e7db97e8ef721"
-  integrity sha512-Pj8EhJzFiPwnf4dEXpuUWwH8M/Yl4vpl4cN2RX1i3R77DWvbY5ZPKni7CCKkOYxz+XKt2fieemsV+WTZbIlYzg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62"
+  integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==
   dependencies:
     escape-goat "^2.0.0"
 
@@ -11414,10 +11432,10 @@ querystringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
-queue-microtask@^1.1.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.1.4.tgz#40841ace4356b48b35b5ea61a2e1fe0a23c59ce1"
-  integrity sha512-eY/4Obve9cE5FK8YvC1cJsm5cr7XvAurul8UtBDJ2PR1p5NmAwHtvAt5ftcLtwYRCUKNhxCneZZlxmUDFoSeKA==
+queue-microtask@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.0.tgz#f27d002cbfac741072afa0e9af3a119b0e8724a3"
+  integrity sha512-J95OVUiS4b8qqmpqhCodN8yPpHG2mpZUPQ8tDGyIY0VhM+kBHszOuvsMJVGNQ1OH2BnTFbqz45i+2jGpDw9H0w==
 
 quick-lru@^1.0.0:
   version "1.1.0"
@@ -11434,7 +11452,7 @@ ramda@~0.26.1:
   resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.26.1.tgz#8d41351eb8111c55353617fc3bbffad8e4d35d06"
   integrity sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==
 
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.3, randombytes@^2.0.5, randombytes@^2.1.0:
+randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
@@ -12174,9 +12192,9 @@ run-async@^2.2.0:
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
 run-parallel@^1.1.9:
-  version "1.1.9"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
-  integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.10.tgz#60a51b2ae836636c81377df16cb107351bcd13ef"
+  integrity sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==
 
 run-queue@^1.0.0, run-queue@^1.0.3:
   version "1.0.3"
@@ -12541,15 +12559,16 @@ simple-get@^4.0.0:
     simple-concat "^1.0.0"
 
 simple-peer@^9.7.2:
-  version "9.7.2"
-  resolved "https://registry.yarnpkg.com/simple-peer/-/simple-peer-9.7.2.tgz#8cd9cb156bf456ad9c3d379119f0c39dfb3b20f7"
-  integrity sha512-xeMyxa9B4V0eA6mf17fVr8nm2QhAYFu+ZZv8zkSFFTjJETGF227CshwobrIYZuspJglMD63egcevQXGOrTIsuA==
+  version "9.8.0"
+  resolved "https://registry.yarnpkg.com/simple-peer/-/simple-peer-9.8.0.tgz#e84a6af664b0eb42dd1cb2349a69c7ad20051d1d"
+  integrity sha512-GK1KhJvEwtZILr6zWvQR3AnBNpLrxwr6b5wcduFxOrQNGLg9Hn92eFsHD7RYPnnWsapxGXFMJcBjNuicqBDRIQ==
   dependencies:
-    debug "^4.0.1"
-    get-browser-rtc "^1.0.0"
-    queue-microtask "^1.1.0"
-    randombytes "^2.0.3"
-    readable-stream "^3.4.0"
+    debug "^4.2.0"
+    err-code "^2.0.3"
+    get-browser-rtc "^1.0.2"
+    queue-microtask "^1.2.0"
+    randombytes "^2.1.0"
+    readable-stream "^3.6.0"
 
 simple-swizzle@^0.2.2:
   version "0.2.2"
@@ -13328,9 +13347,9 @@ tempfile@^2.0.0:
     uuid "^3.0.1"
 
 term-size@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753"
-  integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.1.tgz#2a6a54840432c2fb6320fea0f415531e90189f54"
+  integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==
 
 terser-webpack-plugin@^1.4.3:
   version "1.4.5"
@@ -13412,9 +13431,9 @@ timed-out@^4.0.0, timed-out@^4.0.1:
   integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
 
 timers-browserify@^2.0.4:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.11.tgz#800b1f3eee272e5bc53ee465a04d0e804c31211f"
-  integrity sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
+  integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
   dependencies:
     setimmediate "^1.0.4"
 
@@ -13560,9 +13579,9 @@ trim-repeated@^1.0.0:
     escape-string-regexp "^1.0.2"
 
 trim-trailing-lines@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz#7f0739881ff76657b7776e10874128004b625a94"
-  integrity sha512-4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz#bd4abbec7cc880462f10b2c8b5ce1d8d1ec7c2c0"
+  integrity sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==
 
 trim@0.0.1:
   version "0.0.1"
@@ -13724,9 +13743,9 @@ uglify-js@3.4.x:
     source-map "~0.6.1"
 
 uglify-js@^3.1.4:
-  version "3.11.3"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.3.tgz#b2f8c87826344f091ba48c417c499d6cba5d5786"
-  integrity sha512-wDRziHG94mNj2n3R864CvYw/+pc9y/RNImiTyrrf8BzgWn75JgFSwYvXrtZQMnMnOp/4UTrf3iCSQxSStPiByA==
+  version "3.11.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.4.tgz#b47b7ae99d4bd1dca65b53aaa69caa0909e6fadf"
+  integrity sha512-FyYnoxVL1D6+jDGQpbK5jW6y/2JlVfRfEeQ67BPCUg5wfCjaKOpr2XeceE4QL+MkhxliLtf5EbrMDZgzpt2CNw==
 
 uid-number@0.0.6:
   version "0.0.6"
@@ -13860,9 +13879,9 @@ unist-util-is@^3.0.0:
   integrity sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A==
 
 unist-util-is@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.2.tgz#c7d1341188aa9ce5b3cff538958de9895f14a5de"
-  integrity sha512-Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.0.3.tgz#e8b44db55fc20c43752b3346c116344d45d7c91d"
+  integrity sha512-bTofCFVx0iQM8Jqb1TBDVRIQW03YkD3p66JOd/aCWuqzlLyUtx1ZAGw/u+Zw+SttKvSVcvTiKYbfrtLoLefykw==
 
 unist-util-position@^3.0.0:
   version "3.1.0"
@@ -13948,6 +13967,11 @@ universalify@^1.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
   integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
 
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -14121,9 +14145,9 @@ uuid@^3.0.1, uuid@^3.3.2, uuid@^3.4.0:
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
 v8-compile-cache@^2.0.3:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz#54bc3cdd43317bca91e35dcaf305b1a7237de745"
-  integrity sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"
+  integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==
 
 validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.3:
   version "3.0.4"
@@ -14242,14 +14266,15 @@ vue-inbrowser-compiler-utils@^4.33.4:
     camelcase "^5.3.1"
 
 vue-inbrowser-compiler@^4.33.4:
-  version "4.33.4"
-  resolved "https://registry.yarnpkg.com/vue-inbrowser-compiler/-/vue-inbrowser-compiler-4.33.4.tgz#1a6604edc5ba5023a3688c5284efe8e739ad0da6"
-  integrity sha512-7CmoZaXMLQlA8DH3849OOeuYIhHTC0jHYNsrCxN/nBp/1wD+4e6tAedE5yqcy0zw8qfXRmK5Sl/TZW4GZA8lzg==
+  version "4.33.5"
+  resolved "https://registry.yarnpkg.com/vue-inbrowser-compiler/-/vue-inbrowser-compiler-4.33.5.tgz#f6611a9d8e66be547b54265ee6171effe87d2bcd"
+  integrity sha512-uXhOfOSgQe6ax8qfg1E7wN9t81nqkmqSMHSqCrBsaACgOlyPWSTF3Xw3oiJtqbNahwjPW5Au8U4vp9diP7GvxQ==
   dependencies:
     acorn "^6.1.1"
     acorn-jsx "^5.0.1"
     buble "^0.19.7"
     camelcase "^5.3.1"
+    detect-browser "^5.2.0"
     vue-inbrowser-compiler-utils "^4.33.4"
     walkes "^0.2.1"
 
@@ -14272,9 +14297,9 @@ vue-live@^1.15.1:
     vue-template-compiler "^2.6.12"
 
 vue-loader@^15.7.1:
-  version "15.9.3"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.3.tgz#0de35d9e555d3ed53969516cac5ce25531299dda"
-  integrity sha512-Y67VnGGgVLH5Voostx8JBZgPQTlDQeOVBLOEsjc2cXbCYBKexSKEpOA56x0YZofoDOTszrLnIShyOX1p9uCEHA==
+  version "15.9.4"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.4.tgz#c2ecef8a1a0802ac76c6d686641b5dde522ae267"
+  integrity sha512-58YX00oCYre2/+Hu7wwV/2Bpml15/PUHni8LcmpRF1ofiOZJJ+oYt1g3J8BRyE2ZrkMWiy95fZynnZRmMdErEQ==
   dependencies:
     "@vue/component-compiler-utils" "^3.1.0"
     hash-sum "^1.0.2"
@@ -14295,9 +14320,9 @@ vue-prism-editor@^1.2.2:
   integrity sha512-Lq2VgVygTx3Whn/tC8gD4m1ajA4lzSyCTqPLZA1Dq/ErbBaZA93FWRblwCoDR7AD2nXhGWuiTzb5ih3guzB7DA==
 
 vue-router@^3.1.3:
-  version "3.4.7"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.7.tgz#bf189bafd16f4e4ef783c4a6250a3090f2c1fa1b"
-  integrity sha512-CbHXue5BLrDivOk5O4eZ0WT4Yj8XwdXa4kCnsEIOzYUPF/07ZukayA2jGxDCJxLc9SgVQX9QX0OuGOwGlVB4Qg==
+  version "3.4.8"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.8.tgz#2c06261d35d8075893470352d42d70b6287b8194"
+  integrity sha512-3BsR84AqarcmweXjItxw3jwQsiYNssYg090yi4rlzTnCJxmHtkyCvhNz9Z7qRSOkmiV485KkUCReTp5AjNY4wg==
 
 vue-server-renderer@^2.6.10:
   version "2.6.12"
@@ -14786,8 +14811,8 @@ yauzl@^2.10.0, yauzl@^2.4.2:
     fd-slicer "~1.1.0"
 
 yjs@^13.4.1:
-  version "13.4.1"
-  resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.4.1.tgz#5ef869eb2e64f028eb013952a5f28412a084dc90"
-  integrity sha512-kIh0sprCTzIm2qyr1VsovkvjKzD2GR4WcU/McJpLAEvImCJHA78Q3S6uSLnhZX0i7FQdrLPCRT8DtTPEH73jnw==
+  version "13.4.2"
+  resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.4.2.tgz#565fff706064e6fe59b75cc08dd724b2ac4f3783"
+  integrity sha512-HtlrDT55db2Gtu09UDijDCCH+7FLG2FX+TRP0ySZJZYPj22qkinS2oAcuzjKbsJ1Ed0RSJGSgUE6ImagFdMJvA==
   dependencies:
     lib0 "^0.2.33"

From 97831ea8e5ea726c540107bec1ea492fcfb7b763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sun, 1 Nov 2020 00:28:46 +0100
Subject: [PATCH 058/113] add typography extension

---
 docs/src/demos/Examples/Basic/index.vue    |  6 ++++-
 packages/extension-typography/index.ts     | 30 ++++++++++++++++++++++
 packages/extension-typography/package.json | 21 +++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 packages/extension-typography/index.ts
 create mode 100644 packages/extension-typography/package.json

diff --git a/docs/src/demos/Examples/Basic/index.vue b/docs/src/demos/Examples/Basic/index.vue
index 38fabd2a9..e87a4d2db 100644
--- a/docs/src/demos/Examples/Basic/index.vue
+++ b/docs/src/demos/Examples/Basic/index.vue
@@ -68,6 +68,7 @@
 
 <script>
 import { Editor, EditorContent, defaultExtensions } from '@tiptap/vue-starter-kit'
+import Typography from '@tiptap/extension-typography'
 
 export default {
   components: {
@@ -82,7 +83,10 @@ export default {
 
   mounted() {
     this.editor = new Editor({
-      extensions: defaultExtensions(),
+      extensions: [
+        ...defaultExtensions(),
+        Typography(),
+      ],
       content: `
         <h2>
           Hi there,
diff --git a/packages/extension-typography/index.ts b/packages/extension-typography/index.ts
new file mode 100644
index 000000000..199b74ade
--- /dev/null
+++ b/packages/extension-typography/index.ts
@@ -0,0 +1,30 @@
+import { createExtension } from '@tiptap/core'
+import {
+  emDash,
+  ellipsis,
+  openDoubleQuote,
+  closeDoubleQuote,
+  openSingleQuote,
+  closeSingleQuote,
+} from 'prosemirror-inputrules'
+
+const Typography = createExtension({
+  addInputRules() {
+    return [
+      emDash,
+      ellipsis,
+      openDoubleQuote,
+      closeDoubleQuote,
+      openSingleQuote,
+      closeSingleQuote,
+    ]
+  },
+})
+
+export default Typography
+
+declare module '@tiptap/core/src/Editor' {
+  interface AllExtensions {
+    Typography: typeof Typography,
+  }
+}
diff --git a/packages/extension-typography/package.json b/packages/extension-typography/package.json
new file mode 100644
index 000000000..7998d7f27
--- /dev/null
+++ b/packages/extension-typography/package.json
@@ -0,0 +1,21 @@
+{
+  "name": "@tiptap/extension-typography",
+  "version": "1.0.0",
+  "source": "index.ts",
+  "main": "dist/tiptap-extension-typography.js",
+  "umd:main": "dist/tiptap-extension-typography.umd.js",
+  "module": "dist/tiptap-extension-typography.mjs",
+  "unpkg": "dist/tiptap-extension-typography.js",
+  "jsdelivr": "dist/tiptap-extension-typography.js",
+  "files": [
+    "src",
+    "dist"
+  ],
+  "peerDependencies": {
+    "@tiptap/core": "2.x"
+  },
+  "dependencies": {
+    "@types/prosemirror-inputrules": "^1.0.3",
+    "prosemirror-inputrules": "^1.1.3"
+  }
+}

From 9f6087f36ffeb2c3ebb990cb0693690dcb01ce21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sun, 1 Nov 2020 00:35:14 +0100
Subject: [PATCH 059/113] revert changes in demo

---
 docs/src/demos/Examples/Basic/index.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/src/demos/Examples/Basic/index.vue b/docs/src/demos/Examples/Basic/index.vue
index e87a4d2db..38fabd2a9 100644
--- a/docs/src/demos/Examples/Basic/index.vue
+++ b/docs/src/demos/Examples/Basic/index.vue
@@ -68,7 +68,6 @@
 
 <script>
 import { Editor, EditorContent, defaultExtensions } from '@tiptap/vue-starter-kit'
-import Typography from '@tiptap/extension-typography'
 
 export default {
   components: {
@@ -83,10 +82,7 @@ export default {
 
   mounted() {
     this.editor = new Editor({
-      extensions: [
-        ...defaultExtensions(),
-        Typography(),
-      ],
+      extensions: defaultExtensions(),
       content: `
         <h2>
           Hi there,

From 8e480f86b901096de7013383e5cbf4c4dbb0c6d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sun, 1 Nov 2020 15:38:10 +0100
Subject: [PATCH 060/113] fix build

---
 package.json              |  1 +
 packages/vue/package.json |  3 +++
 yarn.lock                 | 19 +++++++++++++------
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index fe3a59d48..b17526d19 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-vue": "^7.0.1",
     "lerna": "^3.22.1",
+    "levenary": "^1.1.1",
     "microbundle": "^0.12.4",
     "typedoc": "^0.19.2",
     "typescript": "^4.0.5",
diff --git a/packages/vue/package.json b/packages/vue/package.json
index 2b0cd20b9..9b75481d3 100644
--- a/packages/vue/package.json
+++ b/packages/vue/package.json
@@ -14,5 +14,8 @@
   "peerDependencies": {
     "@tiptap/core": "2.x",
     "vue": "2.x"
+  },
+  "dependencies": {
+    "prosemirror-view": "^1.16.1"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 96c5238eb..324e2482d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8560,6 +8560,13 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
+levenary@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz#842a9ee98d2075aa7faeedbe32679e9205f46f77"
+  integrity sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==
+  dependencies:
+    leven "^3.1.0"
+
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -11727,9 +11734,9 @@ regenerate-unicode-properties@^8.2.0:
     regenerate "^1.4.0"
 
 regenerate@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz#cad92ad8e6b591773485fbe05a485caf4f457e6f"
-  integrity sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@^0.13.4:
   version "0.13.7"
@@ -12175,9 +12182,9 @@ rollup@^1.32.1:
     acorn "^7.1.0"
 
 rollup@^2.26.11:
-  version "2.32.1"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.32.1.tgz#625a92c54f5b4d28ada12d618641491d4dbb548c"
-  integrity sha512-Op2vWTpvK7t6/Qnm1TTh7VjEZZkN8RWgf0DHbkKzQBwNf748YhXbozHVefqpPp/Fuyk/PQPAnYsBxAEtlMvpUw==
+  version "2.33.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.0.tgz#dc105b312e2817f996d0b6a192b7033f607ef08d"
+  integrity sha512-7jFrmKgQj1GOWlC8rExHaPcv2SQnWMv1BFUyH/xWS5w80h6132wBUWp/qTvQkAbnlqGvi13T6iP2kHo9Sb2HxA==
   optionalDependencies:
     fsevents "~2.1.2"
 

From ca5a60b7a28001106f0e7b52dca15fa17cdf384d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 11:16:18 +0100
Subject: [PATCH 061/113] improve toggleList

---
 packages/core/src/extensions/index.ts      |  1 +
 packages/core/src/extensions/toggleList.ts | 16 ++++++++++++++-
 packages/core/src/extensions/wrapInList.ts | 23 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 packages/core/src/extensions/wrapInList.ts

diff --git a/packages/core/src/extensions/index.ts b/packages/core/src/extensions/index.ts
index caaade841..453aa847a 100644
--- a/packages/core/src/extensions/index.ts
+++ b/packages/core/src/extensions/index.ts
@@ -21,3 +21,4 @@ export { ToggleList } from './toggleList'
 export { ToggleMark } from './toggleMark'
 export { UpdateMark } from './updateMark'
 export { ToggleWrap } from './toggleWrap'
+export { WrapInList } from './wrapInList'
diff --git a/packages/core/src/extensions/toggleList.ts b/packages/core/src/extensions/toggleList.ts
index a0bc3288a..b9ed6f1a2 100644
--- a/packages/core/src/extensions/toggleList.ts
+++ b/packages/core/src/extensions/toggleList.ts
@@ -9,7 +9,9 @@ import isList from '../utils/isList'
 export const ToggleList = createExtension({
   addCommands() {
     return {
-      toggleList: (listTypeOrName: string | NodeType, itemTypeOrName: string | NodeType): Command => ({ tr, state, dispatch }) => {
+      toggleList: (listTypeOrName: string | NodeType, itemTypeOrName: string | NodeType): Command => ({
+        tr, state, dispatch, chain,
+      }) => {
         const { extensions } = this.editor.options
         const listType = getNodeType(listTypeOrName, state.schema)
         const itemType = getNodeType(itemTypeOrName, state.schema)
@@ -24,10 +26,12 @@ export const ToggleList = createExtension({
         const parentList = findParentNode(node => isList(node.type.name, extensions))(selection)
 
         if (range.depth >= 1 && parentList && range.depth - parentList.depth <= 1) {
+          // remove list
           if (parentList.node.type === listType) {
             return liftListItem(itemType)(state, dispatch)
           }
 
+          // change list type
           if (isList(parentList.node.type.name, extensions) && listType.validContent(parentList.node.content)) {
             tr.setNodeMarkup(parentList.pos, listType)
 
@@ -35,6 +39,16 @@ export const ToggleList = createExtension({
           }
         }
 
+        const canWrapInList = wrapInList(listType)(state)
+
+        // try to convert node to paragraph if needed
+        if (!canWrapInList) {
+          return chain()
+            .setBlockType('paragraph')
+            .wrapInList(listType)
+            .run()
+        }
+
         return wrapInList(listType)(state, dispatch)
       },
     }
diff --git a/packages/core/src/extensions/wrapInList.ts b/packages/core/src/extensions/wrapInList.ts
new file mode 100644
index 000000000..6cd8efbf8
--- /dev/null
+++ b/packages/core/src/extensions/wrapInList.ts
@@ -0,0 +1,23 @@
+import { wrapInList } from 'prosemirror-schema-list'
+import { NodeType } from 'prosemirror-model'
+import { Command } from '../Editor'
+import { createExtension } from '../Extension'
+import getNodeType from '../utils/getNodeType'
+
+export const WrapInList = createExtension({
+  addCommands() {
+    return {
+      wrapInList: (typeOrName: string | NodeType, attrs?: {}): Command => ({ state, dispatch }) => {
+        const type = getNodeType(typeOrName, state.schema)
+
+        return wrapInList(type, attrs)(state, dispatch)
+      },
+    }
+  },
+})
+
+declare module '../Editor' {
+  interface AllExtensions {
+    WrapInList: typeof WrapInList,
+  }
+}

From bfc58caea5ef013e77e92cc240d8dffec53f83e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 11:16:31 +0100
Subject: [PATCH 062/113] add list group

---
 packages/extension-bullet-list/index.ts  | 2 +-
 packages/extension-document/index.ts     | 2 +-
 packages/extension-list-item/index.ts    | 2 +-
 packages/extension-ordered-list/index.ts | 2 +-
 packages/extension-task-list/index.ts    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/extension-bullet-list/index.ts b/packages/extension-bullet-list/index.ts
index e116ca3c3..c2532933c 100644
--- a/packages/extension-bullet-list/index.ts
+++ b/packages/extension-bullet-list/index.ts
@@ -8,7 +8,7 @@ const BulletList = createNode({
 
   list: true,
 
-  group: 'block',
+  group: 'list',
 
   content: 'list_item+',
 
diff --git a/packages/extension-document/index.ts b/packages/extension-document/index.ts
index d569b12f9..0a05a1ff0 100644
--- a/packages/extension-document/index.ts
+++ b/packages/extension-document/index.ts
@@ -3,7 +3,7 @@ import { createNode } from '@tiptap/core'
 const Document = createNode({
   name: 'document',
   topNode: true,
-  content: 'block+',
+  content: '(block|list)+',
 })
 
 export default Document
diff --git a/packages/extension-list-item/index.ts b/packages/extension-list-item/index.ts
index 88cfca70d..a36a95be9 100644
--- a/packages/extension-list-item/index.ts
+++ b/packages/extension-list-item/index.ts
@@ -3,7 +3,7 @@ import { createNode } from '@tiptap/core'
 const ListItem = createNode({
   name: 'list_item',
 
-  content: 'paragraph block*',
+  content: '(paragraph|list)+',
 
   defining: true,
 
diff --git a/packages/extension-ordered-list/index.ts b/packages/extension-ordered-list/index.ts
index e9d6e4694..ed2401645 100644
--- a/packages/extension-ordered-list/index.ts
+++ b/packages/extension-ordered-list/index.ts
@@ -8,7 +8,7 @@ const OrderedList = createNode({
 
   list: true,
 
-  group: 'block',
+  group: 'list',
 
   content: 'list_item+',
 
diff --git a/packages/extension-task-list/index.ts b/packages/extension-task-list/index.ts
index bd73d1e23..cd440ce0e 100644
--- a/packages/extension-task-list/index.ts
+++ b/packages/extension-task-list/index.ts
@@ -5,7 +5,7 @@ const TaskList = createNode({
 
   list: true,
 
-  group: 'block',
+  group: 'list',
 
   content: 'task_item+',
 

From 3dc25640c9044f80872a6aa351e62f80bbc316d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 11:18:44 +0100
Subject: [PATCH 063/113] remove list option

---
 packages/core/src/NodeExtension.ts       | 6 ------
 packages/core/src/utils/isList.ts        | 2 +-
 packages/extension-bullet-list/index.ts  | 2 --
 packages/extension-ordered-list/index.ts | 2 --
 packages/extension-task-list/index.ts    | 2 --
 5 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/packages/core/src/NodeExtension.ts b/packages/core/src/NodeExtension.ts
index e11610b87..d7401cd13 100644
--- a/packages/core/src/NodeExtension.ts
+++ b/packages/core/src/NodeExtension.ts
@@ -12,11 +12,6 @@ export interface NodeExtensionSpec<Options = {}, Commands = {}> extends Overwrit
    */
   topNode?: boolean,
 
-  /**
-   * List
-   */
-  list?: boolean,
-
   /**
    * Content
    */
@@ -167,7 +162,6 @@ const defaultNode: NodeExtension = {
   type: 'node',
   name: 'node',
   topNode: false,
-  list: false,
   content: null,
   marks: null,
   group: null,
diff --git a/packages/core/src/utils/isList.ts b/packages/core/src/utils/isList.ts
index 3a5a23059..5c169e4fc 100644
--- a/packages/core/src/utils/isList.ts
+++ b/packages/core/src/utils/isList.ts
@@ -9,5 +9,5 @@ export default function isList(name: string, extensions: Extensions) {
     return false
   }
 
-  return extension.list
+  return extension.group === 'list'
 }
diff --git a/packages/extension-bullet-list/index.ts b/packages/extension-bullet-list/index.ts
index c2532933c..db615f6e9 100644
--- a/packages/extension-bullet-list/index.ts
+++ b/packages/extension-bullet-list/index.ts
@@ -6,8 +6,6 @@ export const inputRegex = /^\s*([-+*])\s$/
 const BulletList = createNode({
   name: 'bullet_list',
 
-  list: true,
-
   group: 'list',
 
   content: 'list_item+',
diff --git a/packages/extension-ordered-list/index.ts b/packages/extension-ordered-list/index.ts
index ed2401645..779529513 100644
--- a/packages/extension-ordered-list/index.ts
+++ b/packages/extension-ordered-list/index.ts
@@ -6,8 +6,6 @@ export const inputRegex = /^(\d+)\.\s$/
 const OrderedList = createNode({
   name: 'ordered_list',
 
-  list: true,
-
   group: 'list',
 
   content: 'list_item+',
diff --git a/packages/extension-task-list/index.ts b/packages/extension-task-list/index.ts
index cd440ce0e..d1e8a1f5c 100644
--- a/packages/extension-task-list/index.ts
+++ b/packages/extension-task-list/index.ts
@@ -3,8 +3,6 @@ import { Command, createNode, mergeAttributes } from '@tiptap/core'
 const TaskList = createNode({
   name: 'task_list',
 
-  list: true,
-
   group: 'list',
 
   content: 'task_item+',

From 85c1a8ace9102521b4f15a0d466aa9259f64fd24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 12:45:19 +0100
Subject: [PATCH 064/113] add clearNodes command

---
 packages/core/src/extensions/clearNodes.ts | 42 ++++++++++++++++++++++
 packages/core/src/extensions/index.ts      |  1 +
 packages/core/src/extensions/toggleList.ts |  3 +-
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 packages/core/src/extensions/clearNodes.ts

diff --git a/packages/core/src/extensions/clearNodes.ts b/packages/core/src/extensions/clearNodes.ts
new file mode 100644
index 000000000..5d7557676
--- /dev/null
+++ b/packages/core/src/extensions/clearNodes.ts
@@ -0,0 +1,42 @@
+import { liftTarget } from 'prosemirror-transform'
+import { Command } from '../Editor'
+import { createExtension } from '../Extension'
+
+export const ClearNodes = createExtension({
+  addCommands() {
+    return {
+      clearNodes: (): Command => ({ state, tr }) => {
+        const { selection } = tr
+        const { from, to } = selection
+
+        state.doc.nodesBetween(from, to, (node, pos) => {
+          if (!node.type.isText) {
+            const fromPos = tr.doc.resolve(tr.mapping.map(pos + 1))
+            const toPos = tr.doc.resolve(tr.mapping.map(pos + node.nodeSize - 1))
+            const nodeRange = fromPos.blockRange(toPos)
+
+            if (nodeRange) {
+              const targetLiftDepth = liftTarget(nodeRange)
+
+              if (node.type.isTextblock) {
+                tr.setNodeMarkup(nodeRange.start, state.schema.nodes.paragraph)
+              }
+
+              if (targetLiftDepth || targetLiftDepth === 0) {
+                tr.lift(nodeRange, targetLiftDepth)
+              }
+            }
+          }
+        })
+
+        return true
+      },
+    }
+  },
+})
+
+declare module '../Editor' {
+  interface AllExtensions {
+    ClearNodes: typeof ClearNodes,
+  }
+}
diff --git a/packages/core/src/extensions/index.ts b/packages/core/src/extensions/index.ts
index 453aa847a..d90067232 100644
--- a/packages/core/src/extensions/index.ts
+++ b/packages/core/src/extensions/index.ts
@@ -1,5 +1,6 @@
 export { Blur } from './blur'
 export { ClearContent } from './clearContent'
+export { ClearNodes } from './clearNodes'
 export { DeleteSelection } from './deleteSelection'
 export { Focus } from './focus'
 export { InsertHTML } from './insertHTML'
diff --git a/packages/core/src/extensions/toggleList.ts b/packages/core/src/extensions/toggleList.ts
index b9ed6f1a2..ccf302cee 100644
--- a/packages/core/src/extensions/toggleList.ts
+++ b/packages/core/src/extensions/toggleList.ts
@@ -44,7 +44,8 @@ export const ToggleList = createExtension({
         // try to convert node to paragraph if needed
         if (!canWrapInList) {
           return chain()
-            .setBlockType('paragraph')
+            // .setBlockType('paragraph')
+            .clearNodes()
             .wrapInList(listType)
             .run()
         }

From 8f4abb720ae38d91fb31a8b7b936eac8faa76d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 14:29:58 +0100
Subject: [PATCH 065/113] add can method

---
 packages/core/src/CommandManager.ts        | 25 +++++++++++++++++-----
 packages/core/src/Editor.ts                |  1 +
 packages/core/src/extensions/toggleList.ts |  7 +++---
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/packages/core/src/CommandManager.ts b/packages/core/src/CommandManager.ts
index c9352af28..7d5fb89fb 100644
--- a/packages/core/src/CommandManager.ts
+++ b/packages/core/src/CommandManager.ts
@@ -57,7 +57,7 @@ export default class CommandManager {
     }
   }
 
-  public createChain(startTr?: Transaction) {
+  public createChain(startTr?: Transaction, shouldDispatch = true) {
     const { commands, editor } = this
     const { state, view } = editor
     const callbacks: boolean[] = []
@@ -71,7 +71,7 @@ export default class CommandManager {
     return new Proxy({}, {
       get: (_, name: string, proxy) => {
         if (name === 'run') {
-          if (!hasStartTransaction) {
+          if (!hasStartTransaction && shouldDispatch) {
             view.dispatch(tr)
           }
 
@@ -85,7 +85,7 @@ export default class CommandManager {
         }
 
         return (...args: any) => {
-          const props = this.buildProps(tr)
+          const props = this.buildProps(tr, shouldDispatch)
           const callback = command(...args)(props)
           callbacks.push(callback)
 
@@ -95,7 +95,7 @@ export default class CommandManager {
     }) as ChainedCommands
   }
 
-  public buildProps(tr: Transaction) {
+  public buildProps(tr: Transaction, shouldDispatch = true) {
     const { editor, commands } = this
     const { state, view } = editor
 
@@ -104,8 +104,23 @@ export default class CommandManager {
       editor,
       view,
       state: this.chainableState(tr, state),
-      dispatch: () => false,
+      dispatch: shouldDispatch
+        ? () => true
+        : undefined,
       chain: () => this.createChain(tr),
+      can: () => {
+        const dispatch = false
+        const formattedCommands = Object.fromEntries(Object
+          .entries(commands)
+          .map(([name, command]) => {
+            return [name, (...args: any[]) => command(...args)({ ...props, dispatch })]
+          }))
+
+        return {
+          ...formattedCommands,
+          chain: () => this.createChain(tr, dispatch),
+        }
+      },
       get commands() {
         return Object.fromEntries(Object
           .entries(commands)
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 238140df4..91fa36e90 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -23,6 +23,7 @@ export type Command = (props: {
   editor: Editor,
   tr: Transaction,
   commands: SingleCommands,
+  can: () => SingleCommands & { chain: () => ChainedCommands },
   chain: () => ChainedCommands,
   state: EditorState,
   view: EditorView,
diff --git a/packages/core/src/extensions/toggleList.ts b/packages/core/src/extensions/toggleList.ts
index ccf302cee..64d3167e8 100644
--- a/packages/core/src/extensions/toggleList.ts
+++ b/packages/core/src/extensions/toggleList.ts
@@ -10,7 +10,7 @@ export const ToggleList = createExtension({
   addCommands() {
     return {
       toggleList: (listTypeOrName: string | NodeType, itemTypeOrName: string | NodeType): Command => ({
-        tr, state, dispatch, chain,
+        tr, state, dispatch, chain, commands, can,
       }) => {
         const { extensions } = this.editor.options
         const listType = getNodeType(listTypeOrName, state.schema)
@@ -39,18 +39,17 @@ export const ToggleList = createExtension({
           }
         }
 
-        const canWrapInList = wrapInList(listType)(state)
+        const canWrapInList = can().wrapInList(listType)
 
         // try to convert node to paragraph if needed
         if (!canWrapInList) {
           return chain()
-            // .setBlockType('paragraph')
             .clearNodes()
             .wrapInList(listType)
             .run()
         }
 
-        return wrapInList(listType)(state, dispatch)
+        return commands.wrapInList(listType)
       },
     }
   },

From a97ffc41f44adecff4ce8261f3a2f742266c136e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 14:30:08 +0100
Subject: [PATCH 066/113] add clear nodes button

---
 docs/src/demos/Examples/Basic/index.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/src/demos/Examples/Basic/index.vue b/docs/src/demos/Examples/Basic/index.vue
index 38fabd2a9..53770c6d2 100644
--- a/docs/src/demos/Examples/Basic/index.vue
+++ b/docs/src/demos/Examples/Basic/index.vue
@@ -14,7 +14,10 @@
         code
       </button>
       <button @click="editor.chain().focus().removeMarks().run()">
-        clear format
+        clear marks
+      </button>
+      <button @click="editor.chain().focus().clearNodes().run()">
+        clear nodes
       </button>
       <button @click="editor.chain().focus().paragraph().run()" :class="{ 'is-active': editor.isActive('paragraph') }">
         paragraph

From 2bc02e50e0fe4e96cda821c6d1736e7ac77856d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 14:46:18 +0100
Subject: [PATCH 067/113] improve commands

---
 packages/core/src/Editor.ts                |  2 +-
 packages/core/src/extensions/toggleList.ts |  9 +++++----
 packages/extension-hard-break/index.ts     | 20 +++++++++++++-------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 91fa36e90..0c8355e46 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -27,7 +27,7 @@ export type Command = (props: {
   chain: () => ChainedCommands,
   state: EditorState,
   view: EditorView,
-  dispatch: (args?: any) => any,
+  dispatch: ((args?: any) => any) | undefined,
 }) => boolean
 
 export type CommandSpec = (...args: any[]) => Command
diff --git a/packages/core/src/extensions/toggleList.ts b/packages/core/src/extensions/toggleList.ts
index 64d3167e8..acfaf05b5 100644
--- a/packages/core/src/extensions/toggleList.ts
+++ b/packages/core/src/extensions/toggleList.ts
@@ -1,4 +1,3 @@
-import { wrapInList, liftListItem } from 'prosemirror-schema-list'
 import { findParentNode } from 'prosemirror-utils'
 import { NodeType } from 'prosemirror-model'
 import { Command } from '../Editor'
@@ -28,14 +27,16 @@ export const ToggleList = createExtension({
         if (range.depth >= 1 && parentList && range.depth - parentList.depth <= 1) {
           // remove list
           if (parentList.node.type === listType) {
-            return liftListItem(itemType)(state, dispatch)
+            return commands.liftListItem(itemType)
           }
 
           // change list type
           if (isList(parentList.node.type.name, extensions) && listType.validContent(parentList.node.content)) {
-            tr.setNodeMarkup(parentList.pos, listType)
+            if (dispatch) {
+              tr.setNodeMarkup(parentList.pos, listType)
+            }
 
-            return false
+            return true
           }
         }
 
diff --git a/packages/extension-hard-break/index.ts b/packages/extension-hard-break/index.ts
index 69c0d4dc1..f8e062b16 100644
--- a/packages/extension-hard-break/index.ts
+++ b/packages/extension-hard-break/index.ts
@@ -22,13 +22,19 @@ const HardBreak = createNode({
 
   addCommands() {
     return {
-      hardBreak: (): Command => ({
-        tr, state, dispatch, view,
-      }) => {
-        return chainCommands(exitCode, () => {
-          dispatch(tr.replaceSelectionWith(this.type.create()).scrollIntoView())
-          return true
-        })(state, dispatch, view)
+      hardBreak: (): Command => ({ state, dispatch, view }) => {
+        return chainCommands(
+          exitCode,
+          (_, d) => {
+            if (typeof d !== 'function') {
+              return false
+            }
+
+            d(state.tr.replaceSelectionWith(this.type.create()).scrollIntoView())
+
+            return true
+          },
+        )(state, dispatch, view)
       },
     }
   },

From a5d1c76f4038b558863f2a3033dfb2c26725d6ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 15:18:03 +0100
Subject: [PATCH 068/113] fix broken document

---
 packages/core/src/utils/isList.ts        | 9 ++++++++-
 packages/extension-bullet-list/index.ts  | 2 +-
 packages/extension-document/index.ts     | 2 +-
 packages/extension-list-item/index.ts    | 2 +-
 packages/extension-ordered-list/index.ts | 2 +-
 packages/extension-task-list/index.ts    | 2 +-
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/core/src/utils/isList.ts b/packages/core/src/utils/isList.ts
index 5c169e4fc..860e3f64f 100644
--- a/packages/core/src/utils/isList.ts
+++ b/packages/core/src/utils/isList.ts
@@ -1,5 +1,6 @@
 import { Extensions } from '../types'
 import splitExtensions from './splitExtensions'
+import callOrReturn from './callOrReturn'
 
 export default function isList(name: string, extensions: Extensions) {
   const { nodeExtensions } = splitExtensions(extensions)
@@ -9,5 +10,11 @@ export default function isList(name: string, extensions: Extensions) {
     return false
   }
 
-  return extension.group === 'list'
+  const groups = callOrReturn(extension.group, { options: extension.options })
+
+  if (typeof groups !== 'string') {
+    return false
+  }
+
+  return groups.split(' ').includes('list')
 }
diff --git a/packages/extension-bullet-list/index.ts b/packages/extension-bullet-list/index.ts
index db615f6e9..66ec461bb 100644
--- a/packages/extension-bullet-list/index.ts
+++ b/packages/extension-bullet-list/index.ts
@@ -6,7 +6,7 @@ export const inputRegex = /^\s*([-+*])\s$/
 const BulletList = createNode({
   name: 'bullet_list',
 
-  group: 'list',
+  group: 'block list',
 
   content: 'list_item+',
 
diff --git a/packages/extension-document/index.ts b/packages/extension-document/index.ts
index 0a05a1ff0..d569b12f9 100644
--- a/packages/extension-document/index.ts
+++ b/packages/extension-document/index.ts
@@ -3,7 +3,7 @@ import { createNode } from '@tiptap/core'
 const Document = createNode({
   name: 'document',
   topNode: true,
-  content: '(block|list)+',
+  content: 'block+',
 })
 
 export default Document
diff --git a/packages/extension-list-item/index.ts b/packages/extension-list-item/index.ts
index a36a95be9..aa267107a 100644
--- a/packages/extension-list-item/index.ts
+++ b/packages/extension-list-item/index.ts
@@ -3,7 +3,7 @@ import { createNode } from '@tiptap/core'
 const ListItem = createNode({
   name: 'list_item',
 
-  content: '(paragraph|list)+',
+  content: '(paragraph|list?)+',
 
   defining: true,
 
diff --git a/packages/extension-ordered-list/index.ts b/packages/extension-ordered-list/index.ts
index 779529513..35c7ac92d 100644
--- a/packages/extension-ordered-list/index.ts
+++ b/packages/extension-ordered-list/index.ts
@@ -6,7 +6,7 @@ export const inputRegex = /^(\d+)\.\s$/
 const OrderedList = createNode({
   name: 'ordered_list',
 
-  group: 'list',
+  group: 'block list',
 
   content: 'list_item+',
 
diff --git a/packages/extension-task-list/index.ts b/packages/extension-task-list/index.ts
index d1e8a1f5c..b4e0cb831 100644
--- a/packages/extension-task-list/index.ts
+++ b/packages/extension-task-list/index.ts
@@ -3,7 +3,7 @@ import { Command, createNode, mergeAttributes } from '@tiptap/core'
 const TaskList = createNode({
   name: 'task_list',
 
-  group: 'list',
+  group: 'block list',
 
   content: 'task_item+',
 

From 7ef3c04a2f974ae266a1cd3f3cd2ef092e829699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 15:22:12 +0100
Subject: [PATCH 069/113] fix lock file

---
 yarn.lock | 70 +++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 324e2482d..0388b1988 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1972,16 +1972,16 @@
     fastq "^1.6.0"
 
 "@octokit/auth-token@^2.4.0":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.2.tgz#10d0ae979b100fa6b72fa0e8e63e27e6d0dbff8a"
-  integrity sha512-jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ==
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.3.tgz#b868b5f2366533a7e62933eaa1181a8924228cc4"
+  integrity sha512-fdGoOQ3kQJh+hrilc0Plg50xSfaCKOeYN9t6dpJKXN9BxhhfquL0OzoQXg3spLYymL5rm29uPeI3KEXRaZQ9zg==
   dependencies:
     "@octokit/types" "^5.0.0"
 
 "@octokit/endpoint@^6.0.1":
-  version "6.0.8"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.8.tgz#91b07e236fdb69929c678c6439f7a560dc6058ac"
-  integrity sha512-MuRrgv+bM4Q+e9uEvxAB/Kf+Sj0O2JAOBA131uo1o6lgdq1iS8ejKwtqHgdfY91V3rN9R/hdGKFiQYMzVzVBEQ==
+  version "6.0.9"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.9.tgz#c6a772e024202b1bd19ab69f90e0536a2598b13e"
+  integrity sha512-3VPLbcCuqji4IFTclNUtGdp9v7g+nspWdiCUbK3+iPMjJCZ6LEhn1ts626bWLOn0GiDb6j+uqGvPpqLnY7pBgw==
   dependencies:
     "@octokit/types" "^5.0.0"
     is-plain-object "^5.0.0"
@@ -2022,18 +2022,18 @@
     once "^1.4.0"
 
 "@octokit/request-error@^2.0.0":
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.2.tgz#0e76b83f5d8fdda1db99027ea5f617c2e6ba9ed0"
-  integrity sha512-2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.3.tgz#b51b200052bf483f6fa56c9e7e3aa51ead36ecd8"
+  integrity sha512-GgD5z8Btm301i2zfvJLk/mkhvGCdjQ7wT8xF9ov5noQY8WbKZDH9cOBqXzoeKd1mLr1xH2FwbtGso135zGBgTA==
   dependencies:
     "@octokit/types" "^5.0.1"
     deprecation "^2.0.0"
     once "^1.4.0"
 
 "@octokit/request@^5.2.0":
-  version "5.4.9"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.9.tgz#0a46f11b82351b3416d3157261ad9b1558c43365"
-  integrity sha512-CzwVvRyimIM1h2n9pLVYfTDmX9m+KHSgCpqPsY8F1NdEK8IaWqXhSBXsdjOBFZSpEcxNEeg4p0UO9cQ8EnOCLA==
+  version "5.4.10"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.10.tgz#402d2c53768bde12b99348329ba4129746aebb9c"
+  integrity sha512-egA49HkqEORVGDZGav1mh+VD+7uLgOxtn5oODj6guJk0HCy+YBSYapFkSLFgeYj3Fr18ZULKGURkjyhkAChylw==
   dependencies:
     "@octokit/endpoint" "^6.0.1"
     "@octokit/request-error" "^2.0.0"
@@ -3589,14 +3589,14 @@ browserify-zlib@^0.2.0:
     pako "~1.0.5"
 
 browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.5:
-  version "4.14.5"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz#1c751461a102ddc60e40993639b709be7f2c4015"
-  integrity sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==
+  version "4.14.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.6.tgz#97702a9c212e0c6b6afefad913d3a1538e348457"
+  integrity sha512-zeFYcUo85ENhc/zxHbiIp0LGzzTrE2Pv2JhxvS7kpUb9Q9D38kUX6Bie7pGutJ/5iF5rOxE7CepAuWD56xJ33A==
   dependencies:
-    caniuse-lite "^1.0.30001135"
-    electron-to-chromium "^1.3.571"
-    escalade "^3.1.0"
-    node-releases "^1.1.61"
+    caniuse-lite "^1.0.30001154"
+    electron-to-chromium "^1.3.585"
+    escalade "^3.1.1"
+    node-releases "^1.1.65"
 
 btoa-lite@^1.0.0:
   version "1.0.0"
@@ -3884,7 +3884,7 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001135:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001154:
   version "1.0.30001154"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz#f3bbc245ce55e4c1cd20fa731b097880181a7f17"
   integrity sha512-y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org==
@@ -5427,7 +5427,7 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.3.571:
+electron-to-chromium@^1.3.585:
   version "1.3.585"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.585.tgz#71cdb722c73488b9475ad1c572cf43a763ef9081"
   integrity sha512-xoeqjMQhgHDZM7FiglJAb2aeOxHZWFruUc3MbAGTgE7GB8rr5fTn1Sdh5THGuQtndU3GuXlu91ZKqRivxoCZ/A==
@@ -5622,7 +5622,7 @@ es6-promisify@^6.1.1:
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.1.1.tgz#46837651b7b06bf6fff893d03f29393668d01621"
   integrity sha512-HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg==
 
-escalade@^3.1.0:
+escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
@@ -7668,9 +7668,9 @@ import-fresh@^2.0.0:
     resolve-from "^3.0.0"
 
 import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
-  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e"
+  integrity sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
@@ -9743,7 +9743,7 @@ node-libs-browser@^2.2.1:
     util "^0.11.0"
     vm-browserify "^1.0.1"
 
-node-releases@^1.1.61:
+node-releases@^1.1.65:
   version "1.1.65"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.65.tgz#52d9579176bd60f23eba05c4438583f341944b81"
   integrity sha512-YpzJOe2WFIW0V4ZkJQd/DGR/zdVwc/pI4Nl1CZrBO19FdRcSTmsuhdttw9rsTzzJLrNcSloLiBbEYx1C4f6gpA==
@@ -12182,9 +12182,9 @@ rollup@^1.32.1:
     acorn "^7.1.0"
 
 rollup@^2.26.11:
-  version "2.33.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.0.tgz#dc105b312e2817f996d0b6a192b7033f607ef08d"
-  integrity sha512-7jFrmKgQj1GOWlC8rExHaPcv2SQnWMv1BFUyH/xWS5w80h6132wBUWp/qTvQkAbnlqGvi13T6iP2kHo9Sb2HxA==
+  version "2.33.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.33.1.tgz#802795164164ee63cd47769d8879c33ec8ae0c40"
+  integrity sha512-uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w==
   optionalDependencies:
     fsevents "~2.1.2"
 
@@ -12272,9 +12272,9 @@ sass-graph@2.2.5:
     yargs "^13.3.2"
 
 sass-loader@^10.0.3:
-  version "10.0.4"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.4.tgz#ec7181096947d078d60a1d76d527f47c19b151d8"
-  integrity sha512-zhdZ8qvZM4iL5XjLVEjJLvKWvC+MB+hHgzL2x/Nf7UHpUNmPYsJvypW79bW39g4LZ603dH/dRSsRYzJJIljtdA==
+  version "10.0.5"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.0.5.tgz#f53505b5ddbedf43797470ceb34066ded82bb769"
+  integrity sha512-2LqoNPtKkZq/XbXNQ4C64GFEleSEHKv6NPSI+bMC/l+jpEXGJhiRYkAQToO24MR7NU4JRY2RpLpJ/gjo2Uf13w==
   dependencies:
     klona "^2.0.4"
     loader-utils "^2.0.0"
@@ -14304,9 +14304,9 @@ vue-live@^1.15.1:
     vue-template-compiler "^2.6.12"
 
 vue-loader@^15.7.1:
-  version "15.9.4"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.4.tgz#c2ecef8a1a0802ac76c6d686641b5dde522ae267"
-  integrity sha512-58YX00oCYre2/+Hu7wwV/2Bpml15/PUHni8LcmpRF1ofiOZJJ+oYt1g3J8BRyE2ZrkMWiy95fZynnZRmMdErEQ==
+  version "15.9.5"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.5.tgz#7a960dc420a3439deaacdda038fdcdbf7c432706"
+  integrity sha512-oeMOs2b5o5gRqkxfds10bCx6JeXYTwivRgbb8hzOrcThD2z1+GqEKE3EX9A2SGbsYDf4rXwRg6D5n1w0jO5SwA==
   dependencies:
     "@vue/component-compiler-utils" "^3.1.0"
     hash-sum "^1.0.2"

From 83ebbf957adb589c777cd18abc3db025c8b383ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 15:46:56 +0100
Subject: [PATCH 070/113] add setDefaultNodeAttributes

---
 docs/src/demos/Extensions/TextAlign/index.vue |  3 ++
 packages/core/src/extensions/index.ts         |  1 +
 .../extensions/setDefaultNodeAttributes.ts    | 36 +++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 packages/core/src/extensions/setDefaultNodeAttributes.ts

diff --git a/docs/src/demos/Extensions/TextAlign/index.vue b/docs/src/demos/Extensions/TextAlign/index.vue
index 58af3f467..0771dfe79 100644
--- a/docs/src/demos/Extensions/TextAlign/index.vue
+++ b/docs/src/demos/Extensions/TextAlign/index.vue
@@ -9,6 +9,9 @@
     <button @click="editor.chain().focus().textAlign('right').run()">
       right
     </button>
+    <button @click="editor.chain().focus().setDefaultNodeAttributes(['textAlign']).run()">
+      reset
+    </button>
     <editor-content :editor="editor" />
   </div>
 </template>
diff --git a/packages/core/src/extensions/index.ts b/packages/core/src/extensions/index.ts
index d90067232..f21bbac31 100644
--- a/packages/core/src/extensions/index.ts
+++ b/packages/core/src/extensions/index.ts
@@ -11,6 +11,7 @@ export { RemoveMarks } from './removeMarks'
 export { ScrollIntoView } from './scrollIntoView'
 export { SelectAll } from './selectAll'
 export { SelectParentNode } from './selectParentNode'
+export { SetDefaultNodeAttributes } from './setDefaultNodeAttributes'
 export { SetNodeAttributes } from './setNodeAttributes'
 export { SetBlockType } from './setBlockType'
 export { SetContent } from './setContent'
diff --git a/packages/core/src/extensions/setDefaultNodeAttributes.ts b/packages/core/src/extensions/setDefaultNodeAttributes.ts
new file mode 100644
index 000000000..8347b1411
--- /dev/null
+++ b/packages/core/src/extensions/setDefaultNodeAttributes.ts
@@ -0,0 +1,36 @@
+import { Command } from '../Editor'
+import { createExtension } from '../Extension'
+
+export const SetDefaultNodeAttributes = createExtension({
+  addCommands() {
+    return {
+      setDefaultNodeAttributes: (attributeNames: string[] = []): Command => ({ tr, state }) => {
+        const { selection } = tr
+        const { from, to } = selection
+
+        state.doc.nodesBetween(from, to, (node, pos) => {
+          if (!node.type.isText) {
+            attributeNames.forEach(name => {
+              const attribute = node.type.spec.attrs?.[name]
+              const defaultValue = attribute?.default
+
+              if (attribute && defaultValue !== undefined) {
+                tr.setNodeMarkup(pos, undefined, {
+                  [name]: defaultValue,
+                })
+              }
+            })
+          }
+        })
+
+        return true
+      },
+    }
+  },
+})
+
+declare module '../Editor' {
+  interface AllExtensions {
+    SetDefaultNodeAttributes: typeof SetDefaultNodeAttributes,
+  }
+}

From eed82a57b69f597654fb4cf5b64bdf5d716f39c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 15:47:51 +0100
Subject: [PATCH 071/113] wording

---
 docs/src/demos/Extensions/TextAlign/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/demos/Extensions/TextAlign/index.vue b/docs/src/demos/Extensions/TextAlign/index.vue
index 0771dfe79..25ddd3bf8 100644
--- a/docs/src/demos/Extensions/TextAlign/index.vue
+++ b/docs/src/demos/Extensions/TextAlign/index.vue
@@ -10,7 +10,7 @@
       right
     </button>
     <button @click="editor.chain().focus().setDefaultNodeAttributes(['textAlign']).run()">
-      reset
+      set default
     </button>
     <editor-content :editor="editor" />
   </div>

From 4ed07ba87e7c8daf8a944f856824212c0634d9c2 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Mon, 2 Nov 2020 15:54:15 +0100
Subject: [PATCH 072/113] move nodes and marks to a separate folder, add
 missing extensions

---
 .../api/extensions/code-block-highlight.md    |  11 --
 .../src/docPages/api/extensions/dropcursor.md |  25 ++++
 docs/src/docPages/api/extensions/focus.md     |  25 ++++
 docs/src/docPages/api/extensions/gapcursor.md |  25 ++++
 docs/src/docPages/api/extensions/mention.md   |   2 -
 .../docPages/api/extensions/placeholder.md    |   2 -
 .../src/docPages/api/extensions/table-cell.md |   6 -
 .../docPages/api/extensions/table-header.md   |   6 -
 docs/src/docPages/api/extensions/table-row.md |   6 -
 .../src/docPages/api/extensions/typography.md |  17 +++
 docs/src/docPages/api/marks.md                |   5 +
 .../api/{extensions => marks}/bold.md         |   0
 .../api/{extensions => marks}/code.md         |   0
 .../api/{extensions => marks}/italic.md       |   0
 .../api/{extensions => marks}/link.md         |   0
 .../api/{extensions => marks}/strike.md       |   0
 .../api/{extensions => marks}/underline.md    |   0
 docs/src/docPages/api/nodes.md                |   5 +
 .../api/{extensions => nodes}/blockquote.md   |   0
 .../api/{extensions => nodes}/bullet-list.md  |   0
 .../api/{extensions => nodes}/code-block.md   |   0
 .../api/{extensions => nodes}/document.md     |   0
 .../api/{extensions => nodes}/hard-break.md   |   0
 .../api/{extensions => nodes}/heading.md      |   0
 .../{extensions => nodes}/horizontal-rule.md  |   0
 .../api/{extensions => nodes}/image.md        |   0
 .../api/{extensions => nodes}/list-item.md    |   2 +-
 .../api/{extensions => nodes}/ordered-list.md |   0
 .../api/{extensions => nodes}/paragraph.md    |   0
 docs/src/docPages/api/nodes/task-item.md      |  28 ++++
 .../api/{extensions => nodes}/task-list.md    |   0
 .../api/{extensions => nodes}/text.md         |   0
 .../api/{extensions => nodes}/todo-item.md    |   0
 .../api/{extensions => nodes}/todo-list.md    |   0
 docs/src/docPages/api/overview.md             |   2 +-
 docs/src/links.yaml                           | 125 +++++++++---------
 36 files changed, 193 insertions(+), 99 deletions(-)
 delete mode 100644 docs/src/docPages/api/extensions/code-block-highlight.md
 create mode 100644 docs/src/docPages/api/extensions/dropcursor.md
 create mode 100644 docs/src/docPages/api/extensions/focus.md
 create mode 100644 docs/src/docPages/api/extensions/gapcursor.md
 delete mode 100644 docs/src/docPages/api/extensions/mention.md
 delete mode 100644 docs/src/docPages/api/extensions/placeholder.md
 delete mode 100644 docs/src/docPages/api/extensions/table-cell.md
 delete mode 100644 docs/src/docPages/api/extensions/table-header.md
 delete mode 100644 docs/src/docPages/api/extensions/table-row.md
 create mode 100644 docs/src/docPages/api/extensions/typography.md
 create mode 100644 docs/src/docPages/api/marks.md
 rename docs/src/docPages/api/{extensions => marks}/bold.md (100%)
 rename docs/src/docPages/api/{extensions => marks}/code.md (100%)
 rename docs/src/docPages/api/{extensions => marks}/italic.md (100%)
 rename docs/src/docPages/api/{extensions => marks}/link.md (100%)
 rename docs/src/docPages/api/{extensions => marks}/strike.md (100%)
 rename docs/src/docPages/api/{extensions => marks}/underline.md (100%)
 create mode 100644 docs/src/docPages/api/nodes.md
 rename docs/src/docPages/api/{extensions => nodes}/blockquote.md (100%)
 rename docs/src/docPages/api/{extensions => nodes}/bullet-list.md (100%)
 rename docs/src/docPages/api/{extensions => nodes}/code-block.md (100%)
 rename docs/src/docPages/api/{extensions => nodes}/document.md (100%)
 rename docs/src/docPages/api/{extensions => nodes}/hard-break.md (100%)
 rename docs/src/docPages/api/{extensions => nodes}/heading.md (100%)
 rename docs/src/docPages/api/{extensions => nodes}/horizontal-rule.md (100%)
 rename docs/src/docPages/api/{extensions => nodes}/image.md (100%)
 rename docs/src/docPages/api/{extensions => nodes}/list-item.md (81%)
 rename docs/src/docPages/api/{extensions => nodes}/ordered-list.md (100%)
 rename docs/src/docPages/api/{extensions => nodes}/paragraph.md (100%)
 create mode 100644 docs/src/docPages/api/nodes/task-item.md
 rename docs/src/docPages/api/{extensions => nodes}/task-list.md (100%)
 rename docs/src/docPages/api/{extensions => nodes}/text.md (100%)
 rename docs/src/docPages/api/{extensions => nodes}/todo-item.md (100%)
 rename docs/src/docPages/api/{extensions => nodes}/todo-list.md (100%)

diff --git a/docs/src/docPages/api/extensions/code-block-highlight.md b/docs/src/docPages/api/extensions/code-block-highlight.md
deleted file mode 100644
index f5eb1540b..000000000
--- a/docs/src/docPages/api/extensions/code-block-highlight.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# CodeBlockHighlight
-Enables you to use the `<pre>` HTML tag with auto-detected syntax highlighting in the editor.
-
-## Settings
-*None*
-
-## Commands
-*None*
-
-## Keyboard shortcuts
-*None*
\ No newline at end of file
diff --git a/docs/src/docPages/api/extensions/dropcursor.md b/docs/src/docPages/api/extensions/dropcursor.md
new file mode 100644
index 000000000..8759a51c8
--- /dev/null
+++ b/docs/src/docPages/api/extensions/dropcursor.md
@@ -0,0 +1,25 @@
+# Dropcursor
+
+## Installation
+```bash
+# with npm
+npm install @tiptap/extension-dropcursor
+
+# with Yarn
+yarn add @tiptap/extension-dropcursor
+```
+
+## Settings
+*None*
+
+## Commands
+*None*
+
+## Keyboard shortcuts
+*None*
+
+## Source code
+[packages/extension-dropcursor/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-dropcursor/)
+
+## Usage
+<demo name="Extensions/Dropcursor" highlight="" />
diff --git a/docs/src/docPages/api/extensions/focus.md b/docs/src/docPages/api/extensions/focus.md
new file mode 100644
index 000000000..c6f508676
--- /dev/null
+++ b/docs/src/docPages/api/extensions/focus.md
@@ -0,0 +1,25 @@
+# Focus
+
+## Installation
+```bash
+# with npm
+npm install @tiptap/extension-focus
+
+# with Yarn
+yarn add @tiptap/extension-focus
+```
+
+## Settings
+*None*
+
+## Commands
+*None*
+
+## Keyboard shortcuts
+*None*
+
+## Source code
+[packages/extension-focus/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-focus/)
+
+## Usage
+<demo name="Extensions/Focus" highlight="" />
diff --git a/docs/src/docPages/api/extensions/gapcursor.md b/docs/src/docPages/api/extensions/gapcursor.md
new file mode 100644
index 000000000..1f16726be
--- /dev/null
+++ b/docs/src/docPages/api/extensions/gapcursor.md
@@ -0,0 +1,25 @@
+# Gapcursor
+
+## Installation
+```bash
+# with npm
+npm install @tiptap/extension-gapcursor
+
+# with Yarn
+yarn add @tiptap/extension-gapcursor
+```
+
+## Settings
+*None*
+
+## Commands
+*None*
+
+## Keyboard shortcuts
+*None*
+
+## Source code
+[packages/extension-gapcursor/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-gapcursor/)
+
+## Usage
+<demo name="Extensions/Gapcursor" highlight="" />
diff --git a/docs/src/docPages/api/extensions/mention.md b/docs/src/docPages/api/extensions/mention.md
deleted file mode 100644
index 3c2c08388..000000000
--- a/docs/src/docPages/api/extensions/mention.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Mention
-Enables you to use mentions in the editor.
diff --git a/docs/src/docPages/api/extensions/placeholder.md b/docs/src/docPages/api/extensions/placeholder.md
deleted file mode 100644
index cc9da0062..000000000
--- a/docs/src/docPages/api/extensions/placeholder.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Placeholder
-Enables you to show placeholders on empty paragraphs.
diff --git a/docs/src/docPages/api/extensions/table-cell.md b/docs/src/docPages/api/extensions/table-cell.md
deleted file mode 100644
index 09a285337..000000000
--- a/docs/src/docPages/api/extensions/table-cell.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# TableCell
-Enables you to use the `<td>` HTML tag in the editor.
-
-::: warning Restrictions
-This extensions is intended to be used with the `Table` extension.
-:::
diff --git a/docs/src/docPages/api/extensions/table-header.md b/docs/src/docPages/api/extensions/table-header.md
deleted file mode 100644
index 25731c274..000000000
--- a/docs/src/docPages/api/extensions/table-header.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# TableHeader
-Enables you to use the `<th>` HTML tag in the editor.
-
-::: warning Restrictions
-This extensions is intended to be used with the `Table` extension.
-:::
\ No newline at end of file
diff --git a/docs/src/docPages/api/extensions/table-row.md b/docs/src/docPages/api/extensions/table-row.md
deleted file mode 100644
index 748e0c8c0..000000000
--- a/docs/src/docPages/api/extensions/table-row.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# TableRow
-Enables you to use the `<tr>` HTML tag in the editor.
-
-::: warning Restrictions
-This extensions is intended to be used with the `Table` extension.
-:::
\ No newline at end of file
diff --git a/docs/src/docPages/api/extensions/typography.md b/docs/src/docPages/api/extensions/typography.md
new file mode 100644
index 000000000..2cd372ea1
--- /dev/null
+++ b/docs/src/docPages/api/extensions/typography.md
@@ -0,0 +1,17 @@
+# Typography
+
+
+## Installation
+```bash
+# with npm
+npm install @tiptap/typography
+
+# with Yarn
+yarn add @tiptap/typography
+```
+
+## Source code
+[packages/typography/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/typography/)
+
+## Usage
+<demo name="Extensions/Typography" highlight="" />
diff --git a/docs/src/docPages/api/marks.md b/docs/src/docPages/api/marks.md
new file mode 100644
index 000000000..80557d6c5
--- /dev/null
+++ b/docs/src/docPages/api/marks.md
@@ -0,0 +1,5 @@
+# Marks
+
+## toc
+
+## Introduction
diff --git a/docs/src/docPages/api/extensions/bold.md b/docs/src/docPages/api/marks/bold.md
similarity index 100%
rename from docs/src/docPages/api/extensions/bold.md
rename to docs/src/docPages/api/marks/bold.md
diff --git a/docs/src/docPages/api/extensions/code.md b/docs/src/docPages/api/marks/code.md
similarity index 100%
rename from docs/src/docPages/api/extensions/code.md
rename to docs/src/docPages/api/marks/code.md
diff --git a/docs/src/docPages/api/extensions/italic.md b/docs/src/docPages/api/marks/italic.md
similarity index 100%
rename from docs/src/docPages/api/extensions/italic.md
rename to docs/src/docPages/api/marks/italic.md
diff --git a/docs/src/docPages/api/extensions/link.md b/docs/src/docPages/api/marks/link.md
similarity index 100%
rename from docs/src/docPages/api/extensions/link.md
rename to docs/src/docPages/api/marks/link.md
diff --git a/docs/src/docPages/api/extensions/strike.md b/docs/src/docPages/api/marks/strike.md
similarity index 100%
rename from docs/src/docPages/api/extensions/strike.md
rename to docs/src/docPages/api/marks/strike.md
diff --git a/docs/src/docPages/api/extensions/underline.md b/docs/src/docPages/api/marks/underline.md
similarity index 100%
rename from docs/src/docPages/api/extensions/underline.md
rename to docs/src/docPages/api/marks/underline.md
diff --git a/docs/src/docPages/api/nodes.md b/docs/src/docPages/api/nodes.md
new file mode 100644
index 000000000..ee9fa386a
--- /dev/null
+++ b/docs/src/docPages/api/nodes.md
@@ -0,0 +1,5 @@
+# Nodes
+
+## toc
+
+## Introduction
diff --git a/docs/src/docPages/api/extensions/blockquote.md b/docs/src/docPages/api/nodes/blockquote.md
similarity index 100%
rename from docs/src/docPages/api/extensions/blockquote.md
rename to docs/src/docPages/api/nodes/blockquote.md
diff --git a/docs/src/docPages/api/extensions/bullet-list.md b/docs/src/docPages/api/nodes/bullet-list.md
similarity index 100%
rename from docs/src/docPages/api/extensions/bullet-list.md
rename to docs/src/docPages/api/nodes/bullet-list.md
diff --git a/docs/src/docPages/api/extensions/code-block.md b/docs/src/docPages/api/nodes/code-block.md
similarity index 100%
rename from docs/src/docPages/api/extensions/code-block.md
rename to docs/src/docPages/api/nodes/code-block.md
diff --git a/docs/src/docPages/api/extensions/document.md b/docs/src/docPages/api/nodes/document.md
similarity index 100%
rename from docs/src/docPages/api/extensions/document.md
rename to docs/src/docPages/api/nodes/document.md
diff --git a/docs/src/docPages/api/extensions/hard-break.md b/docs/src/docPages/api/nodes/hard-break.md
similarity index 100%
rename from docs/src/docPages/api/extensions/hard-break.md
rename to docs/src/docPages/api/nodes/hard-break.md
diff --git a/docs/src/docPages/api/extensions/heading.md b/docs/src/docPages/api/nodes/heading.md
similarity index 100%
rename from docs/src/docPages/api/extensions/heading.md
rename to docs/src/docPages/api/nodes/heading.md
diff --git a/docs/src/docPages/api/extensions/horizontal-rule.md b/docs/src/docPages/api/nodes/horizontal-rule.md
similarity index 100%
rename from docs/src/docPages/api/extensions/horizontal-rule.md
rename to docs/src/docPages/api/nodes/horizontal-rule.md
diff --git a/docs/src/docPages/api/extensions/image.md b/docs/src/docPages/api/nodes/image.md
similarity index 100%
rename from docs/src/docPages/api/extensions/image.md
rename to docs/src/docPages/api/nodes/image.md
diff --git a/docs/src/docPages/api/extensions/list-item.md b/docs/src/docPages/api/nodes/list-item.md
similarity index 81%
rename from docs/src/docPages/api/extensions/list-item.md
rename to docs/src/docPages/api/nodes/list-item.md
index 37e9b0719..8d6e816e2 100644
--- a/docs/src/docPages/api/extensions/list-item.md
+++ b/docs/src/docPages/api/nodes/list-item.md
@@ -3,7 +3,7 @@ The ListItem extension adds support for the `<li>` HTML tag. It’s used for bul
 
 ## Installation
 ::: warning Restrictions
-This extensions is intended to be used with the [`BulletList`](/api/extensions/bullet-list) or [`OrderedList`](/api/extensions/ordered-list) extension. It doesn’t work without at least using one of them.
+This extension is intended to be used with the [`BulletList`](/api/extensions/bullet-list) or [`OrderedList`](/api/extensions/ordered-list) extension. It doesn’t work without at least using one of them.
 :::
 
 ```bash
diff --git a/docs/src/docPages/api/extensions/ordered-list.md b/docs/src/docPages/api/nodes/ordered-list.md
similarity index 100%
rename from docs/src/docPages/api/extensions/ordered-list.md
rename to docs/src/docPages/api/nodes/ordered-list.md
diff --git a/docs/src/docPages/api/extensions/paragraph.md b/docs/src/docPages/api/nodes/paragraph.md
similarity index 100%
rename from docs/src/docPages/api/extensions/paragraph.md
rename to docs/src/docPages/api/nodes/paragraph.md
diff --git a/docs/src/docPages/api/nodes/task-item.md b/docs/src/docPages/api/nodes/task-item.md
new file mode 100644
index 000000000..a7228168d
--- /dev/null
+++ b/docs/src/docPages/api/nodes/task-item.md
@@ -0,0 +1,28 @@
+# TaskItem
+
+## Installation
+::: warning Restrictions
+This extension is intended to be used with the [`TaskList`](/api/extensions/task-list) extension. It doesn’t work without at least using one of them.
+:::
+
+```bash
+# With npm
+npm install @tiptap/extension-task-list @tiptap/extension-task-item
+
+# Or: With Yarn
+yarn add @tiptap/extension-task-list @tiptap/extension-task-item
+```
+
+## Settings
+| Option | Type   | Default | Description                                  |
+| ------ | ------ | ------- | -------------------------------------------- |
+| class  | string | –       | Add a custom class to the rendered HTML tag. |
+
+## Commands
+*None*
+
+## Source code
+[packages/extension-task-item/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-task-item/)
+
+## Usage
+<demo name="Extensions/TaskItem" />
diff --git a/docs/src/docPages/api/extensions/task-list.md b/docs/src/docPages/api/nodes/task-list.md
similarity index 100%
rename from docs/src/docPages/api/extensions/task-list.md
rename to docs/src/docPages/api/nodes/task-list.md
diff --git a/docs/src/docPages/api/extensions/text.md b/docs/src/docPages/api/nodes/text.md
similarity index 100%
rename from docs/src/docPages/api/extensions/text.md
rename to docs/src/docPages/api/nodes/text.md
diff --git a/docs/src/docPages/api/extensions/todo-item.md b/docs/src/docPages/api/nodes/todo-item.md
similarity index 100%
rename from docs/src/docPages/api/extensions/todo-item.md
rename to docs/src/docPages/api/nodes/todo-item.md
diff --git a/docs/src/docPages/api/extensions/todo-list.md b/docs/src/docPages/api/nodes/todo-list.md
similarity index 100%
rename from docs/src/docPages/api/extensions/todo-list.md
rename to docs/src/docPages/api/nodes/todo-list.md
diff --git a/docs/src/docPages/api/overview.md b/docs/src/docPages/api/overview.md
index d8ff4f5c7..46b551c6f 100644
--- a/docs/src/docPages/api/overview.md
+++ b/docs/src/docPages/api/overview.md
@@ -8,6 +8,6 @@ ProseMirror works with a strict [Schema](/api/schema), which defines the allowed
 The document is stored in a state. All changes are applied as transactions to the state. The state has details about the current content, cursor position and selection. You can hook into a few different [events](/api/events), for example to alter transactions before they get applied.
 
 ### Extensions
-[Extensions](/api/extensions) add functionality like nodes, marks and/or commands to the editor. A huge amount of commands are bound to common [keyboard shortcuts](/api/keyboard-shortcuts).
+Extensions add [nodes](/api/nodes), [marks](/api/marks) and/or [functionalities](/api/extensions) to the editor. A lot of those extensions bound their commands to common [keyboard shortcuts](/api/keyboard-shortcuts).
 
 All those concepts are explained in detail on the following pages.
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index e52f8da11..647c47b33 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -104,22 +104,58 @@
       link: /api/overview
     - title: Editor
       link: /api/editor
+    - title: Nodes
+      link: /api/nodes
+      items:
+        - title: Blockquote
+          link: /api/nodes/blockquote
+        - title: BulletList
+          link: /api/nodes/bullet-list
+        - title: CodeBlock
+          link: /api/nodes/code-block
+        - title: Document
+          link: /api/nodes/document
+        - title: HardBreak
+          link: /api/nodes/hard-break
+        - title: Heading
+          link: /api/nodes/heading
+        - title: HorizontalRule
+          link: /api/nodes/horizontal-rule
+        - title: Image
+          link: /api/nodes/image
+          draft: true
+        - title: ListItem
+          link: /api/nodes/list-item
+        - title: OrderedList
+          link: /api/nodes/ordered-list
+        - title: Paragraph
+          link: /api/nodes/paragraph
+        - title: TaskList
+          link: /api/nodes/task-list
+          draft: true
+        - title: TaskItem
+          link: /api/nodes/task-item
+          draft: true
+        - title: Text
+          link: /api/nodes/text
+    - title: Marks
+      link: /api/marks
+      items:
+        - title: Bold
+          link: /api/marks/bold
+        - title: Code
+          link: /api/marks/code
+        - title: Italic
+          link: /api/marks/italic
+        - title: Link
+          link: /api/marks/link
+        - title: Strike
+          link: /api/marks/strike
+        - title: Underline
+          link: /api/marks/underline
     - title: Extensions
       link: /api/extensions
       items:
-        - title: Blockquote
-          link: /api/extensions/blockquote
-        - title: Bold
-          link: /api/extensions/bold
-        - title: BulletList
-          link: /api/extensions/bullet-list
-        - title: Code
-          link: /api/extensions/code
-        - title: CodeBlock
-          link: /api/extensions/code-block
-        # - title: CodeBlockHighlight
-        #   link: /api/extensions/code-block-highlight
-        #   draft: true
         - title: Collaboration
           link: /api/extensions/collaboration
           premium: true
@@ -127,62 +163,23 @@
           link: /api/extensions/collaboration-cursor
           draft: true
           premium: true
-        - title: Document
-          link: /api/extensions/document
-        - title: HardBreak
-          link: /api/extensions/hard-break
-        - title: Heading
-          link: /api/extensions/heading
+        - title: Dropcursor
+          link: /api/extensions/dropcursor
+          draft: true
+        - title: Focus
+          link: /api/extensions/focus
+          draft: true
+        - title: Gapcursor
+          link: /api/extensions/gapcursor
+          draft: true
         - title: History
           link: /api/extensions/history
-        - title: HorizontalRule
-          link: /api/extensions/horizontal-rule
-        - title: Image
-          link: /api/extensions/image
-          draft: true
-        - title: Italic
-          link: /api/extensions/italic
-        - title: Link
-          link: /api/extensions/link
-        - title: ListItem
-          link: /api/extensions/list-item
-        # - title: Mention
-        #   link: /api/extensions/mention
-        #   draft: true
-        - title: OrderedList
-          link: /api/extensions/ordered-list
-        - title: Paragraph
-          link: /api/extensions/paragraph
-        # - title: Placeholder
-        #   link: /api/extensions/placeholder
-        #   draft: true
-        - title: Strike
-          link: /api/extensions/strike
-        - title: TaskList
-          link: /api/extensions/task-list
-          draft: true
-        # - title: TableCell
-        #   link: /api/extensions/table-cell
-        #   draft: true
-        # - title: TableHeader
-        #   link: /api/extensions/table-header
-        #   draft: true
-        # - title: TableRow
-        #   link: /api/extensions/table-row
-        #   draft: true
-        - title: Text
-          link: /api/extensions/text
         - title: TextAlign
           link: /api/extensions/text-align
           draft: true
-        # - title: TodoItem
-        #   link: /api/extensions/todo-item
-        #   draft: true
-        # - title: TodoList
-        #   link: /api/extensions/todo-list
-        #   draft: true
-        - title: Underline
-          link: /api/extensions/underline
+        - title: Typography
+          link: /api/extensions/typography
+          draft: true
     - title: Commands
       link: /api/commands
     - title: Events

From 389937c32f3c9bbbb3d09c4222a52b6831c34794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 16:23:43 +0100
Subject: [PATCH 073/113] refactoring

---
 docs/src/demos/Extensions/TextAlign/index.vue      |  2 +-
 packages/core/src/extensions/clearNodes.ts         |  6 +++---
 packages/core/src/extensions/focus.ts              |  9 +++++++--
 packages/core/src/extensions/index.ts              |  2 +-
 packages/core/src/extensions/insertHTML.ts         |  8 +++++---
 packages/core/src/extensions/insertText.ts         |  6 ++++--
 packages/core/src/extensions/removeMark.ts         |  6 ++++--
 packages/core/src/extensions/removeMarks.ts        | 14 ++++++++------
 ...ultNodeAttributes.ts => resetNodeAttributes.ts} |  8 ++++----
 packages/core/src/extensions/scrollIntoView.ts     |  6 ++++--
 packages/core/src/extensions/setContent.ts         | 10 ++++++----
 packages/core/src/extensions/setNodeAttributes.ts  |  4 ++--
 packages/core/src/extensions/splitBlock.ts         |  2 +-
 packages/core/src/extensions/toggleList.ts         | 10 ++++++----
 packages/core/src/extensions/updateMark.ts         |  8 +++++---
 15 files changed, 61 insertions(+), 40 deletions(-)
 rename packages/core/src/extensions/{setDefaultNodeAttributes.ts => resetNodeAttributes.ts} (71%)

diff --git a/docs/src/demos/Extensions/TextAlign/index.vue b/docs/src/demos/Extensions/TextAlign/index.vue
index 25ddd3bf8..08ec6d508 100644
--- a/docs/src/demos/Extensions/TextAlign/index.vue
+++ b/docs/src/demos/Extensions/TextAlign/index.vue
@@ -9,7 +9,7 @@
     <button @click="editor.chain().focus().textAlign('right').run()">
       right
     </button>
-    <button @click="editor.chain().focus().setDefaultNodeAttributes(['textAlign']).run()">
+    <button @click="editor.chain().focus().resetNodeAttributes(['textAlign']).run()">
       set default
     </button>
     <editor-content :editor="editor" />
diff --git a/packages/core/src/extensions/clearNodes.ts b/packages/core/src/extensions/clearNodes.ts
index 5d7557676..cb4ab1855 100644
--- a/packages/core/src/extensions/clearNodes.ts
+++ b/packages/core/src/extensions/clearNodes.ts
@@ -5,7 +5,7 @@ import { createExtension } from '../Extension'
 export const ClearNodes = createExtension({
   addCommands() {
     return {
-      clearNodes: (): Command => ({ state, tr }) => {
+      clearNodes: (): Command => ({ state, tr, dispatch }) => {
         const { selection } = tr
         const { from, to } = selection
 
@@ -18,11 +18,11 @@ export const ClearNodes = createExtension({
             if (nodeRange) {
               const targetLiftDepth = liftTarget(nodeRange)
 
-              if (node.type.isTextblock) {
+              if (node.type.isTextblock && dispatch) {
                 tr.setNodeMarkup(nodeRange.start, state.schema.nodes.paragraph)
               }
 
-              if (targetLiftDepth || targetLiftDepth === 0) {
+              if ((targetLiftDepth || targetLiftDepth === 0) && dispatch) {
                 tr.lift(nodeRange, targetLiftDepth)
               }
             }
diff --git a/packages/core/src/extensions/focus.ts b/packages/core/src/extensions/focus.ts
index 8f9ffdb3d..1719a6b85 100644
--- a/packages/core/src/extensions/focus.ts
+++ b/packages/core/src/extensions/focus.ts
@@ -40,7 +40,9 @@ function resolveSelection(editor: Editor, position: Position = null): ResolvedSe
 export const Focus = createExtension({
   addCommands() {
     return {
-      focus: (position: Position = null): Command => ({ editor, view, tr }) => {
+      focus: (position: Position = null): Command => ({
+        editor, view, tr, dispatch,
+      }) => {
         if ((view.hasFocus() && position === null) || position === false) {
           return true
         }
@@ -51,7 +53,10 @@ export const Focus = createExtension({
         const resolvedEnd = minMax(to, 0, doc.content.size)
         const selection = TextSelection.create(doc, resolvedFrom, resolvedEnd)
 
-        tr.setSelection(selection)
+        if (dispatch) {
+          tr.setSelection(selection)
+        }
+
         view.focus()
 
         return true
diff --git a/packages/core/src/extensions/index.ts b/packages/core/src/extensions/index.ts
index f21bbac31..0d2de36f8 100644
--- a/packages/core/src/extensions/index.ts
+++ b/packages/core/src/extensions/index.ts
@@ -11,7 +11,7 @@ export { RemoveMarks } from './removeMarks'
 export { ScrollIntoView } from './scrollIntoView'
 export { SelectAll } from './selectAll'
 export { SelectParentNode } from './selectParentNode'
-export { SetDefaultNodeAttributes } from './setDefaultNodeAttributes'
+export { ResetNodeAttributes } from './resetNodeAttributes'
 export { SetNodeAttributes } from './setNodeAttributes'
 export { SetBlockType } from './setBlockType'
 export { SetContent } from './setContent'
diff --git a/packages/core/src/extensions/insertHTML.ts b/packages/core/src/extensions/insertHTML.ts
index 2a567a406..8d0f395fd 100644
--- a/packages/core/src/extensions/insertHTML.ts
+++ b/packages/core/src/extensions/insertHTML.ts
@@ -21,13 +21,15 @@ function selectionToInsertionEnd(tr: Transaction, startLen: number, bias: number
 export const InsertHTML = createExtension({
   addCommands() {
     return {
-      insertHTML: (value: string): Command => ({ tr, state }) => {
+      insertHTML: (value: string): Command => ({ tr, state, dispatch }) => {
         const { selection } = tr
         const element = elementFromString(value)
         const slice = DOMParser.fromSchema(state.schema).parseSlice(element)
 
-        tr.insert(selection.anchor, slice.content)
-        selectionToInsertionEnd(tr, tr.steps.length - 1, -1)
+        if (dispatch) {
+          tr.insert(selection.anchor, slice.content)
+          selectionToInsertionEnd(tr, tr.steps.length - 1, -1)
+        }
 
         return true
       },
diff --git a/packages/core/src/extensions/insertText.ts b/packages/core/src/extensions/insertText.ts
index cdef32637..a7302fe0a 100644
--- a/packages/core/src/extensions/insertText.ts
+++ b/packages/core/src/extensions/insertText.ts
@@ -4,8 +4,10 @@ import { createExtension } from '../Extension'
 export const InsertText = createExtension({
   addCommands() {
     return {
-      insertText: (value: string): Command => ({ tr }) => {
-        tr.insertText(value)
+      insertText: (value: string): Command => ({ tr, dispatch }) => {
+        if (dispatch) {
+          tr.insertText(value)
+        }
 
         return true
       },
diff --git a/packages/core/src/extensions/removeMark.ts b/packages/core/src/extensions/removeMark.ts
index f44633418..3bd0ccf3a 100644
--- a/packages/core/src/extensions/removeMark.ts
+++ b/packages/core/src/extensions/removeMark.ts
@@ -7,7 +7,7 @@ import getMarkRange from '../utils/getMarkRange'
 export const RemoveMark = createExtension({
   addCommands() {
     return {
-      removeMark: (typeOrName: string | MarkType): Command => ({ tr, state }) => {
+      removeMark: (typeOrName: string | MarkType): Command => ({ tr, state, dispatch }) => {
         const { selection } = tr
         const type = getMarkType(typeOrName, state.schema)
         let { from, to } = selection
@@ -22,7 +22,9 @@ export const RemoveMark = createExtension({
           }
         }
 
-        tr.removeMark(from, to, type)
+        if (dispatch) {
+          tr.removeMark(from, to, type)
+        }
 
         return true
       },
diff --git a/packages/core/src/extensions/removeMarks.ts b/packages/core/src/extensions/removeMarks.ts
index af5270626..fcc5ed1b1 100644
--- a/packages/core/src/extensions/removeMarks.ts
+++ b/packages/core/src/extensions/removeMarks.ts
@@ -4,7 +4,7 @@ import { createExtension } from '../Extension'
 export const RemoveMarks = createExtension({
   addCommands() {
     return {
-      removeMarks: (): Command => ({ tr, state }) => {
+      removeMarks: (): Command => ({ tr, state, dispatch }) => {
         const { selection } = tr
         const { from, to, empty } = selection
 
@@ -12,11 +12,13 @@ export const RemoveMarks = createExtension({
           return true
         }
 
-        Object
-          .entries(state.schema.marks)
-          .forEach(([, mark]) => {
-            tr.removeMark(from, to, mark as any)
-          })
+        if (dispatch) {
+          Object
+            .entries(state.schema.marks)
+            .forEach(([, mark]) => {
+              tr.removeMark(from, to, mark as any)
+            })
+        }
 
         return true
       },
diff --git a/packages/core/src/extensions/setDefaultNodeAttributes.ts b/packages/core/src/extensions/resetNodeAttributes.ts
similarity index 71%
rename from packages/core/src/extensions/setDefaultNodeAttributes.ts
rename to packages/core/src/extensions/resetNodeAttributes.ts
index 8347b1411..a9babeff7 100644
--- a/packages/core/src/extensions/setDefaultNodeAttributes.ts
+++ b/packages/core/src/extensions/resetNodeAttributes.ts
@@ -1,10 +1,10 @@
 import { Command } from '../Editor'
 import { createExtension } from '../Extension'
 
-export const SetDefaultNodeAttributes = createExtension({
+export const ResetNodeAttributes = createExtension({
   addCommands() {
     return {
-      setDefaultNodeAttributes: (attributeNames: string[] = []): Command => ({ tr, state }) => {
+      resetNodeAttributes: (attributeNames: string[] = []): Command => ({ tr, state, dispatch }) => {
         const { selection } = tr
         const { from, to } = selection
 
@@ -14,7 +14,7 @@ export const SetDefaultNodeAttributes = createExtension({
               const attribute = node.type.spec.attrs?.[name]
               const defaultValue = attribute?.default
 
-              if (attribute && defaultValue !== undefined) {
+              if (attribute && defaultValue !== undefined && dispatch) {
                 tr.setNodeMarkup(pos, undefined, {
                   [name]: defaultValue,
                 })
@@ -31,6 +31,6 @@ export const SetDefaultNodeAttributes = createExtension({
 
 declare module '../Editor' {
   interface AllExtensions {
-    SetDefaultNodeAttributes: typeof SetDefaultNodeAttributes,
+    ResetNodeAttributes: typeof ResetNodeAttributes,
   }
 }
diff --git a/packages/core/src/extensions/scrollIntoView.ts b/packages/core/src/extensions/scrollIntoView.ts
index 44fee958e..30dc3d9e4 100644
--- a/packages/core/src/extensions/scrollIntoView.ts
+++ b/packages/core/src/extensions/scrollIntoView.ts
@@ -4,8 +4,10 @@ import { createExtension } from '../Extension'
 export const ScrollIntoView = createExtension({
   addCommands() {
     return {
-      scrollIntoView: (): Command => ({ tr }) => {
-        tr.scrollIntoView()
+      scrollIntoView: (): Command => ({ tr, dispatch }) => {
+        if (dispatch) {
+          tr.scrollIntoView()
+        }
 
         return true
       },
diff --git a/packages/core/src/extensions/setContent.ts b/packages/core/src/extensions/setContent.ts
index f19fb9069..a9069f1e9 100644
--- a/packages/core/src/extensions/setContent.ts
+++ b/packages/core/src/extensions/setContent.ts
@@ -5,15 +5,17 @@ import { createExtension } from '../Extension'
 export const SetContent = createExtension({
   addCommands() {
     return {
-      setContent: (content: string, emitUpdate: Boolean = false, parseOptions = {}): Command => ({ tr, editor }) => {
+      setContent: (content: string, emitUpdate: Boolean = false, parseOptions = {}): Command => ({ tr, editor, dispatch }) => {
         const { createDocument } = editor
         const { doc } = tr
         const document = createDocument(content, parseOptions)
         const selection = TextSelection.create(doc, 0, doc.content.size)
 
-        tr.setSelection(selection)
-          .replaceSelectionWith(document, false)
-          .setMeta('preventUpdate', !emitUpdate)
+        if (dispatch) {
+          tr.setSelection(selection)
+            .replaceSelectionWith(document, false)
+            .setMeta('preventUpdate', !emitUpdate)
+        }
 
         return true
       },
diff --git a/packages/core/src/extensions/setNodeAttributes.ts b/packages/core/src/extensions/setNodeAttributes.ts
index d049ba3b8..9333a5545 100644
--- a/packages/core/src/extensions/setNodeAttributes.ts
+++ b/packages/core/src/extensions/setNodeAttributes.ts
@@ -4,12 +4,12 @@ import { createExtension } from '../Extension'
 export const SetNodeAttributes = createExtension({
   addCommands() {
     return {
-      setNodeAttributes: (attributes: {}): Command => ({ tr, state }) => {
+      setNodeAttributes: (attributes: {}): Command => ({ tr, state, dispatch }) => {
         const { selection } = tr
         const { from, to } = selection
 
         state.doc.nodesBetween(from, to, (node, pos) => {
-          if (!node.type.isText) {
+          if (!node.type.isText && dispatch) {
             tr.setNodeMarkup(pos, undefined, attributes)
           }
         })
diff --git a/packages/core/src/extensions/splitBlock.ts b/packages/core/src/extensions/splitBlock.ts
index 37aaa7da2..39b78241b 100644
--- a/packages/core/src/extensions/splitBlock.ts
+++ b/packages/core/src/extensions/splitBlock.ts
@@ -77,7 +77,7 @@ export const SplitBlock = createExtension({
             }
           }
 
-          dispatch(tr.scrollIntoView())
+          tr.scrollIntoView()
         }
 
         return true
diff --git a/packages/core/src/extensions/toggleList.ts b/packages/core/src/extensions/toggleList.ts
index acfaf05b5..fe8bcc2bb 100644
--- a/packages/core/src/extensions/toggleList.ts
+++ b/packages/core/src/extensions/toggleList.ts
@@ -31,10 +31,12 @@ export const ToggleList = createExtension({
           }
 
           // change list type
-          if (isList(parentList.node.type.name, extensions) && listType.validContent(parentList.node.content)) {
-            if (dispatch) {
-              tr.setNodeMarkup(parentList.pos, listType)
-            }
+          if (
+            isList(parentList.node.type.name, extensions)
+            && listType.validContent(parentList.node.content)
+            && dispatch
+          ) {
+            tr.setNodeMarkup(parentList.pos, listType)
 
             return true
           }
diff --git a/packages/core/src/extensions/updateMark.ts b/packages/core/src/extensions/updateMark.ts
index 0200cf0d0..5c7885c03 100644
--- a/packages/core/src/extensions/updateMark.ts
+++ b/packages/core/src/extensions/updateMark.ts
@@ -7,7 +7,7 @@ import getMarkRange from '../utils/getMarkRange'
 export const UpdateMark = createExtension({
   addCommands() {
     return {
-      updateMark: (typeOrName: string | MarkType, attrs: {}): Command => ({ tr, state }) => {
+      updateMark: (typeOrName: string | MarkType, attrs: {}): Command => ({ tr, state, dispatch }) => {
         const { selection, doc } = tr
         let { from, to } = selection
         const { $from, empty } = selection
@@ -24,11 +24,13 @@ export const UpdateMark = createExtension({
 
         const hasMark = doc.rangeHasMark(from, to, type)
 
-        if (hasMark) {
+        if (hasMark && dispatch) {
           tr.removeMark(from, to, type)
         }
 
-        tr.addMark(from, to, type.create(attrs))
+        if (dispatch) {
+          tr.addMark(from, to, type.create(attrs))
+        }
 
         return true
       },

From b3fb079feed1c6a69337e98fc5e503f50723cd90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 16:33:12 +0100
Subject: [PATCH 074/113] fix tests

---
 docs/src/demos/Extensions/Blockquote/index.spec.js     | 4 ++--
 docs/src/demos/Extensions/Bold/index.spec.js           | 4 ++--
 docs/src/demos/Extensions/BulletList/index.spec.js     | 4 ++--
 docs/src/demos/Extensions/Code/index.spec.js           | 4 ++--
 docs/src/demos/Extensions/CodeBlock/index.spec.js      | 4 ++--
 docs/src/demos/Extensions/Document/index.spec.js       | 4 ++--
 docs/src/demos/Extensions/HardBreak/index.spec.js      | 4 ++--
 docs/src/demos/Extensions/Heading/index.spec.js        | 4 ++--
 docs/src/demos/Extensions/HorizontalRule/index.spec.js | 4 ++--
 docs/src/demos/Extensions/Italic/index.spec.js         | 4 ++--
 docs/src/demos/Extensions/Link/index.spec.js           | 4 ++--
 docs/src/demos/Extensions/ListItem/index.spec.js       | 4 ++--
 docs/src/demos/Extensions/OrderedList/index.spec.js    | 4 ++--
 docs/src/demos/Extensions/Paragraph/index.spec.js      | 4 ++--
 docs/src/demos/Extensions/Strike/index.spec.js         | 4 ++--
 docs/src/demos/Extensions/Text/index.spec.js           | 4 ++--
 docs/src/demos/Extensions/TextAlign/index.spec.js      | 4 ++--
 docs/src/demos/Extensions/Underline/index.spec.js      | 4 ++--
 18 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/docs/src/demos/Extensions/Blockquote/index.spec.js b/docs/src/demos/Extensions/Blockquote/index.spec.js
index d6e0cc7df..e4318e0e1 100644
--- a/docs/src/demos/Extensions/Blockquote/index.spec.js
+++ b/docs/src/demos/Extensions/Blockquote/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/blockquote', () => {
+context('/api/nodes/blockquote', () => {
   before(() => {
-    cy.visit('/api/extensions/blockquote')
+    cy.visit('/api/nodes/blockquote')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/Bold/index.spec.js b/docs/src/demos/Extensions/Bold/index.spec.js
index dbdbba45f..d7d566809 100644
--- a/docs/src/demos/Extensions/Bold/index.spec.js
+++ b/docs/src/demos/Extensions/Bold/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/bold', () => {
+context('/api/marks/bold', () => {
   before(() => {
-    cy.visit('/api/extensions/bold')
+    cy.visit('/api/marks/bold')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/BulletList/index.spec.js b/docs/src/demos/Extensions/BulletList/index.spec.js
index 28f9a815f..4d699aec1 100644
--- a/docs/src/demos/Extensions/BulletList/index.spec.js
+++ b/docs/src/demos/Extensions/BulletList/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/bullet-list', () => {
+context('/api/nodes/bullet-list', () => {
   before(() => {
-    cy.visit('/api/extensions/bullet-list')
+    cy.visit('/api/nodes/bullet-list')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/Code/index.spec.js b/docs/src/demos/Extensions/Code/index.spec.js
index 2111e436c..91e0fdd4a 100644
--- a/docs/src/demos/Extensions/Code/index.spec.js
+++ b/docs/src/demos/Extensions/Code/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/code', () => {
+context('/api/marks/code', () => {
   before(() => {
-    cy.visit('/api/extensions/code')
+    cy.visit('/api/marks/code')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/CodeBlock/index.spec.js b/docs/src/demos/Extensions/CodeBlock/index.spec.js
index 18b6bb186..aa2dd17c7 100644
--- a/docs/src/demos/Extensions/CodeBlock/index.spec.js
+++ b/docs/src/demos/Extensions/CodeBlock/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/code-block', () => {
+context('/api/nodes/code-block', () => {
   before(() => {
-    cy.visit('/api/extensions/code-block')
+    cy.visit('/api/nodes/code-block')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/Document/index.spec.js b/docs/src/demos/Extensions/Document/index.spec.js
index 0231d33c8..59529eedf 100644
--- a/docs/src/demos/Extensions/Document/index.spec.js
+++ b/docs/src/demos/Extensions/Document/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/document', () => {
+context('/api/nodes/document', () => {
   before(() => {
-    cy.visit('/api/extensions/document')
+    cy.visit('/api/nodes/document')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/HardBreak/index.spec.js b/docs/src/demos/Extensions/HardBreak/index.spec.js
index 005864502..86d516fdb 100644
--- a/docs/src/demos/Extensions/HardBreak/index.spec.js
+++ b/docs/src/demos/Extensions/HardBreak/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/hard-break', () => {
+context('/api/nodes/hard-break', () => {
   before(() => {
-    cy.visit('/api/extensions/hard-break')
+    cy.visit('/api/nodes/hard-break')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/Heading/index.spec.js b/docs/src/demos/Extensions/Heading/index.spec.js
index 2543c17e3..70e5dcef8 100644
--- a/docs/src/demos/Extensions/Heading/index.spec.js
+++ b/docs/src/demos/Extensions/Heading/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/heading', () => {
+context('/api/nodes/heading', () => {
   before(() => {
-    cy.visit('/api/extensions/heading')
+    cy.visit('/api/nodes/heading')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/HorizontalRule/index.spec.js b/docs/src/demos/Extensions/HorizontalRule/index.spec.js
index 30e962be4..77442db8b 100644
--- a/docs/src/demos/Extensions/HorizontalRule/index.spec.js
+++ b/docs/src/demos/Extensions/HorizontalRule/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/horizontal-rule', () => {
+context('/api/nodes/horizontal-rule', () => {
   before(() => {
-    cy.visit('/api/extensions/horizontal-rule')
+    cy.visit('/api/nodes/horizontal-rule')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/Italic/index.spec.js b/docs/src/demos/Extensions/Italic/index.spec.js
index 16d26c3fb..1035bc9cc 100644
--- a/docs/src/demos/Extensions/Italic/index.spec.js
+++ b/docs/src/demos/Extensions/Italic/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/italic', () => {
+context('/api/marks/italic', () => {
   before(() => {
-    cy.visit('/api/extensions/italic')
+    cy.visit('/api/marks/italic')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/Link/index.spec.js b/docs/src/demos/Extensions/Link/index.spec.js
index 6f7f89c1c..734579610 100644
--- a/docs/src/demos/Extensions/Link/index.spec.js
+++ b/docs/src/demos/Extensions/Link/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/link', () => {
+context('/api/marks/link', () => {
   before(() => {
-    cy.visit('/api/extensions/link')
+    cy.visit('/api/marks/link')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/ListItem/index.spec.js b/docs/src/demos/Extensions/ListItem/index.spec.js
index 798b7b979..f8b0c6bed 100644
--- a/docs/src/demos/Extensions/ListItem/index.spec.js
+++ b/docs/src/demos/Extensions/ListItem/index.spec.js
@@ -1,5 +1,5 @@
-context('/api/extensions/list-item', () => {
+context('/api/nodes/list-item', () => {
   before(() => {
-    cy.visit('/api/extensions/list-item')
+    cy.visit('/api/nodes/list-item')
   })
 })
diff --git a/docs/src/demos/Extensions/OrderedList/index.spec.js b/docs/src/demos/Extensions/OrderedList/index.spec.js
index acab83ccf..72c8ceecf 100644
--- a/docs/src/demos/Extensions/OrderedList/index.spec.js
+++ b/docs/src/demos/Extensions/OrderedList/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/ordered-list', () => {
+context('/api/nodes/ordered-list', () => {
   before(() => {
-    cy.visit('/api/extensions/ordered-list')
+    cy.visit('/api/nodes/ordered-list')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/Paragraph/index.spec.js b/docs/src/demos/Extensions/Paragraph/index.spec.js
index 359cfbcf7..fd539594d 100644
--- a/docs/src/demos/Extensions/Paragraph/index.spec.js
+++ b/docs/src/demos/Extensions/Paragraph/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/paragraph', () => {
+context('/api/nodes/paragraph', () => {
   before(() => {
-    cy.visit('/api/extensions/paragraph')
+    cy.visit('/api/nodes/paragraph')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/Strike/index.spec.js b/docs/src/demos/Extensions/Strike/index.spec.js
index f43f91d65..98f40014c 100644
--- a/docs/src/demos/Extensions/Strike/index.spec.js
+++ b/docs/src/demos/Extensions/Strike/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/strike', () => {
+context('/api/marks/strike', () => {
   before(() => {
-    cy.visit('/api/extensions/strike')
+    cy.visit('/api/marks/strike')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/Text/index.spec.js b/docs/src/demos/Extensions/Text/index.spec.js
index a9d851def..125c45715 100644
--- a/docs/src/demos/Extensions/Text/index.spec.js
+++ b/docs/src/demos/Extensions/Text/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/text', () => {
+context('/api/nodes/text', () => {
   before(() => {
-    cy.visit('/api/extensions/text')
+    cy.visit('/api/nodes/text')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/TextAlign/index.spec.js b/docs/src/demos/Extensions/TextAlign/index.spec.js
index a9d851def..125c45715 100644
--- a/docs/src/demos/Extensions/TextAlign/index.spec.js
+++ b/docs/src/demos/Extensions/TextAlign/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/text', () => {
+context('/api/nodes/text', () => {
   before(() => {
-    cy.visit('/api/extensions/text')
+    cy.visit('/api/nodes/text')
   })
 
   beforeEach(() => {
diff --git a/docs/src/demos/Extensions/Underline/index.spec.js b/docs/src/demos/Extensions/Underline/index.spec.js
index 3d7664e73..bb1d5193c 100644
--- a/docs/src/demos/Extensions/Underline/index.spec.js
+++ b/docs/src/demos/Extensions/Underline/index.spec.js
@@ -1,6 +1,6 @@
-context('/api/extensions/underline', () => {
+context('/api/marks/underline', () => {
   before(() => {
-    cy.visit('/api/extensions/underline')
+    cy.visit('/api/marks/underline')
   })
 
   beforeEach(() => {

From c9d5494875ef319b4ed7dca4b5c7dca8dc1cc0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 16:47:21 +0100
Subject: [PATCH 075/113] improve table styling

---
 docs/src/templates/DocPage/style.scss | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss
index caf489475..f0d8fe144 100644
--- a/docs/src/templates/DocPage/style.scss
+++ b/docs/src/templates/DocPage/style.scss
@@ -210,16 +210,6 @@
         color: $colorWhite;
         font-weight: 500;
         border-bottom: 1px solid rgba($colorWhite, 0.2);
-
-        &:first-child {
-          border-top-left-radius: 5px;
-          border-bottom-left-radius: 5px;
-        }
-
-        &:last-child {
-          border-top-right-radius: 5px;
-          border-bottom-right-radius: 5px;
-        }
       }
 
       td {
@@ -229,6 +219,16 @@
       tr:last-child td {
         border-bottom: 0;
       }
+
+      tbody tr {
+        &:last-child td {
+          border-bottom: 0;
+        }
+
+        &:hover {
+          background: rgba($colorWhite, 0.02);
+        }
+      }
     }
 
     > .remark-container {

From c73b03c595cb4ce482eb992bc6f024d92a4fd077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 16:56:01 +0100
Subject: [PATCH 076/113] fix error

---
 docs/src/demos/Examples/ExportHtmlOrJson/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/demos/Examples/ExportHtmlOrJson/index.vue b/docs/src/demos/Examples/ExportHtmlOrJson/index.vue
index 218d17e98..98cbe5927 100644
--- a/docs/src/demos/Examples/ExportHtmlOrJson/index.vue
+++ b/docs/src/demos/Examples/ExportHtmlOrJson/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="actions">
+    <div class="actions" v-if="editor">
       <button class="button" @click="setContent">
         Set Content
       </button>

From 7bfab4685f958be82a3519c6cbd377977c88794d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 17:18:12 +0100
Subject: [PATCH 077/113] add can method to editor class

---
 packages/core/src/CommandManager.ts | 42 +++++++++++++++++++----------
 packages/core/src/Editor.ts         |  8 +++++-
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/packages/core/src/CommandManager.ts b/packages/core/src/CommandManager.ts
index 7d5fb89fb..f77879b12 100644
--- a/packages/core/src/CommandManager.ts
+++ b/packages/core/src/CommandManager.ts
@@ -1,5 +1,7 @@
 import { EditorState, Transaction } from 'prosemirror-state'
-import { ChainedCommands, Editor, CommandSpec } from './Editor'
+import {
+  SingleCommands, ChainedCommands, Editor, CommandSpec,
+} from './Editor'
 import getAllMethodNames from './utils/getAllMethodNames'
 
 export default class CommandManager {
@@ -95,6 +97,30 @@ export default class CommandManager {
     }) as ChainedCommands
   }
 
+  public createCan(startTr?: Transaction) {
+    const { commands, editor } = this
+    const { state } = editor
+    const dispatch = false
+    const hasStartTransaction = !!startTr
+    const tr = hasStartTransaction ? startTr : state.tr
+
+    if (!tr) {
+      return
+    }
+
+    const props = this.buildProps(tr, dispatch)
+    const formattedCommands = Object.fromEntries(Object
+      .entries(commands)
+      .map(([name, command]) => {
+        return [name, (...args: any[]) => command(...args)({ ...props, dispatch })]
+      }))
+
+    return {
+      ...formattedCommands,
+      chain: () => this.createChain(tr, dispatch),
+    } as SingleCommands & { chain: () => ChainedCommands }
+  }
+
   public buildProps(tr: Transaction, shouldDispatch = true) {
     const { editor, commands } = this
     const { state, view } = editor
@@ -108,19 +134,7 @@ export default class CommandManager {
         ? () => true
         : undefined,
       chain: () => this.createChain(tr),
-      can: () => {
-        const dispatch = false
-        const formattedCommands = Object.fromEntries(Object
-          .entries(commands)
-          .map(([name, command]) => {
-            return [name, (...args: any[]) => command(...args)({ ...props, dispatch })]
-          }))
-
-        return {
-          ...formattedCommands,
-          chain: () => this.createChain(tr, dispatch),
-        }
-      },
+      can: () => this.createCan(tr),
       get commands() {
         return Object.fromEntries(Object
           .entries(commands)
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 0c8355e46..6d8805be3 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -115,7 +115,6 @@ export class Editor extends EventEmitter {
     this.createExtensionManager()
     this.createSchema()
     this.createView()
-    // this.registerCommands(coreCommands)
     this.injectCSS()
 
     window.setTimeout(() => this.proxy.focus(this.options.autoFocus), 0)
@@ -138,6 +137,13 @@ export class Editor extends EventEmitter {
     return this.commandManager.createChain()
   }
 
+  /**
+   * Check if a command or a command chain can be executed. Without executing it.
+   */
+  public can() {
+    return this.commandManager.createCan()
+  }
+
   /**
    * Inject CSS styles.
    */

From 7338266813847deaff51914dff2d01ab108a376d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 17:22:04 +0100
Subject: [PATCH 078/113] refactoring

---
 packages/core/src/CommandManager.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/CommandManager.ts b/packages/core/src/CommandManager.ts
index f77879b12..1e912fc02 100644
--- a/packages/core/src/CommandManager.ts
+++ b/packages/core/src/CommandManager.ts
@@ -113,12 +113,12 @@ export default class CommandManager {
       .entries(commands)
       .map(([name, command]) => {
         return [name, (...args: any[]) => command(...args)({ ...props, dispatch })]
-      }))
+      })) as SingleCommands
 
     return {
       ...formattedCommands,
       chain: () => this.createChain(tr, dispatch),
-    } as SingleCommands & { chain: () => ChainedCommands }
+    }
   }
 
   public buildProps(tr: Transaction, shouldDispatch = true) {

From 595709547e716e8cbd468f7d4ef0c331041ba9c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 17:36:27 +0100
Subject: [PATCH 079/113] update docs

---
 docs/src/docPages/api/editor.md | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/docs/src/docPages/api/editor.md b/docs/src/docPages/api/editor.md
index 42422893f..721b9b03e 100644
--- a/docs/src/docPages/api/editor.md
+++ b/docs/src/docPages/api/editor.md
@@ -10,25 +10,23 @@ This class is a central building block of tiptap. It does most of the heavy lift
 | ------------------ | --------------- | ----------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `autoFocus`        | `Boolean`       | `false`     | Focus the editor on init.                                                                                                                                                           |
 | `content`          | `Object|String` | `null`      | The editor state object used by Prosemirror. You can also pass HTML to the `content` slot. When used both, the `content` slot will be ignored.                                      |
-| `dropCursor`       | `Object`        | `{}`        | Config for `prosemirror-dropcursor`.                                                                                                                                                |
 | `editable`         | `Boolean`       | `true`      | When set to `false` the editor is read-only.                                                                                                                                        |
 | `editorProps`      | `Object`        | `{}`        | A list of [Prosemirror editorProps](https://prosemirror.net/docs/ref/#view.EditorProps).                                                                                            |
-| `enableDropCursor` | `Boolean`       | `true`      | Enable/disable showing a cursor at the drop position when something is dragged over the editor.                                                                                     |
-| `enableGapCursor`  | `Boolean`       | `true`      | Enable/disable a cursor at places that don’t allow regular selection (such as positions that have a leaf block node, table, or the end of the document both before and after them). |
 | `extensions`       | `Array`         | `[]`        | A list of extensions used, by the editor. This can be `Nodes`, `Marks` or `Plugins`.                                                                                                |
 | `parseOptions`     | `Object`        | `{}`        | A list of [Prosemirror parseOptions](https://prosemirror.net/docs/ref/#model.ParseOptions).                                                                                         |
 | `onBlur`           | `Function`      | `undefined` | Returns an object with the `event` and current `state` and `view` of Prosemirror on blur.                                                                                           |
 | `onFocus`          | `Function`      | `undefined` | Returns an object with the `event` and current `state` and `view` of Prosemirror on focus.                                                                                          |
 | `onInit`           | `Function`      | `undefined` | Returns an object with the current `state` and `view` of Prosemirror on init.                                                                                                       |
-| `onUpdate`         | `Function`      | `undefined` | Returns an object with the current `state` of Prosemirror, a `getJSON()` and `getHTML()` function and the `transaction` on every change.                                                  |
+| `onUpdate`         | `Function`      | `undefined` | Returns an object with the current `state` of Prosemirror, a `getJSON()` and `getHTML()` function and the `transaction` on every change.                                            |
 
 ## Methods
 | Method               | Parameters                                                                                                  | Description                                               |
 | -------------------- | ----------------------------------------------------------------------------------------------------------- | --------------------------------------------------------- |
-| `getHTML()`             | –                                                                                                           | Returns the current content as HTML.                      |
-| `getJSON()`             | –                                                                                                           | Returns the current content as JSON.                      |
+| `getHTML()`          | –                                                                                                           | Returns the current content as HTML.                      |
+| `getJSON()`          | –                                                                                                           | Returns the current content as JSON.                      |
 | `destroy()`          | –                                                                                                           | Stops the editor instance and unbinds all events.         |
 | `chain()`            | -                                                                                                           | Create a command chain to call multiple commands at once. |
+| `can()`              | -                                                                                                           | Check if a command or a command chain can be executed. Without executing it. |
 | `setOptions()`       | `options` A list of options                                                                                 | Update editor options.                                    |
 | `isEditable()`       | -                                                                                                           | Returns whether the editor is editable.                   |
 | `state()`            | -                                                                                                           | Returns the editor state.                                 |
@@ -40,3 +38,4 @@ This class is a central building block of tiptap. It does most of the heavy lift
 | `getNodeAttrs()`     | `name` Name of the node                                                                                     | Get attributes of the currently selected node.            |
 | `getMarkAttrs()`     | `name` Name of the mark                                                                                     | Get attributes of the currently selected mark.            |
 | `isActive()`         | `name` Name of the node or mark<br>`attrs` Attributes of the node or mark                                   | Returns if the currently selected node or mark is active. |
+| `isEmpty()`          | -                                                                                                           | Check if there is no content.                             |

From d3319bea4ecc352870e5bf43c09e7c07794a06e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 19:18:38 +0100
Subject: [PATCH 080/113] fix input rules for marks

---
 packages/core/src/inputRules/markInputRule.ts | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/core/src/inputRules/markInputRule.ts b/packages/core/src/inputRules/markInputRule.ts
index fa99778b0..5358ff9b1 100644
--- a/packages/core/src/inputRules/markInputRule.ts
+++ b/packages/core/src/inputRules/markInputRule.ts
@@ -18,43 +18,43 @@ function getMarksBetween(start: number, end: number, state: EditorState) {
 
 export default function (regexp: RegExp, markType: MarkType, getAttrs?: Function) {
   return new InputRule(regexp, (state, match, start, end) => {
-    const attrs = getAttrs instanceof Function ? getAttrs(match) : getAttrs
+    const attributes = getAttrs instanceof Function ? getAttrs(match) : getAttrs
     const { tr } = state
-    const m = match.length - 1
+    const captureGroup = match[match.length - 1]
+    const fullMatch = match[0]
     let markEnd = end
-    let markStart = start
 
-    if (match[m]) {
-      const matchStart = start + match[0].indexOf(match[m - 1])
-      const matchEnd = matchStart + match[m - 1].length - 1
-      const textStart = matchStart + match[m - 1].lastIndexOf(match[m])
-      const textEnd = textStart + match[m].length
+    if (captureGroup) {
+      const startSpaces = fullMatch.search(/\S/)
+      const textStart = start + fullMatch.indexOf(captureGroup)
+      const textEnd = textStart + captureGroup.length
 
       const excludedMarks = getMarksBetween(start, end, state)
         .filter(item => {
           const { excluded } = item.mark.type
           return excluded.find((type: MarkType) => type.name === markType.name)
         })
-        .filter(item => item.end > matchStart)
+        .filter(item => item.end > textStart)
 
       if (excludedMarks.length) {
         return null
       }
 
-      if (textEnd < matchEnd) {
-        tr.delete(textEnd, matchEnd)
+      if (textEnd < end) {
+        tr.delete(textEnd, end)
       }
 
-      if (textStart > matchStart) {
-        tr.delete(matchStart, textStart)
+      if (textStart > start) {
+        tr.delete(start + startSpaces, textStart)
       }
 
-      markStart = matchStart
-      markEnd = markStart + match[m].length
+      markEnd = start + startSpaces + captureGroup.length
     }
 
-    tr.addMark(markStart, markEnd, markType.create(attrs))
+    tr.addMark(start, markEnd, markType.create(attributes))
+
     tr.removeStoredMark(markType)
+
     return tr
   })
 }

From 727442c3a5e45db6cf86827465e3500ade21597f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 22:17:39 +0100
Subject: [PATCH 081/113] add tests for mergeAttributes

---
 packages/core/src/utils/mergeAttributes.ts    | 11 ++--
 .../integration/core/mergeAttributes.spec.ts  | 60 +++++++++++++++++++
 2 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 tests/cypress/integration/core/mergeAttributes.spec.ts

diff --git a/packages/core/src/utils/mergeAttributes.ts b/packages/core/src/utils/mergeAttributes.ts
index 136e3c5bc..733c8cb94 100644
--- a/packages/core/src/utils/mergeAttributes.ts
+++ b/packages/core/src/utils/mergeAttributes.ts
@@ -5,18 +5,19 @@ export default function mergeAttributes(...object: AnyObject[]) {
     const mergedAttributes = { ...items }
 
     Object.entries(item).forEach(([key, value]) => {
-      if (!mergedAttributes[key]) {
+      const exists = mergedAttributes[key]
+
+      if (!exists) {
         mergedAttributes[key] = value
         return
       }
 
       if (key === 'class') {
         mergedAttributes[key] = [mergedAttributes[key], value].join(' ')
-        return
-      }
-
-      if (key === 'style') {
+      } else if (key === 'style') {
         mergedAttributes[key] = [mergedAttributes[key], value].join('; ')
+      } else {
+        mergedAttributes[key] = value
       }
     })
 
diff --git a/tests/cypress/integration/core/mergeAttributes.spec.ts b/tests/cypress/integration/core/mergeAttributes.spec.ts
new file mode 100644
index 000000000..5a6a24e0b
--- /dev/null
+++ b/tests/cypress/integration/core/mergeAttributes.spec.ts
@@ -0,0 +1,60 @@
+/// <reference types="cypress" />
+
+import mergeAttributes from '@tiptap/core/src/utils/mergeAttributes'
+
+describe('mergeAttributes', () => {
+  it('should merge two objects', () => {
+    const value = mergeAttributes({ id: 1 }, { class: 'foo' })
+
+    expect(value).to.deep.eq({
+      id: 1,
+      class: 'foo',
+    })
+  })
+
+  it('should merge multiple objects', () => {
+    const value = mergeAttributes({ id: 1 }, { class: 'foo' }, { title: 'bar' })
+
+    expect(value).to.deep.eq({
+      id: 1,
+      class: 'foo',
+      title: 'bar',
+    })
+  })
+
+  it('should overwrite values', () => {
+    const value = mergeAttributes({ id: 1 }, { id: 2 })
+
+    expect(value).to.deep.eq({
+      id: 2,
+    })
+  })
+
+  it('should merge classes', () => {
+    const value = mergeAttributes({ class: 'foo' }, { class: 'bar' })
+
+    expect(value).to.deep.eq({
+      class: 'foo bar',
+    })
+  })
+
+  it('should merge styles', () => {
+    const value = mergeAttributes({ style: 'color: red' }, { style: 'background: green' })
+
+    expect(value).to.deep.eq({
+      style: 'color: red; background: green',
+    })
+  })
+
+  it('should merge classes and styles', () => {
+    const value = mergeAttributes(
+      { class: 'foo', style: 'color: red' },
+      { class: 'bar', style: 'background: green' },
+    )
+
+    expect(value).to.deep.eq({
+      class: 'foo bar',
+      style: 'color: red; background: green',
+    })
+  })
+})

From 971e8838a0f45441b5307733fd6604579eca7f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 22:43:54 +0100
Subject: [PATCH 082/113] move plugins to extensions

---
 packages/core/src/Editor.ts                 |  6 +--
 packages/core/src/extensions/editable.ts    | 15 ++++++++
 packages/core/src/extensions/focusEvents.ts | 42 +++++++++++++++++++++
 packages/core/src/extensions/index.ts       |  3 ++
 packages/core/src/extensions/keymap.ts      | 19 ++++++++++
 packages/core/src/plugins/editable.ts       |  9 -----
 packages/core/src/plugins/focus.ts          | 28 --------------
 packages/core/src/plugins/index.ts          | 12 ------
 8 files changed, 80 insertions(+), 54 deletions(-)
 create mode 100644 packages/core/src/extensions/editable.ts
 create mode 100644 packages/core/src/extensions/focusEvents.ts
 create mode 100644 packages/core/src/extensions/keymap.ts
 delete mode 100644 packages/core/src/plugins/editable.ts
 delete mode 100644 packages/core/src/plugins/focus.ts
 delete mode 100644 packages/core/src/plugins/index.ts

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 6d8805be3..ec487eaec 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -15,7 +15,6 @@ import CommandManager from './CommandManager'
 import ExtensionManager from './ExtensionManager'
 import EventEmitter from './EventEmitter'
 import { Extensions, UnionToIntersection, PickValue } from './types'
-import defaultPlugins from './plugins'
 import * as extensions from './extensions'
 import style from './style'
 
@@ -264,10 +263,7 @@ export class Editor extends EventEmitter {
     this.view = new EditorView(this.options.element, {
       state: EditorState.create({
         doc: this.createDocument(this.options.content),
-        plugins: [
-          ...this.extensionManager.plugins,
-          ...defaultPlugins.map(plugin => plugin(this.proxy)),
-        ],
+        plugins: this.extensionManager.plugins,
       }),
       dispatchTransaction: this.dispatchTransaction.bind(this),
     })
diff --git a/packages/core/src/extensions/editable.ts b/packages/core/src/extensions/editable.ts
new file mode 100644
index 000000000..4cca4fa82
--- /dev/null
+++ b/packages/core/src/extensions/editable.ts
@@ -0,0 +1,15 @@
+import { Plugin, PluginKey } from 'prosemirror-state'
+import { createExtension } from '../Extension'
+
+export const Editable = createExtension({
+  addProseMirrorPlugins() {
+    return [
+      new Plugin({
+        key: new PluginKey('editable'),
+        props: {
+          editable: () => this.editor.options.editable,
+        },
+      }),
+    ]
+  },
+})
diff --git a/packages/core/src/extensions/focusEvents.ts b/packages/core/src/extensions/focusEvents.ts
new file mode 100644
index 000000000..46cf848fc
--- /dev/null
+++ b/packages/core/src/extensions/focusEvents.ts
@@ -0,0 +1,42 @@
+import { Plugin } from 'prosemirror-state'
+import { createExtension } from '../Extension'
+
+export const FocusEvents = createExtension({
+  addProseMirrorPlugins() {
+    const { editor } = this
+
+    return [
+      new Plugin({
+        props: {
+          attributes: {
+            tabindex: '0',
+          },
+          handleDOMEvents: {
+            focus: () => {
+              editor.isFocused = true
+
+              const transaction = editor.state.tr.setMeta('focused', true)
+              editor.view.dispatch(transaction)
+
+              return true
+            },
+            blur: () => {
+              editor.isFocused = false
+
+              const transaction = editor.state.tr.setMeta('focused', false)
+              editor.view.dispatch(transaction)
+
+              return true
+            },
+          },
+        },
+      }),
+    ]
+  },
+})
+
+declare module '../Editor' {
+  interface AllExtensions {
+    FocusEvents: typeof FocusEvents,
+  }
+}
diff --git a/packages/core/src/extensions/index.ts b/packages/core/src/extensions/index.ts
index 0d2de36f8..c269e279f 100644
--- a/packages/core/src/extensions/index.ts
+++ b/packages/core/src/extensions/index.ts
@@ -2,9 +2,12 @@ export { Blur } from './blur'
 export { ClearContent } from './clearContent'
 export { ClearNodes } from './clearNodes'
 export { DeleteSelection } from './deleteSelection'
+export { Editable } from './editable'
 export { Focus } from './focus'
+export { FocusEvents } from './focusEvents'
 export { InsertHTML } from './insertHTML'
 export { InsertText } from './insertText'
+export { Keymap } from './keymap'
 export { LiftListItem } from './liftListItem'
 export { RemoveMark } from './removeMark'
 export { RemoveMarks } from './removeMarks'
diff --git a/packages/core/src/extensions/keymap.ts b/packages/core/src/extensions/keymap.ts
new file mode 100644
index 000000000..c3a5963ed
--- /dev/null
+++ b/packages/core/src/extensions/keymap.ts
@@ -0,0 +1,19 @@
+import { keymap } from 'prosemirror-keymap'
+import { baseKeymap } from 'prosemirror-commands'
+import { undoInputRule } from 'prosemirror-inputrules'
+import { createExtension } from '../Extension'
+
+export const Keymap = createExtension({
+  addProseMirrorPlugins() {
+    return [
+      keymap({ Backspace: undoInputRule }),
+      keymap(baseKeymap),
+    ]
+  },
+})
+
+declare module '../Editor' {
+  interface AllExtensions {
+    Keymap: typeof Keymap,
+  }
+}
diff --git a/packages/core/src/plugins/editable.ts b/packages/core/src/plugins/editable.ts
deleted file mode 100644
index 1a2078f21..000000000
--- a/packages/core/src/plugins/editable.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Plugin, PluginKey } from 'prosemirror-state'
-import Editor from '../..'
-
-export default (editor: Editor) => new Plugin({
-  key: new PluginKey('editable'),
-  props: {
-    editable: () => editor.options.editable,
-  },
-})
diff --git a/packages/core/src/plugins/focus.ts b/packages/core/src/plugins/focus.ts
deleted file mode 100644
index 794346e96..000000000
--- a/packages/core/src/plugins/focus.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Plugin } from 'prosemirror-state'
-import Editor from '../..'
-
-export default (editor: Editor) => new Plugin({
-  props: {
-    attributes: {
-      tabindex: '0',
-    },
-    handleDOMEvents: {
-      focus: () => {
-        editor.isFocused = true
-
-        const transaction = editor.state.tr.setMeta('focused', true)
-        editor.view.dispatch(transaction)
-
-        return true
-      },
-      blur: () => {
-        editor.isFocused = false
-
-        const transaction = editor.state.tr.setMeta('focused', false)
-        editor.view.dispatch(transaction)
-
-        return true
-      },
-    },
-  },
-})
diff --git a/packages/core/src/plugins/index.ts b/packages/core/src/plugins/index.ts
deleted file mode 100644
index 6c83f2f43..000000000
--- a/packages/core/src/plugins/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { keymap } from 'prosemirror-keymap'
-import { baseKeymap } from 'prosemirror-commands'
-import { undoInputRule } from 'prosemirror-inputrules'
-import editable from './editable'
-import focus from './focus'
-
-export default [
-  () => keymap({ Backspace: undoInputRule }),
-  () => keymap(baseKeymap),
-  editable,
-  focus,
-]

From ade9847e728ec3b158d7f0625fa5bd39901e430e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 22:46:56 +0100
Subject: [PATCH 083/113] remove unused file

---
 packages/core/index.ts                 | 1 -
 packages/core/src/ComponentRenderer.ts | 5 -----
 2 files changed, 6 deletions(-)
 delete mode 100644 packages/core/src/ComponentRenderer.ts

diff --git a/packages/core/index.ts b/packages/core/index.ts
index 30272f8bb..6661c9bc1 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -2,7 +2,6 @@ import { Editor, Command, CommandsSpec } from './src/Editor'
 
 export default Editor
 export { Editor, Command, CommandsSpec }
-export { default as ComponentRenderer } from './src/ComponentRenderer'
 
 export * from './src/Extension'
 export * from './src/NodeExtension'
diff --git a/packages/core/src/ComponentRenderer.ts b/packages/core/src/ComponentRenderer.ts
deleted file mode 100644
index 39d9d8656..000000000
--- a/packages/core/src/ComponentRenderer.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export default abstract class ComponentRenderer {
-
-  static type: string
-
-}

From 3a79b8c564d586bd3edc58a01022b149a3967945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 23:26:41 +0100
Subject: [PATCH 084/113] fix keymaps

---
 packages/core/src/Editor.ts                |  2 +-
 packages/core/src/extensions/baseKeymap.ts | 14 ++++++++++++++
 packages/core/src/extensions/index.ts      |  3 ++-
 packages/core/src/extensions/inputRules.ts | 16 ++++++++++++++++
 packages/core/src/extensions/keymap.ts     | 19 -------------------
 packages/core/src/extensions/splitBlock.ts |  2 +-
 6 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 packages/core/src/extensions/baseKeymap.ts
 create mode 100644 packages/core/src/extensions/inputRules.ts
 delete mode 100644 packages/core/src/extensions/keymap.ts

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index ec487eaec..062418e2d 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -237,7 +237,7 @@ export class Editor extends EventEmitter {
    */
   private createExtensionManager() {
     const coreExtensions = Object.entries(extensions).map(([, extension]) => extension())
-    const allExtensions = [...coreExtensions, ...this.options.extensions]
+    const allExtensions = [...this.options.extensions, ...coreExtensions]
 
     this.extensionManager = new ExtensionManager(allExtensions, this.proxy)
   }
diff --git a/packages/core/src/extensions/baseKeymap.ts b/packages/core/src/extensions/baseKeymap.ts
new file mode 100644
index 000000000..95508a4e3
--- /dev/null
+++ b/packages/core/src/extensions/baseKeymap.ts
@@ -0,0 +1,14 @@
+import { baseKeymap } from 'prosemirror-commands'
+import { createExtension } from '../Extension'
+
+export const BaseKeymap = createExtension({
+  addKeyboardShortcuts() {
+    return baseKeymap
+  },
+})
+
+declare module '../Editor' {
+  interface AllExtensions {
+    BaseKeymap: typeof BaseKeymap,
+  }
+}
diff --git a/packages/core/src/extensions/index.ts b/packages/core/src/extensions/index.ts
index c269e279f..463db8c50 100644
--- a/packages/core/src/extensions/index.ts
+++ b/packages/core/src/extensions/index.ts
@@ -5,9 +5,10 @@ export { DeleteSelection } from './deleteSelection'
 export { Editable } from './editable'
 export { Focus } from './focus'
 export { FocusEvents } from './focusEvents'
+export { InputRules } from './inputRules'
 export { InsertHTML } from './insertHTML'
 export { InsertText } from './insertText'
-export { Keymap } from './keymap'
+export { BaseKeymap } from './baseKeymap'
 export { LiftListItem } from './liftListItem'
 export { RemoveMark } from './removeMark'
 export { RemoveMarks } from './removeMarks'
diff --git a/packages/core/src/extensions/inputRules.ts b/packages/core/src/extensions/inputRules.ts
new file mode 100644
index 000000000..c9e09d665
--- /dev/null
+++ b/packages/core/src/extensions/inputRules.ts
@@ -0,0 +1,16 @@
+import { undoInputRule } from 'prosemirror-inputrules'
+import { createExtension } from '../Extension'
+
+export const InputRules = createExtension({
+  addKeyboardShortcuts() {
+    return {
+      Backspace: undoInputRule,
+    }
+  },
+})
+
+declare module '../Editor' {
+  interface AllExtensions {
+    InputRules: typeof InputRules,
+  }
+}
diff --git a/packages/core/src/extensions/keymap.ts b/packages/core/src/extensions/keymap.ts
deleted file mode 100644
index c3a5963ed..000000000
--- a/packages/core/src/extensions/keymap.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { keymap } from 'prosemirror-keymap'
-import { baseKeymap } from 'prosemirror-commands'
-import { undoInputRule } from 'prosemirror-inputrules'
-import { createExtension } from '../Extension'
-
-export const Keymap = createExtension({
-  addProseMirrorPlugins() {
-    return [
-      keymap({ Backspace: undoInputRule }),
-      keymap(baseKeymap),
-    ]
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    Keymap: typeof Keymap,
-  }
-}
diff --git a/packages/core/src/extensions/splitBlock.ts b/packages/core/src/extensions/splitBlock.ts
index 39b78241b..98359fd2d 100644
--- a/packages/core/src/extensions/splitBlock.ts
+++ b/packages/core/src/extensions/splitBlock.ts
@@ -26,7 +26,7 @@ export const SplitBlock = createExtension({
           }
 
           if (dispatch) {
-            dispatch(tr.split($from.pos).scrollIntoView())
+            tr.split($from.pos).scrollIntoView()
           }
 
           return true

From 5f35d92acc6097c74e5c512419a5d90c9aae0592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Mon, 2 Nov 2020 23:41:47 +0100
Subject: [PATCH 085/113] fix focus command

---
 packages/core/src/extensions/focus.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/core/src/extensions/focus.ts b/packages/core/src/extensions/focus.ts
index 1719a6b85..ffbcdbee5 100644
--- a/packages/core/src/extensions/focus.ts
+++ b/packages/core/src/extensions/focus.ts
@@ -55,10 +55,9 @@ export const Focus = createExtension({
 
         if (dispatch) {
           tr.setSelection(selection)
+          view.focus()
         }
 
-        view.focus()
-
         return true
       },
     }

From 9bcdb57f14490f2b92c014d544e4f16edfebe333 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Tue, 3 Nov 2020 16:13:13 +0100
Subject: [PATCH 086/113] update content, add text align justify

---
 docs/src/demos/Examples/Formatting/index.vue  | 43 +++++++++---
 .../Examples/MarkdownShortcuts/index.vue      |  6 +-
 docs/src/docPages/api/extensions.md           | 69 ++++++++-----------
 docs/src/docPages/api/marks.md                | 10 +++
 docs/src/docPages/api/nodes.md                | 18 +++++
 docs/src/docPages/api/nodes/bullet-list.md    |  2 +-
 docs/src/docPages/api/nodes/ordered-list.md   |  2 +-
 docs/src/docPages/api/nodes/todo-item.md      | 17 -----
 docs/src/docPages/api/nodes/todo-list.md      | 69 -------------------
 docs/src/docPages/overview/upgrade-guide.md   |  2 +-
 docs/src/layouts/App/style.scss               | 11 ++-
 docs/src/links.yaml                           |  4 ++
 packages/extension-text-align/index.ts        |  2 +-
 13 files changed, 110 insertions(+), 145 deletions(-)
 delete mode 100644 docs/src/docPages/api/nodes/todo-item.md
 delete mode 100644 docs/src/docPages/api/nodes/todo-list.md

diff --git a/docs/src/demos/Examples/Formatting/index.vue b/docs/src/demos/Examples/Formatting/index.vue
index 6dedb0e50..ce9c2a990 100644
--- a/docs/src/demos/Examples/Formatting/index.vue
+++ b/docs/src/demos/Examples/Formatting/index.vue
@@ -28,6 +28,9 @@
       <button @click="editor.chain().focus().textAlign('right').run()">
         right
       </button>
+      <button @click="editor.chain().focus().textAlign('justify').run()">
+        justify
+      </button>
     </div>
     <editor-content :editor="editor" />
   </div>
@@ -70,22 +73,40 @@ export default {
         HardBreak(),
       ],
       content: `
-        <h2>Cyndi Lauper – Girls Just Want to Have Fun</h2>
-        <p>I come home in the morning light
-        My mother says, “When you gonna live your life right?”
-        Oh mother dear we’re not the fortunate ones
-        And girls, they wanna have fun
+        <h3>Girls Just Want to Have Fun (Cyndi Lauper)</h2>
+        <p>I come home in the morning light<br>
+        My mother says, “When you gonna live your life right?”<br>
+        Oh mother dear we’re not the fortunate ones<br>
+        And girls, they wanna have fun<br>
         Oh girls just want to have fun</p>
-        <p>The phone rings in the middle of the night
-        My father yells, "What you gonna do with your life?"
-        Oh daddy dear, you know you’re still number one
-        But girls, they wanna have fun
+        <p style="text-align: center">The phone rings in the middle of the night<br>
+        My father yells, "What you gonna do with your life?"<br>
+        Oh daddy dear, you know you’re still number one<br>
+        But girls, they wanna have fun<br>
         Oh girls just want to have</p>
-        <p>That’s all they really want
+        <p style="text-align:right">That’s all they really want<br>
+        Some fun<br>
+        When the working day is done<br>
+        Oh girls, they wanna have fun<br>
+        Oh girls just wanna have fun<br>
+        (girls, they wanna, wanna have fun, girls wanna have)</p>
+        <p style="text-align:justify">Some boys take a beautiful girl
+        And hide her away from the rest of the world
+        I want to be the one to walk in the sun
+        Oh girls, they wanna have fun
+        Oh girls just wanna have</p>
+        <p style="text-align:justify">That's all they really want
         Some fun
         When the working day is done
         Oh girls, they wanna have fun
-        Oh girls just wanna have fun (girls, they wanna, wanna have fun, girls wanna have)</p>
+        Oh girls just want to have fun (girls, they wanna, wanna have fun, girls wanna have)
+        They just wanna, they just wanna (girls)
+        They just wanna, they just wanna, oh girl (girls just wanna have fun)
+        Girls just wanna have fun
+        They just wanna, they just wanna
+        They just wanna, they just wanna (girls)
+        They just wanna, they just wanna, oh girl (girls just wanna have fun)
+        Girls just want to have fun</p>
       `,
     })
   },
diff --git a/docs/src/demos/Examples/MarkdownShortcuts/index.vue b/docs/src/demos/Examples/MarkdownShortcuts/index.vue
index bfc9db5e4..f67923d33 100644
--- a/docs/src/demos/Examples/MarkdownShortcuts/index.vue
+++ b/docs/src/demos/Examples/MarkdownShortcuts/index.vue
@@ -22,13 +22,13 @@ export default {
     this.editor = new Editor({
       content: `
         <p>
-          Start a new line and type <code>#</code> followed by a space to get a heading. Try <code>#</code>, <code>##</code>, <code>###</code>, <code>####</code>, <code>#####</code>, <code>######</code> for different levels.
+          Markdown shortcuts make it easy to format the text while typing.
         </p>
         <p>
-          Those conventions are called <strong>input rules</strong> in tiptap. Some of them are enabled by default. Try <code>></code> for blockquotes, <code>*</code>, <code>-</code> or <code>+</code> for bullet lists, or <code>\`foobar\`</code> to highlight code.
+          To test that, start a new line and type <code>#</code> followed by a space to get a heading. Try <code>#</code>, <code>##</code>, <code>###</code>, <code>####</code>, <code>#####</code>, <code>######</code> for different levels.
         </p>
         <p>
-          You can add your own input rules to your Nodes and Marks or even to the default ones.
+          Those conventions are called input rules in tiptap. Some of them are enabled by default. Try <code>></code> for blockquotes, <code>*</code>, <code>-</code> or <code>+</code> for bullet lists, or <code>\`foobar\`</code> to highlight code. You can add your own input rules to existing extensions, and to your custom nodes and marks.
         </p>
       `,
       extensions: defaultExtensions(),
diff --git a/docs/src/docPages/api/extensions.md b/docs/src/docPages/api/extensions.md
index 6f4ca1cf2..9649f955a 100644
--- a/docs/src/docPages/api/extensions.md
+++ b/docs/src/docPages/api/extensions.md
@@ -5,51 +5,40 @@
 ## Introduction
 Extensions are the way to add functionality to tiptap. By default tiptap comes bare, without any of them, but we have a long list of extensions that are ready to be used with tiptap.
 
-## A minimalist set of extensions
-You’ll need at least three extensions: `Document`, `Paragraph` and `Text`. See [an example of a tiptap version for minimalists](/examples/minimalist).
-
-## Default extensions
-You don’t have to use it, but we prepared a `@tiptap/vue-starter-kit` which includes the most common extensions. See [how you can use the `defaultExtensions()`](/examples/basic).
-
-## List of supported extensions
+## List of provided extensions
 | Title                                                       | Default Extension | Source Code                                                                                            |
 | ----------------------------------------------------------- | ----------------- | ------------------------------------------------------------------------------------------------------ |
-| [Blockquote](/api/extensions/blockquote)                    | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-blockquote/)           |
-| [Bold](/api/extensions/bold)                                | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-bold/)                 |
-| [BulletList](/api/extensions/bullet-list)                   | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-bullet-list/)          |
-| [Code](/api/extensions/code)                                | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-code/)                 |
-| [CodeBlock](/api/extensions/code-block)                     | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-code-block/)           |
 | [Collaboration](/api/extensions/collaboration)              | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-collaboration/)        |
 | [CollaborationCursor](/api/extensions/collaboration-cursor) | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-collaboration-cursor/) |
-| [Document](/api/extensions/document)                        | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-document/)             |
-| [HardBreak](/api/extensions/hard-break)                     | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-hard-break/)           |
-| [Heading](/api/extensions/heading)                          | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-heading/)              |
-| [History](/api/extensions/history)                          | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-history/)              |
-| [HorizontalRule](/api/extensions/horizontal-rule)           | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-horizontal-rule/)      |
-| [Image](/api/extensions/image)                              | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-image/)                |
-| [Italic](/api/extensions/italic)                            | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-italic/)               |
-| [Link](/api/extensions/link)                                | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-link/)                 |
-| [ListItem](/api/extensions/list-item)                       | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-list-item/)            |
-| [OrderedList](/api/extensions/ordered-list)                 | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-ordered-list/)         |
-| [Paragraph](/api/extensions/paragraph)                      | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-paragraph/)            |
-| [Strike](/api/extensions/strike)                            | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-strike/)               |
-| [Text](/api/extensions/text)                                | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-text/)                 |
+| [Dropcursor](/api/extensions/dropcursor)                    | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-dropcursor/)           |
+| [Focus](/api/extensions/focus)                              | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-focus/)                |
+| [Gapcursor](/api/extensions/gapcursor)                      | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-gapcursor/)            |
+| [History](/api/extensions/history)                          | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-history/)              |
 | [TextAlign](/api/extensions/text-align)                     | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-text-align/)           |
-| [Underline](/api/extensions/underline)                      | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-underline/)            |
+| [Typography](/api/extensions/typography)                    | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-typography/)           |
 
-<!-- | [CodeBlockHighlight](/api/extensions/code-block-highlight) | – | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packagescode-block-highlight/extension-/) -->
-<!-- | [Mention](/api/extensions/mention) | – | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-mention/) -->
-<!-- | [Placeholder](/api/extensions/placeholder) | – | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-placeholder/) -->
-<!-- | [TableCell](/api/extensions/table-cell) | – | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-table-cell/) -->
-<!-- | [TableHeader](/api/extensions/table-header) | – | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-table-header/) -->
-<!-- | [TableRow](/api/extensions/table-row) | – | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-table-row/) -->
-<!-- | [TodoItem](/api/extensions/todo-item) | – | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-todo-item/) -->
-<!-- | [TodoList](/api/extensions/todo-list) | – | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-todo-list/) -->
+You don’t have to use it, but we prepared a `@tiptap/vue-starter-kit` which includes the most common extensions. Learn [how you can use the `defaultExtensions()`](/examples/basic).
 
-## Community extensions
-:::warning Work in Progress
-This section is not ready yet. Meanwhile, [search through GitHub issues](https://github.com/ueberdosis/tiptap/issues) to find code snippets.
-:::
+## Create a new extension
+You’re free to create your own extensions for tiptap. Here is the boilerplate code that’s need to create and register your own extension:
 
-## Your custom extensions
-Didn’t find what you’re looking for? No worries, [you can build your own extensions](/guide/build-custom-extensions).
+```js
+import { createExtension } from '@tiptap/core'
+
+const CustomExtension = createExtension({
+  // Your code here
+})
+
+const editor = new Editor({
+  extensions: [
+    // Register your custom extension with the editor.
+    CustomExtension(),
+    // … and don’t forget all other extensions.
+    Document(),
+    Paragraph(),
+    Text(),
+    // …
+  ],
+```
+
+Learn [more about custom extensions in our guide](/guide/build-custom-extensions).
diff --git a/docs/src/docPages/api/marks.md b/docs/src/docPages/api/marks.md
index 80557d6c5..1c2606862 100644
--- a/docs/src/docPages/api/marks.md
+++ b/docs/src/docPages/api/marks.md
@@ -3,3 +3,13 @@
 ## toc
 
 ## Introduction
+
+## List of supported marks
+| Title                                                       | Default Extension | Source Code                                                                                            |
+| ----------------------------------------------------------- | ----------------- | ------------------------------------------------------------------------------------------------------ |
+| [Bold](/api/extensions/bold)                                | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-bold/)                 |
+| [Code](/api/extensions/code)                                | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-code/)                 |
+| [Italic](/api/extensions/italic)                            | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-italic/)               |
+| [Link](/api/extensions/link)                                | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-link/)                 |
+| [Strike](/api/extensions/strike)                            | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-strike/)               |
+| [Underline](/api/extensions/underline)                      | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-underline/)            |
diff --git a/docs/src/docPages/api/nodes.md b/docs/src/docPages/api/nodes.md
index ee9fa386a..f7c12b50d 100644
--- a/docs/src/docPages/api/nodes.md
+++ b/docs/src/docPages/api/nodes.md
@@ -3,3 +3,21 @@
 ## toc
 
 ## Introduction
+
+## List of supported nodes
+| Title                                        | Default Extension | Source Code                                                                                       |
+| -------------------------------------------- | ----------------- | ------------------------------------------------------------------------------------------------- |
+| [Blockquote](/api/nodes/blockquote)          | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-blockquote/)      |
+| [BulletList](/api/nodes/bullet-list)         | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-bullet-list/)     |
+| [CodeBlock](/api/nodes/code-block)           | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-code-block/)      |
+| [Document](/api/nodes/document)              | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-document/)        |
+| [HardBreak](/api/nodes/hard-break)           | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-hard-break/)      |
+| [Heading](/api/nodes/heading)                | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-heading/)         |
+| [HorizontalRule](/api/nodes/horizontal-rule) | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-horizontal-rule/) |
+| [Image](/api/nodes/image)                    | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-image/)           |
+| [ListItem](/api/nodes/list-item)             | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-list-item/)       |
+| [OrderedList](/api/nodes/ordered-list)       | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-ordered-list/)    |
+| [Paragraph](/api/nodes/paragraph)            | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-paragraph/)       |
+| [TaskItem](/api/nodes/task-item)             | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-task-item/)       |
+| [TaskList](/api/nodes/task-list)             | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-task-list/)       |
+| [Text](/api/nodes/text)                      | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-text/)            |
diff --git a/docs/src/docPages/api/nodes/bullet-list.md b/docs/src/docPages/api/nodes/bullet-list.md
index 2535a9c1e..80902fb82 100644
--- a/docs/src/docPages/api/nodes/bullet-list.md
+++ b/docs/src/docPages/api/nodes/bullet-list.md
@@ -1,5 +1,5 @@
 # BulletList
-This extension enables you to use bullet lists in the editor. They are rendered as `<ul>` HTML tags,
+This extension enables you to use bullet lists in the editor. They are rendered as `<ul>` HTML tags.
 
 Type <code>*&nbsp;</code>, <code>-&nbsp;</code> or <code>+&nbsp;</code> at the beginning of a new line and it will magically transform to a bullet list.
 
diff --git a/docs/src/docPages/api/nodes/ordered-list.md b/docs/src/docPages/api/nodes/ordered-list.md
index c6235978b..062cdb7fb 100644
--- a/docs/src/docPages/api/nodes/ordered-list.md
+++ b/docs/src/docPages/api/nodes/ordered-list.md
@@ -1,5 +1,5 @@
 # OrderedList
-This extension enables you to use ordered lists in the editor. They are rendered as `<ol>` HTML tags,
+This extension enables you to use ordered lists in the editor. They are rendered as `<ol>` HTML tags.
 
 Type <code>1.&nbsp;</code> (or any other number followed by a dot) at the beginning of a new line and it will magically transform to a ordered list.
 
diff --git a/docs/src/docPages/api/nodes/todo-item.md b/docs/src/docPages/api/nodes/todo-item.md
deleted file mode 100644
index cd7f171a7..000000000
--- a/docs/src/docPages/api/nodes/todo-item.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# TodoItem
-It renders a single toggleable item of a list.
-
-::: warning Restrictions
-This extensions is intended to be used with the `TodoList` extension.
-:::
-
-## Settings
-| Option | Type    | Default | Description                           |
-| ------ | ------- | ------- | ------------------------------------- |
-| nested | Boolean | false   | Specifies if you can nest todo lists. |
-
-## Commands
-*None*
-
-## Keyboard shortcuts
-*None*
\ No newline at end of file
diff --git a/docs/src/docPages/api/nodes/todo-list.md b/docs/src/docPages/api/nodes/todo-list.md
deleted file mode 100644
index 0fe0b3009..000000000
--- a/docs/src/docPages/api/nodes/todo-list.md
+++ /dev/null
@@ -1,69 +0,0 @@
-# TodoList
-Renders a toggleable list of items.
-
-::: warning Restrictions
-This extensions is intended to be used with the `TodoItem` extension.
-:::
-
-## Settings
-*None*
-
-## Commands
-| Command   | Options | Description       |
-| --------- | ------- | ----------------- |
-| todo_list | —       | Toggle todo list. |
-
-## Keyboard shortcuts
-*None*
-
-## Usage
-```markup
-<template>
-  <div>
-    <editor-menu-bar :editor="editor" v-slot="{ commands, isActive }">
-      <button type="button" :class="{ 'is-active': isActive.todo_list() }" @click="commands.todo_list">
-        Todo List
-      </button>
-    </editor-menu-bar>
-
-    <editor-content :editor="editor" />
-  </div>
-</template>
-
-<script>
-import { Editor, EditorContent, EditorMenuBar } from 'tiptap'
-import { TodoItem, TodoList } from 'tiptap-extensions'
-
-export default {
-  components: {
-    EditorMenuBar,
-    EditorContent,
-  },
-  data() {
-    return {
-      editor: new Editor({
-        extensions: [
-          TodoItem({
-            nested: true,
-          }),
-          TodoList(),
-        ],
-        content: `
-          <ul data-type="todo_list">
-            <li data-type="todo_item" data-done="true">
-              Checked item
-            </li>
-            <li data-type="todo_item" data-done="false">
-              Unchecked item
-            </li>
-          </ul>
-        `,
-      }),
-    }
-  },
-  beforeDestroy() {
-    this.editor.destroy()
-  }
-}
-</script>
-```
\ No newline at end of file
diff --git a/docs/src/docPages/overview/upgrade-guide.md b/docs/src/docPages/overview/upgrade-guide.md
index 49157057e..4425ba6ec 100644
--- a/docs/src/docPages/overview/upgrade-guide.md
+++ b/docs/src/docPages/overview/upgrade-guide.md
@@ -5,7 +5,7 @@
 ## Reasons to upgrade to tiptap 2.x
 Yes, it’s tedious work to upgrade your favorite text editor to a new API, but we made sure you’ve got enough reasons to upgrade to the newest version
 
-* Autocomplete in your IDE (thanks to TypeScript)
+* Autocompletion in your IDE (thanks to TypeScript)
 * Amazing documentation with 100+ pages
 * Active development, new features in the making
 * Tons of new extensions planned
diff --git a/docs/src/layouts/App/style.scss b/docs/src/layouts/App/style.scss
index 281c22e45..bac89e1fe 100644
--- a/docs/src/layouts/App/style.scss
+++ b/docs/src/layouts/App/style.scss
@@ -184,7 +184,16 @@ $menuBreakPoint: 800px;
     }
 
     &--draft {
-      color: rgba($colorWhite, 0.2);
+      color: rgba($colorWhite, 0.4);
+
+      &::after {
+        content: 'draft';
+        font-family: 'JetBrainsMono', monospace;
+        color: $colorGrey;
+        background-color: rgba($colorGrey, 0.1);
+        padding: 0 0.5em;
+        border-radius: 5px;
+      }
     }
 
     &--premium {
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index 647c47b33..f6a0886bf 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -6,6 +6,7 @@
       link: /overview/installation
     - title: Upgrade Guide
       link: /overview/upgrade-guide
+      draft: true
     - title: Contributing
       link: /overview/contributing
     - title: Examples
@@ -28,6 +29,7 @@
           link: /examples/formatting
         - title: Links
           link: /examples/links
+          draft: true
         # - title: Images
         #   link: /examples/images
         #   draft: true
@@ -79,8 +81,10 @@
   items:
     - title: Getting started
       link: /guide/getting-started
+      draft: true
     - title: Configuration
       link: /guide/configuration
+      draft: true
     - title: Create your editor
       link: /guide/create-your-editor
       draft: true
diff --git a/packages/extension-text-align/index.ts b/packages/extension-text-align/index.ts
index 159380513..3eaaa5efb 100644
--- a/packages/extension-text-align/index.ts
+++ b/packages/extension-text-align/index.ts
@@ -9,7 +9,7 @@ type TextAlignOptions = {
 const TextAlign = createExtension({
   defaultOptions: <TextAlignOptions>{
     types: ['heading', 'paragraph'],
-    alignments: ['left', 'center', 'right'],
+    alignments: ['left', 'center', 'right', 'justify'],
     defaultAlignment: 'left',
   },
 

From 34a3a7fe2613400b926d79dd08277ff25eface28 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Tue, 3 Nov 2020 16:43:35 +0100
Subject: [PATCH 087/113] move everything around, add more content and a first
 test for images

---
 docs/src/demos/Extensions/Focus/index.spec.js |  9 +++
 docs/src/demos/Extensions/Focus/index.vue     | 59 +++++++++++++++++++
 .../{Extensions => Marks}/Bold/index.spec.js  |  0
 .../{Extensions => Marks}/Bold/index.vue      |  0
 .../{Extensions => Marks}/Code/index.spec.js  |  0
 .../{Extensions => Marks}/Code/index.vue      |  0
 .../Italic/index.spec.js                      |  0
 .../{Extensions => Marks}/Italic/index.vue    |  0
 .../{Extensions => Marks}/Link/index.spec.js  |  0
 .../{Extensions => Marks}/Link/index.vue      |  0
 .../Strike/index.spec.js                      |  0
 .../{Extensions => Marks}/Strike/index.vue    |  0
 .../Underline/index.spec.js                   |  0
 .../{Extensions => Marks}/Underline/index.vue |  0
 .../Blockquote/index.spec.js                  |  0
 .../Blockquote/index.vue                      |  0
 .../BulletList/index.spec.js                  |  0
 .../BulletList/index.vue                      |  0
 .../CodeBlock/index.spec.js                   |  0
 .../{Extensions => Nodes}/CodeBlock/index.vue |  0
 .../Document/index.spec.js                    |  0
 .../{Extensions => Nodes}/Document/index.vue  |  0
 .../HardBreak/index.spec.js                   |  0
 .../{Extensions => Nodes}/HardBreak/index.vue |  0
 .../Heading/index.spec.js                     |  0
 .../{Extensions => Nodes}/Heading/index.vue   |  0
 .../HorizontalRule/index.spec.js              |  0
 .../HorizontalRule/index.vue                  |  0
 docs/src/demos/Nodes/Image/index.spec.js      | 27 +++++++++
 .../{Extensions => Nodes}/Image/index.vue     |  0
 .../ListItem/index.spec.js                    |  0
 .../{Extensions => Nodes}/ListItem/index.vue  |  0
 .../OrderedList/index.spec.js                 |  0
 .../OrderedList/index.vue                     |  0
 .../Paragraph/index.spec.js                   |  0
 .../{Extensions => Nodes}/Paragraph/index.vue |  0
 .../Text}/TaskList/index.vue                  |  0
 .../{Extensions => Nodes}/Text/index.spec.js  |  0
 .../{Extensions => Nodes}/Text/index.vue      |  0
 .../api/extensions/collaboration-cursor.md    |  7 +--
 docs/src/docPages/api/extensions/focus.md     |  7 ++-
 docs/src/docPages/api/extensions/history.md   |  2 +-
 .../src/docPages/api/extensions/text-align.md |  9 +++
 docs/src/docPages/api/marks/bold.md           |  4 +-
 docs/src/docPages/api/marks/code.md           |  4 +-
 docs/src/docPages/api/marks/italic.md         |  4 +-
 docs/src/docPages/api/marks/link.md           |  6 +-
 docs/src/docPages/api/marks/strike.md         |  4 +-
 docs/src/docPages/api/marks/underline.md      |  8 +--
 docs/src/docPages/api/nodes/blockquote.md     |  8 +--
 docs/src/docPages/api/nodes/bullet-list.md    |  8 +--
 docs/src/docPages/api/nodes/code-block.md     |  8 +--
 docs/src/docPages/api/nodes/document.md       |  2 +-
 docs/src/docPages/api/nodes/hard-break.md     | 11 ++--
 docs/src/docPages/api/nodes/heading.md        |  8 +--
 .../src/docPages/api/nodes/horizontal-rule.md |  8 +--
 docs/src/docPages/api/nodes/image.md          | 13 ++--
 docs/src/docPages/api/nodes/list-item.md      |  2 +-
 docs/src/docPages/api/nodes/ordered-list.md   |  8 +--
 docs/src/docPages/api/nodes/paragraph.md      |  8 +--
 docs/src/docPages/api/nodes/task-item.md      |  2 +-
 docs/src/docPages/api/nodes/task-list.md      |  8 +--
 docs/src/docPages/api/nodes/text.md           |  2 +-
 docs/src/links.yaml                           |  1 -
 64 files changed, 177 insertions(+), 70 deletions(-)
 create mode 100644 docs/src/demos/Extensions/Focus/index.spec.js
 create mode 100644 docs/src/demos/Extensions/Focus/index.vue
 rename docs/src/demos/{Extensions => Marks}/Bold/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Marks}/Bold/index.vue (100%)
 rename docs/src/demos/{Extensions => Marks}/Code/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Marks}/Code/index.vue (100%)
 rename docs/src/demos/{Extensions => Marks}/Italic/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Marks}/Italic/index.vue (100%)
 rename docs/src/demos/{Extensions => Marks}/Link/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Marks}/Link/index.vue (100%)
 rename docs/src/demos/{Extensions => Marks}/Strike/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Marks}/Strike/index.vue (100%)
 rename docs/src/demos/{Extensions => Marks}/Underline/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Marks}/Underline/index.vue (100%)
 rename docs/src/demos/{Extensions => Nodes}/Blockquote/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Nodes}/Blockquote/index.vue (100%)
 rename docs/src/demos/{Extensions => Nodes}/BulletList/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Nodes}/BulletList/index.vue (100%)
 rename docs/src/demos/{Extensions => Nodes}/CodeBlock/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Nodes}/CodeBlock/index.vue (100%)
 rename docs/src/demos/{Extensions => Nodes}/Document/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Nodes}/Document/index.vue (100%)
 rename docs/src/demos/{Extensions => Nodes}/HardBreak/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Nodes}/HardBreak/index.vue (100%)
 rename docs/src/demos/{Extensions => Nodes}/Heading/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Nodes}/Heading/index.vue (100%)
 rename docs/src/demos/{Extensions => Nodes}/HorizontalRule/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Nodes}/HorizontalRule/index.vue (100%)
 create mode 100644 docs/src/demos/Nodes/Image/index.spec.js
 rename docs/src/demos/{Extensions => Nodes}/Image/index.vue (100%)
 rename docs/src/demos/{Extensions => Nodes}/ListItem/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Nodes}/ListItem/index.vue (100%)
 rename docs/src/demos/{Extensions => Nodes}/OrderedList/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Nodes}/OrderedList/index.vue (100%)
 rename docs/src/demos/{Extensions => Nodes}/Paragraph/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Nodes}/Paragraph/index.vue (100%)
 rename docs/src/demos/{Extensions => Nodes/Text}/TaskList/index.vue (100%)
 rename docs/src/demos/{Extensions => Nodes}/Text/index.spec.js (100%)
 rename docs/src/demos/{Extensions => Nodes}/Text/index.vue (100%)

diff --git a/docs/src/demos/Extensions/Focus/index.spec.js b/docs/src/demos/Extensions/Focus/index.spec.js
new file mode 100644
index 000000000..029eb69e1
--- /dev/null
+++ b/docs/src/demos/Extensions/Focus/index.spec.js
@@ -0,0 +1,9 @@
+context('/examples/focus', () => {
+  before(() => {
+    cy.visit('/examples/focus')
+  })
+
+  it('should have class', () => {
+    cy.get('.ProseMirror p:first').should('have.class', 'has-focus')
+  })
+})
diff --git a/docs/src/demos/Extensions/Focus/index.vue b/docs/src/demos/Extensions/Focus/index.vue
new file mode 100644
index 000000000..b4c7f0f34
--- /dev/null
+++ b/docs/src/demos/Extensions/Focus/index.vue
@@ -0,0 +1,59 @@
+<template>
+  <div>
+    <editor-content :editor="editor" />
+  </div>
+</template>
+
+<script>
+import { Editor, EditorContent } from '@tiptap/vue-starter-kit'
+import Document from '@tiptap/extension-document'
+import Paragraph from '@tiptap/extension-paragraph'
+import Text from '@tiptap/extension-text'
+import Focus from '@tiptap/extension-focus'
+
+export default {
+  components: {
+    EditorContent,
+  },
+
+  data() {
+    return {
+      editor: null,
+    }
+  },
+
+  mounted() {
+    this.editor = new Editor({
+      extensions: [
+        Document(),
+        Paragraph(),
+        Text(),
+        Focus({
+          className: 'has-focus',
+          nested: true,
+        }),
+      ],
+      autoFocus: true,
+      content: `
+        <p>
+          The focus extension adds a class to the focused node only. That enables you to add a custom styling to just that node. By default, it’ll add <code>.has-focus</code>, even to nested nodes.
+        </p>
+        <p>
+          Nested elements will be focused with the default setting nested: true. Otherwise the whole item will get the focus class, even when just a single nested item is selected.
+        </p>
+      `,
+    })
+  },
+
+  beforeDestroy() {
+    this.editor.destroy()
+  },
+}
+</script>
+
+<style lang="scss">
+.has-focus {
+  border-radius: 3px;
+  box-shadow: 0 0 0 3px #68CEF8;
+}
+</style>
diff --git a/docs/src/demos/Extensions/Bold/index.spec.js b/docs/src/demos/Marks/Bold/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/Bold/index.spec.js
rename to docs/src/demos/Marks/Bold/index.spec.js
diff --git a/docs/src/demos/Extensions/Bold/index.vue b/docs/src/demos/Marks/Bold/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/Bold/index.vue
rename to docs/src/demos/Marks/Bold/index.vue
diff --git a/docs/src/demos/Extensions/Code/index.spec.js b/docs/src/demos/Marks/Code/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/Code/index.spec.js
rename to docs/src/demos/Marks/Code/index.spec.js
diff --git a/docs/src/demos/Extensions/Code/index.vue b/docs/src/demos/Marks/Code/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/Code/index.vue
rename to docs/src/demos/Marks/Code/index.vue
diff --git a/docs/src/demos/Extensions/Italic/index.spec.js b/docs/src/demos/Marks/Italic/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/Italic/index.spec.js
rename to docs/src/demos/Marks/Italic/index.spec.js
diff --git a/docs/src/demos/Extensions/Italic/index.vue b/docs/src/demos/Marks/Italic/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/Italic/index.vue
rename to docs/src/demos/Marks/Italic/index.vue
diff --git a/docs/src/demos/Extensions/Link/index.spec.js b/docs/src/demos/Marks/Link/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/Link/index.spec.js
rename to docs/src/demos/Marks/Link/index.spec.js
diff --git a/docs/src/demos/Extensions/Link/index.vue b/docs/src/demos/Marks/Link/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/Link/index.vue
rename to docs/src/demos/Marks/Link/index.vue
diff --git a/docs/src/demos/Extensions/Strike/index.spec.js b/docs/src/demos/Marks/Strike/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/Strike/index.spec.js
rename to docs/src/demos/Marks/Strike/index.spec.js
diff --git a/docs/src/demos/Extensions/Strike/index.vue b/docs/src/demos/Marks/Strike/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/Strike/index.vue
rename to docs/src/demos/Marks/Strike/index.vue
diff --git a/docs/src/demos/Extensions/Underline/index.spec.js b/docs/src/demos/Marks/Underline/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/Underline/index.spec.js
rename to docs/src/demos/Marks/Underline/index.spec.js
diff --git a/docs/src/demos/Extensions/Underline/index.vue b/docs/src/demos/Marks/Underline/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/Underline/index.vue
rename to docs/src/demos/Marks/Underline/index.vue
diff --git a/docs/src/demos/Extensions/Blockquote/index.spec.js b/docs/src/demos/Nodes/Blockquote/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/Blockquote/index.spec.js
rename to docs/src/demos/Nodes/Blockquote/index.spec.js
diff --git a/docs/src/demos/Extensions/Blockquote/index.vue b/docs/src/demos/Nodes/Blockquote/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/Blockquote/index.vue
rename to docs/src/demos/Nodes/Blockquote/index.vue
diff --git a/docs/src/demos/Extensions/BulletList/index.spec.js b/docs/src/demos/Nodes/BulletList/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/BulletList/index.spec.js
rename to docs/src/demos/Nodes/BulletList/index.spec.js
diff --git a/docs/src/demos/Extensions/BulletList/index.vue b/docs/src/demos/Nodes/BulletList/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/BulletList/index.vue
rename to docs/src/demos/Nodes/BulletList/index.vue
diff --git a/docs/src/demos/Extensions/CodeBlock/index.spec.js b/docs/src/demos/Nodes/CodeBlock/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/CodeBlock/index.spec.js
rename to docs/src/demos/Nodes/CodeBlock/index.spec.js
diff --git a/docs/src/demos/Extensions/CodeBlock/index.vue b/docs/src/demos/Nodes/CodeBlock/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/CodeBlock/index.vue
rename to docs/src/demos/Nodes/CodeBlock/index.vue
diff --git a/docs/src/demos/Extensions/Document/index.spec.js b/docs/src/demos/Nodes/Document/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/Document/index.spec.js
rename to docs/src/demos/Nodes/Document/index.spec.js
diff --git a/docs/src/demos/Extensions/Document/index.vue b/docs/src/demos/Nodes/Document/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/Document/index.vue
rename to docs/src/demos/Nodes/Document/index.vue
diff --git a/docs/src/demos/Extensions/HardBreak/index.spec.js b/docs/src/demos/Nodes/HardBreak/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/HardBreak/index.spec.js
rename to docs/src/demos/Nodes/HardBreak/index.spec.js
diff --git a/docs/src/demos/Extensions/HardBreak/index.vue b/docs/src/demos/Nodes/HardBreak/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/HardBreak/index.vue
rename to docs/src/demos/Nodes/HardBreak/index.vue
diff --git a/docs/src/demos/Extensions/Heading/index.spec.js b/docs/src/demos/Nodes/Heading/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/Heading/index.spec.js
rename to docs/src/demos/Nodes/Heading/index.spec.js
diff --git a/docs/src/demos/Extensions/Heading/index.vue b/docs/src/demos/Nodes/Heading/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/Heading/index.vue
rename to docs/src/demos/Nodes/Heading/index.vue
diff --git a/docs/src/demos/Extensions/HorizontalRule/index.spec.js b/docs/src/demos/Nodes/HorizontalRule/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/HorizontalRule/index.spec.js
rename to docs/src/demos/Nodes/HorizontalRule/index.spec.js
diff --git a/docs/src/demos/Extensions/HorizontalRule/index.vue b/docs/src/demos/Nodes/HorizontalRule/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/HorizontalRule/index.vue
rename to docs/src/demos/Nodes/HorizontalRule/index.vue
diff --git a/docs/src/demos/Nodes/Image/index.spec.js b/docs/src/demos/Nodes/Image/index.spec.js
new file mode 100644
index 000000000..5740e17cc
--- /dev/null
+++ b/docs/src/demos/Nodes/Image/index.spec.js
@@ -0,0 +1,27 @@
+context('/api/nodes/image', () => {
+  before(() => {
+    cy.visit('/api/nodes/image')
+  })
+
+  beforeEach(() => {
+    cy.get('.ProseMirror').then(([{ editor }]) => {
+      editor.setContent('<p>Example Text</p>')
+      editor.selectAll()
+    })
+  })
+
+  it('should add an img tag with the correct URL', () => {
+    cy.window().then(win => {
+      cy.stub(win, 'prompt').returns('foobar.png')
+
+      cy.get('.demo__preview button:first')
+        .click()
+
+      cy.window().its('prompt').should('be.called')
+
+      cy.get('.ProseMirror')
+        .find('img')
+        .should('have.attr', 'src', 'foobar.png')
+    })
+  })
+})
diff --git a/docs/src/demos/Extensions/Image/index.vue b/docs/src/demos/Nodes/Image/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/Image/index.vue
rename to docs/src/demos/Nodes/Image/index.vue
diff --git a/docs/src/demos/Extensions/ListItem/index.spec.js b/docs/src/demos/Nodes/ListItem/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/ListItem/index.spec.js
rename to docs/src/demos/Nodes/ListItem/index.spec.js
diff --git a/docs/src/demos/Extensions/ListItem/index.vue b/docs/src/demos/Nodes/ListItem/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/ListItem/index.vue
rename to docs/src/demos/Nodes/ListItem/index.vue
diff --git a/docs/src/demos/Extensions/OrderedList/index.spec.js b/docs/src/demos/Nodes/OrderedList/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/OrderedList/index.spec.js
rename to docs/src/demos/Nodes/OrderedList/index.spec.js
diff --git a/docs/src/demos/Extensions/OrderedList/index.vue b/docs/src/demos/Nodes/OrderedList/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/OrderedList/index.vue
rename to docs/src/demos/Nodes/OrderedList/index.vue
diff --git a/docs/src/demos/Extensions/Paragraph/index.spec.js b/docs/src/demos/Nodes/Paragraph/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/Paragraph/index.spec.js
rename to docs/src/demos/Nodes/Paragraph/index.spec.js
diff --git a/docs/src/demos/Extensions/Paragraph/index.vue b/docs/src/demos/Nodes/Paragraph/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/Paragraph/index.vue
rename to docs/src/demos/Nodes/Paragraph/index.vue
diff --git a/docs/src/demos/Extensions/TaskList/index.vue b/docs/src/demos/Nodes/Text/TaskList/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/TaskList/index.vue
rename to docs/src/demos/Nodes/Text/TaskList/index.vue
diff --git a/docs/src/demos/Extensions/Text/index.spec.js b/docs/src/demos/Nodes/Text/index.spec.js
similarity index 100%
rename from docs/src/demos/Extensions/Text/index.spec.js
rename to docs/src/demos/Nodes/Text/index.spec.js
diff --git a/docs/src/demos/Extensions/Text/index.vue b/docs/src/demos/Nodes/Text/index.vue
similarity index 100%
rename from docs/src/demos/Extensions/Text/index.vue
rename to docs/src/demos/Nodes/Text/index.vue
diff --git a/docs/src/docPages/api/extensions/collaboration-cursor.md b/docs/src/docPages/api/extensions/collaboration-cursor.md
index 05fe4c059..8987916d8 100644
--- a/docs/src/docPages/api/extensions/collaboration-cursor.md
+++ b/docs/src/docPages/api/extensions/collaboration-cursor.md
@@ -20,10 +20,9 @@ yarn add @tiptap/extension-collaboration-cursor
 | type     |      |         |             |
 
 ## Commands
-*None*
-
-## Keyboard shortcuts
-*None*
+| Command | Parameters    | Description                                                              |
+| ------- | ------------- | ------------------------------------------------------------------------ |
+| user    | name<br>color | The name of the current user.<br>The color of the current user’s cursor. |
 
 ## Source code
 [packages/extension-collaboration-cursor/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-collaboration-cursor/)
diff --git a/docs/src/docPages/api/extensions/focus.md b/docs/src/docPages/api/extensions/focus.md
index c6f508676..6eacca5ea 100644
--- a/docs/src/docPages/api/extensions/focus.md
+++ b/docs/src/docPages/api/extensions/focus.md
@@ -10,7 +10,10 @@ yarn add @tiptap/extension-focus
 ```
 
 ## Settings
-*None*
+| Option    | Type    | Default   | Description                                            |
+| --------- | ------- | --------- | ------------------------------------------------------ |
+| className | string  | has-focus | The class that is applied to the focused element.      |
+| nested    | boolean | true      | When enabled nested elements get the focus class, too. |
 
 ## Commands
 *None*
@@ -22,4 +25,4 @@ yarn add @tiptap/extension-focus
 [packages/extension-focus/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-focus/)
 
 ## Usage
-<demo name="Extensions/Focus" highlight="" />
+<demo name="Extensions/Focus" highlight="31-34,12" />
diff --git a/docs/src/docPages/api/extensions/history.md b/docs/src/docPages/api/extensions/history.md
index c60438fd0..b4fa23a63 100644
--- a/docs/src/docPages/api/extensions/history.md
+++ b/docs/src/docPages/api/extensions/history.md
@@ -17,7 +17,7 @@ yarn add @tiptap/extension-history
 | newGroupDelay | number | 500     | The delay between changes after which a new group should be started (in milliseconds). When changes aren’t adjacent, a new group is always started. |
 
 ## Commands
-| Command | Options | Description           |
+| Command | Parameters | Description           |
 | ------- | ------- | --------------------- |
 | undo    | —       | Undo the last change. |
 | redo    | —       | Redo the last change. |
diff --git a/docs/src/docPages/api/extensions/text-align.md b/docs/src/docPages/api/extensions/text-align.md
index dad00adfd..3c6fcf8f1 100644
--- a/docs/src/docPages/api/extensions/text-align.md
+++ b/docs/src/docPages/api/extensions/text-align.md
@@ -9,6 +9,15 @@ npm install @tiptap/extension-text-align
 yarn add @tiptap/extension-text-align
 ```
 
+## Settings
+*None*
+
+## Commands
+*None*
+
+## Keyboard shortcuts
+*None*
+
 ## Source code
 [packages/extension-text-align/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-text-align/)
 
diff --git a/docs/src/docPages/api/marks/bold.md b/docs/src/docPages/api/marks/bold.md
index d9b14f65d..d991247c1 100644
--- a/docs/src/docPages/api/marks/bold.md
+++ b/docs/src/docPages/api/marks/bold.md
@@ -22,7 +22,7 @@ yarn add @tiptap/extension-bold
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
 ## Commands
-| Command | Options | Description     |
+| Command | Parameters | Description     |
 | ------- | ------- | --------------- |
 | bold    | —       | Mark text bold. |
 
@@ -34,4 +34,4 @@ yarn add @tiptap/extension-bold
 [packages/extension-bold/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-bold/)
 
 ## Usage
-<demo name="Extensions/Bold" highlight="3-5,17,36" />
+<demo name="Marks/Bold" highlight="3-5,17,36" />
diff --git a/docs/src/docPages/api/marks/code.md b/docs/src/docPages/api/marks/code.md
index ac5b1148d..e6f342728 100644
--- a/docs/src/docPages/api/marks/code.md
+++ b/docs/src/docPages/api/marks/code.md
@@ -18,7 +18,7 @@ yarn add @tiptap/extension-code
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
 ## Commands
-| Command | Options | Description               |
+| Command | Parameters | Description               |
 | ------- | ------- | ------------------------- |
 | code    | —       | Mark text as inline code. |
 
@@ -29,4 +29,4 @@ yarn add @tiptap/extension-code
 [packages/extension-code/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-code/)
 
 ## Usage
-<demo name="Extensions/Code" highlight="3-5,17,36" />
+<demo name="Marks/Code" highlight="3-5,17,36" />
diff --git a/docs/src/docPages/api/marks/italic.md b/docs/src/docPages/api/marks/italic.md
index d9e558679..407173045 100644
--- a/docs/src/docPages/api/marks/italic.md
+++ b/docs/src/docPages/api/marks/italic.md
@@ -22,7 +22,7 @@ yarn add @tiptap/extension-italic
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
 ## Commands
-| Command | Options | Description       |
+| Command | Parameters | Description       |
 | ------- | ------- | ----------------- |
 | italic  | —       | Mark text italic. |
 
@@ -34,4 +34,4 @@ yarn add @tiptap/extension-italic
 [packages/extension-italic/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-italic/)
 
 ## Usage
-<demo name="Extensions/Italic" highlight="3-5,17,36" />
+<demo name="Marks/Italic" highlight="3-5,17,36" />
diff --git a/docs/src/docPages/api/marks/link.md b/docs/src/docPages/api/marks/link.md
index 779a63775..30ce4b209 100644
--- a/docs/src/docPages/api/marks/link.md
+++ b/docs/src/docPages/api/marks/link.md
@@ -23,17 +23,17 @@ yarn add @tiptap/extension-link
 | target      | string  | _blank                       | Set the default `target` of links.           |
 
 ## Commands
-| Command | Options        | Description                                                 |
+| Command | Parameters     | Description                                                 |
 | ------- | -------------- | ----------------------------------------------------------- |
 | link    | href<br>target | Link the selected text. Removes a link, if `href` is empty. |
 
 ## Keyboard shortcuts
 :::warning Doesn’t have a keyboard shortcut
-This extension doesn’t bind a specific keyboard shortcut. You would probably open your UI on `Mod-k` though.
+This extension doesn’t bind a specific keyboard shortcut. You would probably open your custom UI on `Mod-k` though.
 :::
 
 ## Source code
 [packages/extension-link/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-link/)
 
 ## Usage
-<demo name="Extensions/Link" highlight="3-8,19,38,55" />
+<demo name="Marks/Link" highlight="3-8,19,38,55" />
diff --git a/docs/src/docPages/api/marks/strike.md b/docs/src/docPages/api/marks/strike.md
index bb6660dba..16a1b7801 100644
--- a/docs/src/docPages/api/marks/strike.md
+++ b/docs/src/docPages/api/marks/strike.md
@@ -22,7 +22,7 @@ yarn add @tiptap/extension-strike
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
 ## Commands
-| Command | Options | Description                 |
+| Command | Parameters | Description                 |
 | ------- | ------- | --------------------------- |
 | strike  | —       | Mark text as strikethrough. |
 
@@ -34,4 +34,4 @@ yarn add @tiptap/extension-strike
 [packages/extension-strike/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-strike/)
 
 ## Usage
-<demo name="Extensions/Strike" highlight="3-5,17,36" />
+<demo name="Marks/Strike" highlight="3-5,17,36" />
diff --git a/docs/src/docPages/api/marks/underline.md b/docs/src/docPages/api/marks/underline.md
index fb478db38..2f5045a7a 100644
--- a/docs/src/docPages/api/marks/underline.md
+++ b/docs/src/docPages/api/marks/underline.md
@@ -22,9 +22,9 @@ yarn add @tiptap/extension-underline
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
 ## Commands
-| Command   | Options | Description              |
-| --------- | ------- | ------------------------ |
-| underline | —       | Mark text as underlined. |
+| Command   | Parameters | Description              |
+| --------- | ---------- | ------------------------ |
+| underline | —          | Mark text as underlined. |
 
 ## Keyboard shortcuts
 * Windows/Linux: `Control`&nbsp;`U`
@@ -34,4 +34,4 @@ yarn add @tiptap/extension-underline
 [packages/extension-underline/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-underline/)
 
 ## Usage
-<demo name="Extensions/Underline" highlight="3-5,17,36" />
+<demo name="Marks/Underline" highlight="3-5,17,36" />
diff --git a/docs/src/docPages/api/nodes/blockquote.md b/docs/src/docPages/api/nodes/blockquote.md
index dbd5038e3..66de2089d 100644
--- a/docs/src/docPages/api/nodes/blockquote.md
+++ b/docs/src/docPages/api/nodes/blockquote.md
@@ -19,9 +19,9 @@ yarn add @tiptap/extension-blockquote
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
 ## Commands
-| Command    | Options | Description                   |
-| ---------- | ------- | ----------------------------- |
-| blockquote | —       | Wrap content in a blockquote. |
+| Command    | Parameters | Description                   |
+| ---------- | ---------- | ----------------------------- |
+| blockquote | —          | Wrap content in a blockquote. |
 
 ## Keyboard shortcuts
 * Windows/Linux: `Control`&nbsp;`Shift`&nbsp;`9`
@@ -31,4 +31,4 @@ yarn add @tiptap/extension-blockquote
 [packages/extension-blockquote/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-blockquote/)
 
 ## Usage
-<demo name="Extensions/Blockquote" highlight="3-5,17,36" />
+<demo name="Nodes/Blockquote" highlight="3-5,17,36" />
diff --git a/docs/src/docPages/api/nodes/bullet-list.md b/docs/src/docPages/api/nodes/bullet-list.md
index 80902fb82..54ff543e0 100644
--- a/docs/src/docPages/api/nodes/bullet-list.md
+++ b/docs/src/docPages/api/nodes/bullet-list.md
@@ -22,9 +22,9 @@ yarn add @tiptap/extension-bullet-list @tiptap/extension-list-item
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
 ## Commands
-| Command     | Options | Description           |
-| ----------- | ------- | --------------------- |
-| bullet_list | —       | Toggle a bullet list. |
+| Command     | Parameters | Description           |
+| ----------- | ---------- | --------------------- |
+| bullet_list | —          | Toggle a bullet list. |
 
 ## Keyboard shortcuts
 * `Control`&nbsp;`Shift`&nbsp;`8`
@@ -33,4 +33,4 @@ yarn add @tiptap/extension-bullet-list @tiptap/extension-list-item
 [packages/extension-bullet-list/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-bullet-list/)
 
 ## Usage
-<demo name="Extensions/BulletList" highlight="3-5,17-18,37-38" />
+<demo name="Nodes/BulletList" highlight="3-5,17-18,37-38" />
diff --git a/docs/src/docPages/api/nodes/code-block.md b/docs/src/docPages/api/nodes/code-block.md
index 67d95523e..1dce417e2 100644
--- a/docs/src/docPages/api/nodes/code-block.md
+++ b/docs/src/docPages/api/nodes/code-block.md
@@ -23,9 +23,9 @@ yarn add @tiptap/extension-code-block
 | languageClassPrefix | string | language- | Adds a prefix to language classes that are applied to code tags. |
 
 ## Commands
-| Command   | Options | Description                   |
-| --------- | ------- | ----------------------------- |
-| codeBlock | —       | Wrap content in a code block. |
+| Command   | Parameters | Description                   |
+| --------- | ---------- | ----------------------------- |
+| codeBlock | —          | Wrap content in a code block. |
 
 ## Keyboard shortcuts
 * Windows/Linux: `Control`&nbsp;`Shift`&nbsp;`C`
@@ -35,4 +35,4 @@ yarn add @tiptap/extension-code-block
 [packages/extension-code-block/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-code-block/)
 
 ## Usage
-<demo name="Extensions/CodeBlock" highlight="3-5,17,36" />
+<demo name="Nodes/CodeBlock" highlight="3-5,17,36" />
diff --git a/docs/src/docPages/api/nodes/document.md b/docs/src/docPages/api/nodes/document.md
index 6e269e619..e887bed8b 100644
--- a/docs/src/docPages/api/nodes/document.md
+++ b/docs/src/docPages/api/nodes/document.md
@@ -20,4 +20,4 @@ yarn add @tiptap/extension-document
 [packages/extension-document/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-document/)
 
 ## Usage
-<demo name="Extensions/Document" highlight="10,28" />
+<demo name="Nodes/Document" highlight="10,28" />
diff --git a/docs/src/docPages/api/nodes/hard-break.md b/docs/src/docPages/api/nodes/hard-break.md
index 0f38111c7..83fc2a999 100644
--- a/docs/src/docPages/api/nodes/hard-break.md
+++ b/docs/src/docPages/api/nodes/hard-break.md
@@ -10,13 +10,10 @@ npm install @tiptap/extension-hard-break
 yarn add @tiptap/extension-hard-break
 ```
 
-## Settings
-*None*
-
 ## Commands
-| Command   | Options | Description       |
-| --------- | ------- | ----------------- |
-| hardBreak | —       | Add a line break. |
+| Command   | Parameters | Description       |
+| --------- | ---------- | ----------------- |
+| hardBreak | —          | Add a line break. |
 
 ## Keyboard shortcuts
 * `Shift`&nbsp;`Enter`
@@ -27,4 +24,4 @@ yarn add @tiptap/extension-hard-break
 [packages/extension-hard-break/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-hard-break/)
 
 ## Usage
-<demo name="Extensions/HardBreak" highlight="3-5,17,36" />
+<demo name="Nodes/HardBreak" highlight="3-5,17,36" />
diff --git a/docs/src/docPages/api/nodes/heading.md b/docs/src/docPages/api/nodes/heading.md
index efca21496..652d06301 100644
--- a/docs/src/docPages/api/nodes/heading.md
+++ b/docs/src/docPages/api/nodes/heading.md
@@ -19,9 +19,9 @@ yarn add @tiptap/extension-heading
 | levels | Array  | [1, 2, 3, 4, 5, 6] | Specifies which heading levels are supported. |
 
 ## Commands
-| Command | Options | Description             |
-| ------- | ------- | ----------------------- |
-| heading | level   | Creates a heading node. |
+| Command | Parameters | Description                                      |
+| ------- | ---------- | ------------------------------------------------ |
+| heading | level      | Creates a heading node with the specified level. |
 
 ## Keyboard shortcuts
 * Windows/Linux: `Control`&nbsp;`Alt`&nbsp;`1-6`
@@ -31,4 +31,4 @@ yarn add @tiptap/extension-heading
 [packages/extension-heading/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-heading/)
 
 ## Usage
-<demo name="Extensions/Heading" highlight="3-11,23,42-44" />
+<demo name="Nodes/Heading" highlight="3-11,23,42-44" />
diff --git a/docs/src/docPages/api/nodes/horizontal-rule.md b/docs/src/docPages/api/nodes/horizontal-rule.md
index 1de9d59da..81b6c0e7a 100644
--- a/docs/src/docPages/api/nodes/horizontal-rule.md
+++ b/docs/src/docPages/api/nodes/horizontal-rule.md
@@ -18,9 +18,9 @@ yarn add @tiptap/extension-horizontal-rule
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
 ## Commands
-| Command         | Options | Description               |
-| --------------- | ------- | ------------------------- |
-| horizontalRule | —       | Create a horizontal rule. |
+| Command        | Parameters | Description               |
+| -------------- | ---------- | ------------------------- |
+| horizontalRule | —          | Create a horizontal rule. |
 
 ## Keyboard shortcuts
 *None*
@@ -29,4 +29,4 @@ yarn add @tiptap/extension-horizontal-rule
 [packages/extension-horizontal-rule/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-horizontal-rule/)
 
 ## Usage
-<demo name="Extensions/HorizontalRule" highlight="3-5,17,36" />
+<demo name="Nodes/HorizontalRule" highlight="3-5,17,36" />
diff --git a/docs/src/docPages/api/nodes/image.md b/docs/src/docPages/api/nodes/image.md
index 1c3c9132b..a4e932055 100644
--- a/docs/src/docPages/api/nodes/image.md
+++ b/docs/src/docPages/api/nodes/image.md
@@ -1,4 +1,9 @@
 # Image
+Use this extension to render `<img>` HTML tags. By default, those images are blocks. If you want to render images in line with text  set the `inline` option to `true`.
+
+:::warning Restrictions
+This extension does only the rendering of images. It doesn’t upload images to your server, that’s a whole different story.
+:::
 
 ## Installation
 ```bash
@@ -10,12 +15,12 @@ yarn add @tiptap/extension-image
 ```
 
 ## Settings
-| Option | Type    | Default | Description              |
-| ------ | ------- | ------- | ------------------------ |
-| inline | boolean | false   | Renders the node inline. |
+| Option | Type    | Default | Description                    |
+| ------ | ------- | ------- | ------------------------------ |
+| inline | boolean | false   | Renders the image node inline. |
 
 ## Source code
 [packages/extension-image/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-image/)
 
 ## Usage
-<demo name="Extensions/Image" />
+<demo name="Nodes/Image" />
diff --git a/docs/src/docPages/api/nodes/list-item.md b/docs/src/docPages/api/nodes/list-item.md
index 8d6e816e2..16926eed3 100644
--- a/docs/src/docPages/api/nodes/list-item.md
+++ b/docs/src/docPages/api/nodes/list-item.md
@@ -31,4 +31,4 @@ yarn add @tiptap/extension-list-item
 [packages/extension-list-item/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-list-item/)
 
 ## Usage
-<demo name="Extensions/ListItem" highlight="3-8,20-22,41-43" />
+<demo name="Nodes/ListItem" highlight="3-8,20-22,41-43" />
diff --git a/docs/src/docPages/api/nodes/ordered-list.md b/docs/src/docPages/api/nodes/ordered-list.md
index 062cdb7fb..b5980e3de 100644
--- a/docs/src/docPages/api/nodes/ordered-list.md
+++ b/docs/src/docPages/api/nodes/ordered-list.md
@@ -22,9 +22,9 @@ yarn add @tiptap/extension-ordered-list @tiptap/extension-list-item
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
 ## Commands
-| Command      | Options | Description            |
-| ------------ | ------- | ---------------------- |
-| ordered_list | —       | Toggle a ordered list. |
+| Command     | Parameters | Description            |
+| ----------- | ---------- | ---------------------- |
+| orderedList | —          | Toggle a ordered list. |
 
 ## Keyboard shortcuts
 * `Control`&nbsp;`Shift`&nbsp;`9`
@@ -33,4 +33,4 @@ yarn add @tiptap/extension-ordered-list @tiptap/extension-list-item
 [packages/extension-ordered-list/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-ordered-list/)
 
 ## Usage
-<demo name="Extensions/OrderedList" highlight="3-5,17-18,37-38" />
+<demo name="Nodes/OrderedList" highlight="3-5,17-18,37-38" />
diff --git a/docs/src/docPages/api/nodes/paragraph.md b/docs/src/docPages/api/nodes/paragraph.md
index 7cae8a4cf..6a3013d75 100644
--- a/docs/src/docPages/api/nodes/paragraph.md
+++ b/docs/src/docPages/api/nodes/paragraph.md
@@ -20,9 +20,9 @@ yarn add @tiptap/extension-paragraph
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
 ## Commands
-| Command   | Options | Description                                  |
-| --------- | ------- | -------------------------------------------- |
-| paragraph | —       | Transforms all selected nodes to paragraphs. |
+| Command   | Parameters | Description                                  |
+| --------- | ---------- | -------------------------------------------- |
+| paragraph | —          | Transforms all selected nodes to paragraphs. |
 
 ## Keyboard shortcuts
 * Windows & Linux: `Control`&nbsp;`Alt`&nbsp;`0`
@@ -32,4 +32,4 @@ yarn add @tiptap/extension-paragraph
 [packages/extension-paragraph/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-paragraph/)
 
 ## Usage
-<demo name="Extensions/Paragraph" highlight="11,29" />
+<demo name="Nodes/Paragraph" highlight="11,29" />
diff --git a/docs/src/docPages/api/nodes/task-item.md b/docs/src/docPages/api/nodes/task-item.md
index a7228168d..5a5738f6a 100644
--- a/docs/src/docPages/api/nodes/task-item.md
+++ b/docs/src/docPages/api/nodes/task-item.md
@@ -25,4 +25,4 @@ yarn add @tiptap/extension-task-list @tiptap/extension-task-item
 [packages/extension-task-item/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-task-item/)
 
 ## Usage
-<demo name="Extensions/TaskItem" />
+<demo name="Nodes/TaskItem" />
diff --git a/docs/src/docPages/api/nodes/task-list.md b/docs/src/docPages/api/nodes/task-list.md
index 44b8d962f..ae1bfa9e7 100644
--- a/docs/src/docPages/api/nodes/task-list.md
+++ b/docs/src/docPages/api/nodes/task-list.md
@@ -20,12 +20,12 @@ yarn add @tiptap/extension-task-list @tiptap/extension-task-item
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
 ## Commands
-| Command  | Options | Description         |
-| -------- | ------- | ------------------- |
-| taskList | —       | Toggle a task list. |
+| Command  | Parameters | Description         |
+| -------- | ---------- | ------------------- |
+| taskList | —          | Toggle a task list. |
 
 ## Source code
 [packages/extension-task-list/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-task-list/)
 
 ## Usage
-<demo name="Extensions/TaskList" />
+<demo name="Nodes/TaskList" />
diff --git a/docs/src/docPages/api/nodes/text.md b/docs/src/docPages/api/nodes/text.md
index 5502739be..c283cc727 100644
--- a/docs/src/docPages/api/nodes/text.md
+++ b/docs/src/docPages/api/nodes/text.md
@@ -18,4 +18,4 @@ yarn add @tiptap/extension-text
 [packages/extension-text/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-text/)
 
 ## Usage
-<demo name="Extensions/Text" highlight="12,30" />
+<demo name="Nodes/Text" highlight="12,30" />
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index f6a0886bf..29e51fd80 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -127,7 +127,6 @@
           link: /api/nodes/horizontal-rule
         - title: Image
           link: /api/nodes/image
-          draft: true
         - title: ListItem
           link: /api/nodes/list-item
         - title: OrderedList

From d69b8778d6f1866cf292c9f1ed5e7bc93a263d62 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Tue, 3 Nov 2020 17:05:27 +0100
Subject: [PATCH 088/113] add more content, add tests to the tasklist extension

---
 docs/src/demos/Nodes/TaskList/index.spec.js   | 119 ++++++++++++++++++
 .../demos/Nodes/{Text => }/TaskList/index.vue |   0
 docs/src/docPages/api/commands.md             |   2 +-
 docs/src/docPages/api/marks.md                |  16 +--
 docs/src/docPages/api/nodes/bullet-list.md    |   2 +-
 docs/src/docPages/api/nodes/list-item.md      |   7 +-
 docs/src/docPages/api/nodes/ordered-list.md   |   8 +-
 docs/src/docPages/api/nodes/task-item.md      |   4 +-
 docs/src/docPages/api/nodes/task-list.md      |  12 +-
 docs/src/docPages/overview/upgrade-guide.md   |   2 +-
 docs/src/links.yaml                           |   1 -
 11 files changed, 145 insertions(+), 28 deletions(-)
 create mode 100644 docs/src/demos/Nodes/TaskList/index.spec.js
 rename docs/src/demos/Nodes/{Text => }/TaskList/index.vue (100%)

diff --git a/docs/src/demos/Nodes/TaskList/index.spec.js b/docs/src/demos/Nodes/TaskList/index.spec.js
new file mode 100644
index 000000000..6a5720628
--- /dev/null
+++ b/docs/src/demos/Nodes/TaskList/index.spec.js
@@ -0,0 +1,119 @@
+context('/api/nodes/task-list', () => {
+  before(() => {
+    cy.visit('/api/nodes/task-list')
+  })
+
+  beforeEach(() => {
+    cy.get('.ProseMirror').then(([{ editor }]) => {
+      editor.setContent('<p>Example Text</p>')
+      editor.selectAll()
+    })
+  })
+
+  it('should parse unordered lists correctly', () => {
+    cy.get('.ProseMirror').then(([{ editor }]) => {
+      editor.setContent('<ul data-type="task_list"><li data-checked="true" data-type="task_item"><p>Example Text</p></li></ul>')
+      expect(editor.getHTML()).to.eq('<ul data-type="task_list"><li data-checked="true" data-type="task_item"><p>Example Text</p></li></ul>')
+    })
+  })
+
+  it('should parse unordered lists without paragraphs correctly', () => {
+    cy.get('.ProseMirror').then(([{ editor }]) => {
+      editor.setContent('<ul data-type="task_list"><li data-checked="false" data-type="task_item">Example Text</li></ul>')
+      expect(editor.getHTML()).to.eq('<ul data-type="task_list"><li data-checked="false" data-type="task_item"><p>Example Text</p></li></ul>')
+    })
+  })
+
+  it('the button should make the selected line a task list item', () => {
+    cy.get('.ProseMirror ul')
+      .should('not.exist')
+
+    cy.get('.ProseMirror ul li')
+      .should('not.exist')
+
+    cy.get('.demo__preview button:nth-child(1)')
+      .click()
+
+    cy.get('.ProseMirror')
+      .find('ul[data-type="task_list"]')
+      .should('contain', 'Example Text')
+
+    cy.get('.ProseMirror')
+      .find('ul[data-type="task_list"] li')
+      .should('contain', 'Example Text')
+  })
+
+  it('the button should toggle the task list', () => {
+    cy.get('.ProseMirror ul')
+      .should('not.exist')
+
+    cy.get('.demo__preview button:nth-child(1)')
+      .click()
+
+    cy.get('.ProseMirror')
+      .find('ul[data-type="task_list"]')
+      .should('contain', 'Example Text')
+
+    cy.get('.demo__preview button:nth-child(1)')
+      .click()
+
+    cy.get('.ProseMirror ul')
+      .should('not.exist')
+  })
+
+  it('should leave the list with double enter', () => {
+    cy.get('.ProseMirror').then(([{ editor }]) => {
+      editor.clearContent()
+    })
+
+    cy.get('.ProseMirror')
+      .type('[ ] List Item 1{enter}{enter}Paragraph')
+
+    cy.get('.ProseMirror')
+      .find('li')
+      .its('length')
+      .should('eq', 1)
+
+    cy.get('.ProseMirror')
+      .find('p')
+      .should('contain', 'Paragraph')
+  })
+
+  it('should make a task list from square brackets', () => {
+    cy.get('.ProseMirror').then(([{ editor }]) => {
+      editor.clearContent()
+    })
+
+    cy.get('.ProseMirror')
+      .type('[ ] List Item 1{enter}List Item 2')
+
+    cy.get('.ProseMirror')
+      .find('li:nth-child(1)')
+      .should('contain', 'List Item 1')
+      .should('have.attr', 'data-checked', 'false')
+
+    cy.get('.ProseMirror')
+      .find('li:nth-child(2)')
+      .should('contain', 'List Item 2')
+      .should('have.attr', 'data-checked', 'false')
+  })
+
+  it.only('should make a task list from checked square brackets', () => {
+    cy.get('.ProseMirror').then(([{ editor }]) => {
+      editor.clearContent()
+    })
+
+    cy.get('.ProseMirror')
+      .type('[x] List Item 1{enter}List Item 2')
+
+    cy.get('.ProseMirror')
+      .find('li:nth-child(1)')
+      .should('contain', 'List Item 1')
+      .should('have.attr', 'data-checked', 'true')
+
+    cy.get('.ProseMirror')
+      .find('li:nth-child(2)')
+      .should('contain', 'List Item 2')
+      .should('have.attr', 'data-checked', 'true')
+  })
+})
diff --git a/docs/src/demos/Nodes/Text/TaskList/index.vue b/docs/src/demos/Nodes/TaskList/index.vue
similarity index 100%
rename from docs/src/demos/Nodes/Text/TaskList/index.vue
rename to docs/src/demos/Nodes/TaskList/index.vue
diff --git a/docs/src/docPages/api/commands.md b/docs/src/docPages/api/commands.md
index ff158b869..8956e0023 100644
--- a/docs/src/docPages/api/commands.md
+++ b/docs/src/docPages/api/commands.md
@@ -67,4 +67,4 @@ Have a look at all of the core commands listed below. They should give you a goo
 | .selectAll()       | Select the whole document.              |
 
 ### Extensions
-All extension can add additional commands (and most do), check out the specific [documentation for the provided extensions](/api/extensions) to learn more about that. Of course, you can [add your custom extensions](/guide/build-custom-extensions) with custom commands aswell.
+All extension can add additional commands (and most do), check out the specific [documentation for the provided extensions](/api/extensions), [nodes](/api/nodes), and [marks](/api/marks) to learn more about that. Of course, you can [add your custom extensions](/guide/build-custom-extensions) with custom commands aswell.
diff --git a/docs/src/docPages/api/marks.md b/docs/src/docPages/api/marks.md
index 1c2606862..31acae585 100644
--- a/docs/src/docPages/api/marks.md
+++ b/docs/src/docPages/api/marks.md
@@ -5,11 +5,11 @@
 ## Introduction
 
 ## List of supported marks
-| Title                                                       | Default Extension | Source Code                                                                                            |
-| ----------------------------------------------------------- | ----------------- | ------------------------------------------------------------------------------------------------------ |
-| [Bold](/api/extensions/bold)                                | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-bold/)                 |
-| [Code](/api/extensions/code)                                | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-code/)                 |
-| [Italic](/api/extensions/italic)                            | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-italic/)               |
-| [Link](/api/extensions/link)                                | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-link/)                 |
-| [Strike](/api/extensions/strike)                            | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-strike/)               |
-| [Underline](/api/extensions/underline)                      | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-underline/)            |
+| Title                             | Default Extension | Source Code                                                                                 |
+| --------------------------------- | ----------------- | ------------------------------------------------------------------------------------------- |
+| [Bold](/api/marks/bold)           | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-bold/)      |
+| [Code](/api/marks/code)           | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-code/)      |
+| [Italic](/api/marks/italic)       | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-italic/)    |
+| [Link](/api/marks/link)           | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-link/)      |
+| [Strike](/api/marks/strike)       | Yes               | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-strike/)    |
+| [Underline](/api/marks/underline) | –                 | [GitHub](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-underline/) |
diff --git a/docs/src/docPages/api/nodes/bullet-list.md b/docs/src/docPages/api/nodes/bullet-list.md
index 54ff543e0..602d72193 100644
--- a/docs/src/docPages/api/nodes/bullet-list.md
+++ b/docs/src/docPages/api/nodes/bullet-list.md
@@ -5,7 +5,7 @@ Type <code>*&nbsp;</code>, <code>-&nbsp;</code> or <code>+&nbsp;</code> at the b
 
 ## Installation
 ::: warning Use with ListItem
-The `BulletList` extension is intended to be used with the [`ListItem`](/api/extensions/list-item) extension. Make sure to import that one too, otherwise you’ll get a SyntaxError.
+This extension requires the [`ListItem`](/api/nodes/list-item) extension.
 :::
 
 ```bash
diff --git a/docs/src/docPages/api/nodes/list-item.md b/docs/src/docPages/api/nodes/list-item.md
index 16926eed3..3fbc1f42c 100644
--- a/docs/src/docPages/api/nodes/list-item.md
+++ b/docs/src/docPages/api/nodes/list-item.md
@@ -2,8 +2,8 @@
 The ListItem extension adds support for the `<li>` HTML tag. It’s used for bullet lists and ordered lists and can’t really be used without them.
 
 ## Installation
-::: warning Restrictions
-This extension is intended to be used with the [`BulletList`](/api/extensions/bullet-list) or [`OrderedList`](/api/extensions/ordered-list) extension. It doesn’t work without at least using one of them.
+::: warning Use with BulletList and/or OrderedList
+This extension requires the [`BulletList`](/api/nodes/bullet-list) or [`OrderedList`](/api/nodes/ordered-list) extension.
 :::
 
 ```bash
@@ -19,9 +19,6 @@ yarn add @tiptap/extension-list-item
 | ------ | ------ | ------- | -------------------------------------------- |
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
-## Commands
-*None*
-
 ## Keyboard shortcuts
 * New list item: `Enter`
 * Sink a list item: `Tab`
diff --git a/docs/src/docPages/api/nodes/ordered-list.md b/docs/src/docPages/api/nodes/ordered-list.md
index b5980e3de..38dc26e7c 100644
--- a/docs/src/docPages/api/nodes/ordered-list.md
+++ b/docs/src/docPages/api/nodes/ordered-list.md
@@ -5,7 +5,7 @@ Type <code>1.&nbsp;</code> (or any other number followed by a dot) at the beginn
 
 ## Installation
 ::: warning Use with ListItem
-The `OrderedList` extension is intended to be used with the [`ListItem`](/api/extensions/list-item) extension. Make sure to import that one too, otherwise you’ll get a SyntaxError.
+This extension requires the [`ListItem`](/api/nodes/list-item) extension.
 :::
 
 ```bash
@@ -22,9 +22,9 @@ yarn add @tiptap/extension-ordered-list @tiptap/extension-list-item
 | class  | string | –       | Add a custom class to the rendered HTML tag. |
 
 ## Commands
-| Command     | Parameters | Description            |
-| ----------- | ---------- | ---------------------- |
-| orderedList | —          | Toggle a ordered list. |
+| Command     | Parameters | Description             |
+| ----------- | ---------- | ----------------------- |
+| orderedList | —          | Toggle an ordered list. |
 
 ## Keyboard shortcuts
 * `Control`&nbsp;`Shift`&nbsp;`9`
diff --git a/docs/src/docPages/api/nodes/task-item.md b/docs/src/docPages/api/nodes/task-item.md
index 5a5738f6a..be6e772c0 100644
--- a/docs/src/docPages/api/nodes/task-item.md
+++ b/docs/src/docPages/api/nodes/task-item.md
@@ -1,8 +1,8 @@
 # TaskItem
 
 ## Installation
-::: warning Restrictions
-This extension is intended to be used with the [`TaskList`](/api/extensions/task-list) extension. It doesn’t work without at least using one of them.
+::: warning Use with TaskList
+This extension requires the [`TaskList`](/api/nodes/task-list) extension.
 :::
 
 ```bash
diff --git a/docs/src/docPages/api/nodes/task-list.md b/docs/src/docPages/api/nodes/task-list.md
index ae1bfa9e7..82a74d4ba 100644
--- a/docs/src/docPages/api/nodes/task-list.md
+++ b/docs/src/docPages/api/nodes/task-list.md
@@ -1,16 +1,18 @@
 # TaskList
-This extension enables you to use task lists in the editor. They are rendered as `<ul>` HTML tags.
+This extension enables you to use task lists in the editor. They are rendered as `<ul data-type="task_list">`. This implementation doesn’t require any framework, it’s using plain JavaScript only.
+
+Type <code>[ ]&nbsp;</code> or <code>[x]&nbsp;</code> at the beginning of a new line and it will magically transform to a task list.
 
 ## Installation
 ::: warning Use with TaskItem
-The `TaskList` extension is intended to be used with the [`TaskItem`](/api/extensions/task-item) extension. Make sure to import that one too, otherwise you’ll get a SyntaxError.
+This extension requires the [`TaskItem`](/api/nodes/task-item) extension.
 :::
 
 ```bash
-# With npm
+# with npm
 npm install @tiptap/extension-task-list @tiptap/extension-task-item
 
-# Or: With Yarn
+# with Yarn
 yarn add @tiptap/extension-task-list @tiptap/extension-task-item
 ```
 
@@ -28,4 +30,4 @@ yarn add @tiptap/extension-task-list @tiptap/extension-task-item
 [packages/extension-task-list/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-task-list/)
 
 ## Usage
-<demo name="Nodes/TaskList" />
+<demo name="Nodes/TaskList" highlight="3-5,17-18,37-38" />
diff --git a/docs/src/docPages/overview/upgrade-guide.md b/docs/src/docPages/overview/upgrade-guide.md
index 4425ba6ec..bab0d96c4 100644
--- a/docs/src/docPages/overview/upgrade-guide.md
+++ b/docs/src/docPages/overview/upgrade-guide.md
@@ -18,7 +18,7 @@ The new API will look pretty familiar too you, but there are a ton of changes th
 …
 
 ### Explicitly register the Document, Text and Paragraph extensions
-tiptap 1 tried to hide a few required extensions from you with the default setting `useBuiltInExtensions: true`. That setting has been removed and you’re required to import all extensions. Be sure to explicitly import at least the [Document](/api/extensions/document), [Paragraph](/api/extensions/paragraph) and [Text](/api/extensions/text) extensions.
+tiptap 1 tried to hide a few required extensions from you with the default setting `useBuiltInExtensions: true`. That setting has been removed and you’re required to import all extensions. Be sure to explicitly import at least the [Document](/api/nodes/document), [Paragraph](/api/nodes/paragraph) and [Text](/api/nodes/text) extensions.
 
 ```js
 import Document from '@tiptap/extension-document'
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index 29e51fd80..adf1c1f4a 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -135,7 +135,6 @@
           link: /api/nodes/paragraph
         - title: TaskList
           link: /api/nodes/task-list
-          draft: true
         - title: TaskItem
           link: /api/nodes/task-item
           draft: true

From f47bc4693e9471211d408a72b1ee67e5d285c9ad Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Tue, 3 Nov 2020 17:08:04 +0100
Subject: [PATCH 089/113] clean up

---
 docs/src/docPages/api/extensions/focus.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/docs/src/docPages/api/extensions/focus.md b/docs/src/docPages/api/extensions/focus.md
index 6eacca5ea..2d0117773 100644
--- a/docs/src/docPages/api/extensions/focus.md
+++ b/docs/src/docPages/api/extensions/focus.md
@@ -15,12 +15,6 @@ yarn add @tiptap/extension-focus
 | className | string  | has-focus | The class that is applied to the focused element.      |
 | nested    | boolean | true      | When enabled nested elements get the focus class, too. |
 
-## Commands
-*None*
-
-## Keyboard shortcuts
-*None*
-
 ## Source code
 [packages/extension-focus/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-focus/)
 

From 646c8697d65841301a729c32b6436366da1b2393 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Tue, 3 Nov 2020 17:10:17 +0100
Subject: [PATCH 090/113] add node views heading to the documentation

---
 docs/src/docPages/guide/build-custom-extensions.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/src/docPages/guide/build-custom-extensions.md b/docs/src/docPages/guide/build-custom-extensions.md
index f4dd16f3b..195d4b8d2 100644
--- a/docs/src/docPages/guide/build-custom-extensions.md
+++ b/docs/src/docPages/guide/build-custom-extensions.md
@@ -289,6 +289,8 @@ const CustomUnderline = Underline.extend({
 })
 ```
 
+### Node views
+
 ## Option 2: Start from scratch
 
 ### Read the documentation

From 4ed01c41cb90fc2bb89e553377420d2f7edeb785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Tue, 3 Nov 2020 20:57:09 +0100
Subject: [PATCH 091/113] rename schema names

---
 docs/src/demos/Examples/Basic/index.vue     |  4 ++--
 docs/src/demos/Nodes/BulletList/index.vue   |  2 +-
 docs/src/demos/Nodes/ListItem/index.vue     |  4 ++--
 docs/src/demos/Nodes/OrderedList/index.vue  |  2 +-
 docs/src/demos/Nodes/TaskList/index.spec.js |  8 ++++----
 docs/src/demos/Nodes/TaskList/index.vue     |  4 ++--
 docs/src/docPages/api/nodes/bullet-list.md  |  2 +-
 packages/extension-bullet-list/index.ts     |  6 +++---
 packages/extension-list-item/index.ts       |  8 ++++----
 packages/extension-ordered-list/index.ts    |  6 +++---
 packages/extension-task-item/index.ts       | 12 ++++++------
 packages/extension-task-list/index.ts       |  4 ++--
 12 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/docs/src/demos/Examples/Basic/index.vue b/docs/src/demos/Examples/Basic/index.vue
index 53770c6d2..f25973997 100644
--- a/docs/src/demos/Examples/Basic/index.vue
+++ b/docs/src/demos/Examples/Basic/index.vue
@@ -40,10 +40,10 @@
       <button @click="editor.chain().focus().heading({ level: 6 }).run()" :class="{ 'is-active': editor.isActive('heading', { level: 6 }) }">
         h6
       </button>
-      <button @click="editor.chain().focus().bulletList().run()" :class="{ 'is-active': editor.isActive('bullet_list') }">
+      <button @click="editor.chain().focus().bulletList().run()" :class="{ 'is-active': editor.isActive('bulletList') }">
         bullet list
       </button>
-      <button @click="editor.chain().focus().orderedList().run()" :class="{ 'is-active': editor.isActive('ordered_list') }">
+      <button @click="editor.chain().focus().orderedList().run()" :class="{ 'is-active': editor.isActive('orderedList') }">
         ordered list
       </button>
       <button @click="editor.chain().focus().codeBlock().run()" :class="{ 'is-active': editor.isActive('codeBlock') }">
diff --git a/docs/src/demos/Nodes/BulletList/index.vue b/docs/src/demos/Nodes/BulletList/index.vue
index cdc341010..70491f719 100644
--- a/docs/src/demos/Nodes/BulletList/index.vue
+++ b/docs/src/demos/Nodes/BulletList/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.chain().focus().bulletList().run()" :class="{ 'is-active': editor.isActive('bullet_list') }">
+    <button @click="editor.chain().focus().bulletList().run()" :class="{ 'is-active': editor.isActive('bulletList') }">
       bullet list
     </button>
 
diff --git a/docs/src/demos/Nodes/ListItem/index.vue b/docs/src/demos/Nodes/ListItem/index.vue
index 142c64ffa..861372566 100644
--- a/docs/src/demos/Nodes/ListItem/index.vue
+++ b/docs/src/demos/Nodes/ListItem/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.chain().focus().bulletList().run()" :class="{ 'is-active': editor.isActive('bullet_list') }">
+    <button @click="editor.chain().focus().bulletList().run()" :class="{ 'is-active': editor.isActive('bulletList') }">
       bullet list
     </button>
-    <button @click="editor.chain().focus().orderedList().run()" :class="{ 'is-active': editor.isActive('ordered_list') }">
+    <button @click="editor.chain().focus().orderedList().run()" :class="{ 'is-active': editor.isActive('orderedList') }">
       ordered list
     </button>
 
diff --git a/docs/src/demos/Nodes/OrderedList/index.vue b/docs/src/demos/Nodes/OrderedList/index.vue
index 6703c4ec2..0677b451a 100644
--- a/docs/src/demos/Nodes/OrderedList/index.vue
+++ b/docs/src/demos/Nodes/OrderedList/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="editor">
-    <button @click="editor.chain().focus().orderedList().run()" :class="{ 'is-active': editor.isActive('ordered_list') }">
+    <button @click="editor.chain().focus().orderedList().run()" :class="{ 'is-active': editor.isActive('orderedList') }">
       ordered list
     </button>
 
diff --git a/docs/src/demos/Nodes/TaskList/index.spec.js b/docs/src/demos/Nodes/TaskList/index.spec.js
index 6a5720628..6696b5664 100644
--- a/docs/src/demos/Nodes/TaskList/index.spec.js
+++ b/docs/src/demos/Nodes/TaskList/index.spec.js
@@ -12,15 +12,15 @@ context('/api/nodes/task-list', () => {
 
   it('should parse unordered lists correctly', () => {
     cy.get('.ProseMirror').then(([{ editor }]) => {
-      editor.setContent('<ul data-type="task_list"><li data-checked="true" data-type="task_item"><p>Example Text</p></li></ul>')
-      expect(editor.getHTML()).to.eq('<ul data-type="task_list"><li data-checked="true" data-type="task_item"><p>Example Text</p></li></ul>')
+      editor.setContent('<ul data-type="task_list"><li data-checked="true" data-type="taskItem"><p>Example Text</p></li></ul>')
+      expect(editor.getHTML()).to.eq('<ul data-type="task_list"><li data-checked="true" data-type="taskItem"><p>Example Text</p></li></ul>')
     })
   })
 
   it('should parse unordered lists without paragraphs correctly', () => {
     cy.get('.ProseMirror').then(([{ editor }]) => {
-      editor.setContent('<ul data-type="task_list"><li data-checked="false" data-type="task_item">Example Text</li></ul>')
-      expect(editor.getHTML()).to.eq('<ul data-type="task_list"><li data-checked="false" data-type="task_item"><p>Example Text</p></li></ul>')
+      editor.setContent('<ul data-type="task_list"><li data-checked="false" data-type="taskItem">Example Text</li></ul>')
+      expect(editor.getHTML()).to.eq('<ul data-type="task_list"><li data-checked="false" data-type="taskItem"><p>Example Text</p></li></ul>')
     })
   })
 
diff --git a/docs/src/demos/Nodes/TaskList/index.vue b/docs/src/demos/Nodes/TaskList/index.vue
index b307660ef..edc67a693 100644
--- a/docs/src/demos/Nodes/TaskList/index.vue
+++ b/docs/src/demos/Nodes/TaskList/index.vue
@@ -39,8 +39,8 @@ export default {
       ],
       content: `
         <ul data-type="task_list">
-          <li data-type="task_item" data-checked="true">A list item</li>
-          <li data-type="task_item" data-checked="false">And another one</li>
+          <li data-type="taskItem" data-checked="true">A list item</li>
+          <li data-type="taskItem" data-checked="false">And another one</li>
         </ul>
       `,
     })
diff --git a/docs/src/docPages/api/nodes/bullet-list.md b/docs/src/docPages/api/nodes/bullet-list.md
index 602d72193..6f5fff6cd 100644
--- a/docs/src/docPages/api/nodes/bullet-list.md
+++ b/docs/src/docPages/api/nodes/bullet-list.md
@@ -24,7 +24,7 @@ yarn add @tiptap/extension-bullet-list @tiptap/extension-list-item
 ## Commands
 | Command     | Parameters | Description           |
 | ----------- | ---------- | --------------------- |
-| bullet_list | —          | Toggle a bullet list. |
+| bulletList | —          | Toggle a bullet list. |
 
 ## Keyboard shortcuts
 * `Control`&nbsp;`Shift`&nbsp;`8`
diff --git a/packages/extension-bullet-list/index.ts b/packages/extension-bullet-list/index.ts
index 66ec461bb..ef2b77013 100644
--- a/packages/extension-bullet-list/index.ts
+++ b/packages/extension-bullet-list/index.ts
@@ -4,11 +4,11 @@ import { wrappingInputRule } from 'prosemirror-inputrules'
 export const inputRegex = /^\s*([-+*])\s$/
 
 const BulletList = createNode({
-  name: 'bullet_list',
+  name: 'bulletList',
 
   group: 'block list',
 
-  content: 'list_item+',
+  content: 'listItem+',
 
   parseHTML() {
     return [
@@ -23,7 +23,7 @@ const BulletList = createNode({
   addCommands() {
     return {
       bulletList: (): Command => ({ commands }) => {
-        return commands.toggleList('bullet_list', 'list_item')
+        return commands.toggleList('bulletList', 'listItem')
       },
     }
   },
diff --git a/packages/extension-list-item/index.ts b/packages/extension-list-item/index.ts
index aa267107a..f3c932bc3 100644
--- a/packages/extension-list-item/index.ts
+++ b/packages/extension-list-item/index.ts
@@ -1,7 +1,7 @@
 import { createNode } from '@tiptap/core'
 
 const ListItem = createNode({
-  name: 'list_item',
+  name: 'listItem',
 
   content: '(paragraph|list?)+',
 
@@ -21,9 +21,9 @@ const ListItem = createNode({
 
   addKeyboardShortcuts() {
     return {
-      Enter: () => this.editor.splitListItem('list_item'),
-      Tab: () => this.editor.sinkListItem('list_item'),
-      'Shift-Tab': () => this.editor.liftListItem('list_item'),
+      Enter: () => this.editor.splitListItem('listItem'),
+      Tab: () => this.editor.sinkListItem('listItem'),
+      'Shift-Tab': () => this.editor.liftListItem('listItem'),
     }
   },
 })
diff --git a/packages/extension-ordered-list/index.ts b/packages/extension-ordered-list/index.ts
index 35c7ac92d..ce47c143b 100644
--- a/packages/extension-ordered-list/index.ts
+++ b/packages/extension-ordered-list/index.ts
@@ -4,11 +4,11 @@ import { wrappingInputRule } from 'prosemirror-inputrules'
 export const inputRegex = /^(\d+)\.\s$/
 
 const OrderedList = createNode({
-  name: 'ordered_list',
+  name: 'orderedList',
 
   group: 'block list',
 
-  content: 'list_item+',
+  content: 'listItem+',
 
   addAttributes() {
     return {
@@ -42,7 +42,7 @@ const OrderedList = createNode({
   addCommands() {
     return {
       orderedList: (): Command => ({ commands }) => {
-        return commands.toggleList('ordered_list', 'list_item')
+        return commands.toggleList('orderedList', 'listItem')
       },
     }
   },
diff --git a/packages/extension-task-item/index.ts b/packages/extension-task-item/index.ts
index d59115913..7652cd101 100644
--- a/packages/extension-task-item/index.ts
+++ b/packages/extension-task-item/index.ts
@@ -8,7 +8,7 @@ export interface TaskItemOptions {
 }
 
 const TaskItem = createNode({
-  name: 'task_item',
+  name: 'taskItem',
 
   content() {
     return this.options.nested ? '(paragraph|task_list)+' : 'paragraph+'
@@ -37,20 +37,20 @@ const TaskItem = createNode({
   parseHTML() {
     return [
       {
-        tag: 'li[data-type="task_item"]',
+        tag: 'li[data-type="taskItem"]',
         priority: 51,
       },
     ]
   },
 
   renderHTML({ attributes }) {
-    return ['li', mergeAttributes(attributes, { 'data-type': 'task_item' }), 0]
+    return ['li', mergeAttributes(attributes, { 'data-type': 'taskItem' }), 0]
   },
 
   addKeyboardShortcuts() {
     const shortcuts = {
-      Enter: () => this.editor.splitListItem('task_item'),
-      'Shift-Tab': () => this.editor.liftListItem('task_item'),
+      Enter: () => this.editor.splitListItem('taskItem'),
+      'Shift-Tab': () => this.editor.liftListItem('taskItem'),
     }
 
     if (!this.options.nested) {
@@ -59,7 +59,7 @@ const TaskItem = createNode({
 
     return {
       ...shortcuts,
-      Tab: () => this.editor.sinkListItem('task_item'),
+      Tab: () => this.editor.sinkListItem('taskItem'),
     }
   },
 
diff --git a/packages/extension-task-list/index.ts b/packages/extension-task-list/index.ts
index b4e0cb831..adc9b63b8 100644
--- a/packages/extension-task-list/index.ts
+++ b/packages/extension-task-list/index.ts
@@ -5,7 +5,7 @@ const TaskList = createNode({
 
   group: 'block list',
 
-  content: 'task_item+',
+  content: 'taskItem+',
 
   parseHTML() {
     return [
@@ -23,7 +23,7 @@ const TaskList = createNode({
   addCommands() {
     return {
       taskList: (): Command => ({ commands }) => {
-        return commands.toggleList('task_list', 'task_item')
+        return commands.toggleList('task_list', 'taskItem')
       },
     }
   },

From 0ba95a7ae3e12c079aef22c23842a19fdade72b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 4 Nov 2020 12:40:13 +0100
Subject: [PATCH 092/113] use splitBlockKeepMarks by default, disable weird
 selectAll

---
 packages/core/src/extensions/baseKeymap.ts | 46 +++++++++++++++++++++-
 packages/core/src/extensions/index.ts      |  1 -
 packages/core/src/extensions/inputRules.ts | 16 --------
 3 files changed, 44 insertions(+), 19 deletions(-)
 delete mode 100644 packages/core/src/extensions/inputRules.ts

diff --git a/packages/core/src/extensions/baseKeymap.ts b/packages/core/src/extensions/baseKeymap.ts
index 95508a4e3..5411d87c3 100644
--- a/packages/core/src/extensions/baseKeymap.ts
+++ b/packages/core/src/extensions/baseKeymap.ts
@@ -1,9 +1,51 @@
-import { baseKeymap } from 'prosemirror-commands'
+import {
+  chainCommands,
+  newlineInCode,
+  createParagraphNear,
+  liftEmptyBlock,
+  splitBlockKeepMarks,
+  exitCode,
+  deleteSelection,
+  joinForward,
+  joinBackward,
+  selectNodeForward,
+  selectNodeBackward,
+} from 'prosemirror-commands'
+import { undoInputRule } from 'prosemirror-inputrules'
 import { createExtension } from '../Extension'
 
 export const BaseKeymap = createExtension({
   addKeyboardShortcuts() {
-    return baseKeymap
+    const enter = chainCommands(
+      newlineInCode,
+      createParagraphNear,
+      liftEmptyBlock,
+      splitBlockKeepMarks,
+    )
+
+    const backspace = chainCommands(
+      undoInputRule,
+      deleteSelection,
+      joinBackward,
+      selectNodeBackward,
+    )
+
+    const del = chainCommands(
+      deleteSelection,
+      joinForward,
+      selectNodeForward,
+    )
+
+    return {
+      Enter: enter,
+      'Mod-Enter': exitCode,
+      Backspace: backspace,
+      'Mod-Backspace': backspace,
+      Delete: del,
+      'Mod-Delete': del,
+      // we don’t need a custom `selectAll` for now
+      // 'Mod-a': () => this.editor.selectAll(),
+    }
   },
 })
 
diff --git a/packages/core/src/extensions/index.ts b/packages/core/src/extensions/index.ts
index 463db8c50..3670658d9 100644
--- a/packages/core/src/extensions/index.ts
+++ b/packages/core/src/extensions/index.ts
@@ -5,7 +5,6 @@ export { DeleteSelection } from './deleteSelection'
 export { Editable } from './editable'
 export { Focus } from './focus'
 export { FocusEvents } from './focusEvents'
-export { InputRules } from './inputRules'
 export { InsertHTML } from './insertHTML'
 export { InsertText } from './insertText'
 export { BaseKeymap } from './baseKeymap'
diff --git a/packages/core/src/extensions/inputRules.ts b/packages/core/src/extensions/inputRules.ts
deleted file mode 100644
index c9e09d665..000000000
--- a/packages/core/src/extensions/inputRules.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { undoInputRule } from 'prosemirror-inputrules'
-import { createExtension } from '../Extension'
-
-export const InputRules = createExtension({
-  addKeyboardShortcuts() {
-    return {
-      Backspace: undoInputRule,
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    InputRules: typeof InputRules,
-  }
-}

From 7a16546d6f755aea9bf41bbab3230b4a02f0dcd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 4 Nov 2020 15:31:42 +0100
Subject: [PATCH 093/113] add try command

---
 packages/core/src/Editor.ts                | 11 ++++--
 packages/core/src/extensions/baseKeymap.ts | 45 ++++++++++------------
 packages/core/src/extensions/index.ts      |  3 +-
 packages/core/src/extensions/try.ts        | 26 +++++++++++++
 4 files changed, 57 insertions(+), 28 deletions(-)
 create mode 100644 packages/core/src/extensions/try.ts

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 062418e2d..aebc7d972 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -261,15 +261,20 @@ export class Editor extends EventEmitter {
    */
   private createView() {
     this.view = new EditorView(this.options.element, {
+      dispatchTransaction: this.dispatchTransaction.bind(this),
       state: EditorState.create({
         doc: this.createDocument(this.options.content),
-        plugins: this.extensionManager.plugins,
       }),
-      dispatchTransaction: this.dispatchTransaction.bind(this),
     })
 
     // `editor.view` is not yet available at this time.
-    // Therefore we will add all node views directly afterwards.
+    // Therefore we will add all plugins and node views directly afterwards.
+    const newState = this.state.reconfigure({
+      plugins: this.extensionManager.plugins,
+    })
+
+    this.view.updateState(newState)
+
     this.view.setProps({
       nodeViews: this.extensionManager.nodeViews,
     })
diff --git a/packages/core/src/extensions/baseKeymap.ts b/packages/core/src/extensions/baseKeymap.ts
index 5411d87c3..77f121c16 100644
--- a/packages/core/src/extensions/baseKeymap.ts
+++ b/packages/core/src/extensions/baseKeymap.ts
@@ -1,5 +1,4 @@
 import {
-  chainCommands,
   newlineInCode,
   createParagraphNear,
   liftEmptyBlock,
@@ -16,33 +15,31 @@ import { createExtension } from '../Extension'
 
 export const BaseKeymap = createExtension({
   addKeyboardShortcuts() {
-    const enter = chainCommands(
-      newlineInCode,
-      createParagraphNear,
-      liftEmptyBlock,
-      splitBlockKeepMarks,
-    )
+    const handleBackspace = () => this.editor.try(({ state, dispatch }) => [
+      () => undoInputRule(state, dispatch),
+      () => deleteSelection(state, dispatch),
+      () => joinBackward(state, dispatch),
+      () => selectNodeBackward(state, dispatch),
+    ])
 
-    const backspace = chainCommands(
-      undoInputRule,
-      deleteSelection,
-      joinBackward,
-      selectNodeBackward,
-    )
-
-    const del = chainCommands(
-      deleteSelection,
-      joinForward,
-      selectNodeForward,
-    )
+    const handleDelete = () => this.editor.try(({ state, dispatch }) => [
+      () => deleteSelection(state, dispatch),
+      () => joinForward(state, dispatch),
+      () => selectNodeForward(state, dispatch),
+    ])
 
     return {
-      Enter: enter,
+      Enter: () => this.editor.try(({ state, dispatch }) => [
+        () => newlineInCode(state, dispatch),
+        () => createParagraphNear(state, dispatch),
+        () => liftEmptyBlock(state, dispatch),
+        () => splitBlockKeepMarks(state, dispatch),
+      ]),
       'Mod-Enter': exitCode,
-      Backspace: backspace,
-      'Mod-Backspace': backspace,
-      Delete: del,
-      'Mod-Delete': del,
+      Backspace: () => handleBackspace(),
+      'Mod-Backspace': () => handleBackspace(),
+      Delete: () => handleDelete(),
+      'Mod-Delete': () => handleDelete(),
       // we don’t need a custom `selectAll` for now
       // 'Mod-a': () => this.editor.selectAll(),
     }
diff --git a/packages/core/src/extensions/index.ts b/packages/core/src/extensions/index.ts
index 3670658d9..5dfad4d30 100644
--- a/packages/core/src/extensions/index.ts
+++ b/packages/core/src/extensions/index.ts
@@ -24,6 +24,7 @@ export { SplitListItem } from './splitListItem'
 export { ToggleBlockType } from './toggleBlockType'
 export { ToggleList } from './toggleList'
 export { ToggleMark } from './toggleMark'
-export { UpdateMark } from './updateMark'
 export { ToggleWrap } from './toggleWrap'
+export { Try } from './try'
+export { UpdateMark } from './updateMark'
 export { WrapInList } from './wrapInList'
diff --git a/packages/core/src/extensions/try.ts b/packages/core/src/extensions/try.ts
new file mode 100644
index 000000000..c7fa428b8
--- /dev/null
+++ b/packages/core/src/extensions/try.ts
@@ -0,0 +1,26 @@
+import { Command } from '../Editor'
+import { createExtension } from '../Extension'
+
+export const Try = createExtension({
+  addCommands() {
+    return {
+      try: (fn: (props: Parameters<Command>[0]) => Command[]): Command => props => {
+        const commands = fn(props)
+
+        for (let i = 0; i < commands.length; i += 1) {
+          if (commands[i](props)) {
+            return true
+          }
+        }
+
+        return false
+      },
+    }
+  },
+})
+
+declare module '../Editor' {
+  interface AllExtensions {
+    Try: typeof Try,
+  }
+}

From 1d3de73f82e236909b5eb7154c200a7713c10fe8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 4 Nov 2020 15:40:32 +0100
Subject: [PATCH 094/113] refactoring

---
 packages/core/src/extensions/try.ts    | 10 ++++++----
 packages/extension-hard-break/index.ts | 18 ++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/core/src/extensions/try.ts b/packages/core/src/extensions/try.ts
index c7fa428b8..805e56d38 100644
--- a/packages/core/src/extensions/try.ts
+++ b/packages/core/src/extensions/try.ts
@@ -4,11 +4,13 @@ import { createExtension } from '../Extension'
 export const Try = createExtension({
   addCommands() {
     return {
-      try: (fn: (props: Parameters<Command>[0]) => Command[]): Command => props => {
-        const commands = fn(props)
+      try: (commands: Command[] | ((props: Parameters<Command>[0]) => Command[])): Command => props => {
+        const items = typeof commands === 'function'
+          ? commands(props)
+          : commands
 
-        for (let i = 0; i < commands.length; i += 1) {
-          if (commands[i](props)) {
+        for (let i = 0; i < items.length; i += 1) {
+          if (items[i](props)) {
             return true
           }
         }
diff --git a/packages/extension-hard-break/index.ts b/packages/extension-hard-break/index.ts
index f8e062b16..6d804df12 100644
--- a/packages/extension-hard-break/index.ts
+++ b/packages/extension-hard-break/index.ts
@@ -1,5 +1,5 @@
 import { Command, createNode } from '@tiptap/core'
-import { chainCommands, exitCode } from 'prosemirror-commands'
+import { exitCode } from 'prosemirror-commands'
 
 const HardBreak = createNode({
   name: 'hardBreak',
@@ -22,19 +22,17 @@ const HardBreak = createNode({
 
   addCommands() {
     return {
-      hardBreak: (): Command => ({ state, dispatch, view }) => {
-        return chainCommands(
-          exitCode,
-          (_, d) => {
-            if (typeof d !== 'function') {
-              return false
+      hardBreak: (): Command => ({ commands, state, dispatch }) => {
+        return commands.try([
+          () => exitCode(state, dispatch),
+          () => {
+            if (dispatch) {
+              state.tr.replaceSelectionWith(this.type.create()).scrollIntoView()
             }
 
-            d(state.tr.replaceSelectionWith(this.type.create()).scrollIntoView())
-
             return true
           },
-        )(state, dispatch, view)
+        ])
       },
     }
   },

From 09ddf954a7e6043a825ac599145f2b8e917c9883 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 4 Nov 2020 17:01:51 +0100
Subject: [PATCH 095/113] add withAttributes and withMarks option to splitBlock
 command

---
 packages/core/src/CommandManager.ts        |  2 +-
 packages/core/src/extensions/baseKeymap.ts |  4 +-
 packages/core/src/extensions/splitBlock.ts | 45 ++++++++++++++++++++--
 packages/extension-text-align/index.ts     |  4 +-
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/CommandManager.ts b/packages/core/src/CommandManager.ts
index 1e912fc02..824e98fd2 100644
--- a/packages/core/src/CommandManager.ts
+++ b/packages/core/src/CommandManager.ts
@@ -131,7 +131,7 @@ export default class CommandManager {
       view,
       state: this.chainableState(tr, state),
       dispatch: shouldDispatch
-        ? () => true
+        ? () => undefined
         : undefined,
       chain: () => this.createChain(tr),
       can: () => this.createCan(tr),
diff --git a/packages/core/src/extensions/baseKeymap.ts b/packages/core/src/extensions/baseKeymap.ts
index 77f121c16..30d6c9fbb 100644
--- a/packages/core/src/extensions/baseKeymap.ts
+++ b/packages/core/src/extensions/baseKeymap.ts
@@ -29,11 +29,11 @@ export const BaseKeymap = createExtension({
     ])
 
     return {
-      Enter: () => this.editor.try(({ state, dispatch }) => [
+      Enter: () => this.editor.try(({ commands, state, dispatch }) => [
         () => newlineInCode(state, dispatch),
         () => createParagraphNear(state, dispatch),
         () => liftEmptyBlock(state, dispatch),
-        () => splitBlockKeepMarks(state, dispatch),
+        () => commands.splitBlock(),
       ]),
       'Mod-Enter': exitCode,
       Backspace: () => handleBackspace(),
diff --git a/packages/core/src/extensions/splitBlock.ts b/packages/core/src/extensions/splitBlock.ts
index 98359fd2d..ae1f8c5da 100644
--- a/packages/core/src/extensions/splitBlock.ts
+++ b/packages/core/src/extensions/splitBlock.ts
@@ -1,6 +1,6 @@
 import { canSplit } from 'prosemirror-transform'
 import { ContentMatch, Fragment } from 'prosemirror-model'
-import { NodeSelection, TextSelection } from 'prosemirror-state'
+import { EditorState, NodeSelection, TextSelection } from 'prosemirror-state'
 import { Command } from '../Editor'
 import { createExtension } from '../Extension'
 
@@ -13,10 +13,29 @@ function defaultBlockAt(match: ContentMatch) {
   return null
 }
 
+interface SplitBlockOptions {
+  withAttributes: boolean,
+  withMarks: boolean,
+}
+
+function keepMarks(state: EditorState) {
+  const marks = state.storedMarks
+    || (state.selection.$to.parentOffset && state.selection.$from.marks())
+
+  if (marks) {
+    state.tr.ensureMarks(marks)
+  }
+}
+
 export const SplitBlock = createExtension({
   addCommands() {
     return {
-      splitBlock: (copyAttributes = false): Command => ({ tr, dispatch }) => {
+      splitBlock: (options: Partial<SplitBlockOptions> = {}): Command => ({ tr, state, dispatch }) => {
+        const defaultOptions: SplitBlockOptions = {
+          withAttributes: false,
+          withMarks: true,
+        }
+        const config = { ...defaultOptions, ...options }
         const { selection, doc } = tr
         const { $from, $to } = selection
 
@@ -26,6 +45,10 @@ export const SplitBlock = createExtension({
           }
 
           if (dispatch) {
+            if (config.withMarks) {
+              keepMarks(state)
+            }
+
             tr.split($from.pos).scrollIntoView()
           }
 
@@ -48,7 +71,12 @@ export const SplitBlock = createExtension({
             : defaultBlockAt($from.node(-1).contentMatchAt($from.indexAfter(-1)))
 
           let types = atEnd && deflt
-            ? [{ type: deflt, attrs: copyAttributes ? $from.node().attrs : {} }]
+            ? [{
+              type: deflt,
+              attrs: config.withAttributes
+                ? $from.node().attrs
+                : {},
+            }]
             : undefined
 
           let can = canSplit(tr.doc, tr.mapping.map($from.pos), 1, types)
@@ -60,7 +88,12 @@ export const SplitBlock = createExtension({
           ) {
             can = true
             types = deflt
-              ? [{ type: deflt, attrs: copyAttributes ? $from.node().attrs : {} }]
+              ? [{
+                type: deflt,
+                attrs: config.withAttributes
+                  ? $from.node().attrs
+                  : {},
+              }]
               : undefined
           }
 
@@ -77,6 +110,10 @@ export const SplitBlock = createExtension({
             }
           }
 
+          if (config.withMarks) {
+            keepMarks(state)
+          }
+
           tr.scrollIntoView()
         }
 
diff --git a/packages/extension-text-align/index.ts b/packages/extension-text-align/index.ts
index 3eaaa5efb..7a6e07ad1 100644
--- a/packages/extension-text-align/index.ts
+++ b/packages/extension-text-align/index.ts
@@ -49,7 +49,9 @@ const TextAlign = createExtension({
       // TODO: re-use only 'textAlign' attribute
       // TODO: use custom splitBlock only for `this.options.types`
       // TODO: use complete default enter handler (chainCommand) with custom splitBlock
-      Enter: () => this.editor.splitBlock(true),
+      Enter: () => this.editor.splitBlock({
+        withAttributes: true,
+      }),
     }
   },
 })

From fcd264bb16db9dc981cf0d8edd9adc9b7bf88c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 4 Nov 2020 17:25:25 +0100
Subject: [PATCH 096/113] add comment

---
 packages/core/src/extensions/editable.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/core/src/extensions/editable.ts b/packages/core/src/extensions/editable.ts
index 4cca4fa82..431bc7748 100644
--- a/packages/core/src/extensions/editable.ts
+++ b/packages/core/src/extensions/editable.ts
@@ -13,3 +13,10 @@ export const Editable = createExtension({
     ]
   },
 })
+
+// TODO: Editable circularly references itself!?
+// declare module '../Editor' {
+//   interface AllExtensions {
+//     Editable: typeof Editable,
+//   }
+// }

From 742e643ab362a7d2ec0d70598044ba54d2c13fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 4 Nov 2020 17:46:20 +0100
Subject: [PATCH 097/113] add text transform to nav item labels

---
 docs/src/layouts/App/style.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/src/layouts/App/style.scss b/docs/src/layouts/App/style.scss
index bac89e1fe..5567abe3d 100644
--- a/docs/src/layouts/App/style.scss
+++ b/docs/src/layouts/App/style.scss
@@ -189,6 +189,7 @@ $menuBreakPoint: 800px;
       &::after {
         content: 'draft';
         font-family: 'JetBrainsMono', monospace;
+        text-transform: uppercase;
         color: $colorGrey;
         background-color: rgba($colorGrey, 0.1);
         padding: 0 0.5em;
@@ -200,6 +201,7 @@ $menuBreakPoint: 800px;
       &::after {
         content: 'PRO';
         font-family: 'JetBrainsMono', monospace;
+        text-transform: uppercase;
         color: $colorOrange;
         background-color: rgba($colorOrange, 0.1);
         padding: 0 0.5em;

From ca0c3188f3687131b01beb0013ba8680d4fb0d28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 4 Nov 2020 21:54:59 +0100
Subject: [PATCH 098/113] fix lint

---
 packages/core/src/extensions/baseKeymap.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/core/src/extensions/baseKeymap.ts b/packages/core/src/extensions/baseKeymap.ts
index 30d6c9fbb..fe8f93427 100644
--- a/packages/core/src/extensions/baseKeymap.ts
+++ b/packages/core/src/extensions/baseKeymap.ts
@@ -2,7 +2,6 @@ import {
   newlineInCode,
   createParagraphNear,
   liftEmptyBlock,
-  splitBlockKeepMarks,
   exitCode,
   deleteSelection,
   joinForward,

From 6f3db0970f970e520ff6042458cdb8cbe27c507f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Wed, 4 Nov 2020 22:38:52 +0100
Subject: [PATCH 099/113] move commands again

---
 packages/core/src/commands/blur.ts            |   9 +
 packages/core/src/commands/clearContent.ts    |   5 +
 packages/core/src/commands/clearNodes.ts      |  29 ++
 packages/core/src/commands/deleteSelection.ts |   6 +
 packages/core/src/commands/focus.ts           |  58 ++++
 .../{extensions => commands}/insertHTML.ts    |  31 +--
 packages/core/src/commands/insertText.ts      |   9 +
 packages/core/src/commands/liftListItem.ts    |  10 +
 packages/core/src/commands/removeMark.ts      |  26 ++
 packages/core/src/commands/removeMarks.ts     |  20 ++
 .../core/src/commands/resetNodeAttributes.ts  |  23 ++
 packages/core/src/commands/scrollIntoView.ts  |   9 +
 packages/core/src/commands/selectAll.ts       |   6 +
 .../core/src/commands/selectParentNode.ts     |   6 +
 packages/core/src/commands/setBlockType.ts    |  10 +
 packages/core/src/commands/setContent.ts      |  17 ++
 .../core/src/commands/setNodeAttributes.ts    |  14 +
 packages/core/src/commands/sinkListItem.ts    |  10 +
 packages/core/src/commands/splitBlock.ts      | 117 ++++++++
 packages/core/src/commands/splitListItem.ts   |  10 +
 packages/core/src/commands/toggleBlockType.ts |  16 ++
 packages/core/src/commands/toggleList.ts      |  52 ++++
 packages/core/src/commands/toggleMark.ts      |  10 +
 packages/core/src/commands/toggleWrap.ts      |  16 ++
 packages/core/src/commands/try.ts             |  15 ++
 packages/core/src/commands/updateMark.ts      |  32 +++
 packages/core/src/commands/wrapInList.ts      |  10 +
 packages/core/src/extensions/blur.ts          |  22 --
 packages/core/src/extensions/clearContent.ts  |  18 --
 packages/core/src/extensions/clearNodes.ts    |  42 ---
 packages/core/src/extensions/commands.ts      |  68 +++++
 .../core/src/extensions/deleteSelection.ts    |  19 --
 packages/core/src/extensions/focus.ts         |  71 -----
 packages/core/src/extensions/index.ts         |  30 +--
 packages/core/src/extensions/insertText.ts    |  22 --
 .../extensions/{baseKeymap.ts => keymap.ts}   |   4 +-
 packages/core/src/extensions/liftListItem.ts  |  23 --
 packages/core/src/extensions/removeMark.ts    |  39 ---
 packages/core/src/extensions/removeMarks.ts   |  33 ---
 .../src/extensions/resetNodeAttributes.ts     |  36 ---
 .../core/src/extensions/scrollIntoView.ts     |  22 --
 packages/core/src/extensions/selectAll.ts     |  19 --
 .../core/src/extensions/selectParentNode.ts   |  19 --
 packages/core/src/extensions/setBlockType.ts  |  23 --
 packages/core/src/extensions/setContent.ts    |  30 ---
 .../core/src/extensions/setNodeAttributes.ts  |  27 --
 packages/core/src/extensions/sinkListItem.ts  |  23 --
 packages/core/src/extensions/splitBlock.ts    | 130 ---------
 packages/core/src/extensions/splitListItem.ts |  23 --
 .../core/src/extensions/toggleBlockType.ts    |  29 --
 packages/core/src/extensions/toggleList.ts    |  65 -----
 packages/core/src/extensions/toggleMark.ts    |  23 --
 packages/core/src/extensions/toggleWrap.ts    |  29 --
 packages/core/src/extensions/try.ts           |  28 --
 packages/core/src/extensions/updateMark.ts    |  45 ----
 packages/core/src/extensions/wrapInList.ts    |  23 --
 packages/core/src/inputRules/markInputRule.ts |   6 +-
 packages/core/src/inputRules/nodeInputRule.ts |   8 +-
 yarn.lock                                     | 252 +++++++++---------
 59 files changed, 761 insertions(+), 1066 deletions(-)
 create mode 100644 packages/core/src/commands/blur.ts
 create mode 100644 packages/core/src/commands/clearContent.ts
 create mode 100644 packages/core/src/commands/clearNodes.ts
 create mode 100644 packages/core/src/commands/deleteSelection.ts
 create mode 100644 packages/core/src/commands/focus.ts
 rename packages/core/src/{extensions => commands}/insertHTML.ts (57%)
 create mode 100644 packages/core/src/commands/insertText.ts
 create mode 100644 packages/core/src/commands/liftListItem.ts
 create mode 100644 packages/core/src/commands/removeMark.ts
 create mode 100644 packages/core/src/commands/removeMarks.ts
 create mode 100644 packages/core/src/commands/resetNodeAttributes.ts
 create mode 100644 packages/core/src/commands/scrollIntoView.ts
 create mode 100644 packages/core/src/commands/selectAll.ts
 create mode 100644 packages/core/src/commands/selectParentNode.ts
 create mode 100644 packages/core/src/commands/setBlockType.ts
 create mode 100644 packages/core/src/commands/setContent.ts
 create mode 100644 packages/core/src/commands/setNodeAttributes.ts
 create mode 100644 packages/core/src/commands/sinkListItem.ts
 create mode 100644 packages/core/src/commands/splitBlock.ts
 create mode 100644 packages/core/src/commands/splitListItem.ts
 create mode 100644 packages/core/src/commands/toggleBlockType.ts
 create mode 100644 packages/core/src/commands/toggleList.ts
 create mode 100644 packages/core/src/commands/toggleMark.ts
 create mode 100644 packages/core/src/commands/toggleWrap.ts
 create mode 100644 packages/core/src/commands/try.ts
 create mode 100644 packages/core/src/commands/updateMark.ts
 create mode 100644 packages/core/src/commands/wrapInList.ts
 delete mode 100644 packages/core/src/extensions/blur.ts
 delete mode 100644 packages/core/src/extensions/clearContent.ts
 delete mode 100644 packages/core/src/extensions/clearNodes.ts
 create mode 100644 packages/core/src/extensions/commands.ts
 delete mode 100644 packages/core/src/extensions/deleteSelection.ts
 delete mode 100644 packages/core/src/extensions/focus.ts
 delete mode 100644 packages/core/src/extensions/insertText.ts
 rename packages/core/src/extensions/{baseKeymap.ts => keymap.ts} (94%)
 delete mode 100644 packages/core/src/extensions/liftListItem.ts
 delete mode 100644 packages/core/src/extensions/removeMark.ts
 delete mode 100644 packages/core/src/extensions/removeMarks.ts
 delete mode 100644 packages/core/src/extensions/resetNodeAttributes.ts
 delete mode 100644 packages/core/src/extensions/scrollIntoView.ts
 delete mode 100644 packages/core/src/extensions/selectAll.ts
 delete mode 100644 packages/core/src/extensions/selectParentNode.ts
 delete mode 100644 packages/core/src/extensions/setBlockType.ts
 delete mode 100644 packages/core/src/extensions/setContent.ts
 delete mode 100644 packages/core/src/extensions/setNodeAttributes.ts
 delete mode 100644 packages/core/src/extensions/sinkListItem.ts
 delete mode 100644 packages/core/src/extensions/splitBlock.ts
 delete mode 100644 packages/core/src/extensions/splitListItem.ts
 delete mode 100644 packages/core/src/extensions/toggleBlockType.ts
 delete mode 100644 packages/core/src/extensions/toggleList.ts
 delete mode 100644 packages/core/src/extensions/toggleMark.ts
 delete mode 100644 packages/core/src/extensions/toggleWrap.ts
 delete mode 100644 packages/core/src/extensions/try.ts
 delete mode 100644 packages/core/src/extensions/updateMark.ts
 delete mode 100644 packages/core/src/extensions/wrapInList.ts

diff --git a/packages/core/src/commands/blur.ts b/packages/core/src/commands/blur.ts
new file mode 100644
index 000000000..47c859e45
--- /dev/null
+++ b/packages/core/src/commands/blur.ts
@@ -0,0 +1,9 @@
+import { Command } from '../Editor'
+
+export default (): Command => ({ view }) => {
+  const element = view.dom as HTMLElement
+
+  element.blur()
+
+  return true
+}
diff --git a/packages/core/src/commands/clearContent.ts b/packages/core/src/commands/clearContent.ts
new file mode 100644
index 000000000..54eda0454
--- /dev/null
+++ b/packages/core/src/commands/clearContent.ts
@@ -0,0 +1,5 @@
+import { Command } from '../Editor'
+
+export default (emitUpdate: Boolean = false): Command => ({ commands }) => {
+  return commands.setContent('', emitUpdate)
+}
diff --git a/packages/core/src/commands/clearNodes.ts b/packages/core/src/commands/clearNodes.ts
new file mode 100644
index 000000000..9769c6aa0
--- /dev/null
+++ b/packages/core/src/commands/clearNodes.ts
@@ -0,0 +1,29 @@
+import { liftTarget } from 'prosemirror-transform'
+import { Command } from '../Editor'
+
+export default (): Command => ({ state, tr, dispatch }) => {
+  const { selection } = tr
+  const { from, to } = selection
+
+  state.doc.nodesBetween(from, to, (node, pos) => {
+    if (!node.type.isText) {
+      const fromPos = tr.doc.resolve(tr.mapping.map(pos + 1))
+      const toPos = tr.doc.resolve(tr.mapping.map(pos + node.nodeSize - 1))
+      const nodeRange = fromPos.blockRange(toPos)
+
+      if (nodeRange) {
+        const targetLiftDepth = liftTarget(nodeRange)
+
+        if (node.type.isTextblock && dispatch) {
+          tr.setNodeMarkup(nodeRange.start, state.schema.nodes.paragraph)
+        }
+
+        if ((targetLiftDepth || targetLiftDepth === 0) && dispatch) {
+          tr.lift(nodeRange, targetLiftDepth)
+        }
+      }
+    }
+  })
+
+  return true
+}
diff --git a/packages/core/src/commands/deleteSelection.ts b/packages/core/src/commands/deleteSelection.ts
new file mode 100644
index 000000000..be34c9dc2
--- /dev/null
+++ b/packages/core/src/commands/deleteSelection.ts
@@ -0,0 +1,6 @@
+import { deleteSelection } from 'prosemirror-commands'
+import { Command } from '../Editor'
+
+export default (): Command => ({ state, dispatch }) => {
+  return deleteSelection(state, dispatch)
+}
diff --git a/packages/core/src/commands/focus.ts b/packages/core/src/commands/focus.ts
new file mode 100644
index 000000000..427c4dcb1
--- /dev/null
+++ b/packages/core/src/commands/focus.ts
@@ -0,0 +1,58 @@
+import { TextSelection } from 'prosemirror-state'
+import { Editor, Command } from '../Editor'
+import minMax from '../utils/minMax'
+
+type Position = 'start' | 'end' | number | boolean | null
+
+interface ResolvedSelection {
+  from: number,
+  to: number,
+}
+
+function resolveSelection(editor: Editor, position: Position = null): ResolvedSelection {
+  if (position === null) {
+    return editor.selection
+  }
+
+  if (position === 'start' || position === true) {
+    return {
+      from: 0,
+      to: 0,
+    }
+  }
+
+  if (position === 'end') {
+    const { size } = editor.state.doc.content
+
+    return {
+      from: size,
+      to: size - 1, // TODO: -1 only for nodes with content
+    }
+  }
+
+  return {
+    from: position as number,
+    to: position as number,
+  }
+}
+
+export default (position: Position = null): Command => ({
+  editor, view, tr, dispatch,
+}) => {
+  if ((view.hasFocus() && position === null) || position === false) {
+    return true
+  }
+
+  const { from, to } = resolveSelection(editor, position)
+  const { doc } = tr
+  const resolvedFrom = minMax(from, 0, doc.content.size)
+  const resolvedEnd = minMax(to, 0, doc.content.size)
+  const selection = TextSelection.create(doc, resolvedFrom, resolvedEnd)
+
+  if (dispatch) {
+    tr.setSelection(selection)
+    view.focus()
+  }
+
+  return true
+}
diff --git a/packages/core/src/extensions/insertHTML.ts b/packages/core/src/commands/insertHTML.ts
similarity index 57%
rename from packages/core/src/extensions/insertHTML.ts
rename to packages/core/src/commands/insertHTML.ts
index 8d0f395fd..1db9535ee 100644
--- a/packages/core/src/extensions/insertHTML.ts
+++ b/packages/core/src/commands/insertHTML.ts
@@ -3,7 +3,6 @@ import { Selection, Transaction } from 'prosemirror-state'
 import { ReplaceStep, ReplaceAroundStep } from 'prosemirror-transform'
 import elementFromString from '../utils/elementFromString'
 import { Command } from '../Editor'
-import { createExtension } from '../Extension'
 
 // TODO: move to utils
 // https://github.com/ProseMirror/prosemirror-state/blob/master/src/selection.js#L466
@@ -18,27 +17,15 @@ function selectionToInsertionEnd(tr: Transaction, startLen: number, bias: number
   tr.setSelection(Selection.near(tr.doc.resolve(end as unknown as number), bias))
 }
 
-export const InsertHTML = createExtension({
-  addCommands() {
-    return {
-      insertHTML: (value: string): Command => ({ tr, state, dispatch }) => {
-        const { selection } = tr
-        const element = elementFromString(value)
-        const slice = DOMParser.fromSchema(state.schema).parseSlice(element)
+export default (value: string): Command => ({ tr, state, dispatch }) => {
+  const { selection } = tr
+  const element = elementFromString(value)
+  const slice = DOMParser.fromSchema(state.schema).parseSlice(element)
 
-        if (dispatch) {
-          tr.insert(selection.anchor, slice.content)
-          selectionToInsertionEnd(tr, tr.steps.length - 1, -1)
-        }
-
-        return true
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    InsertHTML: typeof InsertHTML,
+  if (dispatch) {
+    tr.insert(selection.anchor, slice.content)
+    selectionToInsertionEnd(tr, tr.steps.length - 1, -1)
   }
+
+  return true
 }
diff --git a/packages/core/src/commands/insertText.ts b/packages/core/src/commands/insertText.ts
new file mode 100644
index 000000000..7eef04ec2
--- /dev/null
+++ b/packages/core/src/commands/insertText.ts
@@ -0,0 +1,9 @@
+import { Command } from '../Editor'
+
+export default (value: string): Command => ({ tr, dispatch }) => {
+  if (dispatch) {
+    tr.insertText(value)
+  }
+
+  return true
+}
diff --git a/packages/core/src/commands/liftListItem.ts b/packages/core/src/commands/liftListItem.ts
new file mode 100644
index 000000000..aaf1b0933
--- /dev/null
+++ b/packages/core/src/commands/liftListItem.ts
@@ -0,0 +1,10 @@
+import { liftListItem } from 'prosemirror-schema-list'
+import { NodeType } from 'prosemirror-model'
+import { Command } from '../Editor'
+import getNodeType from '../utils/getNodeType'
+
+export default (typeOrName: string | NodeType): Command => ({ state, dispatch }) => {
+  const type = getNodeType(typeOrName, state.schema)
+
+  return liftListItem(type)(state, dispatch)
+}
diff --git a/packages/core/src/commands/removeMark.ts b/packages/core/src/commands/removeMark.ts
new file mode 100644
index 000000000..2ca0ffff6
--- /dev/null
+++ b/packages/core/src/commands/removeMark.ts
@@ -0,0 +1,26 @@
+import { MarkType } from 'prosemirror-model'
+import { Command } from '../Editor'
+import getMarkType from '../utils/getMarkType'
+import getMarkRange from '../utils/getMarkRange'
+
+export default (typeOrName: string | MarkType): Command => ({ tr, state, dispatch }) => {
+  const { selection } = tr
+  const type = getMarkType(typeOrName, state.schema)
+  let { from, to } = selection
+  const { $from, empty } = selection
+
+  if (empty) {
+    const range = getMarkRange($from, type)
+
+    if (range) {
+      from = range.from
+      to = range.to
+    }
+  }
+
+  if (dispatch) {
+    tr.removeMark(from, to, type)
+  }
+
+  return true
+}
diff --git a/packages/core/src/commands/removeMarks.ts b/packages/core/src/commands/removeMarks.ts
new file mode 100644
index 000000000..930a0282c
--- /dev/null
+++ b/packages/core/src/commands/removeMarks.ts
@@ -0,0 +1,20 @@
+import { Command } from '../Editor'
+
+export default (): Command => ({ tr, state, dispatch }) => {
+  const { selection } = tr
+  const { from, to, empty } = selection
+
+  if (empty) {
+    return true
+  }
+
+  if (dispatch) {
+    Object
+      .entries(state.schema.marks)
+      .forEach(([, mark]) => {
+        tr.removeMark(from, to, mark as any)
+      })
+  }
+
+  return true
+}
diff --git a/packages/core/src/commands/resetNodeAttributes.ts b/packages/core/src/commands/resetNodeAttributes.ts
new file mode 100644
index 000000000..dbf1fc656
--- /dev/null
+++ b/packages/core/src/commands/resetNodeAttributes.ts
@@ -0,0 +1,23 @@
+import { Command } from '../Editor'
+
+export default (attributeNames: string[] = []): Command => ({ tr, state, dispatch }) => {
+  const { selection } = tr
+  const { from, to } = selection
+
+  state.doc.nodesBetween(from, to, (node, pos) => {
+    if (!node.type.isText) {
+      attributeNames.forEach(name => {
+        const attribute = node.type.spec.attrs?.[name]
+        const defaultValue = attribute?.default
+
+        if (attribute && defaultValue !== undefined && dispatch) {
+          tr.setNodeMarkup(pos, undefined, {
+            [name]: defaultValue,
+          })
+        }
+      })
+    }
+  })
+
+  return true
+}
diff --git a/packages/core/src/commands/scrollIntoView.ts b/packages/core/src/commands/scrollIntoView.ts
new file mode 100644
index 000000000..6ce0418b4
--- /dev/null
+++ b/packages/core/src/commands/scrollIntoView.ts
@@ -0,0 +1,9 @@
+import { Command } from '../Editor'
+
+export default (): Command => ({ tr, dispatch }) => {
+  if (dispatch) {
+    tr.scrollIntoView()
+  }
+
+  return true
+}
diff --git a/packages/core/src/commands/selectAll.ts b/packages/core/src/commands/selectAll.ts
new file mode 100644
index 000000000..8b01fdce4
--- /dev/null
+++ b/packages/core/src/commands/selectAll.ts
@@ -0,0 +1,6 @@
+import { selectAll } from 'prosemirror-commands'
+import { Command } from '../Editor'
+
+export default (): Command => ({ state, dispatch }) => {
+  return selectAll(state, dispatch)
+}
diff --git a/packages/core/src/commands/selectParentNode.ts b/packages/core/src/commands/selectParentNode.ts
new file mode 100644
index 000000000..d5c1ebe35
--- /dev/null
+++ b/packages/core/src/commands/selectParentNode.ts
@@ -0,0 +1,6 @@
+import { selectParentNode } from 'prosemirror-commands'
+import { Command } from '../Editor'
+
+export default (): Command => ({ state, dispatch }) => {
+  return selectParentNode(state, dispatch)
+}
diff --git a/packages/core/src/commands/setBlockType.ts b/packages/core/src/commands/setBlockType.ts
new file mode 100644
index 000000000..8dad97f21
--- /dev/null
+++ b/packages/core/src/commands/setBlockType.ts
@@ -0,0 +1,10 @@
+import { NodeType } from 'prosemirror-model'
+import { setBlockType } from 'prosemirror-commands'
+import { Command } from '../Editor'
+import getNodeType from '../utils/getNodeType'
+
+export default (typeOrName: string | NodeType, attrs = {}): Command => ({ state, dispatch }) => {
+  const type = getNodeType(typeOrName, state.schema)
+
+  return setBlockType(type, attrs)(state, dispatch)
+}
diff --git a/packages/core/src/commands/setContent.ts b/packages/core/src/commands/setContent.ts
new file mode 100644
index 000000000..9ba8df7e2
--- /dev/null
+++ b/packages/core/src/commands/setContent.ts
@@ -0,0 +1,17 @@
+import { TextSelection } from 'prosemirror-state'
+import { Command } from '../Editor'
+
+export default (content: string, emitUpdate: Boolean = false, parseOptions = {}): Command => ({ tr, editor, dispatch }) => {
+  const { createDocument } = editor
+  const { doc } = tr
+  const document = createDocument(content, parseOptions)
+  const selection = TextSelection.create(doc, 0, doc.content.size)
+
+  if (dispatch) {
+    tr.setSelection(selection)
+      .replaceSelectionWith(document, false)
+      .setMeta('preventUpdate', !emitUpdate)
+  }
+
+  return true
+}
diff --git a/packages/core/src/commands/setNodeAttributes.ts b/packages/core/src/commands/setNodeAttributes.ts
new file mode 100644
index 000000000..37b6fc5df
--- /dev/null
+++ b/packages/core/src/commands/setNodeAttributes.ts
@@ -0,0 +1,14 @@
+import { Command } from '../Editor'
+
+export default (attributes: {}): Command => ({ tr, state, dispatch }) => {
+  const { selection } = tr
+  const { from, to } = selection
+
+  state.doc.nodesBetween(from, to, (node, pos) => {
+    if (!node.type.isText && dispatch) {
+      tr.setNodeMarkup(pos, undefined, attributes)
+    }
+  })
+
+  return true
+}
diff --git a/packages/core/src/commands/sinkListItem.ts b/packages/core/src/commands/sinkListItem.ts
new file mode 100644
index 000000000..bdda43a3a
--- /dev/null
+++ b/packages/core/src/commands/sinkListItem.ts
@@ -0,0 +1,10 @@
+import { sinkListItem as originalSinkListItem } from 'prosemirror-schema-list'
+import { NodeType } from 'prosemirror-model'
+import { Command } from '../Editor'
+import getNodeType from '../utils/getNodeType'
+
+export default (typeOrName: string | NodeType): Command => ({ state, dispatch }) => {
+  const type = getNodeType(typeOrName, state.schema)
+
+  return originalSinkListItem(type)(state, dispatch)
+}
diff --git a/packages/core/src/commands/splitBlock.ts b/packages/core/src/commands/splitBlock.ts
new file mode 100644
index 000000000..461b86936
--- /dev/null
+++ b/packages/core/src/commands/splitBlock.ts
@@ -0,0 +1,117 @@
+import { canSplit } from 'prosemirror-transform'
+import { ContentMatch, Fragment } from 'prosemirror-model'
+import { EditorState, NodeSelection, TextSelection } from 'prosemirror-state'
+import { Command } from '../Editor'
+
+function defaultBlockAt(match: ContentMatch) {
+  for (let i = 0; i < match.edgeCount; i + 1) {
+    const { type } = match.edge(i)
+    // @ts-ignore
+    if (type.isTextblock && !type.hasRequiredAttrs()) return type
+  }
+  return null
+}
+
+export interface SplitBlockOptions {
+  withAttributes: boolean,
+  withMarks: boolean,
+}
+
+function keepMarks(state: EditorState) {
+  const marks = state.storedMarks
+    || (state.selection.$to.parentOffset && state.selection.$from.marks())
+
+  if (marks) {
+    state.tr.ensureMarks(marks)
+  }
+}
+
+export default (options: Partial<SplitBlockOptions> = {}): Command => ({ tr, state, dispatch }) => {
+  const defaultOptions: SplitBlockOptions = {
+    withAttributes: false,
+    withMarks: true,
+  }
+  const config = { ...defaultOptions, ...options }
+  const { selection, doc } = tr
+  const { $from, $to } = selection
+
+  if (selection instanceof NodeSelection && selection.node.isBlock) {
+    if (!$from.parentOffset || !canSplit(doc, $from.pos)) {
+      return false
+    }
+
+    if (dispatch) {
+      if (config.withMarks) {
+        keepMarks(state)
+      }
+
+      tr.split($from.pos).scrollIntoView()
+    }
+
+    return true
+  }
+
+  if (!$from.parent.isBlock) {
+    return false
+  }
+
+  if (dispatch) {
+    const atEnd = $to.parentOffset === $to.parent.content.size
+
+    if (selection instanceof TextSelection) {
+      tr.deleteSelection()
+    }
+
+    const deflt = $from.depth === 0
+      ? undefined
+      : defaultBlockAt($from.node(-1).contentMatchAt($from.indexAfter(-1)))
+
+    let types = atEnd && deflt
+      ? [{
+        type: deflt,
+        attrs: config.withAttributes
+          ? $from.node().attrs
+          : {},
+      }]
+      : undefined
+
+    let can = canSplit(tr.doc, tr.mapping.map($from.pos), 1, types)
+
+    if (
+      !types
+      && !can
+      && canSplit(tr.doc, tr.mapping.map($from.pos), 1, deflt ? [{ type: deflt }] : undefined)
+    ) {
+      can = true
+      types = deflt
+        ? [{
+          type: deflt,
+          attrs: config.withAttributes
+            ? $from.node().attrs
+            : {},
+        }]
+        : undefined
+    }
+
+    if (can) {
+      tr.split(tr.mapping.map($from.pos), 1, types)
+
+      if (
+        !atEnd
+        && !$from.parentOffset
+        && $from.parent.type !== deflt
+        && $from.node(-1).canReplace($from.index(-1), $from.indexAfter(-1), Fragment.from(deflt?.create()))
+      ) {
+        tr.setNodeMarkup(tr.mapping.map($from.before()), deflt || undefined)
+      }
+    }
+
+    if (config.withMarks) {
+      keepMarks(state)
+    }
+
+    tr.scrollIntoView()
+  }
+
+  return true
+}
diff --git a/packages/core/src/commands/splitListItem.ts b/packages/core/src/commands/splitListItem.ts
new file mode 100644
index 000000000..3d3cf5d7a
--- /dev/null
+++ b/packages/core/src/commands/splitListItem.ts
@@ -0,0 +1,10 @@
+import { splitListItem } from 'prosemirror-schema-list'
+import { NodeType } from 'prosemirror-model'
+import { Command } from '../Editor'
+import getNodeType from '../utils/getNodeType'
+
+export default (typeOrName: string | NodeType): Command => ({ state, dispatch }) => {
+  const type = getNodeType(typeOrName, state.schema)
+
+  return splitListItem(type)(state, dispatch)
+}
diff --git a/packages/core/src/commands/toggleBlockType.ts b/packages/core/src/commands/toggleBlockType.ts
new file mode 100644
index 000000000..2efa27bd7
--- /dev/null
+++ b/packages/core/src/commands/toggleBlockType.ts
@@ -0,0 +1,16 @@
+import { NodeType } from 'prosemirror-model'
+import { Command } from '../Editor'
+import nodeIsActive from '../utils/nodeIsActive'
+import getNodeType from '../utils/getNodeType'
+
+export default (typeOrName: string | NodeType, toggleTypeOrName: string | NodeType, attrs = {}): Command => ({ state, commands }) => {
+  const type = getNodeType(typeOrName, state.schema)
+  const toggleType = getNodeType(toggleTypeOrName, state.schema)
+  const isActive = nodeIsActive(state, type, attrs)
+
+  if (isActive) {
+    return commands.setBlockType(toggleType)
+  }
+
+  return commands.setBlockType(type, attrs)
+}
diff --git a/packages/core/src/commands/toggleList.ts b/packages/core/src/commands/toggleList.ts
new file mode 100644
index 000000000..3fc4d846a
--- /dev/null
+++ b/packages/core/src/commands/toggleList.ts
@@ -0,0 +1,52 @@
+import { findParentNode } from 'prosemirror-utils'
+import { NodeType } from 'prosemirror-model'
+import { Command } from '../Editor'
+import getNodeType from '../utils/getNodeType'
+import isList from '../utils/isList'
+
+export default (listTypeOrName: string | NodeType, itemTypeOrName: string | NodeType): Command => ({
+  editor, tr, state, dispatch, chain, commands, can,
+}) => {
+  const { extensions } = editor.options
+  const listType = getNodeType(listTypeOrName, state.schema)
+  const itemType = getNodeType(itemTypeOrName, state.schema)
+  const { selection } = state
+  const { $from, $to } = selection
+  const range = $from.blockRange($to)
+
+  if (!range) {
+    return false
+  }
+
+  const parentList = findParentNode(node => isList(node.type.name, extensions))(selection)
+
+  if (range.depth >= 1 && parentList && range.depth - parentList.depth <= 1) {
+    // remove list
+    if (parentList.node.type === listType) {
+      return commands.liftListItem(itemType)
+    }
+
+    // change list type
+    if (
+      isList(parentList.node.type.name, extensions)
+      && listType.validContent(parentList.node.content)
+      && dispatch
+    ) {
+      tr.setNodeMarkup(parentList.pos, listType)
+
+      return true
+    }
+  }
+
+  const canWrapInList = can().wrapInList(listType)
+
+  // try to convert node to paragraph if needed
+  if (!canWrapInList) {
+    return chain()
+      .clearNodes()
+      .wrapInList(listType)
+      .run()
+  }
+
+  return commands.wrapInList(listType)
+}
diff --git a/packages/core/src/commands/toggleMark.ts b/packages/core/src/commands/toggleMark.ts
new file mode 100644
index 000000000..19e125b8b
--- /dev/null
+++ b/packages/core/src/commands/toggleMark.ts
@@ -0,0 +1,10 @@
+import { toggleMark as originalToggleMark } from 'prosemirror-commands'
+import { MarkType } from 'prosemirror-model'
+import { Command } from '../Editor'
+import getMarkType from '../utils/getMarkType'
+
+export default (typeOrName: string | MarkType): Command => ({ state, dispatch }) => {
+  const type = getMarkType(typeOrName, state.schema)
+
+  return originalToggleMark(type)(state, dispatch)
+}
diff --git a/packages/core/src/commands/toggleWrap.ts b/packages/core/src/commands/toggleWrap.ts
new file mode 100644
index 000000000..83757b7fa
--- /dev/null
+++ b/packages/core/src/commands/toggleWrap.ts
@@ -0,0 +1,16 @@
+import { wrapIn, lift } from 'prosemirror-commands'
+import { NodeType } from 'prosemirror-model'
+import { Command } from '../Editor'
+import nodeIsActive from '../utils/nodeIsActive'
+import getNodeType from '../utils/getNodeType'
+
+export default (typeOrName: string | NodeType, attrs = {}): Command => ({ state, dispatch }) => {
+  const type = getNodeType(typeOrName, state.schema)
+  const isActive = nodeIsActive(state, type, attrs)
+
+  if (isActive) {
+    return lift(state, dispatch)
+  }
+
+  return wrapIn(type, attrs)(state, dispatch)
+}
diff --git a/packages/core/src/commands/try.ts b/packages/core/src/commands/try.ts
new file mode 100644
index 000000000..b81f3bd16
--- /dev/null
+++ b/packages/core/src/commands/try.ts
@@ -0,0 +1,15 @@
+import { Command } from '../Editor'
+
+export default (commands: Command[] | ((props: Parameters<Command>[0]) => Command[])): Command => props => {
+  const items = typeof commands === 'function'
+    ? commands(props)
+    : commands
+
+  for (let i = 0; i < items.length; i += 1) {
+    if (items[i](props)) {
+      return true
+    }
+  }
+
+  return false
+}
diff --git a/packages/core/src/commands/updateMark.ts b/packages/core/src/commands/updateMark.ts
new file mode 100644
index 000000000..a4cb3e926
--- /dev/null
+++ b/packages/core/src/commands/updateMark.ts
@@ -0,0 +1,32 @@
+import { MarkType } from 'prosemirror-model'
+import { Command } from '../Editor'
+import getMarkType from '../utils/getMarkType'
+import getMarkRange from '../utils/getMarkRange'
+
+export default (typeOrName: string | MarkType, attrs: {}): Command => ({ tr, state, dispatch }) => {
+  const { selection, doc } = tr
+  let { from, to } = selection
+  const { $from, empty } = selection
+  const type = getMarkType(typeOrName, state.schema)
+
+  if (empty) {
+    const range = getMarkRange($from, type)
+
+    if (range) {
+      from = range.from
+      to = range.to
+    }
+  }
+
+  const hasMark = doc.rangeHasMark(from, to, type)
+
+  if (hasMark && dispatch) {
+    tr.removeMark(from, to, type)
+  }
+
+  if (dispatch) {
+    tr.addMark(from, to, type.create(attrs))
+  }
+
+  return true
+}
diff --git a/packages/core/src/commands/wrapInList.ts b/packages/core/src/commands/wrapInList.ts
new file mode 100644
index 000000000..29a4ae8a3
--- /dev/null
+++ b/packages/core/src/commands/wrapInList.ts
@@ -0,0 +1,10 @@
+import { wrapInList } from 'prosemirror-schema-list'
+import { NodeType } from 'prosemirror-model'
+import { Command } from '../Editor'
+import getNodeType from '../utils/getNodeType'
+
+export default (typeOrName: string | NodeType, attrs?: {}): Command => ({ state, dispatch }) => {
+  const type = getNodeType(typeOrName, state.schema)
+
+  return wrapInList(type, attrs)(state, dispatch)
+}
diff --git a/packages/core/src/extensions/blur.ts b/packages/core/src/extensions/blur.ts
deleted file mode 100644
index 14dd93e08..000000000
--- a/packages/core/src/extensions/blur.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-export const Blur = createExtension({
-  addCommands() {
-    return {
-      blur: (): Command => ({ view }) => {
-        const element = view.dom as HTMLElement
-
-        element.blur()
-
-        return true
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    Blur: typeof Blur,
-  }
-}
diff --git a/packages/core/src/extensions/clearContent.ts b/packages/core/src/extensions/clearContent.ts
deleted file mode 100644
index 2efc94635..000000000
--- a/packages/core/src/extensions/clearContent.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-export const ClearContent = createExtension({
-  addCommands() {
-    return {
-      clearContent: (emitUpdate: Boolean = false): Command => ({ commands }) => {
-        return commands.setContent('', emitUpdate)
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    ClearContent: typeof ClearContent,
-  }
-}
diff --git a/packages/core/src/extensions/clearNodes.ts b/packages/core/src/extensions/clearNodes.ts
deleted file mode 100644
index cb4ab1855..000000000
--- a/packages/core/src/extensions/clearNodes.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { liftTarget } from 'prosemirror-transform'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-export const ClearNodes = createExtension({
-  addCommands() {
-    return {
-      clearNodes: (): Command => ({ state, tr, dispatch }) => {
-        const { selection } = tr
-        const { from, to } = selection
-
-        state.doc.nodesBetween(from, to, (node, pos) => {
-          if (!node.type.isText) {
-            const fromPos = tr.doc.resolve(tr.mapping.map(pos + 1))
-            const toPos = tr.doc.resolve(tr.mapping.map(pos + node.nodeSize - 1))
-            const nodeRange = fromPos.blockRange(toPos)
-
-            if (nodeRange) {
-              const targetLiftDepth = liftTarget(nodeRange)
-
-              if (node.type.isTextblock && dispatch) {
-                tr.setNodeMarkup(nodeRange.start, state.schema.nodes.paragraph)
-              }
-
-              if ((targetLiftDepth || targetLiftDepth === 0) && dispatch) {
-                tr.lift(nodeRange, targetLiftDepth)
-              }
-            }
-          }
-        })
-
-        return true
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    ClearNodes: typeof ClearNodes,
-  }
-}
diff --git a/packages/core/src/extensions/commands.ts b/packages/core/src/extensions/commands.ts
new file mode 100644
index 000000000..094c62455
--- /dev/null
+++ b/packages/core/src/extensions/commands.ts
@@ -0,0 +1,68 @@
+import { createExtension } from '../Extension'
+import blur from '../commands/blur'
+import clearContent from '../commands/clearContent'
+import clearNodes from '../commands/clearNodes'
+import deleteSelection from '../commands/deleteSelection'
+import focus from '../commands/focus'
+import insertHTML from '../commands/insertHTML'
+import insertText from '../commands/insertText'
+import liftListItem from '../commands/liftListItem'
+import removeMark from '../commands/removeMark'
+import removeMarks from '../commands/removeMarks'
+import resetNodeAttributes from '../commands/resetNodeAttributes'
+import scrollIntoView from '../commands/scrollIntoView'
+import selectAll from '../commands/selectAll'
+import selectParentNode from '../commands/selectParentNode'
+import setBlockType from '../commands/setBlockType'
+import setContent from '../commands/setContent'
+import setNodeAttributes from '../commands/setNodeAttributes'
+import sinkListItem from '../commands/sinkListItem'
+import splitBlock from '../commands/splitBlock'
+import splitListItem from '../commands/splitListItem'
+import toggleBlockType from '../commands/toggleBlockType'
+import toggleList from '../commands/toggleList'
+import toggleMark from '../commands/toggleMark'
+import toggleWrap from '../commands/toggleWrap'
+import tryCommand from '../commands/try'
+import updateMark from '../commands/updateMark'
+import wrapInList from '../commands/wrapInList'
+
+export const Commands = createExtension({
+  addCommands() {
+    return {
+      blur,
+      clearContent,
+      clearNodes,
+      deleteSelection,
+      focus,
+      insertHTML,
+      insertText,
+      liftListItem,
+      removeMark,
+      removeMarks,
+      resetNodeAttributes,
+      scrollIntoView,
+      selectAll,
+      selectParentNode,
+      setBlockType,
+      setContent,
+      setNodeAttributes,
+      sinkListItem,
+      splitBlock,
+      splitListItem,
+      toggleBlockType,
+      toggleList,
+      toggleMark,
+      toggleWrap,
+      try: tryCommand,
+      updateMark,
+      wrapInList,
+    }
+  },
+})
+
+declare module '../Editor' {
+  interface AllExtensions {
+    Commands: typeof Commands,
+  }
+}
diff --git a/packages/core/src/extensions/deleteSelection.ts b/packages/core/src/extensions/deleteSelection.ts
deleted file mode 100644
index 8065c52bd..000000000
--- a/packages/core/src/extensions/deleteSelection.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { deleteSelection } from 'prosemirror-commands'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-export const DeleteSelection = createExtension({
-  addCommands() {
-    return {
-      deleteSelection: (): Command => ({ state, dispatch }) => {
-        return deleteSelection(state, dispatch)
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    DeleteSelection: typeof DeleteSelection,
-  }
-}
diff --git a/packages/core/src/extensions/focus.ts b/packages/core/src/extensions/focus.ts
deleted file mode 100644
index ffbcdbee5..000000000
--- a/packages/core/src/extensions/focus.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { TextSelection } from 'prosemirror-state'
-import { Editor, Command } from '../Editor'
-import { createExtension } from '../Extension'
-import minMax from '../utils/minMax'
-
-type Position = 'start' | 'end' | number | boolean | null
-
-interface ResolvedSelection {
-  from: number,
-  to: number,
-}
-
-function resolveSelection(editor: Editor, position: Position = null): ResolvedSelection {
-  if (position === null) {
-    return editor.selection
-  }
-
-  if (position === 'start' || position === true) {
-    return {
-      from: 0,
-      to: 0,
-    }
-  }
-
-  if (position === 'end') {
-    const { size } = editor.state.doc.content
-
-    return {
-      from: size,
-      to: size - 1, // TODO: -1 only for nodes with content
-    }
-  }
-
-  return {
-    from: position as number,
-    to: position as number,
-  }
-}
-
-export const Focus = createExtension({
-  addCommands() {
-    return {
-      focus: (position: Position = null): Command => ({
-        editor, view, tr, dispatch,
-      }) => {
-        if ((view.hasFocus() && position === null) || position === false) {
-          return true
-        }
-
-        const { from, to } = resolveSelection(editor, position)
-        const { doc } = tr
-        const resolvedFrom = minMax(from, 0, doc.content.size)
-        const resolvedEnd = minMax(to, 0, doc.content.size)
-        const selection = TextSelection.create(doc, resolvedFrom, resolvedEnd)
-
-        if (dispatch) {
-          tr.setSelection(selection)
-          view.focus()
-        }
-
-        return true
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    Focus: typeof Focus,
-  }
-}
diff --git a/packages/core/src/extensions/index.ts b/packages/core/src/extensions/index.ts
index 5dfad4d30..e9c6a76d0 100644
--- a/packages/core/src/extensions/index.ts
+++ b/packages/core/src/extensions/index.ts
@@ -1,30 +1,4 @@
-export { Blur } from './blur'
-export { ClearContent } from './clearContent'
-export { ClearNodes } from './clearNodes'
-export { DeleteSelection } from './deleteSelection'
+export { Commands } from './commands'
 export { Editable } from './editable'
-export { Focus } from './focus'
 export { FocusEvents } from './focusEvents'
-export { InsertHTML } from './insertHTML'
-export { InsertText } from './insertText'
-export { BaseKeymap } from './baseKeymap'
-export { LiftListItem } from './liftListItem'
-export { RemoveMark } from './removeMark'
-export { RemoveMarks } from './removeMarks'
-export { ScrollIntoView } from './scrollIntoView'
-export { SelectAll } from './selectAll'
-export { SelectParentNode } from './selectParentNode'
-export { ResetNodeAttributes } from './resetNodeAttributes'
-export { SetNodeAttributes } from './setNodeAttributes'
-export { SetBlockType } from './setBlockType'
-export { SetContent } from './setContent'
-export { SinkListItem } from './sinkListItem'
-export { SplitBlock } from './splitBlock'
-export { SplitListItem } from './splitListItem'
-export { ToggleBlockType } from './toggleBlockType'
-export { ToggleList } from './toggleList'
-export { ToggleMark } from './toggleMark'
-export { ToggleWrap } from './toggleWrap'
-export { Try } from './try'
-export { UpdateMark } from './updateMark'
-export { WrapInList } from './wrapInList'
+export { Keymap } from './keymap'
diff --git a/packages/core/src/extensions/insertText.ts b/packages/core/src/extensions/insertText.ts
deleted file mode 100644
index a7302fe0a..000000000
--- a/packages/core/src/extensions/insertText.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-export const InsertText = createExtension({
-  addCommands() {
-    return {
-      insertText: (value: string): Command => ({ tr, dispatch }) => {
-        if (dispatch) {
-          tr.insertText(value)
-        }
-
-        return true
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    InsertText: typeof InsertText,
-  }
-}
diff --git a/packages/core/src/extensions/baseKeymap.ts b/packages/core/src/extensions/keymap.ts
similarity index 94%
rename from packages/core/src/extensions/baseKeymap.ts
rename to packages/core/src/extensions/keymap.ts
index fe8f93427..64739e237 100644
--- a/packages/core/src/extensions/baseKeymap.ts
+++ b/packages/core/src/extensions/keymap.ts
@@ -12,7 +12,7 @@ import {
 import { undoInputRule } from 'prosemirror-inputrules'
 import { createExtension } from '../Extension'
 
-export const BaseKeymap = createExtension({
+export const Keymap = createExtension({
   addKeyboardShortcuts() {
     const handleBackspace = () => this.editor.try(({ state, dispatch }) => [
       () => undoInputRule(state, dispatch),
@@ -47,6 +47,6 @@ export const BaseKeymap = createExtension({
 
 declare module '../Editor' {
   interface AllExtensions {
-    BaseKeymap: typeof BaseKeymap,
+    Keymap: typeof Keymap,
   }
 }
diff --git a/packages/core/src/extensions/liftListItem.ts b/packages/core/src/extensions/liftListItem.ts
deleted file mode 100644
index c7244dbaa..000000000
--- a/packages/core/src/extensions/liftListItem.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { liftListItem } from 'prosemirror-schema-list'
-import { NodeType } from 'prosemirror-model'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-import getNodeType from '../utils/getNodeType'
-
-export const LiftListItem = createExtension({
-  addCommands() {
-    return {
-      liftListItem: (typeOrName: string | NodeType): Command => ({ state, dispatch }) => {
-        const type = getNodeType(typeOrName, state.schema)
-
-        return liftListItem(type)(state, dispatch)
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    LiftListItem: typeof LiftListItem,
-  }
-}
diff --git a/packages/core/src/extensions/removeMark.ts b/packages/core/src/extensions/removeMark.ts
deleted file mode 100644
index 3bd0ccf3a..000000000
--- a/packages/core/src/extensions/removeMark.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { MarkType } from 'prosemirror-model'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-import getMarkType from '../utils/getMarkType'
-import getMarkRange from '../utils/getMarkRange'
-
-export const RemoveMark = createExtension({
-  addCommands() {
-    return {
-      removeMark: (typeOrName: string | MarkType): Command => ({ tr, state, dispatch }) => {
-        const { selection } = tr
-        const type = getMarkType(typeOrName, state.schema)
-        let { from, to } = selection
-        const { $from, empty } = selection
-
-        if (empty) {
-          const range = getMarkRange($from, type)
-
-          if (range) {
-            from = range.from
-            to = range.to
-          }
-        }
-
-        if (dispatch) {
-          tr.removeMark(from, to, type)
-        }
-
-        return true
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    RemoveMark: typeof RemoveMark,
-  }
-}
diff --git a/packages/core/src/extensions/removeMarks.ts b/packages/core/src/extensions/removeMarks.ts
deleted file mode 100644
index fcc5ed1b1..000000000
--- a/packages/core/src/extensions/removeMarks.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-export const RemoveMarks = createExtension({
-  addCommands() {
-    return {
-      removeMarks: (): Command => ({ tr, state, dispatch }) => {
-        const { selection } = tr
-        const { from, to, empty } = selection
-
-        if (empty) {
-          return true
-        }
-
-        if (dispatch) {
-          Object
-            .entries(state.schema.marks)
-            .forEach(([, mark]) => {
-              tr.removeMark(from, to, mark as any)
-            })
-        }
-
-        return true
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    RemoveMarks: typeof RemoveMarks,
-  }
-}
diff --git a/packages/core/src/extensions/resetNodeAttributes.ts b/packages/core/src/extensions/resetNodeAttributes.ts
deleted file mode 100644
index a9babeff7..000000000
--- a/packages/core/src/extensions/resetNodeAttributes.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-export const ResetNodeAttributes = createExtension({
-  addCommands() {
-    return {
-      resetNodeAttributes: (attributeNames: string[] = []): Command => ({ tr, state, dispatch }) => {
-        const { selection } = tr
-        const { from, to } = selection
-
-        state.doc.nodesBetween(from, to, (node, pos) => {
-          if (!node.type.isText) {
-            attributeNames.forEach(name => {
-              const attribute = node.type.spec.attrs?.[name]
-              const defaultValue = attribute?.default
-
-              if (attribute && defaultValue !== undefined && dispatch) {
-                tr.setNodeMarkup(pos, undefined, {
-                  [name]: defaultValue,
-                })
-              }
-            })
-          }
-        })
-
-        return true
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    ResetNodeAttributes: typeof ResetNodeAttributes,
-  }
-}
diff --git a/packages/core/src/extensions/scrollIntoView.ts b/packages/core/src/extensions/scrollIntoView.ts
deleted file mode 100644
index 30dc3d9e4..000000000
--- a/packages/core/src/extensions/scrollIntoView.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-export const ScrollIntoView = createExtension({
-  addCommands() {
-    return {
-      scrollIntoView: (): Command => ({ tr, dispatch }) => {
-        if (dispatch) {
-          tr.scrollIntoView()
-        }
-
-        return true
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    ScrollIntoView: typeof ScrollIntoView,
-  }
-}
diff --git a/packages/core/src/extensions/selectAll.ts b/packages/core/src/extensions/selectAll.ts
deleted file mode 100644
index 74b9198d1..000000000
--- a/packages/core/src/extensions/selectAll.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { selectAll } from 'prosemirror-commands'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-export const SelectAll = createExtension({
-  addCommands() {
-    return {
-      selectAll: (): Command => ({ state, dispatch }) => {
-        return selectAll(state, dispatch)
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    SelectAll: typeof SelectAll,
-  }
-}
diff --git a/packages/core/src/extensions/selectParentNode.ts b/packages/core/src/extensions/selectParentNode.ts
deleted file mode 100644
index 79c6c06d2..000000000
--- a/packages/core/src/extensions/selectParentNode.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { selectParentNode } from 'prosemirror-commands'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-export const SelectParentNode = createExtension({
-  addCommands() {
-    return {
-      selectParentNode: (): Command => ({ state, dispatch }) => {
-        return selectParentNode(state, dispatch)
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    SelectParentNode: typeof SelectParentNode,
-  }
-}
diff --git a/packages/core/src/extensions/setBlockType.ts b/packages/core/src/extensions/setBlockType.ts
deleted file mode 100644
index aa7244eef..000000000
--- a/packages/core/src/extensions/setBlockType.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { NodeType } from 'prosemirror-model'
-import { setBlockType } from 'prosemirror-commands'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-import getNodeType from '../utils/getNodeType'
-
-export const SetBlockType = createExtension({
-  addCommands() {
-    return {
-      setBlockType: (typeOrName: string | NodeType, attrs = {}): Command => ({ state, dispatch }) => {
-        const type = getNodeType(typeOrName, state.schema)
-
-        return setBlockType(type, attrs)(state, dispatch)
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    SetBlockType: typeof SetBlockType,
-  }
-}
diff --git a/packages/core/src/extensions/setContent.ts b/packages/core/src/extensions/setContent.ts
deleted file mode 100644
index a9069f1e9..000000000
--- a/packages/core/src/extensions/setContent.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { TextSelection } from 'prosemirror-state'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-export const SetContent = createExtension({
-  addCommands() {
-    return {
-      setContent: (content: string, emitUpdate: Boolean = false, parseOptions = {}): Command => ({ tr, editor, dispatch }) => {
-        const { createDocument } = editor
-        const { doc } = tr
-        const document = createDocument(content, parseOptions)
-        const selection = TextSelection.create(doc, 0, doc.content.size)
-
-        if (dispatch) {
-          tr.setSelection(selection)
-            .replaceSelectionWith(document, false)
-            .setMeta('preventUpdate', !emitUpdate)
-        }
-
-        return true
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    SetContent: typeof SetContent,
-  }
-}
diff --git a/packages/core/src/extensions/setNodeAttributes.ts b/packages/core/src/extensions/setNodeAttributes.ts
deleted file mode 100644
index 9333a5545..000000000
--- a/packages/core/src/extensions/setNodeAttributes.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-export const SetNodeAttributes = createExtension({
-  addCommands() {
-    return {
-      setNodeAttributes: (attributes: {}): Command => ({ tr, state, dispatch }) => {
-        const { selection } = tr
-        const { from, to } = selection
-
-        state.doc.nodesBetween(from, to, (node, pos) => {
-          if (!node.type.isText && dispatch) {
-            tr.setNodeMarkup(pos, undefined, attributes)
-          }
-        })
-
-        return true
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    SetNodeAttributes: typeof SetNodeAttributes,
-  }
-}
diff --git a/packages/core/src/extensions/sinkListItem.ts b/packages/core/src/extensions/sinkListItem.ts
deleted file mode 100644
index e6832a086..000000000
--- a/packages/core/src/extensions/sinkListItem.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { sinkListItem as originalSinkListItem } from 'prosemirror-schema-list'
-import { NodeType } from 'prosemirror-model'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-import getNodeType from '../utils/getNodeType'
-
-export const SinkListItem = createExtension({
-  addCommands() {
-    return {
-      sinkListItem: (typeOrName: string | NodeType): Command => ({ state, dispatch }) => {
-        const type = getNodeType(typeOrName, state.schema)
-
-        return originalSinkListItem(type)(state, dispatch)
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    SinkListItem: typeof SinkListItem,
-  }
-}
diff --git a/packages/core/src/extensions/splitBlock.ts b/packages/core/src/extensions/splitBlock.ts
deleted file mode 100644
index ae1f8c5da..000000000
--- a/packages/core/src/extensions/splitBlock.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { canSplit } from 'prosemirror-transform'
-import { ContentMatch, Fragment } from 'prosemirror-model'
-import { EditorState, NodeSelection, TextSelection } from 'prosemirror-state'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-function defaultBlockAt(match: ContentMatch) {
-  for (let i = 0; i < match.edgeCount; i + 1) {
-    const { type } = match.edge(i)
-    // @ts-ignore
-    if (type.isTextblock && !type.hasRequiredAttrs()) return type
-  }
-  return null
-}
-
-interface SplitBlockOptions {
-  withAttributes: boolean,
-  withMarks: boolean,
-}
-
-function keepMarks(state: EditorState) {
-  const marks = state.storedMarks
-    || (state.selection.$to.parentOffset && state.selection.$from.marks())
-
-  if (marks) {
-    state.tr.ensureMarks(marks)
-  }
-}
-
-export const SplitBlock = createExtension({
-  addCommands() {
-    return {
-      splitBlock: (options: Partial<SplitBlockOptions> = {}): Command => ({ tr, state, dispatch }) => {
-        const defaultOptions: SplitBlockOptions = {
-          withAttributes: false,
-          withMarks: true,
-        }
-        const config = { ...defaultOptions, ...options }
-        const { selection, doc } = tr
-        const { $from, $to } = selection
-
-        if (selection instanceof NodeSelection && selection.node.isBlock) {
-          if (!$from.parentOffset || !canSplit(doc, $from.pos)) {
-            return false
-          }
-
-          if (dispatch) {
-            if (config.withMarks) {
-              keepMarks(state)
-            }
-
-            tr.split($from.pos).scrollIntoView()
-          }
-
-          return true
-        }
-
-        if (!$from.parent.isBlock) {
-          return false
-        }
-
-        if (dispatch) {
-          const atEnd = $to.parentOffset === $to.parent.content.size
-
-          if (selection instanceof TextSelection) {
-            tr.deleteSelection()
-          }
-
-          const deflt = $from.depth === 0
-            ? undefined
-            : defaultBlockAt($from.node(-1).contentMatchAt($from.indexAfter(-1)))
-
-          let types = atEnd && deflt
-            ? [{
-              type: deflt,
-              attrs: config.withAttributes
-                ? $from.node().attrs
-                : {},
-            }]
-            : undefined
-
-          let can = canSplit(tr.doc, tr.mapping.map($from.pos), 1, types)
-
-          if (
-            !types
-            && !can
-            && canSplit(tr.doc, tr.mapping.map($from.pos), 1, deflt ? [{ type: deflt }] : undefined)
-          ) {
-            can = true
-            types = deflt
-              ? [{
-                type: deflt,
-                attrs: config.withAttributes
-                  ? $from.node().attrs
-                  : {},
-              }]
-              : undefined
-          }
-
-          if (can) {
-            tr.split(tr.mapping.map($from.pos), 1, types)
-
-            if (
-              !atEnd
-              && !$from.parentOffset
-              && $from.parent.type !== deflt
-              && $from.node(-1).canReplace($from.index(-1), $from.indexAfter(-1), Fragment.from(deflt?.create()))
-            ) {
-              tr.setNodeMarkup(tr.mapping.map($from.before()), deflt || undefined)
-            }
-          }
-
-          if (config.withMarks) {
-            keepMarks(state)
-          }
-
-          tr.scrollIntoView()
-        }
-
-        return true
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    SplitBlock: typeof SplitBlock,
-  }
-}
diff --git a/packages/core/src/extensions/splitListItem.ts b/packages/core/src/extensions/splitListItem.ts
deleted file mode 100644
index 9b84df0e9..000000000
--- a/packages/core/src/extensions/splitListItem.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { splitListItem } from 'prosemirror-schema-list'
-import { NodeType } from 'prosemirror-model'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-import getNodeType from '../utils/getNodeType'
-
-export const SplitListItem = createExtension({
-  addCommands() {
-    return {
-      splitListItem: (typeOrName: string | NodeType): Command => ({ state, dispatch }) => {
-        const type = getNodeType(typeOrName, state.schema)
-
-        return splitListItem(type)(state, dispatch)
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    SplitListItem: typeof SplitListItem,
-  }
-}
diff --git a/packages/core/src/extensions/toggleBlockType.ts b/packages/core/src/extensions/toggleBlockType.ts
deleted file mode 100644
index f04838d51..000000000
--- a/packages/core/src/extensions/toggleBlockType.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { NodeType } from 'prosemirror-model'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-import nodeIsActive from '../utils/nodeIsActive'
-import getNodeType from '../utils/getNodeType'
-
-export const ToggleBlockType = createExtension({
-  addCommands() {
-    return {
-      toggleBlockType: (typeOrName: string | NodeType, toggleTypeOrName: string | NodeType, attrs = {}): Command => ({ state, commands }) => {
-        const type = getNodeType(typeOrName, state.schema)
-        const toggleType = getNodeType(toggleTypeOrName, state.schema)
-        const isActive = nodeIsActive(state, type, attrs)
-
-        if (isActive) {
-          return commands.setBlockType(toggleType)
-        }
-
-        return commands.setBlockType(type, attrs)
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    ToggleBlockType: typeof ToggleBlockType,
-  }
-}
diff --git a/packages/core/src/extensions/toggleList.ts b/packages/core/src/extensions/toggleList.ts
deleted file mode 100644
index fe8bcc2bb..000000000
--- a/packages/core/src/extensions/toggleList.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { findParentNode } from 'prosemirror-utils'
-import { NodeType } from 'prosemirror-model'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-import getNodeType from '../utils/getNodeType'
-import isList from '../utils/isList'
-
-export const ToggleList = createExtension({
-  addCommands() {
-    return {
-      toggleList: (listTypeOrName: string | NodeType, itemTypeOrName: string | NodeType): Command => ({
-        tr, state, dispatch, chain, commands, can,
-      }) => {
-        const { extensions } = this.editor.options
-        const listType = getNodeType(listTypeOrName, state.schema)
-        const itemType = getNodeType(itemTypeOrName, state.schema)
-        const { selection } = state
-        const { $from, $to } = selection
-        const range = $from.blockRange($to)
-
-        if (!range) {
-          return false
-        }
-
-        const parentList = findParentNode(node => isList(node.type.name, extensions))(selection)
-
-        if (range.depth >= 1 && parentList && range.depth - parentList.depth <= 1) {
-          // remove list
-          if (parentList.node.type === listType) {
-            return commands.liftListItem(itemType)
-          }
-
-          // change list type
-          if (
-            isList(parentList.node.type.name, extensions)
-            && listType.validContent(parentList.node.content)
-            && dispatch
-          ) {
-            tr.setNodeMarkup(parentList.pos, listType)
-
-            return true
-          }
-        }
-
-        const canWrapInList = can().wrapInList(listType)
-
-        // try to convert node to paragraph if needed
-        if (!canWrapInList) {
-          return chain()
-            .clearNodes()
-            .wrapInList(listType)
-            .run()
-        }
-
-        return commands.wrapInList(listType)
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    ToggleList: typeof ToggleList,
-  }
-}
diff --git a/packages/core/src/extensions/toggleMark.ts b/packages/core/src/extensions/toggleMark.ts
deleted file mode 100644
index e3de9adbb..000000000
--- a/packages/core/src/extensions/toggleMark.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { toggleMark as originalToggleMark } from 'prosemirror-commands'
-import { MarkType } from 'prosemirror-model'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-import getMarkType from '../utils/getMarkType'
-
-export const ToggleMark = createExtension({
-  addCommands() {
-    return {
-      toggleMark: (typeOrName: string | MarkType): Command => ({ state, dispatch }) => {
-        const type = getMarkType(typeOrName, state.schema)
-
-        return originalToggleMark(type)(state, dispatch)
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    ToggleMark: typeof ToggleMark,
-  }
-}
diff --git a/packages/core/src/extensions/toggleWrap.ts b/packages/core/src/extensions/toggleWrap.ts
deleted file mode 100644
index 1ba1558d8..000000000
--- a/packages/core/src/extensions/toggleWrap.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { wrapIn, lift } from 'prosemirror-commands'
-import { NodeType } from 'prosemirror-model'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-import nodeIsActive from '../utils/nodeIsActive'
-import getNodeType from '../utils/getNodeType'
-
-export const ToggleWrap = createExtension({
-  addCommands() {
-    return {
-      toggleWrap: (typeOrName: string | NodeType, attrs = {}): Command => ({ state, dispatch }) => {
-        const type = getNodeType(typeOrName, state.schema)
-        const isActive = nodeIsActive(state, type, attrs)
-
-        if (isActive) {
-          return lift(state, dispatch)
-        }
-
-        return wrapIn(type, attrs)(state, dispatch)
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    ToggleWrap: typeof ToggleWrap,
-  }
-}
diff --git a/packages/core/src/extensions/try.ts b/packages/core/src/extensions/try.ts
deleted file mode 100644
index 805e56d38..000000000
--- a/packages/core/src/extensions/try.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-
-export const Try = createExtension({
-  addCommands() {
-    return {
-      try: (commands: Command[] | ((props: Parameters<Command>[0]) => Command[])): Command => props => {
-        const items = typeof commands === 'function'
-          ? commands(props)
-          : commands
-
-        for (let i = 0; i < items.length; i += 1) {
-          if (items[i](props)) {
-            return true
-          }
-        }
-
-        return false
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    Try: typeof Try,
-  }
-}
diff --git a/packages/core/src/extensions/updateMark.ts b/packages/core/src/extensions/updateMark.ts
deleted file mode 100644
index 5c7885c03..000000000
--- a/packages/core/src/extensions/updateMark.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { MarkType } from 'prosemirror-model'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-import getMarkType from '../utils/getMarkType'
-import getMarkRange from '../utils/getMarkRange'
-
-export const UpdateMark = createExtension({
-  addCommands() {
-    return {
-      updateMark: (typeOrName: string | MarkType, attrs: {}): Command => ({ tr, state, dispatch }) => {
-        const { selection, doc } = tr
-        let { from, to } = selection
-        const { $from, empty } = selection
-        const type = getMarkType(typeOrName, state.schema)
-
-        if (empty) {
-          const range = getMarkRange($from, type)
-
-          if (range) {
-            from = range.from
-            to = range.to
-          }
-        }
-
-        const hasMark = doc.rangeHasMark(from, to, type)
-
-        if (hasMark && dispatch) {
-          tr.removeMark(from, to, type)
-        }
-
-        if (dispatch) {
-          tr.addMark(from, to, type.create(attrs))
-        }
-
-        return true
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    UpdateMark: typeof UpdateMark,
-  }
-}
diff --git a/packages/core/src/extensions/wrapInList.ts b/packages/core/src/extensions/wrapInList.ts
deleted file mode 100644
index 6cd8efbf8..000000000
--- a/packages/core/src/extensions/wrapInList.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { wrapInList } from 'prosemirror-schema-list'
-import { NodeType } from 'prosemirror-model'
-import { Command } from '../Editor'
-import { createExtension } from '../Extension'
-import getNodeType from '../utils/getNodeType'
-
-export const WrapInList = createExtension({
-  addCommands() {
-    return {
-      wrapInList: (typeOrName: string | NodeType, attrs?: {}): Command => ({ state, dispatch }) => {
-        const type = getNodeType(typeOrName, state.schema)
-
-        return wrapInList(type, attrs)(state, dispatch)
-      },
-    }
-  },
-})
-
-declare module '../Editor' {
-  interface AllExtensions {
-    WrapInList: typeof WrapInList,
-  }
-}
diff --git a/packages/core/src/inputRules/markInputRule.ts b/packages/core/src/inputRules/markInputRule.ts
index 5358ff9b1..376813fe1 100644
--- a/packages/core/src/inputRules/markInputRule.ts
+++ b/packages/core/src/inputRules/markInputRule.ts
@@ -16,9 +16,11 @@ function getMarksBetween(start: number, end: number, state: EditorState) {
   return marks
 }
 
-export default function (regexp: RegExp, markType: MarkType, getAttrs?: Function) {
+export default function (regexp: RegExp, markType: MarkType, getAttributes?: Function) {
   return new InputRule(regexp, (state, match, start, end) => {
-    const attributes = getAttrs instanceof Function ? getAttrs(match) : getAttrs
+    const attributes = getAttributes instanceof Function
+      ? getAttributes(match)
+      : getAttributes
     const { tr } = state
     const captureGroup = match[match.length - 1]
     const fullMatch = match[0]
diff --git a/packages/core/src/inputRules/nodeInputRule.ts b/packages/core/src/inputRules/nodeInputRule.ts
index c014d1988..b6b3158fe 100644
--- a/packages/core/src/inputRules/nodeInputRule.ts
+++ b/packages/core/src/inputRules/nodeInputRule.ts
@@ -1,13 +1,15 @@
 import { InputRule } from 'prosemirror-inputrules'
 import { NodeType } from 'prosemirror-model'
 
-export default function (regexp: RegExp, type: NodeType, getAttrs?: (match: any) => any): InputRule {
+export default function (regexp: RegExp, type: NodeType, getAttributes?: (match: any) => any): InputRule {
   return new InputRule(regexp, (state, match, start, end) => {
-    const attrs = getAttrs instanceof Function ? getAttrs(match) : getAttrs
+    const attributes = getAttributes instanceof Function
+      ? getAttributes(match)
+      : getAttributes
     const { tr } = state
 
     if (match[0]) {
-      tr.replaceWith(start - 1, end, type.create(attrs))
+      tr.replaceWith(start - 1, end, type.create(attributes))
     }
 
     return tr
diff --git a/yarn.lock b/yarn.lock
index 0388b1988..3e2c914f1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,10 +9,10 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/compat-data@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.1.tgz#d7386a689aa0ddf06255005b4b991988021101a0"
-  integrity sha512-725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ==
+"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.5.tgz#f56db0c4bb1bbbf221b4e81345aab4141e7cb0e9"
+  integrity sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==
 
 "@babel/core@^7.0.0", "@babel/core@^7.10.2", "@babel/core@^7.11.0", "@babel/core@^7.11.6":
   version "7.12.3"
@@ -36,12 +36,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.1.tgz#0d70be32bdaa03d7c51c8597dda76e0df1f15468"
-  integrity sha512-DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg==
+"@babel/generator@^7.12.1", "@babel/generator@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
+  integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
   dependencies:
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.12.5"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
@@ -78,13 +78,13 @@
     "@babel/types" "^7.10.4"
 
 "@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.9.6":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz#310e352888fbdbdd8577be8dfdd2afb9e7adcf50"
-  integrity sha512-jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g==
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
+  integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
   dependencies:
-    "@babel/compat-data" "^7.12.1"
+    "@babel/compat-data" "^7.12.5"
     "@babel/helper-validator-option" "^7.12.1"
-    browserslist "^4.12.0"
+    browserslist "^4.14.5"
     semver "^5.5.0"
 
 "@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.7.4":
@@ -154,11 +154,11 @@
     "@babel/types" "^7.12.1"
 
 "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.8.3":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz#1644c01591a15a2f084dd6d092d9430eb1d1216c"
-  integrity sha512-ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA==
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
+  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
   dependencies:
-    "@babel/types" "^7.12.1"
+    "@babel/types" "^7.12.5"
 
 "@babel/helper-module-transforms@^7.12.1":
   version "7.12.1"
@@ -204,14 +204,14 @@
     "@babel/types" "^7.12.1"
 
 "@babel/helper-replace-supers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz#f15c9cc897439281891e11d5ce12562ac0cf3fa9"
-  integrity sha512-zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz#f009a17543bbbbce16b06206ae73b63d3fca68d9"
+  integrity sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==
   dependencies:
     "@babel/helper-member-expression-to-functions" "^7.12.1"
     "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
+    "@babel/traverse" "^7.12.5"
+    "@babel/types" "^7.12.5"
 
 "@babel/helper-simple-access@^7.12.1":
   version "7.12.1"
@@ -255,13 +255,13 @@
     "@babel/types" "^7.10.4"
 
 "@babel/helpers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.1.tgz#8a8261c1d438ec18cb890434df4ec768734c1e79"
-  integrity sha512-9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g==
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
+  integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
   dependencies:
     "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
+    "@babel/traverse" "^7.12.5"
+    "@babel/types" "^7.12.5"
 
 "@babel/highlight@^7.10.4":
   version "7.10.4"
@@ -272,10 +272,10 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.10.4", "@babel/parser@^7.12.0", "@babel/parser@^7.12.1", "@babel/parser@^7.12.3", "@babel/parser@^7.3.3":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.3.tgz#a305415ebe7a6c7023b40b5122a0662d928334cd"
-  integrity sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==
+"@babel/parser@^7.0.0", "@babel/parser@^7.10.4", "@babel/parser@^7.12.0", "@babel/parser@^7.12.3", "@babel/parser@^7.12.5", "@babel/parser@^7.3.3":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.5.tgz#b4af32ddd473c0bfa643bd7ff0728b8e71b81ea0"
+  integrity sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==
 
 "@babel/plugin-proposal-async-generator-functions@^7.12.1":
   version "7.12.1"
@@ -352,9 +352,9 @@
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
 
 "@babel/plugin-proposal-numeric-separator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz#0e2c6774c4ce48be412119b4d693ac777f7685a6"
-  integrity sha512-MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA==
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz#b1ce757156d40ed79d59d467cb2b154a5c4149ba"
+  integrity sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
@@ -712,10 +712,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx-development@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.1.tgz#0b8f8cd531dcf7991f1e5f2c10a2a4f1cfc78e36"
-  integrity sha512-IilcGWdN1yNgEGOrB96jbTplRh+V2Pz1EoEwsKsHfX1a/L40cUYuD71Zepa7C+ujv7kJIxnDftWeZbKNEqZjCQ==
+"@babel/plugin-transform-react-jsx-development@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.5.tgz#677de5b96da310430d6cfb7fee16a1603afa3d56"
+  integrity sha512-1JJusg3iPgsZDthyWiCr3KQiGs31ikU/mSf2N2dSYEAO0GEImmVUbWf0VoSDGDFTAn5Dj4DUiR6SdIXHY7tELA==
   dependencies:
     "@babel/helper-builder-react-jsx-experimental" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
@@ -735,10 +735,10 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-transform-react-jsx@^7.10.1", "@babel/plugin-transform-react-jsx@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.1.tgz#c2d96c77c2b0e4362cc4e77a43ce7c2539d478cb"
-  integrity sha512-RmKejwnT0T0QzQUzcbP5p1VWlpnP8QHtdhEtLG55ZDQnJNalbF3eeDyu3dnGKvGzFIQiBzFhBYTwvv435p9Xpw==
+"@babel/plugin-transform-react-jsx@^7.10.1", "@babel/plugin-transform-react-jsx@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz#39ede0e30159770561b6963be143e40af3bde00c"
+  integrity sha512-2xkcPqqrYiOQgSlM/iwto1paPijjsDbUynN13tI6bosDz/jOW3CRzYguIE8wKX32h+msbBM22Dv5fwrFkUOZjQ==
   dependencies:
     "@babel/helper-builder-react-jsx" "^7.10.4"
     "@babel/helper-builder-react-jsx-experimental" "^7.12.1"
@@ -921,22 +921,22 @@
     esutils "^2.0.2"
 
 "@babel/preset-react@^7.10.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.1.tgz#7f022b13f55b6dd82f00f16d1c599ae62985358c"
-  integrity sha512-euCExymHCi0qB9u5fKw7rvlw7AZSjw/NaB9h7EkdTt5+yHRrXdiRTh7fkG3uBPpJg82CqLfp1LHLqWGSCrab+g==
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.5.tgz#d45625f65d53612078a43867c5c6750e78772c56"
+  integrity sha512-jcs++VPrgyFehkMezHtezS2BpnUlR7tQFAyesJn1vGTO9aTFZrgIQrA5YydlTwxbcjMwkFY6i04flCigRRr3GA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-transform-react-display-name" "^7.12.1"
-    "@babel/plugin-transform-react-jsx" "^7.12.1"
-    "@babel/plugin-transform-react-jsx-development" "^7.12.1"
+    "@babel/plugin-transform-react-jsx" "^7.12.5"
+    "@babel/plugin-transform-react-jsx-development" "^7.12.5"
     "@babel/plugin-transform-react-jsx-self" "^7.12.1"
     "@babel/plugin-transform-react-jsx-source" "^7.12.1"
     "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
 
 "@babel/runtime@^7.11.0", "@babel/runtime@^7.11.2", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.1.tgz#b4116a6b6711d010b2dad3b7b6e43bf1b9954740"
-  integrity sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA==
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
+  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
@@ -949,25 +949,25 @@
     "@babel/parser" "^7.10.4"
     "@babel/types" "^7.10.4"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.1.tgz#941395e0c5cc86d5d3e75caa095d3924526f0c1e"
-  integrity sha512-MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw==
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5":
+  version "7.12.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.5.tgz#78a0c68c8e8a35e4cacfd31db8bb303d5606f095"
+  integrity sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==
   dependencies:
     "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.1"
+    "@babel/generator" "^7.12.5"
     "@babel/helper-function-name" "^7.10.4"
     "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.12.1"
-    "@babel/types" "^7.12.1"
+    "@babel/parser" "^7.12.5"
+    "@babel/types" "^7.12.5"
     debug "^4.1.0"
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.0", "@babel/types@^7.12.1", "@babel/types@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.1.tgz#e109d9ab99a8de735be287ee3d6a9947a190c4ae"
-  integrity sha512-BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA==
+"@babel/types@^7.0.0", "@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.12.0", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.4.4":
+  version "7.12.6"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.6.tgz#ae0e55ef1cce1fbc881cd26f8234eb3e657edc96"
+  integrity sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==
   dependencies:
     "@babel/helper-validator-identifier" "^7.10.4"
     lodash "^4.17.19"
@@ -2411,60 +2411,60 @@
     "@types/vfile-message" "*"
 
 "@typescript-eslint/eslint-plugin@^4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.6.0.tgz#210cd538bb703f883aff81d3996961f5dba31fdb"
-  integrity sha512-1+419X+Ynijytr1iWI+/IcX/kJryc78YNpdaXR1aRO1sU3bC0vZrIAF1tIX7rudVI84W7o7M4zo5p1aVt70fAg==
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.6.1.tgz#99d77eb7a016fd5a5e749d2c44a7e4c317eb7da3"
+  integrity sha512-SNZyflefTMK2JyrPfFFzzoy2asLmZvZJ6+/L5cIqg4HfKGiW2Gr1Go1OyEVqne/U4QwmoasuMwppoBHWBWF2nA==
   dependencies:
-    "@typescript-eslint/experimental-utils" "4.6.0"
-    "@typescript-eslint/scope-manager" "4.6.0"
+    "@typescript-eslint/experimental-utils" "4.6.1"
+    "@typescript-eslint/scope-manager" "4.6.1"
     debug "^4.1.1"
     functional-red-black-tree "^1.0.1"
     regexpp "^3.0.0"
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/experimental-utils@4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.6.0.tgz#f750aef4dd8e5970b5c36084f0a5ca2f0db309a4"
-  integrity sha512-pnh6Beh2/4xjJVNL+keP49DFHk3orDHHFylSp3WEjtgW3y1U+6l+jNnJrGlbs6qhAz5z96aFmmbUyKhunXKvKw==
+"@typescript-eslint/experimental-utils@4.6.1":
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.6.1.tgz#a9c691dfd530a9570274fe68907c24c07a06c4aa"
+  integrity sha512-qyPqCFWlHZXkEBoV56UxHSoXW2qnTr4JrWVXOh3soBP3q0o7p4pUEMfInDwIa0dB/ypdtm7gLOS0hg0a73ijfg==
   dependencies:
     "@types/json-schema" "^7.0.3"
-    "@typescript-eslint/scope-manager" "4.6.0"
-    "@typescript-eslint/types" "4.6.0"
-    "@typescript-eslint/typescript-estree" "4.6.0"
+    "@typescript-eslint/scope-manager" "4.6.1"
+    "@typescript-eslint/types" "4.6.1"
+    "@typescript-eslint/typescript-estree" "4.6.1"
     eslint-scope "^5.0.0"
     eslint-utils "^2.0.0"
 
 "@typescript-eslint/parser@^4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.6.0.tgz#7e9ff7df2f21d5c8f65f17add3b99eeeec33199d"
-  integrity sha512-Dj6NJxBhbdbPSZ5DYsQqpR32MwujF772F2H3VojWU6iT4AqL4BKuoNWOPFCoSZvCcADDvQjDpa6OLDAaiZPz2Q==
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.6.1.tgz#b801bff67b536ecc4a840ac9289ba2be57e02428"
+  integrity sha512-lScKRPt1wM9UwyKkGKyQDqf0bh6jm8DQ5iN37urRIXDm16GEv+HGEmum2Fc423xlk5NUOkOpfTnKZc/tqKZkDQ==
   dependencies:
-    "@typescript-eslint/scope-manager" "4.6.0"
-    "@typescript-eslint/types" "4.6.0"
-    "@typescript-eslint/typescript-estree" "4.6.0"
+    "@typescript-eslint/scope-manager" "4.6.1"
+    "@typescript-eslint/types" "4.6.1"
+    "@typescript-eslint/typescript-estree" "4.6.1"
     debug "^4.1.1"
 
-"@typescript-eslint/scope-manager@4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.6.0.tgz#b7d8b57fe354047a72dfb31881d9643092838662"
-  integrity sha512-uZx5KvStXP/lwrMrfQQwDNvh2ppiXzz5TmyTVHb+5TfZ3sUP7U1onlz3pjoWrK9konRyFe1czyxObWTly27Ang==
+"@typescript-eslint/scope-manager@4.6.1":
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.6.1.tgz#21872b91cbf7adfc7083f17b8041149148baf992"
+  integrity sha512-f95+80r6VdINYscJY1KDUEDcxZ3prAWHulL4qRDfNVD0I5QAVSGqFkwHERDoLYJJWmEAkUMdQVvx7/c2Hp+Bjg==
   dependencies:
-    "@typescript-eslint/types" "4.6.0"
-    "@typescript-eslint/visitor-keys" "4.6.0"
+    "@typescript-eslint/types" "4.6.1"
+    "@typescript-eslint/visitor-keys" "4.6.1"
 
-"@typescript-eslint/types@4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.6.0.tgz#157ca925637fd53c193c6bf226a6c02b752dde2f"
-  integrity sha512-5FAgjqH68SfFG4UTtIFv+rqYJg0nLjfkjD0iv+5O27a0xEeNZ5rZNDvFGZDizlCD1Ifj7MAbSW2DPMrf0E9zjA==
+"@typescript-eslint/types@4.6.1":
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.6.1.tgz#d3ad7478f53f22e7339dc006ab61aac131231552"
+  integrity sha512-k2ZCHhJ96YZyPIsykickez+OMHkz06xppVLfJ+DY90i532/Cx2Z+HiRMH8YZQo7a4zVd/TwNBuRCdXlGK4yo8w==
 
-"@typescript-eslint/typescript-estree@4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.6.0.tgz#85bd98dcc8280511cfc5b2ce7b03a9ffa1732b08"
-  integrity sha512-s4Z9qubMrAo/tw0CbN0IN4AtfwuehGXVZM0CHNMdfYMGBDhPdwTEpBrecwhP7dRJu6d9tT9ECYNaWDHvlFSngA==
+"@typescript-eslint/typescript-estree@4.6.1":
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.6.1.tgz#6025cce724329413f57e4959b2d676fceeca246f"
+  integrity sha512-/J/kxiyjQQKqEr5kuKLNQ1Finpfb8gf/NpbwqFFYEBjxOsZ621r9AqwS9UDRA1Rrr/eneX/YsbPAIhU2rFLjXQ==
   dependencies:
-    "@typescript-eslint/types" "4.6.0"
-    "@typescript-eslint/visitor-keys" "4.6.0"
+    "@typescript-eslint/types" "4.6.1"
+    "@typescript-eslint/visitor-keys" "4.6.1"
     debug "^4.1.1"
     globby "^11.0.1"
     is-glob "^4.0.1"
@@ -2472,12 +2472,12 @@
     semver "^7.3.2"
     tsutils "^3.17.1"
 
-"@typescript-eslint/visitor-keys@4.6.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.6.0.tgz#fb05d6393891b0a089b243fc8f9fb8039383d5da"
-  integrity sha512-38Aa9Ztl0XyFPVzmutHXqDMCu15Xx8yKvUo38Gu3GhsuckCh3StPI5t2WIO9LHEsOH7MLmlGfKUisU8eW1Sjhg==
+"@typescript-eslint/visitor-keys@4.6.1":
+  version "4.6.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.6.1.tgz#6b125883402d8939df7b54528d879e88f7ba3614"
+  integrity sha512-owABze4toX7QXwOLT3/D5a8NecZEjEWU1srqxENTfqsY3bwVnl3YYbOh6s1rp2wQKO9RTHFGjKes08FgE7SVMw==
   dependencies:
-    "@typescript-eslint/types" "4.6.0"
+    "@typescript-eslint/types" "4.6.1"
     eslint-visitor-keys "^2.0.0"
 
 "@vue/babel-helper-vue-jsx-merge-props@^1.2.1":
@@ -3588,7 +3588,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.8.5:
+browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.8.5:
   version "4.14.6"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.6.tgz#97702a9c212e0c6b6afefad913d3a1538e348457"
   integrity sha512-zeFYcUo85ENhc/zxHbiIp0LGzzTrE2Pv2JhxvS7kpUb9Q9D38kUX6Bie7pGutJ/5iF5rOxE7CepAuWD56xJ33A==
@@ -5428,9 +5428,9 @@ ee-first@1.1.1:
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
 electron-to-chromium@^1.3.585:
-  version "1.3.585"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.585.tgz#71cdb722c73488b9475ad1c572cf43a763ef9081"
-  integrity sha512-xoeqjMQhgHDZM7FiglJAb2aeOxHZWFruUc3MbAGTgE7GB8rr5fTn1Sdh5THGuQtndU3GuXlu91ZKqRivxoCZ/A==
+  version "1.3.588"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.588.tgz#c6515571737bfb42678115a5eaa818384593a9a5"
+  integrity sha512-0zr+ZfytnLeJZxGgmEpPTcItu5Mm4A5zHPZXLfHcGp0mdsk95rmD7ePNewYtK1yIdLbk8Z1U2oTRRfOtR4gbYg==
 
 elegant-spinner@^1.0.1:
   version "1.0.1"
@@ -7897,9 +7897,9 @@ is-buffer@^1.1.5:
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-buffer@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
-  integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
+  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
 is-callable@^1.1.4, is-callable@^1.2.2:
   version "1.2.2"
@@ -7926,9 +7926,9 @@ is-color-stop@^1.0.0:
     rgba-regex "^1.0.0"
 
 is-core-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.0.0.tgz#58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d"
-  integrity sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
+  integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
   dependencies:
     has "^1.0.3"
 
@@ -9018,9 +9018,9 @@ markdown-escapes@^1.0.0:
   integrity sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==
 
 marked@^1.1.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.2.tgz#5d77ffb789c4cb0ae828bfe76250f7140b123f70"
-  integrity sha512-5jjKHVl/FPo0Z6ocP3zYhKiJLzkwJAw4CZoLjv57FkvbUuwOX4LIBBGGcXjAY6ATcd1q9B8UTj5T9Umauj0QYQ==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-1.2.3.tgz#58817ba348a7c9398cb94d40d12e0d08df83af57"
+  integrity sha512-RQuL2i6I6Gn+9n81IDNGbL0VHnta4a+8ZhqvryXEniTb/hQNtf3i26hi1XWUhzb9BgVyWHKR3UO8MaHtKoYibw==
 
 maxmin@^2.1.0:
   version "2.1.0"
@@ -13608,9 +13608,9 @@ trough@^1.0.0:
     glob "^7.1.2"
 
 ts-loader@^8.0.7:
-  version "8.0.7"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.7.tgz#9ce70db5b3906cc9143a09c54ff5247d102ea974"
-  integrity sha512-ooa4wxlZ9TOXaJ/iVyZlWsim79Ul4KyifSwyT2hOrbQA6NZJypsLOE198o8Ko+JV+ZHnMArvWcl4AnRqpCU/Mw==
+  version "8.0.9"
+  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-8.0.9.tgz#890fc25f49a99124268f4e738ed22d00f666dc37"
+  integrity sha512-rQd+iIfz5z4HSVzhhRFP4M2OQ0QmihilWWauYvvowBfnRvr4DW+gqA2om70xp/07EQj1qBkLMWobnXsgmWMbmg==
   dependencies:
     chalk "^2.3.0"
     enhanced-resolve "^4.0.0"
@@ -13750,9 +13750,9 @@ uglify-js@3.4.x:
     source-map "~0.6.1"
 
 uglify-js@^3.1.4:
-  version "3.11.4"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.4.tgz#b47b7ae99d4bd1dca65b53aaa69caa0909e6fadf"
-  integrity sha512-FyYnoxVL1D6+jDGQpbK5jW6y/2JlVfRfEeQ67BPCUg5wfCjaKOpr2XeceE4QL+MkhxliLtf5EbrMDZgzpt2CNw==
+  version "3.11.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.11.5.tgz#d6788bc83cf35ff18ea78a65763e480803409bc6"
+  integrity sha512-btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w==
 
 uid-number@0.0.6:
   version "0.0.6"
@@ -13871,9 +13871,9 @@ unist-builder@^1.0.1, unist-builder@^1.0.3, unist-builder@^1.0.4:
     object-assign "^4.1.0"
 
 unist-util-generated@^1.1.0:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.5.tgz#1e903e68467931ebfaea386dae9ea253628acd42"
-  integrity sha512-1TC+NxQa4N9pNdayCYA1EGUOCAO0Le3fVp7Jzns6lnua/mYgwHo0tz5WUAfrdpNch1RZLHc61VZ1SDgrtNXLSw==
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-1.1.6.tgz#5ab51f689e2992a472beb1b35f2ce7ff2f324d4b"
+  integrity sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==
 
 unist-util-is@^2.0.0:
   version "2.1.3"
@@ -14818,8 +14818,8 @@ yauzl@^2.10.0, yauzl@^2.4.2:
     fd-slicer "~1.1.0"
 
 yjs@^13.4.1:
-  version "13.4.2"
-  resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.4.2.tgz#565fff706064e6fe59b75cc08dd724b2ac4f3783"
-  integrity sha512-HtlrDT55db2Gtu09UDijDCCH+7FLG2FX+TRP0ySZJZYPj22qkinS2oAcuzjKbsJ1Ed0RSJGSgUE6ImagFdMJvA==
+  version "13.4.3"
+  resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.4.3.tgz#b10c63cbc4e6fd1bc3a7974965b75fefc72f70c3"
+  integrity sha512-jHlk3SKz2gC/rO0WBEuyn8yxtxEjDDMuANQYLR7EJjdbYhbdKYiaoPsNsFOgMDy7u8R6i2N3gVIRcmXYrbAvzg==
   dependencies:
     lib0 "^0.2.33"

From a0885e494be0d32a8aed9f8f016f066a862acd3a Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Thu, 5 Nov 2020 09:38:39 +0100
Subject: [PATCH 100/113] update Slack channel

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e827dd9dd..a551cb83b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,7 +54,7 @@ jobs:
       with:
         status: ${{ job.status }}
         steps: ${{ toJson(steps) }}
-        channel: '#tiptap-next'
+        channel: '#tiptap-notifications'
       if: failure()
 
   test:
@@ -107,7 +107,7 @@ jobs:
       with:
         status: ${{ job.status }}
         steps: ${{ toJson(steps) }}
-        channel: '#tiptap-next'
+        channel: '#tiptap-notifications'
       if: failure()
 
   build:
@@ -154,5 +154,5 @@ jobs:
       with:
         status: ${{ job.status }}
         steps: ${{ toJson(steps) }}
-        channel: '#tiptap-next'
+        channel: '#tiptap-notifications'
       if: failure()

From 5110f73e66abb46c25156d335a091f361842a5fa Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Thu, 5 Nov 2020 11:45:36 +0100
Subject: [PATCH 101/113] disable build step for now

---
 .github/workflows/main.yml | 72 +++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a551cb83b..6ffb90368 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -110,49 +110,49 @@ jobs:
         channel: '#tiptap-notifications'
       if: failure()
 
-  build:
-    runs-on: ubuntu-latest
+  # build:
+  #   runs-on: ubuntu-latest
 
-    needs: lint
+  #   needs: lint
 
-    env:
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+  #   env:
+  #     SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
 
-    strategy:
-      matrix:
-        node-version: [14]
+  #   strategy:
+  #     matrix:
+  #       node-version: [14]
 
-    steps:
+  #   steps:
 
-    - uses: actions/checkout@v2.3.3
+  #   - uses: actions/checkout@v2.3.3
 
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2.1.2
-      with:
-        node-version: ${{ matrix.node-version }}
+  #   - name: Use Node.js ${{ matrix.node-version }}
+  #     uses: actions/setup-node@v2.1.2
+  #     with:
+  #       node-version: ${{ matrix.node-version }}
 
-    - name: Load cached dependencies
-      uses: actions/cache@v2
-      id: cache
-      with:
-        path: |
-          **/node_modules
-          /home/runner/.cache/Cypress
-        key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
+  #   - name: Load cached dependencies
+  #     uses: actions/cache@v2
+  #     id: cache
+  #     with:
+  #       path: |
+  #         **/node_modules
+  #         /home/runner/.cache/Cypress
+  #       key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('**/yarn.lock') }}
 
-    - name: Install dependencies
-      id: install-dependencies
-      if: steps.cache.outputs.cache-hit != 'true'
-      run: yarn install
+  #   - name: Install dependencies
+  #     id: install-dependencies
+  #     if: steps.cache.outputs.cache-hit != 'true'
+  #     run: yarn install
 
-    - name: Build packages dependencies
-      id: build-packages
-      run: yarn build:packages
+  #   - name: Build packages dependencies
+  #     id: build-packages
+  #     run: yarn build:packages
 
-    - name: Send Slack notifications
-      uses: act10ns/slack@v1
-      with:
-        status: ${{ job.status }}
-        steps: ${{ toJson(steps) }}
-        channel: '#tiptap-notifications'
-      if: failure()
+  #   - name: Send Slack notifications
+  #     uses: act10ns/slack@v1
+  #     with:
+  #       status: ${{ job.status }}
+  #       steps: ${{ toJson(steps) }}
+  #       channel: '#tiptap-notifications'
+  #     if: failure()

From 729fa7f0360fd4eabaf878bbb7b575967ef6a07b Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Thu, 5 Nov 2020 11:46:27 +0100
Subject: [PATCH 102/113] add content to the gapcursor page

---
 .../demos/Extensions/Gapcursor/index.spec.js  |  5 ++
 docs/src/demos/Extensions/Gapcursor/index.vue | 77 +++++++++++++++++++
 docs/src/docPages/api/extensions/gapcursor.md | 12 +--
 3 files changed, 85 insertions(+), 9 deletions(-)
 create mode 100644 docs/src/demos/Extensions/Gapcursor/index.spec.js
 create mode 100644 docs/src/demos/Extensions/Gapcursor/index.vue

diff --git a/docs/src/demos/Extensions/Gapcursor/index.spec.js b/docs/src/demos/Extensions/Gapcursor/index.spec.js
new file mode 100644
index 000000000..3adf87fd5
--- /dev/null
+++ b/docs/src/demos/Extensions/Gapcursor/index.spec.js
@@ -0,0 +1,5 @@
+context('/examples/gapcursor', () => {
+  before(() => {
+    cy.visit('/examples/gapcursor')
+  })
+})
diff --git a/docs/src/demos/Extensions/Gapcursor/index.vue b/docs/src/demos/Extensions/Gapcursor/index.vue
new file mode 100644
index 000000000..14e46c2af
--- /dev/null
+++ b/docs/src/demos/Extensions/Gapcursor/index.vue
@@ -0,0 +1,77 @@
+<template>
+  <div>
+    <editor-content :editor="editor" />
+  </div>
+</template>
+
+<script>
+import { Editor, EditorContent } from '@tiptap/vue-starter-kit'
+import Document from '@tiptap/extension-document'
+import Paragraph from '@tiptap/extension-paragraph'
+import Text from '@tiptap/extension-text'
+import Gapcursor from '@tiptap/extension-focus'
+import Image from '@tiptap/extension-image'
+
+export default {
+  components: {
+    EditorContent,
+  },
+
+  data() {
+    return {
+      editor: null,
+    }
+  },
+
+  mounted() {
+    this.editor = new Editor({
+      extensions: [
+        Document(),
+        Paragraph(),
+        Text(),
+        Image(),
+        Gapcursor(),
+      ],
+      content: `
+        <p>Try to set the cursor behind the image!</p>
+        <img src="https://source.unsplash.com/8xznAGy4HcY/800x400" />
+      `,
+    })
+  },
+
+  beforeDestroy() {
+    this.editor.destroy()
+  },
+}
+</script>
+
+<style lang="scss">
+/* Copied form the original prosemirror-gapcursor plugin by Marijn Haverbeke */
+/* https://github.com/ProseMirror/prosemirror-gapcursor/blob/master/style/gapcursor.css */
+
+.ProseMirror-gapcursor {
+  display: none;
+  pointer-events: none;
+  position: absolute;
+}
+
+.ProseMirror-gapcursor:after {
+  content: "";
+  display: block;
+  position: absolute;
+  top: -2px;
+  width: 20px;
+  border-top: 1px solid black;
+  animation: ProseMirror-cursor-blink 1.1s steps(2, start) infinite;
+}
+
+@keyframes ProseMirror-cursor-blink {
+  to {
+    visibility: hidden;
+  }
+}
+
+.ProseMirror-focused .ProseMirror-gapcursor {
+  display: block;
+}
+</style>
diff --git a/docs/src/docPages/api/extensions/gapcursor.md b/docs/src/docPages/api/extensions/gapcursor.md
index 1f16726be..52d358f2a 100644
--- a/docs/src/docPages/api/extensions/gapcursor.md
+++ b/docs/src/docPages/api/extensions/gapcursor.md
@@ -1,4 +1,7 @@
 # Gapcursor
+This extension loads the [ProseMirror Gapcursor plugin](https://github.com/ProseMirror/prosemirror-gapcursor) by Marijn Haverbeke, which adds a gap for the cursor in places that don’t allow regular selection. For example, after a table at the end of a document.
+
+Note that tiptap is renderless, but the dropcursor needs CSS for its appearance. The default CSS is added to the usage example below.
 
 ## Installation
 ```bash
@@ -9,15 +12,6 @@ npm install @tiptap/extension-gapcursor
 yarn add @tiptap/extension-gapcursor
 ```
 
-## Settings
-*None*
-
-## Commands
-*None*
-
-## Keyboard shortcuts
-*None*
-
 ## Source code
 [packages/extension-gapcursor/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-gapcursor/)
 

From 81471723252b295b9ba4189c5690e4964d6a4486 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Thu, 5 Nov 2020 13:51:09 +0100
Subject: [PATCH 103/113] update the gapcursor page & example

---
 docs/src/demos/Extensions/Gapcursor/index.vue | 7 ++++---
 docs/src/docPages/api/extensions/gapcursor.md | 2 +-
 docs/src/links.yaml                           | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/src/demos/Extensions/Gapcursor/index.vue b/docs/src/demos/Extensions/Gapcursor/index.vue
index 14e46c2af..11d5bc99d 100644
--- a/docs/src/demos/Extensions/Gapcursor/index.vue
+++ b/docs/src/demos/Extensions/Gapcursor/index.vue
@@ -9,7 +9,7 @@ import { Editor, EditorContent } from '@tiptap/vue-starter-kit'
 import Document from '@tiptap/extension-document'
 import Paragraph from '@tiptap/extension-paragraph'
 import Text from '@tiptap/extension-text'
-import Gapcursor from '@tiptap/extension-focus'
+import Gapcursor from '@tiptap/extension-gapcursor'
 import Image from '@tiptap/extension-image'
 
 export default {
@@ -33,7 +33,7 @@ export default {
         Gapcursor(),
       ],
       content: `
-        <p>Try to set the cursor behind the image!</p>
+        <p>Try to set the cursor behind the image with your arrow keys! You should see big blinking cursor right from the image. This is the gapcursor.</p>
         <img src="https://source.unsplash.com/8xznAGy4HcY/800x400" />
       `,
     })
@@ -46,13 +46,14 @@ export default {
 </script>
 
 <style lang="scss">
-/* Copied form the original prosemirror-gapcursor plugin by Marijn Haverbeke */
+/* Copied from the original prosemirror-gapcursor plugin by Marijn Haverbeke */
 /* https://github.com/ProseMirror/prosemirror-gapcursor/blob/master/style/gapcursor.css */
 
 .ProseMirror-gapcursor {
   display: none;
   pointer-events: none;
   position: absolute;
+  border: 10px solid red;
 }
 
 .ProseMirror-gapcursor:after {
diff --git a/docs/src/docPages/api/extensions/gapcursor.md b/docs/src/docPages/api/extensions/gapcursor.md
index 52d358f2a..a42b7ef0b 100644
--- a/docs/src/docPages/api/extensions/gapcursor.md
+++ b/docs/src/docPages/api/extensions/gapcursor.md
@@ -16,4 +16,4 @@ yarn add @tiptap/extension-gapcursor
 [packages/extension-gapcursor/](https://github.com/ueberdosis/tiptap-next/blob/main/packages/extension-gapcursor/)
 
 ## Usage
-<demo name="Extensions/Gapcursor" highlight="" />
+<demo name="Extensions/Gapcursor" highlight="12,33" />
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index adf1c1f4a..ea41ebc00 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -173,7 +173,6 @@
           draft: true
         - title: Gapcursor
           link: /api/extensions/gapcursor
-          draft: true
         - title: History
           link: /api/extensions/history
         - title: TextAlign

From 520cc318a612b527642aa071687f2d702c9b530c Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Thu, 5 Nov 2020 14:39:28 +0100
Subject: [PATCH 104/113] add content

---
 .../demos/Api/Schema/GenerateHTML/index.vue   |   2 +-
 docs/src/docPages/api/commands.md             |  76 ++++---
 docs/src/docPages/api/keyboard-shortcuts.md   |  86 ++++----
 docs/src/docPages/api/schema.md               | 187 ++++++++----------
 docs/src/docPages/guide/store-content.md      |  11 ++
 docs/src/docPages/open.md                     |   8 +
 docs/src/links.yaml                           |   7 +-
 docs/src/templates/DocPage/style.scss         |   5 +
 packages/extension-text-align/index.ts        |   4 +
 9 files changed, 208 insertions(+), 178 deletions(-)
 create mode 100644 docs/src/docPages/open.md

diff --git a/docs/src/demos/Api/Schema/GenerateHTML/index.vue b/docs/src/demos/Api/Schema/GenerateHTML/index.vue
index 875fe64a0..b0a6eda49 100644
--- a/docs/src/demos/Api/Schema/GenerateHTML/index.vue
+++ b/docs/src/demos/Api/Schema/GenerateHTML/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <pre>{{ html }}</pre>
+  <pre><code>{{ html }}</code></pre>
 </template>
 
 <script>
diff --git a/docs/src/docPages/api/commands.md b/docs/src/docPages/api/commands.md
index 8956e0023..e4de828ea 100644
--- a/docs/src/docPages/api/commands.md
+++ b/docs/src/docPages/api/commands.md
@@ -27,35 +27,67 @@ When a user clicks on a button outside of the content, the editor isn’t in foc
 
 All chained commands are kind of queued up. They are combined to one single transaction. That means, the content is only updated once, also the `update` event is only triggered once.
 
+## Dry run for commands
+Sometimes, you don’t want to actually run the commands, but only know if it would be possible to run commands, for example to show or hide buttons in a menu. Inside of a command you can *try* to execute other commands, without actually changing the content like this:
+
+```js
+commands.try([
+  () => commands.splitBlock(),
+  () => commands.whatever(),
+])
+```
+
+Outside of components you can do this, too. The editor exposes a try method, which passes all commands and expects an array of commands you want to try:
+
+```js
+editor.try(({ commands }) => [
+  () => commands.splitBlock(),
+  () => commands.whatever(),
+])
+```
+
+This stops at the first command which return `false`. Commands after that won’t be executed. Even if all commands would be possible to run, none of the changes are applied to the document.
+
 ## List of commands
 Have a look at all of the core commands listed below. They should give you a good first impression of what’s possible.
 
 ### Content
-| Command         | Description                                                 |
-| --------------- | ----------------------------------------------------------- |
-| .clearContent() | Clear the whole document.                                   |
-| .insertgetHTML()   | Insert a string of HTML at the currently selected position. |
-| .insertText()   | Insert a string of text at the currently selected position. |
-| .setContent()   | Replace the whole document with new content.                |
+| Command          | Description                                                 |
+| ---------------- | ----------------------------------------------------------- |
+| .clearContent()  | Clear the whole document.                                   |
+| .insertgetHTML() | Insert a string of HTML at the currently selected position. |
+| .insertText()    | Insert a string of text at the currently selected position. |
+| .insertHTML()    |                                                             |
+| .setContent()    | Replace the whole document with new content.                |
 
 ### Nodes & Marks
-| Command             | Description                                            |
-| ------------------- | ------------------------------------------------------ |
-| .removeMark()       | Remove a mark in the current selection.                |
-| .removeMarks()      | Remove all marks in the current selection.             |
-| .selectParentNode() | Select the parent node.                                |
-| .toggleMark()       | Toggle a mark on and off.                              |
-| .toggleBlockType()  | Toggle a node with another node.                       |
-| .setBlockType()     | Replace a given range with a node.                     |
-| .updateMark()       | Update a mark with new attributes.                     |
+| Command                | Description                                |
+| ---------------------- | ------------------------------------------ |
+| .clearNodes()          |                                            |
+| .removeMark()          |                                            |
+| .removeMark()          | Remove a mark in the current selection.    |
+| .removeMarks()         |                                            |
+| .removeMarks()         | Remove all marks in the current selection. |
+| .resetNodeAttributes() |                                            |
+| .selectParentNode()    | Select the parent node.                    |
+| .setBlockType()        | Replace a given range with a node.         |
+| .setNodeAttributes()   |                                            |
+| .splitBlock()          | Forks a new node from an existing node.    |
+| .toggleBlockType()     | Toggle a node with another node.           |
+| .toggleMark()          |                                            |
+| .toggleMark()          | Toggle a mark on and off.                  |
+| .toggleWrap()          |                                            |
+| .updateMark()          |                                            |
+| .updateMark()          | Update a mark with new attributes.         |
 
 ### Lists
-| Command             | Description                                            |
-| ------------------- | ------------------------------------------------------ |
-| .liftListItem()     | Lift the list item into a wrapping list.               |
-| .sinkListItem()     | Sink the list item down into an inner list.            |
-| .splitListItem()    | Splits a textblock of a list item into two list items. |
-| .toggleList()       | Toggle between different list styles.                  |
+| Command          | Description                                            |
+| ---------------- | ------------------------------------------------------ |
+| .liftListItem()  | Lift the list item into a wrapping list.               |
+| .sinkListItem()  | Sink the list item down into an inner list.            |
+| .splitListItem() | Splits a textblock of a list item into two list items. |
+| .toggleList()    | Toggle between different list styles.                  |
+| .wrapInList()    |                                                        |
 
 ### Selection
 | Command            | Description                             |
@@ -67,4 +99,4 @@ Have a look at all of the core commands listed below. They should give you a goo
 | .selectAll()       | Select the whole document.              |
 
 ### Extensions
-All extension can add additional commands (and most do), check out the specific [documentation for the provided extensions](/api/extensions), [nodes](/api/nodes), and [marks](/api/marks) to learn more about that. Of course, you can [add your custom extensions](/guide/build-custom-extensions) with custom commands aswell.
+All extensions can add additional commands (and most do), check out the specific [documentation for the provided nodes](/api/nodes), [marks](/api/marks), and [extensions](/api/extensions) to learn more about those. Of course, you can [add your custom extensions](/guide/build-custom-extensions) with custom commands aswell.
diff --git a/docs/src/docPages/api/keyboard-shortcuts.md b/docs/src/docPages/api/keyboard-shortcuts.md
index b1b7afce5..a1390fe6b 100644
--- a/docs/src/docPages/api/keyboard-shortcuts.md
+++ b/docs/src/docPages/api/keyboard-shortcuts.md
@@ -9,6 +9,8 @@ tiptap comes with sensible keyboard shortcut defaults. Depending on what you wan
 Most of the core extensions register their own keyboard shortcuts. Depending on what set of extension you use, not all of the below listed keyboard shortcuts work for your editor.
 
 ### Essentials
+❌ = untested
+
 | Action                   | Windows/Linux                   | macOS                       |
 | ------------------------ | ------------------------------- | --------------------------- |
 | Copy                     | `Control`&nbsp;`C`              | `Cmd`&nbsp;`C`              |
@@ -17,50 +19,50 @@ Most of the core extensions register their own keyboard shortcuts. Depending on
 | Paste without formatting | `Control`&nbsp;`Shift`&nbsp;`V` | `Cmd`&nbsp;`Shift`&nbsp;`V` |
 | Undo                     | `Control`&nbsp;`Z`              | `Cmd`&nbsp;`Z`              |
 | Redo                     | `Control`&nbsp;`Shift`&nbsp;`Z` | `Cmd`&nbsp;`Shift`&nbsp;`Z` |
-| Insert or edit link      | `Control`&nbsp;`K`              | `Cmd`&nbsp;`K`              |
-| Open link                | `Alt`&nbsp;`Enter`              | `Alt`&nbsp;`Enter`          |
-| Find                     | `Control`&nbsp;`F`              | `Cmd`&nbsp;`F`              |
-| Find and replace         | `Control`&nbsp;`H`              | `Cmd`&nbsp;`Shift`&nbsp;`H` |
-| Find again               | `Control`&nbsp;`G`              | `Cmd`&nbsp;`G`              |
-| Find previous            | `Control`&nbsp;`Shift`&nbsp;`G` | `Cmd`&nbsp;`Shift`&nbsp;`G` |
-| Repeat last action       | `Control`&nbsp;`Y`              | `Cmd`&nbsp;`Y`              |
+| ❌ Insert or edit link    | `Control`&nbsp;`K`              | `Cmd`&nbsp;`K`              |
+| ❌ Open link              | `Alt`&nbsp;`Enter`              | `Alt`&nbsp;`Enter`          |
+| ❌ Find                   | `Control`&nbsp;`F`              | `Cmd`&nbsp;`F`              |
+| ❌ Find and replace       | `Control`&nbsp;`H`              | `Cmd`&nbsp;`Shift`&nbsp;`H` |
+| ❌ Find again             | `Control`&nbsp;`G`              | `Cmd`&nbsp;`G`              |
+| ❌ Find previous          | `Control`&nbsp;`Shift`&nbsp;`G` | `Cmd`&nbsp;`Shift`&nbsp;`G` |
+| ❌ Repeat last action     | `Control`&nbsp;`Y`              | `Cmd`&nbsp;`Y`              |
 | Add a line break         | `Shift`&nbsp;`Enter`            | `Shift`&nbsp;`Enter`        |
 
 ### Text Formatting
-| Action                | Windows/Linux                                           | macOS                       |
-| --------------------- | ------------------------------------------------------- | --------------------------- |
-| Bold                  | `Control`&nbsp;`B`                                      | `Cmd`&nbsp;`B`              |
-| Italicize             | `Control`&nbsp;`I`                                      | `Cmd`&nbsp;`I`              |
-| Underline             | `Control`&nbsp;`U`                                      | `Cmd`&nbsp;`U`              |
-| Strikethrough         | `Alt`&nbsp;`Shift`&nbsp;`5`                             | `Cmd`&nbsp;`Shift`&nbsp;`X` |
-| Superscript           | `Control`&nbsp;`.`                                      | `Cmd`&nbsp;`.`              |
-| Subscript             | `Control`&nbsp;`,`                                      | `Cmd`&nbsp;`,`              |
-| Copy text formatting  | `Control`&nbsp;`Alt`&nbsp;`C`                           | `Cmd`&nbsp;`Alt`&nbsp;`C`   |
-| Paste text formatting | `Control`&nbsp;`Alt`&nbsp;`V`                           | `Cmd`&nbsp;`Alt`&nbsp;`V`   |
-| Clear text formatting | `Control`&nbsp;<code>\</code><br>`Control`&nbsp;`Space` | `Cmd`&nbsp;`\`              |
-| Increase font size    | `Control`&nbsp;`Shift`&nbsp;`>`                         | `Cmd`&nbsp;`Shift`&nbsp;`>` |
-| Decrease font size    | `Control`&nbsp;`Shift`&nbsp;`<`                         | `Cmd`&nbsp;`Shift`&nbsp;`<` |
+| Action                  | Windows/Linux                                | macOS                       |
+| ----------------------- | -------------------------------------------- | --------------------------- |
+| Bold                    | `Control`&nbsp;`B`                           | `Cmd`&nbsp;`B`              |
+| Italicize               | `Control`&nbsp;`I`                           | `Cmd`&nbsp;`I`              |
+| Underline               | `Control`&nbsp;`U`                           | `Cmd`&nbsp;`U`              |
+| ❌ Strikethrough         | `Alt`&nbsp;`Shift`&nbsp;`5`                  | `Cmd`&nbsp;`Shift`&nbsp;`X` |
+| ❌ Superscript           | `Control`&nbsp;`.`                           | `Cmd`&nbsp;`.`              |
+| ❌ Subscript             | `Control`&nbsp;`,`                           | `Cmd`&nbsp;`,`              |
+| ❌ Copy text formatting  | `Control`&nbsp;`Alt`&nbsp;`C`                | `Cmd`&nbsp;`Alt`&nbsp;`C`   |
+| ❌ Paste text formatting | `Control`&nbsp;`Alt`&nbsp;`V`                | `Cmd`&nbsp;`Alt`&nbsp;`V`   |
+| ❌ Clear text formatting | `Control`&nbsp;`\`<br>`Control`&nbsp;`Space` | `Cmd`&nbsp;`\`              |
+| ❌ Increase font size    | `Control`&nbsp;`Shift`&nbsp;`>`              | `Cmd`&nbsp;`Shift`&nbsp;`>` |
+| ❌ Decrease font size    | `Control`&nbsp;`Shift`&nbsp;`<`              | `Cmd`&nbsp;`Shift`&nbsp;`<` |
 
 ### Paragraph Formatting
-| Action                         | Windows/Linux                   | macOS                           |
-| ------------------------------ | ------------------------------- | ------------------------------- |
-| Increase paragraph indentation | `Control`&nbsp;`]`              | `Cmd`&nbsp;`]`                  |
-| Decrease paragraph indentation | `Control`&nbsp;`[`              | `Cmd`&nbsp;`[`                  |
-| Apply normal text style        | `Control`&nbsp;`Alt`&nbsp;`0`   | `Cmd`&nbsp;`Alt`&nbsp;`0`       |
-| Apply heading style 1          | `Control`&nbsp;`Alt`&nbsp;`1`   | `Cmd`&nbsp;`Alt`&nbsp;`1`       |
-| Apply heading style 2          | `Control`&nbsp;`Alt`&nbsp;`2`   | `Cmd`&nbsp;`Alt`&nbsp;`2`       |
-| Apply heading style 3          | `Control`&nbsp;`Alt`&nbsp;`3`   | `Cmd`&nbsp;`Alt`&nbsp;`3`       |
-| Apply heading style 4          | `Control`&nbsp;`Alt`&nbsp;`4`   | `Cmd`&nbsp;`Alt`&nbsp;`4`       |
-| Apply heading style 5          | `Control`&nbsp;`Alt`&nbsp;`5`   | `Cmd`&nbsp;`Alt`&nbsp;`5`       |
-| Apply heading style 6          | `Control`&nbsp;`Alt`&nbsp;`6`   | `Cmd`&nbsp;`Alt`&nbsp;`6`       |
-| Left align                     | `Control`&nbsp;`Shift`&nbsp;`L` | `Cmd`&nbsp;`Shift`&nbsp;`L`     |
-| Center align                   | `Control`&nbsp;`Shift`&nbsp;`E` | `Cmd`&nbsp;`Shift`&nbsp;`E`     |
-| Right align                    | `Control`&nbsp;`Shift`&nbsp;`R` | `Cmd`&nbsp;`Shift`&nbsp;`R`     |
-| Justify                        | `Control`&nbsp;`Shift`&nbsp;`J` | `Cmd`&nbsp;`Shift`&nbsp;`J`     |
-| Numbered list                  | `Control`&nbsp;`Shift`&nbsp;`7` | `Cmd`&nbsp;`Shift`&nbsp;`7`     |
-| Bulleted list                  | `Control`&nbsp;`Shift`&nbsp;`8` | `Cmd`&nbsp;`Shift`&nbsp;`8`     |
-| Move paragraph up              | `Control`&nbsp;`Shift`&nbsp;`↑` | `Control`&nbsp;`Shift`&nbsp;`↑` |
-| Move paragraph down            | `Control`&nbsp;`Shift`&nbsp;`↓` | `Control`&nbsp;`Shift`&nbsp;`↓` |
+| Action                           | Windows/Linux                   | macOS                           |
+| -------------------------------- | ------------------------------- | ------------------------------- |
+| ❌ Increase paragraph indentation | `Control`&nbsp;`]`              | `Cmd`&nbsp;`]`                  |
+| ❌ Decrease paragraph indentation | `Control`&nbsp;`[`              | `Cmd`&nbsp;`[`                  |
+| Apply normal text style          | `Control`&nbsp;`Alt`&nbsp;`0`   | `Cmd`&nbsp;`Alt`&nbsp;`0`       |
+| Apply heading style 1            | `Control`&nbsp;`Alt`&nbsp;`1`   | `Cmd`&nbsp;`Alt`&nbsp;`1`       |
+| Apply heading style 2            | `Control`&nbsp;`Alt`&nbsp;`2`   | `Cmd`&nbsp;`Alt`&nbsp;`2`       |
+| Apply heading style 3            | `Control`&nbsp;`Alt`&nbsp;`3`   | `Cmd`&nbsp;`Alt`&nbsp;`3`       |
+| Apply heading style 4            | `Control`&nbsp;`Alt`&nbsp;`4`   | `Cmd`&nbsp;`Alt`&nbsp;`4`       |
+| Apply heading style 5            | `Control`&nbsp;`Alt`&nbsp;`5`   | `Cmd`&nbsp;`Alt`&nbsp;`5`       |
+| Apply heading style 6            | `Control`&nbsp;`Alt`&nbsp;`6`   | `Cmd`&nbsp;`Alt`&nbsp;`6`       |
+| Left align                       | `Control`&nbsp;`Shift`&nbsp;`L` | `Cmd`&nbsp;`Shift`&nbsp;`L`     |
+| Center align                     | `Control`&nbsp;`Shift`&nbsp;`E` | `Cmd`&nbsp;`Shift`&nbsp;`E`     |
+| Right align                      | `Control`&nbsp;`Shift`&nbsp;`R` | `Cmd`&nbsp;`Shift`&nbsp;`R`     |
+| Justify                          | `Control`&nbsp;`Shift`&nbsp;`J` | `Cmd`&nbsp;`Shift`&nbsp;`J`     |
+| ❌ Numbered list                  | `Control`&nbsp;`Shift`&nbsp;`7` | `Cmd`&nbsp;`Shift`&nbsp;`7`     |
+| ❌ Bulleted list                  | `Control`&nbsp;`Shift`&nbsp;`8` | `Cmd`&nbsp;`Shift`&nbsp;`8`     |
+| ❌ Move paragraph up              | `Control`&nbsp;`Shift`&nbsp;`↑` | `Control`&nbsp;`Shift`&nbsp;`↑` |
+| ❌ Move paragraph down            | `Control`&nbsp;`Shift`&nbsp;`↓` | `Control`&nbsp;`Shift`&nbsp;`↓` |
 
 ### Text Selection
 | Action                                            | Windows/Linux                   | macOS                       |
@@ -70,10 +72,10 @@ Most of the core extensions register their own keyboard shortcuts. Depending on
 | Extend selection one character to right           | `Shift`&nbsp;`→`                | `Shift`&nbsp;`→`            |
 | Extend selection one line up                      | `Shift`&nbsp;`↑`                | `Shift`&nbsp;`↑`            |
 | Extend selection one line down                    | `Shift`&nbsp;`↓`                | `Shift`&nbsp;`↓`            |
-| Extend selection one paragraph up                 | `Alt`&nbsp;`Shift`&nbsp;`↑`     | `Alt`&nbsp;`Shift`&nbsp;`↑` |
-| Extend selection one paragraph down               | `Alt`&nbsp;`Shift`&nbsp;`↓`     | `Alt`&nbsp;`Shift`&nbsp;`↓` |
+| ❌ Extend selection one paragraph up               | `Alt`&nbsp;`Shift`&nbsp;`↑`     | `Alt`&nbsp;`Shift`&nbsp;`↑` |
+| ❌ Extend selection one paragraph down             | `Alt`&nbsp;`Shift`&nbsp;`↓`     | `Alt`&nbsp;`Shift`&nbsp;`↓` |
 | Extend selection to the beginning of the document | `Control`&nbsp;`Shift`&nbsp;`↑` | `Cmd`&nbsp;`Shift`&nbsp;`↑` |
-| Extend selection to the end of the document       | `Control`&nbsp;`Shift`&nbsp;`↓` | `Cmd`&nbsp;`Shift`&nbsp;`↓` |
+| ❌ Extend selection to the end of the document     | `Control`&nbsp;`Shift`&nbsp;`↓` | `Cmd`&nbsp;`Shift`&nbsp;`↓` |
 
 ## Overwrite keyboard shortcuts
 Keyboard shortcuts may be strings like `'Shift-Control-Enter'`. Keys are based on the strings that can appear in `event.key`, concatenated with a `-`. There is a little tool called [keycode.info](https://keycode.info/), which shows the `event.key` interactively.
diff --git a/docs/src/docPages/api/schema.md b/docs/src/docPages/api/schema.md
index b41af9bc0..7ed2fbbe9 100644
--- a/docs/src/docPages/api/schema.md
+++ b/docs/src/docPages/api/schema.md
@@ -10,10 +10,10 @@ This schema is *very* strict. You can’t use any HTML element or attribute that
 Let me give you one example: If you paste something like `This is <strong>important</strong>` into tiptap, don’t have any extension that handles `strong` tags registered, you’ll only see `This is important` – without the strong tags.
 
 ## How a schema looks like
-
-The most simple schema for a typical *ProseMirror* editor is looking something like that:
+When you’ll work with the provided extensions only, you don’t have to care that much about the schema. If you’re building your own extensions, it’s probably helpful to understand how the schema works. Let’s look at the most simple schema for a typical ProseMirror editor:
 
 ```js
+// the underlying ProseMirror schema
 {
   nodes: {
     document: {
@@ -32,58 +32,95 @@ The most simple schema for a typical *ProseMirror* editor is looking something l
 }
 ```
 
-:::warning Out of date
-This content is written for tiptap 1 and needs an update.
-:::
-
 We register three nodes here. `document`, `paragraph` and `text`. `document` is the root node which allows one or more block nodes as children (`content: 'block+'`). Since `paragraph` is in the group of block nodes (`group: 'block'`) our document can only contain paragraphs. Our paragraphs allow zero or more inline nodes as children (`content: 'inline*'`) so there can only be `text` in it. `parseDOM` defines how a node can be parsed from pasted HTML. `toDOM` defines how it will be rendered in the DOM.
 
-In tiptap we define every node in its own `Extension` class instead. This allows us to split logic per node. Under the hood the schema will be merged together.
+In tiptap every node, mark and extension is living in its own file. This allows us to split the logic. Under the hood the whole schema will be merged together:
 
 ```js
-class Document extends Node {
-  name = 'document'
-  topNode = true
+// the tiptap schema API
+import { createNode } from '@tiptap/core'
 
-  schema() {
-    return {
-      content: 'block+',
-    }
-  }
-}
+const Document = createNode({
+  name: 'document',
+  topNode: true,
+  content: 'block+',
+})
 
-class Paragraph extends Node {
-  name = 'paragraph'
+const Paragraph = createNode({
+  name: 'paragraph',
+  group: 'block',
+  content: 'inline*',
+  parseHTML() {
+    return [
+      { tag: 'p' },
+    ]
+  },
+  renderHTML({ attributes }) {
+    return ['p', attributes, 0]
+  },
+})
 
-  schema() {
-    return {
-      content: 'inline*',
-      group: 'block',
-      parseDOM: [{ tag: 'p' }],
-      toDOM: () => ['p', 0],
-    }
-  }
-}
-
-class Text extends Node {
-  name = 'text'
-
-  schema() {
-    return {
-      group: 'inline',
-    }
-  }
-}
+const Text = createNode({
+  name: 'text',
+  group: 'inline',
+})
 ```
 
-## Difference between a Node and a Mark
+## Nodes and marks
 
-*Nodes* are like blocks of content, for example paragraphs, headings, code blocks, blockquotes and many more.
+### Differences
+Nodes are like blocks of content, for example paragraphs, headings, code blocks, blockquotes and many more.
 
-*Marks* can apply a different style to specific parts of text inside a *Node*. That’s the case for **bold**, *italic* or ~~striked~~ text. [Links](#) are *Marks*, too.
+Marks can be applied to specific parts of a node. That’s the case for **bold**, *italic* or ~~striked~~ text. [Links](#) are marks, too.
+
+### The node schema
+
+#### Content
+> The content expression for this node, as described in the schema guide. When not given, the node does not allow any content.
+
+#### Marks
+> The marks that are allowed inside of this node. May be a space-separated string referring to mark names or groups, "_" to explicitly allow all marks, or "" to disallow marks. When not given, nodes with inline content default to allowing all marks, other nodes default to not allowing marks.
+
+#### Group
+> The group or space-separated groups to which this node belongs, which can be referred to in the content expressions for the schema.
+
+#### Inline
+> Should be set to true for inline nodes. (Implied for text nodes.)
+
+#### Atom
+> Can be set to true to indicate that, though this isn't a leaf node, it doesn't have directly editable content and should be treated as a single unit in the view.
+
+#### Selectable
+> Controls whether nodes of this type can be selected as a node selection. Defaults to true for non-text nodes.
+
+#### Draggable
+> Determines whether nodes of this type can be dragged without being selected. Defaults to false.
+
+#### Code
+> Can be used to indicate that this node contains code, which causes some commands to behave differently.
+
+#### Defining
+> Determines whether this node is considered an important parent node during replace operations (such as paste). Non-defining (the default) nodes get dropped when their entire content is replaced, whereas defining nodes persist and wrap the inserted content. Likewise, in inserted content the defining parents of the content are preserved when possible. Typically, non-default-paragraph textblock types, and possibly list items, are marked as defining.
+
+#### Isolating
+> When enabled (default is false), the sides of nodes of this type count as boundaries that regular editing operations, like backspacing or lifting, won't cross. An example of a node that should probably have this enabled is a table cell.
+
+### The mark schema
+#### Inclusive
+> Whether this mark should be active when the cursor is positioned at its end (or at its start when that is also the start of the parent node). Defaults to true.
+
+#### Excludes
+> Determines which other marks this mark can coexist with. Should be a space-separated strings naming other marks or groups of marks When a mark is added to a set, all marks that it excludes are removed in the process. If the set contains any mark that excludes the new mark but is not, itself, excluded by the new mark, the mark can not be added an the set. You can use the value "_" to indicate that the mark excludes all marks in the schema.
+
+> Defaults to only being exclusive with marks of the same type. You can set it to an empty string (or any string not containing the mark's own name) to allow multiple marks of a given type to coexist (as long as they have different attributes).
+
+#### Group
+> The group or space-separated groups to which this mark belongs.
+
+#### Spanning
+> Determines whether marks of this type can span multiple adjacent nodes when serialized to DOM/HTML. Defaults to true.
 
 ## Get the underlying ProseMirror schema
-
 There are a few use cases where you need to work with the underlying schema. You’ll need that if you’re using the tiptap collaborative text editing features or if you want to manually render your content as HTML.
 
 ### Option 1: With an Editor
@@ -123,71 +160,3 @@ const schema = getSchema([
   // add more extensions here
 ])
 ```
-
-## Generate HTML from ProseMirror JSON
-
-If you need to render the content on the server side, for example to render a blog post which was written with tiptap, you’ll probably need a way to do just that without an actual editor instance. That’s what `generateHTML()` is for. It’s a utility function that renders HTML without an actual editor instance.
-
-:::info Browser-only rendering
-Import a lightweight implementation from `@tiptap/core` if you’re using the function in a browser context only.
-:::
-
-<demo name="Api/Schema/GenerateHTML" highlight="6,29-33"/>
-
-### Converting JSON<>HTML with PHP
-
-We needed to do the same thing in PHP at some point, so we published libraries to convert ProseMirror JSON to HTML and vice-versa:
-
-* [ueberdosis/prosemirror-php](https://github.com/ueberdosis/prosemirror-php) (PHP)
-* [ueberdosis/prosemirror-to-html](https://github.com/ueberdosis/prosemirror-to-html) (PHP)
-* [ueberdosis/html-to-prosemirror](https://github.com/ueberdosis/html-to-prosemirror) (PHP)
-
-
-### Node Schema
-
-
-#### Content
-> The content expression for this node, as described in the schema guide. When not given, the node does not allow any content.
-
-
-#### Marks
-> The marks that are allowed inside of this node. May be a space-separated string referring to mark names or groups, "_" to explicitly allow all marks, or "" to disallow marks. When not given, nodes with inline content default to allowing all marks, other nodes default to not allowing marks.
-
-#### Group
-> The group or space-separated groups to which this node belongs, which can be referred to in the content expressions for the schema.
-
-#### Inline
-> Should be set to true for inline nodes. (Implied for text nodes.)
-
-#### Atom
-> Can be set to true to indicate that, though this isn't a leaf node, it doesn't have directly editable content and should be treated as a single unit in the view.
-
-#### Selectable
-> Controls whether nodes of this type can be selected as a node selection. Defaults to true for non-text nodes.
-
-#### Draggable
-> Determines whether nodes of this type can be dragged without being selected. Defaults to false.
-
-#### Code
-> Can be used to indicate that this node contains code, which causes some commands to behave differently.
-
-#### Defining
-> Determines whether this node is considered an important parent node during replace operations (such as paste). Non-defining (the default) nodes get dropped when their entire content is replaced, whereas defining nodes persist and wrap the inserted content. Likewise, in inserted content the defining parents of the content are preserved when possible. Typically, non-default-paragraph textblock types, and possibly list items, are marked as defining.
-
-#### Isolating
-> When enabled (default is false), the sides of nodes of this type count as boundaries that regular editing operations, like backspacing or lifting, won't cross. An example of a node that should probably have this enabled is a table cell.
-
-### Mark Schema
-#### Inclusive
-> Whether this mark should be active when the cursor is positioned at its end (or at its start when that is also the start of the parent node). Defaults to true.
-
-#### Excludes
-> Determines which other marks this mark can coexist with. Should be a space-separated strings naming other marks or groups of marks When a mark is added to a set, all marks that it excludes are removed in the process. If the set contains any mark that excludes the new mark but is not, itself, excluded by the new mark, the mark can not be added an the set. You can use the value "_" to indicate that the mark excludes all marks in the schema.
-
-> Defaults to only being exclusive with marks of the same type. You can set it to an empty string (or any string not containing the mark's own name) to allow multiple marks of a given type to coexist (as long as they have different attributes).
-
-#### Group
-> The group or space-separated groups to which this mark belongs.
-
-#### Spanning
-> Determines whether marks of this type can span multiple adjacent nodes when serialized to DOM/HTML. Defaults to true.
diff --git a/docs/src/docPages/guide/store-content.md b/docs/src/docPages/guide/store-content.md
index 7e42b9cde..4380a40a5 100644
--- a/docs/src/docPages/guide/store-content.md
+++ b/docs/src/docPages/guide/store-content.md
@@ -88,3 +88,14 @@ You should really consider to work with HTML or JSON to store your content, they
 If you still think you need Markdown, [Nextcloud Text](https://github.com/nextcloud/text) uses tiptap 1 to work with Markdown. Their code is open source, so maybe you can learn from them.
 
 That said, tiptap **does** support Markdown shortcuts to format your content. Try typing `**two asterisks**` to make your text bold for example.
+
+## Generate HTML from ProseMirror JSON
+If you need to render the content on the server side, for example to render a blog post which was written with tiptap, you’ll probably need a way to do just that without an actual editor instance.
+
+That’s what `generateHTML()` is for. It’s a utility function that renders HTML without an actual editor instance.
+
+:::info Browser-only rendering
+Import a lightweight implementation from `@tiptap/core` if you’re using the function in a browser context only.
+:::
+
+<demo name="Api/Schema/GenerateHTML" highlight="6,29-33"/>
diff --git a/docs/src/docPages/open.md b/docs/src/docPages/open.md
new file mode 100644
index 000000000..62400b831
--- /dev/null
+++ b/docs/src/docPages/open.md
@@ -0,0 +1,8 @@
+# Monthly reports
+
+## October 2020
+
+## September 2020
+
+## August 2020
+
diff --git a/docs/src/links.yaml b/docs/src/links.yaml
index ea41ebc00..00bdd4566 100644
--- a/docs/src/links.yaml
+++ b/docs/src/links.yaml
@@ -187,14 +187,13 @@
       link: /api/events
     - title: Schema
       link: /api/schema
+      draft: true
     - title: Keyboard Shortcuts
       link: /api/keyboard-shortcuts
 
 - title: Sponsoring
   items:
-    # - title: Benefits for sponsors
-    #   link: /benefits-for-sponsors
-    # - title: Sponsoring reports
-    #   link: /open
+    - title: Monthly reports
+      link: /open
     - title: Become a sponsor
       link: /sponsor
diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss
index f0d8fe144..d17cb1856 100644
--- a/docs/src/templates/DocPage/style.scss
+++ b/docs/src/templates/DocPage/style.scss
@@ -265,5 +265,10 @@
       }
     }
 
+    > blockquote {
+      border-left: 2px solid rgba($colorGrey, 0.5);
+      padding-left: $spacing;
+    }
+
   }
 }
diff --git a/packages/extension-text-align/index.ts b/packages/extension-text-align/index.ts
index 7a6e07ad1..dcf499ebd 100644
--- a/packages/extension-text-align/index.ts
+++ b/packages/extension-text-align/index.ts
@@ -52,6 +52,10 @@ const TextAlign = createExtension({
       Enter: () => this.editor.splitBlock({
         withAttributes: true,
       }),
+      'Ctrl-Shift-l': () => this.editor.textAlign('left'),
+      'Ctrl-Shift-e': () => this.editor.textAlign('center'),
+      'Ctrl-Shift-r': () => this.editor.textAlign('right'),
+      'Ctrl-Shift-j': () => this.editor.textAlign('justify'),
     }
   },
 })

From a8e478abecb23b8b3e31ea45efc352b5d267cde1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Thu, 5 Nov 2020 14:44:14 +0100
Subject: [PATCH 105/113] reuse attrs for setNodeAttributes and
 resetNodeAttributes, fix #37

---
 packages/core/src/commands/resetNodeAttributes.ts | 1 +
 packages/core/src/commands/setNodeAttributes.ts   | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/commands/resetNodeAttributes.ts b/packages/core/src/commands/resetNodeAttributes.ts
index dbf1fc656..c7988d187 100644
--- a/packages/core/src/commands/resetNodeAttributes.ts
+++ b/packages/core/src/commands/resetNodeAttributes.ts
@@ -12,6 +12,7 @@ export default (attributeNames: string[] = []): Command => ({ tr, state, dispatc
 
         if (attribute && defaultValue !== undefined && dispatch) {
           tr.setNodeMarkup(pos, undefined, {
+            ...node.attrs,
             [name]: defaultValue,
           })
         }
diff --git a/packages/core/src/commands/setNodeAttributes.ts b/packages/core/src/commands/setNodeAttributes.ts
index 37b6fc5df..97c9d9c42 100644
--- a/packages/core/src/commands/setNodeAttributes.ts
+++ b/packages/core/src/commands/setNodeAttributes.ts
@@ -6,7 +6,10 @@ export default (attributes: {}): Command => ({ tr, state, dispatch }) => {
 
   state.doc.nodesBetween(from, to, (node, pos) => {
     if (!node.type.isText && dispatch) {
-      tr.setNodeMarkup(pos, undefined, attributes)
+      tr.setNodeMarkup(pos, undefined, {
+        ...node.attrs,
+        ...attributes,
+      })
     }
   })
 

From 1aebab31d9a7263f40748f423b3df84299b2bc7e Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Thu, 5 Nov 2020 14:45:52 +0100
Subject: [PATCH 106/113] add a link to mouseless

---
 docs/src/docPages/api/keyboard-shortcuts.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/src/docPages/api/keyboard-shortcuts.md b/docs/src/docPages/api/keyboard-shortcuts.md
index a1390fe6b..d4db84bf1 100644
--- a/docs/src/docPages/api/keyboard-shortcuts.md
+++ b/docs/src/docPages/api/keyboard-shortcuts.md
@@ -5,6 +5,8 @@
 ## Introduction
 tiptap comes with sensible keyboard shortcut defaults. Depending on what you want to use it for, you’ll probably want to change those keyboard shortcuts to your liking. Let’s have a look at what we defined for you, and show you how to change it then!
 
+Funfact: A while ago, we built a [keyboard shortcut learning app](https://mouseless.app), to which we manually added exercises for thousands of keyboard shortcuts for a bunch of tools.
+
 ## Predefined keyboard shortcuts
 Most of the core extensions register their own keyboard shortcuts. Depending on what set of extension you use, not all of the below listed keyboard shortcuts work for your editor.
 

From d081e81991604ec0c3d53f39492d8f01a41e230c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Thu, 5 Nov 2020 14:51:34 +0100
Subject: [PATCH 107/113] fix task list name

---
 packages/extension-task-item/index.ts | 2 +-
 packages/extension-task-list/index.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/extension-task-item/index.ts b/packages/extension-task-item/index.ts
index 7652cd101..248164c4a 100644
--- a/packages/extension-task-item/index.ts
+++ b/packages/extension-task-item/index.ts
@@ -11,7 +11,7 @@ const TaskItem = createNode({
   name: 'taskItem',
 
   content() {
-    return this.options.nested ? '(paragraph|task_list)+' : 'paragraph+'
+    return this.options.nested ? '(paragraph|taskList)+' : 'paragraph+'
   },
 
   defining: true,
diff --git a/packages/extension-task-list/index.ts b/packages/extension-task-list/index.ts
index adc9b63b8..21fc7545a 100644
--- a/packages/extension-task-list/index.ts
+++ b/packages/extension-task-list/index.ts
@@ -1,7 +1,7 @@
 import { Command, createNode, mergeAttributes } from '@tiptap/core'
 
 const TaskList = createNode({
-  name: 'task_list',
+  name: 'taskList',
 
   group: 'block list',
 
@@ -10,20 +10,20 @@ const TaskList = createNode({
   parseHTML() {
     return [
       {
-        tag: 'ul[data-type="task_list"]',
+        tag: 'ul[data-type="taskList"]',
         priority: 51,
       },
     ]
   },
 
   renderHTML({ attributes }) {
-    return ['ul', mergeAttributes(attributes, { 'data-type': 'task_list' }), 0]
+    return ['ul', mergeAttributes(attributes, { 'data-type': 'taskList' }), 0]
   },
 
   addCommands() {
     return {
       taskList: (): Command => ({ commands }) => {
-        return commands.toggleList('task_list', 'taskItem')
+        return commands.toggleList('taskList', 'taskItem')
       },
     }
   },

From 5a9e8ce522e5b4424be6ccf829bcdc60cb7c4852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Thu, 5 Nov 2020 14:52:11 +0100
Subject: [PATCH 108/113] fixx task list style

---
 docs/src/demos/Nodes/TaskList/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/demos/Nodes/TaskList/index.vue b/docs/src/demos/Nodes/TaskList/index.vue
index edc67a693..6baf52e5f 100644
--- a/docs/src/demos/Nodes/TaskList/index.vue
+++ b/docs/src/demos/Nodes/TaskList/index.vue
@@ -53,7 +53,7 @@ export default {
 </script>
 
 <style lang="scss">
-ul[data-type="task_list"] {
+ul[data-type="taskList"] {
   list-style: none;
   padding: 0;
 

From ef1caab47f71285cfce22a415ea930420e4cc8f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Thu, 5 Nov 2020 15:11:24 +0100
Subject: [PATCH 109/113] whitespace

---
 docs/src/docPages/overview/upgrade-guide.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/src/docPages/overview/upgrade-guide.md b/docs/src/docPages/overview/upgrade-guide.md
index bab0d96c4..7f3115f9b 100644
--- a/docs/src/docPages/overview/upgrade-guide.md
+++ b/docs/src/docPages/overview/upgrade-guide.md
@@ -27,10 +27,10 @@ import Text from '@tiptap/extension-text'
 
 new Editor({
   extensions: [
-      Document(),
-      Paragraph(),
-      Text(),
-      // all your other extensions
+    Document(),
+    Paragraph(),
+    Text(),
+    // all your other extensions
   ]
 })
 ```

From 36f8b29f0d03b344a568cdaf3dbd6ceeded63a29 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Thu, 5 Nov 2020 16:02:12 +0100
Subject: [PATCH 110/113] add content

---
 docs/src/docPages/api/commands.md | 45 +++++++++++-----
 docs/src/docPages/api/schema.md   | 88 ++++++++++++++++++++++++++++++-
 docs/src/docPages/open.md         | 18 +++++++
 3 files changed, 137 insertions(+), 14 deletions(-)

diff --git a/docs/src/docPages/api/commands.md b/docs/src/docPages/api/commands.md
index e4de828ea..83d495ad0 100644
--- a/docs/src/docPages/api/commands.md
+++ b/docs/src/docPages/api/commands.md
@@ -14,7 +14,7 @@ editor.bold()
 
 While that’s perfectly fine and does make the selected bold, you’d likely want to change multiple commands in one run. Let’s have a look at how that works.
 
-## Chain commands
+### Chain commands
 Most commands can be executed combined to one call. First of all, that’s shorter than separate function call in most cases. Here is an example to make the selected text bold:
 
 ```js
@@ -27,26 +27,43 @@ When a user clicks on a button outside of the content, the editor isn’t in foc
 
 All chained commands are kind of queued up. They are combined to one single transaction. That means, the content is only updated once, also the `update` event is only triggered once.
 
-## Dry run for commands
-Sometimes, you don’t want to actually run the commands, but only know if it would be possible to run commands, for example to show or hide buttons in a menu. Inside of a command you can *try* to execute other commands, without actually changing the content like this:
+### Dry run for commands
+Sometimes, you don’t want to actually run the commands, but only know if it would be possible to run commands, for example to show or hide buttons in a menu. That’s what we added `.can()` for. Everything coming after this method will be executed, without applying the changes to the document:
 
 ```js
-commands.try([
-  () => commands.splitBlock(),
-  () => commands.whatever(),
-])
+editor.can().bold()
 ```
 
-Outside of components you can do this, too. The editor exposes a try method, which passes all commands and expects an array of commands you want to try:
+And you can use it together with `.chain()`, too. Here is an example which checks if it’s possible to apply all the commands:
+
+```js
+editor.can().chain().bold().italic().run()
+```
+
+Both calls would return `true` if it’s possible to apply the commands, and `false` in case it’s not.
+
+### Try commands
+If you want to run a list of commands, but want only the first successful command to be applied, you can do this with the `.try()` method. This method runs one command after the other and stops at the first which returns `true`.
+
+For example, the backspace key tries to undo an input rule first. If that was successful, it stops there. If no input rule has been applied and thus can’t be reverted, it runs the next command and deletes the selection, if there is one. Here is the simplified example:
 
 ```js
 editor.try(({ commands }) => [
-  () => commands.splitBlock(),
-  () => commands.whatever(),
+  () => commands.undoInputRule(),
+  () => commands.deleteSelection(),
+  // …
 ])
 ```
 
-This stops at the first command which return `false`. Commands after that won’t be executed. Even if all commands would be possible to run, none of the changes are applied to the document.
+Inside of commands you can do the same thing like that:
+
+```js
+commands.try([
+  () => commands.undoInputRule(),
+  () => commands.deleteSelection(),
+  // …
+])
+```
 
 ## List of commands
 Have a look at all of the core commands listed below. They should give you a good first impression of what’s possible.
@@ -98,5 +115,7 @@ Have a look at all of the core commands listed below. They should give you a goo
 | .scrollIntoView()  | Scroll the selection into view.         |
 | .selectAll()       | Select the whole document.              |
 
-### Extensions
-All extensions can add additional commands (and most do), check out the specific [documentation for the provided nodes](/api/nodes), [marks](/api/marks), and [extensions](/api/extensions) to learn more about those. Of course, you can [add your custom extensions](/guide/build-custom-extensions) with custom commands aswell.
+## Add your own commands
+All extensions can add additional commands (and most do), check out the specific [documentation for the provided nodes](/api/nodes), [marks](/api/marks), and [extensions](/api/extensions) to learn more about those.
+
+Of course, you can [add your custom extensions](/guide/build-custom-extensions) with custom commands aswell.
diff --git a/docs/src/docPages/api/schema.md b/docs/src/docPages/api/schema.md
index 7ed2fbbe9..4d6f85aa4 100644
--- a/docs/src/docPages/api/schema.md
+++ b/docs/src/docPages/api/schema.md
@@ -76,35 +76,121 @@ Marks can be applied to specific parts of a node. That’s the case for **bold**
 ### The node schema
 
 #### Content
-> The content expression for this node, as described in the schema guide. When not given, the node does not allow any content.
+The content attribute defines exactly what kind of content the node can have. ProseMirror is really strict with that. That means, content which doesn’t fit the schema is thrown away. It expects a name or group as a string. Here are a few examples:
+
+```js
+createNode({
+  // must have one ore more blocks
+  content: 'block+',
+
+  // allows all kinds of 'inline' content (text or hard breaks)
+  content: 'inline*',
+
+  // must not have anything else than 'text'
+  content: 'text*',
+
+  // can have one or more paragraphs, or lists (if lists are used)
+  content: '(paragraph|list?)+',
+})
+```
+
 
 #### Marks
 > The marks that are allowed inside of this node. May be a space-separated string referring to mark names or groups, "_" to explicitly allow all marks, or "" to disallow marks. When not given, nodes with inline content default to allowing all marks, other nodes default to not allowing marks.
 
+```js
+createNode({
+  // must contain 'bold' marks only
+  marks: 'bold',
+
+  // allows all marks
+  marks: '_',
+
+  // disallows all marks
+  marks: '',
+})
+```
+
 #### Group
 > The group or space-separated groups to which this node belongs, which can be referred to in the content expressions for the schema.
 
+```js
+createNode({
+  // add to 'block' group
+  group: 'block',
+
+  // add to 'inline' group
+  group: 'inline',
+
+  // add to 'block' and 'list' group
+  group: 'block list',
+})
+```
+
 #### Inline
 > Should be set to true for inline nodes. (Implied for text nodes.)
 
+```js
+createNode({
+  // renders nodes in line with, for example, the text
+  inline: true,
+})
+```
+
 #### Atom
 > Can be set to true to indicate that, though this isn't a leaf node, it doesn't have directly editable content and should be treated as a single unit in the view.
 
+```js
+createNode({
+  atom: true,
+})
+```
+
 #### Selectable
 > Controls whether nodes of this type can be selected as a node selection. Defaults to true for non-text nodes.
 
+```js
+createNode({
+  selectable: true,
+})
+```
+
 #### Draggable
 > Determines whether nodes of this type can be dragged without being selected. Defaults to false.
 
+```js
+createNode({
+  draggable: true,
+})
+```
+
 #### Code
 > Can be used to indicate that this node contains code, which causes some commands to behave differently.
 
+```js
+createNode({
+  code: true,
+})
+```
+
 #### Defining
 > Determines whether this node is considered an important parent node during replace operations (such as paste). Non-defining (the default) nodes get dropped when their entire content is replaced, whereas defining nodes persist and wrap the inserted content. Likewise, in inserted content the defining parents of the content are preserved when possible. Typically, non-default-paragraph textblock types, and possibly list items, are marked as defining.
 
+```js
+createNode({
+  defining: true,
+})
+```
+
 #### Isolating
 > When enabled (default is false), the sides of nodes of this type count as boundaries that regular editing operations, like backspacing or lifting, won't cross. An example of a node that should probably have this enabled is a table cell.
 
+```js
+createNode({
+  isolating: true,
+})
+```
+
 ### The mark schema
 #### Inclusive
 > Whether this mark should be active when the cursor is positioned at its end (or at its start when that is also the start of the parent node). Defaults to true.
diff --git a/docs/src/docPages/open.md b/docs/src/docPages/open.md
index 62400b831..b5d7cae32 100644
--- a/docs/src/docPages/open.md
+++ b/docs/src/docPages/open.md
@@ -1,8 +1,26 @@
 # Monthly reports
 
 ## October 2020
+* Writing extensions for tiptap 2
+* 25 sponsors, $423/month
+* 102 hours, $7,140 development costs (at $70/hour)
+* Sponsored @calebporzio with $99
+* **Total -$6,816**
 
 ## September 2020
+* Developing the API of tiptap 2, writing the documentation
+* 125 hours, $8,750 development costs (at $70/hour)
+* Sponsored @calebporzio with $99
+* **Total -$8,849**
 
 ## August 2020
+* Setting up tiptap 2
+* 56 hours, $3,920 development costs (at $70/hour)
+* Sponsored @calebporzio with $99
+* **Total -$4,019**
+
+## All time
+
+* **Total -$19.684**
+
 

From 9adeed74ef8021d36bd567b6be1dfba798afeef7 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Thu, 5 Nov 2020 16:17:01 +0100
Subject: [PATCH 111/113] add the sponsors page

---
 docs/src/docPages/sponsor.md | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/docs/src/docPages/sponsor.md b/docs/src/docPages/sponsor.md
index fcea3ceea..40a16564e 100644
--- a/docs/src/docPages/sponsor.md
+++ b/docs/src/docPages/sponsor.md
@@ -1,3 +1,23 @@
 # Become a sponsor
+To deliver you a top-notch developer experience and user experience, we put hundreds of hours of unpaid work into tiptap. Your funding helps us to make this work more and more financially sustainable. This enables us, to provide helpful support, maintain all our packages, keep everything up to date, and develop new features and extensions for tiptap.
 
-[Sponsor us on GitHub](https://github.com/sponsors/ueberdosis)
+If you’re using tiptap in a commercial project or just want to give back to the open source community, you can [sponsor us on GitHub](https://github.com/sponsors/ueberdosis).
+
+## Your benefits as a sponsor
+* Give back to the open source community
+* Get early access to the tiptap 2 repository
+* Your issues and pull requests get a `sponsor 💖` label
+* Get a sponsor badge in all your comments on GitHub
+* Show the support in your GitHub profile
+* Receive monthly reports related to our open source work
+
+Does that sound good? [Sponsor us on GitHub!](https://github.com/sponsors/ueberdosis)
+
+## I can’t use GitHub.
+If you’re a company, don’t want to use GitHub, don’t have a credit card or want a proper invoice form us, just reach out to us at [hans.pagel@ueber.io](mailto:hans.pagel@ueber.io).
+
+## I want consulting.
+We don’t do any calls, consulting or personal support. If you have an issue, a question, want to talk something through or anything else, please use GitHub issues, to keep everything accessible for the whole community.
+
+## Can we have a call?
+Nope, we are big fans of asynchronous communication. If you really need to reach out in private, send us an email to [hans.pagel@ueber.io](mailto:hans.pagel@ueber.io), but don’t expect technical email support.

From 1bd95e17f7355a05866743328a772a89313f60f3 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Thu, 5 Nov 2020 16:46:05 +0100
Subject: [PATCH 112/113] improve blockquote styling

---
 docs/src/templates/DocPage/style.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/src/templates/DocPage/style.scss b/docs/src/templates/DocPage/style.scss
index d17cb1856..71037f4aa 100644
--- a/docs/src/templates/DocPage/style.scss
+++ b/docs/src/templates/DocPage/style.scss
@@ -266,8 +266,8 @@
     }
 
     > blockquote {
-      border-left: 2px solid rgba($colorGrey, 0.5);
-      padding-left: $spacing;
+      border-left: 1px solid rgba($colorGrey, 0.5);
+      padding-left: 2*$spacing;
     }
 
   }

From 44a2839d412041632f3c023d34d3d2d045d83904 Mon Sep 17 00:00:00 2001
From: Hans Pagel <hans.pagel@ueber.io>
Date: Thu, 5 Nov 2020 17:01:25 +0100
Subject: [PATCH 113/113] add more content

---
 docs/src/docPages/api/events.md     |  2 +-
 docs/src/docPages/api/extensions.md | 16 +++++++
 docs/src/docPages/api/schema.md     | 72 +++++++++++++++++++++++------
 3 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/docs/src/docPages/api/events.md b/docs/src/docPages/api/events.md
index afd01daac..3aee03a00 100644
--- a/docs/src/docPages/api/events.md
+++ b/docs/src/docPages/api/events.md
@@ -31,6 +31,7 @@ const editor = new Editor({
 ## Option 2: Later
 Or you can register your event listeners on a running editor instance:
 
+### Bind event listeners
 ```js
 editor.on('init', () => {
   // The editor is ready.
@@ -54,7 +55,6 @@ editor.on('transaction', ({ transaction }) => {
 ```
 
 ### Unbind event listeners
-
 If you need to unbind those event listeners at some point, you should register your event listeners with `.on()` and unbind them with `.off()` then.
 
 ```js
diff --git a/docs/src/docPages/api/extensions.md b/docs/src/docPages/api/extensions.md
index 9649f955a..d46c4f448 100644
--- a/docs/src/docPages/api/extensions.md
+++ b/docs/src/docPages/api/extensions.md
@@ -42,3 +42,19 @@ const editor = new Editor({
 ```
 
 Learn [more about custom extensions in our guide](/guide/build-custom-extensions).
+
+### ProseMirror plugins
+ProseMirror has a fantastic eco system with many amazing plugins. If you want to use one of them, you can register them with tiptap like that:
+
+```js
+import { history } from 'prosemirror-history'
+
+const History = createExtension({
+  addProseMirrorPlugins() {
+    return [
+      history(),
+      // …
+    ]
+  },
+})
+```
diff --git a/docs/src/docPages/api/schema.md b/docs/src/docPages/api/schema.md
index 4d6f85aa4..3fe871d43 100644
--- a/docs/src/docPages/api/schema.md
+++ b/docs/src/docPages/api/schema.md
@@ -66,6 +66,10 @@ const Text = createNode({
 })
 ```
 
+### Parse HTML
+
+### Render HTML
+
 ## Nodes and marks
 
 ### Differences
@@ -96,13 +100,16 @@ createNode({
 
 
 #### Marks
-> The marks that are allowed inside of this node. May be a space-separated string referring to mark names or groups, "_" to explicitly allow all marks, or "" to disallow marks. When not given, nodes with inline content default to allowing all marks, other nodes default to not allowing marks.
+You can define which marks are allowed inside of a node with the `marks` setting of the schema. Add a one or more names or groups of marks, allow all or disallow all marks like this:
 
 ```js
 createNode({
-  // must contain 'bold' marks only
+  // allows only the 'bold' mark
   marks: 'bold',
 
+  // allows only the 'bold' and 'italic' marks
+  marks: 'bold italic',
+
   // allows all marks
   marks: '_',
 
@@ -112,7 +119,7 @@ createNode({
 ```
 
 #### Group
-> The group or space-separated groups to which this node belongs, which can be referred to in the content expressions for the schema.
+Add this node to a group of extensions, which can be referred to in the [content](#content) attribute of the schema.
 
 ```js
 createNode({
@@ -128,17 +135,17 @@ createNode({
 ```
 
 #### Inline
-> Should be set to true for inline nodes. (Implied for text nodes.)
+Nodes can be rendered inline, too. When setting `inline: true` nodes are rendered in line with the text. That’s the case for mentions. The result is more like a mark, but with the functionality of a node. One difference is the resulting JSON document. Multiple marks are applied at once, inline nodes would result in a nested structure.
 
 ```js
 createNode({
-  // renders nodes in line with, for example, the text
+  // renders nodes in line with the text, for example
   inline: true,
 })
 ```
 
 #### Atom
-> Can be set to true to indicate that, though this isn't a leaf node, it doesn't have directly editable content and should be treated as a single unit in the view.
+Nodes with `atom: true` aren’t directly editable and should be treated as a single unit. It’s not so likely to use that in a editor context, but this is how it would look like:
 
 ```js
 createNode({
@@ -156,7 +163,7 @@ createNode({
 ```
 
 #### Draggable
-> Determines whether nodes of this type can be dragged without being selected. Defaults to false.
+All nodes can be configured to be draggable (by default they aren’t) with this setting:
 
 ```js
 createNode({
@@ -165,7 +172,7 @@ createNode({
 ```
 
 #### Code
-> Can be used to indicate that this node contains code, which causes some commands to behave differently.
+Users expect code to behave very differently. For all kind of nodes containing code, you can set `code: true` to take this into account.
 
 ```js
 createNode({
@@ -183,7 +190,7 @@ createNode({
 ```
 
 #### Isolating
-> When enabled (default is false), the sides of nodes of this type count as boundaries that regular editing operations, like backspacing or lifting, won't cross. An example of a node that should probably have this enabled is a table cell.
+For nodes that should fence the cursor for regular editing operations like backspacing, for example a TableCell, set `isolating: true`.
 
 ```js
 createNode({
@@ -193,18 +200,55 @@ createNode({
 
 ### The mark schema
 #### Inclusive
-> Whether this mark should be active when the cursor is positioned at its end (or at its start when that is also the start of the parent node). Defaults to true.
+If you don’t want the mark to be active when the cursor is at its end, set inclusive to `false`. For example, that’s how it’s configured for [`Link`](/api/marks/link) marks:
+
+```js
+createMark({
+  inclusive: false,
+})
+```
 
 #### Excludes
-> Determines which other marks this mark can coexist with. Should be a space-separated strings naming other marks or groups of marks When a mark is added to a set, all marks that it excludes are removed in the process. If the set contains any mark that excludes the new mark but is not, itself, excluded by the new mark, the mark can not be added an the set. You can use the value "_" to indicate that the mark excludes all marks in the schema.
+By default all nodes can be applied at the same time. With the excludes attribute you can define which marks must not coexist with the mark. For example, the inline code mark excludes any other mark (bold, italic, and all others).
 
-> Defaults to only being exclusive with marks of the same type. You can set it to an empty string (or any string not containing the mark's own name) to allow multiple marks of a given type to coexist (as long as they have different attributes).
+```js
+createMark({
+  // must not coexist with the bold mark
+  excludes: 'bold'
+  // exclude any other mark
+  excludes: '_',
+})
+```
 
 #### Group
-> The group or space-separated groups to which this mark belongs.
+Add this mark to a group of extensions, which can be referred to in the content attribute of the schema.
+
+```js
+createMark({
+  // add this mark to the 'basic' group
+  group: 'basic',
+  // add this mark to the 'basic' and the 'foobar' group
+  group: 'foobar',
+})
+```
+
+#### Code
+Users expect code to behave very differently. For all kind of marks containing code, you can set `code: true` to take this into account.
+
+```js
+createMark({
+  code: true,
+})
+```
 
 #### Spanning
-> Determines whether marks of this type can span multiple adjacent nodes when serialized to DOM/HTML. Defaults to true.
+By default marks can span multiple nodes when rendered as HTML. Set `spanning: false` to indicate that a mark must not span multiple nodes.
+
+```js
+createMark({
+  spanning: false,
+})
+```
 
 ## Get the underlying ProseMirror schema
 There are a few use cases where you need to work with the underlying schema. You’ll need that if you’re using the tiptap collaborative text editing features or if you want to manually render your content as HTML.