From 846cd72c384053e60895b207c5ff112534205ef8 Mon Sep 17 00:00:00 2001
From: Will Pfleger <wpfleger@block.xyz>
Date: Tue, 26 May 2026 19:22:32 -0400
Subject: [PATCH] fix: guard EditorContent against null editor in tiptap 3.23.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

tiptap v3.19+ throws when EditorContent receives a null editor
(ueberdosis/tiptap#7529). useEditor() returns null on the first render
cycle before the instance is constructed — this was tolerated in 3.22.5
but crashes silently in 3.23.6, killing the entire ChannelPane subtree.
---
 desktop/src/features/forum/ui/ForumComposer.tsx              | 2 +-
 desktop/src/features/forum/ui/ForumComposerCompactLayout.tsx | 2 +-
 desktop/src/features/messages/ui/MessageComposer.tsx         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/desktop/src/features/forum/ui/ForumComposer.tsx b/desktop/src/features/forum/ui/ForumComposer.tsx
index b88c1fe35c..81d0d174d0 100644
--- a/desktop/src/features/forum/ui/ForumComposer.tsx
+++ b/desktop/src/features/forum/ui/ForumComposer.tsx
@@ -451,7 +451,7 @@ export function ForumComposer({
             className="rich-text-composer max-h-32 overflow-y-auto"
             onKeyDown={handleEditorKeyDown}
           >
-            <EditorContent editor={richText.editor} />
+            {richText.editor && <EditorContent editor={richText.editor} />}
           </div>
 
           <MessageComposerToolbar
diff --git a/desktop/src/features/forum/ui/ForumComposerCompactLayout.tsx b/desktop/src/features/forum/ui/ForumComposerCompactLayout.tsx
index e482e01421..7a4db22040 100644
--- a/desktop/src/features/forum/ui/ForumComposerCompactLayout.tsx
+++ b/desktop/src/features/forum/ui/ForumComposerCompactLayout.tsx
@@ -31,7 +31,7 @@ export function ForumComposerCompactLayout({
         className="rich-text-composer max-h-10 min-w-0 flex-1 overflow-y-auto"
         onKeyDown={onEditorKeyDown}
       >
-        <EditorContent editor={editor} />
+        {editor && <EditorContent editor={editor} />}
       </div>
       <Button
         aria-label={isSending ? "Sending" : "Send message"}
diff --git a/desktop/src/features/messages/ui/MessageComposer.tsx b/desktop/src/features/messages/ui/MessageComposer.tsx
index f44e684be9..aa99b60fed 100644
--- a/desktop/src/features/messages/ui/MessageComposer.tsx
+++ b/desktop/src/features/messages/ui/MessageComposer.tsx
@@ -720,7 +720,7 @@ export function MessageComposer({
             ref={composerScrollRef}
             onKeyDown={handleEditorKeyDown}
           >
-            <EditorContent editor={richText.editor} />
+            {richText.editor && <EditorContent editor={richText.editor} />}
           </div>
 
           <MessageComposerToolbar