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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/core",
   "description": "headless rich text editor",
-  "version": "2.0.0-beta.209",
+  "version": "2.0.0-beta.210",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -18,41 +18,42 @@
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/packages/core/src/index.d.ts",
-      "import": "./dist/tiptap-core.esm.js",
-      "require": "./dist/tiptap-core.cjs"
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
     }
   },
-  "main": "dist/tiptap-core.cjs",
-  "umd": "dist/tiptap-core.umd.js",
-  "module": "dist/tiptap-core.esm.js",
-  "types": "dist/packages/core/src/index.d.ts",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
   "files": [
     "src",
     "dist"
   ],
   "peerDependencies": {
-    "prosemirror-commands": "^1.3.1",
-    "prosemirror-keymap": "^1.2.0",
-    "prosemirror-model": "^1.18.1",
-    "prosemirror-schema-list": "^1.2.2",
-    "prosemirror-state": "^1.4.1",
-    "prosemirror-transform": "^1.7.0",
-    "prosemirror-view": "^1.28.2"
+    "@tiptap/pm": "^2.0.0-beta.209"
   },
   "devDependencies": {
-    "prosemirror-commands": "^1.3.1",
-    "prosemirror-keymap": "^1.2.0",
-    "prosemirror-model": "^1.18.1",
-    "prosemirror-schema-list": "^1.2.2",
-    "prosemirror-state": "^1.4.1",
-    "prosemirror-transform": "^1.7.0",
-    "prosemirror-view": "^1.28.2"
+    "@tiptap/pm": "^2.0.0-beta.210"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/ueberdosis/tiptap",
     "directory": "packages/core"
   },
-  "sideEffects": false
+  "sideEffects": false,
+  "scripts": {
+    "build": "tsup"
+  },
+  "tsup": {
+    "entry": [
+      "src/index.ts"
+    ],
+    "dts": true,
+    "splitting": true,
+    "format": [
+      "esm",
+      "cjs"
+    ]
+  }
 }

package/src/CommandManager.ts

