react-native-reanimated 2.8.0 → 3.0.0-rc.0

package/Common/cpp/headers/SharedItems/ValueWrapper.h

@@ -1,6 +1,9 @@
 #pragma once
 
 #include <jsi/jsi.h>
+#ifdef RCT_NEW_ARCH_ENABLED
+#include <react/renderer/core/ShadowNode.h>
+#endif
 #include <memory>
 #include <string>
 #include <vector>
@@ -9,6 +12,8 @@
 #include "SharedParent.h"
 #include "WorkletsCache.h"
 
+using namespace facebook::react;
+
 namespace reanimated {
 
 class HostFunctionWrapper;
@@ -42,6 +47,10 @@ class ValueWrapper {
       const std::unique_ptr<ValueWrapper> &valueContainer);
   static inline const std::shared_ptr<MutableValue> &asMutableValue(
       const std::unique_ptr<ValueWrapper> &valueContainer);
+#ifdef RCT_NEW_ARCH_ENABLED
+  static inline const ShadowNode::Shared &asShadowNode(
+      const std::unique_ptr<ValueWrapper> &valueContainer);
+#endif
 
   static const HostFunctionWrapper *asHostFunctionWrapper(
       const std::unique_ptr<ValueWrapper> &valueContainer);
@@ -109,6 +118,15 @@ class MutableValueWrapper : public ValueWrapper {
   std::shared_ptr<MutableValue> value;
 };
 
+#ifdef RCT_NEW_ARCH_ENABLED
+class ShadowNodeValueWrapper : public ValueWrapper {
+ public:
+  explicit ShadowNodeValueWrapper(const ShadowNode::Shared &_value)
+      : ValueWrapper(ValueType::ShadowNodeType), value(_value) {}
+  ShadowNode::Shared value;
+};
+#endif
+
 inline bool ValueWrapper::asBoolean(
     const std::unique_ptr<ValueWrapper> &valueContainer) {
   return static_cast<BooleanValueWrapper *>(valueContainer.get())->value;
@@ -150,6 +168,13 @@ inline const std::shared_ptr<MutableValue> &ValueWrapper::asMutableValue(
   return static_cast<MutableValueWrapper *>(valueContainer.get())->value;
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+inline const ShadowNode::Shared &ValueWrapper::asShadowNode(
+    const std::unique_ptr<ValueWrapper> &valueContainer) {
+  return static_cast<ShadowNodeValueWrapper *>(valueContainer.get())->value;
+}
+#endif
+
 inline const HostFunctionWrapper *ValueWrapper::asHostFunctionWrapper(
     const std::unique_ptr<ValueWrapper> &valueContainer) {
   return static_cast<HostFunctionWrapper *>(valueContainer.get());

package/Common/cpp/headers/SpecTools/ErrorHandler.h

@@ -2,7 +2,12 @@
 
 #include <memory>
 #include <string>
+
+#ifdef __APPLE__
+#include "RNReanimated/Scheduler.h"
+#else
 #include "Scheduler.h"
+#endif
 
 namespace reanimated {
 

package/Common/cpp/headers/Tools/Mapper.h

@@ -29,7 +29,7 @@ class Mapper : public std::enable_shared_from_this<Mapper> {
   std::vector<std::shared_ptr<MutableValue>> outputs;
   bool dirty = true;
   std::shared_ptr<jsi::Function> userUpdater;
-  UpdaterFunction *updateProps;
+  UpdatePropsFunction updateProps;
   int optimalizationLvl = 0;
   std::shared_ptr<ShareableValue> viewDescriptors;
 

package/Common/cpp/headers/Tools/PlatformDepMethodsHolder.h

@@ -1,25 +1,56 @@
 #pragma once
 
 #include <jsi/jsi.h>
-#include <stdio.h>
+
+#ifdef RCT_NEW_ARCH_ENABLED
+#include <react/renderer/core/ReactPrimitives.h>
+#endif
+
 #include <string>
 #include <utility>
 #include <vector>
 
 using namespace facebook;
 
+#ifdef RCT_NEW_ARCH_ENABLED
+using namespace react;
+#endif
+
 namespace reanimated {
 
-using UpdaterFunction = std::function<void(
+#ifdef RCT_NEW_ARCH_ENABLED
+
+using SynchronouslyUpdateUIPropsFunction =
+    std::function<void(jsi::Runtime &rt, Tag tag, const jsi::Value &props)>;
+using UpdatePropsFunction = std::function<void(
+    jsi::Runtime &rt,
+    const jsi::Value &shadowNodeValue,
+    const jsi::Value &props)>;
+using RemoveShadowNodeFromRegistryFunction =
+    std::function<void(jsi::Runtime &rt, const jsi::Value &shadowNodeValue)>;
+using DispatchCommandFunction = std::function<void(
+    jsi::Runtime &rt,
+    const jsi::Value &shadowNodeValue,
+    const jsi::Value &commandNameValue,
+    const jsi::Value &argsValue)>;
+using MeasureFunction = std::function<
+    jsi::Value(jsi::Runtime &rt, const jsi::Value &shadowNodeValue)>;
+
+#else
+
+using UpdatePropsFunction = std::function<void(
     jsi::Runtime &rt,
     int viewTag,
     const jsi::Value &viewName,
     const jsi::Object &object)>;
-using RequestRender =
-    std::function<void(std::function<void(double)>, jsi::Runtime &rt)>;
 using ScrollToFunction = std::function<void(int, double, double, bool)>;
-using MeasuringFunction =
+using MeasureFunction =
     std::function<std::vector<std::pair<std::string, double>>(int)>;
+
+#endif // RCT_NEW_ARCH_ENABLED
+
+using RequestRender =
+    std::function<void(std::function<void(double)>, jsi::Runtime &rt)>;
 using TimeProviderFunction = std::function<double(void)>;
 
 using RegisterSensorFunction =
@@ -33,14 +64,18 @@ using ConfigurePropsFunction = std::function<void(
 
 struct PlatformDepMethodsHolder {
   RequestRender requestRender;
-  UpdaterFunction updaterFunction;
+#ifdef RCT_NEW_ARCH_ENABLED
+  SynchronouslyUpdateUIPropsFunction synchronouslyUpdateUIPropsFunction;
+#else
+  UpdatePropsFunction updatePropsFunction;
   ScrollToFunction scrollToFunction;
-  MeasuringFunction measuringFunction;
+  MeasureFunction measureFunction;
+  ConfigurePropsFunction configurePropsFunction;
+#endif
   TimeProviderFunction getCurrentTime;
   RegisterSensorFunction registerSensor;
   UnregisterSensorFunction unregisterSensor;
   SetGestureStateFunction setGestureStateFunction;
-  ConfigurePropsFunction configurePropsFunction;
 };
 
 } // namespace reanimated

package/Common/cpp/headers/Tools/RuntimeDecorator.h

@@ -31,10 +31,15 @@ class RuntimeDecorator {
   static void decorateRuntime(jsi::Runtime &rt, const std::string &label);
   static void decorateUIRuntime(
       jsi::Runtime &rt,
-      const UpdaterFunction updater,
-      const RequestFrameFunction requestFrame,
+      const UpdatePropsFunction updateProps,
+      const MeasureFunction measure,
+#ifdef RCT_NEW_ARCH_ENABLED
+      const RemoveShadowNodeFromRegistryFunction removeShadowNodeFromRegistry,
+      const DispatchCommandFunction dispatchCommand,
+#else
       const ScrollToFunction scrollTo,
-      const MeasuringFunction measure,
+#endif
+      const RequestFrameFunction requestFrame,
       const TimeProviderFunction getCurrentTime,
       const RegisterSensorFunction registerSensor,
       const UnregisterSensorFunction unregisterSensor,

package/README.md

@@ -13,6 +13,10 @@ comes to gesture based interactions.
 
 Check out the [installation](https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation) section of our docs for the detailed installation instructions.
 
+## Fabric
+
+To learn how to use `react-native-reanimated` with Fabric architecture, head over to [Fabric README](README-Fabric.md). Instructions on how to run Fabric Example within this repo can be found in the [FabricExample README](FabricExample/README.md).
+
 ## Documentation
 
 Check out our dedicated documentation page for info about this library, API reference and more: [https://docs.swmansion.com/react-native-reanimated/docs/](https://docs.swmansion.com/react-native-reanimated/docs/)

package/RNReanimated.podspec

@@ -38,16 +38,21 @@ end
 
 rnVersion = reactVersion.split('.')[1]
 
+fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+
 folly_prefix = ""
 if rnVersion.to_i >= 64
   folly_prefix = "RCT-"
 end
 
-
-folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DRNVERSION=' + rnVersion
+folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DRNVERSION=' + rnVersion
 folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.04.26.00'
+folly_version = '2021.06.28.00-v2'
 boost_compiler_flags = '-Wno-documentation'
+fabric_flags = ''
+if fabric_enabled
+  fabric_flags = '-DRN_FABRIC_ENABLED -DRCT_NEW_ARCH_ENABLED'
+end
 
 Pod::Spec.new do |s|
   s.name         = "RNReanimated"
@@ -75,21 +80,29 @@ Pod::Spec.new do |s|
 
   s.pod_target_xcconfig    = {
     "USE_HEADERMAP" => "YES",
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" "
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\"",
+    "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
   }
   s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
   s.xcconfig               = {
-    "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\"",
-                               "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags  }
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\"",
+                               "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags + " " + fabric_flags }
 
   s.requires_arc = true
 
   s.dependency "React-Core"
+  if fabric_enabled
+    s.dependency "React-RCTFabric"
+    s.dependency "React-Codegen"
+    s.dependency "RCT-Folly", folly_version
+  else
+    s.dependency "#{folly_prefix}Folly"
+  end
+  s.dependency "RCTRequired"
+  s.dependency "RCTTypeSafety"
+  s.dependency "ReactCommon/turbomodule/core"
   s.dependency 'FBLazyVector'
   s.dependency 'FBReactNativeSpec'
-  s.dependency 'RCTRequired'
-  s.dependency 'RCTTypeSafety'
   s.dependency 'React-Core'
   s.dependency 'React-CoreModules'
   s.dependency 'React-Core/DevSupport'
@@ -108,7 +121,6 @@ Pod::Spec.new do |s|
   s.dependency 'React-jsi'
   s.dependency 'React-jsiexecutor'
   s.dependency 'React-jsinspector'
-  s.dependency 'ReactCommon/turbomodule/core'
   s.dependency 'Yoga'
   s.dependency 'DoubleConversion'
   s.dependency 'glog'
@@ -119,7 +131,6 @@ Pod::Spec.new do |s|
     s.dependency 'React-callinvoker'
   end
 
-  s.dependency "#{folly_prefix}Folly"
 
 end
 

package/android/CMakeLists.txt

@@ -1,8 +1,14 @@
 cmake_minimum_required(VERSION 3.5.1)
 
 set (CMAKE_VERBOSE_MAKEFILE ON)
-set (CMAKE_CXX_STANDARD 14)
-set (CMAKE_CXX_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DON_ANDROID -DONANDROID -DFOR_HERMES=${FOR_HERMES} -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare")
+set (CMAKE_CXX_STANDARD 17)
+set (DEFAULT_FLAGS "-DFOLLY_NO_CONFIG=1 -DFOLLY_HAVE_CLOCK_GETTIME=1 -DFOLLY_HAVE_MEMRCHR=1 -DFOLLY_USE_LIBCPP=1 -DFOLLY_MOBILE=1 -DFOLLY_HAVE_RECVMMSG=1 -DFOLLY_HAVE_PTHREAD=1 -DON_ANDROID -DONANDROID -DANDROID -DFOR_HERMES=${FOR_HERMES} -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -std=c++17 -Wall")
+if(${IS_NEW_ARCHITECTURE_ENABLED})
+    set (ALL_FLAGS "${DEFAULT_FLAGS} -DRCT_NEW_ARCH_ENABLED")
+else()
+    set (ALL_FLAGS ${DEFAULT_FLAGS})
+endif()
+set (CMAKE_CXX_FLAGS ${ALL_FLAGS})
 
 if(${NATIVE_DEBUG})
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
@@ -13,20 +19,32 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
 
 set (PACKAGE_NAME "reanimated")
+set (BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
 set (SRC_DIR ${CMAKE_SOURCE_DIR}/src)
 
 if(${CLIENT_SIDE_BUILD})
     set (NODE_MODULES_DIR "${CMAKE_SOURCE_DIR}/../../")
     set (COMMON_SRC_DIR "${CMAKE_SOURCE_DIR}/../Common")
 else()
-    set (NODE_MODULES_DIR "../node_modules")
+    set (NODE_MODULES_DIR "../${PLAYGROUND_APP_NAME}/node_modules")
     set (COMMON_SRC_DIR "${SRC_DIR}/main/Common")
 endif()
 
-set (RN_SO_DIR ${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/first-party/react/jni)
-set (FBJNI_HEADERS_DIR ${RN_SO_DIR}/../../fbjni/headers)
+if(${IS_NEW_ARCHITECTURE_ENABLED})
+    if(${CLIENT_SIDE_BUILD})
+        set (RN_SO_DIR "${CMAKE_SOURCE_DIR}/../../../android/app/build/react-ndk/exported")
+        set (FBJNI_HEADERS_DIR "${CMAKE_SOURCE_DIR}/../../react-native/ReactAndroid/src/main/jni/first-party/fbjni/headers")
+    else()
+        set (RN_SO_DIR "${CMAKE_SOURCE_DIR}/../${PLAYGROUND_APP_NAME}/android/app/build/react-ndk/exported")
+        set (FBJNI_HEADERS_DIR "${CMAKE_SOURCE_DIR}/../${PLAYGROUND_APP_NAME}/node_modules/react-native/ReactAndroid/src/main/jni/first-party/fbjni/headers")
+    endif()
+else()
+    set (RN_SO_DIR ${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/first-party/react/jni)
+    set (FBJNI_HEADERS_DIR "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni/first-party/fbjni/headers")
+endif()
 
-# reanimated shared
+file (GLOB LIBRN_DIR "${RN_SO_DIR}/${ANDROID_ABI}")
+file (GLOB HERMES_DIR "${BUILD_DIR}/third-party-ndk/hermes/jni/${ANDROID_ABI}")
 
 file(GLOB sources_tools  "${COMMON_SRC_DIR}/cpp/Tools/*.cpp")
 file(GLOB sources_native_modules  "${COMMON_SRC_DIR}/cpp/NativeModules/*.cpp")
@@ -45,6 +63,17 @@ if(${REACT_NATIVE_TARGET_VERSION} LESS 66)
         )
 endif()
 
+if(${IS_NEW_ARCHITECTURE_ENABLED})
+    set(
+        FABRIC_UTILS_CPP
+        "${COMMON_SRC_DIR}/cpp/Fabric/FabricUtils.cpp"
+    )
+    set(
+        REANIMATED_UI_MANAGER_BINDING_CPP
+        "${COMMON_SRC_DIR}/cpp/Fabric/ReanimatedUIManagerBinding.cpp"
+    )
+endif()
+
 add_library(
         ${PACKAGE_NAME}
         SHARED
@@ -63,6 +92,8 @@ add_library(
         "${COMMON_SRC_DIR}/cpp/Tools/FeaturesConfig.cpp"
         "${COMMON_SRC_DIR}/cpp/LayoutAnimations/LayoutAnimationsProxy.cpp"
         "${COMMON_SRC_DIR}/cpp/AnimatedSensor/AnimatedSensorModule.cpp"
+        ${FABRIC_UTILS_CPP}
+        ${REANIMATED_UI_MANAGER_BINDING_CPP}
 )
 
 # includes
@@ -81,11 +112,15 @@ target_include_directories(
         "${NODE_MODULES_DIR}/react-native/React/Base"
         "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/jni"
         "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni"
+        "${NODE_MODULES_DIR}/react-native/ReactAndroid/src/main/java/com/facebook/react/fabric/jni"
         "${NODE_MODULES_DIR}/react-native/ReactCommon"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/react/renderer/graphics/platform/cxx"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/runtimeexecutor"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/turbomodule/core"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/turbomodule"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/yoga"
         "${NODE_MODULES_DIR}/hermes-engine/android/include/"
         "${COMMON_SRC_DIR}/cpp/headers/Tools"
         "${COMMON_SRC_DIR}/cpp/headers/SpecTools"
@@ -94,15 +129,11 @@ target_include_directories(
         "${COMMON_SRC_DIR}/cpp/headers/Registries"
         "${COMMON_SRC_DIR}/cpp/headers/LayoutAnimations"
         "${COMMON_SRC_DIR}/cpp/headers/AnimatedSensor"
+        "${COMMON_SRC_DIR}/cpp/headers/Fabric"
         "${COMMON_SRC_DIR}/cpp/hidden_headers"
         "${SRC_DIR}/main/cpp/headers"
 )
 
-# find libraries
-
-file (GLOB LIBRN_DIR "${RN_SO_DIR}/${ANDROID_ABI}")
-file (GLOB HERMES_DIR "${BUILD_DIR}/third-party-ndk/hermes/jni/${ANDROID_ABI}")
-
 find_library(
         LOG_LIB
         log
@@ -119,26 +150,18 @@ find_library(
         PATHS ${LIBRN_DIR}
         NO_CMAKE_FIND_ROOT_PATH
 )
-find_library(
-        FOLLY_JSON_LIB
-        folly_json
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
 find_library(
         REACT_NATIVE_JNI_LIB
         reactnativejni
         PATHS ${LIBRN_DIR}
         NO_CMAKE_FIND_ROOT_PATH
 )
-
 find_library(
         GLOG_LIB
         glog
         PATHS ${LIBRN_DIR}
         NO_CMAKE_FIND_ROOT_PATH
 )
-
 find_library(
         FBJNI_LIB
         fbjni
@@ -146,15 +169,88 @@ find_library(
         NO_CMAKE_FIND_ROOT_PATH
 )
 
+if(${REACT_NATIVE_TARGET_VERSION} LESS 69)
+    find_library(
+            FOLLY_LIB
+            folly_json
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+else()
+    find_library(
+            FOLLY_LIB
+            folly_runtime
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+endif()
+
 if(${REACT_NATIVE_TARGET_VERSION} LESS 66)
-        set (JSI_LIB "")
+    set (JSI_LIB "")
 else()
-        find_library(
-                JSI_LIB
-                jsi
-                PATHS ${LIBRN_DIR}
-                NO_CMAKE_FIND_ROOT_PATH
-        )
+    find_library(
+            JSI_LIB
+            jsi
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+endif()
+
+if(${IS_NEW_ARCHITECTURE_ENABLED})
+    find_library(
+            REACT_RENDER_UIMANAGER
+            react_render_uimanager
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+    find_library(
+            REACT_RENDER_MOUNTING
+            react_render_mounting
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+    find_library(
+            REACT_RENDER_COMPONENTREGISTRY
+            react_render_componentregistry
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+    find_library(
+            REACT_RENDER_CORE
+            react_render_core
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+    find_library(
+            REACT_DEBUG
+            react_debug
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+    find_library(
+            REACT_RENDER_DEBUG
+            react_render_debug
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+    find_library(
+            RRC_ROOT
+            rrc_root
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+    find_library(
+            REACT_RENDER_SCHEDULER
+            react_render_scheduler
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
+    find_library(
+            FABRICJNI
+            fabricjni
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
 endif()
 
 # build shared lib
@@ -169,7 +265,7 @@ if(${FOR_HERMES})
             ${HERMES_LIB}
             ${GLOG_LIB}
             ${FBJNI_LIB}
-            ${FOLLY_JSON_LIB}
+            ${FOLLY_LIB}
             ${REACT_NATIVE_JNI_LIB}
             android
     )
@@ -178,6 +274,7 @@ else()
             ${PACKAGE_NAME}
             ${LOG_LIB}
             ${JSI_LIB}
+            ${FOLLY_LIB}
             ${JSEXECUTOR_LIB}
             ${GLOG_LIB}
             ${FBJNI_LIB}
@@ -187,6 +284,21 @@ else()
     )
 endif()
 
+if(${IS_NEW_ARCHITECTURE_ENABLED})
+    target_link_libraries(
+            ${PACKAGE_NAME}
+            ${REACT_RENDER_UIMANAGER}
+            ${REACT_RENDER_MOUNTING}
+            ${REACT_RENDER_COMPONENTREGISTRY}
+            ${REACT_RENDER_CORE}
+            ${REACT_DEBUG}
+            ${REACT_RENDER_DEBUG}
+            ${RRC_ROOT}
+            ${FABRICJNI}
+            ${REACT_RENDER_SCHEDULER}
+    )
+endif()
+
 if(${REACT_NATIVE_TARGET_VERSION} LESS 64)
     add_library(
             turbomodulejsijni