Pass mutation list to RCTMountingTransactionObserving callbacks

Summary:
Re-land of previous reverted commit.

Changelog: [Internal]

Reviewed By: cortinico, cipolleschi

Differential Revision: D35843710

fbshipit-source-id: 3adde4fba2f2702ad5b85b3b52b2f68843c6c9f2

React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm

@@ -192,7 +192,8 @@ - (void)ensurePresentedOnlyIfNeeded
 
 #pragma mark - RCTMountingTransactionObserving
 
-- (void)mountingTransactionWillMountWithMetadata:(MountingTransactionMetadata const &)metadata
+- (void)mountingTransactionWillMount:(MountingTransaction const &)transaction
+                withSurfaceTelemetry:(facebook::react::SurfaceTelemetry const &)surfaceTelemetry
 {
   _modalContentsSnapshot = [self.viewController.view snapshotViewAfterScreenUpdates:NO];
 }

React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm

@@ -147,7 +147,8 @@ - (void)dealloc
 
 #pragma mark - RCTMountingTransactionObserving
 
-- (void)mountingTransactionDidMountWithMetadata:(MountingTransactionMetadata const &)metadata
+- (void)mountingTransactionDidMount:(MountingTransaction const &)transaction
+               withSurfaceTelemetry:(facebook::react::SurfaceTelemetry const &)surfaceTelemetry
 {
   [self _remountChildren];
 }

React/Fabric/Mounting/RCTComponentViewFactory.mm

@@ -95,9 +95,9 @@ - (RCTComponentViewClassDescriptor)_componentViewClassDescriptorFromClass:(Class
   {
     .viewClass = viewClass,
     .observesMountingTransactionWillMount =
-        (bool)class_respondsToSelector(viewClass, @selector(mountingTransactionWillMountWithMetadata:)),
+        (bool)class_respondsToSelector(viewClass, @selector(mountingTransactionWillMount:withSurfaceTelemetry:)),
     .observesMountingTransactionDidMount =
-        (bool)class_respondsToSelector(viewClass, @selector(mountingTransactionDidMountWithMetadata:)),
+        (bool)class_respondsToSelector(viewClass, @selector(mountingTransactionDidMount:withSurfaceTelemetry:)),
   };
 #pragma clang diagnostic pop
 }

React/Fabric/Mounting/RCTMountingManager.mm

