Merge branch 'main' of github.com:ueberdosis/tiptap-next

docs/src/demos/Examples/CollaborativeEditing/index.vue

@@ -77,9 +77,6 @@ export default {
         Highlight,
         TaskList,
         CustomTaskItem,
-        Collaboration.configure({
-          document: ydoc,
-        }),
         CollaborationCursor.configure({
           provider: this.provider,
           user: this.currentUser,
@@ -87,6 +84,9 @@ export default {
             this.users = users
           },
         }),
+        Collaboration.configure({
+          document: ydoc,
+        }),
       ],
     })
 

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: {

docs/src/demos/Extensions/CollaborationCursor/index.vue

@@ -33,9 +33,6 @@ export default {
         Document,
         Paragraph,
         Text,
-        Collaboration.configure({
-          document: ydoc,
-        }),
         CollaborationCursor.configure({
           provider: this.provider,
           user: {
@@ -43,6 +40,9 @@ export default {
             color: '#f783ac',
           },
         }),
+        Collaboration.configure({
+          document: ydoc,
+        }),
       ],
     })
   },

docs/src/demos/Nodes/TaskList/index.spec.js

@@ -121,6 +121,6 @@ context('/demos/Nodes/TaskList', () => {
     cy.get('.ProseMirror')
       .find('li:nth-child(2)')
       .should('contain', 'List Item 2')
-      .should('have.attr', 'data-checked', 'true')
+      .should('have.attr', 'data-checked', 'false')
   })
 })

docs/src/docPages/guide/collaborative-editing.md

@@ -155,16 +155,16 @@ const provider = new WebsocketProvider('ws://127.0.0.1:1234', 'example-document'
 
 const editor = new Editor({
   extensions: [
-    // …
-    Collaboration.configure({
-      document: ydoc,
-    }),
     // Register the collaboration cursor extension
     CollaborationCursor.configure({
       provider: provider,
       name: 'Cyndi Lauper',
       color: '#f783ac',
     }),
+    Collaboration.configure({
+      document: ydoc,
+    }),
+    // …
   ],
 })
 ```