react-native-reanimated 2.9.1 → 2.10.0

package/Common/cpp/AnimatedSensor/AnimatedSensorModule.cpp

@@ -35,10 +35,10 @@ jsi::Value AnimatedSensorModule::registerSensor(
     setter = [&, mutableObject](double newValues[]) {
       jsi::Runtime &runtime = *runtimeManager_->runtime.get();
       jsi::Object value(runtime);
-      value.setProperty(runtime, "qw", newValues[0]);
-      value.setProperty(runtime, "qx", newValues[1]);
-      value.setProperty(runtime, "qy", newValues[2]);
-      value.setProperty(runtime, "qz", newValues[3]);
+      value.setProperty(runtime, "qx", newValues[0]);
+      value.setProperty(runtime, "qy", newValues[1]);
+      value.setProperty(runtime, "qz", newValues[2]);
+      value.setProperty(runtime, "qw", newValues[3]);
       value.setProperty(runtime, "yaw", newValues[4]);
       value.setProperty(runtime, "pitch", newValues[5]);
       value.setProperty(runtime, "roll", newValues[6]);

package/Common/cpp/NativeModules/NativeReanimatedModule.cpp

@@ -98,6 +98,10 @@ NativeReanimatedModule::NativeReanimatedModule(
     this->onRender(timestampMs);
   };
   updaterFunction = platformDepMethodsHolder.updaterFunction;
+  subscribeForKeyboardEventsFunction =
+      platformDepMethodsHolder.subscribeForKeyboardEvents;
+  unsubscribeFromKeyboardEventsFunction =
+      platformDepMethodsHolder.unsubscribeFromKeyboardEvents;
 }
 
 void NativeReanimatedModule::installCoreFunctions(
@@ -327,4 +331,38 @@ void NativeReanimatedModule::unregisterSensor(
   animatedSensorModule.unregisterSensor(sensorId);
 }
 
+jsi::Value NativeReanimatedModule::subscribeForKeyboardEvents(
+    jsi::Runtime &rt,
+    const jsi::Value &keyboardEventContainer) {
+  jsi::Object keyboardEventObj = keyboardEventContainer.getObject(rt);
+  std::unordered_map<std::string, std::shared_ptr<ShareableValue>>
+      sharedProperties;
+  std::shared_ptr<ShareableValue> keyboardStateShared = ShareableValue::adapt(
+      rt, keyboardEventObj.getProperty(rt, "state"), this);
+  std::shared_ptr<ShareableValue> heightShared = ShareableValue::adapt(
+      rt, keyboardEventObj.getProperty(rt, "height"), this);
+
+  auto keyboardEventDataUpdater =
+      [this, &rt, keyboardStateShared, heightShared](
+          int keyboardState, int height) {
+        auto &keyboardStateValue =
+            ValueWrapper::asMutableValue(keyboardStateShared->valueContainer);
+        keyboardStateValue->setValue(rt, jsi::Value(keyboardState));
+
+        auto &heightMutableValue =
+            ValueWrapper::asMutableValue(heightShared->valueContainer);
+        heightMutableValue->setValue(rt, jsi::Value(height));
+
+        this->mapperRegistry->execute(*this->runtime);
+      };
+
+  return subscribeForKeyboardEventsFunction(keyboardEventDataUpdater);
+}
+
+void NativeReanimatedModule::unsubscribeFromKeyboardEvents(
+    jsi::Runtime &rt,
+    const jsi::Value &listenerId) {
+  unsubscribeFromKeyboardEventsFunction(listenerId.asNumber());
+}
+
 } // namespace reanimated

package/Common/cpp/NativeModules/NativeReanimatedModuleSpec.cpp

@@ -138,6 +138,25 @@ static jsi::Value SPEC_PREFIX(configureProps)(
   return jsi::Value::undefined();
 }
 
+static jsi::Value SPEC_PREFIX(subscribeForKeyboardEvents)(
+    jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const jsi::Value *args,
+    size_t count) {
+  return static_cast<NativeReanimatedModuleSpec *>(&turboModule)
+      ->subscribeForKeyboardEvents(rt, std::move(args[0]));
+}
+
+static jsi::Value SPEC_PREFIX(unsubscribeFromKeyboardEvents)(
+    jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const jsi::Value *args,
+    size_t count) {
+  static_cast<NativeReanimatedModuleSpec *>(&turboModule)
+      ->unsubscribeFromKeyboardEvents(rt, std::move(args[0]));
+  return jsi::Value::undefined();
+}
+
 NativeReanimatedModuleSpec::NativeReanimatedModuleSpec(
     std::shared_ptr<CallInvoker> jsInvoker)
     : TurboModule("NativeReanimated", jsInvoker) {
@@ -163,5 +182,9 @@ NativeReanimatedModuleSpec::NativeReanimatedModuleSpec(
   methodMap_["unregisterSensor"] =
       MethodMetadata{1, SPEC_PREFIX(unregisterSensor)};
   methodMap_["configureProps"] = MethodMetadata{2, SPEC_PREFIX(configureProps)};
+  methodMap_["subscribeForKeyboardEvents"] =
+      MethodMetadata{1, SPEC_PREFIX(subscribeForKeyboardEvents)};
+  methodMap_["unsubscribeFromKeyboardEvents"] =
+      MethodMetadata{1, SPEC_PREFIX(unsubscribeFromKeyboardEvents)};
 }
 } // namespace reanimated

package/Common/cpp/headers/NativeModules/NativeReanimatedModule.h

@@ -89,6 +89,12 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec,
       const jsi::Value &interval,
       const jsi::Value &sensorDataContainer) override;
   void unregisterSensor(jsi::Runtime &rt, const jsi::Value &sensorId) override;