@@ -266,15 +266,16 @@ - (void)performTransaction:(MountingCoordinator::Shared const &)mountingCoordina
   auto surfaceId = mountingCoordinator->getSurfaceId();
 
   mountingCoordinator->getTelemetryController().pullTransaction(
-      [&](MountingTransactionMetadata metadata) {
+      [&](MountingTransaction const &transaction, SurfaceTelemetry const &surfaceTelemetry) {
         [self.delegate mountingManager:self willMountComponentsWithRootTag:surfaceId];
-        _observerCoordinator.notifyObserversMountingTransactionWillMount(metadata);
+        _observerCoordinator.notifyObserversMountingTransactionWillMount(transaction, surfaceTelemetry);
       },
-      [&](ShadowViewMutationList const &mutations) {
-        RCTPerformMountInstructions(mutations, _componentViewRegistry, _observerCoordinator, surfaceId);
+      [&](MountingTransaction const &transaction, SurfaceTelemetry const &surfaceTelemetry) {
+        RCTPerformMountInstructions(
+            transaction.getMutations(), _componentViewRegistry, _observerCoordinator, surfaceId);
       },
-      [&](MountingTransactionMetadata metadata) {
-        _observerCoordinator.notifyObserversMountingTransactionDidMount(metadata);
+      [&](MountingTransaction const &transaction, SurfaceTelemetry const &surfaceTelemetry) {
+        _observerCoordinator.notifyObserversMountingTransactionDidMount(transaction, surfaceTelemetry);
         [self.delegate mountingManager:self didMountComponentsWithRootTag:surfaceId];
       });
 }

React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.h

@@ -11,7 +11,7 @@
 #import <butter/map.h>
 #import <butter/set.h>
 
-#import <react/renderer/mounting/MountingTransactionMetadata.h>
+#include <react/renderer/mounting/MountingTransaction.h>
 
 class RCTMountingTransactionObserverCoordinator final {
  public:
@@ -31,9 +31,11 @@ class RCTMountingTransactionObserverCoordinator final {
    * To be called from `RCTMountingManager`.
    */
   void notifyObserversMountingTransactionWillMount(
-      facebook::react::MountingTransactionMetadata const &metadata) const;
+      facebook::react::MountingTransaction const &transaction,
+      facebook::react::SurfaceTelemetry const &surfaceTelemetry) const;
   void notifyObserversMountingTransactionDidMount(
-      facebook::react::MountingTransactionMetadata const &metadata) const;
+      facebook::react::MountingTransaction const &transaction,
+      facebook::react::SurfaceTelemetry const &surfaceTelemetry) const;
 
  private:
   facebook::butter::map<

React/Fabric/Mounting/RCTMountingTransactionObserverCoordinator.mm

@@ -40,35 +40,37 @@
 }
 
 void RCTMountingTransactionObserverCoordinator::notifyObserversMountingTransactionWillMount(
-    MountingTransactionMetadata const &metadata) const
+    MountingTransaction const &transaction,
+    SurfaceTelemetry const &surfaceTelemetry) const
 {
-  auto surfaceId = metadata.surfaceId;
+  auto surfaceId = transaction.getSurfaceId();
   auto surfaceRegistryIterator = registry_.find(surfaceId);
   if (surfaceRegistryIterator == registry_.end()) {
     return;
   }
   auto &surfaceRegistry = surfaceRegistryIterator->second;
   for (auto const &componentViewDescriptor : surfaceRegistry) {
     if (componentViewDescriptor.observesMountingTransactionWillMount) {
-      [(id<RCTMountingTransactionObserving>)componentViewDescriptor.view
-          mountingTransactionWillMountWithMetadata:metadata];
+      [(id<RCTMountingTransactionObserving>)componentViewDescriptor.view mountingTransactionWillMount:transaction
+                                                                                 withSurfaceTelemetry:surfaceTelemetry];
     }
   }
 }
 
 void RCTMountingTransactionObserverCoordinator::notifyObserversMountingTransactionDidMount(
-    MountingTransactionMetadata const &metadata) const
+    MountingTransaction const &transaction,
+    SurfaceTelemetry const &surfaceTelemetry) const
 {
-  auto surfaceId = metadata.surfaceId;
+  auto surfaceId = transaction.getSurfaceId();
   auto surfaceRegistryIterator = registry_.find(surfaceId);
   if (surfaceRegistryIterator == registry_.end()) {
     return;
   }
   auto &surfaceRegistry = surfaceRegistryIterator->second;
   for (auto const &componentViewDescriptor : surfaceRegistry) {
     if (componentViewDescriptor.observesMountingTransactionDidMount) {
-      [(id<RCTMountingTransactionObserving>)componentViewDescriptor.view
-          mountingTransactionDidMountWithMetadata:metadata];
+      [(id<RCTMountingTransactionObserving>)componentViewDescriptor.view mountingTransactionDidMount:transaction
+                                                                                withSurfaceTelemetry:surfaceTelemetry];
     }
   }
 }

React/Fabric/Mounting/RCTMountingTransactionObserving.h

@@ -7,7 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import <react/renderer/mounting/MountingTransactionMetadata.h>
+#include <react/renderer/mounting/MountingTransaction.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -50,14 +50,16 @@ NS_ASSUME_NONNULL_BEGIN
  * Is not being called for a component view which is being mounted as part of the transaction (because the view is not
  * registered as an observer yet).
  */
