@tiptap/core 2.0.0-beta.209 → 2.0.0-beta.210

package/src/NodeView.ts

@@ -1,6 +1,6 @@
-import { Node as ProseMirrorNode } from 'prosemirror-model'
-import { NodeSelection } from 'prosemirror-state'
-import { Decoration, NodeView as ProseMirrorNodeView } from 'prosemirror-view'
+import { Node as ProseMirrorNode } from '@tiptap/pm/model'
+import { NodeSelection } from '@tiptap/pm/state'
+import { Decoration, NodeView as ProseMirrorNodeView } from '@tiptap/pm/view'
 
 import { Editor as CoreEditor } from './Editor'
 import { Node } from './Node'
@@ -12,7 +12,6 @@ export class NodeView<
   Editor extends CoreEditor = CoreEditor,
   Options extends NodeViewRendererOptions = NodeViewRendererOptions,
 > implements ProseMirrorNodeView {
-
   component: Component
 
   editor: Editor
@@ -59,7 +58,7 @@ export class NodeView<
 
   onDragStart(event: DragEvent) {
     const { view } = this.editor
-    const target = (event.target as HTMLElement)
+    const target = event.target as HTMLElement
 
     // get the drag handle element
     // `closest` is not available for text nodes so we may have to use its parent
@@ -67,11 +66,7 @@ export class NodeView<
       ? target.parentElement?.closest('[data-drag-handle]')
       : target.closest('[data-drag-handle]')
 
-    if (
-      !this.dom
-      || this.contentDOM?.contains(target)
-      || !dragHandle
-    ) {
+    if (!this.dom || this.contentDOM?.contains(target) || !dragHandle) {
       return
     }
 
@@ -110,7 +105,7 @@ export class NodeView<
       return this.options.stopEvent({ event })
     }
 
-    const target = (event.target as HTMLElement)
+    const target = event.target as HTMLElement
     const isInElement = this.dom.contains(target) && !this.contentDOM?.contains(target)
 
     // any event from child nodes should be handled by ProseMirror
@@ -119,8 +114,7 @@ export class NodeView<
     }
 
     const isDropEvent = event.type === 'drop'
-    const isInput = ['INPUT', 'BUTTON', 'SELECT', 'TEXTAREA'].includes(target.tagName)
-      || target.isContentEditable
+    const isInput = ['INPUT', 'BUTTON', 'SELECT', 'TEXTAREA'].includes(target.tagName) || target.isContentEditable
 
     // any input event within node views should be ignored by ProseMirror
     if (isInput && !isDropEvent) {
@@ -152,19 +146,26 @@ export class NodeView<
     // we have to store that dragging started
     if (isDraggable && isEditable && !isDragging && isClickEvent) {
       const dragHandle = target.closest('[data-drag-handle]')
-      const isValidDragHandle = dragHandle
-        && (this.dom === dragHandle || (this.dom.contains(dragHandle)))
+      const isValidDragHandle = dragHandle && (this.dom === dragHandle || this.dom.contains(dragHandle))
 
       if (isValidDragHandle) {
         this.isDragging = true
 
-        document.addEventListener('dragend', () => {
-          this.isDragging = false
-        }, { once: true })
-
-        document.addEventListener('mouseup', () => {
-          this.isDragging = false
-        }, { once: true })
+        document.addEventListener(
+          'dragend',
+          () => {
+            this.isDragging = false
+          },
+          { once: true },
+        )
+
+        document.addEventListener(
+          'mouseup',
+          () => {
+            this.isDragging = false
+          },
+          { once: true },
+        )
       }
     }
 
@@ -183,7 +184,7 @@ export class NodeView<
     return true
   }
 
-  ignoreMutation(mutation: MutationRecord | { type: 'selection', target: Element }) {
+  ignoreMutation(mutation: MutationRecord | { type: 'selection'; target: Element }) {
     if (!this.dom || !this.contentDOM) {
       return true
     }

package/src/PasteRule.ts

@@ -1,4 +1,4 @@
-import { EditorState, Plugin } from 'prosemirror-state'
+import { EditorState, Plugin } from '@tiptap/pm/state'
 
 import { CommandManager } from './CommandManager'
 import { Editor } from './Editor'
@@ -14,46 +14,47 @@ import { isNumber } from './utilities/isNumber'
 import { isRegExp } from './utilities/isRegExp'
 
 export type PasteRuleMatch = {
-  index: number,
-  text: string,
-  replaceWith?: string,
-  match?: RegExpMatchArray,
-  data?: Record<string, any>,
+  index: number
+  text: string
+  replaceWith?: string
+  match?: RegExpMatchArray
+  data?: Record<string, any>
 }
 
-export type PasteRuleFinder =
-  | RegExp
-  | ((text: string) => PasteRuleMatch[] | null | undefined)
+export type PasteRuleFinder = RegExp | ((text: string) => PasteRuleMatch[] | null | undefined)
 
 export class PasteRule {
   find: PasteRuleFinder
 
   handler: (props: {
-    state: EditorState,
-    range: Range,
-    match: ExtendedRegExpMatchArray,
-    commands: SingleCommands,
-    chain: () => ChainedCommands,
-    can: () => CanCommands,
+    state: EditorState
+    range: Range
+    match: ExtendedRegExpMatchArray
+    commands: SingleCommands
+    chain: () => ChainedCommands
+    can: () => CanCommands
   }) => void | null
 
   constructor(config: {
-    find: PasteRuleFinder,
+    find: PasteRuleFinder
     handler: (props: {
-      state: EditorState,
-      range: Range,
-      match: ExtendedRegExpMatchArray,
-      commands: SingleCommands,
-      chain: () => ChainedCommands,
-      can: () => CanCommands,
-    }) => void | null,
+      state: EditorState
+      range: Range
+      match: ExtendedRegExpMatchArray
+      commands: SingleCommands
+      chain: () => ChainedCommands
+      can: () => CanCommands
+    }) => void | null
   }) {
     this.find = config.find
     this.handler = config.handler
   }
 }
 
-const pasteRuleMatcherHandler = (text: string, find: PasteRuleFinder): ExtendedRegExpMatchArray[] => {
+const pasteRuleMatcherHandler = (
+  text: string,
+  find: PasteRuleFinder,
+): ExtendedRegExpMatchArray[] => {
   if (isRegExp(find)) {
     return [...text.matchAll(find)]
   }
@@ -65,16 +66,17 @@ const pasteRuleMatcherHandler = (text: string, find: PasteRuleFinder): ExtendedR
   }
 
   return matches.map(pasteRuleMatch => {
-    const result: ExtendedRegExpMatchArray = []
+    const result: ExtendedRegExpMatchArray = [pasteRuleMatch.text]
 
-    result.push(pasteRuleMatch.text)
     result.index = pasteRuleMatch.index
     result.input = text
     result.data = pasteRuleMatch.data
 
     if (pasteRuleMatch.replaceWith) {
       if (!pasteRuleMatch.text.includes(pasteRuleMatch.replaceWith)) {
-        console.warn('[tiptap warn]: "pasteRuleMatch.replaceWith" must be part of "pasteRuleMatch.text".')
+        console.warn(
+          '[tiptap warn]: "pasteRuleMatch.replaceWith" must be part of "pasteRuleMatch.text".',
+        )
       }
 
       result.push(pasteRuleMatch.replaceWith)
@@ -85,18 +87,14 @@ const pasteRuleMatcherHandler = (text: string, find: PasteRuleFinder): ExtendedR
 }
 
 function run(config: {
-  editor: Editor,
-  state: EditorState,
-  from: number,
-  to: number,
-  rule: PasteRule,
+  editor: Editor
+  state: EditorState
+  from: number
+  to: number
+  rule: PasteRule
 }): boolean {
   const {
-    editor,
-    state,
-    from,
-    to,
-    rule,
+    editor, state, from, to, rule,
   } = config
 
   const { commands, chain, can } = new CommandManager({
@@ -113,12 +111,7 @@ function run(config: {
 
     const resolvedFrom = Math.max(from, pos)
     const resolvedTo = Math.min(to, pos + node.content.size)
-    const textToMatch = node.textBetween(
-      resolvedFrom - pos,
-      resolvedTo - pos,
-      undefined,
-      '\ufffc',
-    )
+    const textToMatch = node.textBetween(resolvedFrom - pos, resolvedTo - pos, undefined, '\ufffc')
 
     const matches = pasteRuleMatcherHandler(textToMatch, rule.find)
 
@@ -157,7 +150,7 @@ function run(config: {
  * text that matches any of the given rules to trigger the rule’s
  * action.
  */
-export function pasteRulesPlugin(props: { editor: Editor, rules: PasteRule[] }): Plugin[] {
+export function pasteRulesPlugin(props: { editor: Editor; rules: PasteRule[] }): Plugin[] {
   const { editor, rules } = props
   let dragSourceElement: Element | null = null
   let isPastedFromProseMirror = false

package/src/Tracker.ts

@@ -1,12 +1,11 @@
-import { Transaction } from 'prosemirror-state'
+import { Transaction } from '@tiptap/pm/state'
 
 export interface TrackerResult {
-  position: number,
-  deleted: boolean,
+  position: number
+  deleted: boolean
 }
 
 export class Tracker {
-
   transaction: Transaction
 
   currentStep: number
@@ -22,9 +21,7 @@ export class Tracker {
     const mappedPosition = this.transaction.steps
       .slice(this.currentStep)
       .reduce((newPosition, step) => {
-        const mapResult = step
-          .getMap()
-          .mapResult(newPosition)
+        const mapResult = step.getMap().mapResult(newPosition)
 
         if (mapResult.deleted) {
           deleted = true
@@ -38,5 +35,4 @@ export class Tracker {
       deleted,
     }
   }
-
 }

package/src/commands/clearNodes.ts

@@ -1,4 +1,4 @@
-import { liftTarget } from 'prosemirror-transform'
+import { liftTarget } from '@tiptap/pm/transform'
 
 import { RawCommands } from '../types'
 

package/src/commands/createParagraphNear.ts

@@ -1,4 +1,4 @@
-import { createParagraphNear as originalCreateParagraphNear } from 'prosemirror-commands'
+import { createParagraphNear as originalCreateParagraphNear } from '@tiptap/pm/commands'
 
 import { RawCommands } from '../types'
 
@@ -8,7 +8,7 @@ declare module '@tiptap/core' {
       /**
        * Create a paragraph nearby.
        */
-      createParagraphNear: () => ReturnType,
+      createParagraphNear: () => ReturnType
     }
   }
 }

package/src/commands/deleteNode.ts

@@ -1,4 +1,4 @@
-import { NodeType } from 'prosemirror-model'
+import { NodeType } from '@tiptap/pm/model'
 
 import { getNodeType } from '../helpers/getNodeType'
 import { RawCommands } from '../types'

package/src/commands/deleteSelection.ts

@@ -1,4 +1,4 @@
-import { deleteSelection as originalDeleteSelection } from 'prosemirror-commands'
+import { deleteSelection as originalDeleteSelection } from '@tiptap/pm/commands'
 
 import { RawCommands } from '../types'
 
@@ -8,7 +8,7 @@ declare module '@tiptap/core' {
       /**
        * Delete the selection, if there is one.
        */
-      deleteSelection: () => ReturnType,
+      deleteSelection: () => ReturnType
     }
   }
 }

package/src/commands/exitCode.ts

@@ -1,4 +1,4 @@
-import { exitCode as originalExitCode } from 'prosemirror-commands'
+import { exitCode as originalExitCode } from '@tiptap/pm/commands'
 
 import { RawCommands } from '../types'
 
@@ -8,7 +8,7 @@ declare module '@tiptap/core' {
       /**
        * Exit from a code block.
        */
-      exitCode: () => ReturnType,
+      exitCode: () => ReturnType
     }
   }
 }

package/src/commands/extendMarkRange.ts

@@ -1,5 +1,5 @@
-import { MarkType } from 'prosemirror-model'
-import { TextSelection } from 'prosemirror-state'
+import { MarkType } from '@tiptap/pm/model'
+import { TextSelection } from '@tiptap/pm/state'
 
 import { getMarkRange } from '../helpers/getMarkRange'
 import { getMarkType } from '../helpers/getMarkType'
@@ -11,7 +11,10 @@ declare module '@tiptap/core' {
       /**
        * Extends the text selection to the current mark.
        */
-      extendMarkRange: (typeOrName: string | MarkType, attributes?: Record<string, any>) => ReturnType,
+      extendMarkRange: (
+        typeOrName: string | MarkType,
+        attributes?: Record<string, any>,
+      ) => ReturnType
     }
   }
 }

package/src/commands/insertContent.ts

@@ -1,4 +1,4 @@
-import { ParseOptions } from 'prosemirror-model'
+import { ParseOptions } from '@tiptap/pm/model'
 
 import { Content, RawCommands } from '../types'
 
@@ -11,14 +11,18 @@ declare module '@tiptap/core' {
       insertContent: (
         value: Content,
         options?: {
-          parseOptions?: ParseOptions,
-          updateSelection?: boolean,
+          parseOptions?: ParseOptions
+          updateSelection?: boolean
         },
-      ) => ReturnType,
+      ) => ReturnType
     }
   }
 }
 
 export const insertContent: RawCommands['insertContent'] = (value, options) => ({ tr, commands }) => {
-  return commands.insertContentAt({ from: tr.selection.from, to: tr.selection.to }, value, options)
+  return commands.insertContentAt(
+    { from: tr.selection.from, to: tr.selection.to },
+    value,
+    options,
+  )
 }

package/src/commands/insertContentAt.ts

@@ -1,12 +1,8 @@
-import { Fragment, Node as ProseMirrorNode, ParseOptions } from 'prosemirror-model'
+import { Fragment, Node as ProseMirrorNode, ParseOptions } from '@tiptap/pm/model'
 
 import { createNodeFromContent } from '../helpers/createNodeFromContent'
 import { selectionToInsertionEnd } from '../helpers/selectionToInsertionEnd'
-import {
-  Content,
-  Range,
-  RawCommands,
-} from '../types'
+import { Content, Range, RawCommands } from '../types'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -18,10 +14,10 @@ declare module '@tiptap/core' {
         position: number | Range,
         value: Content,
         options?: {
-          parseOptions?: ParseOptions,
-          updateSelection?: boolean,
+          parseOptions?: ParseOptions
+          updateSelection?: boolean
         },
-      ) => ReturnType,
+      ) => ReturnType
     }
   }
 }
@@ -50,27 +46,19 @@ export const insertContentAt: RawCommands['insertContentAt'] = (position, value,
       return true
     }
 
-    let { from, to } = typeof position === 'number'
-      ? { from: position, to: position }
-      : position
+    let { from, to } = typeof position === 'number' ? { from: position, to: position } : position
 
     let isOnlyTextContent = true
     let isOnlyBlockContent = true
-    const nodes = isFragment(content)
-      ? content
-      : [content]
+    const nodes = isFragment(content) ? content : [content]
 
     nodes.forEach(node => {
       // check if added node is valid
       node.check()
 
-      isOnlyTextContent = isOnlyTextContent
-        ? node.isText && node.marks.length === 0
-        : false
+      isOnlyTextContent = isOnlyTextContent ? node.isText && node.marks.length === 0 : false
 
-      isOnlyBlockContent = isOnlyBlockContent
-        ? node.isBlock
-        : false
+      isOnlyBlockContent = isOnlyBlockContent ? node.isBlock : false
     })
 
     // check if we can replace the wrapping node by
@@ -80,9 +68,7 @@ export const insertContentAt: RawCommands['insertContentAt'] = (position, value,
     // instead of inserting the image below the paragraph
     if (from === to && isOnlyBlockContent) {
       const { parent } = tr.doc.resolve(from)
-      const isEmptyTextBlock = parent.isTextblock
-        && !parent.type.spec.code
-        && !parent.childCount
+      const isEmptyTextBlock = parent.isTextblock && !parent.type.spec.code && !parent.childCount
 
       if (isEmptyTextBlock) {
         from -= 1

package/src/commands/join.ts

@@ -1,6 +1,9 @@
 import {
-  joinBackward as originalJoinBackward, joinDown as originalJoinDown, joinForward as originalJoinForward, joinUp as originalJoinUp,
-} from 'prosemirror-commands'
+  joinBackward as originalJoinBackward,
+  joinDown as originalJoinDown,
+  joinForward as originalJoinForward,
+  joinUp as originalJoinUp,
+} from '@tiptap/pm/commands'
 
 import { RawCommands } from '../types'
 
@@ -10,25 +13,25 @@ declare module '@tiptap/core' {
       /**
        * Join two nodes Up.
        */
-      joinUp: () => ReturnType,
+      joinUp: () => ReturnType
     }
     joinDown: {
       /**
        * Join two nodes Down.
        */
-      joinDown: () => ReturnType,
+      joinDown: () => ReturnType
     }
     joinBackward: {
       /**
        * Join two nodes Backwards.
        */
-      joinBackward: () => ReturnType,
+      joinBackward: () => ReturnType
     }
     joinForward: {
       /**
        * Join two nodes Forwards.
        */
-      joinForward: () => ReturnType,
+      joinForward: () => ReturnType
     }
   }
 }

package/src/commands/lift.ts

@@ -1,5 +1,5 @@
-import { lift as originalLift } from 'prosemirror-commands'
-import { NodeType } from 'prosemirror-model'
+import { lift as originalLift } from '@tiptap/pm/commands'
+import { NodeType } from '@tiptap/pm/model'
 
 import { getNodeType } from '../helpers/getNodeType'
 import { isNodeActive } from '../helpers/isNodeActive'
@@ -11,7 +11,7 @@ declare module '@tiptap/core' {
       /**
        * Removes an existing wrap.
        */
-      lift: (typeOrName: string | NodeType, attributes?: Record<string, any>) => ReturnType,
+      lift: (typeOrName: string | NodeType, attributes?: Record<string, any>) => ReturnType
     }
   }
 }

