From 60b8ee8b5036623fd57ecc95d7b312a50bc371d8 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 22 Jul 2025 09:37:31 +0300
Subject: [PATCH] Enhance DragTarget logic in CommunityStructureCanvas by
 refining conditions for rendering and improving readability. Ensure proper
 handling of dragged data and its parent/community relationships.

---
 .../widgets/community_structure_canvas.dart   | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/lib/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart b/lib/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart
index a4d941bc..37fa027b 100644
--- a/lib/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart
+++ b/lib/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart
@@ -425,17 +425,29 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
       height: _cardHeight,
       child: DragTarget<SpaceReorderDataModel>(
         builder: (context, candidateData, rejectedData) {
-          if (_draggedData == null) return const SizedBox.shrink();
+          if (_draggedData == null) {
+            return const SizedBox.shrink();
+          }
 
-          final isTargetForDragged = (_draggedData?.parent?.uuid == parent?.uuid &&
-                  _draggedData?.community == null) ||
-              (_draggedData?.community?.uuid == community?.uuid &&
-                  _draggedData?.parent == null);
+          final children = parent?.children ?? community?.spaces ?? [];
+          final isSameParent = (_draggedData!.parent?.uuid == parent?.uuid &&
+                  _draggedData!.community == null) ||
+              (_draggedData!.community?.uuid == community?.uuid &&
+                  _draggedData!.parent == null);
 
-          if (!isTargetForDragged) return const SizedBox.shrink();
+          if (!isSameParent) {
+            return const SizedBox.shrink();
+          }
+
+          final oldIndex =
+              children.indexWhere((s) => s.uuid == _draggedData!.space.uuid);
+          if (oldIndex != -1 && (oldIndex == index || oldIndex == index - 1)) {
+            return const SizedBox.shrink();
+          }
 
           return Container(
             width: 40,
+            alignment: Alignment.center,
             height: _cardHeight,
             decoration: BoxDecoration(
               color: context.theme.colorScheme.primary.withValues(
@@ -462,6 +474,9 @@ class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
 
           final oldIndex =
               children.indexWhere((s) => s.uuid == data.data.space.uuid);
+          if (oldIndex == -1) {
+            return true;
+          }
           if (oldIndex == index || oldIndex == index - 1) {
             return false;
           }