From 2479d9362d0543fefca7f6b1c93795e543652f7f Mon Sep 17 00:00:00 2001
From: Matthew Lipski <matthewlipski@gmail.com>
Date: Mon, 22 Sep 2025 22:04:34 +0200
Subject: [PATCH] Fixed issue with block colors

---
 .../FormattingToolbar/DefaultButtons/ColorStyleButton.tsx       | 2 +-
 .../SideMenu/DragHandleMenu/DefaultItems/BlockColorsItem.tsx    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react/src/components/FormattingToolbar/DefaultButtons/ColorStyleButton.tsx b/packages/react/src/components/FormattingToolbar/DefaultButtons/ColorStyleButton.tsx
index 2633dfe924..1a9ed2da07 100644
--- a/packages/react/src/components/FormattingToolbar/DefaultButtons/ColorStyleButton.tsx
+++ b/packages/react/src/components/FormattingToolbar/DefaultButtons/ColorStyleButton.tsx
@@ -16,7 +16,7 @@ import { ColorPicker } from "../../ColorPicker/ColorPicker.js";
 
 function checkColorInSchema<Color extends "text" | "background">(
   color: Color,
-  editor: BlockNoteEditor<BlockSchema, InlineContentSchema, StyleSchema>,
+  editor: BlockNoteEditor<any, any, any>,
 ): editor is BlockNoteEditor<
   BlockSchema,
   InlineContentSchema,
diff --git a/packages/react/src/components/SideMenu/DragHandleMenu/DefaultItems/BlockColorsItem.tsx b/packages/react/src/components/SideMenu/DragHandleMenu/DefaultItems/BlockColorsItem.tsx
index c8733458d6..24a738960e 100644
--- a/packages/react/src/components/SideMenu/DragHandleMenu/DefaultItems/BlockColorsItem.tsx
+++ b/packages/react/src/components/SideMenu/DragHandleMenu/DefaultItems/BlockColorsItem.tsx
@@ -37,7 +37,7 @@ export const BlockColorsItem = <
   if (
     !blockHasType(block, editor, block.type, {
       textColor: "string",
-    }) ||
+    }) &&
     !blockHasType(block, editor, block.type, {
       backgroundColor: "string",
     })