package/src/commands/liftEmptyBlock.ts

@@ -1,4 +1,4 @@
-import { liftEmptyBlock as originalLiftEmptyBlock } from 'prosemirror-commands'
+import { liftEmptyBlock as originalLiftEmptyBlock } from '@tiptap/pm/commands'
 
 import { RawCommands } from '../types'
 

package/src/commands/liftListItem.ts

@@ -1,5 +1,5 @@
-import { NodeType } from 'prosemirror-model'
-import { liftListItem as originalLiftListItem } from 'prosemirror-schema-list'
+import { NodeType } from '@tiptap/pm/model'
+import { liftListItem as originalLiftListItem } from '@tiptap/pm/schema-list'
 
 import { getNodeType } from '../helpers/getNodeType'
 import { RawCommands } from '../types'
@@ -10,7 +10,7 @@ declare module '@tiptap/core' {
       /**
        * Lift the list item into a wrapping list.
        */
-      liftListItem: (typeOrName: string | NodeType) => ReturnType,
+      liftListItem: (typeOrName: string | NodeType) => ReturnType
     }
   }
 }

package/src/commands/newlineInCode.ts

@@ -1,4 +1,4 @@
-import { newlineInCode as originalNewlineInCode } from 'prosemirror-commands'
+import { newlineInCode as originalNewlineInCode } from '@tiptap/pm/commands'
 
 import { RawCommands } from '../types'
 
