ueberdosis · Jul 24, 2024 · Jul 25, 2024 · Jul 26, 2024 · Jul 26, 2024 · Jul 26, 2024
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## 2.5.7
+
+### Patch Changes
+
+- b012471: This addresses an issue with `isNodeEmpty` function where it was also comparing node attributes and finding mismatches on actually empty nodes. This helps placeholders find empty content correctly
+- cc3497e: Fixes a bug where if `enableContentCheck` was true, inserting content as JSON nodes would fail. This was because the node that was being created technically had a different schema than the content being inserted, so it would fail to generate the correct content value
+  - @tiptap/pm@2.5.7
+
 ## 2.5.6
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/core",
   "description": "headless rich text editor",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -32,10 +32,10 @@
     "dist"
   ],
   "devDependencies": {
-    "@tiptap/pm": "^2.5.6"
+    "@tiptap/pm": "^2.5.7"
   },
   "peerDependencies": {
-    "@tiptap/pm": "^2.5.6"
+    "@tiptap/pm": "^2.5.7"
   },
   "repository": {
     "type": "git",

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
@@ -39,6 +39,7 @@ import { isFunction } from './utilities/isFunction.js'
 
 export * as extensions from './extensions/index.js'
 
+// @ts-ignore
 export interface TiptapEditorHTMLElement extends HTMLElement {
   editor?: Editor
 }
@@ -340,6 +341,7 @@ export class Editor extends EventEmitter<EditorEvents> {
 
     // Let’s store the editor instance in the DOM element.
     // So we’ll have access to it for tests.
+    // @ts-ignore
     const dom = this.view.dom as TiptapEditorHTMLElement
 
     dom.editor = this

diff --git a/packages/core/src/commands/insertContentAt.ts b/packages/core/src/commands/insertContentAt.ts
@@ -81,6 +81,13 @@ export const insertContentAt: RawCommands['insertContentAt'] = (position, value,
         errorOnInvalidContent: options.errorOnInvalidContent ?? editor.options.enableContentCheck,
       })
     } catch (e) {
+      editor.emit('contentError', {
+        editor,
+        error: e as Error,
+        disableCollaboration: () => {
+          console.error('[tiptap error]: Unable to disable collaboration at this point in time')
+        },
+      })
       return false
     }
 

diff --git a/packages/core/src/helpers/createNodeFromContent.ts b/packages/core/src/helpers/createNodeFromContent.ts
@@ -58,13 +58,14 @@ export function createNodeFromContent(
   }
 
   if (isTextContent) {
-    let schemaToUse = schema
-    let hasInvalidContent = false
-    let invalidContent = ''
 
-    // Only ever check for invalid content if we're supposed to throw an error
+    // Check for invalid content
     if (options.errorOnInvalidContent) {
-      schemaToUse = new Schema({
+      let hasInvalidContent = false
+      let invalidContent = ''
+
+      // A copy of the current schema with a catch-all node at the end
+      const contentCheckSchema = new Schema({
         topNode: schema.spec.topNode,
         marks: schema.spec.marks,
         // Prosemirror's schemas are executed such that: the last to execute, matches last
@@ -88,19 +89,26 @@ export function createNodeFromContent(
           },
         }),
       })
-    }
 
-    const parser = DOMParser.fromSchema(schemaToUse)
+      if (options.slice) {
+        DOMParser.fromSchema(contentCheckSchema).parseSlice(elementFromString(content), options.parseOptions)
+      } else {
+        DOMParser.fromSchema(contentCheckSchema).parse(elementFromString(content), options.parseOptions)
+      }
 
-    const response = options.slice
-      ? parser.parseSlice(elementFromString(content), options.parseOptions).content
-      : parser.parse(elementFromString(content), options.parseOptions)
+      if (options.errorOnInvalidContent && hasInvalidContent) {
+        throw new Error('[tiptap error]: Invalid HTML content', { cause: new Error(`Invalid element found: ${invalidContent}`) })
+      }
+    }
+
+    const parser = DOMParser.fromSchema(schema)
 
-    if (options.errorOnInvalidContent && hasInvalidContent) {
-      throw new Error('[tiptap error]: Invalid HTML content', { cause: new Error(`Invalid element found: ${invalidContent}`) })
+    if (options.slice) {
+      return parser.parseSlice(elementFromString(content), options.parseOptions).content
     }
 
-    return response
+    return parser.parse(elementFromString(content), options.parseOptions)
+
   }
 
   return createNodeFromContent('', schema, options)

diff --git a/packages/core/src/helpers/isNodeEmpty.ts b/packages/core/src/helpers/isNodeEmpty.ts
@@ -1,11 +1,41 @@
 import { Node as ProseMirrorNode } from '@tiptap/pm/model'
 
