react-native-reanimated 3.8.0 → 3.9.0-layout-animation-experimental

package/Common/cpp/NativeModules/NativeReanimatedModule.h

@@ -20,6 +20,7 @@
 #include "UIScheduler.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
+#include "LayoutAnimationsProxy.h"
 #include "PropsRegistry.h"
 #include "ReanimatedCommitHook.h"
 #if REACT_NATIVE_MINOR_VERSION >= 73
@@ -33,18 +34,20 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec {
  public:
   NativeReanimatedModule(
       jsi::Runtime &rnRuntime,
-      const std::shared_ptr<CallInvoker> &jsInvoker,
+      const std::shared_ptr<JSScheduler> &jsScheduler,
       const std::shared_ptr<MessageQueueThread> &jsQueue,
       const std::shared_ptr<UIScheduler> &uiScheduler,
       const PlatformDepMethodsHolder &platformDepMethodsHolder,
-      const std::string &valueUnpackerCode);
+      const std::string &valueUnpackerCode,
+      const bool isBridgeless);
 
   ~NativeReanimatedModule();
 
   jsi::Value makeShareableClone(
       jsi::Runtime &rt,
       const jsi::Value &value,
-      const jsi::Value &shouldRetainRemote) override;
+      const jsi::Value &shouldRetainRemote,
+      const jsi::Value &nativeStateSource) override;
 
   void scheduleOnUI(jsi::Runtime &rt, const jsi::Value &worklet) override;
   jsi::Value executeOnUIRuntimeSync(jsi::Runtime &rt, const jsi::Value &worklet)
