Merge branch 'ueberdosis:develop' into develop

ueberdosis · Jul 26, 2024 · b862ecd · b862ecd
2 parents ad133fd + b012471
commit b862ecd
Show file tree

Hide file tree

Showing 130 changed files with 2,087 additions and 787 deletions.
diff --git a/.changeset/atom-text-content-in-full.md b/.changeset/atom-text-content-in-full.md
diff --git a/.changeset/rotten-geckos-notice.md b/.changeset/rotten-geckos-notice.md
diff --git a/.changeset/serious-foxes-decide.md b/.changeset/serious-foxes-decide.md
diff --git a/.changeset/smart-rockets-divide.md b/.changeset/smart-rockets-divide.md
@@ -0,0 +1,6 @@
+---
+"@tiptap/core": patch
+"@tiptap/extension-placeholder": patch
+---
+
+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
diff --git a/.changeset/tiny-walls-shave.md b/.changeset/tiny-walls-shave.md
@@ -0,0 +1,5 @@
+---
+"@tiptap/core": patch
+---
+
+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
diff --git a/demos/src/Marks/Link/React/index.jsx b/demos/src/Marks/Link/React/index.jsx
@@ -10,6 +10,7 @@ import React, { useCallback } from 'react'
 
 export default () => {
   const editor = useEditor({
+    editable: true,
     extensions: [
       Document,
       Paragraph,

diff --git a/demos/src/Nodes/Table/React/index.spec.js b/demos/src/Nodes/Table/React/index.spec.js
@@ -63,7 +63,7 @@ context('/src/Nodes/Table/React/', () => {
       const html = editor.getHTML()
 
       expect(html).to.equal(
-        '<table style="minWidth: 25px"><colgroup><col></colgroup><tbody><tr><td colspan="1" rowspan="1"><p></p></td></tr></tbody></table>',
+        '<table style="min-width: 25px"><colgroup><col></colgroup><tbody><tr><td colspan="1" rowspan="1"><p></p></td></tr></tbody></table>',
       )
     })
   })
@@ -75,7 +75,7 @@ context('/src/Nodes/Table/React/', () => {
       const html = editor.getHTML()
 
       expect(html).to.equal(
-        '<table style="minWidth: 25px"><colgroup><col></colgroup><tbody><tr><th colspan="1" rowspan="1"><p></p></th></tr></tbody></table>',
+        '<table style="min-width: 25px"><colgroup><col></colgroup><tbody><tr><th colspan="1" rowspan="1"><p></p></th></tr></tbody></table>',
       )
     })
   })

diff --git a/demos/src/Nodes/Table/Vue/index.spec.js b/demos/src/Nodes/Table/Vue/index.spec.js
@@ -62,7 +62,7 @@ context('/src/Nodes/Table/Vue/', () => {
 
       const html = editor.getHTML()
 
-      expect(html).to.equal('<table style="minWidth: 25px"><colgroup><col></colgroup><tbody><tr><td colspan="1" rowspan="1"><p></p></td></tr></tbody></table>')
+      expect(html).to.equal('<table style="min-width: 25px"><colgroup><col></colgroup><tbody><tr><td colspan="1" rowspan="1"><p></p></td></tr></tbody></table>')
     })
   })
 
@@ -72,7 +72,7 @@ context('/src/Nodes/Table/Vue/', () => {
 
       const html = editor.getHTML()
 
-      expect(html).to.equal('<table style="minWidth: 25px"><colgroup><col></colgroup><tbody><tr><th colspan="1" rowspan="1"><p></p></th></tr></tbody></table>')
+      expect(html).to.equal('<table style="min-width: 25px"><colgroup><col></colgroup><tbody><tr><th colspan="1" rowspan="1"><p></p></th></tr></tbody></table>')
     })
   })