@@ -8,7 +8,7 @@ declare module '@tiptap/core' {
       /**
        * Add a newline character in code.
        */
-      newlineInCode: () => ReturnType,
+      newlineInCode: () => ReturnType
     }
   }
 }

package/src/commands/resetAttributes.ts

@@ -1,4 +1,4 @@
-import { MarkType, NodeType } from 'prosemirror-model'
+import { MarkType, NodeType } from '@tiptap/pm/model'
 
 import { getMarkType } from '../helpers/getMarkType'
 import { getNodeType } from '../helpers/getNodeType'
@@ -12,7 +12,10 @@ declare module '@tiptap/core' {
       /**
        * Resets some node attributes to the default value.
        */
-      resetAttributes: (typeOrName: string | NodeType | MarkType, attributes: string | string[]) => ReturnType,
+      resetAttributes: (
+        typeOrName: string | NodeType | MarkType,
+        attributes: string | string[],
+      ) => ReturnType
     }
   }
 }
@@ -22,9 +25,7 @@ export const resetAttributes: RawCommands['resetAttributes'] = (typeOrName, attr
   let markType: MarkType | null = null
 
   const schemaType = getSchemaTypeNameByName(
-    typeof typeOrName === 'string'
-      ? typeOrName
-      : typeOrName.name,
+    typeof typeOrName === 'string' ? typeOrName : typeOrName.name,
     state.schema,
   )
 
@@ -50,7 +51,11 @@ export const resetAttributes: RawCommands['resetAttributes'] = (typeOrName, attr
         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)))
