diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.cpp b/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.cpp index ea00876744c..7c5022a467b 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.cpp +++ b/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.cpp @@ -427,13 +427,11 @@ std::shared_ptr NativeAnimatedNodesManager::ensureEventEmitterListener() noexcept { if (!eventEmitterListener_) { eventEmitterListener_ = std::make_shared( - [weakSelf = weak_from_this()]( + [this]( Tag tag, const std::string& eventName, const EventPayload& payload) -> bool { - if (auto self = weakSelf.lock()) { - self->handleAnimatedEvent(tag, eventName, payload); - } + handleAnimatedEvent(tag, eventName, payload); return false; }); } @@ -442,11 +440,7 @@ NativeAnimatedNodesManager::ensureEventEmitterListener() noexcept { void NativeAnimatedNodesManager::startRenderCallbackIfNeeded() { if (startOnRenderCallback_) { - startOnRenderCallback_([weakSelf = weak_from_this()]() { - if (auto self = weakSelf.lock()) { - self->onRender(); - } - }); + startOnRenderCallback_([this]() { onRender(); }); if (isOnRenderThread_) { // Calling startOnRenderCallback_ will register a UI tick listener. diff --git a/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.h b/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.h index 7365990b738..8c851eedbff 100644 --- a/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.h +++ b/packages/react-native/ReactCxxPlatform/react/renderer/animated/NativeAnimatedNodesManager.h @@ -41,8 +41,7 @@ template <> struct Bridging : NativeAnimatedTurboModuleEndResultBridging {}; -class NativeAnimatedNodesManager - : public std::enable_shared_from_this { +class NativeAnimatedNodesManager { public: using DirectManipulationCallback = std::function;