Revert "fix: OnValueChanged not being invoked when calling ResetValue"

This reverts commit 0835d1a.
Hertzole · Jan 16, 2024 · 9700a6a · 9700a6a
1 parent 5625fc4
commit 9700a6a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,6 @@
 
 - Fixed scriptable value editor breaking if the value is null
 - Fixed scriptable value editor having the wrong height in newer Unity versions
-- Fixed OnValueChanged not being invoked when resetting the value on a scriptable value
 - Fixed the package not having an author
 
 ## [1.2.0] - 2023-05-20

diff --git a/Packages/se.hertzole.scriptable-values/Runtime/Values/ScriptableValue.cs b/Packages/se.hertzole.scriptable-values/Runtime/Values/ScriptableValue.cs
@@ -197,25 +197,10 @@ protected override void OnStart()
 		/// </summary>
 		public void ResetValue()
 		{
-			T previousValue = value;
-			bool isSameValue = EqualityHelper.Equals(value, DefaultValue);
-
-			if (!isSameValue)
-			{
-				onValueChanging.Invoke(previousValue, DefaultValue);
-				OnValueChanging?.Invoke(previousValue, DefaultValue);
-			}
-
 			value = DefaultValue;
 			PreviousValue = DefaultValue;
 			temporaryValue = DefaultValue;
 			valueIsDefault = EqualityHelper.Equals(value, default);
-
-			if (!isSameValue)
-			{
-				onValueChanged.Invoke(previousValue, DefaultValue);
-				OnValueChanged?.Invoke(previousValue, DefaultValue);
-			}
 		}
 
 		/// <summary>

diff --git a/Packages/se.hertzole.scriptable-values/Tests/Editor/ResetValuesTests_Values.cs b/Packages/se.hertzole.scriptable-values/Tests/Editor/ResetValuesTests_Values.cs
@@ -85,9 +85,6 @@ public void ScriptableString_ResetValue()
 
 		private void ScriptableValueReset<TType, TValue>(TValue initialValue, TValue newValue) where TType : ScriptableValue<TValue>
 		{
-			bool changingInvoked = false;
-			bool changedInvoked = false;
-
 			TType instance = CreateInstance<TType>();
 
 			instance.Value = initialValue;
@@ -98,23 +95,8 @@ private void ScriptableValueReset<TType, TValue>(TValue initialValue, TValue new
 			instance.Value = newValue;
 
 			Assert.AreEqual(newValue, instance.Value);
-
-			instance.OnValueChanging += (_, newChangedValue) =>
-			{
-				changingInvoked = true;
-				Assert.AreEqual(initialValue, newChangedValue);
-			};
-
-			instance.OnValueChanged += (_, newChangedValue) =>
-			{
-				changedInvoked = true;
-				Assert.AreEqual(initialValue, newChangedValue);
-			};
 
 			instance.Test_OnStart();
-
-			Assert.IsTrue(changingInvoked);
-			Assert.IsTrue(changedInvoked);
 
 			Assert.AreEqual(initialValue, instance.Value);
 		}