@tiptap/core 2.0.0-beta.179 → 2.0.0-beta.181

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/core",
   "description": "headless rich text editor",
-  "version": "2.0.0-beta.179",
+  "version": "2.0.0-beta.181",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -24,20 +24,13 @@
     "dist"
   ],
   "dependencies": {
-    "@types/prosemirror-commands": "^1.0.4",
-    "@types/prosemirror-keymap": "^1.0.4",
-    "@types/prosemirror-model": "^1.16.0",
-    "@types/prosemirror-schema-list": "^1.0.3",
-    "@types/prosemirror-state": "^1.2.8",
-    "@types/prosemirror-transform": "^1.1.5",
-    "@types/prosemirror-view": "^1.23.1",
-    "prosemirror-commands": "^1.2.1",
-    "prosemirror-keymap": "^1.1.5",
-    "prosemirror-model": "^1.16.1",
-    "prosemirror-schema-list": "^1.1.6",
-    "prosemirror-state": "^1.3.4",
-    "prosemirror-transform": "^1.3.3",
-    "prosemirror-view": "^1.23.6"
+    "prosemirror-commands": "1.3.0",
+    "prosemirror-keymap": "1.2.0",
+    "prosemirror-model": "1.18.1",
+    "prosemirror-schema-list": "1.2.0",
+    "prosemirror-state": "1.4.1",
+    "prosemirror-transform": "1.6.0",
+    "prosemirror-view": "1.26.2"
   },
   "repository": {
     "type": "git",
@@ -45,5 +38,5 @@
     "directory": "packages/core"
   },
   "sideEffects": false,
-  "gitHead": "591c0807a2ab5c34b4b7fe12c12511fe4f493ebd"
+  "gitHead": "090c5a44566bcd936096574fa62bf301ab4a1285"
 }

package/src/Editor.ts

