@tiptap/core 2.0.0-beta.137 → 2.0.0-beta.140

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/core",
   "description": "headless rich text editor",
-  "version": "2.0.0-beta.137",
+  "version": "2.0.0-beta.140",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -37,12 +37,12 @@
     "prosemirror-schema-list": "^1.1.6",
     "prosemirror-state": "^1.3.4",
     "prosemirror-transform": "^1.3.3",
-    "prosemirror-view": "^1.22.0"
+    "prosemirror-view": "^1.23.1"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/ueberdosis/tiptap",
     "directory": "packages/core"
   },
-  "gitHead": "2bbc594ac9369e4f65fe0b7308c8952f7dc0b5b0"
+  "gitHead": "5844a8893c1d0b888b3a338ce3fb3994383a9eef"
 }

package/src/Editor.ts

@@ -22,6 +22,7 @@ import {
   EditorOptions,
   CanCommands,
   ChainedCommands,
+  JSONContent,
   SingleCommands,
   TextSerializer,
   EditorEvents,
@@ -401,7 +402,7 @@ export class Editor extends EventEmitter<EditorEvents> {
   /**
    * Get the document as JSON.
    */
-  public getJSON(): Record<string, any> {
+  public getJSON(): JSONContent {
     return this.state.doc.toJSON()
   }
 

package/src/ExtensionManager.ts

@@ -13,6 +13,7 @@ import getNodeType from './helpers/getNodeType'
 import splitExtensions from './helpers/splitExtensions'
 import getAttributesFromExtensions from './helpers/getAttributesFromExtensions'
 import getRenderedAttributes from './helpers/getRenderedAttributes'
+import isExtensionRulesEnabled from './helpers/isExtensionRulesEnabled'
 import callOrReturn from './utilities/callOrReturn'
 import findDuplicates from './utilities/findDuplicates'
 import { NodeConfig } from '.'
@@ -270,7 +271,7 @@ export default class ExtensionManager {
           context,
         )
 
-        if (editor.options.enableInputRules && addInputRules) {
+        if (isExtensionRulesEnabled(extension, editor.options.enableInputRules) && addInputRules) {
           inputRules.push(...addInputRules())
         }
 
@@ -280,7 +281,7 @@ export default class ExtensionManager {
           context,
         )
 
-        if (editor.options.enablePasteRules && addPasteRules) {
+        if (isExtensionRulesEnabled(extension, editor.options.enablePasteRules) && addPasteRules) {
           pasteRules.push(...addPasteRules())
         }
 

package/src/NodeView.ts

@@ -202,7 +202,12 @@ export class NodeView<
     // this is because ProseMirror can’t preventDispatch on enter
     // this will lead to a re-render of the node view on enter
     // see: https://github.com/ueberdosis/tiptap/issues/1214
-    if (this.dom.contains(mutation.target) && mutation.type === 'childList' && isiOS()) {
+    if (
+      this.dom.contains(mutation.target)
+      && mutation.type === 'childList'
+      && isiOS()
+      && this.editor.isFocused
+    ) {
       const changedNodes = [
         ...Array.from(mutation.addedNodes),
         ...Array.from(mutation.removedNodes),

package/src/commands/insertContentAt.ts

@@ -1,4 +1,4 @@
-import { ParseOptions } from 'prosemirror-model'
+import { Fragment, Node as ProseMirrorNode, ParseOptions } from 'prosemirror-model'
 import createNodeFromContent from '../helpers/createNodeFromContent'
 import selectionToInsertionEnd from '../helpers/selectionToInsertionEnd'
 import {
@@ -25,6 +25,10 @@ declare module '@tiptap/core' {
   }
 }
 
+const isFragment = (nodeOrFragment: ProseMirrorNode | Fragment): nodeOrFragment is Fragment => {
+  return nodeOrFragment.toString().startsWith('<')
+}
+
 export const insertContentAt: RawCommands['insertContentAt'] = (position, value, options) => ({ tr, dispatch, editor }) => {
   if (dispatch) {
     options = {
@@ -50,8 +54,11 @@ export const insertContentAt: RawCommands['insertContentAt'] = (position, value,
       : position
 
     let isOnlyBlockContent = true
+    const nodes = isFragment(content)
+      ? content
+      : [content]
 
-    content.forEach(node => {
+    nodes.forEach(node => {
       isOnlyBlockContent = isOnlyBlockContent
         ? node.isBlock
         : false
@@ -63,10 +70,10 @@ export const insertContentAt: RawCommands['insertContentAt'] = (position, value,
     // replace an empty paragraph by an inserted image
     // instead of inserting the image below the paragraph
     if (from === to && isOnlyBlockContent) {
-      const $from = tr.doc.resolve(from)
-      const isEmptyTextBlock = $from.parent.isTextblock
-        && !$from.parent.type.spec.code
-        && !$from.parent.textContent
+      const { parent } = tr.doc.resolve(from)
+      const isEmptyTextBlock = parent.isTextblock
+        && !parent.type.spec.code
+        && !parent.childCount
 
       if (isEmptyTextBlock) {
         from -= 1

package/src/helpers/isExtensionRulesEnabled.ts

@@ -0,0 +1,15 @@
+import { AnyExtension, EnableRules } from '../types'
+
+export default function isExtensionRulesEnabled(extension: AnyExtension, enabled: EnableRules): boolean {
+  if (Array.isArray(enabled)) {
+    return enabled.some(enabledExtension => {
+      const name = typeof enabledExtension === 'string'
+        ? enabledExtension
+        : enabledExtension.name
+
+      return name === extension.name
+    })
+  }
+
+  return enabled
+}

package/src/types.ts

@@ -63,6 +63,8 @@ export interface EditorEvents {
   destroy: void,
 }
 
+export type EnableRules = (AnyExtension | string)[] | boolean
+
 export interface EditorOptions {
   element: Element,
   content: Content,
@@ -72,8 +74,8 @@ export interface EditorOptions {
   editable: boolean,
   editorProps: EditorProps,
   parseOptions: ParseOptions,
-  enableInputRules: boolean,
-  enablePasteRules: boolean,
+  enableInputRules: EnableRules,
+  enablePasteRules: EnableRules,
   enableCoreExtensions: boolean,
   onBeforeCreate: (props: EditorEvents['beforeCreate']) => void,
   onCreate: (props: EditorEvents['create']) => void,