Add FabricUIManager measure helper

Summary:
Fabric components that measure through `FabricUIManager` repeat the same JNI signature, map conversion, constraint forwarding, and result decoding. Add a shared Android C++ helper and migrate the existing representative callers.

Changelog:
[Android][Added] - Add a reusable C++ helper for measuring Fabric components

Differential Revision: D126142997

Author: javache

packages/react-native/ReactAndroid/src/main/jni/react/fabric/FabricUIManagerMeasure.h

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <fbjni/fbjni.h>
+#include <folly/dynamic.h>
+#include <react/jni/ReadableNativeMap.h>
+#include <react/renderer/core/LayoutConstraints.h>
+#include <react/renderer/core/ReactPrimitives.h>
+#include <react/renderer/core/conversions.h>
+#include <bit>
+#include <utility>
+
+namespace facebook::react {
+
+struct FabricUIManagerMeasureArgs {
+  SurfaceId surfaceId;
+  const char *componentName;
+  LayoutConstraints layoutConstraints;
+  folly::dynamic localData{nullptr};
+  folly::dynamic props{nullptr};
+  folly::dynamic state{nullptr};
+};
+
+inline Size measureWithFabricUIManager(const jni::global_ref<jobject> &fabricUIManager, FabricUIManagerMeasureArgs args)
+{
+  static const auto measure = jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
+                                  ->getMethod<jlong(
+                                      jint,
+                                      jstring,
+                                      ReadableMap::javaobject,
+                                      ReadableMap::javaobject,
+                                      ReadableMap::javaobject,
+                                      jfloat,
+                                      jfloat,
+                                      jfloat,
+                                      jfloat)>("measure");
+
+  auto toReadableMap = [](folly::dynamic &value) {
+    auto nativeMap = jni::make_local(ReadableNativeMap::createWithContents(std::move(value)));
+    return jni::adopt_local(std::bit_cast<ReadableMap::javaobject>(nativeMap.release()));
+  };
+
+  auto componentName = jni::make_jstring(args.componentName);
+  auto localData = toReadableMap(args.localData);
+  auto props = toReadableMap(args.props);
+  auto state = toReadableMap(args.state);
+  const auto &minimumSize = args.layoutConstraints.minimumSize;
+  const auto &maximumSize = args.layoutConstraints.maximumSize;
+
+  return yogaMeassureToSize(measure(
+      fabricUIManager,
+      args.surfaceId,
+      componentName.get(),
+      localData.get(),
+      props.get(),
+      state.get(),
+      minimumSize.width,
+      maximumSize.width,
+      minimumSize.height,
+      maximumSize.height));
+}
+
+} // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/AndroidProgressBarMeasurementsManager.cpp

@@ -7,12 +7,8 @@
 
 #include "AndroidProgressBarMeasurementsManager.h"
 
-#include <fbjni/fbjni.h>
-#include <react/jni/ReadableNativeMap.h>
+#include <react/fabric/FabricUIManagerMeasure.h>
 #include <react/renderer/components/progressbar/conversions.h>
-#include <react/renderer/core/conversions.h>
-
-using namespace facebook::jni;
 
 namespace facebook::react {
 
@@ -23,41 +19,14 @@ Size AndroidProgressBarMeasurementsManager::measure(
   const jni::global_ref<jobject>& fabricUIManager =
       contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
 
-  static auto measure = facebook::jni::findClassStatic(
-                            "com/facebook/react/fabric/FabricUIManager")
-                            ->getMethod<jlong(
-                                jint,
-                                jstring,
-                                ReadableMap::javaobject,
-                                ReadableMap::javaobject,
-                                ReadableMap::javaobject,
-                                jfloat,
-                                jfloat,
-                                jfloat,
-                                jfloat)>("measure");
-
-  auto minimumSize = layoutConstraints.minimumSize;
-  auto maximumSize = layoutConstraints.maximumSize;
-
-  local_ref<JString> componentName = make_jstring("AndroidProgressBar");
-
-  auto serialiazedProps = toDynamic(props);
-  local_ref<ReadableNativeMap::javaobject> propsRNM =
-      ReadableNativeMap::newObjectCxxArgs(serialiazedProps);
-  local_ref<ReadableMap::javaobject> propsRM =
-      make_local(reinterpret_cast<ReadableMap::javaobject>(propsRNM.get()));
-
-  return yogaMeassureToSize(measure(
+  return measureWithFabricUIManager(
       fabricUIManager,
-      surfaceId,
-      componentName.get(),
-      nullptr,
-      propsRM.get(),
-      nullptr,
-      minimumSize.width,
-      maximumSize.width,
-      minimumSize.height,
-      maximumSize.height));
+      {
+          .surfaceId = surfaceId,
+          .componentName = "AndroidProgressBar",
+          .layoutConstraints = layoutConstraints,
+          .props = toDynamic(props),
+      });
 }
 
 } // namespace facebook::react

