Added support for OnValueChanged events.

Author: neogeek

Scripts/Form.cs

@@ -17,9 +17,13 @@ namespace CandyCoded.Forms
     public class Form : MonoBehaviour
     {
 
-        public SubmitEventObject FormSubmittedObject;
+        public FormEventObjectEvent FormChangedObject;
 
-        public SubmitEventJSON FormSubmittedJSON;
+        public FormEventJSONEvent FormChangedJSON;
+
+        public FormEventObjectEvent FormSubmittedObject;
+
+        public FormEventJSONEvent FormSubmittedJSON;
 
         public Button submitButton;
 
@@ -66,6 +70,44 @@ private void Update()
 
         }
 
+        private void OnEnable()
+        {
+
+            foreach (var formField in GetChildFormFields())
+            {
+
+                formField.OnValueChanged.AddListener(HandleValueChanged);
+
+            }
+
+            if (submitButton)
+            {
+
+                submitButton.onClick.AddListener(HandleReturnPress);
+
+            }
+
+        }
+
+        private void OnDisable()
+        {
+
+            foreach (var formField in GetChildFormFields())
+            {
+
+                formField.OnValueChanged.RemoveListener(HandleValueChanged);
+
+            }
+
+            if (submitButton)
+            {
+
+                submitButton.onClick.RemoveListener(HandleReturnPress);
+
+            }
+
+        }
+
         private void HandleTabPress(Selectable selectable, Selectable[] allSelectable)
         {
 
@@ -193,7 +235,9 @@ public void LoadFormValues<T>(T values)
                     if (fieldInfo.Name.Equals(formField.name))
                     {
 
+                        formField.RemoveOnValueChangedEvent();
                         formField.value = fieldInfo.GetValue(values);
+                        formField.AddOnValueChangedEvent();
 
                     }
 
@@ -220,38 +264,23 @@ public void LoadFormValues<T>(T values)
 
         }
 
-        private void OnEnable()
+        private void HandleValueChanged()
         {
 
-            if (submitButton)
-            {
-
-                submitButton.onClick.AddListener(HandleReturnPress);
+            FormChangedObject?.Invoke(GetFormRawValues());
 
-            }
-
-        }
-
-        private void OnDisable()
-        {
-
-            if (submitButton)
-            {
-
-                submitButton.onClick.RemoveListener(HandleReturnPress);
-
-            }
+            FormChangedJSON?.Invoke(ToJSON());
 
         }
 
         [Serializable]
-        public class SubmitEventObject : UnityEvent<Dictionary<string, object>>
+        public class FormEventObjectEvent : UnityEvent<Dictionary<string, object>>
         {
 
         }
 
         [Serializable]
-        public class SubmitEventJSON : UnityEvent<string>
+        public class FormEventJSONEvent : UnityEvent<string>
         {
 
         }

Scripts/FormField.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Scott Doxey. All Rights Reserved. Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEngine;
+using UnityEngine.Events;
 using UnityEngine.UI;
 
 namespace CandyCoded.Forms
@@ -19,9 +20,32 @@ public class FormField : MonoBehaviour
         private string _name;
 #pragma warning restore CS0649
 
+        public UnityEvent OnValueChanged;
+
+        private InputField _inputField;
+
+        private Toggle _toggleField;
+
+        private Dropdown _dropdownField;
+
+        private Slider _sliderField;
+
+        private Form _parentForm;
+
         private object _value;
 
