@tiptap/core 3.0.0 → 3.0.1

package/src/commands/cut.ts

@@ -1,6 +1,6 @@
 import { TextSelection } from '@tiptap/pm/state'
 
-import { RawCommands } from '../types.js'
+import type { RawCommands } from '../types.js'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -13,22 +13,24 @@ declare module '@tiptap/core' {
        * @param targetPos The position to insert the content at.
        * @example editor.commands.cut({ from: 1, to: 3 }, 5)
        */
-      cut: ({ from, to }: { from: number, to: number }, targetPos: number) => ReturnType,
+      cut: ({ from, to }: { from: number; to: number }, targetPos: number) => ReturnType
     }
   }
 }
 
-export const cut: RawCommands['cut'] = (originRange, targetPos) => ({ editor, tr }) => {
-  const { state } = editor
+export const cut: RawCommands['cut'] =
+  (originRange, targetPos) =>
+  ({ editor, tr }) => {
+    const { state } = editor
 
-  const contentSlice = state.doc.slice(originRange.from, originRange.to)
+    const contentSlice = state.doc.slice(originRange.from, originRange.to)
 
-  tr.deleteRange(originRange.from, originRange.to)
-  const newPos = tr.mapping.map(targetPos)
+    tr.deleteRange(originRange.from, originRange.to)
+    const newPos = tr.mapping.map(targetPos)
 
-  tr.insert(newPos, contentSlice.content)
+    tr.insert(newPos, contentSlice.content)
 
-  tr.setSelection(new TextSelection(tr.doc.resolve(newPos - 1)))
+    tr.setSelection(new TextSelection(tr.doc.resolve(Math.max(newPos - 1, 0))))
 
-  return true
-}
+    return true
+  }

package/src/commands/deleteCurrentNode.ts

@@ -1,4 +1,4 @@
-import { RawCommands } from '../types.js'
+import type { RawCommands } from '../types.js'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -7,36 +7,38 @@ declare module '@tiptap/core' {
        * Delete the node that currently has the selection anchor.
        * @example editor.commands.deleteCurrentNode()
        */
-      deleteCurrentNode: () => ReturnType,
+      deleteCurrentNode: () => ReturnType
     }
   }
 }
 
-export const deleteCurrentNode: RawCommands['deleteCurrentNode'] = () => ({ tr, dispatch }) => {
-  const { selection } = tr
-  const currentNode = selection.$anchor.node()
+export const deleteCurrentNode: RawCommands['deleteCurrentNode'] =
+  () =>
+  ({ tr, dispatch }) => {
+    const { selection } = tr
+    const currentNode = selection.$anchor.node()
 
-  // if there is content inside the current node, break out of this command
-  if (currentNode.content.size > 0) {
-    return false
-  }
+    // if there is content inside the current node, break out of this command
+    if (currentNode.content.size > 0) {
+      return false
+    }
 
-  const $pos = tr.selection.$anchor
+    const $pos = tr.selection.$anchor
 
-  for (let depth = $pos.depth; depth > 0; depth -= 1) {
-    const node = $pos.node(depth)
+    for (let depth = $pos.depth; depth > 0; depth -= 1) {
+      const node = $pos.node(depth)
 
-    if (node.type === currentNode.type) {
-      if (dispatch) {
-        const from = $pos.before(depth)
-        const to = $pos.after(depth)
+      if (node.type === currentNode.type) {
+        if (dispatch) {
+          const from = $pos.before(depth)
+          const to = $pos.after(depth)
 
-        tr.delete(from, to).scrollIntoView()
-      }
+          tr.delete(from, to).scrollIntoView()
+        }
 
-      return true
+        return true
+      }
     }
-  }
 
-  return false
-}
+    return false
+  }

package/src/commands/deleteNode.ts

@@ -1,7 +1,7 @@
-import { NodeType } from '@tiptap/pm/model'
+import type { NodeType } from '@tiptap/pm/model'
 
 import { getNodeType } from '../helpers/getNodeType.js'
-import { RawCommands } from '../types.js'
+import type { RawCommands } from '../types.js'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -11,29 +11,31 @@ declare module '@tiptap/core' {
        * @param typeOrName The type or name of the node.
        * @example editor.commands.deleteNode('paragraph')
        */
-      deleteNode: (typeOrName: string | NodeType) => ReturnType,
+      deleteNode: (typeOrName: string | NodeType) => ReturnType
     }
   }
 }
 
