Moved changes to RawReferenceDrawer

Since it only applies to SerializableInterfaces in Raw mode, it made more sense to only do it in RawReferenceDrawer instead of SerializableInterfacePropertyDrawer. Tested the same way, no apparent diff.

Author: marc-antoine-girard

Editor/Drawers/RawReferenceDrawer.cs

@@ -11,6 +11,9 @@ internal class RawReferenceDrawer : ReferenceDrawer, IReferenceDrawer
         private readonly GUIContent label;
         private readonly FieldInfo fieldInfo;
 
+        private static object previousReferenceValue;
+        private static string previousPropertyPath;
+
         private object RawReferenceValue
         {
             get
@@ -21,6 +24,15 @@ private object RawReferenceValue
                 ISerializableInterface instance =
                     (ISerializableInterface)fieldInfo.GetValue(Property.serializedObject.targetObject);
                 return instance.GetRawReference();
+#endif
+            }
+
+            set
+            {
+#if UNITY_2021_1_OR_NEWER
+                RawReferenceProperty.managedReferenceValue = value;
+#else
+                fieldInfo.SetValue(Property.serializedObject.targetObject, value);
 #endif
             }
         }
@@ -47,6 +59,8 @@ public float GetHeight()
         /// <inheritdoc />
         public void OnGUI(Rect position)
         {
+            AvoidDuplicateReferencesInArray();
+
             Rect objectFieldRect = new Rect(position)
             {
                 height = EditorGUIUtility.singleLineHeight
@@ -71,6 +85,8 @@ public void OnGUI(Rect position)
                 true);
 
             HandleDragAndDrop(objectFieldRect);
+
+            previousPropertyPath = Property.propertyPath;
         }
 
         /// <inheritdoc />
@@ -91,5 +107,37 @@ protected override void OnPropertiesClicked()
                 }
             }
         }
+
+        private void AvoidDuplicateReferencesInArray()
+        {
+            if (!IsPropertyInArray(Property)) return;
+            if (previousPropertyPath == null) return;
+            if (previousPropertyPath == Property.propertyPath) return;
+
+            var rawReferenceProperty = Property.FindPropertyRelative("rawReference");
+            var currentReferenceValue = RawReferenceValue;
+
+            if (currentReferenceValue == null) return;
+
+            if (previousReferenceValue == currentReferenceValue)
+            {
+                rawReferenceProperty.managedReferenceValue = CreateInstance(currentReferenceValue);
+                rawReferenceProperty.serializedObject.ApplyModifiedProperties();
+            }
+
+            previousReferenceValue = currentReferenceValue;
+        }
+
+        private static bool IsPropertyInArray(SerializedProperty prop)
+        {
+            return prop.propertyPath.Contains(".Array.data[");
+        }
+
+        private static object CreateInstance(object source)
+        {
+            var instance = Activator.CreateInstance(source.GetType());
+            EditorUtility.CopySerializedManagedFieldsOnly(source, instance);
+            return instance;
+        }
     }
-}
+}

Editor/SerializableInterfacePropertyDrawer.cs

@@ -10,17 +10,11 @@ namespace TNRD
     [CustomPropertyDrawer(typeof(SerializableInterface<>), true)]
     internal sealed class SerializableInterfacePropertyDrawer : PropertyDrawer
     {
-        private const string RAW_REFERENCE = "rawReference";
-        private const string MODE = "mode";
-
         private SerializedProperty serializedProperty;
         private Type genericType;
 
         private IReferenceDrawer activeDrawer;
 
-        private object previousReferenceValue;
-        private string previousPropertyPath;
-
         /// <inheritdoc />
         public override bool CanCacheInspectorGUI(SerializedProperty property) => false;
 
@@ -48,48 +42,8 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent
         public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
         {
             Initialize(property);
-            AvoidDuplicateReferencesInArray(property);
-
             activeDrawer = GetReferenceDrawer(activeDrawer, property, label);
             activeDrawer.OnGUI(position);
-            previousPropertyPath = property.propertyPath;
-        }
-
-        /// <summary>
-        /// When a new instance of <see cref="SerializableInterface{T}"/> is added in an array using the inspector's gizmo,
-        /// avoids having their <see cref="SerializableInterface{T}.rawReference"/> field reference the same instance.
-        /// </summary>
-        /// <param name="property">The SerializedProperty to make the custom GUI for.</param>
-        private void AvoidDuplicateReferencesInArray(SerializedProperty property)
-        {
-            if (!IsPropertyInArray(property)) return;
-            if (previousPropertyPath == null) return;
-            if (previousPropertyPath == property.propertyPath) return;
-
-            var rawReferenceProperty = property.FindPropertyRelative(RAW_REFERENCE);
-            var currentReferenceValue = rawReferenceProperty.managedReferenceValue;
-
-            if (currentReferenceValue == null) return;
-
-            if (previousReferenceValue == currentReferenceValue)
-            {
-                rawReferenceProperty.managedReferenceValue = CreateInstance(currentReferenceValue);
-                rawReferenceProperty.serializedObject.ApplyModifiedProperties();
-            }
-
-            previousReferenceValue = currentReferenceValue;
-        }
-        
-        private static bool IsPropertyInArray(SerializedProperty prop)
-        {
-            return prop.propertyPath.Contains(".Array.data[");
-        }
-
-        private static object CreateInstance(object source)
-        {
-            var instance = Activator.CreateInstance(source.GetType());
-            EditorUtility.CopySerializedManagedFieldsOnly(source, instance);
-            return instance;
         }
 
         private Type GetGenericArgument()
@@ -134,7 +88,7 @@ private IReferenceDrawer GetReferenceDrawer(
             GUIContent label
         )
         {
-            SerializedProperty modeProperty = serializedProperty.FindPropertyRelative(MODE);
+            SerializedProperty modeProperty = serializedProperty.FindPropertyRelative("mode");
             ReferenceMode referenceMode = (ReferenceMode)modeProperty.enumValueIndex;
 
             switch (referenceMode)