@tiptap/core 2.0.0-beta.99 → 2.0.0-rc.1

package/src/commands/toggleNode.ts

@@ -1,7 +1,8 @@
-import { NodeType } from 'prosemirror-model'
+import { NodeType } from '@tiptap/pm/model'
+
+import { getNodeType } from '../helpers/getNodeType'
+import { isNodeActive } from '../helpers/isNodeActive'
 import { RawCommands } from '../types'
-import isNodeActive from '../helpers/isNodeActive'
-import getNodeType from '../helpers/getNodeType'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -9,7 +10,11 @@ declare module '@tiptap/core' {
       /**
        * Toggle a node with another node.
        */
-      toggleNode: (typeOrName: string | NodeType, toggleTypeOrName: string | NodeType, attributes?: Record<string, any>) => ReturnType,
+      toggleNode: (
+        typeOrName: string | NodeType,
+        toggleTypeOrName: string | NodeType,
+        attributes?: Record<string, any>,
+      ) => ReturnType
     }
   }
 }

package/src/commands/toggleWrap.ts

@@ -1,8 +1,8 @@
-import { wrapIn, lift } from 'prosemirror-commands'
-import { NodeType } from 'prosemirror-model'
+import { NodeType } from '@tiptap/pm/model'
+
+import { getNodeType } from '../helpers/getNodeType'
+import { isNodeActive } from '../helpers/isNodeActive'
 import { RawCommands } from '../types'
-import isNodeActive from '../helpers/isNodeActive'
-import getNodeType from '../helpers/getNodeType'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -10,18 +10,18 @@ declare module '@tiptap/core' {
       /**
        * Wraps nodes in another node, or removes an existing wrap.
        */
-      toggleWrap: (typeOrName: string | NodeType, attributes?: Record<string, any>) => ReturnType,
+      toggleWrap: (typeOrName: string | NodeType, attributes?: Record<string, any>) => ReturnType
     }
   }
 }
 
