From 55e5a4a3ae35f9e1d509b32d5193ebe183b7a3c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Ku=CC=88hn?= <kontakt@philipp-kuehn.com>
Date: Sat, 4 May 2019 00:25:14 +0200
Subject: [PATCH] move collab extension

---
 .../Components/Routes/Collaboration/Collab.js | 43 -------------
 .../Components/Routes/Collaboration/index.vue | 28 ++-------
 package.json                                  |  2 -
 packages/tiptap-extensions/package.json       |  3 +
 .../src/extensions/Collaboration.js           | 62 +++++++++++++++++++
 packages/tiptap-extensions/src/index.js       |  1 +
 yarn.lock                                     |  2 +-
 7 files changed, 72 insertions(+), 69 deletions(-)
 delete mode 100644 examples/Components/Routes/Collaboration/Collab.js
 create mode 100644 packages/tiptap-extensions/src/extensions/Collaboration.js

diff --git a/examples/Components/Routes/Collaboration/Collab.js b/examples/Components/Routes/Collaboration/Collab.js
deleted file mode 100644
index a59328b2..00000000
--- a/examples/Components/Routes/Collaboration/Collab.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Extension } from 'tiptap'
-import { collab, sendableSteps } from 'prosemirror-collab'
-import { debounce } from 'lodash-es'
-
-export default class CollabExtension extends Extension {
-
-  get name() {
-    return 'collab'
-  }
-
-  init() {
-    this.editor.on('update', ({ state }) => {
-      this.getSendableSteps(state)
-    })
-  }
-
-  get defaultOptions() {
-    return {
-      version: 0,
-      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
-      debounce: 250,
-      onSend: () => {},
-    }
-  }
-
-  get plugins() {
-    return [
-      collab({
-        version: this.options.version,
-        clientID: this.options.clientID,
-      }),
-    ]
-  }
-
-  getSendableSteps = debounce(state => {
-    const sendable = sendableSteps(state)
-
-    if (sendable) {
-      this.options.onSend(sendable)
-    }
-  }, this.options.debounce)
-
-}
diff --git a/examples/Components/Routes/Collaboration/index.vue b/examples/Components/Routes/Collaboration/index.vue
index f7adc7cb..293541e5 100644
--- a/examples/Components/Routes/Collaboration/index.vue
+++ b/examples/Components/Routes/Collaboration/index.vue
@@ -10,9 +10,7 @@
 <script>
 import io from 'socket.io-client'
 import { Editor, EditorContent } from 'tiptap'
