react-native 0.68.2 → 0.69.0-rc.2

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/BUCK

@@ -30,7 +30,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",
+    ],
     platforms = APPLE,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.mm

@@ -7,6 +7,7 @@
 
 #include "LegacyViewManagerInteropComponentDescriptor.h"
 #include <React/RCTBridge.h>
+#include <React/RCTBridgeModuleDecorator.h>
 #include <React/RCTComponentData.h>
 #include <React/RCTEventDispatcher.h>
 #include <React/RCTModuleData.h>
@@ -43,6 +44,11 @@ static std::string moduleNameFromComponentName(const std::string &componentName)
     return componentName + "Manager";
   }
 
+  std::string rnPrefix("RN");
+  if (std::mismatch(rnPrefix.begin(), rnPrefix.end(), componentName.begin()).first == rnPrefix.end()) {
+    return componentName + "Manager";
+  }
+
   return "RCT" + componentName + "Manager";
 }
 
@@ -71,11 +77,19 @@ static std::shared_ptr<void> const constructCoordinator(
     eventDispatcher = unwrapManagedObject(optionalEventDispatcher.value());
   }
 
+  auto optionalModuleDecorator = contextContainer->find<std::shared_ptr<void>>("RCTBridgeModuleDecorator");
+  RCTBridgeModuleDecorator *bridgeModuleDecorator;
+  if (optionalModuleDecorator) {
+    bridgeModuleDecorator = unwrapManagedObject(optionalModuleDecorator.value());
+  }
+
   RCTComponentData *componentData = [[RCTComponentData alloc] initWithManagerClass:module
                                                                             bridge:bridge
                                                                    eventDispatcher:eventDispatcher];
