From a43d047f60aa34c9bf591e21fdb66b85f7ded597 Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <contact@baptiste-arnaud.fr>
Date: Tue, 5 Dec 2023 08:22:46 +0100
Subject: [PATCH] :bug: Fix multiple item dragged issue

---
 .../src/features/graph/components/nodes/item/ItemNode.tsx       | 2 +-
 .../src/features/graph/components/nodes/item/ItemNodesList.tsx  | 2 +-
 apps/builder/src/features/graph/providers/GraphDndProvider.tsx  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/builder/src/features/graph/components/nodes/item/ItemNode.tsx b/apps/builder/src/features/graph/components/nodes/item/ItemNode.tsx
index 15bef64f3..dfafa0888 100644
--- a/apps/builder/src/features/graph/components/nodes/item/ItemNode.tsx
+++ b/apps/builder/src/features/graph/components/nodes/item/ItemNode.tsx
@@ -59,7 +59,7 @@ export const ItemNode = ({
     )
   const onDrag = (position: NodePosition) => {
     if (!onMouseDown || block.type === LogicBlockType.AB_TEST) return
-    onMouseDown(position, { ...item, type: block.type })
+    onMouseDown(position, { ...item, type: block.type, blockId: block.id })
   }
   useDragDistance({
     ref: itemRef,
diff --git a/apps/builder/src/features/graph/components/nodes/item/ItemNodesList.tsx b/apps/builder/src/features/graph/components/nodes/item/ItemNodesList.tsx
index f3eee1d98..0c9fa4569 100644
--- a/apps/builder/src/features/graph/components/nodes/item/ItemNodesList.tsx
+++ b/apps/builder/src/features/graph/components/nodes/item/ItemNodesList.tsx
@@ -159,7 +159,7 @@ export const ItemNodesList = ({
         />
       )}
 
-      {draggedItem && (
+      {draggedItem && draggedItem.blockId === block.id && (
         <Portal>
           <Flex
             pointerEvents="none"
diff --git a/apps/builder/src/features/graph/providers/GraphDndProvider.tsx b/apps/builder/src/features/graph/providers/GraphDndProvider.tsx
index a28241749..63606f0c9 100644
--- a/apps/builder/src/features/graph/providers/GraphDndProvider.tsx
+++ b/apps/builder/src/features/graph/providers/GraphDndProvider.tsx
@@ -31,6 +31,7 @@ export type BlockWithCreatableItems = Exclude<
 
 export type DraggableItem = Exclude<ItemV6, AbTestBlock['items'][number]> & {
   type: BlockWithCreatableItems['type']
+  blockId: string
 }
 
 const graphDndContext = createContext<{