@tiptap/core 3.0.0-beta.3 → 3.0.0-beta.30

package/jsx-dev-runtime/index.cjs

@@ -0,0 +1 @@
+module.exports = require('../dist/jsx-runtime/jsx-runtime.cjs')

package/jsx-dev-runtime/index.d.cts

@@ -0,0 +1 @@
+export * from '../src/jsx-runtime.ts'

package/jsx-dev-runtime/index.d.ts

@@ -0,0 +1 @@
+export type * from '../src/jsx-runtime.js'

package/jsx-dev-runtime/index.js

@@ -0,0 +1 @@
+export * from '../dist/jsx-runtime/jsx-runtime.js'

package/jsx-runtime/index.cjs

@@ -1 +1 @@
-export * from '../dist/jsx-runtime/jsx-runtime.cjs'
+module.exports = require('../dist/jsx-runtime/jsx-runtime.cjs')

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/core",
   "description": "headless rich text editor",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.30",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -48,13 +48,14 @@
   "files": [
     "src",
     "dist",
-    "jsx-runtime"
+    "jsx-runtime",
+    "jsx-dev-runtime"
   ],
   "devDependencies": {
-    "@tiptap/pm": "3.0.0-beta.3"
+    "@tiptap/pm": "3.0.0-beta.30"
   },
   "peerDependencies": {
-    "@tiptap/pm": "3.0.0-beta.3"
+    "@tiptap/pm": "3.0.0-beta.30"
   },
   "repository": {
     "type": "git",

package/src/Editor.ts

@@ -92,6 +92,7 @@ export class Editor extends EventEmitter<EditorEvents> {
     enablePasteRules: true,
     enableCoreExtensions: true,
     enableContentCheck: false,
+    emitContentError: false,
     onBeforeCreate: () => null,
     onCreate: () => null,
     onUpdate: () => null,
@@ -287,6 +288,7 @@ export class Editor extends EventEmitter<EditorEvents> {
         composing: false,
         dragging: null,
         editable: true,
+        isDestroyed: false,
       } as EditorView,
       {
         get: (obj, key) => {
@@ -361,7 +363,7 @@ export class Editor extends EventEmitter<EditorEvents> {
       const name = typeof nameOrPluginKey === 'string' ? `${nameOrPluginKey}$` : nameOrPluginKey.key
 
       // @ts-ignore
-      plugins = prevPlugins.filter(plugin => !plugin.key.startsWith(name))
+      plugins = plugins.filter(plugin => !plugin.key.startsWith(name))
     })
 
     if (prevPlugins.length === plugins.length) {
@@ -717,8 +719,7 @@ export class Editor extends EventEmitter<EditorEvents> {
    * Check if the editor is already destroyed.
    */
   public get isDestroyed(): boolean {
-    // @ts-ignore
-    return !this.view?.docView
+    return this.editorView?.isDestroyed ?? true
   }
 
   public $node(selector: string, attributes?: { [key: string]: any }): NodePos | null {

package/src/Extension.ts

@@ -15,8 +15,16 @@ export class Extension<Options = any, Storage = any> extends Extendable<
 > {
   type = 'extension'
 
-  static create<O = any, S = any>(config: Partial<ExtensionConfig<O, S>> = {}) {
-    return new Extension<O, S>(config)
+  /**
+   * Create a new Extension instance
+   * @param config - Extension configuration object or a function that returns a configuration object
+   */
+  static create<O = any, S = any>(
+    config: Partial<ExtensionConfig<O, S>> | (() => Partial<ExtensionConfig<O, S>>) = {},
+  ) {
+    // If the config is a function, execute it to get the configuration object
+    const resolvedConfig = typeof config === 'function' ? config() : config
+    return new Extension<O, S>(resolvedConfig)
   }
 
   configure(options?: Partial<Options>) {
@@ -27,7 +35,9 @@ export class Extension<Options = any, Storage = any> extends Extendable<
     ExtendedOptions = Options,
     ExtendedStorage = Storage,
     ExtendedConfig = ExtensionConfig<ExtendedOptions, ExtendedStorage>,
-  >(extendedConfig?: Partial<ExtendedConfig>) {
-    return super.extend(extendedConfig) as Extension<ExtendedOptions, ExtendedStorage>
+  >(extendedConfig?: Partial<ExtendedConfig> | (() => Partial<ExtendedConfig>)) {
+    // If the extended config is a function, execute it to get the configuration object
+    const resolvedConfig = typeof extendedConfig === 'function' ? extendedConfig() : extendedConfig
+    return super.extend(resolvedConfig) as Extension<ExtendedOptions, ExtendedStorage>
   }
 }

package/src/ExtensionManager.ts

@@ -17,7 +17,7 @@ import {
   sortExtensions,
   splitExtensions,
 } from './helpers/index.js'
-import { type MarkConfig, type NodeConfig, type Storage, getMarkType } from './index.js'
+import { type MarkConfig, type NodeConfig, type Storage, getMarkType, updateMarkViewAttributes } from './index.js'
 import type { InputRule } from './InputRule.js'
 import { inputRulesPlugin } from './InputRule.js'
 import { Mark } from './Mark.js'
@@ -262,6 +262,9 @@ export class ExtensionManager {
               editor,
               extension,
               HTMLAttributes,
+              updateAttributes: (attrs: Record<string, any>) => {
+                updateMarkViewAttributes(mark, editor, attrs)
+              },
             })
           }
 

package/src/Mark.ts

@@ -146,8 +146,14 @@ export interface MarkConfig<Options = any, Storage = any>
 export class Mark<Options = any, Storage = any> extends Extendable<Options, Storage, MarkConfig<Options, Storage>> {
   type = 'mark'
 
-  static create<O = any, S = any>(config: Partial<MarkConfig<O, S>> = {}) {
-    return new Mark<O, S>(config)
+  /**
+   * Create a new Mark instance
+   * @param config - Mark configuration object or a function that returns a configuration object
+   */
+  static create<O = any, S = any>(config: Partial<MarkConfig<O, S>> | (() => Partial<MarkConfig<O, S>>) = {}) {
+    // If the config is a function, execute it to get the configuration object
+    const resolvedConfig = typeof config === 'function' ? config() : config
+    return new Mark<O, S>(resolvedConfig)
   }
 
   static handleExit({ editor, mark }: { editor: Editor; mark: Mark }) {
@@ -186,7 +192,9 @@ export class Mark<Options = any, Storage = any> extends Extendable<Options, Stor
     ExtendedOptions = Options,
     ExtendedStorage = Storage,
     ExtendedConfig = MarkConfig<ExtendedOptions, ExtendedStorage>,
-  >(extendedConfig?: Partial<ExtendedConfig>) {
-    return super.extend(extendedConfig) as Mark<ExtendedOptions, ExtendedStorage>
+  >(extendedConfig?: Partial<ExtendedConfig> | (() => Partial<ExtendedConfig>)) {
+    // If the extended config is a function, execute it to get the configuration object
+    const resolvedConfig = typeof extendedConfig === 'function' ? extendedConfig() : extendedConfig
+    return super.extend(resolvedConfig) as Mark<ExtendedOptions, ExtendedStorage>
   }
 }

package/src/MarkView.ts

@@ -1,9 +1,57 @@
+import type { Mark } from '@tiptap/pm/model'
 import type { ViewMutationRecord } from '@tiptap/pm/view'
 
 import type { Editor } from './Editor.js'
 import type { MarkViewProps, MarkViewRendererOptions } from './types.js'
 import { isAndroid, isiOS } from './utilities/index.js'
 
+export function updateMarkViewAttributes(checkMark: Mark, editor: Editor, attrs: Record<string, any> = {}): void {
+  const { state } = editor
+  const { doc, tr } = state
+  const thisMark = checkMark
+
+  doc.descendants((node, pos) => {
+    const from = tr.mapping.map(pos)
+    const to = tr.mapping.map(pos) + node.nodeSize
+    let foundMark: Mark | null = null
+
+    // find the mark on the current node
+    node.marks.forEach(mark => {
+      if (mark !== thisMark) {
+        return false
+      }
+
+      foundMark = mark
+    })
+
+    if (!foundMark) {
+      return
+    }
+
+    // check if we need to update given the attributes
+    let needsUpdate = false
+    Object.keys(attrs).forEach(k => {
+      if (attrs[k] !== foundMark!.attrs[k]) {
+        needsUpdate = true
+      }
+    })
+
+    if (needsUpdate) {
+      const updatedMark = checkMark.type.create({
+        ...checkMark.attrs,
+        ...attrs,
+      })
+
+      tr.removeMark(from, to, checkMark.type)
+      tr.addMark(from, to, updatedMark)
+    }
+  })
+
+  if (tr.docChanged) {
+    editor.view.dispatch(tr)
+  }
+}
+
 export class MarkView<Component, Options extends MarkViewRendererOptions = MarkViewRendererOptions> {
   component: Component
   editor: Editor
@@ -27,6 +75,14 @@ export class MarkView<Component, Options extends MarkViewRendererOptions = MarkV
     return null
   }
 
+  /**
+   * Update the attributes of the mark in the document.
+   * @param attrs The attributes to update.
+   */
+  updateAttributes(attrs: Record<string, any>, checkMark?: Mark): void {
+    updateMarkViewAttributes(checkMark || this.mark, this.editor, attrs)
+  }
+
   ignoreMutation(mutation: ViewMutationRecord): boolean {
     if (!this.dom || !this.contentDOM) {
       return true

package/src/Node.ts

@@ -340,8 +340,14 @@ export interface NodeConfig<Options = any, Storage = any>
 export class Node<Options = any, Storage = any> extends Extendable<Options, Storage, NodeConfig<Options, Storage>> {
   type = 'node'
 
-  static create<O = any, S = any>(config: Partial<NodeConfig<O, S>> = {}) {
-    return new Node<O, S>(config)
+  /**
+   * Create a new Node instance
+   * @param config - Node configuration object or a function that returns a configuration object
+   */
+  static create<O = any, S = any>(config: Partial<NodeConfig<O, S>> | (() => Partial<NodeConfig<O, S>>) = {}) {
+    // If the config is a function, execute it to get the configuration object
+    const resolvedConfig = typeof config === 'function' ? config() : config
+    return new Node<O, S>(resolvedConfig)
   }
 
   configure(options?: Partial<Options>) {
@@ -352,7 +358,9 @@ export class Node<Options = any, Storage = any> extends Extendable<Options, Stor
     ExtendedOptions = Options,
     ExtendedStorage = Storage,
     ExtendedConfig = NodeConfig<ExtendedOptions, ExtendedStorage>,
-  >(extendedConfig?: Partial<ExtendedConfig>) {
-    return super.extend(extendedConfig) as Node<ExtendedOptions, ExtendedStorage>
+  >(extendedConfig?: Partial<ExtendedConfig> | (() => Partial<ExtendedConfig>)) {
+    // If the extended config is a function, execute it to get the configuration object
+    const resolvedConfig = typeof extendedConfig === 'function' ? extendedConfig() : extendedConfig
+    return super.extend(resolvedConfig) as Node<ExtendedOptions, ExtendedStorage>
   }
 }

package/src/NodePos.ts

@@ -136,6 +136,12 @@ export class NodePos {
       const isNonTextAtom = node.isAtom && !node.isText
 
       const targetPos = this.pos + offset + (isNonTextAtom ? 0 : 1)
+
+      // Check if targetPos is within valid document range
+      if (targetPos < 0 || targetPos > this.resolvedPos.doc.nodeSize - 2) {
+        return
+      }
+
       const $pos = this.resolvedPos.doc.resolve(targetPos)
 
       if (!isBlock && $pos.depth <= this.depth) {

package/src/PasteRule.ts

@@ -267,7 +267,7 @@ export function pasteRulesPlugin(props: { editor: Editor; rules: PasteRule[] }):
             if (!isDroppedFromProseMirror) {
               const dragFromOtherEditor = tiptapDragFromOtherEditor
 
-              if (dragFromOtherEditor) {
+              if (dragFromOtherEditor?.isEditable) {
                 // setTimeout to avoid the wrong content after drop, timeout arg can't be empty or 0
                 setTimeout(() => {
                   const selection = dragFromOtherEditor.state.selection

package/src/commands/cut.ts

@@ -30,7 +30,7 @@ export const cut: RawCommands['cut'] =
 
     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
   }

package/src/commands/insertContentAt.ts

@@ -76,18 +76,10 @@ export const insertContentAt: RawCommands['insertContentAt'] =
       let content: Fragment | ProseMirrorNode
       const { selection } = editor.state
 
-      try {
-        content = createNodeFromContent(value, editor.schema, {
-          parseOptions: {
-            preserveWhitespace: 'full',
-            ...options.parseOptions,
-          },
-          errorOnInvalidContent: options.errorOnInvalidContent ?? editor.options.enableContentCheck,
-        })
-      } catch (e) {
+      const emitContentError = (error: Error) => {
         editor.emit('contentError', {
           editor,
-          error: e as Error,
+          error,
           disableCollaboration: () => {
             if (
               'collaboration' in editor.storage &&
@@ -98,6 +90,33 @@ export const insertContentAt: RawCommands['insertContentAt'] =
             }
           },
         })
+      }
+
+      const parseOptions: ParseOptions = {
+        preserveWhitespace: 'full',
+        ...options.parseOptions,
+      }
+
+      // If `emitContentError` is enabled, we want to check the content for errors
+      // but ignore them (do not remove the invalid content from the document)
+      if (!options.errorOnInvalidContent && !editor.options.enableContentCheck && editor.options.emitContentError) {
+        try {
+          createNodeFromContent(value, editor.schema, {
+            parseOptions,
+            errorOnInvalidContent: true,
+          })
+        } catch (e) {
+          emitContentError(e as Error)
+        }
+      }
+
+      try {
+        content = createNodeFromContent(value, editor.schema, {
+          parseOptions,
+          errorOnInvalidContent: options.errorOnInvalidContent ?? editor.options.enableContentCheck,
+        })
+      } catch (e) {
+        emitContentError(e as Error)
         return false
       }
 
@@ -163,8 +182,9 @@ export const insertContentAt: RawCommands['insertContentAt'] =
 
         const fromSelectionAtStart = selection.$from.parentOffset === 0
         const isTextSelection = selection.$from.node().isText || selection.$from.node().isTextblock
+        const hasContent = selection.$from.node().content.size > 0
 
-        if (fromSelectionAtStart && isTextSelection) {
+        if (fromSelectionAtStart && isTextSelection && hasContent) {
           from = Math.max(0, from - 1)
         }
 

package/src/types.ts

@@ -354,6 +354,15 @@ export interface EditorOptions {
    * @default false
    */
   enableContentCheck: boolean
+  /**
+   * If `true`, the editor will emit the `contentError` event if invalid content is
+   * encountered but `enableContentCheck` is `false`. This lets you preserve the
+   * invalid editor content while still showing a warning or error message to
+   * the user.
+   *
+   * @default false
+   */
+  emitContentError: boolean
   /**
    * Called before the editor is constructed.
    */
@@ -653,9 +662,11 @@ export interface MarkViewRendererProps {
    * The HTML attributes that should be added to the mark's DOM element.
    */
   HTMLAttributes: Record<string, any>
+
+  updateAttributes: (attrs: Record<string, any>) => void
 }
 
-export type MarkViewRenderer = (props: MarkViewRendererProps) => MarkView
+export type MarkViewRenderer<Props = MarkViewRendererProps> = (props: Props) => MarkView
 
 export interface MarkViewRendererOptions {
   ignoreMutation: ((props: { mutation: ViewMutationRecord }) => boolean) | null

package/src/utilities/canInsertNode.ts

@@ -0,0 +1,30 @@
+import type { NodeType } from '@tiptap/pm/model'
+import { type EditorState, NodeSelection } from '@tiptap/pm/state'
+
+export function canInsertNode(state: EditorState, nodeType: NodeType): boolean {
+  const { selection } = state
+  const { $from } = selection
+
+  // Special handling for NodeSelection
+  if (selection instanceof NodeSelection) {
+    const index = $from.index()
+    const parent = $from.parent
+
+    // Can we replace the selected node with the horizontal rule?
+    return parent.canReplaceWith(index, index + 1, nodeType)
+  }
+
+  // Default: check if we can insert at the current position
+  let depth = $from.depth
+
+  while (depth >= 0) {
+    const index = $from.index(depth)
+    const parent = $from.node(depth)
+    const match = parent.contentMatchAt(index)
+    if (match.matchType(nodeType)) {
+      return true
+    }
+    depth -= 1
+  }
+  return false
+}

package/src/utilities/index.ts

@@ -1,4 +1,5 @@
 export * from './callOrReturn.js'
+export * from './canInsertNode.js'
 export * from './createStyleTag.js'
 export * from './deleteProps.js'
 export * from './elementFromString.js'