react-native 0.68.1 → 0.69.0-rc.1

package/ReactCommon/react/renderer/textlayoutmanager/Android.mk

@@ -10,13 +10,13 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_textlayoutmanager
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp $(LOCAL_PATH)/platform/android/react/renderer/textlayoutmanager/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
   libfb \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libmapbufferjni \
   libreact_debug \

package/ReactCommon/react/renderer/textlayoutmanager/BUCK

@@ -103,7 +103,10 @@ rn_xplat_cxx_library(
             "platform/ios/**/*.mm",
         ],
     ),
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

package/ReactCommon/react/renderer/textlayoutmanager/CMakeLists.txt

@@ -0,0 +1,45 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+
+file(GLOB react_render_textlayourmanager_SRC CONFIGURE_DEPENDS
+        *.cpp
+        platform/android/react/renderer/textlayoutmanager/*.cpp)
+
+add_library(react_render_textlayoutmanager
+        SHARED
+        ${react_render_textlayourmanager_SRC})
+
+target_include_directories(react_render_textlayoutmanager
+        PUBLIC
+          ${REACT_COMMON_DIR}
+          ${CMAKE_CURRENT_SOURCE_DIR}/platform/android/
+)
+
+target_link_libraries(react_render_textlayoutmanager
+        glog
+        fb
+        fbjni
+        folly_runtime
+        glog_init
+        mapbufferjni
+        react_debug
+        react_render_attributedstring
+        react_render_componentregistry
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        react_render_mapbuffer
+        react_render_mounting
+        react_render_telemetry
+        react_render_uimanager
+        react_utils
+        reactnativeutilsjni
+        yoga
+)

package/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp

@@ -9,18 +9,150 @@
 
 #include <limits>
 
+#include <react/common/mapbuffer/JReadableMapBuffer.h>
 #include <react/jni/ReadableNativeMap.h>
 #include <react/renderer/attributedstring/conversions.h>
 #include <react/renderer/core/conversions.h>
+#include <react/renderer/mapbuffer/MapBuffer.h>
+#include <react/renderer/mapbuffer/MapBufferBuilder.h>
 #include <react/renderer/telemetry/TransactionTelemetry.h>
-#include <react/utils/LayoutManager.h>
 
 using namespace facebook::jni;
 
 namespace facebook {
 namespace react {
 
-TextLayoutManager::~TextLayoutManager() = default;
+Size measureAndroidComponent(
+    ContextContainer::Shared const &contextContainer,
+    Tag rootTag,
+    std::string const &componentName,
+    folly::dynamic localData,
+    folly::dynamic props,
+    folly::dynamic state,
+    float minWidth,
+    float maxWidth,
+    float minHeight,
+    float maxHeight,
+    jfloatArray attachmentPositions) {
+  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,
+              jfloatArray)>("measure");
+
+  auto componentNameRef = make_jstring(componentName);
+  local_ref<ReadableNativeMap::javaobject> localDataRNM =
+      ReadableNativeMap::newObjectCxxArgs(std::move(localData));
+  local_ref<ReadableNativeMap::javaobject> propsRNM =
+      ReadableNativeMap::newObjectCxxArgs(std::move(props));
+  local_ref<ReadableNativeMap::javaobject> stateRNM =
+      ReadableNativeMap::newObjectCxxArgs(std::move(state));
+
+  local_ref<ReadableMap::javaobject> localDataRM =
+      make_local(reinterpret_cast<ReadableMap::javaobject>(localDataRNM.get()));
+  local_ref<ReadableMap::javaobject> propsRM =
+      make_local(reinterpret_cast<ReadableMap::javaobject>(propsRNM.get()));
+  local_ref<ReadableMap::javaobject> stateRM =
+      make_local(reinterpret_cast<ReadableMap::javaobject>(stateRNM.get()));
+
+  auto size = yogaMeassureToSize(measure(
+      fabricUIManager,
+      rootTag,
+      componentNameRef.get(),
+      localDataRM.get(),
+      propsRM.get(),
+      stateRM.get(),
+      minWidth,
+      maxWidth,
+      minHeight,
+      maxHeight,
+      attachmentPositions));
+
+  // Explicitly release smart pointers to free up space faster in JNI tables
+  componentNameRef.reset();
+  localDataRM.reset();
+  localDataRNM.reset();
+  propsRM.reset();
+  propsRNM.reset();
+  stateRM.reset();
+  stateRNM.reset();
+
+  return size;
+}
+
+Size measureAndroidComponentMapBuffer(
+    const ContextContainer::Shared &contextContainer,
+    Tag rootTag,
+    std::string const &componentName,
+    MapBuffer localData,
+    MapBuffer props,
+    float minWidth,
+    float maxWidth,
+    float minHeight,
+    float maxHeight,
+    jfloatArray attachmentPositions) {
+  const jni::global_ref<jobject> &fabricUIManager =
+      contextContainer->at<jni::global_ref<jobject>>("FabricUIManager");
+  auto componentNameRef = make_jstring(componentName);
+
+  static auto measure =
+      jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
+          ->getMethod<jlong(
+              jint,
+              jstring,
+              JReadableMapBuffer::javaobject,
+              JReadableMapBuffer::javaobject,
+              JReadableMapBuffer::javaobject,
+              jfloat,
+              jfloat,
+              jfloat,
+              jfloat,
+              jfloatArray)>("measureMapBuffer");
+
+  auto localDataMap =
+      JReadableMapBuffer::createWithContents(std::move(localData));
+  auto propsMap = JReadableMapBuffer::createWithContents(std::move(props));
+
+  auto size = yogaMeassureToSize(measure(
+      fabricUIManager,
+      rootTag,
+      componentNameRef.get(),
+      localDataMap.get(),
+      propsMap.get(),
+      nullptr,
+      minWidth,
+      maxWidth,
+      minHeight,
+      maxHeight,
+      attachmentPositions));
+
+  // Explicitly release smart pointers to free up space faster in JNI tables
+  componentNameRef.reset();
+  localDataMap.reset();
+  propsMap.reset();
+  return size;
+}
+
+TextLayoutManager::TextLayoutManager(
+    const ContextContainer::Shared &contextContainer)
+    : contextContainer_(contextContainer),
+      mapBufferSerializationEnabled_(
+          contextContainer->at<bool>("MapBufferSerializationEnabled")),
+      measureCache_(
+          contextContainer->at<bool>("EnableLargeTextMeasureCache")
+              ? 1024
+              : kSimpleThreadSafeCacheSizeCap) {}
 
 void *TextLayoutManager::getNativeTextLayoutManager() const {
   return self_;
@@ -73,7 +205,7 @@ TextMeasurement TextLayoutManager::measureCachedSpannableById(
       contextContainer_,
       -1, // TODO: we should pass rootTag in
       "RCTText",
-      cacheIdMap,
+      std::move(cacheIdMap),
       toDynamic(paragraphAttributes),
       nullptr,
       minimumSize.width,
@@ -155,15 +287,15 @@ LinesMeasurements TextLayoutManager::measureLinesMapBuffer(
   static auto measureLines =
       jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
           ->getMethod<NativeArray::javaobject(
-              ReadableMapBuffer::javaobject,
-              ReadableMapBuffer::javaobject,
+              JReadableMapBuffer::javaobject,
+              JReadableMapBuffer::javaobject,
               jfloat,
               jfloat)>("measureLinesMapBuffer");
 
   auto attributedStringMB =
-      ReadableMapBuffer::createWithContents(toMapBuffer(attributedString));
+      JReadableMapBuffer::createWithContents(toMapBuffer(attributedString));
   auto paragraphAttributesMB =
-      ReadableMapBuffer::createWithContents(toMapBuffer(paragraphAttributes));
+      JReadableMapBuffer::createWithContents(toMapBuffer(paragraphAttributes));
 
   auto array = measureLines(
       fabricUIManager,
@@ -224,7 +356,7 @@ TextMeasurement TextLayoutManager::doMeasure(
 
   auto attachments = TextMeasurement::Attachments{};
   if (attachmentsCount > 0) {
-    folly::dynamic fragments = serializedAttributedString["fragments"];
+    folly::dynamic const &fragments = serializedAttributedString["fragments"];
     int attachmentIndex = 0;
     for (auto const &fragment : fragments) {
       auto isAttachment = fragment.find("isAttachment");
@@ -276,8 +408,8 @@ TextMeasurement TextLayoutManager::doMeasureMapBuffer(
       contextContainer_,
       -1, // TODO: we should pass rootTag in
       "RCTText",
-      attributedStringMap,
-      paragraphAttributesMap,
+      std::move(attributedStringMap),
+      std::move(paragraphAttributesMap),
       minimumSize.width,
       maximumSize.width,
       minimumSize.height,

package/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h

@@ -26,17 +26,19 @@ using SharedTextLayoutManager = std::shared_ptr<const TextLayoutManager>;
  */
 class TextLayoutManager {
  public:
-  TextLayoutManager(const ContextContainer::Shared &contextContainer)
-      : contextContainer_(contextContainer),
-        measureCache_{
-            contextContainer->at<bool>("EnableLargeTextMeasureCache")
-                ? 1024
-                : kSimpleThreadSafeCacheSizeCap} {
-    static auto value =
-        contextContainer->at<bool>("MapBufferSerializationEnabled");
-    mapBufferSerializationEnabled_ = value;
-  }
-  ~TextLayoutManager();
+  TextLayoutManager(const ContextContainer::Shared &contextContainer);
+
+  /*
+   * Not copyable.
+   */
+  TextLayoutManager(TextLayoutManager const &) = delete;
+  TextLayoutManager &operator=(TextLayoutManager const &) = delete;
+
+  /*
+   * Not movable.
+   */
+  TextLayoutManager(TextLayoutManager &&) = delete;
+  TextLayoutManager &operator=(TextLayoutManager &&) = delete;
 
   /*
    * Measures `attributedString` using native text rendering infrastructure.

package/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.cpp

@@ -10,8 +10,6 @@
 namespace facebook {
 namespace react {
 
-TextLayoutManager::~TextLayoutManager() {}
-
 void *TextLayoutManager::getNativeTextLayoutManager() const {
   return (void *)this;
 }

package/ReactCommon/react/renderer/textlayoutmanager/platform/cxx/TextLayoutManager.h

@@ -29,7 +29,6 @@ using SharedTextLayoutManager = std::shared_ptr<const TextLayoutManager>;
 class TextLayoutManager {
  public:
   TextLayoutManager(const ContextContainer::Shared &contextContainer) {}
-  ~TextLayoutManager();
 
   /*
    * Measures `attributedStringBox` using native text rendering infrastructure.

package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTAttributedTextUtils.mm

@@ -62,13 +62,13 @@ inline static UIFont *RCTEffectiveFontFromTextAttributes(const TextAttributes &t
   RCTFontProperties fontProperties;
   fontProperties.family = fontFamily;
   fontProperties.size = textAttributes.fontSize;
-  fontProperties.style = textAttributes.fontStyle.hasValue()
+  fontProperties.style = textAttributes.fontStyle.has_value()
       ? RCTFontStyleFromFontStyle(textAttributes.fontStyle.value())
       : RCTFontStyleUndefined;
-  fontProperties.variant = textAttributes.fontVariant.hasValue()
+  fontProperties.variant = textAttributes.fontVariant.has_value()
       ? RCTFontVariantFromFontVariant(textAttributes.fontVariant.value())
       : RCTFontVariantUndefined;
-  fontProperties.weight = textAttributes.fontWeight.hasValue()
+  fontProperties.weight = textAttributes.fontWeight.has_value()
       ? RCTUIFontWeightFromInteger((NSInteger)textAttributes.fontWeight.value())
       : NAN;
   fontProperties.sizeMultiplier = textAttributes.fontSizeMultiplier;
@@ -136,7 +136,7 @@ NSDictionary<NSAttributedStringKey, id> *RCTNSTextAttributesFromTextAttributes(T
   // Paragraph Style
   NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
   BOOL isParagraphStyleUsed = NO;
-  if (textAttributes.alignment.hasValue()) {
+  if (textAttributes.alignment.has_value()) {
     TextAlignment textAlignment = textAttributes.alignment.value_or(TextAlignment::Natural);
     if (textAttributes.layoutDirection.value_or(LayoutDirection::LeftToRight) == LayoutDirection::RightToLeft) {
       if (textAlignment == TextAlignment::Right) {
@@ -150,7 +150,7 @@ NSDictionary<NSAttributedStringKey, id> *RCTNSTextAttributesFromTextAttributes(T
     isParagraphStyleUsed = YES;
   }
 
-  if (textAttributes.baseWritingDirection.hasValue()) {
+  if (textAttributes.baseWritingDirection.has_value()) {
     paragraphStyle.baseWritingDirection =
         RCTNSWritingDirectionFromWritingDirection(textAttributes.baseWritingDirection.value());
     isParagraphStyleUsed = YES;
@@ -198,7 +198,7 @@ NSDictionary<NSAttributedStringKey, id> *RCTNSTextAttributesFromTextAttributes(T
   }
 
   // Shadow
-  if (textAttributes.textShadowOffset.hasValue()) {
+  if (textAttributes.textShadowOffset.has_value()) {
     auto textShadowOffset = textAttributes.textShadowOffset.value();
     NSShadow *shadow = [NSShadow new];
     shadow.shadowOffset = CGSize{textShadowOffset.width, textShadowOffset.height};
@@ -212,7 +212,7 @@ NSDictionary<NSAttributedStringKey, id> *RCTNSTextAttributesFromTextAttributes(T
     attributes[RCTAttributedStringIsHighlightedAttributeName] = @YES;
   }
 
-  if (textAttributes.accessibilityRole.hasValue()) {
+  if (textAttributes.accessibilityRole.has_value()) {
     auto accessibilityRole = textAttributes.accessibilityRole.value();
     switch (accessibilityRole) {
       case AccessibilityRole::None:
@@ -334,7 +334,7 @@ NSAttributedString *RCTNSAttributedStringFromAttributedString(const AttributedSt
     } else {
       NSString *string = [NSString stringWithCString:fragment.string.c_str() encoding:NSUTF8StringEncoding];
 
-      if (fragment.textAttributes.textTransform.hasValue()) {
+      if (fragment.textAttributes.textTransform.has_value()) {
         auto textTransform = fragment.textAttributes.textTransform.value();
         string = RCTNSStringFromStringApplyingTextTransform(string, textTransform);
       }
@@ -378,6 +378,23 @@ AttributedStringBox RCTAttributedStringBoxFromNSAttributedString(NSAttributedStr
   return nsAttributedString.length ? AttributedStringBox{wrapManagedObject(nsAttributedString)} : AttributedStringBox{};
 }
 
+static NSString *capitalizeText(NSString *text)
+{
+  NSArray *words = [text componentsSeparatedByString:@" "];
+  NSMutableArray *newWords = [NSMutableArray new];
+  NSNumberFormatter *num = [NSNumberFormatter new];
+  for (NSString *item in words) {
+    NSString *word;
+    if ([item length] > 0 && [num numberFromString:[item substringWithRange:NSMakeRange(0, 1)]] == nil) {
+      word = [item capitalizedString];
+    } else {
+      word = [item lowercaseString];
+    }
+    [newWords addObject:word];
+  }
+  return [newWords componentsJoinedByString:@" "];
+}
+
 NSString *RCTNSStringFromStringApplyingTextTransform(NSString *string, TextTransform textTransform)
 {
   switch (textTransform) {
@@ -386,7 +403,7 @@ NSString *RCTNSStringFromStringApplyingTextTransform(NSString *string, TextTrans
     case TextTransform::Lowercase:
       return [string lowercaseString];
     case TextTransform::Capitalize:
-      return [string capitalizedString];
+      return capitalizeText(string);
     default:
       return string;
   }

package/ReactCommon/react/renderer/uimanager/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_render_uimanager
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../../
@@ -23,8 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libjsi \
   libreact_debug \
   libreact_render_componentregistry \

package/ReactCommon/react/renderer/uimanager/BUCK

@@ -34,7 +34,10 @@ rn_xplat_cxx_library(
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

package/ReactCommon/react/renderer/uimanager/CMakeLists.txt

@@ -0,0 +1,32 @@
+# 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.
+
+cmake_minimum_required(VERSION 3.13)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+add_compile_options(-fexceptions -frtti -std=c++17 -Wall -DLOG_TAG=\"Fabric\")
+
+file(GLOB react_render_uimanager_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(react_render_uimanager SHARED ${react_render_uimanager_SRC})
+
+target_include_directories(react_render_uimanager PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(react_render_uimanager
+        glog
+        folly_runtime
+        jsi
+        react_debug
+        react_render_componentregistry
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        react_render_leakchecker
+        react_render_runtimescheduler
+        react_render_mounting
+        react_config
+        rrc_root
+        rrc_view
+        runtimeexecutor
+)

package/ReactCommon/react/renderer/uimanager/UIManager.cpp

@@ -101,28 +101,27 @@ SharedShadowNode UIManager::createNode(
 }
 
 SharedShadowNode UIManager::cloneNode(
-    const ShadowNode::Shared &shadowNode,
-    const SharedShadowNodeSharedList &children,
-    const RawProps *rawProps) const {
+    ShadowNode const &shadowNode,
+    SharedShadowNodeSharedList const &children,
+    RawProps const *rawProps) const {
   SystraceSection s("UIManager::cloneNode");
 
   PropsParserContext propsParserContext{
-      shadowNode->getFamily().getSurfaceId(), *contextContainer_.get()};
+      shadowNode.getFamily().getSurfaceId(), *contextContainer_.get()};
 
-  auto &componentDescriptor = shadowNode->getComponentDescriptor();
+  auto &componentDescriptor = shadowNode.getComponentDescriptor();
   auto clonedShadowNode = componentDescriptor.cloneShadowNode(
-      *shadowNode,
+      shadowNode,
       {
           /* .props = */
           rawProps ? componentDescriptor.cloneProps(
-                         propsParserContext, shadowNode->getProps(), *rawProps)
+                         propsParserContext, shadowNode.getProps(), *rawProps)
                    : ShadowNodeFragment::propsPlaceholder(),
           /* .children = */ children,
       });
 
   if (delegate_) {
-    delegate_->uiManagerDidCloneShadowNode(
-        *shadowNode.get(), *clonedShadowNode);
+    delegate_->uiManagerDidCloneShadowNode(shadowNode, *clonedShadowNode);
   }
 
   return clonedShadowNode;

