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

packages/core/src/commands/updateMarkAttributes.ts

@@ -4,7 +4,7 @@ import getMarkType from '../utils/getMarkType'
 import getMarkRange from '../utils/getMarkRange'
 
 export default (typeOrName: string | MarkType, attrs: {}): Command => ({ tr, state, dispatch }) => {
-  const { selection, doc } = tr
+  const { selection } = tr
   let { from, to } = selection
   const { $from, empty } = selection
   const type = getMarkType(typeOrName, state.schema)
@@ -18,11 +18,12 @@ export default (typeOrName: string | MarkType, attrs: {}): Command => ({ tr, sta
     }
   }
 
-  const hasMark = doc.rangeHasMark(from, to, type)
+  // TODO: toggleMark?
+  // const hasMark = doc.rangeHasMark(from, to, type)
 
-  if (hasMark && dispatch) {
-    tr.removeMark(from, to, type)
-  }
+  // if (hasMark && dispatch) {
+  //   tr.removeMark(from, to, type)
+  // }
 
   if (dispatch) {
     tr.addMark(from, to, type.create(attrs))

packages/core/src/extensions/commands.ts

@@ -15,7 +15,6 @@ import selectAll from '../commands/selectAll'
 import selectParentNode from '../commands/selectParentNode'
 import setBlockType from '../commands/setBlockType'
 import setContent from '../commands/setContent'
-import setNodeAttributes from '../commands/setNodeAttributes'
 import sinkListItem from '../commands/sinkListItem'
 import splitBlock from '../commands/splitBlock'
 import splitListItem from '../commands/splitListItem'
@@ -24,7 +23,8 @@ import toggleList from '../commands/toggleList'
 import toggleMark from '../commands/toggleMark'
 import toggleWrap from '../commands/toggleWrap'
 import tryCommand from '../commands/try'
-import updateMark from '../commands/updateMark'
+import updateMarkAttributes from '../commands/updateMarkAttributes'
+import updateNodeAttributes from '../commands/updateNodeAttributes'
 import wrapInList from '../commands/wrapInList'
 
 export const Commands = createExtension({
@@ -46,7 +46,6 @@ export const Commands = createExtension({
       selectParentNode,
       setBlockType,
       setContent,
-      setNodeAttributes,
       sinkListItem,
       splitBlock,
       splitListItem,
@@ -55,7 +54,8 @@ export const Commands = createExtension({
       toggleMark,
       toggleWrap,
       try: tryCommand,
-      updateMark,
+      updateMarkAttributes,
+      updateNodeAttributes,
       wrapInList,
     }
   },

packages/extension-link/index.ts

@@ -50,7 +50,7 @@ const Link = createMark({
           return commands.removeMark('link')
         }
 
-        return commands.updateMark('link', options)
+        return commands.updateMarkAttributes('link', options)
       },
     }
   },

packages/extension-text-align/index.ts

@@ -39,7 +39,7 @@ const TextAlign = createExtension({
           return false
         }
 
-        return commands.setNodeAttributes({ textAlign: alignment })
+        return commands.updateNodeAttributes({ textAlign: alignment })
       },
     }
   },