From 6ff500d6941ce10f1473c402f6f72c5b9cda06a2 Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Fri, 23 May 2025 05:51:26 -0700 Subject: [PATCH] Stop render callback on destruction to prevent crash (#51558) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/51558 changelog: [internal] we must call stopRenderCallbackIfNeeded to prevent UI tick from being called when `NativeAnimatedNodesManager` is deallocated. Reviewed By: mdvacca Differential Revision: D75140890 fbshipit-source-id: 9ad32956a877f9ee8256790ba32cb5982a5b0c2f --- .../react/renderer/animated/NativeAnimatedNodesManager.cpp | 6 +++++- .../react/renderer/animated/NativeAnimatedNodesManager.h | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.cpp b/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.cpp index 676eafa218c..1530892f8fd 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.cpp +++ b/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.cpp @@ -65,6 +65,10 @@ NativeAnimatedNodesManager::NativeAnimatedNodesManager( startOnRenderCallback_(std::move(startOnRenderCallback)), stopOnRenderCallback_(std::move(stopOnRenderCallback)) {} +NativeAnimatedNodesManager::~NativeAnimatedNodesManager() noexcept { + stopRenderCallbackIfNeeded(); +} + std::optional NativeAnimatedNodesManager::getValue(Tag tag) { auto node = getAnimatedNode(tag); if (node) { @@ -466,7 +470,7 @@ void NativeAnimatedNodesManager::startRenderCallbackIfNeeded() { } } -void NativeAnimatedNodesManager::stopRenderCallbackIfNeeded() { +void NativeAnimatedNodesManager::stopRenderCallbackIfNeeded() noexcept { if (stopOnRenderCallback_) { stopOnRenderCallback_(); } diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.h b/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.h index 588e24d8ab8..4d2f5a243c9 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.h +++ b/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.h @@ -57,7 +57,7 @@ class NativeAnimatedNodesManager StartOnRenderCallback&& startOnRenderCallback = nullptr, StopOnRenderCallback&& stopOnRenderCallback = nullptr) noexcept; - ~NativeAnimatedNodesManager() = default; + ~NativeAnimatedNodesManager() noexcept; template < typename T, @@ -173,7 +173,7 @@ class NativeAnimatedNodesManager bool isOnRenderThread() const; private: - void stopRenderCallbackIfNeeded(); + void stopRenderCallbackIfNeeded() noexcept; bool onAnimationFrame(uint64_t timestamp);