@tiptap/core 3.0.0-next.3 → 3.0.0-next.5

package/src/commands/keyboardShortcut.ts

@@ -64,42 +64,37 @@ declare module '@tiptap/core' {
        * @param name The name of the keyboard shortcut.
        * @example editor.commands.keyboardShortcut('Mod-b')
        */
-      keyboardShortcut: (name: string) => ReturnType,
+      keyboardShortcut: (name: string) => ReturnType
     }
   }
 }
 
-export const keyboardShortcut: RawCommands['keyboardShortcut'] = name => ({
-  editor,
-  view,
-  tr,
-  dispatch,
-}) => {
-  const keys = normalizeKeyName(name).split(/-(?!$)/)
-  const key = keys.find(item => !['Alt', 'Ctrl', 'Meta', 'Shift'].includes(item))
-  const event = new KeyboardEvent('keydown', {
-    key: key === 'Space'
-      ? ' '
-      : key,
-    altKey: keys.includes('Alt'),
-    ctrlKey: keys.includes('Ctrl'),
-    metaKey: keys.includes('Meta'),
-    shiftKey: keys.includes('Shift'),
-    bubbles: true,
-    cancelable: true,
-  })
-
-  const capturedTransaction = editor.captureTransaction(() => {
-    view.someProp('handleKeyDown', f => f(view, event))
-  })
-
-  capturedTransaction?.steps.forEach(step => {
-    const newStep = step.map(tr.mapping)
-
-    if (newStep && dispatch) {
-      tr.maybeStep(newStep)
-    }
-  })
+export const keyboardShortcut: RawCommands['keyboardShortcut'] =
+  name =>
+  ({ editor, view, tr, dispatch }) => {
+    const keys = normalizeKeyName(name).split(/-(?!$)/)
+    const key = keys.find(item => !['Alt', 'Ctrl', 'Meta', 'Shift'].includes(item))
+    const event = new KeyboardEvent('keydown', {
+      key: key === 'Space' ? ' ' : key,
+      altKey: keys.includes('Alt'),
+      ctrlKey: keys.includes('Ctrl'),
+      metaKey: keys.includes('Meta'),
+      shiftKey: keys.includes('Shift'),
+      bubbles: true,
+      cancelable: true,
+    })
+
+    const capturedTransaction = editor.captureTransaction(() => {
+      view.someProp('handleKeyDown', f => f(view, event))
+    })
+
+    capturedTransaction?.steps.forEach(step => {
+      const newStep = step.map(tr.mapping)
+
+      if (newStep && dispatch) {
+        tr.maybeStep(newStep)
+      }
+    })
 
-  return true
-}
+    return true
+  }

package/src/commands/lift.ts

@@ -20,13 +20,15 @@ declare module '@tiptap/core' {
   }
 }
 
-export const lift: RawCommands['lift'] = (typeOrName, attributes = {}) => ({ state, dispatch }) => {
-  const type = getNodeType(typeOrName, state.schema)
-  const isActive = isNodeActive(state, type, attributes)
+export const lift: RawCommands['lift'] =
+  (typeOrName, attributes = {}) =>
+  ({ state, dispatch }) => {
+    const type = getNodeType(typeOrName, state.schema)
+    const isActive = isNodeActive(state, type, attributes)
 
-  if (!isActive) {
-    return false
-  }
+    if (!isActive) {
+      return false
+    }
 
-  return originalLift(state, dispatch)
-}
+    return originalLift(state, dispatch)
+  }

package/src/commands/liftEmptyBlock.ts

@@ -9,11 +9,13 @@ declare module '@tiptap/core' {
        * If the cursor is in an empty textblock that can be lifted, lift the block.
        * @example editor.commands.liftEmptyBlock()
        */
-      liftEmptyBlock: () => ReturnType,
+      liftEmptyBlock: () => ReturnType
     }
   }
 }
 
-export const liftEmptyBlock: RawCommands['liftEmptyBlock'] = () => ({ state, dispatch }) => {
-  return originalLiftEmptyBlock(state, dispatch)
-}
+export const liftEmptyBlock: RawCommands['liftEmptyBlock'] =
+  () =>
+  ({ state, dispatch }) => {
+    return originalLiftEmptyBlock(state, dispatch)
+  }

package/src/commands/liftListItem.ts

