remove item display dependency on InventoryDisplayElement

stilnat · Dec 22, 2024 · fe6e755 · fe6e755
1 parent 61d832e
commit fe6e755
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/Assets/Scripts/SS3D/Systems/Inventory/UI/ItemDisplay.cs b/Assets/Scripts/SS3D/Systems/Inventory/UI/ItemDisplay.cs
@@ -14,6 +14,8 @@ namespace SS3D.Systems.Inventory.UI
     /// </summary>
     public class ItemDisplay : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler, IPointerDownHandler, IPointerClickHandler
     {
+        public event EventHandler OnDragOutOfUI;
+
         [SerializeField]
         private Image _itemImage;
 
@@ -99,7 +101,7 @@ public void OnEndDrag(PointerEventData eventData)
             GameObject o = eventData.pointerCurrentRaycast.gameObject;
             if (o == null)
             {
-                GetComponentInParent<InventoryDisplayElement>().DropItemOutside(Item);
+                OnDragOutOfUI?.Invoke(this, EventArgs.Empty);
             }
         }
 

diff --git a/Assets/Scripts/SS3D/Systems/Inventory/UI/ItemGrid.cs b/Assets/Scripts/SS3D/Systems/Inventory/UI/ItemGrid.cs
@@ -128,6 +128,7 @@ public void CreateItemDisplay(Item item, Vector2Int position, bool itemMovedInsi
 
             GameObject o = Instantiate(_itemDisplayPrefab, transform);
             ItemGridItem itemSpriteOnGrid = o.GetComponent<ItemGridItem>();
+            itemSpriteOnGrid.OnDragOutOfUI += HandleDragOutOfUI;
 
             Vector2 cellSize = _gridLayout.cellSize;
             o.GetComponent<RectTransform>().sizeDelta = new Vector2(cellSize.x, cellSize.y);
@@ -147,6 +148,7 @@ public void RemoveItemDisplay(Item item)
                     continue;
                 }
 
+                gridItem.OnDragOutOfUI -= HandleDragOutOfUI;
                 _gridItems.Remove(gridItem);
                 gridItem.gameObject.Dispose(true);
                 return;
@@ -197,6 +199,11 @@ protected override void OnItemDisplayDrop(ItemDisplay display)
             // display.ShouldDrop = true;
         }
 
+        private void HandleDragOutOfUI(object sender, EventArgs e)
+        {
+            DropItemOutside(((ItemDisplay)sender).Item);
+        }
+
         /// <summary>
         /// Finds an item at a position
         /// </summary>

diff --git a/Assets/Scripts/SS3D/Systems/Inventory/UI/SingleItemContainerSlot.cs b/Assets/Scripts/SS3D/Systems/Inventory/UI/SingleItemContainerSlot.cs
@@ -1,6 +1,7 @@
 using SS3D.Systems.Inventory.Containers;
 using SS3D.Systems.Inventory.Interfaces;
 using SS3D.Systems.Inventory.Items;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
@@ -72,6 +73,7 @@ protected override void OnItemDisplayDrop(ItemDisplay display)
         protected void Start()
         {
             Assert.IsNotNull(_itemDisplay);
+            _itemDisplay.OnDragOutOfUI += HandleDragOutOfUI;
             if (Container != null)
             {
                 UpdateContainer(Container);
@@ -88,6 +90,11 @@ protected void OnDestroy()
             Destroy(_itemDisplay);
         }
 
+        private void HandleDragOutOfUI(object sender, EventArgs e)
+        {
+            DropItemOutside(_itemDisplay.Item);
+        }
+
         /// <summary>
         /// Change the displayed sprite inside the slot.
         /// </summary>