-import { Step } from 'prosemirror-transform'
-import { receiveTransaction, getVersion } from 'prosemirror-collab'
-import Collab from './Collab'
+import { Collaboration } from 'tiptap-extensions'
 
 export default {
   components: {
@@ -38,38 +36,22 @@ export default {
       this.editor = new Editor({
         content: doc,
         extensions: [
-          new Collab({
+          new Collaboration({
             version,
             debounce: 250,
-            onSend: sendable => {
-              this.socket.emit('update', sendable)
+            onSendable: data => {
+              this.socket.emit('update', data)
             },
           }),
         ],
       })
-
-      // console.log(this.editor.extensions.options.collab.version)
-    },
-
-    onUpdate({ steps, version }) {
-      const { state, view, schema } = this.editor
-
-      if (getVersion(state) > version) {
-        return
-      }
-
-      view.dispatch(receiveTransaction(
-        state,
-        steps.map(item => Step.fromJSON(schema, item.step)),
-        steps.map(item => item.clientID),
-      ))
     },
   },
 
   mounted() {
     this.socket = io('wss://tiptap-sockets.glitch.me')
       .on('init', data => this.onInit(data))
-      .on('update', data => this.onUpdate(data))
+      .on('update', data => this.editor.extensions.options.collaboration.onUpdate(data))
   },
 
   beforeDestroy() {
diff --git a/package.json b/package.json
index 027d3bbf..f4d00af8 100644
--- a/package.json
+++ b/package.json
@@ -91,8 +91,6 @@
     "zlib": "^1.0.5"
   },
   "dependencies": {
-    "lodash-es": "^4.17.11",
-    "prosemirror-collab": "^1.1.1",
     "socket.io-client": "^2.2.0"
   }
 }
diff --git a/packages/tiptap-extensions/package.json b/packages/tiptap-extensions/package.json
index 420e99a3..f9a89978 100644
--- a/packages/tiptap-extensions/package.json
+++ b/packages/tiptap-extensions/package.json
@@ -21,10 +21,13 @@
     "url": "https://github.com/scrumpy/tiptap/issues"
   },
   "dependencies": {
+    "lodash-es": "^4.17.11",
     "lowlight": "^1.11.0",
+    "prosemirror-collab": "^1.1.1",
     "prosemirror-history": "^1.0.4",
     "prosemirror-state": "^1.2.2",
     "prosemirror-tables": "^0.7.11",
+    "prosemirror-transform": "^1.1.3",
     "prosemirror-utils": "^0.7.6",
     "prosemirror-view": "^1.8.9",
     "tiptap": "^1.17.0",
diff --git a/packages/tiptap-extensions/src/extensions/Collaboration.js b/packages/tiptap-extensions/src/extensions/Collaboration.js
new file mode 100644
index 00000000..47250dd4
--- /dev/null
+++ b/packages/tiptap-extensions/src/extensions/Collaboration.js
@@ -0,0 +1,62 @@
+import { debounce } from 'lodash-es'
+import { Extension } from 'tiptap'
+import { Step } from 'prosemirror-transform'
+import {
+  collab,
+  sendableSteps,
+  getVersion,
+  receiveTransaction,
+} from 'prosemirror-collab'
+
+export default class CollaborationExtension extends Extension {
+
+  get name() {
+    return 'collaboration'
+  }
+
+  init() {
+    this.editor.on('update', ({ state }) => {
+      this.getSendableSteps(state)
+    })
+  }
+
+  get defaultOptions() {
+    return {
+      version: 0,
+      clientID: Math.floor(Math.random() * 0xFFFFFFFF),
+      debounce: 250,
+      onSendable: () => {},
+      onUpdate: ({ steps, version }) => {
+        const { state, view, schema } = this.editor
+
+        if (getVersion(state) > version) {
+          return
+        }
+
+        view.dispatch(receiveTransaction(
+          state,
+          steps.map(item => Step.fromJSON(schema, item.step)),
+          steps.map(item => item.clientID),
+        ))
+      },
+    }
+  }
+
+  get plugins() {
+    return [
+      collab({
+        version: this.options.version,
+        clientID: this.options.clientID,
+      }),
+    ]
+  }
+
+  getSendableSteps = debounce(state => {
+    const sendable = sendableSteps(state)
+
+    if (sendable) {
+      this.options.onSendable(sendable)
+    }
+  }, this.options.debounce)
+
+}
diff --git a/packages/tiptap-extensions/src/index.js b/packages/tiptap-extensions/src/index.js
index d0d6a169..4851bb51 100644
--- a/packages/tiptap-extensions/src/index.js
+++ b/packages/tiptap-extensions/src/index.js
@@ -23,6 +23,7 @@ export { default as Link } from './marks/Link'
 export { default as Strike } from './marks/Strike'
 export { default as Underline } from './marks/Underline'
 
+export { default as Collaboration } from './extensions/Collaboration'
 export { default as History } from './extensions/History'
 export { default as Placeholder } from './extensions/Placeholder'
 
diff --git a/yarn.lock b/yarn.lock
index 62eca021..0addca56 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9681,7 +9681,7 @@ prosemirror-tables@^0.7.11:
     prosemirror-transform "^1.0.0"
     prosemirror-view "^1.0.0"
 
-prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0:
+prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.1.3.tgz#28cfdf1f9ee514edc40466be7b7db39eed545fdf"
   integrity sha512-1O6Di5lOL1mp4nuCnQNkHY7l2roIW5y8RH4ZG3hMYmkmDEWzTaFFnxxAAHsE5ipGLBSRcTlP7SsDhYBIdSuLpQ==