-export const toggleWrap: RawCommands['toggleWrap'] = (typeOrName, attributes = {}) => ({ state, dispatch }) => {
+export const toggleWrap: RawCommands['toggleWrap'] = (typeOrName, attributes = {}) => ({ state, commands }) => {
   const type = getNodeType(typeOrName, state.schema)
   const isActive = isNodeActive(state, type, attributes)
 
   if (isActive) {
-    return lift(state, dispatch)
+    return commands.lift(type)
   }
 
-  return wrapIn(type, attributes)(state, dispatch)
+  return commands.wrapIn(type, attributes)
 }

package/src/commands/undoInputRule.ts

@@ -1,4 +1,3 @@
-import { undoInputRule as originalUndoInputRule } from 'prosemirror-inputrules'
 import { RawCommands } from '../types'
 
 declare module '@tiptap/core' {
@@ -13,5 +12,35 @@ declare module '@tiptap/core' {
 }
 
 export const undoInputRule: RawCommands['undoInputRule'] = () => ({ state, dispatch }) => {
-  return originalUndoInputRule(state, dispatch)
+  const plugins = state.plugins
+
+  for (let i = 0; i < plugins.length; i += 1) {
+    const plugin = plugins[i]
+    let undoable
+
+    // @ts-ignore
+    // eslint-disable-next-line
+    if (plugin.spec.isInputRules && (undoable = plugin.getState(state))) {
+      if (dispatch) {
+        const tr = state.tr
+        const toUndo = undoable.transform
+
+        for (let j = toUndo.steps.length - 1; j >= 0; j -= 1) {
+          tr.step(toUndo.steps[j].invert(toUndo.docs[j]))
+        }
+
+        if (undoable.text) {
+          const marks = tr.doc.resolve(undoable.from).marks()
+
+          tr.replaceWith(undoable.from, undoable.to, state.schema.text(undoable.text, marks))
+        } else {
+          tr.delete(undoable.from, undoable.to)
+        }
+      }
+
+      return true
+    }
+  }
+
+  return false
 }

package/src/commands/unsetAllMarks.ts

@@ -11,7 +11,7 @@ declare module '@tiptap/core' {
   }
 }
 
-export const unsetAllMarks: RawCommands['unsetAllMarks'] = () => ({ tr, state, dispatch }) => {
+export const unsetAllMarks: RawCommands['unsetAllMarks'] = () => ({ tr, dispatch }) => {
   const { selection } = tr
   const { empty, ranges } = selection
 
@@ -20,13 +20,9 @@ export const unsetAllMarks: RawCommands['unsetAllMarks'] = () => ({ tr, state, d
   }
 
   if (dispatch) {
-    Object
-      .entries(state.schema.marks)
-      .forEach(([, mark]) => {
-        ranges.forEach(range => {
-          tr.removeMark(range.$from.pos, range.$to.pos, mark as any)
-        })
-      })
+    ranges.forEach(range => {
+      tr.removeMark(range.$from.pos, range.$to.pos)
+    })
   }
 
   return true

package/src/commands/unsetMark.ts

@@ -1,7 +1,8 @@
-import { MarkType } from 'prosemirror-model'
+import { MarkType } from '@tiptap/pm/model'
+
+import { getMarkRange } from '../helpers/getMarkRange'
+import { getMarkType } from '../helpers/getMarkType'
 import { RawCommands } from '../types'
-import getMarkType from '../helpers/getMarkType'
-import getMarkRange from '../helpers/getMarkRange'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -9,35 +10,47 @@ declare module '@tiptap/core' {
       /**
        * Remove all marks in the current selection.
        */
-      unsetMark: (typeOrName: string | MarkType) => ReturnType,
+      unsetMark: (
+        typeOrName: string | MarkType,
+        options?: {
+          /**
+           * Removes the mark even across the current selection. Defaults to `false`.
+           */
+          extendEmptyMarkRange?: boolean
+        },
+      ) => ReturnType
     }
   }
 }
 
-export const unsetMark: RawCommands['unsetMark'] = typeOrName => ({ tr, state, dispatch }) => {
+export const unsetMark: RawCommands['unsetMark'] = (typeOrName, options = {}) => ({ tr, state, dispatch }) => {
+  const { extendEmptyMarkRange = false } = options
   const { selection } = tr
   const type = getMarkType(typeOrName, state.schema)
   const { $from, empty, ranges } = selection
 
-  if (dispatch) {
-    if (empty) {
-      let { from, to } = selection
-      const range = getMarkRange($from, type)
-
-      if (range) {
-        from = range.from
-        to = range.to
-      }
-
-      tr.removeMark(from, to, type)
-    } else {
-      ranges.forEach(range => {
-        tr.removeMark(range.$from.pos, range.$to.pos, type)
-      })
+  if (!dispatch) {
+    return true
+  }
+
+  if (empty && extendEmptyMarkRange) {
+    let { from, to } = selection
+    const attrs = $from.marks().find(mark => mark.type === type)?.attrs
+    const range = getMarkRange($from, type, attrs)
+
+    if (range) {
+      from = range.from
+      to = range.to
     }
 
-    tr.removeStoredMark(type)
+    tr.removeMark(from, to, type)
+  } else {
+    ranges.forEach(range => {
+      tr.removeMark(range.$from.pos, range.$to.pos, type)
+    })
   }
 
+  tr.removeStoredMark(type)
+
   return true
 }

package/src/commands/updateAttributes.ts

@@ -1,7 +1,8 @@
-import { NodeType, MarkType } from 'prosemirror-model'
-import getNodeType from '../helpers/getNodeType'
-import getMarkType from '../helpers/getMarkType'
-import getSchemaTypeNameByName from '../helpers/getSchemaTypeNameByName'
+import { MarkType, NodeType } from '@tiptap/pm/model'
+
+import { getMarkType } from '../helpers/getMarkType'
+import { getNodeType } from '../helpers/getNodeType'
+import { getSchemaTypeNameByName } from '../helpers/getSchemaTypeNameByName'
 import { RawCommands } from '../types'
 
 declare module '@tiptap/core' {
@@ -10,7 +11,10 @@ declare module '@tiptap/core' {
       /**
        * Update attributes of a node or mark.
        */
-      updateAttributes: (typeOrName: string | NodeType | MarkType, attributes: Record<string, any>) => ReturnType,
+      updateAttributes: (
+        typeOrName: string | NodeType | MarkType,
+        attributes: Record<string, any>,
+      ) => ReturnType
     }
   }
 }
@@ -20,9 +24,7 @@ export const updateAttributes: RawCommands['updateAttributes'] = (typeOrName, at
   let markType: MarkType | null = null
 
   const schemaType = getSchemaTypeNameByName(
-    typeof typeOrName === 'string'
-      ? typeOrName
-      : typeOrName.name,
+    typeof typeOrName === 'string' ? typeOrName : typeOrName.name,
     state.schema,
   )
 
@@ -57,10 +59,14 @@ export const updateAttributes: RawCommands['updateAttributes'] = (typeOrName, at
               const trimmedFrom = Math.max(pos, from)
               const trimmedTo = Math.min(pos + node.nodeSize, to)
 
-              tr.addMark(trimmedFrom, trimmedTo, markType.create({
-                ...mark.attrs,
-                ...attributes,
-              }))
+              tr.addMark(
+                trimmedFrom,
+                trimmedTo,
+                markType.create({
+                  ...mark.attrs,
+                  ...attributes,
+                }),
+              )
             }
           })
         }

package/src/commands/wrapIn.ts

@@ -1,8 +1,8 @@
-import { wrapIn as originalWrapIn } from 'prosemirror-commands'
-import { NodeType } from 'prosemirror-model'
+import { wrapIn as originalWrapIn } from '@tiptap/pm/commands'
+import { NodeType } from '@tiptap/pm/model'
+
+import { getNodeType } from '../helpers/getNodeType'
 import { RawCommands } from '../types'
-import isNodeActive from '../helpers/isNodeActive'
-import getNodeType from '../helpers/getNodeType'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -10,18 +10,13 @@ declare module '@tiptap/core' {
       /**
        * Wraps nodes in another node.
        */
-      wrapIn: (typeOrName: string | NodeType, attributes?: Record<string, any>) => ReturnType,
+      wrapIn: (typeOrName: string | NodeType, attributes?: Record<string, any>) => ReturnType
     }
   }
 }
 
 export const wrapIn: RawCommands['wrapIn'] = (typeOrName, attributes = {}) => ({ state, dispatch }) => {
   const type = getNodeType(typeOrName, state.schema)
-  const isActive = isNodeActive(state, type, attributes)
-
-  if (isActive) {
-    return false
-  }
 
   return originalWrapIn(type, attributes)(state, dispatch)
 }