-  return wrapManagedObject([[RCTLegacyViewManagerInteropCoordinator alloc] initWithComponentData:componentData
-                                                                                          bridge:bridge]);
+  return wrapManagedObject([[RCTLegacyViewManagerInteropCoordinator alloc]
+      initWithComponentData:componentData
+                     bridge:bridge
+      bridgelessInteropData:bridgeModuleDecorator]);
 }
 
 LegacyViewManagerInteropComponentDescriptor::LegacyViewManagerInteropComponentDescriptor(

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.h

@@ -6,6 +6,7 @@
  */
 
 #import <Foundation/Foundation.h>
+#import <React/RCTBridgeModuleDecorator.h>
 #import <UIKit/UIKit.h>
 #include <folly/dynamic.h>
 
@@ -18,7 +19,9 @@ typedef void (^InterceptorBlock)(std::string eventName, folly::dynamic event);
 
 @interface RCTLegacyViewManagerInteropCoordinator : NSObject
 
-- (instancetype)initWithComponentData:(RCTComponentData *)componentData bridge:(RCTBridge *)bridge;
+- (instancetype)initWithComponentData:(RCTComponentData *)componentData
+                               bridge:(RCTBridge *)bridge
+                bridgelessInteropData:(RCTBridgeModuleDecorator *)bridgelessInteropData;
 
 - (UIView *)createPaperViewWithTag:(NSInteger)tag;
 

package/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm

@@ -16,7 +16,6 @@
 #include <React/RCTUIManager.h>
 #include <React/RCTUIManagerUtils.h>
 #include <React/RCTUtils.h>
-#include <React/RCTWeakViewHolder.h>
 #include <folly/json.h>
 #include <objc/runtime.h>
 
@@ -25,6 +24,7 @@ using namespace facebook::react;
 @implementation RCTLegacyViewManagerInteropCoordinator {
   RCTComponentData *_componentData;
   __weak RCTBridge *_bridge;
+  __weak RCTBridgeModuleDecorator *_bridgelessInteropData;
   /*
    Each instance of `RCTLegacyViewManagerInteropComponentView` registers a block to which events are dispatched.
    This is the container that maps unretained UIView pointer to a block to which the event is dispatched.
@@ -39,11 +39,20 @@ using namespace facebook::react;
   NSMutableDictionary<NSString *, id<RCTBridgeMethod>> *_moduleMethodsByName;
 }
 
-- (instancetype)initWithComponentData:(RCTComponentData *)componentData bridge:(RCTBridge *)bridge
+- (instancetype)initWithComponentData:(RCTComponentData *)componentData
+                               bridge:(RCTBridge *)bridge
+                bridgelessInteropData:(RCTBridgeModuleDecorator *)bridgelessInteropData;
 {
   if (self = [super init]) {
     _componentData = componentData;
     _bridge = bridge;
+    _bridgelessInteropData = bridgelessInteropData;
+    if (bridgelessInteropData) {
+      //  During bridge mode, RCTBridgeModules will be decorated with these APIs by the bridge.
+      RCTAssert(
+          _bridge == nil,
+          @"RCTLegacyViewManagerInteropCoordinator should not be intialized with RCTBridgeModuleDecorator in bridge mode.");
+    }
 
     _eventInterceptors = [NSMutableDictionary new];
 
@@ -74,20 +83,16 @@ using namespace facebook::react;
 - (UIView *)createPaperViewWithTag:(NSInteger)tag;
 {
   UIView *view = [_componentData createViewWithTag:[NSNumber numberWithInteger:tag] rootTag:NULL];
-  if ([_componentData.bridgelessViewManager conformsToProtocol:@protocol(RCTWeakViewHolder)]) {
-    id<RCTWeakViewHolder> weakViewHolder = (id<RCTWeakViewHolder>)_componentData.bridgelessViewManager;
-    if (!weakViewHolder.weakViews) {
-      weakViewHolder.weakViews = [NSMapTable strongToWeakObjectsMapTable];
-    }
-    [weakViewHolder.weakViews setObject:view forKey:[NSNumber numberWithInteger:tag]];
-  }
+  [_bridgelessInteropData attachInteropAPIsToModule:(id<RCTBridgeModule>)_componentData.bridgelessViewManager];
   return view;
 }
 
 - (void)setProps:(folly::dynamic const &)props forView:(UIView *)view
 {
-  NSDictionary<NSString *, id> *convertedProps = convertFollyDynamicToId(props);
-  [_componentData setProps:convertedProps forView:view];
+  if (props.isObject()) {
+    NSDictionary<NSString *, id> *convertedProps = convertFollyDynamicToId(props);
+    [_componentData setProps:convertedProps forView:view];
+  }
 }
 
 - (NSString *)componentViewName

package/ReactCommon/react/renderer/components/modal/Android.mk

@@ -24,7 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_codegen_rncore \
   libreact_render_componentregistry \

package/ReactCommon/react/renderer/components/modal/BUCK

@@ -57,7 +57,10 @@ rn_xplat_cxx_library(
         ],
         prefix = "react/renderer/components/modal",
     ),
-    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/components/modal/CMakeLists.txt

@@ -0,0 +1,31 @@
+# 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 rrc_modal_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(rrc_modal STATIC ${rrc_modal_SRC})
+
+target_include_directories(rrc_modal PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(rrc_modal
+        glog
+        folly_runtime
+        glog_init
+        react_codegen_rncore
+        react_render_componentregistry
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        react_render_imagemanager
+        react_render_mapbuffer
+        react_render_uimanager
+        rrc_image
+        rrc_view
+        yoga
+)

package/ReactCommon/react/renderer/components/modal/ModalHostViewComponentDescriptor.h

@@ -15,7 +15,7 @@ namespace facebook {
 namespace react {
 
 /*
- * Descriptor for <BottomSheet> component.
+ * Descriptor for <ModalHostView> component.
  */
 
 class ModalHostViewComponentDescriptor final

package/ReactCommon/react/renderer/components/modal/ModalHostViewShadowNode.h

@@ -18,7 +18,7 @@ namespace react {
 extern const char ModalHostViewComponentName[];
 
 /*
- * `ShadowNode` for <Slider> component.
+ * `ShadowNode` for <ModalHostView> component.
  */
 class ModalHostViewShadowNode final : public ConcreteViewShadowNode<
                                           ModalHostViewComponentName,

package/ReactCommon/react/renderer/components/modal/ModalHostViewState.h

@@ -21,7 +21,7 @@ namespace facebook {
 namespace react {
 
 /*
- * State for <BottomSheetView> component.
+ * State for <ModalHostView> component.
  */
 class ModalHostViewState final {
  public:

package/ReactCommon/react/renderer/components/progressbar/Android.mk

@@ -25,8 +25,7 @@ LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := \
   glog \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_codegen_rncore \
   libreact_debug \

package/ReactCommon/react/renderer/components/progressbar/BUCK

@@ -65,7 +65,10 @@ rn_xplat_cxx_library(
     ios_srcs = glob(
         ["platform/ios/*.cpp"],
     ),
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",

package/ReactCommon/react/renderer/components/progressbar/CMakeLists.txt

@@ -0,0 +1,34 @@
+# 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 rrc_progressbar_SRC CONFIGURE_DEPENDS android/react/renderer/components/progressbar/*.cpp)
+add_library(rrc_progressbar STATIC ${rrc_progressbar_SRC})
+
+target_include_directories(rrc_progressbar
+        PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}/android/
+)
+
+target_link_libraries(rrc_progressbar
+        glog
+        fbjni
+        folly_runtime
+        glog_init
+        react_codegen_rncore
+        react_debug
+        react_render_componentregistry
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        react_render_uimanager
+        reactnativeutilsjni
+        rrc_view
+        yoga
+)

package/ReactCommon/react/renderer/components/progressbar/android/react/renderer/components/progressbar/conversions.h

@@ -20,7 +20,7 @@ inline folly::dynamic toDynamic(AndroidProgressBarProps const &props) {
   serializedProps["indeterminate"] = props.indeterminate;
   serializedProps["progress"] = props.progress;
   serializedProps["animating"] = props.animating;
-  serializedProps["color"] = toDynamic(props.color);
+  serializedProps["color"] = toAndroidRepr(props.color);
   serializedProps["testID"] = props.testID;
   return serializedProps;
 }

package/ReactCommon/react/renderer/components/root/Android.mk

@@ -24,8 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_debug \
   libreact_render_core \

package/ReactCommon/react/renderer/components/root/BUCK

@@ -31,7 +31,10 @@ rn_xplat_cxx_library(
     ),
     fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
     fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
-    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/components/root/CMakeLists.txt

@@ -0,0 +1,26 @@
+# 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 rrc_root_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(rrc_root SHARED ${rrc_root_SRC})
+
+target_include_directories(rrc_root PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(rrc_root
+        folly_runtime
+        glog
+        glog_init
+        react_debug
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        rrc_view
+        yoga
+)

package/ReactCommon/react/renderer/components/safeareaview/BUCK

@@ -27,7 +27,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",
+    ],
     platforms = APPLE,
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",

package/ReactCommon/react/renderer/components/scrollview/Android.mk

@@ -24,8 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \

package/ReactCommon/react/renderer/components/scrollview/BUCK

@@ -38,7 +38,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/components/scrollview/CMakeLists.txt

@@ -0,0 +1,28 @@
+# 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 rrc_scrollview_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(rrc_scrollview SHARED ${rrc_scrollview_SRC})
+
+target_include_directories(rrc_scrollview PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(rrc_scrollview
+        glog
+        folly_runtime
+        glog_init
+        jsi
+        react_debug
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        react_render_mapbuffer
+        rrc_view
+        yoga
+)

package/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.cpp

@@ -86,11 +86,11 @@ void ScrollViewEventEmitter::onMomentumScrollEnd(
 }
 
 void ScrollViewEventEmitter::dispatchScrollViewEvent(
-    const std::string &name,
+    std::string name,
     const ScrollViewMetrics &scrollViewMetrics,
     EventPriority priority) const {
   dispatchEvent(
-      name,
+      std::move(name),
       [scrollViewMetrics](jsi::Runtime &runtime) {
         return scrollViewMetricsPayload(runtime, scrollViewMetrics);
       },

package/ReactCommon/react/renderer/components/scrollview/ScrollViewEventEmitter.h

@@ -38,7 +38,7 @@ class ScrollViewEventEmitter : public ViewEventEmitter {
 
  private:
   void dispatchScrollViewEvent(
-      const std::string &name,
+      std::string name,
       const ScrollViewMetrics &scrollViewMetrics,
       EventPriority priority = EventPriority::AsynchronousBatched) const;
 };

package/ReactCommon/react/renderer/components/slider/Android.mk

@@ -25,8 +25,7 @@ LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := \
   glog \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_codegen_rncore \
   libreact_debug \

package/ReactCommon/react/renderer/components/slider/BUCK

@@ -67,7 +67,10 @@ rn_xplat_cxx_library(
     ios_srcs = glob(
         ["platform/ios/*.cpp"],
     ),
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",

package/ReactCommon/react/renderer/components/slider/CMakeLists.txt

@@ -0,0 +1,38 @@
+# 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 rrc_slider_SRC CONFIGURE_DEPENDS *.cpp platform/android/react/renderer/components/slider/*.cpp)
+add_library(rrc_slider STATIC ${rrc_slider_SRC})
+
+target_include_directories(rrc_slider
+        PUBLIC
+        ${REACT_COMMON_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/platform/android/
+)
+
+target_link_libraries(rrc_slider
+        glog
+        fbjni
+        folly_runtime
+        glog_init
+        react_codegen_rncore
+        react_debug
+        react_render_componentregistry
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        react_render_imagemanager
+        react_render_mapbuffer
+        react_render_uimanager
+        reactnativeutilsjni
+        rrc_image
+        rrc_view
+        yoga
+)

package/ReactCommon/react/renderer/components/switch/Android.mk

@@ -25,8 +25,7 @@ LOCAL_STATIC_LIBRARIES :=
 LOCAL_SHARED_LIBRARIES := \
   glog \
   libfbjni \
-  libfolly_futures \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libreact_codegen_rncore \
   libreact_debug \

package/ReactCommon/react/renderer/components/switch/BUCK

@@ -41,7 +41,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",
+    ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",

package/ReactCommon/react/renderer/components/switch/CMakeLists.txt

@@ -0,0 +1,44 @@
+# 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)
+
+file(GLOB rrc_switch_SRCS CONFIGURE_DEPENDS androidswitch/react/renderer/components/androidswitch/*.cpp)
+
+add_library(
+        rrc_switch
+        STATIC
+        ${rrc_switch_SRCS}
+)
+
+target_include_directories(rrc_switch PUBLIC androidswitch/)
+
+target_link_libraries(
+        rrc_switch
+        glog
+        fbjni
+        folly_runtime
+        glog_init
+        react_codegen_rncore
+        react_debug
+        react_render_componentregistry
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        react_render_uimanager
+        reactnativeutilsjni
+        rrc_view
+        yoga
+)
+
+target_compile_options(
+        rrc_switch
+        PRIVATE
+        -DLOG_TAG=\"Fabric\"
+        -fexceptions
+        -frtti
+        -std=c++17
+        -Wall
+)

package/ReactCommon/react/renderer/components/text/Android.mk

@@ -24,7 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \

package/ReactCommon/react/renderer/components/text/BUCK

@@ -43,7 +43,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",
+    ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",

package/ReactCommon/react/renderer/components/text/CMakeLists.txt

@@ -0,0 +1,33 @@
+# 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 rrc_text_SRC CONFIGURE_DEPENDS *.cpp)
+add_library(rrc_text SHARED ${rrc_text_SRC})
+
+target_include_directories(rrc_text PUBLIC ${REACT_COMMON_DIR})
+
+target_link_libraries(rrc_text
+        glog
+        folly_runtime
+        glog_init
+        jsi
+        react_debug
+        react_render_attributedstring
+        react_render_core
+        react_render_debug
+        react_render_graphics
+        react_render_mapbuffer
+        react_render_mounting
+        react_render_textlayoutmanager
+        react_render_uimanager
+        react_utils
+        rrc_view
+        yoga
+)

package/ReactCommon/react/renderer/components/text/ParagraphShadowNode.h

@@ -102,7 +102,7 @@ class ParagraphShadowNode final : public ConcreteViewShadowNode<
   /*
    * Cached content of the subtree started from the node.
    */
-  mutable butter::optional<Content> content_{};
+  mutable std::optional<Content> content_{};
 };
 
 } // namespace react

package/ReactCommon/react/renderer/components/textinput/Android.mk

@@ -24,7 +24,7 @@ LOCAL_STATIC_LIBRARIES :=
 
 LOCAL_SHARED_LIBRARIES := \
   glog \
-  libfolly_json \
+  libfolly_runtime \
   libglog_init \
   libjsi \
   libreact_debug \

package/ReactCommon/react/renderer/components/textinput/BUCK

@@ -40,7 +40,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",
+    ],
     platforms = (ANDROID, APPLE, CXX),
     preprocessor_flags = [
         "-DLOG_TAG=\"ReactNative\"",