chore: Don't restart the animator loop if already running

unoplatform · Jan 15, 2025 · d44a1eb · d44a1eb
1 parent 246884e
commit d44a1eb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/Uno.UI/UI/Xaml/Media/Animation/Animators/RenderingLoopAnimator.Interop.wasm.cs b/src/Uno.UI/UI/Xaml/Media/Animation/Animators/RenderingLoopAnimator.Interop.wasm.cs
@@ -11,12 +11,17 @@ internal partial class RenderingLoopAnimator
 
 		internal static IDisposable RegisterFrameEvent(Action action)
 		{
+			var requiresEnable = _frameHandlers.IsEmpty;
+
 			var disposable = WeakEventHelper.RegisterEvent(
 				_frameHandlers,
 				action,
 				(h, s, a) => (h as Action)?.Invoke());
 
-			NativeMethods.SetEnabled(true);
+			if (requiresEnable)
+			{
+				NativeMethods.SetEnabled(true);
+			}
 
 			return Disposable.Create(() =>
 			{

diff --git a/src/Uno.UI/ts/Windows/UI/Xaml/Animation/RenderingLoopAnimator.ts b/src/Uno.UI/ts/Windows/UI/Xaml/Animation/RenderingLoopAnimator.ts
@@ -26,16 +26,18 @@
 		}
 
 		private static scheduleAnimationFrame() {
-			RenderingLoopAnimator._frameRequestId = window.requestAnimationFrame(RenderingLoopAnimator.onAnimationFrame);
+			if (RenderingLoopAnimator._frameRequestId == null) {
+				RenderingLoopAnimator._frameRequestId = window.requestAnimationFrame(RenderingLoopAnimator.onAnimationFrame);
+			}
 		}
 
 		private static onAnimationFrame() {
 			RenderingLoopAnimator.dispatchFrame();
 
+			RenderingLoopAnimator._frameRequestId = null;
+
 			if (RenderingLoopAnimator._isEnabled) {
 				RenderingLoopAnimator.scheduleAnimationFrame();
-			} else {
-				RenderingLoopAnimator._frameRequestId = null;
 			}
 		}