package/ReactCommon/react/renderer/uimanager/UIManager.h

@@ -111,14 +111,6 @@ class UIManager final : public ShadowTreeDelegate {
       RootShadowNode::Shared const &oldRootShadowNode,
       RootShadowNode::Unshared const &newRootShadowNode) const override;
 
- private:
-  friend class UIManagerBinding;
-  friend class Scheduler;
-  friend class SurfaceHandler;
-
-  // `TimelineController` needs to call private `getShadowTreeRegistry()`.
-  friend class TimelineController;
-
   ShadowNode::Shared createNode(
       Tag tag,
       std::string const &componentName,
@@ -127,9 +119,9 @@ class UIManager final : public ShadowTreeDelegate {
       SharedEventTarget eventTarget) const;
 
   ShadowNode::Shared cloneNode(
-      const ShadowNode::Shared &shadowNode,
-      const SharedShadowNodeSharedList &children = nullptr,
-      const RawProps *rawProps = nullptr) const;
+      ShadowNode const &shadowNode,
+      SharedShadowNodeSharedList const &children = nullptr,
+      RawProps const *rawProps = nullptr) const;
 
   void appendChild(
       const ShadowNode::Shared &parentShadowNode,
@@ -174,6 +166,13 @@ class UIManager final : public ShadowTreeDelegate {
       const ShadowNode::Shared &shadowNode,
       std::string const &eventType);
 
+  ShadowTreeRegistry const &getShadowTreeRegistry() const;
+
+ private:
+  friend class UIManagerBinding;
+  friend class Scheduler;
+  friend class SurfaceHandler;
+
   /**
    * Configure a LayoutAnimation to happen on the next commit.
    * This API configures a global LayoutAnimation starting from the root node.
@@ -184,8 +183,6 @@ class UIManager final : public ShadowTreeDelegate {
       jsi::Value const &successCallback,
       jsi::Value const &failureCallback) const;
 
-  ShadowTreeRegistry const &getShadowTreeRegistry() const;
-
   SharedComponentDescriptorRegistry componentDescriptorRegistry_;
   UIManagerDelegate *delegate_;
   UIManagerAnimationDelegate *animationDelegate_{nullptr};

package/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp

@@ -98,7 +98,7 @@ void UIManagerBinding::dispatchEvent(
     std::string const &type,
     ReactEventPriority priority,
     ValueFactory const &payloadFactory) const {
-  SystraceSection s("UIManagerBinding::dispatchEvent");
+  SystraceSection s("UIManagerBinding::dispatchEvent", "type", type);
 
   auto payload = payloadFactory(runtime);
 
@@ -220,7 +220,8 @@ jsi::Value UIManagerBinding::get(
             size_t count) noexcept -> jsi::Value {
           return valueFromShadowNode(
               runtime,
-              uiManager->cloneNode(shadowNodeFromValue(runtime, arguments[0])));
+              uiManager->cloneNode(
+                  *shadowNodeFromValue(runtime, arguments[0])));
         });
   }
 
@@ -287,7 +288,7 @@ jsi::Value UIManagerBinding::get(
           return valueFromShadowNode(
               runtime,
               uiManager->cloneNode(
-                  shadowNodeFromValue(runtime, arguments[0]),
+                  *shadowNodeFromValue(runtime, arguments[0]),
                   ShadowNode::emptySharedShadowNodeSharedList()));
         });
   }
@@ -307,7 +308,7 @@ jsi::Value UIManagerBinding::get(
           return valueFromShadowNode(
               runtime,
               uiManager->cloneNode(
-                  shadowNodeFromValue(runtime, arguments[0]),
+                  *shadowNodeFromValue(runtime, arguments[0]),
                   nullptr,
                   &rawProps));
         });
@@ -328,7 +329,7 @@ jsi::Value UIManagerBinding::get(
           return valueFromShadowNode(
               runtime,
               uiManager->cloneNode(
-                  shadowNodeFromValue(runtime, arguments[0]),
+                  *shadowNodeFromValue(runtime, arguments[0]),
                   ShadowNode::emptySharedShadowNodeSharedList(),
                   &rawProps));
         });

package/ReactCommon/react/test_utils/BUCK

@@ -31,7 +31,10 @@ rn_xplat_cxx_library(
     fbobjc_frameworks = ["Foundation"],
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
     force_static = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     macosx_tests_override = [],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [

package/ReactCommon/react/test_utils/MockSurfaceHandler.h

@@ -18,8 +18,8 @@ class MockSurfaceHandler : public SurfaceHandler {
  public:
   MockSurfaceHandler() : SurfaceHandler("moduleName", 0){};
 
-  MOCK_QUALIFIED_METHOD1(setDisplayMode, const noexcept, void(DisplayMode));
-  MOCK_QUALIFIED_METHOD0(getSurfaceId, const noexcept, SurfaceId());
+  MOCK_METHOD(void, setDisplayMode, (DisplayMode), (const, noexcept));
+  MOCK_METHOD(SurfaceId, getSurfaceId, (), (const, noexcept));
 };
 
 } // namespace react

package/ReactCommon/react/utils/Android.mk

@@ -10,6 +10,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := react_utils
 
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_SRC_FILES := $(subst $(LOCAL_PATH)/,,$(LOCAL_SRC_FILES))
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../../
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../../
@@ -23,12 +24,10 @@ LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := \
   libglog \
   libglog_init \
-  libreact_debug \
-  libreact_render_mapbuffer
+  libreact_debug
 
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,react/debug)
 $(call import-module,fbgloginit)
 $(call import-module,glog)
-$(call import-module,react/renderer/mapbuffer)