-export const deleteNode: RawCommands['deleteNode'] = typeOrName => ({ tr, state, dispatch }) => {
-  const type = getNodeType(typeOrName, state.schema)
-  const $pos = tr.selection.$anchor
+export const deleteNode: RawCommands['deleteNode'] =
+  typeOrName =>
+  ({ tr, state, dispatch }) => {
+    const type = getNodeType(typeOrName, state.schema)
+    const $pos = tr.selection.$anchor
 
-  for (let depth = $pos.depth; depth > 0; depth -= 1) {
-    const node = $pos.node(depth)
+    for (let depth = $pos.depth; depth > 0; depth -= 1) {
+      const node = $pos.node(depth)
 
-    if (node.type === type) {
-      if (dispatch) {
-        const from = $pos.before(depth)
-        const to = $pos.after(depth)
+      if (node.type === type) {
+        if (dispatch) {
+          const from = $pos.before(depth)
+          const to = $pos.after(depth)
 
-        tr.delete(from, to).scrollIntoView()
-      }
+          tr.delete(from, to).scrollIntoView()
+        }
 
-      return true
+        return true
+      }
     }
-  }
 
-  return false
-}
+    return false
+  }

package/src/commands/deleteRange.ts

@@ -1,4 +1,4 @@
-import { Range, RawCommands } from '../types.js'
+import type { Range, RawCommands } from '../types.js'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -8,17 +8,19 @@ declare module '@tiptap/core' {
        * @param range The range to delete.
        * @example editor.commands.deleteRange({ from: 1, to: 3 })
        */
-      deleteRange: (range: Range) => ReturnType,
+      deleteRange: (range: Range) => ReturnType
     }
   }
 }
 
-export const deleteRange: RawCommands['deleteRange'] = range => ({ tr, dispatch }) => {
-  const { from, to } = range
+export const deleteRange: RawCommands['deleteRange'] =
+  range =>
+  ({ tr, dispatch }) => {
+    const { from, to } = range
 
-  if (dispatch) {
-    tr.delete(from, to)
-  }
+    if (dispatch) {
+      tr.delete(from, to)
+    }
 
-  return true
-}
+    return true
+  }

package/src/commands/deleteSelection.ts

@@ -1,6 +1,6 @@
 import { deleteSelection as originalDeleteSelection } from '@tiptap/pm/commands'
 
-import { RawCommands } from '../types.js'
+import type { RawCommands } from '../types.js'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -14,6 +14,8 @@ declare module '@tiptap/core' {
   }
 }
 
-export const deleteSelection: RawCommands['deleteSelection'] = () => ({ state, dispatch }) => {
-  return originalDeleteSelection(state, dispatch)
-}
+export const deleteSelection: RawCommands['deleteSelection'] =
+  () =>
+  ({ state, dispatch }) => {
+    return originalDeleteSelection(state, dispatch)
+  }

package/src/commands/enter.ts

@@ -1,4 +1,4 @@
-import { RawCommands } from '../types.js'
+import type { RawCommands } from '../types.js'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -7,11 +7,13 @@ declare module '@tiptap/core' {
        * Trigger enter.
        * @example editor.commands.enter()
        */
-      enter: () => ReturnType,
+      enter: () => ReturnType
     }
   }
 }
 
-export const enter: RawCommands['enter'] = () => ({ commands }) => {
-  return commands.keyboardShortcut('Enter')
-}
+export const enter: RawCommands['enter'] =
+  () =>
+  ({ commands }) => {
+    return commands.keyboardShortcut('Enter')
+  }

package/src/commands/exitCode.ts

@@ -1,6 +1,6 @@
 import { exitCode as originalExitCode } from '@tiptap/pm/commands'
 
-import { RawCommands } from '../types.js'
+import type { RawCommands } from '../types.js'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -14,6 +14,8 @@ declare module '@tiptap/core' {
   }
 }
 
-export const exitCode: RawCommands['exitCode'] = () => ({ state, dispatch }) => {
-  return originalExitCode(state, dispatch)
-}
+export const exitCode: RawCommands['exitCode'] =
+  () =>
+  ({ state, dispatch }) => {
+    return originalExitCode(state, dispatch)
+  }

