From 18bd907a9602b358f25284ff95749f8a3ed23ed4 Mon Sep 17 00:00:00 2001
From: Matthew Lipski <50169049+matthewlipski@users.noreply.github.com>
Date: Tue, 29 Jul 2025 17:29:02 +0200
Subject: [PATCH] fix: Editors in comments not inheriting theme (#1890)

---
 packages/ariakit/src/comments/Editor.tsx    | 4 ++++
 packages/mantine/src/comments/Editor.tsx    | 4 ++++
 packages/react/src/editor/BlockNoteView.tsx | 3 ++-
 packages/shadcn/src/comments/Editor.tsx     | 4 ++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/ariakit/src/comments/Editor.tsx b/packages/ariakit/src/comments/Editor.tsx
index b2f71e5c14..2f14144e5c 100644
--- a/packages/ariakit/src/comments/Editor.tsx
+++ b/packages/ariakit/src/comments/Editor.tsx
@@ -4,6 +4,7 @@ import {
   FormattingToolbar,
   FormattingToolbarController,
   getFormattingToolbarItems,
+  useBlockNoteContext,
 } from "@blocknote/react";
 import { forwardRef } from "react";
 import { BlockNoteView } from "../BlockNoteView.js";
@@ -17,6 +18,8 @@ export const Editor = forwardRef<
 
   assertEmpty(rest, false);
 
+  const blockNoteContext = useBlockNoteContext();
+
   return (
     <BlockNoteView
       autoFocus={autoFocus}
@@ -28,6 +31,7 @@ export const Editor = forwardRef<
       filePanel={false}
       formattingToolbar={false}
       editable={editable}
+      theme={blockNoteContext?.colorSchemePreference}
       ref={ref}
       onFocus={onFocus}
       onBlur={onBlur}
diff --git a/packages/mantine/src/comments/Editor.tsx b/packages/mantine/src/comments/Editor.tsx
index 14e79851e6..e65d46fd93 100644
--- a/packages/mantine/src/comments/Editor.tsx
+++ b/packages/mantine/src/comments/Editor.tsx
@@ -4,6 +4,7 @@ import {
   FormattingToolbar,
   FormattingToolbarController,
   getFormattingToolbarItems,
+  useBlockNoteContext,
 } from "@blocknote/react";
 import { forwardRef } from "react";
 import { BlockNoteView } from "../BlockNoteView.js";
@@ -17,6 +18,8 @@ export const Editor = forwardRef<
 
   assertEmpty(rest, false);
 
+  const blockNoteContext = useBlockNoteContext();
+
   return (
     <BlockNoteView
       autoFocus={autoFocus}
@@ -28,6 +31,7 @@ export const Editor = forwardRef<
       filePanel={false}
       formattingToolbar={false}
       editable={editable}
+      theme={blockNoteContext?.colorSchemePreference}
       ref={ref}
       onFocus={onFocus}
       onBlur={onBlur}
diff --git a/packages/react/src/editor/BlockNoteView.tsx b/packages/react/src/editor/BlockNoteView.tsx
index 2f27a40ead..102703c0d4 100644
--- a/packages/react/src/editor/BlockNoteView.tsx
+++ b/packages/react/src/editor/BlockNoteView.tsx
@@ -159,8 +159,9 @@ function BlockNoteViewComponent<
       ...existingContext,
       editor,
       setContentEditableProps,
+      colorSchemePreference: editorColorScheme,
     };
-  }, [existingContext, editor]);
+  }, [existingContext, editor, editorColorScheme]);
 
   // We set defaultUIProps and editorProps on a different context, the BlockNoteViewContext.
   // This BlockNoteViewContext is used to render the editor and the default UI.
diff --git a/packages/shadcn/src/comments/Editor.tsx b/packages/shadcn/src/comments/Editor.tsx
index 44c0fb5a93..d89c728a5c 100644
--- a/packages/shadcn/src/comments/Editor.tsx
+++ b/packages/shadcn/src/comments/Editor.tsx
@@ -4,6 +4,7 @@ import {
   FormattingToolbar,
   FormattingToolbarController,
   getFormattingToolbarItems,
+  useBlockNoteContext,
 } from "@blocknote/react";
 import { forwardRef } from "react";
 
@@ -19,10 +20,13 @@ export const Editor = forwardRef<
 
   assertEmpty(rest);
 
+  const blockNoteContext = useBlockNoteContext();
+
   return (
     <BlockNoteView
       autoFocus={autoFocus}
       className={cn(className, "")}
+      theme={blockNoteContext?.colorSchemePreference}
       editor={props.editor}
       sideMenu={false}
       slashMenu={false}