react-native-reanimated 2.1.0 → 2.2.3

package/Common/cpp/SharedItems/MutableValue.cpp

@@ -16,7 +16,7 @@ void MutableValue::setValue(jsi::Runtime &rt, const jsi::Value &newValue) {
       listener.second();
     }
   };
-  if (RuntimeDecorator::isWorkletRuntime(rt)) {
+  if (RuntimeDecorator::isUIRuntime(rt)) {
     notifyListeners();
   } else {
     runtimeManager->scheduler->scheduleOnUI([notifyListeners] {
@@ -32,8 +32,27 @@ jsi::Value MutableValue::getValue(jsi::Runtime &rt) {
 
 void MutableValue::set(jsi::Runtime &rt, const jsi::PropNameID &name, const jsi::Value &newValue) {
   auto propName = name.utf8(rt);
+  if (!runtimeManager->valueSetter) {
+    throw jsi::JSError(rt, "Value-Setter is not yet configured! Make sure the core-functions are installed.");
+  }
 
-  if (RuntimeDecorator::isReactRuntime(rt)) {
+  if (RuntimeDecorator::isUIRuntime(rt)) {
+    // UI thread
+    if (propName == "value") {
+      auto setterProxy = jsi::Object::createFromHostObject(rt, std::make_shared<MutableValueSetterProxy>(shared_from_this()));
+      runtimeManager->valueSetter->getValue(rt)
+      .asObject(rt)
+      .asFunction(rt)
+      .callWithThis(rt, setterProxy, newValue);
+    } else if (propName == "_animation") {
+      // TODO: assert to allow animation to be set from UI only
+      if (animation.expired()) {
+        animation = getWeakRef(rt);
+      }
+      *animation.lock() = jsi::Value(rt, newValue);
+    }
+  } else {
+    // React-JS Thread or another threaded Runtime.
     if (propName == "value") {
       auto shareable = ShareableValue::adapt(rt, newValue, runtimeManager);
       runtimeManager->scheduler->scheduleOnUI([this, shareable] {
@@ -46,23 +65,8 @@ void MutableValue::set(jsi::Runtime &rt, const jsi::PropNameID &name, const jsi:
           .callWithThis(rt, setterProxy, newValue);
       });
     }
-    return;
   }
 
-  // UI thread
-  if (propName == "value") {
-    auto setterProxy = jsi::Object::createFromHostObject(rt, std::make_shared<MutableValueSetterProxy>(shared_from_this()));
-    runtimeManager->valueSetter->getValue(rt)
-      .asObject(rt)
-      .asFunction(rt)
-      .callWithThis(rt, setterProxy, newValue);
-  } else if (propName == "_animation") {
-    // TODO: assert to allow animation to be set from UI only
-    if (animation.expired()) {
-      animation = getWeakRef(rt);
-    }
-    *animation.lock() = jsi::Value(rt, newValue);
-  }
 }
 
 jsi::Value MutableValue::get(jsi::Runtime &rt, const jsi::PropNameID &name) {
@@ -72,7 +76,7 @@ jsi::Value MutableValue::get(jsi::Runtime &rt, const jsi::PropNameID &name) {
     return getValue(rt);
   }
 
-  if (RuntimeDecorator::isWorkletRuntime(rt)) {
+  if (RuntimeDecorator::isUIRuntime(rt)) {
     // _value and _animation should be accessed from UI only
     if (propName == "_value") {
       return getValue(rt);

package/Common/cpp/SharedItems/ShareableValue.cpp

@@ -327,7 +327,7 @@ jsi::Value ShareableValue::toJSValue(jsi::Runtime &rt) {
       auto runtimeManager = this->runtimeManager;
       auto& frozenObject = ValueWrapper::asFrozenObject(this->valueContainer);
       if (RuntimeDecorator::isWorkletRuntime(rt)) {
-        // when running on UI thread we prep a function
+        // when running on worklet thread we prep a function
 
         auto jsThis = std::make_shared<jsi::Object>(frozenObject->shallowClone(*runtimeManager->runtime));
         std::shared_ptr<jsi::Function> funPtr(runtimeManager->workletsCache->getFunction(rt, frozenObject));

package/Common/cpp/Tools/JSIStoreValueUser.cpp

@@ -1,43 +1,56 @@
+#ifdef ONANDROID
+#include <AndroidScheduler.h>
+#endif
 #include "JSIStoreValueUser.h"
 
 namespace reanimated {
 
-std::atomic<int> StoreUser::ctr;
-std::recursive_mutex StoreUser::storeMutex;
-std::unordered_map<int, std::vector<std::shared_ptr<jsi::Value>>> StoreUser::store;
+std::shared_ptr<StaticStoreUser> StoreUser::staticStoreUserData = std::make_shared<StaticStoreUser>();
 
 std::weak_ptr<jsi::Value> StoreUser::getWeakRef(jsi::Runtime &rt) {
-  const std::lock_guard<std::recursive_mutex> lock(storeMutex);
-  if (StoreUser::store.count(identifier) == 0) {
-    StoreUser::store[identifier] = std::vector<std::shared_ptr<jsi::Value>>();
+  const std::lock_guard<std::recursive_mutex> lock(storeUserData->storeMutex);
+  if (storeUserData->store.count(identifier) == 0) {
+    storeUserData->store[identifier] = std::vector<std::shared_ptr<jsi::Value>>();
   }
   std::shared_ptr<jsi::Value> sv = std::make_shared<jsi::Value>(rt, jsi::Value::undefined());
-  StoreUser::store[identifier].push_back(sv);
+  storeUserData->store[identifier].push_back(sv);
   
   return sv;
 }
 
 StoreUser::StoreUser(std::shared_ptr<Scheduler> s): scheduler(s) {
-  identifier = StoreUser::ctr++;
+  storeUserData = StoreUser::staticStoreUserData;
+  identifier = storeUserData->ctr++;
 }
 
 StoreUser::~StoreUser() {
   int id = identifier;
   std::shared_ptr<Scheduler> strongScheduler = scheduler.lock();
   if (strongScheduler != nullptr) {
-    strongScheduler->scheduleOnUI([id]() {
-      const std::lock_guard<std::recursive_mutex> lock(storeMutex);
-      if (StoreUser::store.count(id) > 0) {
-        StoreUser::store.erase(id);
+    std::shared_ptr<StaticStoreUser> sud = storeUserData;
+    #ifdef ONANDROID
+    jni::ThreadScope::WithClassLoader([&] {
+      strongScheduler->scheduleOnUI([id, sud]() {
+        const std::lock_guard<std::recursive_mutex> lock(sud->storeMutex);
+        if (sud->store.count(id) > 0) {
+          sud->store.erase(id);
+        }
+      });
+    });
+    #else
+    strongScheduler->scheduleOnUI([id, sud]() {
+      const std::lock_guard<std::recursive_mutex> lock(sud->storeMutex);
+      if (sud->store.count(id) > 0) {
+        sud->store.erase(id);
       }
     });
+    #endif
   }
 }
 
-
 void StoreUser::clearStore() {
-  const std::lock_guard<std::recursive_mutex> lock(storeMutex);
-  StoreUser::store.clear();
+  const std::lock_guard<std::recursive_mutex> lock(StoreUser::staticStoreUserData->storeMutex);
+  StoreUser::staticStoreUserData->store.clear();
 }
 
 }

package/Common/cpp/Tools/RuntimeDecorator.cpp

@@ -10,7 +10,7 @@ void RuntimeDecorator::decorateRuntime(jsi::Runtime &rt, std::string label) {
   rt.global().setProperty(rt, "_WORKLET", jsi::Value(true));
   // This property will be used for debugging
   rt.global().setProperty(rt, "_LABEL", jsi::String::createFromAscii(rt, label));
-  
+
   jsi::Object dummyGlobal(rt);
   auto dummyFunction = [](
                           jsi::Runtime &rt,
@@ -21,12 +21,12 @@ void RuntimeDecorator::decorateRuntime(jsi::Runtime &rt, std::string label) {
     return jsi::Value::undefined();
   };
   jsi::Function __reanimatedWorkletInit = jsi::Function::createFromHostFunction(rt, jsi::PropNameID::forAscii(rt, "__reanimatedWorkletInit"), 1, dummyFunction);
-  
+
   dummyGlobal.setProperty(rt, "__reanimatedWorkletInit", __reanimatedWorkletInit);
   rt.global().setProperty(rt, "global", dummyGlobal);
-  
+
   rt.global().setProperty(rt, "jsThis", jsi::Value::undefined());
-  
+
   auto callback = [](
                      jsi::Runtime &rt,
                      const jsi::Value &thisValue,
@@ -47,7 +47,7 @@ void RuntimeDecorator::decorateRuntime(jsi::Runtime &rt, std::string label) {
   };
   jsi::Value log = jsi::Function::createFromHostFunction(rt, jsi::PropNameID::forAscii(rt, "_log"), 1, callback);
   rt.global().setProperty(rt, "_log", log);
-  
+
   auto setGlobalConsole = [](
                              jsi::Runtime &rt,
                              const jsi::Value &thisValue,
@@ -67,7 +67,8 @@ void RuntimeDecorator::decorateUIRuntime(jsi::Runtime &rt,
                                          MeasuringFunction measure,
                                          TimeProviderFunction getCurrentTime) {
   RuntimeDecorator::decorateRuntime(rt, "UI");
-  
+  rt.global().setProperty(rt, "_UI", jsi::Value(true));
+
   auto clb = [updater](
                        jsi::Runtime &rt,
                        const jsi::Value &thisValue,
@@ -82,8 +83,8 @@ void RuntimeDecorator::decorateUIRuntime(jsi::Runtime &rt,
   };
   jsi::Value updateProps = jsi::Function::createFromHostFunction(rt, jsi::PropNameID::forAscii(rt, "_updateProps"), 2, clb);
   rt.global().setProperty(rt, "_updateProps", updateProps);
-  
-  
+
+
   auto clb2 = [requestFrame](
                              jsi::Runtime &rt,
                              const jsi::Value &thisValue,
@@ -98,7 +99,7 @@ void RuntimeDecorator::decorateUIRuntime(jsi::Runtime &rt,
   };
   jsi::Value requestAnimationFrame = jsi::Function::createFromHostFunction(rt, jsi::PropNameID::forAscii(rt, "requestAnimationFrame"), 1, clb2);
   rt.global().setProperty(rt, "requestAnimationFrame", requestAnimationFrame);
-  
+
   auto clb3 = [scrollTo](
                          jsi::Runtime &rt,
                          const jsi::Value &thisValue,
@@ -114,7 +115,7 @@ void RuntimeDecorator::decorateUIRuntime(jsi::Runtime &rt,
   };
   jsi::Value scrollToFunction = jsi::Function::createFromHostFunction(rt, jsi::PropNameID::forAscii(rt, "_scrollTo"), 4, clb3);
   rt.global().setProperty(rt, "_scrollTo", scrollToFunction);
-  
+
   auto clb4 = [measure](
                         jsi::Runtime &rt,
                         const jsi::Value &thisValue,
@@ -131,7 +132,7 @@ void RuntimeDecorator::decorateUIRuntime(jsi::Runtime &rt,
   };
   jsi::Value measureFunction = jsi::Function::createFromHostFunction(rt, jsi::PropNameID::forAscii(rt, "_measure"), 1, clb4);
   rt.global().setProperty(rt, "_measure", measureFunction);
-  
+
   auto clb6 = [getCurrentTime](
                                jsi::Runtime &rt,
                                const jsi::Value &thisValue,
@@ -142,16 +143,21 @@ void RuntimeDecorator::decorateUIRuntime(jsi::Runtime &rt,
   };
   jsi::Value timeFun = jsi::Function::createFromHostFunction(rt, jsi::PropNameID::forAscii(rt, "_getCurrentTime"), 0, clb6);
   rt.global().setProperty(rt, "_getCurrentTime", timeFun);
-  
+
   rt.global().setProperty(rt, "_frameTimestamp", jsi::Value::undefined());
   rt.global().setProperty(rt, "_eventTimestamp", jsi::Value::undefined());
 }
 
-bool RuntimeDecorator::isWorkletRuntime(jsi::Runtime& rt) {
-  auto isUi = rt.global().getProperty(rt, "_WORKLET");
+bool RuntimeDecorator::isUIRuntime(jsi::Runtime& rt) {
+  auto isUi = rt.global().getProperty(rt, "_UI");
   return isUi.isBool() && isUi.getBool();
 }
 
+bool RuntimeDecorator::isWorkletRuntime(jsi::Runtime& rt) {
+  auto isWorklet = rt.global().getProperty(rt, "_WORKLET");
+  return isWorklet.isBool() && isWorklet.getBool();
+}
+
 bool RuntimeDecorator::isReactRuntime(jsi::Runtime& rt) {
   return !isWorkletRuntime(rt);
 }

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

@@ -13,11 +13,16 @@ using namespace facebook;
 
 namespace reanimated {
 
+struct StaticStoreUser {
+    std::atomic<int> ctr;
+    std::unordered_map<int, std::vector<std::shared_ptr<jsi::Value>>> store;
+    std::recursive_mutex storeMutex;
+};
+
 class StoreUser {
   int identifier = 0;
-  static std::atomic<int> ctr;
-  static std::unordered_map<int, std::vector<std::shared_ptr<jsi::Value>>> store;
-  static std::recursive_mutex storeMutex;
+  static std::shared_ptr<StaticStoreUser> staticStoreUserData;
+  std::shared_ptr<StaticStoreUser> storeUserData;
   std::weak_ptr<Scheduler> scheduler;
   
 public:

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

@@ -20,7 +20,17 @@ public:
                                 MeasuringFunction measure,
                                 TimeProviderFunction getCurrentTime);
   
+  /**
+   Returns true if the given Runtime is the Reanimated UI-Thread Runtime.
+   */
+  static bool isUIRuntime(jsi::Runtime &rt);
+  /**
+   Returns true if the given Runtime is a Runtime that supports Workletization. (REA, Vision, ...)
+   */
   static bool isWorkletRuntime(jsi::Runtime &rt);
+  /**
+   Returns true if the given Runtime is the default React-JS Runtime.
+   */
   static bool isReactRuntime(jsi::Runtime &rt);
 };
 

package/README.md

@@ -1,7 +1,6 @@
-<p align="center">
-  <h1 align="center">React Native Reanimated</h1>
-  <h3 align="center">React Native's Animated library reimplemented</h3>
-</p>
+<img src="https://user-images.githubusercontent.com/16062886/117443145-ff868480-af37-11eb-8680-648bccf0d0ce.png" alt="React Native Reanimated by Software Mansion" width="100%">
+
+### React Native's Animated library reimplemented
 
 > Reanimated 2 is here! Check out our [documentation page](https://docs.swmansion.com/react-native-reanimated/) for more information
 

package/RNReanimated.podspec

@@ -5,9 +5,10 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 reactVersion = '0.0.0'
 
 begin
-  reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "react-native", "package.json")))["version"]
+  reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "..", "node_modules", "react-native", "package.json")))["version"]
 rescue
-  reactVersion = '0.64.0'
+  # Example app
+  reactVersion = JSON.parse(File.read(File.join(__dir__, "node_modules", "react-native", "package.json")))["version"]
 end
 
 rnVersion = reactVersion.split('.')[1]
@@ -20,7 +21,7 @@ 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 = '2020.01.13.00'
+folly_version = '2021.04.26.00'
 boost_compiler_flags = '-Wno-documentation'
 
 Pod::Spec.new do |s|
@@ -49,12 +50,12 @@ 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-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\" "
   }
   s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
   s.xcconfig               = {
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\"",
+    "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  }
 
   s.requires_arc = true
@@ -95,4 +96,3 @@ Pod::Spec.new do |s|
   s.dependency "#{folly_prefix}Folly"
 
 end
-

package/android/build.gradle

@@ -1,4 +1,6 @@
-import groovy.json.JsonSlurper;
+import groovy.json.JsonSlurper
+import java.util.regex.Matcher
+import java.util.regex.Pattern
 configurations.maybeCreate("default")
 
 def inputFile = new File(projectDir, '../../react-native/package.json')
@@ -6,4 +8,78 @@ def json = new JsonSlurper().parseText(inputFile.text)
 def reactNativeVersion = json.version as String
 def (major, minor, patch) = reactNativeVersion.tokenize('.')
 
-artifacts.add("default", file("react-native-reanimated-${minor}.aar"))
+def engine = "jsc"
+
+abstract class replaceSoTask extends DefaultTask {
+    public static String appName = ":app"
+    public static String buildDir = "../../../android/app/build"
+
+    @TaskAction
+    def run() {
+        for(def abiVersion in ["x86", "x86_64", "armeabi-v7a", "arm64-v8a"]) {
+            ant.sequential {
+                copy(
+                        tofile: "${buildDir}/intermediates/merged_native_libs/debug/out/lib/${abiVersion}/libfbjni.so",
+                        file: "../libSo/fbjni/jni/${abiVersion}/libfbjni.so",
+                        overwrite: true
+                )
+            }
+        }
+    }
+}
+
+def getCurrentFlavor() {
+    Gradle gradle = getGradle()
+    String taskRequestName = gradle.getStartParameter().getTaskRequests().toString()
+    Pattern pattern = Pattern.compile("(assemble|install|generate)(\\w+)(Release|Debug)")
+    Matcher matcher = pattern.matcher(taskRequestName)
+
+    if(matcher.find()) {
+        return matcher.group(2)
+    }
+
+    return ""
+}
+
+def replaceSoTaskDebug
+def replaceSoTaskRelease
+if(Integer.parseInt(minor) < 65) {
+    tasks.register("replaceSoTaskDebug", replaceSoTask)
+    tasks.register("replaceSoTaskRelease", replaceSoTask)
+    replaceSoTaskDebug = project.getTasks().getByPath(":react-native-reanimated:replaceSoTaskDebug")
+    replaceSoTaskRelease = project.getTasks().getByPath(":react-native-reanimated:replaceSoTaskRelease")
+}
+
+rootProject.getSubprojects().forEach({project ->
+    if (project.plugins.hasPlugin("com.android.application")) {
+        if(project.ext.react.enableHermes) {
+            engine = "hermes"
+        }
+
+        if(project.getProperties().get("android") && Integer.parseInt(minor) < 65) {
+            def projectProperties = project.getProperties()
+            if(!projectProperties.get("reanimated")
+                    || (projectProperties.get("reanimated") && projectProperties.get("reanimated").get("enablePackagingOptions"))
+            ) {
+                def flavorString = getCurrentFlavor()
+                replaceSoTask.appName = project.getProperties().path
+                replaceSoTask.buildDir = project.getProperties().buildDir
+                def appName = project.getProperties().path
+
+                replaceSoTaskDebug.dependsOn(
+                        project.getTasks().getByPath("${appName}:merge${flavorString}DebugNativeLibs"),
+                        project.getTasks().getByPath("${appName}:strip${flavorString}DebugDebugSymbols")
+                )
+                project.getTasks().getByPath("${appName}:package${flavorString}Debug").dependsOn(replaceSoTaskDebug)
+
+                replaceSoTaskRelease.dependsOn(
+                        project.getTasks().getByPath("${appName}:merge${flavorString}ReleaseNativeLibs"),
+                        project.getTasks().getByPath("${appName}:strip${flavorString}ReleaseDebugSymbols")
+                )
+                project.getTasks().getByPath("${appName}:package${flavorString}Release").dependsOn(replaceSoTaskRelease)
+            }
+        }
+    }
+})
+
+artifacts.add("default", file("react-native-reanimated-${minor}-${engine}.aar"))

package/ios/REANodesManager.m

@@ -481,6 +481,9 @@
       if (strongSelf == nil) {
         return;
       }
+      if (eventHandler == nil) {
+        return;
+      }
       eventHandler(eventHash, event);
       if ([strongSelf isDirectEvent:event]) {
         [strongSelf performOperations];

package/ios/native/NativeMethods.mm

@@ -10,7 +10,7 @@ std::vector<std::pair<std::string,double>> measure(int viewTag, RCTUIManager *ui
   UIView *rootView = view;
 
   if (view == nil) {
-    return std::vector<std::pair<std::string, double>>(0, std::make_pair("x", -1234567.0));
+    return std::vector<std::pair<std::string, double>>(1, std::make_pair("x", -1234567.0));
   }
 
   while (rootView.superview && ![rootView isReactRootView]) {
@@ -18,7 +18,7 @@ std::vector<std::pair<std::string,double>> measure(int viewTag, RCTUIManager *ui
   }
 
   if (rootView == nil || (![rootView isReactRootView])) {
-    return std::vector<std::pair<std::string, double>>(0, std::make_pair("x", -1234567.0));
+    return std::vector<std::pair<std::string, double>>(1, std::make_pair("x", -1234567.0));
   }
 
   CGRect frame = view.frame;

package/ios/native/NativeProxy.mm

@@ -8,7 +8,9 @@
 #import <React/RCTFollyConvert.h>
 #import <React/RCTUIManager.h>
 
-#if __has_include(<hermes/hermes.h>)
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
+#import <reacthermes/HermesExecutorFactory.h>
+#elif __has_include(<hermes/hermes.h>)
 #import <hermes/hermes.h>
 #else
 #import <jsi/JSCRuntime.h>
@@ -111,7 +113,9 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(std::shared_ptr<C
   };
 
 
-#if __has_include(<hermes/hermes.h>)
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
+  std::unique_ptr<jsi::Runtime> animatedRuntime = facebook::hermes::makeHermesRuntime();
+#elif __has_include(<hermes/hermes.h>)
   std::unique_ptr<jsi::Runtime> animatedRuntime = facebook::hermes::makeHermesRuntime();
 #else
   std::unique_ptr<jsi::Runtime> animatedRuntime = facebook::jsc::makeJSCRuntime();

package/ios/native/REAInitializer.h

@@ -0,0 +1,32 @@
+#import <Foundation/Foundation.h>
+#import <React/RCTCxxBridgeDelegate.h>
+#import <RNReanimated/NativeProxy.h>
+#import <RNReanimated/REAModule.h>
+#import <ReactCommon/RCTTurboModuleManager.h>
+#import <React/RCTBridge+Private.h>
+#import <React/RCTCxxBridgeDelegate.h>
+#import <RNReanimated/REAEventDispatcher.h>
+#import <jsireact/JSIExecutor.h>
+
+#if RNVERSION >= 64
+#import <React/RCTJSIExecutorRuntimeInstaller.h>
+#endif
+
+#if RNVERSION < 63
+#import <ReactCommon/BridgeJSCallInvoker.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+namespace reanimated {
+
+using namespace facebook;
+using namespace react;
+
+JSIExecutor::RuntimeInstaller REAJSIExecutorRuntimeInstaller(
+    RCTBridge* bridge,
+    JSIExecutor::RuntimeInstaller runtimeInstallerToWrap
+);
+
+}
+NS_ASSUME_NONNULL_END

package/ios/native/REAInitializer.mm

@@ -0,0 +1,54 @@
+#import "REAInitializer.h"
+
+@interface RCTEventDispatcher(Reanimated)
+
+- (void)setBridge:(RCTBridge*)bridge;
+
+@end
+
+namespace reanimated {
+
+using namespace facebook;
+using namespace react;
+
+JSIExecutor::RuntimeInstaller REAJSIExecutorRuntimeInstaller(
+    RCTBridge* bridge,
+    JSIExecutor::RuntimeInstaller runtimeInstallerToWrap)
+{
+    [bridge moduleForClass:[RCTEventDispatcher class]];
+    RCTEventDispatcher *eventDispatcher = [REAEventDispatcher new];
+    #if RNVERSION >= 66
+    RCTCallableJSModules *callableJSModules = [RCTCallableJSModules new];
+    [bridge setValue:callableJSModules forKey:@"_callableJSModules"];
+    [callableJSModules setBridge:bridge];
+    [eventDispatcher setValue:callableJSModules forKey:@"_callableJSModules"];
+    [eventDispatcher setValue:bridge forKey:@"_bridge"];
+    [eventDispatcher initialize];
+    #else
+    [eventDispatcher setBridge:bridge];
+    #endif
+    [bridge updateModuleWithInstance:eventDispatcher];
+     _bridge_reanimated = bridge;
+    const auto runtimeInstaller = [bridge, runtimeInstallerToWrap](facebook::jsi::Runtime &runtime) {
+      if (!bridge) {
+        return;
+      }
+#if RNVERSION >= 63
+    auto reanimatedModule = reanimated::createReanimatedModule(bridge.jsCallInvoker);
+#else
+    auto callInvoker = std::make_shared<react::BridgeJSCallInvoker>(bridge.reactInstance);
+    auto reanimatedModule = reanimated::createReanimatedModule(callInvoker);
+#endif
+    runtime.global().setProperty(runtime,
+                                 jsi::PropNameID::forAscii(runtime, "__reanimatedModuleProxy"),
+                                 jsi::Object::createFromHostObject(runtime, reanimatedModule));
+        
+        if (runtimeInstallerToWrap) {
+            runtimeInstallerToWrap(runtime);
+        }
+    };
+    return runtimeInstaller;
+}
+
+
+}