From abc1b8aa636c8d3e66e4dbe6e1c418ab59fef585 Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <baptiste@typebot.io>
Date: Tue, 9 Sep 2025 11:38:30 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20group=20context=20menu=20o?=
 =?UTF-8?q?pening=20in=20block=20settings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/nodes/block/BlockNode.tsx      | 51 ++++++++++---------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/apps/builder/src/features/graph/components/nodes/block/BlockNode.tsx b/apps/builder/src/features/graph/components/nodes/block/BlockNode.tsx
index 9b682dbe6..1c434f267 100644
--- a/apps/builder/src/features/graph/components/nodes/block/BlockNode.tsx
+++ b/apps/builder/src/features/graph/components/nodes/block/BlockNode.tsx
@@ -298,30 +298,33 @@ export const BlockNode = ({
           </ContextMenu.Root>
         )}
       />
-      {hasSettingsPopover(block) && (
-        <SettingsPopoverContent
-          node={block}
-          groupId={groupId}
-          onNodeChange={handleBlockUpdate}
-          side="left"
-          isExpanded={isSettingsPopoverExpanded}
-          onExpandClick={() =>
-            setIsSettingsPopoverExpanded(!isSettingsPopoverExpanded)
-          }
-        />
-      )}
-      {typebot && isMediaBubbleBlock(block) && (
-        <MediaBubblePopoverContent
-          uploadFileProps={{
-            workspaceId: typebot.workspaceId,
-            typebotId: typebot.id,
-            blockId: block.id,
-          }}
-          block={block}
-          side="left"
-          onContentChange={handleContentChange}
-        />
-      )}
+      {/* Prevent triggering parent group context menu */}
+      <div onContextMenu={(e) => e.stopPropagation()}>
+        {hasSettingsPopover(block) && (
+          <SettingsPopoverContent
+            node={block}
+            groupId={groupId}
+            onNodeChange={handleBlockUpdate}
+            side="left"
+            isExpanded={isSettingsPopoverExpanded}
+            onExpandClick={() =>
+              setIsSettingsPopoverExpanded(!isSettingsPopoverExpanded)
+            }
+          />
+        )}
+        {typebot && isMediaBubbleBlock(block) && (
+          <MediaBubblePopoverContent
+            uploadFileProps={{
+              workspaceId: typebot.workspaceId,
+              typebotId: typebot.id,
+              blockId: block.id,
+            }}
+            block={block}
+            side="left"
+            onContentChange={handleContentChange}
+          />
+        )}
+      </div>
     </Popover.Root>
   );
 };