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

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;
 

docs/src/docPages/overview/upgrade-guide.md

@@ -27,10 +27,10 @@ import Text from '@tiptap/extension-text'
 
 new Editor({
   extensions: [
-      Document(),
+    Document(),
-      Paragraph(),
+    Paragraph(),
-      Text(),
+    Text(),
-      // all your other extensions
+    // all your other extensions
   ]
 })
 ```

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

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

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,

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