From 0f6d6ea8f2d14c86e68feb62aade085d59155894 Mon Sep 17 00:00:00 2001
From: VipinDevelops <vipinchaudhary1809@gmail.com>
Date: Mon, 6 Oct 2025 15:15:41 +0530
Subject: [PATCH 1/3] fix: block menu option behind issues over view

---
 packages/editor/src/core/components/menus/block-menu.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/editor/src/core/components/menus/block-menu.tsx b/packages/editor/src/core/components/menus/block-menu.tsx
index 63bf288ac60..09b60d45729 100644
--- a/packages/editor/src/core/components/menus/block-menu.tsx
+++ b/packages/editor/src/core/components/menus/block-menu.tsx
@@ -206,9 +206,10 @@ export const BlockMenu = (props: Props) => {
           ...floatingStyles,
           animationFillMode: "forwards",
           transitionTimingFunction: "cubic-bezier(0.16, 1, 0.3, 1)", // Expo ease out
+          zIndex: 100,
         }}
         className={cn(
-          "z-20 max-h-60 min-w-[7rem] overflow-y-scroll rounded-lg border border-custom-border-200 bg-custom-background-100 p-1.5 shadow-custom-shadow-rg",
+          "max-h-60 min-w-[7rem] overflow-y-scroll rounded-lg border border-custom-border-200 bg-custom-background-100 p-1.5 shadow-custom-shadow-rg",
           "transition-all duration-300 transform origin-top-right",
           isAnimatedIn ? "opacity-100 scale-100" : "opacity-0 scale-75"
         )}

From e09e1d3d25576d712f91ffaa9ee37236a15cc7fd Mon Sep 17 00:00:00 2001
From: VipinDevelops <vipinchaudhary1809@gmail.com>
Date: Mon, 6 Oct 2025 15:16:07 +0530
Subject: [PATCH 2/3] fix: clicking mention closing modal

---
 packages/editor/src/core/extensions/mentions/utils.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/editor/src/core/extensions/mentions/utils.ts b/packages/editor/src/core/extensions/mentions/utils.ts
index 91f713fd7ca..b257556c829 100644
--- a/packages/editor/src/core/extensions/mentions/utils.ts
+++ b/packages/editor/src/core/extensions/mentions/utils.ts
@@ -31,6 +31,12 @@ export const renderMentionsDropdown =
         const element = component.element as HTMLElement;
         element.style.position = "absolute";
         element.style.zIndex = "100";
+
+        // Add event handlers to prevent modal closing
+        element.addEventListener("click", (e) => {
+          e.stopPropagation();
+        });
+
         document.body.appendChild(element);
         updateFloatingUIFloaterPosition(props.editor, element);
       },

From 8b0b8f69f47fcb688a64d126c6df224a046407ae Mon Sep 17 00:00:00 2001
From: VipinDevelops <vipinchaudhary1809@gmail.com>
Date: Mon, 6 Oct 2025 16:17:11 +0530
Subject: [PATCH 3/3]  chore : move stop propagration to drop down modal

---
 .../core/extensions/mentions/mentions-list-dropdown.tsx    | 7 +++++++
 packages/editor/src/core/extensions/mentions/utils.ts      | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/editor/src/core/extensions/mentions/mentions-list-dropdown.tsx b/packages/editor/src/core/extensions/mentions/mentions-list-dropdown.tsx
index da11d0f9953..212d849f63a 100644
--- a/packages/editor/src/core/extensions/mentions/mentions-list-dropdown.tsx
+++ b/packages/editor/src/core/extensions/mentions/mentions-list-dropdown.tsx
@@ -115,6 +115,12 @@ export const MentionsListDropdown = forwardRef((props: MentionsListDropdownProps
     <div
       ref={commandListContainer}
       className="z-10 max-h-[90vh] w-[14rem] overflow-y-auto rounded-md border-[0.5px] border-custom-border-300 bg-custom-background-100 px-2 py-2.5 shadow-custom-shadow-rg space-y-2"
+      onClick={(e) => {
+        e.stopPropagation();
+      }}
+      onMouseDown={(e) => {
+        e.stopPropagation();
+      }}
     >
       {isLoading ? (
         <div className="text-center text-sm text-custom-text-400">Loading...</div>
@@ -138,6 +144,7 @@ export const MentionsListDropdown = forwardRef((props: MentionsListDropdownProps
                   )}
                   onClick={(e) => {
                     e.preventDefault();
+                    e.stopPropagation();
                     selectItem(sectionIndex, itemIndex);
                   }}
                   onMouseEnter={() =>
diff --git a/packages/editor/src/core/extensions/mentions/utils.ts b/packages/editor/src/core/extensions/mentions/utils.ts
index b257556c829..32e2e283a10 100644
--- a/packages/editor/src/core/extensions/mentions/utils.ts
+++ b/packages/editor/src/core/extensions/mentions/utils.ts
@@ -32,11 +32,6 @@ export const renderMentionsDropdown =
         element.style.position = "absolute";
         element.style.zIndex = "100";
 
-        // Add event handlers to prevent modal closing
-        element.addEventListener("click", (e) => {
-          e.stopPropagation();
-        });
-
         document.body.appendChild(element);
         updateFloatingUIFloaterPosition(props.editor, element);
       },