-- (void)mountingTransactionWillMountWithMetadata:(facebook::react::MountingTransactionMetadata const &)metadata;
+- (void)mountingTransactionWillMount:(facebook::react::MountingTransaction const &)transaction
+                withSurfaceTelemetry:(facebook::react::SurfaceTelemetry const &)surfaceTelemetry;
 
 /*
  * Called right after the last mutation instruction is executed.
  * Is not being called for a component view which was being unmounted as part of the transaction (because the view is
  * not registered as an observer already).
  */
-- (void)mountingTransactionDidMountWithMetadata:(facebook::react::MountingTransactionMetadata const &)metadata;
+- (void)mountingTransactionDidMount:(facebook::react::MountingTransaction const &)transaction
+               withSurfaceTelemetry:(facebook::react::SurfaceTelemetry const &)surfaceTelemetry;
 
 @end
 

ReactCommon/react/renderer/mounting/TelemetryController.cpp

@@ -17,35 +17,32 @@ TelemetryController::TelemetryController(
     : mountingCoordinator_(mountingCoordinator) {}
 
 bool TelemetryController::pullTransaction(
-    std::function<void(MountingTransactionMetadata metadata)> const &willMount,
-    std::function<void(ShadowViewMutationList const &mutations)> const &doMount,
-    std::function<void(MountingTransactionMetadata metadata)> const &didMount)
-    const {
+    MountingTransactionCallback const &willMount,
+    MountingTransactionCallback const &doMount,
+    MountingTransactionCallback const &didMount) const {
   auto optional = mountingCoordinator_.pullTransaction();
   if (!optional.has_value()) {
     return false;
   }
 
   auto transaction = std::move(*optional);
 
-  auto surfaceId = transaction.getSurfaceId();
-  auto number = transaction.getNumber();
   auto telemetry = transaction.getTelemetry();
   auto numberOfMutations = static_cast<int>(transaction.getMutations().size());
 
   mutex_.lock();
   auto compoundTelemetry = compoundTelemetry_;
   mutex_.unlock();
 
-  willMount({surfaceId, number, telemetry, compoundTelemetry});
+  willMount(transaction, compoundTelemetry);
 
   telemetry.willMount();
-  doMount(transaction.getMutations());
+  doMount(transaction, compoundTelemetry);
   telemetry.didMount();
 
   compoundTelemetry.incorporate(telemetry, numberOfMutations);
 
-  didMount({surfaceId, number, telemetry, compoundTelemetry});
+  didMount(transaction, compoundTelemetry);
 
   mutex_.lock();
   compoundTelemetry_ = compoundTelemetry;

ReactCommon/react/renderer/mounting/TelemetryController.h

@@ -11,14 +11,17 @@
 #include <mutex>
 
 #include <react/renderer/mounting/MountingTransaction.h>
-#include <react/renderer/mounting/MountingTransactionMetadata.h>
 #include <react/renderer/telemetry/TransactionTelemetry.h>
 
 namespace facebook {
 namespace react {
 
 class MountingCoordinator;
 
+using MountingTransactionCallback = std::function<void(
+    MountingTransaction const &transaction,
+    SurfaceTelemetry const &surfaceTelemetry)>;
+
 /*
  * Provides convenient tools for aggregating and accessing telemetry data
  * associated with running Surface.
@@ -43,12 +46,9 @@ class TelemetryController final {
    * Calls `MountingCoordinator::pullTransaction()` and aggregates telemetry.
    */
   bool pullTransaction(
-      std::function<void(MountingTransactionMetadata metadata)> const
-          &willMount,
-      std::function<void(ShadowViewMutationList const &mutations)> const
-          &doMount,
-      std::function<void(MountingTransactionMetadata metadata)> const &didMount)
-      const;
+      MountingTransactionCallback const &willMount,
+      MountingTransactionCallback const &doMount,
+      MountingTransactionCallback const &didMount) const;
 
  private:
   MountingCoordinator const &mountingCoordinator_;