package/src/commands/extendMarkRange.ts

@@ -1,9 +1,9 @@
-import { MarkType } from '@tiptap/pm/model'
+import type { MarkType } from '@tiptap/pm/model'
 import { TextSelection } from '@tiptap/pm/state'
 
 import { getMarkRange } from '../helpers/getMarkRange.js'
 import { getMarkType } from '../helpers/getMarkType.js'
-import { RawCommands } from '../types.js'
+import type { RawCommands } from '../types.js'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -30,20 +30,22 @@ declare module '@tiptap/core' {
   }
 }
 
-export const extendMarkRange: RawCommands['extendMarkRange'] = (typeOrName, attributes = {}) => ({ tr, state, dispatch }) => {
-  const type = getMarkType(typeOrName, state.schema)
-  const { doc, selection } = tr
-  const { $from, from, to } = selection
+export const extendMarkRange: RawCommands['extendMarkRange'] =
+  (typeOrName, attributes = {}) =>
+  ({ tr, state, dispatch }) => {
+    const type = getMarkType(typeOrName, state.schema)
+    const { doc, selection } = tr
+    const { $from, from, to } = selection
 
-  if (dispatch) {
-    const range = getMarkRange($from, type, attributes)
+    if (dispatch) {
+      const range = getMarkRange($from, type, attributes)
 
-    if (range && range.from <= from && range.to >= to) {
-      const newSelection = TextSelection.create(doc, range.from, range.to)
+      if (range && range.from <= from && range.to >= to) {
+        const newSelection = TextSelection.create(doc, range.from, range.to)
 
-      tr.setSelection(newSelection)
+        tr.setSelection(newSelection)
+      }
     }
-  }
 
-  return true
-}
+    return true
+  }

package/src/commands/first.ts

@@ -1,4 +1,4 @@
-import { Command, CommandProps, RawCommands } from '../types.js'
+import type { Command, CommandProps, RawCommands } from '../types.js'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -8,15 +8,13 @@ declare module '@tiptap/core' {
        * @param commands The commands to run.
        * @example editor.commands.first([command1, command2])
        */
-      first: (commands: Command[] | ((props: CommandProps) => Command[])) => ReturnType,
+      first: (commands: Command[] | ((props: CommandProps) => Command[])) => ReturnType
     }
   }
 }
 
 export const first: RawCommands['first'] = commands => props => {
-  const items = typeof commands === 'function'
-    ? commands(props)
-    : commands
+  const items = typeof commands === 'function' ? commands(props) : commands
 
   for (let i = 0; i < items.length; i += 1) {
     if (items[i](props)) {

package/src/commands/focus.ts

@@ -1,6 +1,7 @@
 import { isTextSelection } from '../helpers/isTextSelection.js'
 import { resolveFocusPosition } from '../helpers/resolveFocusPosition.js'
-import { FocusPosition, RawCommands } from '../types.js'
+import type { FocusPosition, RawCommands } from '../types.js'
+import { isAndroid } from '../utilities/isAndroid.js'
 import { isiOS } from '../utilities/isiOS.js'
 
 declare module '@tiptap/core' {
@@ -24,72 +25,69 @@ declare module '@tiptap/core' {
          * @default { scrollIntoView: true }
          */
         options?: {
-          scrollIntoView?: boolean,
+          scrollIntoView?: boolean
         },
-      ) => ReturnType,
+      ) => ReturnType
     }
   }
 }
 