-export function isNodeEmpty(node: ProseMirrorNode): boolean {
-  const defaultContent = node.type.createAndFill(node.attrs)
+/**
+ * Returns true if the given node is empty.
+ * When `checkChildren` is true (default), it will also check if all children are empty.
+ */
+export function isNodeEmpty(
+  node: ProseMirrorNode,
+  { checkChildren }: { checkChildren: boolean } = { checkChildren: true },
+): boolean {
+  if (node.isText) {
+    return !node.text
+  }
+
+  if (node.content.childCount === 0) {
+    return true
+  }
 
-  if (!defaultContent) {
+  if (node.isLeaf) {
     return false
   }
 
-  return node.eq(defaultContent)
+  if (checkChildren) {
+    let hasSameContent = true
+
+    node.content.forEach(childNode => {
+      if (hasSameContent === false) {
+        // Exit early for perf
+        return
+      }
+
+      if (!isNodeEmpty(childNode)) {
+        hasSameContent = false
+      }
+    })
+
+    return hasSameContent
+  }
+
+  return false
 }
diff --git a/packages/extension-blockquote/CHANGELOG.md b/packages/extension-blockquote/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## 2.5.7
+
+### Patch Changes
+
+- Updated dependencies [b012471]
+- Updated dependencies [cc3497e]
+  - @tiptap/core@2.5.7
+
 ## 2.5.6
 
 ### Patch Changes

diff --git a/packages/extension-blockquote/package.json b/packages/extension-blockquote/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/extension-blockquote",
   "description": "blockquote extension for tiptap",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -29,10 +29,10 @@
     "dist"
   ],
   "devDependencies": {
-    "@tiptap/core": "^2.5.6"
+    "@tiptap/core": "^2.5.7"
   },
   "peerDependencies": {
-    "@tiptap/core": "^2.5.6"
+    "@tiptap/core": "^2.5.7"
   },
   "repository": {
     "type": "git",

diff --git a/packages/extension-bold/CHANGELOG.md b/packages/extension-bold/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## 2.5.7
+
+### Patch Changes
+
+- Updated dependencies [b012471]
+- Updated dependencies [cc3497e]
+  - @tiptap/core@2.5.7
+
 ## 2.5.6
 
 ### Patch Changes

diff --git a/packages/extension-bold/package.json b/packages/extension-bold/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/extension-bold",
   "description": "bold extension for tiptap",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -29,10 +29,10 @@
     "dist"
   ],
   "devDependencies": {
-    "@tiptap/core": "^2.5.6"
+    "@tiptap/core": "^2.5.7"
   },
   "peerDependencies": {
-    "@tiptap/core": "^2.5.6"
+    "@tiptap/core": "^2.5.7"
   },
   "repository": {
     "type": "git",

diff --git a/packages/extension-bubble-menu/CHANGELOG.md b/packages/extension-bubble-menu/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## 2.5.7
+
+### Patch Changes
+
+- Updated dependencies [b012471]
+- Updated dependencies [cc3497e]
+  - @tiptap/core@2.5.7
+  - @tiptap/pm@2.5.7
+
 ## 2.5.6
 
 ### Patch Changes

diff --git a/packages/extension-bubble-menu/package.json b/packages/extension-bubble-menu/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/extension-bubble-menu",
   "description": "bubble-menu extension for tiptap",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -38,12 +38,12 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@tiptap/core": "^2.5.6",
-    "@tiptap/pm": "^2.5.6"
+    "@tiptap/core": "^2.5.7",
+    "@tiptap/pm": "^2.5.7"
   },
   "peerDependencies": {
-    "@tiptap/core": "^2.5.6",
-    "@tiptap/pm": "^2.5.6"
+    "@tiptap/core": "^2.5.7",
+    "@tiptap/pm": "^2.5.7"
   },
   "scripts": {
     "clean": "rm -rf dist",

diff --git a/packages/extension-bullet-list/CHANGELOG.md b/packages/extension-bullet-list/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## 2.5.7
+
+### Patch Changes
+
+- Updated dependencies [b012471]
+- Updated dependencies [cc3497e]
+  - @tiptap/core@2.5.7
+
 ## 2.5.6
 
 ### Patch Changes

diff --git a/packages/extension-bullet-list/package.json b/packages/extension-bullet-list/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/extension-bullet-list",
   "description": "bullet list extension for tiptap",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -29,10 +29,10 @@
     "dist"
   ],
   "devDependencies": {
-    "@tiptap/core": "^2.5.6"
+    "@tiptap/core": "^2.5.7"
   },
   "peerDependencies": {
-    "@tiptap/core": "^2.5.6"
+    "@tiptap/core": "^2.5.7"
   },
   "repository": {
     "type": "git",

diff --git a/packages/extension-character-count/CHANGELOG.md b/packages/extension-character-count/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Change Log
 
+## 2.5.7
+
+### Patch Changes
+
+- Updated dependencies [b012471]
+- Updated dependencies [cc3497e]
+  - @tiptap/core@2.5.7
+  - @tiptap/pm@2.5.7
+
 ## 2.5.6
 
 ### Patch Changes

diff --git a/packages/extension-character-count/package.json b/packages/extension-character-count/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tiptap/extension-character-count",
   "description": "font family extension for tiptap",
-  "version": "2.5.6",
+  "version": "2.5.7",
   "homepage": "https://tiptap.dev",
   "keywords": [
     "tiptap",
@@ -29,12 +29,12 @@
     "dist"
   ],
   "devDependencies": {
-    "@tiptap/core": "^2.5.6",
-    "@tiptap/pm": "^2.5.6"
+    "@tiptap/core": "^2.5.7",
+    "@tiptap/pm": "^2.5.7"
   },
   "peerDependencies": {
-    "@tiptap/core": "^2.5.6",
-    "@tiptap/pm": "^2.5.6"
+    "@tiptap/core": "^2.5.7",
+    "@tiptap/pm": "^2.5.7"
   },
   "repository": {
     "type": "git",

diff --git a/packages/extension-code-block-lowlight/CHANGELOG.md b/packages/extension-code-block-lowlight/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Change Log
 
+## 2.5.7
+
+### Patch Changes
+
+- Updated dependencies [b012471]
+- Updated dependencies [cc3497e]
+  - @tiptap/core@2.5.7
+  - @tiptap/extension-code-block@2.5.7
+  - @tiptap/pm@2.5.7
+
 ## 2.5.6
 
 ### Patch Changes