feat: Update package.json to 1.4.0

SubclassSelector now support nested private type

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/ManagedReferenceContextualPropertyMenu.cs

@@ -1,17 +1,20 @@
 // NOTE: managedReferenceValue getter is available only in Unity 2021.3 or later.
 #if UNITY_2021_3_OR_NEWER
+using System;
 using UnityEditor;
 using UnityEngine;
 
 namespace MackySoft.SerializeReferenceExtensions.Editor
 {
-	public static class CopyAndPasteProperty
+	public static class ManagedReferenceContextualPropertyMenu
 	{
 
 		const string kCopiedPropertyPathKey = "SerializeReferenceExtensions.CopiedPropertyPath";
 		const string kClipboardKey = "SerializeReferenceExtensions.CopyAndPasteProperty";
 
 		static readonly GUIContent kPasteContent = new GUIContent("Paste Property");
+		static readonly GUIContent kNewInstanceContent = new GUIContent("New Instance");
+		static readonly GUIContent kResetAndNewInstanceContent = new GUIContent("Reset and New Instance");
 
 		[InitializeOnLoadMethod]
 		static void Initialize ()
@@ -38,6 +41,20 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
 				{
 					menu.AddDisabledItem(kPasteContent);
 				}
+
+				menu.AddSeparator("");
+
+				bool hasInstance = clonedProperty.managedReferenceValue != null;
+				if (hasInstance)
+				{
+					menu.AddItem(kNewInstanceContent, false, NewInstance, clonedProperty);
+					menu.AddItem(kResetAndNewInstanceContent, false, ResetAndNewInstance, clonedProperty);
+				}
+				else
+				{
+					menu.AddDisabledItem(kNewInstanceContent);
+					menu.AddDisabledItem(kResetAndNewInstanceContent);
+				}
 			}
 		}
 
@@ -62,6 +79,29 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
 			JsonUtility.FromJsonOverwrite(json, property.managedReferenceValue);
 			property.serializedObject.ApplyModifiedProperties();
 		}
+
+		static void NewInstance (object customData)
+		{
+			SerializedProperty property = (SerializedProperty)customData;
+			string json = JsonUtility.ToJson(property.managedReferenceValue);
+
+			Undo.RecordObject(property.serializedObject.targetObject, "New Instance");
+			property.managedReferenceValue = JsonUtility.FromJson(json, property.managedReferenceValue.GetType());
+			property.serializedObject.ApplyModifiedProperties();
+
+			Debug.Log($"Create new instance of \"{property.propertyPath}\".");
+		}
+
+		static void ResetAndNewInstance (object customData)
+		{
+			SerializedProperty property = (SerializedProperty)customData;
+
+			Undo.RecordObject(property.serializedObject.targetObject, "Reset and New Instance");
+			property.managedReferenceValue = Activator.CreateInstance(property.managedReferenceValue.GetType());
+			property.serializedObject.ApplyModifiedProperties();
+
+			Debug.Log($"Reset property and created new instance of \"{property.propertyPath}\".");
+		}
 	}
 }
 #endif

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/ManagedReferenceUtility.cs

@@ -4,7 +4,9 @@ using System.Reflection;
 using UnityEditor;
 using UnityEngine;
 
