Back out "Remove UIManagerCommitHookManager 2/2" (facebook#54302)

Summary:
Pull Request resolved: facebook#54302

Changelog: [Internal]

Original commit changeset: 1c7705187346

Original Phabricator Diff: D85261208

Reviewed By: javache, rubennorte

Differential Revision: D85660275

fbshipit-source-id: 19e6c44871660a53399276445bc2d3ee97cd2ac0

Author: sammy-SC

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java

@@ -964,15 +964,15 @@ public void runGuarded() {
    * by an ImageView.
    */
   @UnstableReactNativeAPI
-  public void experimental_prefetchResource(
-      int surfaceId, String componentName, ReadableMapBuffer params, int tag) {
+  public void experimental_prefetchResources(
+      int surfaceId, String componentName, ReadableMapBuffer params) {
     if (ReactNativeFeatureFlags.enableImagePrefetchingOnUiThreadAndroid()) {
       mMountItemDispatcher.addMountItem(
-          new PrefetchResourcesMountItem(surfaceId, componentName, params, tag));
+          new PrefetchResourcesMountItem(surfaceId, componentName, params));
     } else {
       SurfaceMountingManager surfaceMountingManager = mMountingManager.getSurfaceManager(surfaceId);
       if (surfaceMountingManager != null) {
-        surfaceMountingManager.experimental_prefetchResource(surfaceId, componentName, params, tag);
+        surfaceMountingManager.experimental_prefetchResources(surfaceId, componentName, params);
       }
     }
   }

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java

@@ -815,20 +815,19 @@ private void updateProps(
    * @param surfaceId surface ID
    * @param componentName
    * @param params prefetch request params defined in C++
-   * @param tag react tag of the component
    */
   @SuppressLint("FunctionName")
   @AnyThread
   @UnstableReactNativeAPI
-  public void experimental_prefetchResource(
-      int surfaceId, String componentName, MapBuffer params, int tag) {
+  public void experimental_prefetchResources(
+      int surfaceId, String componentName, MapBuffer params) {
     if (isStopped()) {
       return;
     }
     mViewManagerRegistry
         .get(componentName)
-        .experimental_prefetchResource(
-            surfaceId, Assertions.assertNotNull(mThemedReactContext), params, tag);
+        .experimental_prefetchResources(
+            surfaceId, Assertions.assertNotNull(mThemedReactContext), params);
   }
 
   @Deprecated

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/PrefetchResourcesMountItem.kt

@@ -16,18 +16,16 @@ internal class PrefetchResourcesMountItem(
     private val surfaceId: Int,
     private val componentName: String,
     private val params: ReadableMapBuffer,
-    private val tag: Int,
 ) : MountItem {
 
   @OptIn(UnstableReactNativeAPI::class, FrameworkAPI::class)
   override fun execute(mountingManager: MountingManager) {
     mountingManager
         .getSurfaceManager(surfaceId)
-        ?.experimental_prefetchResource(
+        ?.experimental_prefetchResources(
             surfaceId,
             componentName,
             params,
-            tag,
         )
   }
 

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java

@@ -489,11 +489,10 @@ public void onSurfaceStopped(int surfaceId) {
    * @param surfaceId surface ID
    * @param reactContext {@link com.facebook.react.bridge.ReactContext} used for the view.
    * @param params {@link MapBuffer} prefetch request params defined in C++
-   * @param tag react tag of the component
    */
   @UnstableReactNativeAPI
-  public void experimental_prefetchResource(
-      int surfaceId, ThemedReactContext reactContext, MapBuffer params, int tag) {
+  public void experimental_prefetchResources(
+      int surfaceId, ThemedReactContext reactContext, MapBuffer params) {
     return;
   }
 

packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.cpp

@@ -21,26 +21,40 @@ ImageRequest ImageFetcher::requestImage(
     SurfaceId surfaceId,
     const ImageRequestParams& imageRequestParams,
     Tag tag) {
+  items_[surfaceId].emplace_back(
+      ImageRequestItem{
+          .imageSource = imageSource,
+          .imageRequestParams = imageRequestParams,
+          .tag = tag});
+
   auto telemetry = std::make_shared<ImageTelemetry>(surfaceId);
 
+  flushImageRequests();
+
+  return {imageSource, telemetry};
+}
+
+void ImageFetcher::flushImageRequests() {
+  if (items_.empty()) {
+    return;
+  }
+
   auto fabricUIManager_ =
       contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
-  static auto prefetchResource =
+  static auto prefetchResources =
       fabricUIManager_->getClass()
           ->getMethod<void(
-              SurfaceId, std::string, JReadableMapBuffer::javaobject, Tag)>(
-              "experimental_prefetchResource");
-
-  auto readableMapBuffer = JReadableMapBuffer::createWithContents(
-      serializeImageRequest(imageSource, imageRequestParams));
-  prefetchResource(
-      fabricUIManager_,
-      surfaceId,
-      "RCTImageView",
-      readableMapBuffer.get(),
-      tag);
+              SurfaceId, std::string, JReadableMapBuffer::javaobject)>(
+              "experimental_prefetchResources");
 
-  return {imageSource, telemetry};
+  for (auto& [surfaceId, surfaceImageRequests] : items_) {
+    auto readableMapBuffer = JReadableMapBuffer::createWithContents(
+        serializeImageRequests(surfaceImageRequests));
+    prefetchResources(
+        fabricUIManager_, surfaceId, "RCTImageView", readableMapBuffer.get());
+  }
+
+  items_.clear();
 }
 
 } // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageFetcher.h

@@ -11,6 +11,8 @@
 #include <react/renderer/imagemanager/ImageRequestParams.h>
 #include <react/utils/ContextContainer.h>
 #include <memory>
+#include <unordered_map>
+#include <vector>
 
 namespace facebook::react {
 
@@ -30,6 +32,9 @@ class ImageFetcher {
       Tag tag);
 
  private:
+  void flushImageRequests();
+
+  std::unordered_map<SurfaceId, std::vector<ImageRequestItem>> items_;
   std::shared_ptr<const ContextContainer> contextContainer_;
 };
 } // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/ImageRequestParams.h

@@ -95,4 +95,10 @@ class ImageRequestParams {
   }
 };
 
+struct ImageRequestItem {
+  ImageSource imageSource;
+  ImageRequestParams imageRequestParams;
+  Tag tag{};
+};
+
 } // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/imagemanager/platform/android/react/renderer/imagemanager/conversions.h

@@ -13,6 +13,7 @@
 #include <react/renderer/mapbuffer/MapBuffer.h>
 #include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #include <react/utils/to_underlying.h>
+#include <vector>
 
 namespace facebook::react {
 
@@ -33,6 +34,7 @@ constexpr MapBuffer::Key IS_KEY_FADE_DURATION = 11;
 constexpr MapBuffer::Key IS_KEY_PROGRESSIVE_RENDERING_ENABLED = 12;
 constexpr MapBuffer::Key IS_KEY_LOADING_INDICATOR_SRC = 13;
 constexpr MapBuffer::Key IS_KEY_ANALYTIC_TAG = 14;
+constexpr MapBuffer::Key IS_KEY_TAG = 15;
 
 inline void serializeImageSource(MapBufferBuilder &builder, const ImageSource &imageSource)
 {
@@ -61,13 +63,26 @@ inline void serializeImageRequestParams(MapBufferBuilder &builder, const ImageRe
   builder.putString(IS_KEY_ANALYTIC_TAG, imageRequestParams.analyticTag);
 }
 
+inline MapBuffer serializeImageRequest(const ImageRequestItem &item)
+{
+  auto builder = MapBufferBuilder();
+  serializeImageSource(builder, item.imageSource);
+  serializeImageRequestParams(builder, item.imageRequestParams);
+  builder.putInt(IS_KEY_TAG, item.tag);
+  return builder.build();
+}
+
 } // namespace
 
-inline MapBuffer serializeImageRequest(const ImageSource &imageSource, const ImageRequestParams &imageRequestParams)
+inline MapBuffer serializeImageRequests(const std::vector<ImageRequestItem> &items)
 {
-  auto builder = MapBufferBuilder();
-  serializeImageSource(builder, imageSource);
-  serializeImageRequestParams(builder, imageRequestParams);
+  std::vector<MapBuffer> mapBufferList;
+  mapBufferList.reserve(items.size());
+  for (const auto &item : items) {
+    mapBufferList.emplace_back(serializeImageRequest(item));
+  }
+  MapBufferBuilder builder;
+  builder.putMapBufferList(0, mapBufferList);
   return builder.build();
 }