package/src/commands/wrapInList.ts

@@ -1,7 +1,8 @@
-import { wrapInList as originalWrapInList } from 'prosemirror-schema-list'
-import { NodeType } from 'prosemirror-model'
+import { NodeType } from '@tiptap/pm/model'
+import { wrapInList as originalWrapInList } from '@tiptap/pm/schema-list'
+
+import { getNodeType } from '../helpers/getNodeType'
 import { RawCommands } from '../types'
-import getNodeType from '../helpers/getNodeType'
 
 declare module '@tiptap/core' {
   interface Commands<ReturnType> {
@@ -9,7 +10,7 @@ declare module '@tiptap/core' {
       /**
        * Wrap a node in a list.
        */
-      wrapInList: (typeOrName: string | NodeType, attributes?: Record<string, any>) => ReturnType,
+      wrapInList: (typeOrName: string | NodeType, attributes?: Record<string, any>) => ReturnType
     }
   }
 }

package/src/extensions/clipboardTextSerializer.ts

@@ -1,40 +1,11 @@
-import { Editor } from '@tiptap/core'
-import { Plugin, PluginKey } from 'prosemirror-state'
-import { Extension } from '../Extension'
-
-const textBetween = (
-  editor: Editor,
-  from: number,
-  to: number,
-  blockSeparator?: string,
-  leafText?: string,
-): string => {
-  let text = ''
-  let separated = true
-
-  editor.state.doc.nodesBetween(from, to, (node, pos) => {
-    const textSerializer = editor.extensionManager.textSerializers[node.type.name]
+import { Plugin, PluginKey } from '@tiptap/pm/state'
 
-    if (textSerializer) {
-      text += textSerializer({ node })
-      separated = !blockSeparator
-    } else if (node.isText) {
-      text += node?.text?.slice(Math.max(from, pos) - pos, to - pos)
-      separated = !blockSeparator
-    } else if (node.isLeaf && leafText) {
-      text += leafText
-      separated = !blockSeparator
-    } else if (!separated && node.isBlock) {
-      text += blockSeparator
-      separated = true
-    }
-  }, 0)
-
-  return text
-}
+import { Extension } from '../Extension'
+import { getTextBetween } from '../helpers/getTextBetween'
+import { getTextSerializersFromSchema } from '../helpers/getTextSerializersFromSchema'
 
 export const ClipboardTextSerializer = Extension.create({
-  name: 'editable',
+  name: 'clipboardTextSerializer',
 
   addProseMirrorPlugins() {
     return [
@@ -43,9 +14,17 @@ export const ClipboardTextSerializer = Extension.create({
         props: {
           clipboardTextSerializer: () => {
             const { editor } = this
-            const { from, to } = editor.state.selection
+            const { state, schema } = editor
+            const { doc, selection } = state
+            const { ranges } = selection
+            const from = Math.min(...ranges.map(range => range.$from.pos))
+            const to = Math.max(...ranges.map(range => range.$to.pos))
+            const textSerializers = getTextSerializersFromSchema(schema)
+            const range = { from, to }
 
-            return textBetween(editor, from, to, '\n')
+            return getTextBetween(doc, range, {
+              textSerializers,
+            })
           },
         },
       }),

package/src/extensions/commands.ts

@@ -1,155 +1,14 @@
+import * as commands from '../commands'
 import { Extension } from '../Extension'
-import * as blur from '../commands/blur'
-import * as clearContent from '../commands/clearContent'
-import * as clearNodes from '../commands/clearNodes'
-import * as command from '../commands/command'
-import * as createParagraphNear from '../commands/createParagraphNear'
-import * as deleteNode from '../commands/deleteNode'
-import * as deleteRange from '../commands/deleteRange'
-import * as deleteSelection from '../commands/deleteSelection'
-import * as enter from '../commands/enter'
-import * as exitCode from '../commands/exitCode'
-import * as extendMarkRange from '../commands/extendMarkRange'
-import * as first from '../commands/first'
-import * as focus from '../commands/focus'
-import * as forEach from '../commands/forEach'
-import * as insertContent from '../commands/insertContent'
-import * as insertContentAt from '../commands/insertContentAt'
-import * as joinBackward from '../commands/joinBackward'
-import * as joinForward from '../commands/joinForward'
-import * as keyboardShortcut from '../commands/keyboardShortcut'
-import * as lift from '../commands/lift'
-import * as liftEmptyBlock from '../commands/liftEmptyBlock'
-import * as liftListItem from '../commands/liftListItem'
-import * as newlineInCode from '../commands/newlineInCode'
-import * as resetAttributes from '../commands/resetAttributes'
-import * as scrollIntoView from '../commands/scrollIntoView'
-import * as selectAll from '../commands/selectAll'
-import * as selectNodeBackward from '../commands/selectNodeBackward'
-import * as selectNodeForward from '../commands/selectNodeForward'
-import * as selectParentNode from '../commands/selectParentNode'
-import * as setContent from '../commands/setContent'
-import * as setMark from '../commands/setMark'
-import * as setMeta from '../commands/setMeta'
-import * as setNode from '../commands/setNode'
-import * as setNodeSelection from '../commands/setNodeSelection'
-import * as setTextSelection from '../commands/setTextSelection'
-import * as sinkListItem from '../commands/sinkListItem'
-import * as splitBlock from '../commands/splitBlock'
-import * as splitListItem from '../commands/splitListItem'
-import * as toggleList from '../commands/toggleList'
-import * as toggleMark from '../commands/toggleMark'
-import * as toggleNode from '../commands/toggleNode'
-import * as toggleWrap from '../commands/toggleWrap'
-import * as undoInputRule from '../commands/undoInputRule'
-import * as unsetAllMarks from '../commands/unsetAllMarks'
-import * as unsetMark from '../commands/unsetMark'
-import * as updateAttributes from '../commands/updateAttributes'
-import * as wrapIn from '../commands/wrapIn'
-import * as wrapInList from '../commands/wrapInList'
 
-export { blur }
-export { clearContent }
-export { clearNodes }
-export { command }
-export { createParagraphNear }
-export { deleteNode }
-export { deleteRange }
-export { deleteSelection }
-export { enter }
-export { exitCode }
-export { extendMarkRange }
-export { first }
-export { focus }
-export { forEach }
-export { insertContent }
-export { insertContentAt }
-export { joinBackward }
-export { joinForward }
-export { keyboardShortcut }
-export { lift }
-export { liftEmptyBlock }
-export { liftListItem }
-export { newlineInCode }
-export { resetAttributes }
-export { scrollIntoView }
-export { selectAll }
-export { selectNodeBackward }
-export { selectNodeForward }
-export { selectParentNode }
-export { setContent }
-export { setMark }
-export { setMeta }
-export { setNode }
-export { setNodeSelection }
-export { setTextSelection }
-export { sinkListItem }
-export { splitBlock }
-export { splitListItem }
-export { toggleList }
-export { toggleMark }
-export { toggleNode }
-export { toggleWrap }
-export { undoInputRule }
-export { unsetAllMarks }
-export { unsetMark }
-export { updateAttributes }
-export { wrapIn }
-export { wrapInList }
+export * from '../commands'
 
 export const Commands = Extension.create({
   name: 'commands',
 
   addCommands() {
     return {
-      ...blur,
-      ...clearContent,
-      ...clearNodes,
-      ...command,
-      ...createParagraphNear,
-      ...deleteNode,
-      ...deleteRange,
-      ...deleteSelection,
-      ...enter,
-      ...exitCode,
-      ...extendMarkRange,
-      ...first,
-      ...focus,
-      ...forEach,
-      ...insertContent,
-      ...insertContentAt,
-      ...joinBackward,
-      ...joinForward,
-      ...keyboardShortcut,
-      ...lift,
-      ...liftEmptyBlock,
-      ...liftListItem,
-      ...newlineInCode,
-      ...resetAttributes,
-      ...scrollIntoView,
-      ...selectAll,
-      ...selectNodeBackward,
-      ...selectNodeForward,
-      ...selectParentNode,
-      ...setContent,
-      ...setMark,
-      ...setMeta,
-      ...setNode,
-      ...setNodeSelection,
-      ...setTextSelection,
-      ...sinkListItem,
-      ...splitBlock,
-      ...splitListItem,
-      ...toggleList,
-      ...toggleMark,
-      ...toggleNode,
-      ...toggleWrap,
-      ...undoInputRule,
-      ...unsetAllMarks,
-      ...unsetMark,
-      ...updateAttributes,
-      ...wrapIn,
-      ...wrapInList,
+      ...commands,
     }
   },
 })

package/src/extensions/editable.ts

@@ -1,4 +1,5 @@
-import { Plugin, PluginKey } from 'prosemirror-state'
+import { Plugin, PluginKey } from '@tiptap/pm/state'
+
 import { Extension } from '../Extension'
 
 export const Editable = Extension.create({

package/src/extensions/focusEvents.ts

@@ -1,4 +1,5 @@
-import { Plugin, PluginKey } from 'prosemirror-state'
+import { Plugin, PluginKey } from '@tiptap/pm/state'
+
 import { Extension } from '../Extension'
 
 export const FocusEvents = Extension.create({
@@ -11,11 +12,8 @@ export const FocusEvents = Extension.create({
       new Plugin({
         key: new PluginKey('focusEvents'),
         props: {
-          attributes: {
-            tabindex: '0',
-          },
           handleDOMEvents: {
-            focus: (view, event) => {
+            focus: (view, event: Event) => {
               editor.isFocused = true
 
               const transaction = editor.state.tr
@@ -26,7 +24,7 @@ export const FocusEvents = Extension.create({
 
               return false
             },
-            blur: (view, event) => {
+            blur: (view, event: Event) => {
               editor.isFocused = false
 
               const transaction = editor.state.tr

package/src/extensions/index.ts

@@ -3,3 +3,4 @@ export { Commands } from './commands'
 export { Editable } from './editable'
 export { FocusEvents } from './focusEvents'
 export { Keymap } from './keymap'
+export { Tabindex } from './tabindex'