packages/react-native/ReactCommon/react/renderer/components/switch/androidswitch/react/renderer/components/androidswitch/AndroidSwitchMeasurementsManager.cpp

@@ -7,51 +7,23 @@
 
 #include "AndroidSwitchMeasurementsManager.h"
 
-#include <fbjni/fbjni.h>
-#include <react/jni/ReadableNativeMap.h>
-#include <react/renderer/core/conversions.h>
-
-using namespace facebook::jni;
+#include <react/fabric/FabricUIManagerMeasure.h>
 
 namespace facebook::react {
 
 Size AndroidSwitchMeasurementsManager::measure(
     SurfaceId surfaceId,
     LayoutConstraints layoutConstraints) const {
-  {
-    const jni::global_ref<jobject>& fabricUIManager =
-        contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
-
-    static auto measure =
-        jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
-            ->getMethod<jlong(
-                jint,
-                jstring,
-                ReadableMap::javaobject,
-                ReadableMap::javaobject,
-                ReadableMap::javaobject,
-                jfloat,
-                jfloat,
-                jfloat,
-                jfloat)>("measure");
-
-    auto minimumSize = layoutConstraints.minimumSize;
-    auto maximumSize = layoutConstraints.maximumSize;
-
-    local_ref<JString> componentName = make_jstring("AndroidSwitch");
-
-    return yogaMeassureToSize(measure(
-        fabricUIManager,
-        surfaceId,
-        componentName.get(),
-        nullptr,
-        nullptr,
-        nullptr,
-        minimumSize.width,
-        maximumSize.width,
-        minimumSize.height,
-        maximumSize.height));
-  }
+  const jni::global_ref<jobject>& fabricUIManager =
+      contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
+
+  return measureWithFabricUIManager(
+      fabricUIManager,
+      {
+          .surfaceId = surfaceId,
+          .componentName = "AndroidSwitch",
+          .layoutConstraints = layoutConstraints,
+      });
 }
 
 } // namespace facebook::react

scripts/cxx-api/api-snapshots/ReactAndroidDebugCxx.api

@@ -514,6 +514,7 @@ facebook::react::SharedColor facebook::react::colorFromComponents(facebook::reac
 facebook::react::SharedColor facebook::react::colorFromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a);
 facebook::react::SharedColor facebook::react::parsePlatformColor(const facebook::react::ContextContainer& contextContainer, int32_t surfaceId, const facebook::react::RawValue& value);
 facebook::react::SharedColor facebook::react::whiteColor();
+facebook::react::Size facebook::react::measureWithFabricUIManager(const jni::global_ref<jobject>& fabricUIManager, facebook::react::FabricUIManagerMeasureArgs args);
 facebook::react::Size facebook::react::yogaMeassureToSize(int64_t value);
 facebook::react::TurboModuleMethodValueKind facebook::react::getTurboModuleMethodValueKind(facebook::jsi::Runtime& rt, const facebook::jsi::Value* value);
 facebook::react::ValueUnit facebook::react::toValueUnit(const facebook::react::RawValue& value);
@@ -3244,6 +3245,15 @@ struct facebook::react::EventPayload {
   public virtual ~EventPayload() = default;
 }
 