-export const focus: RawCommands['focus'] = (position = null, options = {}) => ({
-  editor,
-  view,
-  tr,
-  dispatch,
-}) => {
-  options = {
-    scrollIntoView: true,
-    ...options,
-  }
-
-  const delayedFocus = () => {
-    // focus within `requestAnimationFrame` breaks focus on iOS
-    // so we have to call this
-    if (isiOS()) {
-      (view.dom as HTMLElement).focus()
+export const focus: RawCommands['focus'] =
+  (position = null, options = {}) =>
+  ({ editor, view, tr, dispatch }) => {
+    options = {
+      scrollIntoView: true,
+      ...options,
     }
 
-    // For React we have to focus asynchronously. Otherwise wild things happen.
-    // see: https://github.com/ueberdosis/tiptap/issues/1520
-    requestAnimationFrame(() => {
-      if (!editor.isDestroyed) {
-        view.focus()
-
-        if (options?.scrollIntoView) {
-          editor.commands.scrollIntoView()
-        }
+    const delayedFocus = () => {
+      // focus within `requestAnimationFrame` breaks focus on iOS and Android
+      // so we have to call this
+      if (isiOS() || isAndroid()) {
+        ;(view.dom as HTMLElement).focus()
       }
-    })
-  }
 
-  if ((view.hasFocus() && position === null) || position === false) {
-    return true
-  }
+      // For React we have to focus asynchronously. Otherwise wild things happen.
+      // see: https://github.com/ueberdosis/tiptap/issues/1520
+      requestAnimationFrame(() => {
+        if (!editor.isDestroyed) {
+          view.focus()
 
-  // we don’t try to resolve a NodeSelection or CellSelection
-  if (dispatch && position === null && !isTextSelection(editor.state.selection)) {
-    delayedFocus()
-    return true
-  }
+          if (options?.scrollIntoView) {
+            editor.commands.scrollIntoView()
+          }
+        }
+      })
+    }
 
-  // pass through tr.doc instead of editor.state.doc
-  // since transactions could change the editors state before this command has been run
-  const selection = resolveFocusPosition(tr.doc, position) || editor.state.selection
-  const isSameSelection = editor.state.selection.eq(selection)
+    if ((view.hasFocus() && position === null) || position === false) {
+      return true
+    }
 
-  if (dispatch) {
-    if (!isSameSelection) {
-      tr.setSelection(selection)
+    // we don’t try to resolve a NodeSelection or CellSelection
+    if (dispatch && position === null && !isTextSelection(editor.state.selection)) {
+      delayedFocus()
+      return true
     }
 
-    // `tr.setSelection` resets the stored marks
-    // so we’ll restore them if the selection is the same as before
-    if (isSameSelection && tr.storedMarks) {
-      tr.setStoredMarks(tr.storedMarks)
+    // pass through tr.doc instead of editor.state.doc
+    // since transactions could change the editors state before this command has been run
+    const selection = resolveFocusPosition(tr.doc, position) || editor.state.selection
+    const isSameSelection = editor.state.selection.eq(selection)
+
+    if (dispatch) {
+      if (!isSameSelection) {
+        tr.setSelection(selection)
+      }
+
+      // `tr.setSelection` resets the stored marks
+      // so we’ll restore them if the selection is the same as before
+      if (isSameSelection && tr.storedMarks) {
+        tr.setStoredMarks(tr.storedMarks)
+      }
+
+      delayedFocus()
     }
 
-    delayedFocus()
+    return true
   }
-
-  return true
-}

package/src/commands/forEach.ts

@@ -1,4 +1,4 @@
-import { CommandProps, RawCommands } from '../types.js'
+import type { CommandProps, RawCommands } from '../types.js'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -11,10 +11,10 @@ declare module '@tiptap/core' {
         fn: (
           item: T,
           props: CommandProps & {
-            index: number,
+            index: number
           },
         ) => boolean,
-      ) => ReturnType,
+      ) => ReturnType
     }
   }
 }

package/src/commands/insertContent.ts

@@ -1,6 +1,6 @@
-import { ParseOptions } from '@tiptap/pm/model'
+import type { Fragment, Node as ProseMirrorNode, ParseOptions } from '@tiptap/pm/model'
 
-import { Content, RawCommands } from '../types.js'
+import type { Content, RawCommands } from '../types.js'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -14,7 +14,7 @@ declare module '@tiptap/core' {
         /**
          * The ProseMirror content to insert.
          */
-        value: Content,
+        value: Content | ProseMirrorNode | Fragment,
 
         /**
          * Optional options
@@ -37,10 +37,8 @@ declare module '@tiptap/core' {
   }
 }
 
-export const insertContent: RawCommands['insertContent'] = (value, options) => ({ tr, commands }) => {
-  return commands.insertContentAt(
-    { from: tr.selection.from, to: tr.selection.to },
-    value,
-    options,
-  )
-}
+export const insertContent: RawCommands['insertContent'] =
+  (value, options) =>
+  ({ tr, commands }) => {
+    return commands.insertContentAt({ from: tr.selection.from, to: tr.selection.to }, value, options)
+  }