@@ -17,8 +17,10 @@ declare module '@tiptap/core' {
   }
 }
 
-export const liftListItem: RawCommands['liftListItem'] = typeOrName => ({ state, dispatch }) => {
-  const type = getNodeType(typeOrName, state.schema)
+export const liftListItem: RawCommands['liftListItem'] =
+  typeOrName =>
+  ({ state, dispatch }) => {
+    const type = getNodeType(typeOrName, state.schema)
 
-  return originalLiftListItem(type)(state, dispatch)
-}
+    return originalLiftListItem(type)(state, dispatch)
+  }

package/src/commands/newlineInCode.ts

@@ -14,6 +14,8 @@ declare module '@tiptap/core' {
   }
 }
 
-export const newlineInCode: RawCommands['newlineInCode'] = () => ({ state, dispatch }) => {
-  return originalNewlineInCode(state, dispatch)
-}
+export const newlineInCode: RawCommands['newlineInCode'] =
+  () =>
+  ({ state, dispatch }) => {
+    return originalNewlineInCode(state, dispatch)
+  }

package/src/commands/resetAttributes.ts

@@ -15,56 +15,51 @@ declare module '@tiptap/core' {
        * @param attributes The attributes of the node to reset.
        * @example editor.commands.resetAttributes('heading', 'level')
        */
-      resetAttributes: (
-        typeOrName: string | NodeType | MarkType,
-        attributes: string | string[],
-      ) => ReturnType
+      resetAttributes: (typeOrName: string | NodeType | MarkType, attributes: string | string[]) => ReturnType
     }
   }
 }
 
-export const resetAttributes: RawCommands['resetAttributes'] = (typeOrName, attributes) => ({ tr, state, dispatch }) => {
-  let nodeType: NodeType | null = null
-  let markType: MarkType | null = null
+export const resetAttributes: RawCommands['resetAttributes'] =
+  (typeOrName, attributes) =>
+  ({ tr, state, dispatch }) => {
+    let nodeType: NodeType | null = null
+    let markType: MarkType | null = null
 
-  const schemaType = getSchemaTypeNameByName(
-    typeof typeOrName === 'string' ? typeOrName : typeOrName.name,
-    state.schema,
-  )
+    const schemaType = getSchemaTypeNameByName(
+      typeof typeOrName === 'string' ? typeOrName : typeOrName.name,
+      state.schema,
+    )
 
-  if (!schemaType) {
-    return false
-  }
+    if (!schemaType) {
+      return false
+    }
 
-  if (schemaType === 'node') {
-    nodeType = getNodeType(typeOrName as NodeType, state.schema)
-  }
+    if (schemaType === 'node') {
+      nodeType = getNodeType(typeOrName as NodeType, state.schema)
+    }
 
-  if (schemaType === 'mark') {
-    markType = getMarkType(typeOrName as MarkType, state.schema)
-  }
+    if (schemaType === 'mark') {
+      markType = getMarkType(typeOrName as MarkType, state.schema)
+    }
 
-  if (dispatch) {
-    tr.selection.ranges.forEach(range => {
-      state.doc.nodesBetween(range.$from.pos, range.$to.pos, (node, pos) => {
-        if (nodeType && nodeType === node.type) {
-          tr.setNodeMarkup(pos, undefined, deleteProps(node.attrs, attributes))
-        }
+    if (dispatch) {
+      tr.selection.ranges.forEach(range => {
+        state.doc.nodesBetween(range.$from.pos, range.$to.pos, (node, pos) => {
+          if (nodeType && nodeType === node.type) {
+            tr.setNodeMarkup(pos, undefined, deleteProps(node.attrs, attributes))
+          }
 
-        if (markType && node.marks.length) {
-          node.marks.forEach(mark => {
-            if (markType === mark.type) {
-              tr.addMark(
-                pos,
-                pos + node.nodeSize,
-                markType.create(deleteProps(mark.attrs, attributes)),
-              )
-            }
-          })
-        }
+          if (markType && node.marks.length) {
+            node.marks.forEach(mark => {
+              if (markType === mark.type) {
+                tr.addMark(pos, pos + node.nodeSize, markType.create(deleteProps(mark.attrs, attributes)))
+              }
+            })
+          }
+        })
       })
-    })
-  }
+    }
 
-  return true
-}
+    return true
+  }

package/src/commands/scrollIntoView.ts

@@ -7,15 +7,17 @@ declare module '@tiptap/core' {
        * Scroll the selection into view.
        * @example editor.commands.scrollIntoView()
        */
-      scrollIntoView: () => ReturnType,
+      scrollIntoView: () => ReturnType
     }
   }
 }
 