+  jsi::Value subscribeForKeyboardEvents(
+      jsi::Runtime &rt,
+      const jsi::Value &keyboardEventContainer) override;
+  void unsubscribeFromKeyboardEvents(
+      jsi::Runtime &rt,
+      const jsi::Value &listenerId) override;
 
  private:
   std::shared_ptr<MapperRegistry> mapperRegistry;
@@ -103,6 +109,8 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec,
   std::shared_ptr<LayoutAnimationsProxy> layoutAnimationsProxy;
   AnimatedSensorModule animatedSensorModule;
   ConfigurePropsFunction configurePropsPlatformFunction;
+  KeyboardEventSubscribeFunction subscribeForKeyboardEventsFunction;
+  KeyboardEventUnsubscribeFunction unsubscribeFromKeyboardEventsFunction;
 };
 
 } // namespace reanimated

package/Common/cpp/headers/NativeModules/NativeReanimatedModuleSpec.h

@@ -69,6 +69,14 @@ class JSI_EXPORT NativeReanimatedModuleSpec : public TurboModule {
       jsi::Runtime &rt,
       const jsi::Value &sensorId) = 0;
 
+  // keyboard
+  virtual jsi::Value subscribeForKeyboardEvents(
+      jsi::Runtime &rt,
+      const jsi::Value &keyboardEventContainer) = 0;
+  virtual void unsubscribeFromKeyboardEvents(
+      jsi::Runtime &rt,
+      const jsi::Value &listenerId) = 0;
+
   // other
   virtual jsi::Value enableLayoutAnimations(
       jsi::Runtime &rt,

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

@@ -30,6 +30,9 @@ using ConfigurePropsFunction = std::function<void(
     jsi::Runtime &rt,
     const jsi::Value &uiProps,
     const jsi::Value &nativeProps)>;
+using KeyboardEventSubscribeFunction =
+    std::function<int(std::function<void(int, int)>)>;
+using KeyboardEventUnsubscribeFunction = std::function<void(int)>;
 
 struct PlatformDepMethodsHolder {
   RequestRender requestRender;
@@ -41,6 +44,8 @@ struct PlatformDepMethodsHolder {
   UnregisterSensorFunction unregisterSensor;
   SetGestureStateFunction setGestureStateFunction;
   ConfigurePropsFunction configurePropsFunction;
+  KeyboardEventSubscribeFunction subscribeForKeyboardEvents;
+  KeyboardEventUnsubscribeFunction unsubscribeFromKeyboardEvents;
 };
 
 } // namespace reanimated

package/RNReanimated.podspec

@@ -4,14 +4,16 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 reactVersion = '0.0.0'
 reactTargetTvOS = false
+isUserApp = false
 
 begin
-  # standard app
+  # user app
   # /appName/node_modules/react-native-reanimated/RNReanimated.podspec
   # /appName/node_modules/react-native/package.json
   reactJson = JSON.parse(File.read(File.join(__dir__, "..", "..", "node_modules", "react-native", "package.json")))
   reactVersion = reactJson["version"]
   reactTargetTvOS = reactJson["name"] == "react-native-tvos"
+  isUserApp = true
 rescue
   begin
     # monorepo
@@ -31,11 +33,25 @@ rescue
     rescue
       # should never happen
       reactVersion = '0.68.0'
-      puts "[RNReanimated] Unable to recognized your `react-native` version! Default `react-native` version: " + reactVersion
+      puts "[RNReanimated] Unable to recognize your `react-native` version! Default `react-native` version: " + reactVersion
     end
   end
 end
 
+if isUserApp
+  libInstances = %x[find ../../ -name "package.json" | grep "/react-native-reanimated/package.json"]
+  libInstancesArray = libInstances.split("\n")
+  if libInstancesArray.length() > 1
+    parsedLocation = ''
+    for location in libInstancesArray
+      location['../../'] = '- '
+      location['/package.json'] = ''
+      parsedLocation += location + "\n"
+    end
+    raise "[Reanimated] Multiple versions of Reanimated were detected. Only one instance of react-native-reanimated can be installed in a project. You need to resolve the conflict manually. Check out the documentation: https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/troubleshooting#multiple-versions-of-reanimated-were-detected \n\nConflict between: \n" + parsedLocation
+  end
+end
+
 rnVersion = reactVersion.split('.')[1]
 
 folly_prefix = ""
@@ -46,7 +62,6 @@ end
 
 folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DRNVERSION=' + rnVersion
 folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.04.26.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -86,6 +101,10 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React-Core"
+  s.dependency "#{folly_prefix}Folly"
+  s.dependency "RCTRequired"
+  s.dependency "RCTTypeSafety"
+  s.dependency "ReactCommon/turbomodule/core"
   s.dependency 'FBLazyVector'
   s.dependency 'FBReactNativeSpec'
   s.dependency 'RCTRequired'

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Jul 01 09:56:56 UTC 2022
+#Fri Aug 19 13:09:51 UTC 2022
 gradle.version=7.2

package/android/CMakeLists.txt

@@ -1,9 +1,15 @@
 project(Reanimated)
-cmake_minimum_required(VERSION 3.5.1)
+cmake_minimum_required(VERSION 3.12.0)
 
 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 -DRNVERSION=${RNVERSION} -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")
@@ -17,54 +23,63 @@ set (PACKAGE_NAME "reanimated")
 set (BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
 set (SRC_DIR ${CMAKE_SOURCE_DIR}/src)
 
+set (ignoreMe "${PLAYGROUND_APP_NAME}")
+
 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 (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 sources_tools  "${COMMON_SRC_DIR}/cpp/Tools/*.cpp")
-file(GLOB sources_native_modules  "${COMMON_SRC_DIR}/cpp/NativeModules/*.cpp")
-file(GLOB sources_shared_items  "${COMMON_SRC_DIR}/cpp/SharedItems/*.cpp")
-file(GLOB sources_registries  "${COMMON_SRC_DIR}/cpp/Registries/*.cpp")
-file(GLOB sources_android  "${SRC_DIR}/main/cpp/*.cpp")
+file(GLOB_RECURSE SOURCES_COMMON CONFIGURE_DEPENDS "${COMMON_SRC_DIR}/cpp/**.cpp")
+file(GLOB_RECURSE SOURCES_ANDROID CONFIGURE_DEPENDS "${SRC_DIR}/main/cpp/**.cpp")
 
 if(${REACT_NATIVE_TARGET_VERSION} LESS 66)
-        set (
-                INCLUDE_JSI_CPP
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/jsi.cpp"
-        )
-        set (
-                INCLUDE_JSIDYNAMIC_CPP
-                "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/JSIDynamic.cpp"
-        )
+    set (
+            INCLUDE_JSI_CPP
+            "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/jsi.cpp"
+    )
+    set (
+            INCLUDE_JSIDYNAMIC_CPP
+            "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/JSIDynamic.cpp"
+    )
+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
-        ${sources_native_modules}
-        ${sources_shared_items}
-        ${sources_registries}
-        ${sources_android}
-        ${source_tools}
+        ${SOURCES_COMMON}
+        ${SOURCES_ANDROID}
         ${INCLUDE_JSI_CPP}
         ${INCLUDE_JSIDYNAMIC_CPP}
-        "${COMMON_SRC_DIR}/cpp/Tools/JSIStoreValueUser.cpp"
-        "${COMMON_SRC_DIR}/cpp/Tools/Mapper.cpp"
-        "${COMMON_SRC_DIR}/cpp/Tools/RuntimeDecorator.cpp"
-        "${COMMON_SRC_DIR}/cpp/Tools/Scheduler.cpp"
-        "${COMMON_SRC_DIR}/cpp/Tools/WorkletEventHandler.cpp"
-        "${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
@@ -83,12 +98,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}/hermes-engine/android/include/"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/yoga"
         "${COMMON_SRC_DIR}/cpp/headers/Tools"
         "${COMMON_SRC_DIR}/cpp/headers/SpecTools"
         "${COMMON_SRC_DIR}/cpp/headers/NativeModules"
@@ -96,62 +114,27 @@ 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
 )
