From 07cfc995023f1a6f497ff1480296a518529bf269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Thu, 28 Jan 2021 17:39:57 +0100
Subject: [PATCH] improve plugin order

---
 docs/src/demos/Examples/Default/index.vue | 22 ++++++++++++++++++++--
 packages/core/src/Editor.ts               |  4 ++--
 packages/core/src/ExtensionManager.ts     |  3 ++-
 packages/starter-kit/src/index.ts         | 14 +++++++-------
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/docs/src/demos/Examples/Default/index.vue b/docs/src/demos/Examples/Default/index.vue
index e97fc4f6..e2c4bb5d 100644
--- a/docs/src/demos/Examples/Default/index.vue
+++ b/docs/src/demos/Examples/Default/index.vue
@@ -70,7 +70,9 @@
 </template>
 
 <script>
-import { Editor, EditorContent, defaultExtensions } from '@tiptap/vue-starter-kit'
+import {
+  Editor, EditorContent, defaultExtensions, Extension,
+} from '@tiptap/vue-starter-kit'
 
 export default {
   components: {
@@ -85,7 +87,23 @@ export default {
 
   mounted() {
     this.editor = new Editor({
-      extensions: defaultExtensions(),
+      extensions: [
+        ...defaultExtensions(),
+        Extension.create({
+          addKeyboardShortcuts() {
+            return {
+              'Mod-Enter': () => {
+                console.log('Mod-Enter plugin')
+                return false
+              },
+              'Shift-Enter': () => {
+                console.log('Shift-Enter')
+                return false
+              },
+            }
+          },
+        }),
+      ],
       content: `
         <h2>
           Hi there,
diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
index 6c62603b..a457e564 100644
--- a/packages/core/src/Editor.ts
+++ b/packages/core/src/Editor.ts
@@ -195,7 +195,7 @@ export class Editor extends EventEmitter {
   public registerPlugin(plugin: Plugin, handlePlugins?: (newPlugin: Plugin, plugins: Plugin[]) => Plugin[]): void {
     const plugins = typeof handlePlugins === 'function'
       ? handlePlugins(plugin, this.state.plugins)
-      : [plugin, ...this.state.plugins]
+      : [...this.state.plugins, plugin]
 
     const state = this.state.reconfigure({ plugins })
 
@@ -221,7 +221,7 @@ export class Editor extends EventEmitter {
    */
   private createExtensionManager(): void {
     const coreExtensions = Object.entries(extensions).map(([, extension]) => extension)
-    const allExtensions = [...this.options.extensions, ...coreExtensions].filter(extension => {
+    const allExtensions = [...coreExtensions, ...this.options.extensions].filter(extension => {
       return ['extension', 'node', 'mark'].includes(extension?.type)
     })
 
diff --git a/packages/core/src/ExtensionManager.ts b/packages/core/src/ExtensionManager.ts
index 6b680dbc..43a12dd6 100644
--- a/packages/core/src/ExtensionManager.ts
+++ b/packages/core/src/ExtensionManager.ts
@@ -67,7 +67,8 @@ export default class ExtensionManager {
   }
 
   get plugins(): Plugin[] {
-    return this.extensions
+    return [...this.extensions]
+      .reverse()
       .map(extension => {
         const context = {
           options: extension.options,
diff --git a/packages/starter-kit/src/index.ts b/packages/starter-kit/src/index.ts
index 5022166a..23cd8ed6 100644
--- a/packages/starter-kit/src/index.ts
+++ b/packages/starter-kit/src/index.ts
@@ -35,23 +35,23 @@ export function defaultExtensions(options?: Partial<{
   listItem: ListItemOptions,
 }>) {
   return [
-    Dropcursor.configure(options?.dropursor),
-    Gapcursor,
     Document,
-    History.configure(options?.history),
     Paragraph.configure(options?.paragraph),
     Text,
     Bold.configure(options?.bold),
     Italic.configure(options?.italic),
     Code.configure(options?.code),
-    CodeBlock.configure(options?.codeBlock),
-    Heading.configure(options?.heading),
-    HardBreak.configure(options?.hardBreak),
     Strike.configure(options?.strike),
+    HardBreak.configure(options?.hardBreak),
+    Heading.configure(options?.heading),
     Blockquote.configure(options?.blockquote),
-    HorizontalRule.configure(options?.horizontalRule),
     BulletList.configure(options?.bulletList),
     OrderedList.configure(options?.orderedList),
     ListItem.configure(options?.listItem),
+    HorizontalRule.configure(options?.horizontalRule),
+    CodeBlock.configure(options?.codeBlock),
+    History.configure(options?.history),
+    Dropcursor.configure(options?.dropursor),
+    Gapcursor,
   ]
 }