-export const scrollIntoView: RawCommands['scrollIntoView'] = () => ({ tr, dispatch }) => {
-  if (dispatch) {
-    tr.scrollIntoView()
-  }
+export const scrollIntoView: RawCommands['scrollIntoView'] =
+  () =>
+  ({ tr, dispatch }) => {
+    if (dispatch) {
+      tr.scrollIntoView()
+    }
 
-  return true
-}
+    return true
+  }

package/src/commands/selectAll.ts

@@ -9,17 +9,19 @@ declare module '@tiptap/core' {
        * Select the whole document.
        * @example editor.commands.selectAll()
        */
-      selectAll: () => ReturnType,
+      selectAll: () => ReturnType
     }
   }
 }
 
-export const selectAll: RawCommands['selectAll'] = () => ({ tr, dispatch }) => {
-  if (dispatch) {
-    const selection = new AllSelection(tr.doc)
+export const selectAll: RawCommands['selectAll'] =
+  () =>
+  ({ tr, dispatch }) => {
+    if (dispatch) {
+      const selection = new AllSelection(tr.doc)
 
-    tr.setSelection(selection)
-  }
+      tr.setSelection(selection)
+    }
 
-  return true
-}
+    return true
+  }

package/src/commands/selectNodeBackward.ts

@@ -14,6 +14,8 @@ declare module '@tiptap/core' {
   }
 }
 
-export const selectNodeBackward: RawCommands['selectNodeBackward'] = () => ({ state, dispatch }) => {
-  return originalSelectNodeBackward(state, dispatch)
-}
+export const selectNodeBackward: RawCommands['selectNodeBackward'] =
+  () =>
+  ({ state, dispatch }) => {
+    return originalSelectNodeBackward(state, dispatch)
+  }

package/src/commands/selectNodeForward.ts

@@ -14,6 +14,8 @@ declare module '@tiptap/core' {
   }
 }
 
-export const selectNodeForward: RawCommands['selectNodeForward'] = () => ({ state, dispatch }) => {
-  return originalSelectNodeForward(state, dispatch)
-}
+export const selectNodeForward: RawCommands['selectNodeForward'] =
+  () =>
+  ({ state, dispatch }) => {
+    return originalSelectNodeForward(state, dispatch)
+  }

package/src/commands/selectParentNode.ts

@@ -14,6 +14,8 @@ declare module '@tiptap/core' {
   }
 }
 
-export const selectParentNode: RawCommands['selectParentNode'] = () => ({ state, dispatch }) => {
-  return originalSelectParentNode(state, dispatch)
-}
+export const selectParentNode: RawCommands['selectParentNode'] =
+  () =>
+  ({ state, dispatch }) => {
+    return originalSelectParentNode(state, dispatch)
+  }

package/src/commands/selectTextblockEnd.ts

@@ -16,6 +16,8 @@ declare module '@tiptap/core' {
   }
 }
 
-export const selectTextblockEnd: RawCommands['selectTextblockEnd'] = () => ({ state, dispatch }) => {
-  return originalSelectTextblockEnd(state, dispatch)
-}
+export const selectTextblockEnd: RawCommands['selectTextblockEnd'] =
+  () =>
+  ({ state, dispatch }) => {
+    return originalSelectTextblockEnd(state, dispatch)
+  }

package/src/commands/selectTextblockStart.ts

@@ -16,6 +16,8 @@ declare module '@tiptap/core' {
   }
 }
 
-export const selectTextblockStart: RawCommands['selectTextblockStart'] = () => ({ state, dispatch }) => {
-  return originalSelectTextblockStart(state, dispatch)
-}
+export const selectTextblockStart: RawCommands['selectTextblockStart'] =
+  () =>
+  ({ state, dispatch }) => {
+    return originalSelectTextblockStart(state, dispatch)
+  }

package/src/commands/setContent.ts