-find_library(
-        HERMES_LIB
-        hermes
-        PATHS ${HERMES_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
-find_library(
-        JSEXECUTOR_LIB
-        jscexecutor
-        PATHS ${LIBRN_DIR}
-        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()
-
 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
@@ -159,44 +142,180 @@ 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(
+            RRC_VIEW
+            rrc_view
+            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
 
 set_target_properties(${PACKAGE_NAME} PROPERTIES LINKER_LANGUAGE CXX)
 
-if(${FOR_HERMES})
+
+target_link_libraries(
+        ${PACKAGE_NAME}
+        ${LOG_LIB}
+        ${JSI_LIB}
+        ${GLOG_LIB}
+        ${FBJNI_LIB}
+        ${FOLLY_LIB}
+        ${REACT_NATIVE_JNI_LIB}
+        android
+)
+
+if(${JS_RUNTIME} STREQUAL "hermes")
+    string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_HERMES=1")
+    if(${REACT_NATIVE_TARGET_VERSION} LESS 69)
+        # From `hermes-engine` npm package
+        target_include_directories(
+                ${PACKAGE_NAME}
+                PRIVATE
+                "${JS_RUNTIME_DIR}/android/include"
+        )
+    else()
+        # Bundled Hermes from module `com.facebook.react:hermes-engine` or project `:ReactAndroid:hermes-engine`
+        target_include_directories(
+                ${PACKAGE_NAME}
+                PRIVATE
+                "${JS_RUNTIME_DIR}/API"
+                "${JS_RUNTIME_DIR}/public"
+        )
+    endif()
+    target_link_libraries(
+            ${PACKAGE_NAME}
+            "${BUILD_DIR}/third-party-ndk/hermes/jni/${ANDROID_ABI}/libhermes.so"
+    )
+elseif(${JS_RUNTIME} STREQUAL "v8")
+    string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_V8=1")
+    target_include_directories(
+            ${PACKAGE_NAME}
+            PRIVATE
+            "${JS_RUNTIME_DIR}/src"
+    )
+    file (GLOB V8_SO_DIR "${JS_RUNTIME_DIR}/android/build/intermediates/library_jni/*/jni/${ANDROID_ABI}")
+    find_library(
+            V8EXECUTOR_LIB
+            v8executor
+            PATHS ${V8_SO_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
     target_link_libraries(
             ${PACKAGE_NAME}
-            ${LOG_LIB}
-            ${JSI_LIB}
-            ${HERMES_LIB}
-            ${GLOG_LIB}
-            ${FBJNI_LIB}
-            ${FOLLY_LIB}
-            ${REACT_NATIVE_JNI_LIB}
-            android
+            ${V8EXECUTOR_LIB}
     )
 else()
+    set (ignoreMe "${JS_RUNTIME_DIR}")
+    string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_JSC=1")
+    find_library(
+            JSEXECUTOR_LIB
+            jscexecutor
+            PATHS ${LIBRN_DIR}
+            NO_CMAKE_FIND_ROOT_PATH
+    )
     target_link_libraries(
             ${PACKAGE_NAME}
-            ${LOG_LIB}
-            ${JSI_LIB}
             ${JSEXECUTOR_LIB}
-            ${GLOG_LIB}
-            ${FBJNI_LIB}
-            ${FOLLY_LIB}
-            ${REACT_NATIVE_JNI_LIB}
-            android
+    )
+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}
+            ${RRC_VIEW}
+            ${FABRICJNI}
+            ${REACT_RENDER_SCHEDULER}
     )
 endif()
 
@@ -208,4 +327,4 @@ if(${REACT_NATIVE_TARGET_VERSION} LESS 64)
             # Provides a relative path to your source file(s).
             ./empty.cpp
     )
-endif()
+endif()