add "Drop Link" button

dmitry-ivashenko · Aug 15, 2024 · 8a87944 · 8a87944
1 parent 2f7c7b1
commit 8a87944
Show file tree

Hide file tree

Showing 17 changed files with 84 additions and 35 deletions.
diff --git a/Assets/Plugins/StatefulUI/Editor/ReferenceInspectors/ContainersInspector.cs b/Assets/Plugins/StatefulUI/Editor/ReferenceInspectors/ContainersInspector.cs
@@ -16,11 +16,13 @@ public class ContainersInspector : ItemsReferenceInspector
         protected override Type RoleType => typeof(ContainerRoleAttribute);
         protected override string TabName => ContainersTabName;
         protected override SerializedProperty Property { get; }
+        private readonly StatefulComponent _statefulComponent;
 
         public ContainersInspector(SerializedObject serializedObject)
         {
             Property = serializedObject.FindProperty(ContainersTabName);
             _serializedObject = serializedObject;
+            _statefulComponent = serializedObject.targetObject as StatefulComponent;
         }
 
         protected override void DrawTitle()
@@ -62,5 +64,13 @@ protected override string CreateItemAPI(string prefix, string name, SerializedPr
         {
             return $"{prefix}GetContainer(ContainerRole.{name});\n";
         }
+
+        protected override void DrawExtraButtons()
+        {
+            if (GUILayout.Button("Update"))
+            {
+                _statefulComponent.OnValidate();
+            }
+        }
     }
 }
diff --git a/Assets/Plugins/StatefulUI/Editor/Selector/ExtensionMethodWrapper.cs b/Assets/Plugins/StatefulUI/Editor/Selector/ExtensionMethodWrapper.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using StatefulUI.Runtime.Core;
 
 namespace StatefulUI.Editor.Selector
 {
@@ -9,9 +10,9 @@ public class ExtensionMethodWrapper
         private readonly object[] _parameters;
         private readonly MethodInfo _methodInfo;
 
-        public ExtensionMethodWrapper(object target, string name)
+        public ExtensionMethodWrapper(object target, StatefulComponent statefulComponent,  string name)
         {
-            _parameters = new []{target};
+            _parameters = new []{target, statefulComponent};
             _methodInfo = GetExtensionMethods(target.GetType(), name);
         }
 
@@ -47,4 +48,4 @@ private MethodInfo GetExtensionMethods(Type extendedType, string name)
             return null;
         }
     }
-}
+}
diff --git a/Assets/Plugins/StatefulUI/Editor/Selector/RoleDrawer.cs b/Assets/Plugins/StatefulUI/Editor/Selector/RoleDrawer.cs
@@ -26,13 +26,14 @@ public override void OnGUI(Rect position, SerializedProperty property, GUIConten
             {
                 if (_extensionMethodWrapper == null)
                 {
+                    var statefulComponent = property.serializedObject.targetObject as StatefulComponent;
                     var target = property.GetTargetObjectWithProperty();
-                    _extensionMethodWrapper = new ExtensionMethodWrapper(target, roleAttribute.Action);
+                    _extensionMethodWrapper = new ExtensionMethodWrapper(target, statefulComponent, roleAttribute.Action);
                 }
 
                 var context = new GenericMenu();
                 context.AddItem(new GUIContent(roleAttribute.Name), false, _extensionMethodWrapper.Invoke);
-                context.ShowAsContext ();
+                context.ShowAsContext();
             }
         }
 
@@ -71,4 +72,4 @@ protected static void SaveValue(SerializedProperty property, int value)
             }
         }
     }
-}
+}
diff --git a/Assets/Plugins/StatefulUI/Runtime/Core/StatefulComponent.cs b/Assets/Plugins/StatefulUI/Runtime/Core/StatefulComponent.cs
@@ -198,6 +198,7 @@ private ObjectReference GetObject(int role)
             return null;
         }
 