-namespace MackySoft.SerializeReferenceExtensions.Editor {
+namespace MackySoft.SerializeReferenceExtensions.Editor
+{
+
 	public static class ManagedReferenceUtility {
 
 		public static object SetManagedReference (this SerializedProperty property,Type type) {
@@ -12,7 +14,7 @@ namespace MackySoft.SerializeReferenceExtensions.Editor {
 
 #if UNITY_2021_3_OR_NEWER
 			// NOTE: managedReferenceValue getter is available only in Unity 2021.3 or later.
-			if (property.managedReferenceValue != null && type != null)
+			if ((type != null) && (property.managedReferenceValue != null))
 			{
 				// Restore an previous values from json.
 				string json = JsonUtility.ToJson(property.managedReferenceValue);

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/PropertyDrawerCache.cs

@@ -26,49 +26,47 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
 		static Type GetCustomPropertyDrawerType (Type type)
 		{
 			Type[] interfaceTypes = type.GetInterfaces();
-			
-			foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
+
+			var types = TypeCache.GetTypesWithAttribute<CustomPropertyDrawer>();
+			foreach (Type drawerType in types)
 			{
-				foreach (Type drawerType in assembly.GetTypes())
+				var customPropertyDrawerAttributes = drawerType.GetCustomAttributes(typeof(CustomPropertyDrawer), true);
+				foreach (CustomPropertyDrawer customPropertyDrawer in customPropertyDrawerAttributes)
 				{
-					var customPropertyDrawerAttributes = drawerType.GetCustomAttributes(typeof(CustomPropertyDrawer), true);
-					foreach (CustomPropertyDrawer customPropertyDrawer in customPropertyDrawerAttributes)
+					var field = customPropertyDrawer.GetType().GetField("m_Type", BindingFlags.NonPublic | BindingFlags.Instance);
+					if (field != null)
 					{
-						var field = customPropertyDrawer.GetType().GetField("m_Type", BindingFlags.NonPublic | BindingFlags.Instance);
-						if (field != null)
+						var fieldType = field.GetValue(customPropertyDrawer) as Type;
+						if (fieldType != null)
 						{
-							var fieldType = field.GetValue(customPropertyDrawer) as Type;
-							if (fieldType != null)
+							if (fieldType == type)
 							{
-								if (fieldType == type)
+								return drawerType;
+							}
+							
+							// If the property drawer also allows for being applied to child classes, check if they match
+							var useForChildrenField = customPropertyDrawer.GetType().GetField("m_UseForChildren", BindingFlags.NonPublic | BindingFlags.Instance);
+							if (useForChildrenField != null)
+							{
+								object useForChildrenValue = useForChildrenField.GetValue(customPropertyDrawer);
+								if (useForChildrenValue is bool && (bool)useForChildrenValue)
 								{
-									return drawerType;
-								}
-								
-								// If the property drawer also allows for being applied to child classes, check if they match
-								var useForChildrenField = customPropertyDrawer.GetType().GetField("m_UseForChildren", BindingFlags.NonPublic | BindingFlags.Instance);
-								if (useForChildrenField != null)
-								{
-									object useForChildrenValue = useForChildrenField.GetValue(customPropertyDrawer);
-									if (useForChildrenValue is bool && (bool)useForChildrenValue)
+									// Check interfaces
+									if (Array.Exists(interfaceTypes, interfaceType => interfaceType == fieldType))
 									{
-										// Check interfaces
-										if (Array.Exists(interfaceTypes, interfaceType => interfaceType == fieldType))
+										return drawerType;
+									}
+
+									// Check derived types
+									Type baseType = type.BaseType;
+									while (baseType != null)
+									{
+										if (baseType == fieldType)
 										{
 											return drawerType;
 										}
 
-										// Check derived types
-										Type baseType = type.BaseType;
-										while (baseType != null)
-										{
-											if (baseType == fieldType)
-											{
-												return drawerType;
-											}
-
-											baseType = baseType.BaseType;
-										}
+										baseType = baseType.BaseType;
 									}
 								}
 							}

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SerializedPropertyExtensions.cs

@@ -0,0 +1,31 @@
+#if UNITY_2019_3_OR_NEWER
+using System.Collections.Generic;
+using UnityEditor;
+
+namespace MackySoft.SerializeReferenceExtensions.Editor
+{
+	public static class SerializedPropertyExtensions
+	{
+		public static IEnumerable<SerializedProperty> GetChildProperties (this SerializedProperty parent, int depth = 1)
+		{
+			parent = parent.Copy();
+
+			int depthOfParent = parent.depth;
+			var enumerator = parent.GetEnumerator();
+
+			while (enumerator.MoveNext())
+			{
+				if (enumerator.Current is not SerializedProperty childProperty)
+				{
+					continue;
+				}
+				if (childProperty.depth > (depthOfParent + depth))
+				{
+					continue;
+				}
+				yield return childProperty.Copy();
+			}
+		}
+	}
+}
+#endif

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SerializedPropertyExtensions.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b934aeca38cb7a24cabd6047fe0e298a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/Editor/SubclassSelectorDrawer.cs

@@ -31,51 +31,80 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
 
 		SerializedProperty m_TargetProperty;
 
-		public override void OnGUI (Rect position,SerializedProperty property,GUIContent label) {
-			EditorGUI.BeginProperty(position,label,property);
+		public override void OnGUI (Rect position, SerializedProperty property, GUIContent label)
+		{
+			EditorGUI.BeginProperty(position, label, property);
 
-			if (property.propertyType == SerializedPropertyType.ManagedReference) {
-
-				// render label first to avoid label overlap for lists
+			if (property.propertyType == SerializedPropertyType.ManagedReference)
+			{
+				// Render label first to avoid label overlap for lists
 				Rect foldoutLabelRect = new Rect(position);
 				foldoutLabelRect.height = EditorGUIUtility.singleLineHeight;
-				foldoutLabelRect.x += EditorGUI.indentLevel * 12;
+				foldoutLabelRect = EditorGUI.IndentedRect(foldoutLabelRect);
 				Rect popupPosition = EditorGUI.PrefixLabel(foldoutLabelRect, label);
 
 				// Draw the subclass selector popup.
-				if (EditorGUI.DropdownButton(popupPosition,GetTypeName(property),FocusType.Keyboard)) {
+				if (EditorGUI.DropdownButton(popupPosition, GetTypeName(property), FocusType.Keyboard))
+				{
 					TypePopupCache popup = GetTypePopup(property);
 					m_TargetProperty = property;
 					popup.TypePopup.Show(popupPosition);
 				}
 
-				// Check if a custom property drawer exists for this type.
-				PropertyDrawer customDrawer = GetCustomPropertyDrawer(property);
-				if (customDrawer != null)
+				// Draw the foldout.
+				if (!string.IsNullOrEmpty(property.managedReferenceFullTypename))
 				{
-					// Draw the property with custom property drawer.
 					Rect foldoutRect = new Rect(position);
 					foldoutRect.height = EditorGUIUtility.singleLineHeight;
-					property.isExpanded = EditorGUI.Foldout(foldoutRect, property.isExpanded, GUIContent.none, true);
 
-					if (property.isExpanded)
+#if UNITY_2022_2_OR_NEWER
+					// NOTE: Position x must be adjusted.
+					// FIXME: Is there a more essential solution...?
+					foldoutRect.x -= 12;
+#endif
+
+					property.isExpanded = EditorGUI.Foldout(foldoutRect, property.isExpanded, GUIContent.none, true);
+				}
+
+				// Draw property if expanded.
+				if (property.isExpanded)
+				{
+					using (new EditorGUI.IndentLevelScope())
 					{
-						using (new EditorGUI.IndentLevelScope())
+						// Check if a custom property drawer exists for this type.
+						PropertyDrawer customDrawer = GetCustomPropertyDrawer(property);
+						if (customDrawer != null)
 						{
+							// Draw the property with custom property drawer.
 							Rect indentedRect = position;
 							float foldoutDifference = EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
 							indentedRect.height = customDrawer.GetPropertyHeight(property, label);
 							indentedRect.y += foldoutDifference;
 							customDrawer.OnGUI(indentedRect, property, label);
 						}
+						else
+						{
+							// Draw the properties of the child elements.
+							// NOTE: In the following code, since the foldout layout isn't working properly, I'll iterate through the properties of the child elements myself.
+							// EditorGUI.PropertyField(position, property, GUIContent.none, true);
+
+							Rect childPosition = position;
+							childPosition.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+							foreach (SerializedProperty childProperty in property.GetChildProperties())
+							{
+								float height = EditorGUI.GetPropertyHeight(childProperty, new GUIContent(childProperty.displayName, childProperty.tooltip), true);
+								childPosition.height = height;
+								EditorGUI.PropertyField(childPosition, childProperty, true);
+
+								childPosition.y += height + EditorGUIUtility.standardVerticalSpacing;
+							}
+						}
 					}
 				}
-				else
-				{
-					EditorGUI.PropertyField(position, property, GUIContent.none, true);
-				}
-			} else {
-				EditorGUI.LabelField(position,label,k_IsNotManagedReferenceLabel);
+			}
+			else
+			{
+				EditorGUI.LabelField(position, label, k_IsNotManagedReferenceLabel);
 			}
 
 			EditorGUI.EndProperty();
@@ -101,7 +130,7 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
 				Type baseType = ManagedReferenceUtility.GetType(managedReferenceFieldTypename);
 				var popup = new AdvancedTypePopup(
 					TypeCache.GetTypesDerivedFrom(baseType).Append(baseType).Where(p =>
-						(p.IsPublic || p.IsNestedPublic) &&
+						(p.IsPublic || p.IsNestedPublic || p.IsNestedPrivate) &&
 						!p.IsAbstract &&
 						!p.IsGenericType &&
 						!k_UnityObjectType.IsAssignableFrom(p) &&
@@ -117,7 +146,6 @@ namespace MackySoft.SerializeReferenceExtensions.Editor
 					foreach (var targetObject in m_TargetProperty.serializedObject.targetObjects) {
 						SerializedObject individualObject = new SerializedObject(targetObject);
 						SerializedProperty individualProperty = individualObject.FindProperty(m_TargetProperty.propertyPath);
-
 						object obj = individualProperty.SetManagedReference(type);
 						individualProperty.isExpanded = (obj != null);
 

Assets/MackySoft/MackySoft.SerializeReferenceExtensions/package.json

@@ -2,7 +2,7 @@
 	"name": "com.mackysoft.serializereference-extensions",
 	"displayName": "SerializeReference Extensions",
 	"author": { "name": "MackySoft", "url": "https://github.com/mackysoft" },
-	"version": "1.2.2",
+	"version": "1.4.0",
 	"unity": "2021.3",
 	"description": "Provide popup to specify the type of the field serialized by the [SerializeReference] attribute in the inspector.",
 	"keywords": [ "SerializeReference", "Editor" ],

Packages/manifest.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "com.unity.ide.rider": "3.0.24",
-    "com.unity.ide.visualstudio": "2.0.18",
+    "com.unity.ide.rider": "3.0.28",
+    "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.test-framework": "1.1.33",
     "com.unity.modules.ai": "1.0.0",

Packages/packages-lock.json

@@ -8,7 +8,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.24",
+      "version": "3.0.28",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -17,7 +17,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.18",
+      "version": "2.0.22",
       "depth": 0,
       "source": "registry",
       "dependencies": {

README.md

@@ -18,6 +18,7 @@ The `SubclassSelector` attribute allows you to easily set subclasses of those ab
 - **[New]** Available `CustomPropertyDrawer` for subclasses.
 - **[New]** Restore values of previous object from JSON when subclass is changed. (required Unity 2021.3 or later)
 - **[New]** Copy & Paste the subclass properties. (required Unity 2021.3 or later)
+- **[New]** Clear & reset the subclass properties. (required Unity 2021.3 or later)
 
 > See below for the reason for the limitation of versions less than Unity 2021.3.
 >