@@ -198,7 +198,7 @@ export class Editor extends EventEmitter<EditorEvents> {
    */
   public registerPlugin(plugin: Plugin, handlePlugins?: (newPlugin: Plugin, plugins: Plugin[]) => Plugin[]): void {
     const plugins = isFunction(handlePlugins)
-      ? handlePlugins(plugin, this.state.plugins)
+      ? handlePlugins(plugin, [...this.state.plugins])
       : [...this.state.plugins, plugin]
 
     const state = this.state.reconfigure({ plugins })
@@ -271,7 +271,7 @@ export class Editor extends EventEmitter<EditorEvents> {
       dispatchTransaction: this.dispatchTransaction.bind(this),
       state: EditorState.create({
         doc,
-        selection,
+        selection: selection || undefined,
       }),
     })
 

package/src/InputRule.ts

@@ -188,7 +188,7 @@ export function inputRulesPlugin(props: { editor: Editor, rules: InputRule[] }):
         return null
       },
       apply(tr, prev) {
-        const stored = tr.getMeta(this)
+        const stored = tr.getMeta(plugin)
 
         if (stored) {
           return stored

package/src/NodeView.ts

@@ -49,11 +49,11 @@ export class NodeView<
     return
   }
 
-  get dom(): Element | null {
-    return null
+  get dom(): HTMLElement {
+    return this.editor.view.dom as HTMLElement
   }
 
-  get contentDOM(): Element | null {
+  get contentDOM(): HTMLElement | null {
     return null
   }
 

package/src/PasteRule.ts

@@ -190,8 +190,8 @@ export function pasteRulesPlugin(props: { editor: Editor, rules: PasteRule[] }):
             return false
           },
 
-          paste: (view, event) => {
-            const html = event.clipboardData?.getData('text/html')
+          paste: (view, event: Event) => {
+            const html = (event as ClipboardEvent).clipboardData?.getData('text/html')
 
             isPastedFromProseMirror = !!html?.includes('data-pm-slice')
 

package/src/commands/focus.ts

@@ -60,7 +60,9 @@ export const focus: RawCommands['focus'] = (position = null, options = {}) => ({
     return true
   }
 
-  const selection = resolveFocusPosition(editor.state.doc, position) || editor.state.selection
+  // pass through tr.doc instead of editor.state.doc
+  // since transactions could change the editors state before this command has been run
+  const selection = resolveFocusPosition(tr.doc, position) || editor.state.selection
   const isSameSelection = editor.state.selection.eq(selection)
 
   if (dispatch) {

package/src/extensions/focusEvents.ts

@@ -13,7 +13,7 @@ export const FocusEvents = Extension.create({
         key: new PluginKey('focusEvents'),
         props: {
           handleDOMEvents: {
-            focus: (view, event) => {
+            focus: (view, event: Event) => {
               editor.isFocused = true
 
               const transaction = editor.state.tr
@@ -24,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/tabindex.ts

@@ -10,13 +10,7 @@ export const Tabindex = Extension.create({
       new Plugin({
         key: new PluginKey('tabindex'),
         props: {
-          attributes: () => {
-            if (this.editor.isEditable) {
-              return {
-                tabindex: '0',
-              }
-            }
-          },
+          attributes: this.editor.isEditable ? { tabindex: '0' } : {},
         },
       }),
     ]

package/src/helpers/createChainableState.ts

@@ -11,10 +11,11 @@ export function createChainableState(config: {
 
   return {
     ...state,
-    schema: state.schema,
-    plugins: state.plugins,
     apply: state.apply.bind(state),
     applyTransaction: state.applyTransaction.bind(state),
+    filterTransaction: state.filterTransaction,
+    plugins: state.plugins,
+    schema: state.schema,
     reconfigure: state.reconfigure.bind(state),
     toJSON: state.toJSON.bind(state),
     get storedMarks() {

package/src/helpers/getMarkRange.ts

@@ -40,7 +40,7 @@ export function getMarkRange(
     return
   }
 
-  const mark = findMarkInSet(start.node.marks, type, attributes)
+  const mark = findMarkInSet([...start.node.marks], type, attributes)
 
   if (!mark) {
     return
@@ -51,7 +51,7 @@ export function getMarkRange(
   let endIndex = startIndex + 1
   let endPos = startPos + start.node.nodeSize
 
-  findMarkInSet(start.node.marks, type, attributes)
+  findMarkInSet([...start.node.marks], type, attributes)
 
   while (startIndex > 0 && mark.isInSet($pos.parent.child(startIndex - 1).marks)) {
     startIndex -= 1
@@ -60,7 +60,7 @@ export function getMarkRange(
 
   while (
     endIndex < $pos.parent.childCount
-    && isMarkInSet($pos.parent.child(endIndex).marks, type, attributes)
+    && isMarkInSet([...$pos.parent.child(endIndex).marks], type, attributes)
   ) {
     endPos += $pos.parent.child(endIndex).nodeSize
     endIndex += 1

package/src/helpers/getTextBetween.ts

@@ -27,13 +27,15 @@ export function getTextBetween(
         separated = true
       }
 
-      text += textSerializer({
-        node,
-        pos,
-        parent,
-        index,
-        range,
-      })
+      if (parent) {
+        text += textSerializer({
+          node,
+          pos,
+          parent,
+          index,
+          range,
+        })
+      }
     } else if (node.isText) {
       text += node?.text?.slice(Math.max(from, pos) - pos, to - pos) // eslint-disable-line
       separated = false

package/src/helpers/getTextContentFromNodes.ts

@@ -1,6 +1,6 @@
 import { ResolvedPos } from 'prosemirror-model'
 
-export const getTextContentFromNodes = ($from: ResolvedPos<any>, maxMatch = 500) => {
+export const getTextContentFromNodes = ($from: ResolvedPos, maxMatch = 500) => {
   let textBefore = ''
 
   $from.parent.nodesBetween(

package/src/pasteRules/index.ts

@@ -1,2 +1,3 @@
 export * from './markPasteRule'
+export * from './nodePasteRule'
 export * from './textPasteRule'

package/src/pasteRules/nodePasteRule.ts

@@ -0,0 +1,39 @@
+import { NodeType } from 'prosemirror-model'
+
+import { PasteRule } from '../PasteRule'
+import { ExtendedRegExpMatchArray } from '../types'
+import { callOrReturn } from '../utilities'
+
+/**
+ * Build an paste rule that adds a node when the
+ * matched text is pasted into it.
+ */
+export function nodePasteRule(config: {
+  find: RegExp,
+  type: NodeType,
+  getAttributes?:
+    | Record<string, any>
+    | ((match: ExtendedRegExpMatchArray) => Record<string, any>)
+    | false
+    | null,
+}) {
+  return new PasteRule({
+    find: config.find,
+    handler({ match, chain, range }) {
+      const attributes = callOrReturn(config.getAttributes, undefined, match)
+
+      if (attributes === false || attributes === null) {
+        return null
+      }
+
+      if (match.input) {
+        chain()
+          .deleteRange(range)
+          .insertContent({
+            type: config.type.name,
+            attrs: attributes,
+          })
+      }
+    },
+  })
+}