react-native-reanimated 3.0.0-rc.2 → 3.0.0-rc.4

package/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

package/android/src/fabric/java/com/swmansion/reanimated/NativeProxy.java

@@ -7,6 +7,7 @@ import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.queue.MessageQueueThread;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeArray;
@@ -159,7 +160,9 @@ public class NativeProxy {
       LayoutAnimations LayoutAnimations,
       FabricUIManager fabricUIManager);
 
-  private native void installJSIBindings(FabricUIManager fabricUIManager);
+  private native void installJSIBindings(
+    MessageQueueThread messageQueueThread,
+    FabricUIManager fabricUIManager);
 
   public native boolean isAnyHandlerWaitingForEvent(String eventName);
 
@@ -223,14 +226,12 @@ public class NativeProxy {
   }
 
   @DoNotStrip
-  private String getUptime() {
+  private long getCurrentTime() {
     if (slowAnimationsEnabled) {
       final long ANIMATIONS_DRAG_FACTOR = 10;
-      return Long.toString(
-          this.firstUptime
-              + (SystemClock.uptimeMillis() - this.firstUptime) / ANIMATIONS_DRAG_FACTOR);
+      return this.firstUptime + (SystemClock.uptimeMillis() - this.firstUptime) / ANIMATIONS_DRAG_FACTOR;
     } else {
-      return Long.toString(SystemClock.uptimeMillis());
+      return SystemClock.uptimeMillis();
     }
   }
 
@@ -294,8 +295,9 @@ public class NativeProxy {
     }
     mNodesManager = mContext.get().getNativeModule(ReanimatedModule.class).getNodesManager();
     FabricUIManager fabricUIManager =
-        (FabricUIManager) UIManagerHelper.getUIManager(mContext.get(), UIManagerType.FABRIC);
-    installJSIBindings(fabricUIManager);
+      (FabricUIManager) UIManagerHelper.getUIManager(mContext.get(), UIManagerType.FABRIC);
+    ReanimatedMessageQueueThread messageQueueThread = new ReanimatedMessageQueueThread();
+    installJSIBindings(messageQueueThread, fabricUIManager);
     AnimationsManager animationsManager =
         mContext
             .get()

package/android/src/main/cpp/AndroidErrorHandler.cpp

@@ -1,5 +1,6 @@
 #include "AndroidErrorHandler.h"
 #include <fbjni/fbjni.h>
+#include <exception>
 #include <string>
 #include "Logger.h"
 
@@ -17,11 +18,9 @@ void AndroidErrorHandler::raiseSpec() {
     return;
   }
 
-  static const auto cls = javaClassStatic();
-  static auto method = cls->getStaticMethod<void(std::string)>("raise");
-  method(cls, error->message);
-
+  // mark error as handled before this method throws exception
   this->error->handled = true;
+  throw std::runtime_error(this->error->message);
 }
 
 std::shared_ptr<Scheduler> AndroidErrorHandler::getScheduler() {

package/android/src/main/cpp/{headers/AndroidErrorHandler.h → AndroidErrorHandler.h}

@@ -11,15 +11,12 @@
 
 namespace reanimated {
 
-class AndroidErrorHandler : public JavaClass<AndroidErrorHandler>,
-                            public ErrorHandler {
+class AndroidErrorHandler : public ErrorHandler {
   std::shared_ptr<ErrorWrapper> error;
   std::shared_ptr<Scheduler> scheduler;
   void raiseSpec() override;
 
  public:
-  static auto constexpr kJavaDescriptor =
-      "Lcom/swmansion/reanimated/AndroidErrorHandler;";
   explicit AndroidErrorHandler(std::shared_ptr<Scheduler> scheduler);
   std::shared_ptr<Scheduler> getScheduler() override;
   std::shared_ptr<ErrorWrapper> getError() override;

package/android/src/main/cpp/AndroidLogger.cpp

@@ -1,6 +1,9 @@
-#include "AndroidLogger.h"
 #include <android/log.h>
+#include <memory>
+
+#include "AndroidLogger.h"
 #include "Logger.h"
+
 #define APPNAME "NATIVE_REANIMATED"
 
 namespace reanimated {

package/android/src/main/cpp/NativeProxy.cpp

@@ -1,26 +1,20 @@
+#include <android/log.h>
 #include <fbjni/fbjni.h>
 #include <jsi/JSIDynamic.h>
 #include <jsi/jsi.h>
+#include <react/jni/JMessageQueueThread.h>
 #include <react/jni/ReadableNativeArray.h>
 #include <react/jni/ReadableNativeMap.h>
 
 #include <memory>
 #include <string>
 
-#if JS_RUNTIME_HERMES
-#include <hermes/hermes.h>
-#elif JS_RUNTIME_V8
-#include <v8runtime/V8RuntimeFactory.h>
-#else
-#include <jsi/JSCRuntime.h>
-#endif
-
-#include <android/log.h>
 #include "AndroidErrorHandler.h"
 #include "AndroidScheduler.h"
 #include "LayoutAnimationsProxy.h"
 #include "NativeProxy.h"
 #include "PlatformDepMethodsHolder.h"
+#include "ReanimatedRuntime.h"
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #include <JFabricUIManager.h>
@@ -101,7 +95,9 @@ jni::local_ref<NativeProxy::jhybriddata> NativeProxy::initHybrid(
 }
 
 void NativeProxy::installJSIBindings(
+    jni::alias_ref<JavaMessageQueueThread::javaobject> messageQueueThread
 #ifdef RCT_NEW_ARCH_ENABLED
+    ,
     jni::alias_ref<facebook::react::JFabricUIManager::javaobject>
         fabricUIManager
 #endif
@@ -130,11 +126,10 @@ void NativeProxy::installJSIBindings(
 #endif
 
   auto getCurrentTime = [this]() {
-    auto method =
-        javaPart_->getClass()->getMethod<local_ref<JString>()>("getUptime");
-    local_ref<JString> output = method(javaPart_.get());
-    return static_cast<double>(
-        std::strtoll(output->toStdString().c_str(), NULL, 10));
+    static const auto method =
+        javaPart_->getClass()->getMethod<jlong()>("getCurrentTime");
+    jlong output = method(javaPart_.get());
+    return static_cast<double>(output);
   };
 
   auto requestRender = [this, getCurrentTime](
@@ -206,21 +201,10 @@ void NativeProxy::installJSIBindings(
     unsubscribeFromKeyboardEvents(listenerId);
   };
 
-#if JS_RUNTIME_HERMES
-  auto config =
-      ::hermes::vm::RuntimeConfig::Builder().withEnableSampleProfiling(false);
-  std::shared_ptr<jsi::Runtime> animatedRuntime =
-      facebook::hermes::makeHermesRuntime(config.build());
-#elif JS_RUNTIME_V8
-  auto config = std::make_unique<rnv8::V8RuntimeConfig>();
-  config->enableInspector = false;
-  config->appName = "reanimated";
-  std::shared_ptr<jsi::Runtime> animatedRuntime =
-      rnv8::createSharedV8Runtime(runtime_, std::move(config));
-#else
+  auto jsQueue = std::make_shared<JMessageQueueThread>(messageQueueThread);
   std::shared_ptr<jsi::Runtime> animatedRuntime =
-      facebook::jsc::makeJSCRuntime();
-#endif
+      ReanimatedRuntime::make(jsQueue);
+
   auto workletRuntimeValue =
       runtime_->global()
           .getProperty(*runtime_, "ArrayBuffer")

package/android/src/main/cpp/{headers/NativeProxy.h → NativeProxy.h}

@@ -186,13 +186,15 @@ class NativeProxy : public jni::HybridClass<NativeProxy> {
 #endif
 #ifdef RCT_NEW_ARCH_ENABLED
   void installJSIBindings(
+      jni::alias_ref<JavaMessageQueueThread::javaobject> messageQueueThread,
       jni::alias_ref<JFabricUIManager::javaobject> fabricUIManager);
   void synchronouslyUpdateUIProps(
       jsi::Runtime &rt,
       Tag viewTag,
       const jsi::Value &uiProps);
 #else
-  void installJSIBindings();
+  void installJSIBindings(
+      jni::alias_ref<JavaMessageQueueThread::javaobject> messageQueueThread);
 #endif
   bool isAnyHandlerWaitingForEvent(std::string);
   void performOperations();

package/android/src/main/java/com/swmansion/reanimated/ReanimatedMessageQueueThreadBase.java

@@ -0,0 +1,72 @@
+package com.swmansion.reanimated;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.queue.MessageQueueThread;
+import com.facebook.react.bridge.queue.MessageQueueThreadImpl;
+import com.facebook.react.bridge.queue.MessageQueueThreadPerfStats;
+import com.facebook.react.bridge.queue.MessageQueueThreadSpec;
+import java.lang.reflect.Field;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+
+// This class is an almost exact copy of MessageQueueThreadImpl taken from here:
+// https://github.com/facebook/react-native/blob/main/ReactAndroid/src/main/java/com/facebook/react/bridge/queue/MessageQueueThreadImpl.java
+// The only method that has changed is `quitSynchronous()` (see comment above
+// function implementation for details).
+@DoNotStrip
+public abstract class ReanimatedMessageQueueThreadBase implements MessageQueueThread {
+  protected final MessageQueueThreadImpl messageQueueThread;
+
+  public ReanimatedMessageQueueThreadBase() {
+    messageQueueThread =
+        MessageQueueThreadImpl.create(
+            MessageQueueThreadSpec.mainThreadSpec(),
+            exception -> {
+              throw new RuntimeException(exception);
+            });
+  }
+
+  @Override
+  public <T> Future<T> callOnQueue(Callable<T> callable) {
+    return messageQueueThread.callOnQueue(callable);
+  }
+
+  @Override
+  public boolean isOnThread() {
+    return messageQueueThread.isOnThread();
+  }
+
+  @Override
+  public void assertIsOnThread() {
+    messageQueueThread.assertIsOnThread();
+  }
+
+  @Override
+  public void assertIsOnThread(String s) {
+    messageQueueThread.assertIsOnThread(s);
+  }
+
+  // We don't want to quit the main looper (which is what MessageQueueThreadImpl would have done),
+  // but we still want to prevent anything else from executing.
+  @Override
+  public void quitSynchronous() {
+    try {
+      Field mIsFinished = messageQueueThread.getClass().getDeclaredField("mIsFinished");
+      mIsFinished.setAccessible(true);
+      mIsFinished.set(messageQueueThread, true);
+      mIsFinished.setAccessible(false);
+    } catch (NoSuchFieldException | IllegalAccessException e) {
+      e.printStackTrace();
+    }
+  }
+
+  @Override
+  public MessageQueueThreadPerfStats getPerfStats() {
+    return messageQueueThread.getPerfStats();
+  }
+
+  @Override
+  public void resetPerfStats() {
+    messageQueueThread.resetPerfStats();
+  }
+}

package/android/src/main/java/com/swmansion/reanimated/keyboardObserver/ReanimatedKeyboardEventListener.java

@@ -57,7 +57,8 @@ public class ReanimatedKeyboardEventListener {
         rootView,
         (v, insets) -> {
           int paddingBottom = 0;
-          if (!BuildConfig.IS_NEW_ARCHITECTURE_ENABLED && BuildConfig.REACT_NATIVE_VERSION < 70) {
+          if (!BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+              && BuildConfig.REACT_NATIVE_MINOR_VERSION < 70) {
             paddingBottom = insets.getInsets(WindowInsetsCompat.Type.navigationBars()).bottom;
           }
           int paddingTop = insets.getInsets(WindowInsetsCompat.Type.systemBars()).top;

package/android/src/main/java/com/swmansion/reanimated/layoutReanimation/ReanimatedUIManager.java

@@ -20,7 +20,7 @@ class ReaUiImplementationProvider extends UIImplementationProvider {
       ViewManagerRegistry viewManagerRegistry,
       EventDispatcher eventDispatcher,
       int minTimeLeftInFrameForNonBatchedOperationMs) {
-    return new ReanimatedUIImplementation(
+    return new com.facebook.react.uimanager.ReanimatedUIImplementation(
         reactContext,
         viewManagerRegistry,
         eventDispatcher,

package/android/src/paper/java/com/swmansion/reanimated/NativeProxy.java

@@ -7,6 +7,7 @@ import com.facebook.jni.HybridData;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.queue.MessageQueueThread;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeArray;
@@ -152,7 +153,7 @@ public class NativeProxy {
       Scheduler scheduler,
       LayoutAnimations LayoutAnimations);
 
-  private native void installJSIBindings();
+  private native void installJSIBindings(MessageQueueThread messageQueueThread);
 
   public native boolean isAnyHandlerWaitingForEvent(String eventName);
 
@@ -216,14 +217,12 @@ public class NativeProxy {
   }
 
   @DoNotStrip
-  private String getUptime() {
+  private long getCurrentTime() {
     if (slowAnimationsEnabled) {
       final long ANIMATIONS_DRAG_FACTOR = 10;
-      return Long.toString(
-          this.firstUptime
-              + (SystemClock.uptimeMillis() - this.firstUptime) / ANIMATIONS_DRAG_FACTOR);
+      return this.firstUptime + (SystemClock.uptimeMillis() - this.firstUptime) / ANIMATIONS_DRAG_FACTOR;
     } else {
-      return Long.toString(SystemClock.uptimeMillis());
+      return SystemClock.uptimeMillis();
     }
   }
 
@@ -286,7 +285,8 @@ public class NativeProxy {
       return;
     }
     mNodesManager = mContext.get().getNativeModule(ReanimatedModule.class).getNodesManager();
-    installJSIBindings();
+    ReanimatedMessageQueueThread messageQueueThread = new ReanimatedMessageQueueThread();
+    installJSIBindings(messageQueueThread);
     AnimationsManager animationsManager =
         mContext
             .get()

package/android/src/reactNativeVersionPatch/messageQueueThread/67/com/swmansion/reanimated/ReanimatedMessageQueueThread.java

@@ -0,0 +1,12 @@
+package com.swmansion.reanimated;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.swmansion.reanimated.ReanimatedMessageQueueThreadBase;
+
+@DoNotStrip
+public class ReanimatedMessageQueueThread extends ReanimatedMessageQueueThreadBase {
+  @Override
+  public void runOnQueue(Runnable runnable) {
+    messageQueueThread.runOnQueue(runnable);
+  }
+}

package/android/src/reactNativeVersionPatch/messageQueueThread/latest/com/swmansion/reanimated/ReanimatedMessageQueueThread.java

@@ -0,0 +1,12 @@
+package com.swmansion.reanimated;
+
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.swmansion.reanimated.ReanimatedMessageQueueThreadBase;
+
+@DoNotStrip
+public class ReanimatedMessageQueueThread extends ReanimatedMessageQueueThreadBase {
+  @Override
+  public boolean runOnQueue(Runnable runnable) {
+    return messageQueueThread.runOnQueue(runnable);
+  }
+}

package/ios/REAModule.mm

@@ -19,6 +19,7 @@
 
 #import <RNReanimated/REAModule.h>
 #import <RNReanimated/REANodesManager.h>
+#import <RNReanimated/SingleInstanceChecker.h>
 
 using namespace facebook::react;
 using namespace reanimated;
@@ -47,10 +48,21 @@ typedef void (^AnimatedOperation)(REANodesManager *nodesManager);
 #else
   NSMutableArray<AnimatedOperation> *_operations;
 #endif
+#ifdef DEBUG
+  SingleInstanceChecker<REAModule> singleInstanceChecker_;
+#endif
+  bool hasListeners;
 }
 
 RCT_EXPORT_MODULE(ReanimatedModule);
 
+#ifdef RCT_NEW_ARCH_ENABLED
++ (BOOL)requiresMainQueueSetup
+{
+  return YES;
+}
+#endif // RCT_NEW_ARCH_ENABLED
+
 - (void)invalidate
 {
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -281,4 +293,21 @@ RCT_EXPORT_METHOD(installTurboModule)
   [_nodesManager dispatchEvent:event];
 }
 
+- (void)startObserving
+{
+  hasListeners = YES;
+}
+
+- (void)stopObserving
+{
+  hasListeners = NO;
+}
+
+- (void)sendEventWithName:(NSString *)eventName body:(id)body
+{
+  if (hasListeners) {
+    [super sendEventWithName:eventName body:body];
+  }
+}
+
 @end

package/ios/keyboardObserver/REAKeyboardEventObserver.m

@@ -1,5 +1,5 @@
-#import "REAKeyboardEventObserver.h"
 #import <Foundation/Foundation.h>
+#import <RNReanimated/REAKeyboardEventObserver.h>
 #import <React/RCTDefines.h>
 #import <React/RCTUIManager.h>
 

package/ios/native/NativeProxy.mm

@@ -6,10 +6,12 @@
 #import <RNReanimated/REAIOSScheduler.h>
 #import <RNReanimated/REAJSIUtils.h>
 #import <RNReanimated/REAKeyboardEventObserver.h>
+#import <RNReanimated/REAMessageThread.h>
 #import <RNReanimated/REAModule.h>
 #import <RNReanimated/REANodesManager.h>
 #import <RNReanimated/REAUIManager.h>
 #import <RNReanimated/RNGestureHandlerStateManager.h>
+#import <RNReanimated/ReanimatedRuntime.h>
 #import <RNReanimated/ReanimatedSensorContainer.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -30,14 +32,6 @@
 #import <dlfcn.h>
 #endif
 
-#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>
-#endif
-
 namespace reanimated {
 
 using namespace facebook;
@@ -201,20 +195,19 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
   };
 #endif
 
-#if __has_include(<reacthermes/HermesExecutorFactory.h>)
-  std::shared_ptr<jsi::Runtime> animatedRuntime = facebook::hermes::makeHermesRuntime();
-#elif __has_include(<hermes/hermes.h>)
-  std::shared_ptr<jsi::Runtime> animatedRuntime = facebook::hermes::makeHermesRuntime();
-#else
-  std::shared_ptr<jsi::Runtime> animatedRuntime = facebook::jsc::makeJSCRuntime();
-#endif
+  auto jsQueue = std::make_shared<REAMessageThread>([NSRunLoop currentRunLoop], ^(NSError *error) {
+    throw error;
+  });
+  std::shared_ptr<jsi::Runtime> animatedRuntime = ReanimatedRuntime::make(jsQueue);
 
   std::shared_ptr<Scheduler> scheduler = std::make_shared<REAIOSScheduler>(jsInvoker);
   std::shared_ptr<ErrorHandler> errorHandler = std::make_shared<REAIOSErrorHandler>(scheduler);
   std::shared_ptr<NativeReanimatedModule> module;
 
-  auto requestRender = [reanimatedModule, &module](std::function<void(double)> onRender, jsi::Runtime &rt) {
-    [reanimatedModule.nodesManager postOnAnimation:^(CADisplayLink *displayLink) {
+  auto nodesManager = reanimatedModule.nodesManager;
+
+  auto requestRender = [nodesManager, &module](std::function<void(double)> onRender, jsi::Runtime &rt) {
+    [nodesManager postOnAnimation:^(CADisplayLink *displayLink) {
       double frameTimestamp = calculateTimestampWithSlowAnimations(displayLink.targetTimestamp) * 1000;
       jsi::Object global = rt.global();
       jsi::String frameTimestampName = jsi::String::createFromAscii(rt, "_frameTimestamp");
@@ -225,10 +218,10 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
   };
 
 #ifdef RCT_NEW_ARCH_ENABLED
-  auto synchronouslyUpdateUIPropsFunction = [reanimatedModule](jsi::Runtime &rt, Tag tag, const jsi::Value &props) {
+  auto synchronouslyUpdateUIPropsFunction = [nodesManager](jsi::Runtime &rt, Tag tag, const jsi::Value &props) {
     NSNumber *viewTag = @(tag);
     NSDictionary *uiProps = convertJSIObjectToNSDictionary(rt, props.asObject(rt));
-    [reanimatedModule.nodesManager synchronouslyUpdateViewOnUIThread:viewTag props:uiProps];
+    [nodesManager synchronouslyUpdateViewOnUIThread:viewTag props:uiProps];
   };
 
   std::shared_ptr<LayoutAnimationsProxy> layoutAnimationsProxy =

package/ios/native/REAInitializer.h

@@ -7,11 +7,11 @@
 #import <ReactCommon/RCTTurboModuleManager.h>
 #import <jsireact/JSIExecutor.h>
 
-#if RNVERSION >= 64
+#if REACT_NATIVE_MINOR_VERSION >= 64
 #import <React/RCTJSIExecutorRuntimeInstaller.h>
 #endif
 
-#if RNVERSION < 63
+#if REACT_NATIVE_MINOR_VERSION < 63
 #import <ReactCommon/BridgeJSCallInvoker.h>
 #endif
 

package/ios/native/REAInitializer.mm

@@ -24,7 +24,7 @@ JSIExecutor::RuntimeInstaller REAJSIExecutorRuntimeInstaller(
 
   [bridge moduleForClass:[RCTEventDispatcher class]];
   RCTEventDispatcher *eventDispatcher = [REAEventDispatcher new];
-#if RNVERSION >= 66
+#if REACT_NATIVE_MINOR_VERSION >= 66
   RCTCallableJSModules *callableJSModules = [RCTCallableJSModules new];
   [bridge setValue:callableJSModules forKey:@"_callableJSModules"];
   [callableJSModules setBridge:bridge];
@@ -39,7 +39,7 @@ JSIExecutor::RuntimeInstaller REAJSIExecutorRuntimeInstaller(
     if (!bridge) {
       return;
     }
-#if RNVERSION >= 63
+#if REACT_NATIVE_MINOR_VERSION >= 63
     auto reanimatedModule = reanimated::createReanimatedModule(bridge, bridge.jsCallInvoker);
 #else
     auto callInvoker = std::make_shared<react::BridgeJSCallInvoker>(bridge.reactInstance);

package/ios/native/REAMessageThread.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#import <memory>
+#import <string>
+
+#import <Foundation/Foundation.h>
+
+#import <React/RCTJavaScriptExecutor.h>
+#import <React/RCTMessageThread.h>
+#import <cxxreact/MessageQueueThread.h>
+
+namespace facebook {
+namespace react {
+
+class REAMessageThread : public RCTMessageThread {
+ public:
+  using RCTMessageThread::RCTMessageThread;
+  virtual void quitSynchronous() override;
+};
+
+} // namespace react
+} // namespace facebook

package/ios/native/REAMessageThread.mm

@@ -0,0 +1,38 @@
+#import <RNReanimated/REAMessageThread.h>
+
+#include <condition_variable>
+#include <mutex>
+
+#import <React/RCTCxxUtils.h>
+#import <React/RCTMessageThread.h>
+#import <React/RCTUtils.h>
+
+namespace facebook {
+namespace react {
+
+// Essentially the same as RCTMessageThread, but with public fields.
+struct REAMessageThreadPublic {
+  // I don't know why we need three vtables (if you know then feel free to
+  // explain it instead of this message), but this is what makes the casts in
+  // quitSynchronous() work correctly.
+  void *vtable1;
+  void *vtable2;
+  void *vtable3;
+  CFRunLoopRef m_cfRunLoop;
+  RCTJavaScriptCompleteBlock m_errorBlock;
+  std::atomic_bool m_shutdown;
+};
+
+// We need to prevent any new code from being executed on the thread as there
+// is an assertion for that in the destructor of RCTMessageThread, but we have
+// to override quitSynchronous() as it would quit the main looper and freeze
+// the app.
+void REAMessageThread::quitSynchronous()
+{
+  RCTMessageThread *rctThread = static_cast<RCTMessageThread *>(this);
+  REAMessageThreadPublic *rctThreadPublic = reinterpret_cast<REAMessageThreadPublic *>(rctThread);
+  rctThreadPublic->m_shutdown = true;
+}
+
+}
+}

package/ios/native/UIResponder+Reanimated.mm

@@ -21,7 +21,7 @@ typedef JSCExecutorFactory ExecutorFactory;
 {
   const auto installer = reanimated::REAJSIExecutorRuntimeInstaller(bridge, NULL);
 
-#if RNVERSION >= 64
+#if REACT_NATIVE_MINOR_VERSION >= 64
   // installs globals such as console, nativePerformanceNow, etc.
   return std::make_unique<ExecutorFactory>(RCTJSIExecutorRuntimeInstaller(installer));
 #else

package/lib/commonjs/createAnimatedComponent.js

@@ -118,11 +118,8 @@ function createAnimatedComponent(Component, options) {
           // TODO update config
           const tag = (0, _reactNative.findNodeHandle)(ref);
 
-          if ((this.props.layout || this.props.entering || this.props.exiting) && tag != null) {
-            if (!(0, _PlatformChecker.shouldBeUseWeb)()) {
-              (0, _core.enableLayoutAnimations)(true, false);
-            }
-
+          if (!(0, _PlatformChecker.shouldBeUseWeb)() && (this.props.layout || this.props.entering || this.props.exiting) && tag != null) {
+            (0, _core.enableLayoutAnimations)(true, false);
             let layout = this.props.layout ? this.props.layout : _Default.DefaultLayout;
             let entering = this.props.entering ? this.props.entering : _Default.DefaultEntering;
             let exiting = this.props.exiting ? this.props.exiting : _Default.DefaultExiting;