+        [UsedImplicitly]
         private Image GetImage(int role)
         {
             for (var i = 0; i < Images.Count; i++)
@@ -495,6 +496,38 @@ public bool HasItem<T>(int roleValue) where T : class
             throw new Exception($"Type {type} is not supported");
         }
 
+        public bool DropItem<T>(T reference) where T : class
+        {
+#if UNITY_EDITOR
+            UnityEditor.Undo.RecordObject(this, "Drop item");
+#endif
+
+            var type = typeof(T);
+            var manager = StatefulUiManager.Instance;
+            bool result;
+
+            if (type == manager.ButtonReferenceType) result = Buttons.Remove(reference as ButtonReference);
+            else if (type == manager.ImageReferenceType) result = Images.Remove(reference as ImageReference);
+            else if (type == manager.AnimatorReferenceType) result = Animators.Remove(reference as AnimatorReference);
+            else if (type == manager.ContainerReferenceType) result = Containers.Remove(reference as ContainerReference);
+            else if (type == manager.DropdownReferenceType) result = Dropdowns.Remove(reference as DropdownReference);
+            else if (type == manager.InnerComponentReferenceType) result = InnerComponents.Remove(reference as InnerComponentReference);
+            else if (type == manager.ObjectReferenceType) result = Objects.Remove(reference as ObjectReference);
+            else if (type == manager.SliderReferenceType) result = Sliders.Remove(reference as SliderReference);
+            else if (type == manager.TextInputReferenceType) result = TextsInputs.Remove(reference as TextInputReference);
+            else if (type == manager.TextReferenceType) result = Texts.Remove(reference as TextReference);
+            else if (type == manager.ToggleReferenceType) result = Toggles.Remove(reference as ToggleReference);
+            else if (type == manager.VideoPlayerReferenceType) result = VideoPlayers.Remove(reference as VideoPlayerReference);
+            else return false;
+
+#if UNITY_EDITOR
+            UnityEditor.EditorUtility.SetDirty(this);
+            OnValidate();
+#endif
+
+            return result;
+        }
+
         private bool HasVideoPlayer(int role)
         {
             foreach (var videoPlayerReference in VideoPlayers)

diff --git a/Assets/Plugins/StatefulUI/Runtime/Core/StatefulUiUtils.cs b/Assets/Plugins/StatefulUI/Runtime/Core/StatefulUiUtils.cs
@@ -3,13 +3,27 @@
 using System.Globalization;
 using System.Linq;
 using System.Text;
+using StatefulUI.Runtime.References;
 using UnityEngine;
 using UnityEngine.UI;
+// ReSharper disable UnusedMember.Local
 
 namespace StatefulUI.Runtime.Core
 {
     public static class StatefulUiUtils
     {
+        private static void RemoveReference(this TextReference @ref, StatefulComponent obj) => obj.DropItem(@ref);
+        private static void RemoveReference(this ToggleReference @ref, StatefulComponent obj) => obj.DropItem(@ref);
+        private static void RemoveReference(this SliderReference @ref, StatefulComponent obj) => obj.DropItem(@ref);
+        private static void RemoveReference(this ButtonReference @ref, StatefulComponent obj) => obj.DropItem(@ref);
+        private static void RemoveReference(this ImageReference @ref, StatefulComponent obj) => obj.DropItem(@ref);
+        private static void RemoveReference(this TextInputReference @ref, StatefulComponent obj) => obj.DropItem(@ref);
+        private static void RemoveReference(this DropdownReference @ref, StatefulComponent obj) => obj.DropItem(@ref);
+        private static void RemoveReference(this ContainerReference @ref, StatefulComponent obj) => obj.DropItem(@ref);
+        private static void RemoveReference(this InnerComponentReference @ref, StatefulComponent obj) => obj.DropItem(@ref);
+        private static void RemoveReference(this VideoPlayerReference @ref, StatefulComponent obj) => obj.DropItem(@ref);
+        private static void RemoveReference(this ObjectReference @ref, StatefulComponent obj) => obj.DropItem(@ref);
+
         public static int IndexOf<T>(this IList<T> list, T item)
         {
             for (var i = 0; i < list.Count; i++)

diff --git a/Assets/Plugins/StatefulUI/Runtime/References/ButtonReference.cs b/Assets/Plugins/StatefulUI/Runtime/References/ButtonReference.cs
@@ -8,7 +8,7 @@ namespace StatefulUI.Runtime.References
     [Serializable]
     public class ButtonReference : BaseReference
     {
-        [Role(typeof(ButtonRoleAttribute), "Copy Universal Link", "CopyUniversalLink")]
+        [Role(typeof(ButtonRoleAttribute), "Drop Link", "RemoveReference")]
         public int Role;
 
         [ChildOnly]

diff --git a/Assets/Plugins/StatefulUI/Runtime/References/ContainerReference.cs b/Assets/Plugins/StatefulUI/Runtime/References/ContainerReference.cs
@@ -8,7 +8,7 @@ namespace StatefulUI.Runtime.References
     [Serializable]
     public class ContainerReference : BaseReference
     {
-        [Role(typeof(ContainerRoleAttribute))]
+        [Role(typeof(ContainerRoleAttribute), "Drop Link", "RemoveReference")]
         public int Role;
 
         [ChildOnly]

diff --git a/Assets/Plugins/StatefulUI/Runtime/References/DropdownReference.cs b/Assets/Plugins/StatefulUI/Runtime/References/DropdownReference.cs
@@ -6,18 +6,18 @@
 
 namespace StatefulUI.Runtime.References
 {
-
-
-
 	[Serializable]
 	public class DropdownReference : BaseReference
 	{
-		[Role(typeof(DropdownRoleAttribute), "Copy Universal Link", "CopyUniversalLink")]
+		[Role(typeof(DropdownRoleAttribute), "Drop Link", "RemoveReference")]
 		public int Role;
+
+		public bool IsEmpty => DropdownFieldTMP == null && DropdownField == null;
 		public TMP_Dropdown DropdownFieldTMP;
 		public Dropdown DropdownField;
 		public bool IsTMP;
 
+
 		public int Value
 		{
 			get => IsTMP ? DropdownFieldTMP.value : DropdownField.value;
@@ -34,9 +34,6 @@ public int Value
 			}
 		}
 
-
-		public bool IsEmpty => DropdownFieldTMP == null && DropdownField == null;
-
 		public void SetValue(int value)
 		{
 			if (IsTMP) DropdownFieldTMP.value = value;

diff --git a/Assets/Plugins/StatefulUI/Runtime/References/ImageReference.cs b/Assets/Plugins/StatefulUI/Runtime/References/ImageReference.cs
@@ -8,10 +8,10 @@ namespace StatefulUI.Runtime.References
     [Serializable]
     public class ImageReference : BaseReference
     {
-        [Role(typeof(ImageRoleAttribute), "Copy Universal Link", "CopyUniversalLink")]
+        [Role(typeof(ImageRoleAttribute), "Drop Link", "RemoveReference")]
         public int Role;
 
         [ChildOnly]
         public Image Image;
     }
-}
+}
diff --git a/Assets/Plugins/StatefulUI/Runtime/References/InnerComponentReference.cs b/Assets/Plugins/StatefulUI/Runtime/References/InnerComponentReference.cs
@@ -7,10 +7,10 @@ namespace StatefulUI.Runtime.References
     [Serializable]
     public class InnerComponentReference : BaseReference
     {
-        [Role(typeof(InnerComponentRoleAttribute))]
+        [Role(typeof(InnerComponentRoleAttribute), "Drop Link", "RemoveReference")]
         public int Role;
 
         [ChildOnly]
         public StatefulComponent InnerComponent;
     }
-}
+}
diff --git a/Assets/Plugins/StatefulUI/Runtime/References/ObjectReference.cs b/Assets/Plugins/StatefulUI/Runtime/References/ObjectReference.cs
@@ -5,17 +5,14 @@
 
 namespace StatefulUI.Runtime.References
 {
-    // ReSharper disable CheckNamespace
-
-
     [Serializable]
     public class ObjectReference : BaseReference
     {
-        [Role(typeof(ObjectRoleAttribute), "Copy Universal Link", "CopyUniversalLink")]
+        [Role(typeof(ObjectRoleAttribute), "Drop Link", "RemoveReference")]
         public int Role;
 
 
         [ChildOnly]
         public GameObject Object;
     }
-}
+}
diff --git a/Assets/Plugins/StatefulUI/Runtime/References/SliderReference.cs b/Assets/Plugins/StatefulUI/Runtime/References/SliderReference.cs
@@ -8,7 +8,7 @@ namespace StatefulUI.Runtime.References
     [Serializable]
     public class SliderReference : BaseReference
     {
-        [Role(typeof(SliderRoleAttribute), "Copy Universal Link", "CopyUniversalLink")]
+        [Role(typeof(SliderRoleAttribute), "Drop Link", "RemoveReference")]
         public int Role;
 
         [ChildOnly]

diff --git a/Assets/Plugins/StatefulUI/Runtime/References/TextInputReference.cs b/Assets/Plugins/StatefulUI/Runtime/References/TextInputReference.cs
@@ -6,13 +6,10 @@
 
 namespace StatefulUI.Runtime.References
 {
-
-
-
 	[Serializable]
 	public class TextInputReference : BaseReference
 	{
-		[Role(typeof(TextInputRoleAttribute), "Copy Universal Link", "CopyUniversalLink")]
+		[Role(typeof(TextInputRoleAttribute), "Drop Link", "RemoveReference")]
 		public int Role;
 
 		public TMP_InputField InputFieldTMP;

diff --git a/Assets/Plugins/StatefulUI/Runtime/References/TextReference.cs b/Assets/Plugins/StatefulUI/Runtime/References/TextReference.cs
@@ -10,7 +10,7 @@ namespace StatefulUI.Runtime.References
     [Serializable]
     public class TextReference : BaseReference
     {
-        [Role(typeof(TextRoleAttribute), "Copy Universal Link", "CopyUniversalLink")]
+        [Role(typeof(TextRoleAttribute), "Drop Link", "RemoveReference")]
         public int Role;
 
         public string Identificator;

diff --git a/Assets/Plugins/StatefulUI/Runtime/References/ToggleReference.cs b/Assets/Plugins/StatefulUI/Runtime/References/ToggleReference.cs
@@ -8,10 +8,10 @@ namespace StatefulUI.Runtime.References
     [Serializable]
     public class ToggleReference : BaseReference
     {
-        [Role(typeof(ToggleRoleAttribute), "Copy Universal Link", "CopyUniversalLink")]
+        [Role(typeof(ToggleRoleAttribute), "Drop Link", "RemoveReference")]
         public int Role;
 
         [ChildOnly]
         public Toggle Toggle;
     }
-}
+}
diff --git a/Assets/Plugins/StatefulUI/Runtime/References/VideoPlayerReference.cs b/Assets/Plugins/StatefulUI/Runtime/References/VideoPlayerReference.cs
@@ -8,11 +8,10 @@ namespace StatefulUI.Runtime.References
 	[Serializable]
 	public class VideoPlayerReference : BaseReference
 	{
-		[Role(typeof(VideoPlayerRoleAttribute))]
+		[Role(typeof(VideoPlayerRoleAttribute), "Drop Link", "RemoveReference")]
 		public int Role;
 
 		[ChildOnly]
 		public VideoPlayer VideoPlayer;
 	}	
 }
-
diff --git a/Assets/Plugins/StatefulUI/package.json b/Assets/Plugins/StatefulUI/package.json
@@ -1,7 +1,7 @@
 {
     "name": "dmitry-ivashenko.statefului",
     "displayName": "StatefulUI",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "unity": "2021.3",
     "description": "Stateful UI - A library for structured state-based UI development in Unity",
     "keywords": ["UI"],