+struct facebook::react::FabricUIManagerMeasureArgs {
+  public const char* componentName;
+  public facebook::react::LayoutConstraints layoutConstraints;
+  public facebook::react::SurfaceId surfaceId;
+  public folly::dynamic localData;
+  public folly::dynamic props;
+  public folly::dynamic state;
+}
+
 struct facebook::react::FilterFunction {
   public bool operator==(const facebook::react::FilterFunction& other) const = default;
   public facebook::react::FilterType type;

scripts/cxx-api/api-snapshots/ReactAndroidFrameworksCxx.api

@@ -741,6 +741,7 @@ facebook::react::SharedColor facebook::react::colorFromComponents(facebook::reac
 facebook::react::SharedColor facebook::react::colorFromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a);
 facebook::react::SharedColor facebook::react::parsePlatformColor(const facebook::react::ContextContainer& contextContainer, int32_t surfaceId, const facebook::react::RawValue& value);
 facebook::react::SharedColor facebook::react::whiteColor();
+facebook::react::Size facebook::react::measureWithFabricUIManager(const jni::global_ref<jobject>& fabricUIManager, facebook::react::FabricUIManagerMeasureArgs args);
 facebook::react::Size facebook::react::yogaMeassureToSize(int64_t value);
 facebook::react::SurfaceId facebook::react::getNextRootViewTag() noexcept;
 facebook::react::TurboModuleMethodValueKind facebook::react::getTurboModuleMethodValueKind(facebook::jsi::Runtime& rt, const facebook::jsi::Value* value);
@@ -6082,6 +6083,15 @@ struct facebook::react::EventPayload {
   public virtual ~EventPayload() = default;
 }
 
+struct facebook::react::FabricUIManagerMeasureArgs {
+  public const char* componentName;
+  public facebook::react::LayoutConstraints layoutConstraints;
+  public facebook::react::SurfaceId surfaceId;
+  public folly::dynamic localData;
+  public folly::dynamic props;
+  public folly::dynamic state;
+}
+
 struct facebook::react::FilterFunction {
   public bool operator==(const facebook::react::FilterFunction& other) const = default;
   public facebook::react::FilterType type;

scripts/cxx-api/api-snapshots/ReactAndroidNewarchCxx.api

@@ -514,6 +514,7 @@ facebook::react::SharedColor facebook::react::colorFromComponents(facebook::reac
 facebook::react::SharedColor facebook::react::colorFromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a);
 facebook::react::SharedColor facebook::react::parsePlatformColor(const facebook::react::ContextContainer& contextContainer, int32_t surfaceId, const facebook::react::RawValue& value);
 facebook::react::SharedColor facebook::react::whiteColor();
+facebook::react::Size facebook::react::measureWithFabricUIManager(const jni::global_ref<jobject>& fabricUIManager, facebook::react::FabricUIManagerMeasureArgs args);
 facebook::react::Size facebook::react::yogaMeassureToSize(int64_t value);
 facebook::react::TurboModuleMethodValueKind facebook::react::getTurboModuleMethodValueKind(facebook::jsi::Runtime& rt, const facebook::jsi::Value* value);
 facebook::react::ValueUnit facebook::react::toValueUnit(const facebook::react::RawValue& value);
@@ -3237,6 +3238,15 @@ struct facebook::react::EventPayload {
   public virtual ~EventPayload() = default;
 }
 
+struct facebook::react::FabricUIManagerMeasureArgs {
+  public const char* componentName;
+  public facebook::react::LayoutConstraints layoutConstraints;
+  public facebook::react::SurfaceId surfaceId;
+  public folly::dynamic localData;
+  public folly::dynamic props;
+  public folly::dynamic state;
+}
+
 struct facebook::react::FilterFunction {
   public bool operator==(const facebook::react::FilterFunction& other) const = default;
   public facebook::react::FilterType type;

scripts/cxx-api/api-snapshots/ReactAndroidReleaseCxx.api

@@ -514,6 +514,7 @@ facebook::react::SharedColor facebook::react::colorFromComponents(facebook::reac
 facebook::react::SharedColor facebook::react::colorFromRGBA(uint8_t r, uint8_t g, uint8_t b, uint8_t a);
 facebook::react::SharedColor facebook::react::parsePlatformColor(const facebook::react::ContextContainer& contextContainer, int32_t surfaceId, const facebook::react::RawValue& value);
 facebook::react::SharedColor facebook::react::whiteColor();
+facebook::react::Size facebook::react::measureWithFabricUIManager(const jni::global_ref<jobject>& fabricUIManager, facebook::react::FabricUIManagerMeasureArgs args);
 facebook::react::Size facebook::react::yogaMeassureToSize(int64_t value);
 facebook::react::TurboModuleMethodValueKind facebook::react::getTurboModuleMethodValueKind(facebook::jsi::Runtime& rt, const facebook::jsi::Value* value);
 facebook::react::ValueUnit facebook::react::toValueUnit(const facebook::react::RawValue& value);
@@ -3237,6 +3238,15 @@ struct facebook::react::EventPayload {
   public virtual ~EventPayload() = default;
 }
 
+struct facebook::react::FabricUIManagerMeasureArgs {
+  public const char* componentName;
+  public facebook::react::LayoutConstraints layoutConstraints;
+  public facebook::react::SurfaceId surfaceId;
+  public folly::dynamic localData;
+  public folly::dynamic props;
+  public folly::dynamic state;
+}
+
 struct facebook::react::FilterFunction {
   public bool operator==(const facebook::react::FilterFunction& other) const = default;
   public facebook::react::FilterType type;