always invoke onRender via UIManagerNativeAnimatedDelegate (facebook#54211)

Summary:

## Changelog:

[Internal] [Added] - always invoke onRender via UIManagerNativeAnimatedDelegate

Previously only android invokes `onRender` via UIManagerNativeAnimatedDelegate::runAnimationFrame()
consolidating so it's easier for debugging, also in cases where we want to add extra work per frame (e.g. add performance logging) in AnimatedNodesManagerProvider

Reviewed By: sammy-SC

Differential Revision: D85071075

Author: zeyap

packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.cpp

@@ -539,7 +539,7 @@ void NativeAnimatedNodesManager::startRenderCallbackIfNeeded() {
   }
 
   if (startOnRenderCallback_) {
-    startOnRenderCallback_([this]() { onRender(); });
+    startOnRenderCallback_();
   }
 }
 

packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManager.h

@@ -61,7 +61,7 @@ class NativeAnimatedNodesManager {
       std::function<void(Tag, const folly::dynamic&)>;
   using FabricCommitCallback =
       std::function<void(std::unordered_map<Tag, folly::dynamic>&)>;
-  using StartOnRenderCallback = std::function<void(std::function<void()>&&)>;
+  using StartOnRenderCallback = std::function<void()>;
   using StopOnRenderCallback = std::function<void()>;
 
   explicit NativeAnimatedNodesManager(

packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManagerProvider.cpp

@@ -18,9 +18,7 @@
 
 namespace facebook::react {
 
-UIManagerNativeAnimatedDelegateImpl::UIManagerNativeAnimatedDelegateImpl(
-    std::weak_ptr<NativeAnimatedNodesManager> nativeAnimatedNodesManager)
-    : nativeAnimatedNodesManager_(std::move(nativeAnimatedNodesManager)) {}
+UIManagerNativeAnimatedDelegateImpl::UIManagerNativeAnimatedDelegateImpl() {}
 
 void UIManagerNativeAnimatedDelegateImpl::runAnimationFrame() {
   if (auto nativeAnimatedNodesManagerStrong =
@@ -30,8 +28,8 @@ void UIManagerNativeAnimatedDelegateImpl::runAnimationFrame() {
 }
 
 NativeAnimatedNodesManagerProvider::NativeAnimatedNodesManagerProvider(
-    NativeAnimatedNodesManager::StartOnRenderCallback startOnRenderCallback,
-    NativeAnimatedNodesManager::StopOnRenderCallback stopOnRenderCallback)
+    StartOnRenderCallback startOnRenderCallback,
+    StopOnRenderCallback stopOnRenderCallback)
     : eventEmitterListenerContainer_(
           std::make_shared<EventEmitterListenerContainer>()),
       startOnRenderCallback_(std::move(startOnRenderCallback)),
@@ -67,12 +65,25 @@ NativeAnimatedNodesManagerProvider::getOrCreate(
           uiManager->synchronouslyUpdateViewOnUIThread(viewTag, props);
         };
 
+    nativeAnimatedDelegate_ =
+        std::make_shared<UIManagerNativeAnimatedDelegateImpl>();
+
+    auto startOnRenderCallback =
+        [nativeAnimatedDelegate = nativeAnimatedDelegate_,
+         startOnRenderCallbackFn = std::move(startOnRenderCallback_)]() {
+          if (startOnRenderCallbackFn) {
+            startOnRenderCallbackFn([nativeAnimatedDelegate]() {
+              nativeAnimatedDelegate->runAnimationFrame();
+            });
+          }
+        };
+
     if (ReactNativeFeatureFlags::useSharedAnimatedBackend()) {
 #ifdef RN_USE_ANIMATION_BACKEND
       // TODO: this should be initialized outside of animated, but for now it
       // was convenient to do it here
       animationBackend_ = std::make_shared<AnimationBackend>(
-          std::move(startOnRenderCallback_),
+          std::move(startOnRenderCallback),
           std::move(stopOnRenderCallback_),
           std::move(directManipulationCallback),
           std::move(fabricCommitCallback),
@@ -88,10 +99,14 @@ NativeAnimatedNodesManagerProvider::getOrCreate(
           std::make_shared<NativeAnimatedNodesManager>(
               std::move(directManipulationCallback),
               std::move(fabricCommitCallback),
-              std::move(startOnRenderCallback_),
+              std::move(startOnRenderCallback),
               std::move(stopOnRenderCallback_));
     }
 
+    std::static_pointer_cast<UIManagerNativeAnimatedDelegateImpl>(
+        nativeAnimatedDelegate_)
+        ->setNativeAnimatedNodesManager(nativeAnimatedNodesManager_);
+
     addEventEmitterListener(
         nativeAnimatedNodesManager_->getEventEmitterListener());
 
@@ -112,10 +127,6 @@ NativeAnimatedNodesManagerProvider::getOrCreate(
           return false;
         }));
 
-    nativeAnimatedDelegate_ =
-        std::make_shared<UIManagerNativeAnimatedDelegateImpl>(
-            nativeAnimatedNodesManager_);
-
     uiManager->setNativeAnimatedDelegate(nativeAnimatedDelegate_);
 
     // TODO: remove force casting.

packages/react-native/ReactCommon/react/renderer/animated/NativeAnimatedNodesManagerProvider.h

@@ -13,27 +13,32 @@
 
 namespace facebook::react {
 
+class AnimatedMountingOverrideDelegate;
+
 class UIManagerNativeAnimatedDelegateImpl
     : public UIManagerNativeAnimatedDelegate {
  public:
-  explicit UIManagerNativeAnimatedDelegateImpl(
-      std::weak_ptr<NativeAnimatedNodesManager> nativeAnimatedNodesManager);
+  explicit UIManagerNativeAnimatedDelegateImpl();
 
   void runAnimationFrame() override;
 
+  void setNativeAnimatedNodesManager(
+      std::weak_ptr<NativeAnimatedNodesManager> manager) {
+    nativeAnimatedNodesManager_ = manager;
+  }
+
  private:
   std::weak_ptr<NativeAnimatedNodesManager> nativeAnimatedNodesManager_;
 };
 
-class AnimatedMountingOverrideDelegate;
-
 class NativeAnimatedNodesManagerProvider {
  public:
+  using StartOnRenderCallback = std::function<void(std::function<void()>&&)>;
+  using StopOnRenderCallback = NativeAnimatedNodesManager::StopOnRenderCallback;
+
   NativeAnimatedNodesManagerProvider(
-      NativeAnimatedNodesManager::StartOnRenderCallback startOnRenderCallback =
-          nullptr,
-      NativeAnimatedNodesManager::StopOnRenderCallback stopOnRenderCallback =
-          nullptr);
+      StartOnRenderCallback startOnRenderCallback = nullptr,
+      StopOnRenderCallback stopOnRenderCallback = nullptr);
 
   std::shared_ptr<NativeAnimatedNodesManager> getOrCreate(
       jsi::Runtime& runtime,
@@ -56,8 +61,8 @@ class NativeAnimatedNodesManagerProvider {
   std::shared_ptr<AnimatedMountingOverrideDelegate>
       animatedMountingOverrideDelegate_;
 
-  NativeAnimatedNodesManager::StartOnRenderCallback startOnRenderCallback_;
-  NativeAnimatedNodesManager::StopOnRenderCallback stopOnRenderCallback_;
+  StartOnRenderCallback startOnRenderCallback_;
+  StopOnRenderCallback stopOnRenderCallback_;
 
   std::unique_ptr<MergedValueDispatcher> mergedValueDispatcher_;
 };