From 746b15a13f9ce94ddd9a5a5c2f1459d7202fdb73 Mon Sep 17 00:00:00 2001
From: Nick the Sick <computers@nickthesick.com>
Date: Mon, 17 Nov 2025 14:41:21 +0100
Subject: [PATCH 1/2] fix: rm dependency array on comments

---
 .../react/src/components/Comments/Comment.tsx | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/packages/react/src/components/Comments/Comment.tsx b/packages/react/src/components/Comments/Comment.tsx
index 26f940892e..55c3e1af23 100644
--- a/packages/react/src/components/Comments/Comment.tsx
+++ b/packages/react/src/components/Comments/Comment.tsx
@@ -51,20 +51,17 @@ export const Comment = ({
 
   const dict = useDictionary();
 
-  const commentEditor = useCreateBlockNote(
-    {
-      initialContent: comment.body,
-      trailingBlock: false,
-      dictionary: {
-        ...dict,
-        placeholders: {
-          emptyDocument: dict.placeholders.edit_comment,
-        },
+  const commentEditor = useCreateBlockNote({
+    initialContent: comment.body,
+    trailingBlock: false,
+    dictionary: {
+      ...dict,
+      placeholders: {
+        emptyDocument: dict.placeholders.edit_comment,
       },
-      schema: editor.comments.commentEditorSchema || defaultCommentEditorSchema,
     },
-    [comment.body],
-  );
+    schema: editor.comments.commentEditorSchema || defaultCommentEditorSchema,
+  });
 
   const Components = useComponentsContext()!;
 

From 0e79d045914cc002ed6d38ba0b9841c1f6adcca3 Mon Sep 17 00:00:00 2001
From: Nick the Sick <computers@nickthesick.com>
Date: Tue, 18 Nov 2025 10:40:08 +0100
Subject: [PATCH 2/2] chore: use a key to unmount it

---
 packages/react/src/components/Comments/Comments.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/src/components/Comments/Comments.tsx b/packages/react/src/components/Comments/Comments.tsx
index b48796a205..ab6203a6f6 100644
--- a/packages/react/src/components/Comments/Comments.tsx
+++ b/packages/react/src/components/Comments/Comments.tsx
@@ -23,7 +23,7 @@ export const Comments = ({
   // Maps all comments to elements.
   const comments = thread.comments.map((comment, index) => (
     <Comment
-      key={comment.id}
+      key={comment.id + JSON.stringify(comment.body || "{}")}
       thread={thread}
       comment={comment}
       showResolveButton={index === 0}