@@ -19,55 +19,56 @@ declare module '@tiptap/core' {
          */
         content: Content | Fragment | ProseMirrorNode,
 
-        /**
-         * Whether to emit an update event.
-         * @default false
-         */
-        emitUpdate?: boolean,
-
-        /**
-         * Options for parsing the content.
-         * @default {}
-         */
-        parseOptions?: ParseOptions,
         /**
          * Options for `setContent`.
          */
         options?: {
+          /**
+           * Options for parsing the content.
+           * @default {}
+           */
+          parseOptions?: ParseOptions
+
           /**
            * Whether to throw an error if the content is invalid.
            */
-          errorOnInvalidContent?: boolean;
-        }
-      ) => ReturnType;
-    };
+          errorOnInvalidContent?: boolean
+
+          /**
+           * Whether to emit an update event.
+           * @default true
+           */
+          emitUpdate?: boolean
+        },
+      ) => ReturnType
+    }
   }
 }
 
-export const setContent: RawCommands['setContent'] = (content, emitUpdate = false, parseOptions = {}, options = {}) => ({
-  editor, tr, dispatch, commands,
-}) => {
-  const { doc } = tr
+export const setContent: RawCommands['setContent'] =
+  (content, { errorOnInvalidContent, emitUpdate = true, parseOptions = {} } = {}) =>
+  ({ editor, tr, dispatch, commands }) => {
+    const { doc } = tr
 
-  // This is to keep backward compatibility with the previous behavior
-  // TODO remove this in the next major version
-  if (parseOptions.preserveWhitespace !== 'full') {
-    const document = createDocument(content, editor.schema, parseOptions, {
-      errorOnInvalidContent: options.errorOnInvalidContent ?? editor.options.enableContentCheck,
-    })
+    // This is to keep backward compatibility with the previous behavior
+    // TODO remove this in the next major version
+    if (parseOptions.preserveWhitespace !== 'full') {
+      const document = createDocument(content, editor.schema, parseOptions, {
+        errorOnInvalidContent: errorOnInvalidContent ?? editor.options.enableContentCheck,
+      })
+
+      if (dispatch) {
+        tr.replaceWith(0, doc.content.size, document).setMeta('preventUpdate', !emitUpdate)
+      }
+      return true
+    }
 
     if (dispatch) {
-      tr.replaceWith(0, doc.content.size, document).setMeta('preventUpdate', !emitUpdate)
+      tr.setMeta('preventUpdate', !emitUpdate)
     }
-    return true
-  }
 
-  if (dispatch) {
-    tr.setMeta('preventUpdate', !emitUpdate)
+    return commands.insertContentAt({ from: 0, to: doc.content.size }, content, {
+      parseOptions,
+      errorOnInvalidContent: errorOnInvalidContent ?? editor.options.enableContentCheck,
+    })
   }
-
-  return commands.insertContentAt({ from: 0, to: doc.content.size }, content, {
-    parseOptions,
-    errorOnInvalidContent: options.errorOnInvalidContent ?? editor.options.enableContentCheck,
-  })
-}

package/src/commands/setMark.ts

@@ -31,18 +31,14 @@ function canSetMark(state: EditorState, tr: Transaction, newMarkType: MarkType)
     const currentMarks = state.storedMarks ?? cursor.marks()
 
     // There can be no current marks that exclude the new mark
-    return (
-      !!newMarkType.isInSet(currentMarks)
-      || !currentMarks.some(mark => mark.type.excludes(newMarkType))
-    )
+    return !!newMarkType.isInSet(currentMarks) || !currentMarks.some(mark => mark.type.excludes(newMarkType))
   }
 
   const { ranges } = selection
 
   return ranges.some(({ $from, $to }) => {
-    let someNodeSupportsMark = $from.depth === 0
-      ? state.doc.inlineContent && state.doc.type.allowsMarkType(newMarkType)
-      : false
+    let someNodeSupportsMark =
+      $from.depth === 0 ? state.doc.inlineContent && state.doc.type.allowsMarkType(newMarkType) : false
 
     state.doc.nodesBetween($from.pos, $to.pos, (node, _pos, parent) => {
       // If we already found a mark that we can enable, return false to bypass the remaining search
@@ -52,8 +48,8 @@ function canSetMark(state: EditorState, tr: Transaction, newMarkType: MarkType)
 
       if (node.isInline) {
         const parentAllowsMarkType = !parent || parent.type.allowsMarkType(newMarkType)
-        const currentMarksAllowMarkType = !!newMarkType.isInSet(node.marks)
-          || !node.marks.some(otherMark => otherMark.type.excludes(newMarkType))
+        const currentMarksAllowMarkType =
+          !!newMarkType.isInSet(node.marks) || !node.marks.some(otherMark => otherMark.type.excludes(newMarkType))
 
         someNodeSupportsMark = parentAllowsMarkType && currentMarksAllowMarkType
       }
@@ -63,54 +59,56 @@ function canSetMark(state: EditorState, tr: Transaction, newMarkType: MarkType)
     return someNodeSupportsMark
   })
 }
-export const setMark: RawCommands['setMark'] = (typeOrName, attributes = {}) => ({ tr, state, dispatch }) => {
-  const { selection } = tr
-  const { empty, ranges } = selection
-  const type = getMarkType(typeOrName, state.schema)
-
-  if (dispatch) {
-    if (empty) {
-      const oldAttributes = getMarkAttributes(state, type)
-
-      tr.addStoredMark(
-        type.create({
-          ...oldAttributes,
-          ...attributes,
-        }),
-      )
-    } else {
-      ranges.forEach(range => {
-        const from = range.$from.pos
-        const to = range.$to.pos
-
-        state.doc.nodesBetween(from, to, (node, pos) => {
-          const trimmedFrom = Math.max(pos, from)
-          const trimmedTo = Math.min(pos + node.nodeSize, to)
-          const someHasMark = node.marks.find(mark => mark.type === type)
-
-          // if there is already a mark of this type
-          // we know that we have to merge its attributes
-          // otherwise we add a fresh new mark
-          if (someHasMark) {
-            node.marks.forEach(mark => {
-              if (type === mark.type) {
-                tr.addMark(
-                  trimmedFrom,
-                  trimmedTo,
-                  type.create({
-                    ...mark.attrs,
-                    ...attributes,
-                  }),
-                )
-              }
-            })
-          } else {
-            tr.addMark(trimmedFrom, trimmedTo, type.create(attributes))
-          }
+export const setMark: RawCommands['setMark'] =
+  (typeOrName, attributes = {}) =>
+  ({ tr, state, dispatch }) => {
+    const { selection } = tr
+    const { empty, ranges } = selection
+    const type = getMarkType(typeOrName, state.schema)
+
+    if (dispatch) {
+      if (empty) {
+        const oldAttributes = getMarkAttributes(state, type)
+
+        tr.addStoredMark(
+          type.create({
+            ...oldAttributes,
+            ...attributes,
+          }),
+        )
+      } else {
+        ranges.forEach(range => {
+          const from = range.$from.pos
+          const to = range.$to.pos
+
+          state.doc.nodesBetween(from, to, (node, pos) => {
+            const trimmedFrom = Math.max(pos, from)
+            const trimmedTo = Math.min(pos + node.nodeSize, to)
+            const someHasMark = node.marks.find(mark => mark.type === type)
+
+            // if there is already a mark of this type
+            // we know that we have to merge its attributes
+            // otherwise we add a fresh new mark
+            if (someHasMark) {
+              node.marks.forEach(mark => {
+                if (type === mark.type) {
+                  tr.addMark(
+                    trimmedFrom,
+                    trimmedTo,
+                    type.create({
+                      ...mark.attrs,
+                      ...attributes,
+                    }),
+                  )
+                }
+              })
+            } else {
+              tr.addMark(trimmedFrom, trimmedTo, type.create(attributes))
+            }
+          })
         })
-      })
+      }
     }
-  }
 
-  return canSetMark(state, tr, type)
-}
+    return canSetMark(state, tr, type)
+  }

package/src/commands/setMeta.ts

@@ -11,13 +11,15 @@ declare module '@tiptap/core' {
        * @param value The value to store.
        * @example editor.commands.setMeta('foo', 'bar')
        */
-      setMeta: (key: string | Plugin | PluginKey, value: any) => ReturnType,
+      setMeta: (key: string | Plugin | PluginKey, value: any) => ReturnType
     }
   }
 }
 
-export const setMeta: RawCommands['setMeta'] = (key, value) => ({ tr }) => {
-  tr.setMeta(key, value)
+export const setMeta: RawCommands['setMeta'] =
+  (key, value) =>
+  ({ tr }) => {
+    tr.setMeta(key, value)
 
-  return true
-}
+    return true
+  }