Fixed Drag and Drop behaviour

Author: marc-antoine-girard

Editor/Drawers/RawReferenceDrawer.cs

@@ -59,6 +59,9 @@ public void OnGUI(Rect position)
                 : new GUIContent(rawReferenceValue.GetType().Name, IconUtility.ScriptIcon);
 
             CustomObjectDrawer.OnGUI(objectFieldRect, label, content);
+
+            HandleDragAndDrop(objectFieldRect);
+
             if (rawReferenceValue == null)
                 return;
 
@@ -69,8 +72,6 @@ public void OnGUI(Rect position)
                 RawReferenceProperty,
                 new GUIContent(rawReferenceValue.GetType().Name),
                 true);
-
-            HandleDragAndDrop(objectFieldRect);
         }
 
         /// <inheritdoc />

Editor/Drawers/ReferenceDrawer.cs

@@ -109,13 +109,17 @@ private void OnItemSelected(ReferenceMode mode, object reference)
 
         protected void HandleDragAndDrop(Rect position)
         {
+            if (!position.Contains(Event.current.mousePosition))
+                return;
+            
             if (Event.current.type == EventType.DragPerform)
             {
+                HandleDragUpdated();
                 HandleDragPerform();
             }
             else if (Event.current.type == EventType.DragUpdated)
             {
-                HandleDragUpdated(position);
+                HandleDragUpdated();
             }
         }
 
@@ -134,11 +138,8 @@ private void SetDragAndDropMode(bool success, DragAndDropMode? successMode = nul
             }
         }
 
-        private void HandleDragUpdated(Rect position)
+        private void HandleDragUpdated()
         {
-            if (!position.Contains(Event.current.mousePosition))
-                return;
-
             if (DragAndDrop.objectReferences.Length > 1)
             {
                 SetDragAndDropMode(false);