Add AllowManualAssignment parameter to Autofill and AutofillOptional

Author: jonagill

Packages/com.jonagill.autofill/Editor/AutofillEditorUpdater.cs

@@ -220,7 +220,8 @@ public static AutofillUpdateResult UpdateProperty(
                 if (targetGameObject != null && autofillAttribute != null)
                 {
                     Component propertyComponent = property.objectReferenceValue as Component;
-                    if (!VerifyPropertyFilled(targetGameObject, autofillAttribute, propertyComponent) || force)
+
+                    if (ShouldRunUpdate(targetGameObject, propertyComponent, autofillAttribute, force))
                     {
                         // Collect all of the possible components that could fill this field
                         Component[] allPossibleComponents = null;
@@ -289,6 +290,56 @@ public static AutofillUpdateResult UpdateProperty(
             return result;
         }
 
+        internal static bool PropertyHasManualOverride(
+            SerializedProperty property,
+            AutofillAttribute autofillAttribute)
+        {
+            var targetObject = property.serializedObject.targetObject;
+            var targetComponent = targetObject as Component;
+            if (targetComponent != null)
+            {
+                var targetGameObject = targetComponent.gameObject;
+                if (targetGameObject != null && autofillAttribute != null)
+                {
+                    Component propertyComponent = property.objectReferenceValue as Component;
+                    
+                    // We have a value, but it doesn't match our expected location
+                    return propertyComponent != null &&
+                           !VerifyAutofillSatisfied(targetGameObject, autofillAttribute, propertyComponent);
+                }
+            }
+
+            return false;
+        }
+
+        private static bool ShouldRunUpdate(
+            GameObject targetGameObject, 
+            Component propertyComponent, 
+            AutofillAttribute autofillAttribute, 
+            bool force)
+        {
+            if (propertyComponent == null)
+            {
+                // We have no value -- try to find one
+                return true;
+            }
+
+            if (autofillAttribute.AllowManualAssignment)
+            {
+                // We have manually assigned a value
+                return false;
+            }
+
+            if (force)
+            {
+                // Update all fields that aren't manually assigned
+                return true;
+            }
+            
+            // Update only if we don't already have a valid target 
+            return !VerifyAutofillSatisfied(targetGameObject, autofillAttribute, propertyComponent);
+        }
+
         private static string GenerateErrorText(
             SerializedProperty property,
             FieldInfo fieldInfo,
@@ -326,15 +377,17 @@ void CollectHierarchyPathRecursive(Transform transform, bool first)
             return sb.ToString();
         }
 
-        private static bool VerifyPropertyFilled(GameObject targetGameObject, AutofillAttribute autofillAttribute,
-            Component propertyComponent)
+        private static bool VerifyAutofillSatisfied(
+            GameObject targetGameObject, 
+            AutofillAttribute autofillAttribute,
+            Component propertyValue)
         {
-            if (propertyComponent == null)
+            if (propertyValue == null)
             {
                 return false;
             }
 
-            if (autofillAttribute.IncludesSelf && propertyComponent.gameObject == targetGameObject)
+            if (autofillAttribute.IncludesSelf && propertyValue.gameObject == targetGameObject)
             {
                 return true;
             }
@@ -343,9 +396,9 @@ private static bool VerifyPropertyFilled(GameObject targetGameObject, AutofillAt
             {
                 case AutofillType.Parent:
                 case AutofillType.SelfAndParent:
-                    return targetGameObject.transform.IsChildOf(propertyComponent.transform);
+                    return targetGameObject.transform.IsChildOf(propertyValue.transform);
                 case AutofillType.SelfAndChildren:
-                    return propertyComponent.transform.IsChildOf(targetGameObject.transform);
+                    return propertyValue.transform.IsChildOf(targetGameObject.transform);
             }
 
             return false;

Packages/com.jonagill.autofill/Editor/AutofillPropertyDrawer.cs

@@ -66,11 +66,18 @@ void UpdateFields()
                 }
 
                 var showError = errorText != null;
-                var showField = showError || autofillAttribute.AlwaysShowInInspector;
+
+                var isNull = property.objectReferenceValue == null;
+                var isManualOverride = AutofillEditorUpdater.PropertyHasManualOverride(property, autofillAttribute);
+                
+                var showField = showError || 
+                                autofillAttribute.AlwaysShowInInspector ||
+                                (autofillAttribute.AllowManualAssignment && (isNull || isManualOverride));
 
                 helpBox.text = errorText;
                 helpBox.style.display = showError ? DisplayStyle.Flex : DisplayStyle.None;
                 propertyField.style.display = showField ? DisplayStyle.Flex : DisplayStyle.None;
+                propertyField.SetEnabled(autofillAttribute.AllowManualAssignment);
             }
 
             propertyField.TrackSerializedObjectValue(property.serializedObject, obj => UpdateFields());

Packages/com.jonagill.autofill/Runtime/AutofillAttribute.cs

@@ -21,15 +21,18 @@ public class AutofillAttribute : PropertyAttribute
 
 		public readonly bool AcceptFirstValidResult;
 		public readonly bool AlwaysShowInInspector;
+		public readonly bool AllowManualAssignment;
 
 		public AutofillAttribute(
 			AutofillType type = AutofillType.Self, 
 			bool acceptFirstValidResult = false,
-			bool alwaysShowInInspector = false)
+			bool alwaysShowInInspector = false,
+			bool allowManualAssignment = false)
 		{
 			Type = type;
 			AcceptFirstValidResult = acceptFirstValidResult;
 			AlwaysShowInInspector = alwaysShowInInspector;
+			AllowManualAssignment = allowManualAssignment;
 		}
 	}
 }

Packages/com.jonagill.autofill/Runtime/AutofillOptionalAttribute.cs

@@ -15,7 +15,8 @@ public class AutofillOptionalAttribute : AutofillAttribute
         public AutofillOptionalAttribute(
             AutofillType type = AutofillType.Self,
             bool acceptFirstValidResult = false,
-            bool alwaysShowInInspector = false) : base(type, acceptFirstValidResult, alwaysShowInInspector)
+            bool alwaysShowInInspector = false,
+            bool allowManualAssignment = false) : base(type, acceptFirstValidResult, alwaysShowInInspector, allowManualAssignment)
         {
         }
 

Packages/com.jonagill.autofill/package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.jonagill.autofill",
   "description": "A utility to automatically retrieve serializable component references on prefabs at edit time.",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "unity": "2019.2",
   "displayName": "Autofill"
 }