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

package/src/extensions/clipboardTextSerializer.ts

@@ -1,4 +1,4 @@
-import { Plugin, PluginKey } from 'prosemirror-state'
+import { Plugin, PluginKey } from '@tiptap/pm/state'
 
 import { Extension } from '../Extension'
 import { getTextBetween } from '../helpers/getTextBetween'

package/src/extensions/editable.ts

@@ -1,4 +1,4 @@
-import { Plugin, PluginKey } from 'prosemirror-state'
+import { Plugin, PluginKey } from '@tiptap/pm/state'
 
 import { Extension } from '../Extension'
 

package/src/extensions/focusEvents.ts

@@ -1,4 +1,4 @@
-import { Plugin, PluginKey } from 'prosemirror-state'
+import { Plugin, PluginKey } from '@tiptap/pm/state'
 
 import { Extension } from '../Extension'
 

package/src/extensions/keymap.ts

@@ -1,4 +1,4 @@
-import { Plugin, PluginKey, Selection } from 'prosemirror-state'
+import { Plugin, PluginKey, Selection } from '@tiptap/pm/state'
 
 import { CommandManager } from '../CommandManager'
 import { Extension } from '../Extension'
@@ -19,12 +19,7 @@ export const Keymap = Extension.create({
         const { pos, parent } = $anchor
         const isAtStart = Selection.atStart(doc).from === pos
 
-        if (
-          !empty
-          || !isAtStart
-          || !parent.type.isTextblock
-          || parent.textContent.length
-        ) {
+        if (!empty || !isAtStart || !parent.type.isTextblock || parent.textContent.length) {
           return false
         }
 

package/src/extensions/tabindex.ts

@@ -1,4 +1,4 @@
-import { Plugin, PluginKey } from 'prosemirror-state'
+import { Plugin, PluginKey } from '@tiptap/pm/state'
 
 import { Extension } from '../Extension'
 

package/src/helpers/combineTransactionSteps.ts

@@ -1,11 +1,14 @@
-import { Node as ProseMirrorNode } from 'prosemirror-model'
-import { Transaction } from 'prosemirror-state'
-import { Transform } from 'prosemirror-transform'
+import { Node as ProseMirrorNode } from '@tiptap/pm/model'
+import { Transaction } from '@tiptap/pm/state'
+import { Transform } from '@tiptap/pm/transform'
 
 /**
  * Returns a new `Transform` based on all steps of the passed transactions.
  */
-export function combineTransactionSteps(oldDoc: ProseMirrorNode, transactions: Transaction[]): Transform {
+export function combineTransactionSteps(
+  oldDoc: ProseMirrorNode,
+  transactions: Transaction[],
+): Transform {
   const transform = new Transform(oldDoc)
 
   transactions.forEach(transaction => {

package/src/helpers/createChainableState.ts

@@ -1,8 +1,8 @@
-import { EditorState, Transaction } from 'prosemirror-state'
+import { EditorState, Transaction } from '@tiptap/pm/state'
 
 export function createChainableState(config: {
-  transaction: Transaction,
-  state: EditorState,
+  transaction: Transaction
+  state: EditorState
 }): EditorState {
   const { state, transaction } = config
   let { selection } = transaction

package/src/helpers/createDocument.ts

@@ -1,4 +1,4 @@
-import { Node as ProseMirrorNode, ParseOptions, Schema } from 'prosemirror-model'
+import { Node as ProseMirrorNode, ParseOptions, Schema } from '@tiptap/pm/model'
 
 import { Content } from '../types'
 import { createNodeFromContent } from './createNodeFromContent'

package/src/helpers/createNodeFromContent.ts

@@ -4,14 +4,14 @@ import {
   Node as ProseMirrorNode,
   ParseOptions,
   Schema,
-} from 'prosemirror-model'
+} from '@tiptap/pm/model'
 
 import { Content } from '../types'
 import { elementFromString } from '../utilities/elementFromString'
 
 export type CreateNodeFromContentOptions = {
-  slice?: boolean,
-  parseOptions?: ParseOptions,
+  slice?: boolean
+  parseOptions?: ParseOptions
 }
 
 export function createNodeFromContent(
@@ -33,13 +33,7 @@ export function createNodeFromContent(
 
       return schema.nodeFromJSON(content)
     } catch (error) {
-      console.warn(
-        '[tiptap warn]: Invalid content.',
-        'Passed value:',
-        content,
-        'Error:',
-        error,
-      )
+      console.warn('[tiptap warn]: Invalid content.', 'Passed value:', content, 'Error:', error)
 
       return createNodeFromContent('', schema, options)
     }

package/src/helpers/defaultBlockAt.ts

@@ -1,4 +1,4 @@
-import { ContentMatch, NodeType } from 'prosemirror-model'
+import { ContentMatch, NodeType } from '@tiptap/pm/model'
 
 export function defaultBlockAt(match: ContentMatch): NodeType | null {
   for (let i = 0; i < match.edgeCount; i += 1) {

package/src/helpers/findChildren.ts

@@ -1,4 +1,4 @@
-import { Node as ProseMirrorNode } from 'prosemirror-model'
+import { Node as ProseMirrorNode } from '@tiptap/pm/model'
 
 import { NodeWithPos, Predicate } from '../types'
 

package/src/helpers/findChildrenInRange.ts

@@ -1,11 +1,15 @@
-import { Node as ProseMirrorNode } from 'prosemirror-model'
+import { Node as ProseMirrorNode } from '@tiptap/pm/model'
 
 import { NodeWithPos, Predicate, Range } from '../types'
 
 /**
  * Same as `findChildren` but searches only within a `range`.
  */
-export function findChildrenInRange(node: ProseMirrorNode, range: Range, predicate: Predicate): NodeWithPos[] {
+export function findChildrenInRange(
+  node: ProseMirrorNode,
+  range: Range,
+  predicate: Predicate,
+): NodeWithPos[] {
   const nodesWithPos: NodeWithPos[] = []
 
   // if (range.from === range.to) {

package/src/helpers/findParentNode.ts

@@ -1,4 +1,4 @@
-import { Selection } from 'prosemirror-state'
+import { Selection } from '@tiptap/pm/state'
 
 import { Predicate } from '../types'
 import { findParentNodeClosestToPos } from './findParentNodeClosestToPos'

package/src/helpers/findParentNodeClosestToPos.ts

@@ -1,13 +1,18 @@
-import { Node as ProseMirrorNode, ResolvedPos } from 'prosemirror-model'
+import { Node as ProseMirrorNode, ResolvedPos } from '@tiptap/pm/model'
 
 import { Predicate } from '../types'
 
-export function findParentNodeClosestToPos($pos: ResolvedPos, predicate: Predicate): ({
-  pos: number,
-  start: number,
-  depth: number,
-  node: ProseMirrorNode,
-} | undefined) {
+export function findParentNodeClosestToPos(
+  $pos: ResolvedPos,
+  predicate: Predicate,
+):
+  | {
+      pos: number
+      start: number
+      depth: number
+      node: ProseMirrorNode
+    }
+  | undefined {
   for (let i = $pos.depth; i > 0; i -= 1) {
     const node = $pos.node(i)
 

package/src/helpers/generateHTML.ts

@@ -1,4 +1,4 @@
-import { Node } from 'prosemirror-model'
+import { Node } from '@tiptap/pm/model'
 
 import { Extensions, JSONContent } from '../types'
 import { getHTMLFromFragment } from './getHTMLFromFragment'

package/src/helpers/generateJSON.ts

@@ -1,4 +1,4 @@
-import { DOMParser } from 'prosemirror-model'
+import { DOMParser } from '@tiptap/pm/model'
 
 import { Extensions } from '../types'
 import { elementFromString } from '../utilities/elementFromString'
@@ -8,7 +8,5 @@ export function generateJSON(html: string, extensions: Extensions): Record<strin
   const schema = getSchema(extensions)
   const dom = elementFromString(html)
 
-  return DOMParser.fromSchema(schema)
-    .parse(dom)
-    .toJSON()
+  return DOMParser.fromSchema(schema).parse(dom).toJSON()
 }

package/src/helpers/generateText.ts

@@ -1,4 +1,4 @@
-import { Node } from 'prosemirror-model'
+import { Node } from '@tiptap/pm/model'
 
 import { Extensions, JSONContent, TextSerializer } from '../types'
 import { getSchema } from './getSchema'
@@ -9,14 +9,11 @@ export function generateText(
   doc: JSONContent,
   extensions: Extensions,
   options?: {
-    blockSeparator?: string,
-    textSerializers?: Record<string, TextSerializer>,
+    blockSeparator?: string
+    textSerializers?: Record<string, TextSerializer>
   },
 ): string {
-  const {
-    blockSeparator = '\n\n',
-    textSerializers = {},
-  } = options || {}
+  const { blockSeparator = '\n\n', textSerializers = {} } = options || {}
   const schema = getSchema(extensions)
   const contentNode = Node.fromJSON(schema, doc)
 

package/src/helpers/getAttributes.ts

@@ -1,5 +1,5 @@
-import { MarkType, NodeType } from 'prosemirror-model'
-import { EditorState } from 'prosemirror-state'
+import { MarkType, NodeType } from '@tiptap/pm/model'
+import { EditorState } from '@tiptap/pm/state'
 
 import { getMarkAttributes } from './getMarkAttributes'
 import { getNodeAttributes } from './getNodeAttributes'
@@ -10,9 +10,7 @@ export function getAttributes(
   typeOrName: string | NodeType | MarkType,
 ): Record<string, any> {
   const schemaType = getSchemaTypeNameByName(
-    typeof typeOrName === 'string'
-      ? typeOrName
-      : typeOrName.name,
+    typeof typeOrName === 'string' ? typeOrName : typeOrName.name,
     state.schema,
   )
 

package/src/helpers/getChangedRanges.ts

@@ -1,4 +1,4 @@
-import { Step, Transform } from 'prosemirror-transform'
+import { Step, Transform } from '@tiptap/pm/transform'
 
 import { Range } from '../types'
 import { removeDuplicates } from '../utilities/removeDuplicates'

package/src/helpers/getDebugJSON.ts

@@ -1,10 +1,10 @@
-import { Node as ProseMirrorNode } from 'prosemirror-model'
+import { Node as ProseMirrorNode } from '@tiptap/pm/model'
 
 import { JSONContent } from '../types'
 
 interface DebugJSONContent extends JSONContent {
-  from: number,
-  to: number,
+  from: number
+  to: number
 }
 
 export function getDebugJSON(node: ProseMirrorNode, startOffset = 0): DebugJSONContent {
@@ -13,7 +13,7 @@ export function getDebugJSON(node: ProseMirrorNode, startOffset = 0): DebugJSONC
   const from = startOffset
   const to = from + node.nodeSize
   const marks = node.marks.map(mark => {
-    const output: { type: string, attrs?: Record<string, any> } = {
+    const output: { type: string; attrs?: Record<string, any> } = {
       type: mark.type.name,
     }
 

package/src/helpers/getHTMLFromFragment.ts

@@ -1,9 +1,7 @@
-import { DOMSerializer, Fragment, Schema } from 'prosemirror-model'
+import { DOMSerializer, Fragment, Schema } from '@tiptap/pm/model'
 
 export function getHTMLFromFragment(fragment: Fragment, schema: Schema): string {
-  const documentFragment = DOMSerializer
-    .fromSchema(schema)
-    .serializeFragment(fragment)
+  const documentFragment = DOMSerializer.fromSchema(schema).serializeFragment(fragment)
 
   const temporaryDocument = document.implementation.createHTMLDocument()
   const container = temporaryDocument.createElement('div')

package/src/helpers/getMarkAttributes.ts

@@ -1,9 +1,12 @@
-import { Mark, MarkType } from 'prosemirror-model'
-import { EditorState } from 'prosemirror-state'
+import { Mark, MarkType } from '@tiptap/pm/model'
+import { EditorState } from '@tiptap/pm/state'
 
 import { getMarkType } from './getMarkType'
 
-export function getMarkAttributes(state: EditorState, typeOrName: string | MarkType): Record<string, any> {
+export function getMarkAttributes(
+  state: EditorState,
+  typeOrName: string | MarkType,
+): Record<string, any> {
   const type = getMarkType(typeOrName, state.schema)
   const { from, to, empty } = state.selection
   const marks: Mark[] = []

package/src/helpers/getMarkRange.ts

@@ -1,4 +1,4 @@
-import { Mark as ProseMirrorMark, MarkType, ResolvedPos } from 'prosemirror-model'
+import { Mark as ProseMirrorMark, MarkType, ResolvedPos } from '@tiptap/pm/model'
 
 import { Range } from '../types'
 import { objectIncludes } from '../utilities/objectIncludes'

package/src/helpers/getMarkType.ts

@@ -1,9 +1,11 @@
-import { MarkType, Schema } from 'prosemirror-model'
+import { MarkType, Schema } from '@tiptap/pm/model'
 
 export function getMarkType(nameOrType: string | MarkType, schema: Schema): MarkType {
   if (typeof nameOrType === 'string') {
     if (!schema.marks[nameOrType]) {
-      throw Error(`There is no mark type named '${nameOrType}'. Maybe you forgot to add the extension?`)
+      throw Error(
+        `There is no mark type named '${nameOrType}'. Maybe you forgot to add the extension?`,
+      )
     }
 
     return schema.marks[nameOrType]

package/src/helpers/getMarksBetween.ts

@@ -1,4 +1,4 @@
-import { Node as ProseMirrorNode } from 'prosemirror-model'
+import { Node as ProseMirrorNode } from '@tiptap/pm/model'
 
 import { MarkRange } from '../types'
 import { getMarkRange } from './getMarkRange'
@@ -26,11 +26,13 @@ export function getMarksBetween(from: number, to: number, doc: ProseMirrorNode):
       })
   } else {
     doc.nodesBetween(from, to, (node, pos) => {
-      marks.push(...node.marks.map(mark => ({
-        from: pos,
-        to: pos + node.nodeSize,
-        mark,
-      })))
+      marks.push(
+        ...node.marks.map(mark => ({
+          from: pos,
+          to: pos + node.nodeSize,
+          mark,
+        })),
+      )
     })
   }
 

package/src/helpers/getNodeAttributes.ts

@@ -1,9 +1,12 @@
-import { Node, NodeType } from 'prosemirror-model'
-import { EditorState } from 'prosemirror-state'
+import { Node, NodeType } from '@tiptap/pm/model'
+import { EditorState } from '@tiptap/pm/state'
 
 import { getNodeType } from './getNodeType'
 
-export function getNodeAttributes(state: EditorState, typeOrName: string | NodeType): Record<string, any> {
+export function getNodeAttributes(
+  state: EditorState,
+  typeOrName: string | NodeType,
+): Record<string, any> {
   const type = getNodeType(typeOrName, state.schema)
   const { from, to } = state.selection
   const nodes: Node[] = []
@@ -12,9 +15,7 @@ export function getNodeAttributes(state: EditorState, typeOrName: string | NodeT
     nodes.push(node)
   })
 
-  const node = nodes
-    .reverse()
-    .find(nodeItem => nodeItem.type.name === type.name)
+  const node = nodes.reverse().find(nodeItem => nodeItem.type.name === type.name)
 
   if (!node) {
     return {}

package/src/helpers/getNodeType.ts

@@ -1,9 +1,11 @@
-import { NodeType, Schema } from 'prosemirror-model'
+import { NodeType, Schema } from '@tiptap/pm/model'
 
 export function getNodeType(nameOrType: string | NodeType, schema: Schema): NodeType {
   if (typeof nameOrType === 'string') {
     if (!schema.nodes[nameOrType]) {
-      throw Error(`There is no node type named '${nameOrType}'. Maybe you forgot to add the extension?`)
+      throw Error(
+        `There is no node type named '${nameOrType}'. Maybe you forgot to add the extension?`,
+      )
     }
 
     return schema.nodes[nameOrType]

package/src/helpers/getRenderedAttributes.ts

@@ -1,9 +1,12 @@
-import { Mark, Node } from 'prosemirror-model'
+import { Mark, Node } from '@tiptap/pm/model'
 
 import { ExtensionAttribute } from '../types'
 import { mergeAttributes } from '../utilities/mergeAttributes'
 
-export function getRenderedAttributes(nodeOrMark: Node | Mark, extensionAttributes: ExtensionAttribute[]): Record<string, any> {
+export function getRenderedAttributes(
+  nodeOrMark: Node | Mark,
+  extensionAttributes: ExtensionAttribute[],
+): Record<string, any> {
   return extensionAttributes
     .filter(item => item.attribute.rendered)
     .map(item => {

package/src/helpers/getSchema.ts

@@ -1,4 +1,4 @@
-import { Schema } from 'prosemirror-model'
+import { Schema } from '@tiptap/pm/model'
 
 import { ExtensionManager } from '../ExtensionManager'
 import { Extensions } from '../types'