Merge pull request #56 from davepruitt/main

Fixing two issues with ToggleSwitch control
jsuarezruiz · Apr 29, 2023 · 56f942d · 56f942d
2 parents 08ca4b3 + b9ca4d3
commit 56f942d
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/AlohaKit/Controls/ToggleSwitch/ToggleSwitch.cs b/src/AlohaKit/Controls/ToggleSwitch/ToggleSwitch.cs
@@ -134,6 +134,8 @@ void UpdateIsOn()
             Toggled?.Invoke(this, new ToggledEventArgs(IsOn));
 
             Invalidate();
+
+            AnimateToggle();
         }
 
         void UpdateHasShadow()
@@ -148,9 +150,10 @@ void UpdateHasShadow()
 
         void OnToggleSwitchStartInteraction(object sender, TouchEventArgs e)
         {
-            IsOn = !IsOn;
-
-            AnimateToggle();
+            if (IsEnabled)
+            {
+                IsOn = !IsOn;
+            }
         }
 
         void AnimateToggle()