@@ -70,7 +73,11 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec {
 
   jsi::Value getViewProp(
       jsi::Runtime &rt,
+#ifdef RCT_NEW_ARCH_ENABLED
+      const jsi::Value &shadowNodeWrapper,
+#else
       const jsi::Value &viewTag,
+#endif
       const jsi::Value &propName,
       const jsi::Value &callback) override;
 
@@ -80,12 +87,6 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec {
       jsi::Runtime &rt,
       const jsi::Value &uiProps,
       const jsi::Value &nativeProps) override;
-  jsi::Value configureLayoutAnimation(
-      jsi::Runtime &rt,
-      const jsi::Value &viewTag,
-      const jsi::Value &type,
-      const jsi::Value &sharedTransitionTag,
-      const jsi::Value &config) override;
   jsi::Value configureLayoutAnimationBatch(
       jsi::Runtime &rt,
       const jsi::Value &layoutAnimationsBatch) override;
@@ -127,9 +128,19 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec {
       const jsi::Value &commandNameValue,
       const jsi::Value &argsValue);
 
+  jsi::String obtainProp(
+      jsi::Runtime &rt,
+      const jsi::Value &shadowNodeWrapper,
+      const jsi::Value &propName);
+
   jsi::Value measure(jsi::Runtime &rt, const jsi::Value &shadowNodeValue);
 
   void initializeFabric(const std::shared_ptr<UIManager> &uiManager);
+
+  std::string obtainPropFromShadowNode(
+      jsi::Runtime &rt,
+      const std::string &propName,
+      const ShadowNode::Shared &shadowNode);
 #endif
 
   jsi::Value registerSensor(
@@ -151,14 +162,21 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec {
       const jsi::Value &listenerId) override;
 
   inline LayoutAnimationsManager &layoutAnimationsManager() {
-    return layoutAnimationsManager_;
+    return *layoutAnimationsManager_;
   }
 
   inline jsi::Runtime &getUIRuntime() {
     return uiWorkletRuntime_->getJSIRuntime();
   }
 
+ public:
+  inline bool isBridgeless() const {
+    return isBridgeless_;
+  }
+
  private:
+  void commonInit(const PlatformDepMethodsHolder &platformDepMethodsHolder);
+
   void requestAnimationFrame(jsi::Runtime &rt, const jsi::Value &callback);
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -168,6 +186,8 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec {
       const jsi::Value &props);
 #endif // RCT_NEW_ARCH_ENABLED
 
+ public:
+  const bool isBridgeless_;
   const std::shared_ptr<MessageQueueThread> jsQueue_;
   const std::shared_ptr<JSScheduler> jsScheduler_;
   const std::shared_ptr<UIScheduler> uiScheduler_;
@@ -181,7 +201,7 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec {
   const std::function<void(const double)> onRenderCallback_;
   AnimatedSensorModule animatedSensorModule_;
   const std::shared_ptr<JSLogger> jsLogger_;
-  LayoutAnimationsManager layoutAnimationsManager_;
+  std::shared_ptr<LayoutAnimationsManager> layoutAnimationsManager_;
 
 #ifdef RCT_NEW_ARCH_ENABLED
   const SynchronouslyUpdateUIPropsFunction synchronouslyUpdateUIPropsFunction_;
@@ -190,6 +210,7 @@ class NativeReanimatedModule : public NativeReanimatedModuleSpec {
   std::unordered_set<std::string>
       animatablePropNames_; // filled by configureProps
   std::shared_ptr<UIManager> uiManager_;
+  std::shared_ptr<LayoutAnimationsProxy> layoutAnimationsProxy_;
 
   // After app reload, surfaceId on iOS is still 1 but on Android it's 11.
   // We can store surfaceId of the most recent ShadowNode as a workaround.

package/Common/cpp/NativeModules/NativeReanimatedModuleSpec.cpp

@@ -14,7 +14,8 @@ static jsi::Value SPEC_PREFIX(makeShareableClone)(
     const jsi::Value *args,
     size_t) {
   return static_cast<NativeReanimatedModuleSpec *>(&turboModule)
-      ->makeShareableClone(rt, std::move(args[0]), std::move(args[1]));
+      ->makeShareableClone(
+          rt, std::move(args[0]), std::move(args[1]), std::move(args[2]));
 }
 
 // scheduler
@@ -150,20 +151,6 @@ static jsi::Value SPEC_PREFIX(unsubscribeFromKeyboardEvents)(
   return jsi::Value::undefined();
 }
 
-static jsi::Value SPEC_PREFIX(configureLayoutAnimation)(
-    jsi::Runtime &rt,
-    TurboModule &turboModule,
-    const jsi::Value *args,
-    size_t) {
-  return static_cast<NativeReanimatedModuleSpec *>(&turboModule)
-      ->configureLayoutAnimation(
-          rt,
-          std::move(args[0]),
-          std::move(args[1]),
-          std::move(args[2]),
-          std::move(args[3]));
-}
-
 static jsi::Value SPEC_PREFIX(configureLayoutAnimationBatch)(
     jsi::Runtime &rt,
     TurboModule &turboModule,
@@ -214,8 +201,6 @@ NativeReanimatedModuleSpec::NativeReanimatedModuleSpec(
   methodMap_["unsubscribeFromKeyboardEvents"] =
       MethodMetadata{1, SPEC_PREFIX(unsubscribeFromKeyboardEvents)};
 
-  methodMap_["configureLayoutAnimation"] =
-      MethodMetadata{4, SPEC_PREFIX(configureLayoutAnimation)};
   methodMap_["configureLayoutAnimationBatch"] =
       MethodMetadata{1, SPEC_PREFIX(configureLayoutAnimationBatch)};
   methodMap_["setShouldAnimateExitingForTag"] =

package/Common/cpp/NativeModules/NativeReanimatedModuleSpec.h

@@ -27,7 +27,8 @@ class JSI_EXPORT NativeReanimatedModuleSpec : public TurboModule {
   virtual jsi::Value makeShareableClone(
       jsi::Runtime &rt,
       const jsi::Value &value,
-      const jsi::Value &shouldRetainRemote) = 0;
+      const jsi::Value &shouldRetainRemote,
+      const jsi::Value &nativeStateSource) = 0;
 
   // Scheduling
   virtual void scheduleOnUI(jsi::Runtime &rt, const jsi::Value &worklet) = 0;
@@ -58,7 +59,11 @@ class JSI_EXPORT NativeReanimatedModuleSpec : public TurboModule {
   // views
   virtual jsi::Value getViewProp(
       jsi::Runtime &rt,
+#ifdef RCT_NEW_ARCH_ENABLED
+      const jsi::Value &shadowNodeWrapper,
+#else
       const jsi::Value &viewTag,
+#endif
       const jsi::Value &propName,
       const jsi::Value &callback) = 0;
 
@@ -92,13 +97,6 @@ class JSI_EXPORT NativeReanimatedModuleSpec : public TurboModule {
       const jsi::Value &nativeProps) = 0;
 
   // layout animations
-  virtual jsi::Value configureLayoutAnimation(
-      jsi::Runtime &rt,
-      const jsi::Value &viewTag,
-      const jsi::Value &type,
-      const jsi::Value &sharedTransitionTag,
-      const jsi::Value &config) = 0;
-
   virtual jsi::Value configureLayoutAnimationBatch(
       jsi::Runtime &rt,
       const jsi::Value &layoutAnimationsBatch) = 0;

package/Common/cpp/ReanimatedRuntime/RNRuntimeDecorator.cpp

@@ -29,6 +29,9 @@ void RNRuntimeDecorator::decorate(
 #endif // RCT_NEW_ARCH_ENABLED
   rnRuntime.global().setProperty(rnRuntime, "_IS_FABRIC", isFabric);
 
+  rnRuntime.global().setProperty(
+      rnRuntime, "_IS_BRIDGELESS", nativeReanimatedModule->isBridgeless());
+
 #ifndef NDEBUG
   checkJSVersion(rnRuntime, nativeReanimatedModule->getJSLogger());
 #endif // NDEBUG

package/Common/cpp/ReanimatedRuntime/WorkletRuntime.cpp

@@ -75,10 +75,9 @@ WorkletRuntime::WorkletRuntime(
 
   auto codeBuffer = std::make_shared<const jsi::StringBuffer>(
       "(" + valueUnpackerCode + "\n)");
-  auto valueUnpacker =
-      rt.evaluateJavaScript(codeBuffer, "WorkletRuntime::WorkletRuntime")
-          .asObject(rt)
-          .asFunction(rt);
+  auto valueUnpacker = rt.evaluateJavaScript(codeBuffer, "valueUnpacker")
+                           .asObject(rt)
+                           .asFunction(rt);
   rt.global().setProperty(rt, "__valueUnpacker", valueUnpacker);
 }
 

package/Common/cpp/ReanimatedRuntime/WorkletRuntimeDecorator.cpp

@@ -62,7 +62,7 @@ void WorkletRuntimeDecorator::decorate(
           jsi::PropNameID::forAscii(rt, "evalWithSourceUrl"),
           1,
           evalWithSourceUrl));
-#endif
+#endif // NDEBUG
 
   jsi_utils::installJsiFunction(
       rt, "_toString", [](jsi::Runtime &rt, const jsi::Value &value) {
@@ -75,9 +75,14 @@ void WorkletRuntimeDecorator::decorate(
       });
 
   jsi_utils::installJsiFunction(
-      rt, "_makeShareableClone", [](jsi::Runtime &rt, const jsi::Value &value) {
+      rt,
+      "_makeShareableClone",
+      [](jsi::Runtime &rt,
+         const jsi::Value &value,
+         const jsi::Value &nativeStateSource) {
         auto shouldRetainRemote = jsi::Value::undefined();
-        return reanimated::makeShareableClone(rt, value, shouldRetainRemote);
+        return reanimated::makeShareableClone(
+            rt, value, shouldRetainRemote, nativeStateSource);
       });
 
   jsi_utils::installJsiFunction(

package/Common/cpp/SharedItems/Shareables.cpp

@@ -41,7 +41,8 @@ jsi::Function getCallGuard(jsi::Runtime &rt) {
 jsi::Value makeShareableClone(
     jsi::Runtime &rt,
     const jsi::Value &value,
-    const jsi::Value &shouldRetainRemote) {
+    const jsi::Value &shouldRetainRemote,
+    const jsi::Value &nativeStateSource) {
   std::shared_ptr<Shareable> shareable;
   if (value.isObject()) {
     auto object = value.asObject(rt);
@@ -76,10 +77,11 @@ jsi::Value makeShareableClone(
           std::make_shared<ShareableHostObject>(rt, object.getHostObject(rt));
     } else {
       if (shouldRetainRemote.isBool() && shouldRetainRemote.getBool()) {
-        shareable =
-            std::make_shared<RetainingShareable<ShareableObject>>(rt, object);
+        shareable = std::make_shared<RetainingShareable<ShareableObject>>(
+            rt, object, nativeStateSource);
       } else {
-        shareable = std::make_shared<ShareableObject>(rt, object);
+        shareable =
+            std::make_shared<ShareableObject>(rt, object, nativeStateSource);
       }
     }
   } else if (value.isString()) {
@@ -198,6 +200,24 @@ ShareableObject::ShareableObject(jsi::Runtime &rt, const jsi::Object &object)
     auto value = extractShareableOrThrow(rt, object.getProperty(rt, key));
     data_.emplace_back(key.utf8(rt), value);
   }
+#if REACT_NATIVE_MINOR_VERSION >= 71
+  if (object.hasNativeState(rt)) {
+    nativeState_ = object.getNativeState(rt);
+  }
+#endif
+}
+
+ShareableObject::ShareableObject(
+    jsi::Runtime &rt,
+    const jsi::Object &object,
+    const jsi::Value &nativeStateSource)
+    : ShareableObject(rt, object) {
+#if REACT_NATIVE_MINOR_VERSION >= 71
+  if (nativeStateSource.isObject() &&
+      nativeStateSource.asObject(rt).hasNativeState(rt)) {
+    nativeState_ = nativeStateSource.asObject(rt).getNativeState(rt);
+  }
+#endif
 }
 
 jsi::Value ShareableObject::toJSValue(jsi::Runtime &rt) {
@@ -206,6 +226,11 @@ jsi::Value ShareableObject::toJSValue(jsi::Runtime &rt) {
     obj.setProperty(
         rt, data_[i].first.c_str(), data_[i].second->getJSValue(rt));
   }
+#if REACT_NATIVE_MINOR_VERSION >= 71
+  if (nativeState_ != nullptr) {
+    obj.setNativeState(rt, nativeState_);
+  }
+#endif
   return obj;
 }
 
@@ -238,7 +263,8 @@ jsi::Value ShareableRemoteFunction::toJSValue(jsi::Runtime &rt) {
     return getValueUnpacker(rt).call(
         rt,
         ShareableJSRef::newHostObject(rt, shared_from_this()),
-        jsi::String::createFromAscii(rt, "RemoteFunction"));
+        jsi::String::createFromAscii(rt, "RemoteFunction"),
+        jsi::String::createFromUtf8(rt, name_));
 #else
     return ShareableJSRef::newHostObject(rt, shared_from_this());
 #endif

package/Common/cpp/SharedItems/Shareables.h

@@ -146,7 +146,8 @@ class ShareableJSRef : public jsi::HostObject {
 jsi::Value makeShareableClone(
     jsi::Runtime &rt,
     const jsi::Value &value,
-    const jsi::Value &shouldRetainRemote);
+    const jsi::Value &shouldRetainRemote,
+    const jsi::Value &nativeStateSource);
 
 std::shared_ptr<Shareable> extractShareableOrThrow(
     jsi::Runtime &rt,
@@ -182,10 +183,18 @@ class ShareableObject : public Shareable {
  public:
   ShareableObject(jsi::Runtime &rt, const jsi::Object &object);
 
+  ShareableObject(
+      jsi::Runtime &rt,
+      const jsi::Object &object,
+      const jsi::Value &nativeStateSource);
+
   jsi::Value toJSValue(jsi::Runtime &rt) override;
 
  protected:
   std::vector<std::pair<std::string, std::shared_ptr<Shareable>>> data_;
+#if REACT_NATIVE_MINOR_VERSION >= 71
+  std::shared_ptr<jsi::NativeState> nativeState_;
+#endif
 };
 
 class ShareableHostObject : public Shareable {
@@ -256,13 +265,20 @@ class ShareableRemoteFunction
       public std::enable_shared_from_this<ShareableRemoteFunction> {
  private:
   jsi::Runtime *runtime_;
+#ifndef NDEBUG
+  const std::string name_;
+#endif
   std::unique_ptr<jsi::Value> function_;
 
  public:
   ShareableRemoteFunction(jsi::Runtime &rt, jsi::Function &&function)
       : Shareable(RemoteFunctionType),
         runtime_(&rt),
-        function_(std::make_unique<jsi::Value>(rt, std::move(function))) {}
+#ifndef NDEBUG
+        name_(function.getProperty(rt, "name").asString(rt).utf8(rt)),
+#endif
+        function_(std::make_unique<jsi::Value>(rt, std::move(function))) {
+  }
 
   ~ShareableRemoteFunction() {
     cleanupIfRuntimeExists(runtime_, function_);

package/Common/cpp/Tools/JSScheduler.cpp

@@ -1,12 +1,36 @@
 #include "JSScheduler.h"
-
-#include <utility>
+using namespace facebook;
+using namespace react;
 
 namespace reanimated {
+JSScheduler::JSScheduler(
+    jsi::Runtime &rnRuntime,
+    const std::shared_ptr<CallInvoker> &jsCallInvoker)
+    : scheduleOnJS([&](Job job) {
+        jsCallInvoker_->invokeAsync(
+            [job = std::move(job), &rt = rnRuntime_] { job(rt); });
+      }),
+      rnRuntime_(rnRuntime),
+      jsCallInvoker_(jsCallInvoker) {}
+
+#if REACT_NATIVE_MINOR_VERSION >= 74 && defined(RCT_NEW_ARCH_ENABLED)
+// With `runtimeExecutor`.
+JSScheduler::JSScheduler(
+    jsi::Runtime &rnRuntime,
+    RuntimeExecutor runtimeExecutor)
+    : scheduleOnJS([&](Job job) {
+        runtimeExecutor_(
+            [job = std::move(job)](jsi::Runtime &runtime) { job(runtime); });
+      }),
+      rnRuntime_(rnRuntime),
+      runtimeExecutor_(runtimeExecutor) {}
+#endif // REACT_NATIVE_MINOR_VERSION >= 74 && defined(RCT_NEW_ARCH_ENABLED
 
-void JSScheduler::scheduleOnJS(std::function<void(jsi::Runtime &rt)> job) {
-  jsCallInvoker_->invokeAsync(
-      [job = std::move(job), &rt = rnRuntime_] { job(rt); });
+const std::shared_ptr<CallInvoker> JSScheduler::getJSCallInvoker() const {
+  assert(
+      jsCallInvoker_ != nullptr &&
+      "[Reanimated] Expected jsCallInvoker, got nullptr instead.");
+  return jsCallInvoker_;
 }
 
 } // namespace reanimated

package/Common/cpp/Tools/JSScheduler.h

@@ -1,25 +1,42 @@
 #pragma once
 
 #include <ReactCommon/CallInvoker.h>
+#include <ReactCommon/RuntimeExecutor.h>
 #include <jsi/jsi.h>
 
 #include <memory>
+#include <utility>
 
 using namespace facebook;
+using namespace react;
+
+using Job = std::function<void(jsi::Runtime &rt)>;
 
 namespace reanimated {
 
 class JSScheduler {
  public:
+  // With `jsCallInvoker`.
   explicit JSScheduler(
       jsi::Runtime &rnRuntime,
-      const std::shared_ptr<facebook::react::CallInvoker> &jsCallInvoker)
-      : rnRuntime_(rnRuntime), jsCallInvoker_(jsCallInvoker) {}
-  void scheduleOnJS(std::function<void(jsi::Runtime &rt)> job);
+      const std::shared_ptr<CallInvoker> &jsCallInvoker);
+
+#if REACT_NATIVE_MINOR_VERSION >= 74 && defined(RCT_NEW_ARCH_ENABLED)
+  // With `runtimeExecutor`.
+  explicit JSScheduler(
+      jsi::Runtime &rnRuntime,
+      RuntimeExecutor runtimeExecutor);
+#endif // REACT_NATIVE_MINOR_VERSION >= 74 && defined(RCT_NEW_ARCH_ENABLED
+
+  const std::function<void(Job)> scheduleOnJS = nullptr;
+  const std::shared_ptr<CallInvoker> getJSCallInvoker() const;
 
  protected:
   jsi::Runtime &rnRuntime_;
-  const std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker_;
+#if REACT_NATIVE_MINOR_VERSION >= 74 && defined(RCT_NEW_ARCH_ENABLED)
+  RuntimeExecutor runtimeExecutor_ = nullptr;
+#endif // REACT_NATIVE_MINOR_VERSION >= 74 && defined(RCT_NEW_ARCH_ENABLED
+  const std::shared_ptr<CallInvoker> jsCallInvoker_ = nullptr;
 };
 
 } // namespace reanimated

package/Common/cpp/Tools/PlatformDepMethodsHolder.h

@@ -26,6 +26,10 @@ using UpdatePropsFunction =
     std::function<void(jsi::Runtime &rt, const jsi::Value &operations)>;
 using RemoveFromPropsRegistryFunction =
     std::function<void(jsi::Runtime &rt, const jsi::Value &viewTags)>;
+using ObtainPropFunction = std::function<jsi::Value(
+    jsi::Runtime &rt,
+    const jsi::Value &shadowNodeWrapper,
+    const jsi::Value &propName)>;
 using DispatchCommandFunction = std::function<void(
     jsi::Runtime &rt,
     const jsi::Value &shadowNodeValue,
@@ -46,13 +50,13 @@ using DispatchCommandFunction = std::function<void(
     const jsi::Value &argsValue)>;
 using MeasureFunction =
     std::function<std::vector<std::pair<std::string, double>>(int)>;
+using ObtainPropFunction =
+    std::function<jsi::Value(jsi::Runtime &, const int, const jsi::Value &)>;
 
 #endif // RCT_NEW_ARCH_ENABLED
 
 using RequestRenderFunction =
     std::function<void(std::function<void(const double)>, jsi::Runtime &)>;
-using ObtainPropFunction =
-    std::function<jsi::Value(jsi::Runtime &, const int, const jsi::String &)>;
 using GetAnimationTimestampFunction = std::function<double(void)>;
 
 using ProgressLayoutAnimationFunction =

package/Common/cpp/Tools/UIRuntimeDecorator.cpp

@@ -10,6 +10,7 @@ void UIRuntimeDecorator::decorate(
 #else
     const ScrollToFunction scrollTo,
 #endif
+    const ObtainPropFunction obtainPropFunction,
     const UpdatePropsFunction updateProps,
     const MeasureFunction measure,
     const DispatchCommandFunction dispatchCommand,
@@ -44,6 +45,8 @@ void UIRuntimeDecorator::decorate(
         }
         return resultObject;
       });
+  jsi_utils::installJsiFunction(
+      uiRuntime, "_obtainPropPaper", obtainPropFunction);
 #endif // RCT_NEW_ARCH_ENABLED
 
   jsi_utils::installJsiFunction(
@@ -59,6 +62,9 @@ void UIRuntimeDecorator::decorate(
   jsi_utils::installJsiFunction(uiRuntime, "_setGestureState", setGestureState);
   jsi_utils::installJsiFunction(
       uiRuntime, "_maybeFlushUIUpdatesQueue", maybeFlushUIUpdatesQueue);
+
+  jsi_utils::installJsiFunction(
+      uiRuntime, "_obtainPropFabric", obtainPropFunction);
 }
 
 } // namespace reanimated

package/Common/cpp/Tools/UIRuntimeDecorator.h

@@ -20,6 +20,7 @@ class UIRuntimeDecorator {
 #else
       const ScrollToFunction scrollTo,
 #endif
+      const ObtainPropFunction obtainPropFunction,
       const UpdatePropsFunction updateProps,
       const MeasureFunction measure,
       const DispatchCommandFunction dispatchCommand,

package/android/CMakeLists.txt

@@ -99,6 +99,8 @@ if(${REACT_NATIVE_MINOR_VERSION} GREATER_EQUAL 71)
         "${REACT_NATIVE_DIR}/ReactCommon/react/renderer/graphics/platform/cxx"
         "${REACT_NATIVE_DIR}/ReactCommon/runtimeexecutor"
         "${REACT_NATIVE_DIR}/ReactCommon/yoga"
+        "${REACT_NATIVE_DIR}/ReactCommon/react/renderer/componentregistry"
+        "${REACT_NATIVE_DIR}/ReactCommon/react/renderer/core"
     )
 else()
     file(GLOB LIBFBJNI_INCLUDE_DIR ${FBJNI_HEADERS_DIR})
@@ -307,6 +309,7 @@ if(${IS_NEW_ARCHITECTURE_ENABLED})
         ReactAndroid::react_debug
         ReactAndroid::react_render_core
         ReactAndroid::react_render_mounting
+        ReactAndroid::react_render_componentregistry
         ReactAndroid::react_render_scheduler
         ReactAndroid::react_render_uimanager
         ReactAndroid::rrc_view

package/android/build.gradle

@@ -130,6 +130,10 @@ def toPlatformFileString(String path) {
   return path
 }
 
+if (isNewArchitectureEnabled()) {
+    apply plugin: "com.facebook.react"
+}
+
 def reactNativeRootDir = resolveReactNativeDirectory()
 
 def reactProperties = new Properties()
@@ -362,9 +366,7 @@ android {
 
             // messageQueueThread
             if (REANIMATED_MAJOR_VERSION > 2) {
-                if (REACT_NATIVE_MINOR_VERSION <= 67) {
-                    srcDirs += "src/reactNativeVersionPatch/messageQueueThread/67"
-                } else if (REACT_NATIVE_MINOR_VERSION <= 72) {
+                if (REACT_NATIVE_MINOR_VERSION <= 72) {
                     srcDirs += "src/reactNativeVersionPatch/messageQueueThread/72"
                 } else {
                     srcDirs += "src/reactNativeVersionPatch/messageQueueThread/latest"
@@ -372,8 +374,8 @@ android {
             }
 
             // ReanimatedUIManager & ReanimatedUIImplementation 
-            if (REACT_NATIVE_MINOR_VERSION <= 70) {
-                srcDirs += "src/reactNativeVersionPatch/ReanimatedUIManager/70"
+            if (REACT_NATIVE_MINOR_VERSION <= 73) {
+                srcDirs += "src/reactNativeVersionPatch/ReanimatedUIManager/73"
             } else {
                 srcDirs += "src/reactNativeVersionPatch/ReanimatedUIManager/latest"
             }
@@ -386,6 +388,16 @@ android {
                     srcDirs += "src/reactNativeVersionPatch/ReactFeatureFlagsWrapper/latest"
                 }
             }
+
+            // RuntimeExecutor
+            if (IS_NEW_ARCHITECTURE_ENABLED) {
+                if (REACT_NATIVE_MINOR_VERSION <= 73) {
+                    srcDirs += "src/reactNativeVersionPatch/RuntimeExecutor/73"
+                } else {
+                    srcDirs += "src/reactNativeVersionPatch/RuntimeExecutor/latest"
+                }
+            }
+
         }
     }
 }