move plugins to extensions

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: [
+        plugins: this.extensionManager.plugins,
-          ...this.extensionManager.plugins,
-          ...defaultPlugins.map(plugin => plugin(this.proxy)),
-        ],
       }),
       dispatchTransaction: this.dispatchTransaction.bind(this),
     })

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,
+        },
+      }),
+    ]
+  },
+})

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,
+  }
+}

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'

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,
+  }
+}

packages/core/src/plugins/editable.ts

@@ -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,
-  },
-})

packages/core/src/plugins/focus.ts

@@ -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
-      },
-    },
-  },
-})

packages/core/src/plugins/index.ts

@@ -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,
-]