From 8183fcbd4459c82a2e00a58217122a7daee6259a Mon Sep 17 00:00:00 2001
From: Prathamesh Chavan <prathamesh.chavan216@gmail.com>
Date: Sun, 27 Aug 2023 20:10:09 +0530
Subject: [PATCH 1/2] fix: BlockTypeDropdown can not select Heading

---
 .../components/DefaultDropdowns/BlockTypeDropdown.tsx       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx b/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx
index 13d80a6ede..de3bda6893 100644
--- a/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx
+++ b/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx
@@ -112,7 +112,11 @@ export const BlockTypeDropdown = <BSchema extends BlockSchema>(props: {
             props: {},
           });
         },
-        isSelected: block.type === item.type,
+        isSelected:
+          block.type === item.type &&
+          (block.type === "heading"
+            ? block.props.level === item.props?.level
+            : true),
       })),
     [block, filteredItems, props.editor]
   );

From c5bd557ccdb48935953ad073af95f627cd296663 Mon Sep 17 00:00:00 2001
From: Prathamesh Chavan <prathamesh.chavan216@gmail.com>
Date: Mon, 28 Aug 2023 10:45:18 +0530
Subject: [PATCH 2/2] fix: BlockTypeDropdown cannott update heading

---
 .../components/DefaultDropdowns/BlockTypeDropdown.tsx        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx b/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx
index de3bda6893..4b58ae2597 100644
--- a/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx
+++ b/packages/react/src/FormattingToolbar/components/DefaultDropdowns/BlockTypeDropdown.tsx
@@ -9,6 +9,7 @@ import {
   RiListUnordered,
   RiText,
 } from "react-icons/ri";
+import { PartialBlock } from "../../../../../core/src/extensions/Blocks/api/blockTypes";
 
 import { ToolbarDropdown } from "../../../SharedComponents/Toolbar/components/ToolbarDropdown";
 import { useEditorSelectionChange } from "../../../hooks/useEditorSelectionChange";
@@ -109,8 +110,8 @@ export const BlockTypeDropdown = <BSchema extends BlockSchema>(props: {
           props.editor.focus();
           props.editor.updateBlock(block, {
             type: item.type,
-            props: {},
-          });
+            props: item.type === "heading" ? { level: item.props?.level } : {},
+          } as PartialBlock<BSchema>);
         },
         isSelected:
           block.type === item.type &&