fix: Overlapping marks in comments (#1564)

matthewlipski · web-flow · commit c17b9cfd8656 · 2025-03-27T16:01:44.000+01:00
diff --git a/examples/07-collaboration/04-comments/style.css b/examples/07-collaboration/04-comments/style.css
@@ -11,7 +11,7 @@
 }
 
 .comments-main-container .bn-editor {
-  max-height: 100%;
+  height: 100%;
   max-width: 700px;
   overflow: auto;
   width: 100%;
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -106,7 +106,7 @@
     "remark-stringify": "^11.0.0",
     "unified": "^11.0.5",
     "uuid": "^8.3.2",
-    "y-prosemirror": "1.2.17",
+    "y-prosemirror": "1.3.0",
     "y-protocols": "^1.0.6",
     "yjs": "^13.6.15"
   },
diff --git a/packages/core/src/extensions/Comments/CommentsPlugin.ts b/packages/core/src/extensions/Comments/CommentsPlugin.ts
@@ -106,7 +106,7 @@ export class CommentsPlugin extends EventEmitter<any> {
               pos + node.nodeSize,
               ttEditor.state.doc.content.size - 1
             );
-            tr.removeMark(trimmedFrom, trimmedTo, markType);
+            tr.removeMark(trimmedFrom, trimmedTo, mark);
             tr.addMark(
               trimmedFrom,
               trimmedTo,
diff --git a/packages/server-util/package.json b/packages/server-util/package.json
@@ -55,7 +55,7 @@
     "@tiptap/core": "^2.7.1",
     "@tiptap/pm": "^2.7.1",
     "jsdom": "^25.0.1",
-    "y-prosemirror": "1.2.17",
+    "y-prosemirror": "1.3.0",
     "y-protocols": "^1.0.6",
     "yjs": "^13.6.15"
   },

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`.comments-main-container .bn-editor {`
`14`		`- max-height: 100%;`
	`14`	`+ height: 100%;`
`15`	`15`	`max-width: 700px;`
`16`	`16`	`overflow: auto;`
`17`	`17`	`width: 100%;`