@@ -1,27 +1,19 @@
-import { EditorState, Transaction } from 'prosemirror-state'
+import { EditorState, Transaction } from '@tiptap/pm/state'
 
 import { Editor } from './Editor'
 import { createChainableState } from './helpers/createChainableState'
 import {
-  AnyCommands,
-  CanCommands,
-  ChainedCommands,
-  CommandProps,
-  SingleCommands,
+  AnyCommands, CanCommands, ChainedCommands, CommandProps, SingleCommands,
 } from './types'
 
 export class CommandManager {
-
   editor: Editor
 
   rawCommands: AnyCommands
 
   customState?: EditorState
 
-  constructor(props: {
-    editor: Editor,
-    state?: EditorState,
-  }) {
+  constructor(props: { editor: Editor; state?: EditorState }) {
     this.editor = props.editor
     this.rawCommands = this.editor.extensionManager.commands
     this.customState = props.state
@@ -41,9 +33,8 @@ export class CommandManager {
     const { tr } = state
     const props = this.buildProps(tr)
 
-    return Object.fromEntries(Object
-      .entries(rawCommands)
-      .map(([name, command]) => {
+    return Object.fromEntries(
+      Object.entries(rawCommands).map(([name, command]) => {
         const method = (...args: any[]) => {
           const callback = command(...args)(props)
 
@@ -55,7 +46,8 @@ export class CommandManager {
         }
 
         return [name, method]
-      })) as unknown as SingleCommands
+      }),
+    ) as unknown as SingleCommands
   }
 
   get chain(): () => ChainedCommands {
@@ -87,18 +79,20 @@ export class CommandManager {
     }
 
     const chain = {
-      ...Object.fromEntries(Object.entries(rawCommands).map(([name, command]) => {
-        const chainedCommand = (...args: never[]) => {
-          const props = this.buildProps(tr, shouldDispatch)
-          const callback = command(...args)(props)
+      ...Object.fromEntries(
+        Object.entries(rawCommands).map(([name, command]) => {
+          const chainedCommand = (...args: never[]) => {
+            const props = this.buildProps(tr, shouldDispatch)
+            const callback = command(...args)(props)
 
-          callbacks.push(callback)
+            callbacks.push(callback)
 
-          return chain
-        }
+            return chain
+          }
 
-        return [name, chainedCommand]
-      })),
+          return [name, chainedCommand]
+        }),
+      ),
       run,
     } as unknown as ChainedCommands
 
@@ -110,11 +104,11 @@ export class CommandManager {
     const dispatch = false
     const tr = startTr || state.tr
     const props = this.buildProps(tr, dispatch)
-    const formattedCommands = Object.fromEntries(Object
-      .entries(rawCommands)
-      .map(([name, command]) => {
+    const formattedCommands = Object.fromEntries(
+      Object.entries(rawCommands).map(([name, command]) => {
         return [name, (...args: never[]) => command(...args)({ ...props, dispatch: undefined })]
-      })) as unknown as SingleCommands
+      }),
+    ) as unknown as SingleCommands
 
     return {
       ...formattedCommands,
@@ -138,21 +132,18 @@ export class CommandManager {
         state,
         transaction: tr,
       }),
-      dispatch: shouldDispatch
-        ? () => undefined
-        : undefined,
+      dispatch: shouldDispatch ? () => undefined : undefined,
       chain: () => this.createChain(tr),
       can: () => this.createCan(tr),
       get commands() {
-        return Object.fromEntries(Object
-          .entries(rawCommands)
-          .map(([name, command]) => {
+        return Object.fromEntries(
+          Object.entries(rawCommands).map(([name, command]) => {
             return [name, (...args: never[]) => command(...args)(props)]
-          })) as unknown as SingleCommands
+          }),
+        ) as unknown as SingleCommands
       },
     }
 
     return props
   }
-
 }

package/src/Editor.ts

@@ -1,11 +1,8 @@
-import { MarkType, NodeType, Schema } from 'prosemirror-model'
+import { MarkType, NodeType, Schema } from '@tiptap/pm/model'
 import {
-  EditorState,
-  Plugin,
-  PluginKey,
-  Transaction,
-} from 'prosemirror-state'
-import { EditorView } from 'prosemirror-view'
+  EditorState, Plugin, PluginKey, Transaction,
+} from '@tiptap/pm/state'
+import { EditorView } from '@tiptap/pm/view'
 
 import { CommandManager } from './CommandManager'
 import { EventEmitter } from './EventEmitter'
@@ -39,7 +36,6 @@ export interface HTMLElement {
 }
 
 export class Editor extends EventEmitter<EditorEvents> {
-
   private commandManager!: CommandManager
 
   public extensionManager!: ExtensionManager
@@ -167,9 +163,12 @@ export class Editor extends EventEmitter<EditorEvents> {
   /**
    * Update editable state of the editor.
    */
-  public setEditable(editable: boolean): void {
+  public setEditable(editable: boolean, emitUpdate = true): void {
     this.setOptions({ editable })
-    this.emit('update', { editor: this, transaction: this.state.tr })
+
+    if (emitUpdate) {
+      this.emit('update', { editor: this, transaction: this.state.tr })
+    }
   }
 
   /**
@@ -179,9 +178,7 @@ export class Editor extends EventEmitter<EditorEvents> {
     // since plugins are applied after creating the view
     // `editable` is always `true` for one tick.
     // that’s why we also have to check for `options.editable`
-    return this.options.editable
-      && this.view
-      && this.view.editable
+    return this.options.editable && this.view && this.view.editable
   }
 
   /**
@@ -197,7 +194,10 @@ export class Editor extends EventEmitter<EditorEvents> {
    * @param plugin A ProseMirror plugin
    * @param handlePlugins Control how to merge the plugin into the existing plugins.
    */
-  public registerPlugin(plugin: Plugin, handlePlugins?: (newPlugin: Plugin, plugins: Plugin[]) => Plugin[]): void {
+  public registerPlugin(
+    plugin: Plugin,
+    handlePlugins?: (newPlugin: Plugin, plugins: Plugin[]) => Plugin[],
+  ): void {
     const plugins = isFunction(handlePlugins)
       ? handlePlugins(plugin, [...this.state.plugins])
       : [...this.state.plugins, plugin]
@@ -217,10 +217,8 @@ export class Editor extends EventEmitter<EditorEvents> {
       return
     }
 
-    const name = typeof nameOrPluginKey === 'string'
-      ? `${nameOrPluginKey}$`
-      // @ts-ignore
-      : nameOrPluginKey.key
+    // @ts-ignore
+    const name = typeof nameOrPluginKey === 'string' ? `${nameOrPluginKey}$` : nameOrPluginKey.key
 
     const state = this.state.reconfigure({
       // @ts-ignore
@@ -234,9 +232,7 @@ export class Editor extends EventEmitter<EditorEvents> {
    * Creates an extension manager.
    */
   private createExtensionManager(): void {
-    const coreExtensions = this.options.enableCoreExtensions
-      ? Object.values(extensions)
-      : []
+    const coreExtensions = this.options.enableCoreExtensions ? Object.values(extensions) : []
     const allExtensions = [...coreExtensions, ...this.options.extensions].filter(extension => {
       return ['extension', 'node', 'mark'].includes(extension?.type)
     })
@@ -394,16 +390,12 @@ export class Editor extends EventEmitter<EditorEvents> {
    * @param name Name of the node or mark
    * @param attributes Attributes of the node or mark
    */
-  public isActive(name: string, attributes?: {}): boolean;
-  public isActive(attributes: {}): boolean;
+  public isActive(name: string, attributes?: {}): boolean
+  public isActive(attributes: {}): boolean
   public isActive(nameOrAttributes: string, attributesOrUndefined?: {}): boolean {
-    const name = typeof nameOrAttributes === 'string'
-      ? nameOrAttributes
-      : null
+    const name = typeof nameOrAttributes === 'string' ? nameOrAttributes : null
 
-    const attributes = typeof nameOrAttributes === 'string'
-      ? attributesOrUndefined
-      : nameOrAttributes
+    const attributes = typeof nameOrAttributes === 'string' ? attributesOrUndefined : nameOrAttributes
 
     return isActive(this.state, name, attributes)
   }
@@ -426,13 +418,10 @@ export class Editor extends EventEmitter<EditorEvents> {
    * Get the document as text.
    */
   public getText(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 || {}
 
     return getText(this.state.doc, {
       blockSeparator,
@@ -456,7 +445,9 @@ export class Editor extends EventEmitter<EditorEvents> {
    * @deprecated
    */
   public getCharacterCount(): number {
-    console.warn('[tiptap warn]: "editor.getCharacterCount()" is deprecated. Please use "editor.storage.characterCount.characters()" instead.')
+    console.warn(
+      '[tiptap warn]: "editor.getCharacterCount()" is deprecated. Please use "editor.storage.characterCount.characters()" instead.',
+    )
 
     return this.state.doc.content.size - 2
   }
@@ -481,5 +472,4 @@ export class Editor extends EventEmitter<EditorEvents> {
     // @ts-ignore
     return !this.view?.docView
   }
-
 }