+              tr.addMark(
+                pos,
+                pos + node.nodeSize,
+                markType.create(deleteProps(mark.attrs, attributes)),
+              )
             }
           })
         }

package/src/commands/selectNodeBackward.ts

@@ -1,4 +1,4 @@
-import { selectNodeBackward as originalSelectNodeBackward } from 'prosemirror-commands'
+import { selectNodeBackward as originalSelectNodeBackward } from '@tiptap/pm/commands'
 
 import { RawCommands } from '../types'
 
@@ -8,7 +8,7 @@ declare module '@tiptap/core' {
       /**
        * Select a node backward.
        */
-      selectNodeBackward: () => ReturnType,
+      selectNodeBackward: () => ReturnType
     }
   }
 }

package/src/commands/selectNodeForward.ts

@@ -1,4 +1,4 @@
-import { selectNodeForward as originalSelectNodeForward } from 'prosemirror-commands'
+import { selectNodeForward as originalSelectNodeForward } from '@tiptap/pm/commands'
 
 import { RawCommands } from '../types'
 
@@ -8,7 +8,7 @@ declare module '@tiptap/core' {
       /**
        * Select a node forward.
        */
-      selectNodeForward: () => ReturnType,
+      selectNodeForward: () => ReturnType
     }
   }
 }

package/src/commands/selectParentNode.ts

@@ -1,4 +1,4 @@
-import { selectParentNode as originalSelectParentNode } from 'prosemirror-commands'
+import { selectParentNode as originalSelectParentNode } from '@tiptap/pm/commands'
 
 import { RawCommands } from '../types'
 
@@ -8,7 +8,7 @@ declare module '@tiptap/core' {
       /**
        * Select the parent node.
        */
-      selectParentNode: () => ReturnType,
+      selectParentNode: () => ReturnType
     }
   }
 }

package/src/commands/selectTextblockEnd.ts

@@ -1,6 +1,6 @@
 // @ts-ignore
 // TODO: add types to @types/prosemirror-commands
-import { selectTextblockEnd as originalSelectTextblockEnd } from 'prosemirror-commands'
+import { selectTextblockEnd as originalSelectTextblockEnd } from '@tiptap/pm/commands'
 
 import { RawCommands } from '../types'
 
@@ -10,7 +10,7 @@ declare module '@tiptap/core' {
       /**
        * Moves the cursor to the end of current text block.
        */
-      selectTextblockEnd: () => ReturnType,
+      selectTextblockEnd: () => ReturnType
     }
   }
 }