diff --git a/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp b/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp index e9b3ffd7ba5..acf737d6ba9 100644 --- a/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp +++ b/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp @@ -552,9 +552,13 @@ void NativeAnimatedNodesManager::startRenderCallbackIfNeeded(bool isAsync) { if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) { if (auto animationBackend = animationBackend_.lock()) { - animationBackendCallbackId_ = - animationBackend->start([this](AnimationTimestamp timestamp) { - return pullAnimationMutations(timestamp); + auto weak = weak_from_this(); + animationBackendCallbackId_ = animationBackend->start( + [weak](AnimationTimestamp timestamp) -> AnimationMutations { + if (auto self = weak.lock()) { + return self->pullAnimationMutations(timestamp); + } + return {}; }); } diff --git a/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.h b/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.h index b5cc98af588..c969eea23b1 100644 --- a/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.h +++ b/packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.h @@ -51,7 +51,7 @@ using AnimationEndCallback = AsyncCallback; template <> struct Bridging : NativeAnimatedTurboModuleEndResultBridging {}; -class NativeAnimatedNodesManager { +class NativeAnimatedNodesManager : public std::enable_shared_from_this { public: using DirectManipulationCallback = std::function; using FabricCommitCallback = std::function &)>;