-        public Form parentForm { get; private set; }
+        public Form parentForm
+        {
+            get
+            {
+                if (_parentForm == null)
+                {
+                    _parentForm = gameObject.GetComponentInParent<Form>();
+                }
+
+                return _parentForm;
+            }
+        }
 
         public new string name
         {
@@ -43,31 +67,31 @@ public object value
             get
             {
 
-                if (gameObject.TryGetComponent<InputField>(out var inputField))
+                if (_inputField)
                 {
 
-                    return inputField.text;
+                    return _inputField.text;
 
                 }
 
-                if (gameObject.TryGetComponent<Toggle>(out var toggle))
+                if (_toggleField)
                 {
 
-                    return toggle.isOn;
+                    return _toggleField.isOn;
 
                 }
 
-                if (gameObject.TryGetComponent<Dropdown>(out var dropdown))
+                if (_dropdownField)
                 {
 
-                    return dropdown.value;
+                    return _dropdownField.value;
 
                 }
 
-                if (gameObject.TryGetComponent<Slider>(out var slider))
+                if (_sliderField)
                 {
 
-                    return slider.value;
+                    return _sliderField.value;
 
                 }
 
@@ -76,57 +100,73 @@ public object value
             }
             set
             {
-                if (gameObject.TryGetComponent<InputField>(out var inputField))
+                if (_inputField)
                 {
 
-                    inputField.text = value.ToString();
+                    _inputField.text = value.ToString();
 
                 }
 
-                if (gameObject.TryGetComponent<Toggle>(out var toggle))
+                if (_toggleField)
                 {
 
                     if (bool.TryParse(value.ToString(), out var valueBool))
                     {
 
-                        toggle.isOn = valueBool;
+                        _toggleField.isOn = valueBool;
 
                     }
 
                 }
 
-                if (gameObject.TryGetComponent<Dropdown>(out var dropdown))
+                if (_dropdownField)
                 {
 
                     if (int.TryParse(value.ToString(), out var valueInt))
                     {
 
-                        dropdown.value = valueInt;
+                        _dropdownField.value = valueInt;
 
                     }
 
                 }
 
-                if (gameObject.TryGetComponent<Slider>(out var slider))
+                if (_sliderField)
                 {
 
                     if (float.TryParse(value.ToString(), out var valueFloat))
                     {
 
-                        slider.value = valueFloat;
+                        _sliderField.value = valueFloat;
 
                     }
 
                 }
 
                 _value = value;
+
             }
         }
 
-        private void Awake()
+        public void OnEnable()
+        {
+
+            gameObject.TryGetComponent(out _inputField);
+
+            gameObject.TryGetComponent(out _toggleField);
+
+            gameObject.TryGetComponent(out _dropdownField);
+
+            gameObject.TryGetComponent(out _sliderField);
+
+            AddOnValueChangedEvent();
+
+        }
+
+        public void OnDisable()
         {
 
-            parentForm = gameObject.GetComponentInParent<Form>();
+            RemoveOnValueChangedEvent();
 
         }
 
@@ -158,6 +198,100 @@ public void SetBoolValue(bool value)
 
         }
 
+        public void AddOnValueChangedEvent()
+        {
+
+            if (_inputField)
+            {
+
+                _inputField.onValueChanged.AddListener(OnValueChangedEvent);
+
+            }
+
+            if (_toggleField)
+            {
+
+                _toggleField.onValueChanged.AddListener(OnValueChangedEvent);
+
+            }
+
+            if (_dropdownField)
+            {
+
+                _dropdownField.onValueChanged.AddListener(OnValueChangedEvent);
+
+            }
+
+            if (_sliderField)
+            {
+
+                _sliderField.onValueChanged.AddListener(OnValueChangedEvent);
+
+            }
+
+        }
+
+        public void RemoveOnValueChangedEvent()
+        {
+
+            if (_inputField)
+            {
+
+                _inputField.onValueChanged.RemoveListener(OnValueChangedEvent);
+
+            }
+
+            if (_toggleField)
+            {
+
+                _toggleField.onValueChanged.RemoveListener(OnValueChangedEvent);
+
+            }
+
+            if (_dropdownField)
+            {
+
+                _dropdownField.onValueChanged.RemoveListener(OnValueChangedEvent);
+
+            }
+
+            if (_sliderField)
+            {
+
+                _sliderField.onValueChanged.RemoveListener(OnValueChangedEvent);
+
+            }
+
+        }
+
+        private void OnValueChangedEvent(string _)
+        {
+
+            OnValueChanged?.Invoke();
+
+        }
+
+        private void OnValueChangedEvent(bool _)
+        {
+
+            OnValueChanged?.Invoke();
+
+        }
+
+        private void OnValueChangedEvent(float _)
+        {
+
+            OnValueChanged?.Invoke();
+
+        }
+
+        private void OnValueChangedEvent(int _)
+        {
+
+            OnValueChanged?.Invoke();
+
+        }
+
     }
 
 }