react-native-reanimated 3.0.0-rc.6 → 3.0.0-rc.8

package/android/CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.8)
 
 set (CMAKE_VERBOSE_MAKEFILE ON)
 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 -DANDROID -DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION} -DHERMES_ENABLE_DEBUGGER=${HERMES_ENABLE_DEBUGGER} -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -std=c++17 -Wall -Werror")
+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 -DANDROID -DREACT_NATIVE_MINOR_VERSION=${REACT_NATIVE_MINOR_VERSION} -DREANIMATED_VERSION=${REANIMATED_VERSION} -DHERMES_ENABLE_DEBUGGER=${HERMES_ENABLE_DEBUGGER} -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -std=c++17 -Wall -Werror")
 if(${IS_NEW_ARCHITECTURE_ENABLED})
     set (ALL_FLAGS "${DEFAULT_FLAGS} -DRCT_NEW_ARCH_ENABLED")
 else()

package/android/build.gradle

@@ -179,8 +179,11 @@ def checkNoMultipleInstances() {
 def getReanimatedVersion() {
     def inputFile = file(projectDir.path + '/../package.json')
     def json = new JsonSlurper().parseText(inputFile.text)
-    String reanimatedVersion = json.version
-    def (major, minor, patch) = reanimatedVersion.tokenize('.')
+    return json.version
+}
+
+def getReanimatedMajorVersion() {
+    def (major, minor, patch) = getReanimatedVersion().tokenize('.')
     return major.toInteger()
 }
 
@@ -209,7 +212,8 @@ def REACT_NATIVE_VERSION = reactProperties.getProperty("VERSION_NAME")
 def REACT_NATIVE_MINOR_VERSION = REACT_NATIVE_VERSION.split("\\.")[1].toInteger()
 def FBJNI_VERSION = "0.3.0"
 def REANIMATED_PACKAGE_BUILD = System.getenv("REANIMATED_PACKAGE_BUILD")
-def REANIMATED_MAJOR_VERSION = getReanimatedVersion()
+def REANIMATED_VERSION = getReanimatedVersion()
+def REANIMATED_MAJOR_VERSION = getReanimatedMajorVersion()
 
 // We download various C++ open-source dependencies into downloads.
 // We then copy both the downloaded code and our custom makefiles and headers into third-party-ndk.
@@ -461,7 +465,8 @@ android {
                         "-DCLIENT_SIDE_BUILD=${CLIENT_SIDE_BUILD}",
                         "-DIS_NEW_ARCHITECTURE_ENABLED=${isNewArchitectureEnabled()}",
                         "-DPLAYGROUND_APP_NAME=${getPlaygroundAppName()}",
-                        "-DREANIMATED_PACKAGE_BUILD=${REANIMATED_PACKAGE_BUILD}"
+                        "-DREANIMATED_PACKAGE_BUILD=${REANIMATED_PACKAGE_BUILD}",
+                        "-DREANIMATED_VERSION=${REANIMATED_VERSION}"
                 abiFilters (*reactNativeArchitectures())
                 _stackProtectorFlag ? (cppFlags("-fstack-protector-all")) : null
             }

package/android/src/main/cpp/LayoutAnimations.cpp

@@ -13,10 +13,6 @@ jni::local_ref<LayoutAnimations::jhybriddata> LayoutAnimations::initHybrid(
   return makeCxxInstance(jThis);
 }
 
-void LayoutAnimations::setWeakUIRuntime(std::weak_ptr<jsi::Runtime> wrt) {
-  this->weakUIRuntime = wrt;
-}
-
 void LayoutAnimations::setAnimationStartingBlock(
     AnimationStartingBlock animationStartingBlock) {
   this->animationStartingBlock_ = animationStartingBlock;
@@ -31,17 +27,12 @@ void LayoutAnimations::startAnimationForTag(
 
 void LayoutAnimations::progressLayoutAnimation(
     int tag,
-    const jsi::Value &progress) {
-  if (auto rt = this->weakUIRuntime.lock()) {
-    static const auto method =
-        javaPart_->getClass()
-            ->getMethod<void(int, JMap<JString, JObject>::javaobject)>(
-                "progressLayoutAnimation");
-    method(
-        javaPart_.get(),
-        tag,
-        JNIHelper::ConvertToPropsMap(*rt, progress.asObject(*rt)).get());
-  }
+    const jni::local_ref<JNIHelper::PropsMap> &updates) {
+  static const auto method =
+      javaPart_->getClass()
+          ->getMethod<void(int, JMap<JString, JObject>::javaobject)>(
+              "progressLayoutAnimation");
+  method(javaPart_.get(), tag, updates.get());
 }
 
 void LayoutAnimations::endLayoutAnimation(
@@ -91,5 +82,4 @@ void LayoutAnimations::registerNatives() {
           LayoutAnimations::isLayoutAnimationEnabled),
   });
 }
-
 }; // namespace reanimated

package/android/src/main/cpp/LayoutAnimations.h

@@ -14,7 +14,7 @@ using namespace facebook;
 class LayoutAnimations : public jni::HybridClass<LayoutAnimations> {
   using AnimationStartingBlock = std::function<
       void(int, alias_ref<JString>, alias_ref<JMap<jstring, jstring>>)>;
-  using HasAnimationBlock = std::function<bool(int, std::string)>;
+  using HasAnimationBlock = std::function<bool(int, const std::string &)>;
   using ClearAnimationConfigBlock = std::function<void(int)>;
 
  public:
@@ -31,20 +31,20 @@ class LayoutAnimations : public jni::HybridClass<LayoutAnimations> {
   bool hasAnimationForTag(int tag, std::string type);
   bool isLayoutAnimationEnabled();
 
-  void setWeakUIRuntime(std::weak_ptr<jsi::Runtime> wrt);
   void setAnimationStartingBlock(AnimationStartingBlock animationStartingBlock);
   void setHasAnimationBlock(HasAnimationBlock hasAnimationBlock);
   void setClearAnimationConfigBlock(
       ClearAnimationConfigBlock clearAnimationConfigBlock);
 
-  void progressLayoutAnimation(int tag, const jsi::Value &progress);
+  void progressLayoutAnimation(
+      int tag,
+      const jni::local_ref<JNIHelper::PropsMap> &updates);
   void endLayoutAnimation(int tag, bool cancelled, bool removeView);
   void clearAnimationConfigForTag(int tag);
 
  private:
   friend HybridBase;
   jni::global_ref<LayoutAnimations::javaobject> javaPart_;
-  std::weak_ptr<jsi::Runtime> weakUIRuntime;
   AnimationStartingBlock animationStartingBlock_;
   HasAnimationBlock hasAnimationBlock_;
   ClearAnimationConfigBlock clearAnimationConfigBlock_;

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

@@ -11,7 +11,7 @@
 
 #include "AndroidErrorHandler.h"
 #include "AndroidScheduler.h"
-#include "LayoutAnimationsProxy.h"
+#include "LayoutAnimationsManager.h"
 #include "NativeProxy.h"
 #include "PlatformDepMethodsHolder.h"
 #include "ReanimatedRuntime.h"
@@ -23,6 +23,12 @@
 #include "ReanimatedUIManagerBinding.h"
 #endif
 
+#ifdef REANIMATED_VERSION
+#define STRINGIZE(x) #x
+#define STRINGIZE2(x) STRINGIZE(x)
+#define REANIMATED_VERSION_STRING STRINGIZE2(REANIMATED_VERSION)
+#endif // REANIMATED_VERSION
+
 namespace reanimated {
 
 using namespace facebook;
@@ -225,13 +231,18 @@ void NativeProxy::installJSIBindings(
   runtime_->global().setProperty(*runtime_, "_IS_FABRIC", false);
 #endif
 
+  auto version =
+      jsi::String::createFromUtf8(*runtime_, REANIMATED_VERSION_STRING);
+  runtime_->global().setProperty(*runtime_, "_REANIMATED_VERSION_CPP", version);
+
   std::shared_ptr<ErrorHandler> errorHandler =
       std::make_shared<AndroidErrorHandler>(scheduler_);
+  std::weak_ptr<jsi::Runtime> wrt = animatedRuntime;
 
-  // Layout Animations Start
-
-  auto progressLayoutAnimation = [this](int tag, jsi::Value progress) {
-    this->layoutAnimations->cthis()->progressLayoutAnimation(tag, progress);
+  auto progressLayoutAnimation = [this, wrt](
+                                     int tag, const jsi::Object &newProps) {
+    auto newPropsJNI = JNIHelper::ConvertToPropsMap(*wrt.lock(), newProps);
+    this->layoutAnimations->cthis()->progressLayoutAnimation(tag, newPropsJNI);
   };
 
   auto endLayoutAnimation = [this](int tag, bool isCancelled, bool removeView) {
@@ -239,62 +250,6 @@ void NativeProxy::installJSIBindings(
         tag, isCancelled, removeView);
   };
 
-  std::shared_ptr<LayoutAnimationsProxy> layoutAnimationsProxy =
-      std::make_shared<LayoutAnimationsProxy>(
-          progressLayoutAnimation, endLayoutAnimation, errorHandler);
-  std::weak_ptr<jsi::Runtime> wrt = animatedRuntime;
-  std::weak_ptr<LayoutAnimationsProxy> weakLayoutAnimationsProxy =
-      layoutAnimationsProxy;
-  layoutAnimations->cthis()->setWeakUIRuntime(wrt);
-  std::weak_ptr<ErrorHandler> weakErrorHandler = errorHandler;
-
-  layoutAnimations->cthis()->setAnimationStartingBlock(
-      [wrt, weakLayoutAnimationsProxy, weakErrorHandler](
-          int tag,
-          alias_ref<JString> type,
-          alias_ref<JMap<jstring, jstring>> values) {
-        auto runtime = wrt.lock();
-        auto layoutAnimationsProxy = weakLayoutAnimationsProxy.lock();
-        if (!runtime || !layoutAnimationsProxy) {
-          return;
-        }
-        auto &rt = *runtime;
-        jsi::Object yogaValues(rt);
-        for (const auto &entry : *values) {
-          try {
-            auto key =
-                jsi::String::createFromAscii(rt, entry.first->toStdString());
-            auto value = stod(entry.second->toStdString());
-            yogaValues.setProperty(rt, key, value);
-          } catch (std::invalid_argument e) {
-            if (auto errorHandler = weakErrorHandler.lock()) {
-              errorHandler->setError("Failed to convert value to number");
-              errorHandler->raise();
-            }
-          }
-        }
-
-        layoutAnimationsProxy->startLayoutAnimation(
-            *runtime, tag, type->toStdString(), yogaValues);
-      });
-
-  layoutAnimations->cthis()->setHasAnimationBlock(
-      [weakLayoutAnimationsProxy](int tag, std::string type) {
-        auto layoutAnimationsProxy = weakLayoutAnimationsProxy.lock();
-        return layoutAnimationsProxy &&
-            layoutAnimationsProxy->hasLayoutAnimation(tag, type);
-      });
-
-  layoutAnimations->cthis()->setClearAnimationConfigBlock(
-      [weakLayoutAnimationsProxy](int tag) {
-        auto layoutAnimationsProxy = weakLayoutAnimationsProxy.lock();
-        if (layoutAnimationsProxy) {
-          layoutAnimationsProxy->clearLayoutAnimationConfig(tag);
-        }
-      });
-
-  // Layout Animations End
-
   PlatformDepMethodsHolder platformDepMethodsHolder = {
       requestRender,
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -306,6 +261,8 @@ void NativeProxy::installJSIBindings(
       configurePropsFunction,
 #endif
       getCurrentTime,
+      progressLayoutAnimation,
+      endLayoutAnimation,
       registerSensorFunction,
       unregisterSensorFunction,
       setGestureStateFunction,
@@ -323,12 +280,13 @@ void NativeProxy::installJSIBindings(
 #else
       propObtainer,
 #endif
-      layoutAnimationsProxy,
       platformDepMethodsHolder);
 
-  _nativeReanimatedModule = module;
+  scheduler_->setRuntimeManager(module);
 
+  _nativeReanimatedModule = module;
   std::weak_ptr<NativeReanimatedModule> weakModule = module;
+
 #ifdef RCT_NEW_ARCH_ENABLED
   this->registerEventHandler([weakModule, getCurrentTime](
                                  std::string eventName,
@@ -380,6 +338,45 @@ void NativeProxy::installJSIBindings(
   //  reactScheduler_ = binding->getScheduler();
   //  reactScheduler_->addEventListener(eventListener_);
 
+  std::weak_ptr<ErrorHandler> weakErrorHandler = errorHandler;
+
+  layoutAnimations->cthis()->setAnimationStartingBlock(
+      [wrt, weakModule, weakErrorHandler](
+          int tag,
+          alias_ref<JString> type,
+          alias_ref<JMap<jstring, jstring>> values) {
+        auto &rt = *wrt.lock();
+        jsi::Object yogaValues(rt);
+        for (const auto &entry : *values) {
+          try {
+            auto key =
+                jsi::String::createFromAscii(rt, entry.first->toStdString());
+            auto value = stod(entry.second->toStdString());
+            yogaValues.setProperty(rt, key, value);
+          } catch (std::invalid_argument e) {
+            if (auto errorHandler = weakErrorHandler.lock()) {
+              errorHandler->setError("Failed to convert value to number");
+              errorHandler->raise();
+            }
+          }
+        }
+
+        weakModule.lock()->layoutAnimationsManager().startLayoutAnimation(
+            rt, tag, type->toStdString(), yogaValues);
+      });
+
+  layoutAnimations->cthis()->setHasAnimationBlock(
+      [weakModule](int tag, const std::string &type) {
+        return weakModule.lock()->layoutAnimationsManager().hasLayoutAnimation(
+            tag, type);
+      });
+
+  layoutAnimations->cthis()->setClearAnimationConfigBlock(
+      [weakModule](int tag) {
+        weakModule.lock()->layoutAnimationsManager().clearLayoutAnimationConfig(
+            tag);
+      });
+
   runtime_->global().setProperty(
       *runtime_,
       jsi::PropNameID::forAscii(*runtime_, "__reanimatedModuleProxy"),

package/ios/REAModule.mm

@@ -21,6 +21,12 @@
 #import <RNReanimated/REANodesManager.h>
 #import <RNReanimated/SingleInstanceChecker.h>
 
+#ifdef REANIMATED_VERSION
+#define STRINGIZE(x) #x
+#define STRINGIZE2(x) STRINGIZE(x)
+#define REANIMATED_VERSION_STRING STRINGIZE2(REANIMATED_VERSION)
+#endif // REANIMATED_VERSION
+
 using namespace facebook::react;
 using namespace reanimated;
 
@@ -44,7 +50,6 @@ typedef void (^AnimatedOperation)(REANodesManager *nodesManager);
   __weak RCTSurfacePresenter *_surfacePresenter;
   std::shared_ptr<NewestShadowNodesRegistry> newestShadowNodesRegistry;
   std::weak_ptr<NativeReanimatedModule> reanimatedModule_;
-  std::shared_ptr<EventListener> eventListener_;
 #else
   NSMutableArray<AnimatedOperation> *_operations;
 #endif
@@ -66,8 +71,6 @@ RCT_EXPORT_MODULE(ReanimatedModule);
 - (void)invalidate
 {
 #ifdef RCT_NEW_ARCH_ENABLED
-  RCTScheduler *scheduler = [_surfacePresenter scheduler];
-  [scheduler removeEventListener:eventListener_];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 #endif
   [_nodesManager invalidate];
@@ -146,7 +149,7 @@ RCT_EXPORT_MODULE(ReanimatedModule);
       return;
     }
     if (auto reanimatedModule = strongSelf->reanimatedModule_.lock()) {
-      self->eventListener_ =
+      auto eventListener =
           std::make_shared<facebook::react::EventListener>([reanimatedModule](const RawEvent &rawEvent) {
             if (!RCTIsMainQueue()) {
               // event listener called on the JS thread, let's ignore this event
@@ -156,7 +159,7 @@ RCT_EXPORT_MODULE(ReanimatedModule);
             }
             return reanimatedModule->handleRawEvent(rawEvent, CACurrentMediaTime() * 1000);
           });
-      [scheduler addEventListener:self->eventListener_];
+      [scheduler addEventListener:eventListener];
     }
   });
 }
@@ -219,6 +222,9 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(installTurboModule)
 
     runtime.global().setProperty(runtime, "_IS_FABRIC", true);
 
+    auto version = jsi::String::createFromUtf8(runtime, REANIMATED_VERSION_STRING);
+    runtime.global().setProperty(runtime, "_REANIMATED_VERSION_CPP", version);
+
     runtime.global().setProperty(
         runtime,
         jsi::PropNameID::forAscii(runtime, "__reanimatedModuleProxy"),

package/ios/native/NativeProxy.mm

@@ -1,4 +1,3 @@
-#import <RNReanimated/LayoutAnimationsProxy.h>
 #import <RNReanimated/NativeMethods.h>
 #import <RNReanimated/NativeProxy.h>
 #import <RNReanimated/REAAnimationsManager.h>
@@ -229,8 +228,14 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
     [nodesManager synchronouslyUpdateViewOnUIThread:viewTag props:uiProps];
   };
 
-  auto layoutAnimationsProxy = std::make_shared<LayoutAnimationsProxy>(
-      [](int tag, jsi::Object newStyle) {}, [](int tag, bool isCancelled, bool removeView) {}, errorHandler);
+  auto progressLayoutAnimation = [=](int tag, const jsi::Object &newStyle) {
+    // noop
+  };
+
+  auto endLayoutAnimation = [=](int tag, bool isCancelled, bool removeView) {
+    // noop
+  };
+
 #else
   // Layout Animations start
   __block std::weak_ptr<Scheduler> weakScheduler = scheduler;
@@ -247,19 +252,15 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
   [reaUiManagerNoCast setUp:animationsManager];
 
   __weak REAAnimationsManager *weakAnimationsManager = animationsManager;
-  auto progressLayoutAnimation = [weakAnimationsManager, animatedRuntime](int tag, jsi::Object newStyle) {
-    REAAnimationsManager *animationsManager = weakAnimationsManager;
-    if (animationsManager) {
-      NSDictionary *propsDict = convertJSIObjectToNSDictionary(*animatedRuntime, newStyle);
-      [animationsManager progressLayoutAnimationWithStyle:propsDict forTag:@(tag)];
-    }
+  std::weak_ptr<jsi::Runtime> wrt = animatedRuntime;
+
+  auto progressLayoutAnimation = [=](int tag, const jsi::Object &newStyle) {
+    NSDictionary *propsDict = convertJSIObjectToNSDictionary(*wrt.lock(), newStyle);
+    [weakAnimationsManager progressLayoutAnimationWithStyle:propsDict forTag:@(tag)];
   };
 
-  auto endLayoutAnimation = [weakAnimationsManager](int tag, bool isCancelled, bool removeView) {
-    REAAnimationsManager *animationsManager = weakAnimationsManager;
-    if (animationsManager) {
-      [animationsManager endLayoutAnimationForTag:@(tag) cancelled:isCancelled removeView:removeView];
-    }
+  auto endLayoutAnimation = [=](int tag, bool isCancelled, bool removeView) {
+    [weakAnimationsManager endLayoutAnimationForTag:@(tag) cancelled:isCancelled removeView:removeView];
   };
 
   auto configurePropsFunction = [reanimatedModule](
@@ -269,11 +270,6 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
     [reanimatedModule.nodesManager configureUiProps:uiPropsSet andNativeProps:nativePropsSet];
   };
 
-  auto layoutAnimationsProxy =
-      std::make_shared<LayoutAnimationsProxy>(progressLayoutAnimation, endLayoutAnimation, errorHandler);
-  auto weakLayoutAnimationsProxy = std::weak_ptr(layoutAnimationsProxy);
-  std::weak_ptr<jsi::Runtime> wrt = animatedRuntime;
-
   // Layout Animations end
 #endif
 
@@ -318,6 +314,8 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
       configurePropsFunction,
 #endif
       getCurrentTime,
+      progressLayoutAnimation,
+      endLayoutAnimation,
       registerSensorFunction,
       unregisterSensorFunction,
       setGestureStateFunction,
@@ -335,7 +333,6 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
 #else
       propObtainer,
 #endif
-      layoutAnimationsProxy,
       platformDepMethodsHolder);
 
   scheduler->setRuntimeManager(module);
@@ -372,8 +369,8 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
   }];
 #endif
 
-#ifdef RCT_NEW_ARCH_ENABLED
   std::weak_ptr<NativeReanimatedModule> weakModule = module; // to avoid retain cycle
+#ifdef RCT_NEW_ARCH_ENABLED
   [reanimatedModule.nodesManager registerPerformOperations:^() {
     if (auto module = weakModule.lock()) {
       module->performOperations();
@@ -383,37 +380,24 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
   // Layout Animation callbacks setup
   [animationsManager setAnimationStartingBlock:^(
                          NSNumber *_Nonnull tag, NSString *type, NSDictionary *_Nonnull values, NSNumber *depth) {
-    std::shared_ptr<jsi::Runtime> runtime = wrt.lock();
-    if (runtime == nullptr) {
-      return;
-    }
-    auto layoutAnimationsProxy = weakLayoutAnimationsProxy.lock();
-    if (layoutAnimationsProxy == nullptr) {
-      return;
-    }
-    jsi::Object yogaValues(*runtime);
+    jsi::Runtime &rt = *wrt.lock();
+    jsi::Object yogaValues(rt);
     for (NSString *key in values.allKeys) {
       NSNumber *value = values[key];
-      yogaValues.setProperty(*runtime, [key UTF8String], [value doubleValue]);
+      yogaValues.setProperty(rt, [key UTF8String], [value doubleValue]);
     }
 
-    layoutAnimationsProxy->startLayoutAnimation(*runtime, [tag intValue], std::string([type UTF8String]), yogaValues);
+    weakModule.lock()->layoutAnimationsManager().startLayoutAnimation(
+        rt, [tag intValue], std::string([type UTF8String]), yogaValues);
   }];
 
   [animationsManager setHasAnimationBlock:^(NSNumber *_Nonnull tag, NSString *_Nonnull type) {
-    auto layoutAnimationsProxy = weakLayoutAnimationsProxy.lock();
-    if (layoutAnimationsProxy == nullptr) {
-      return false;
-    }
-    return layoutAnimationsProxy->hasLayoutAnimation([tag intValue], std::string([type UTF8String]));
+    return weakModule.lock()->layoutAnimationsManager().hasLayoutAnimation(
+        [tag intValue], std::string([type UTF8String]));
   }];
 
   [animationsManager setAnimationRemovingBlock:^(NSNumber *_Nonnull tag) {
-    auto layoutAnimationsProxy = weakLayoutAnimationsProxy.lock();
-    if (layoutAnimationsProxy == nullptr) {
-      return;
-    }
-    layoutAnimationsProxy->clearLayoutAnimationConfig([tag intValue]);
+    weakModule.lock()->layoutAnimationsManager().clearLayoutAnimationConfig([tag intValue]);
   }];
 #endif
 

package/ios/native/REAInitializer.mm

@@ -1,6 +1,12 @@
 #import <RNReanimated/REAInitializer.h>
 #import <RNReanimated/REAUIManager.h>
 
+#ifdef REANIMATED_VERSION
+#define STRINGIZE(x) #x
+#define STRINGIZE2(x) STRINGIZE(x)
+#define REANIMATED_VERSION_STRING STRINGIZE2(REANIMATED_VERSION)
+#endif // REANIMATED_VERSION
+
 @interface RCTEventDispatcher (Reanimated)
 
 - (void)setBridge:(RCTBridge *)bridge;
@@ -58,6 +64,9 @@ JSIExecutor::RuntimeInstaller REAJSIExecutorRuntimeInstaller(
 
     runtime.global().setProperty(runtime, "_IS_FABRIC", false);
 
+    auto version = jsi::String::createFromUtf8(runtime, REANIMATED_VERSION_STRING);
+    runtime.global().setProperty(runtime, "_REANIMATED_VERSION_CPP", version);
+
     runtime.global().setProperty(
         runtime,
         jsi::PropNameID::forAscii(runtime, "__reanimatedModuleProxy"),

package/lib/commonjs/createAnimatedComponent.js

@@ -13,7 +13,7 @@ var _WorkletEventHandler = _interopRequireDefault(require("./reanimated2/Worklet
 
 var _setAndForwardRef = _interopRequireDefault(require("./setAndForwardRef"));
 
-require("./reanimated2/layoutReanimation/LayoutAnimationRepository");
+require("./reanimated2/layoutReanimation/animationsManager");
 
 var _invariant = _interopRequireDefault(require("invariant"));
 
@@ -29,6 +29,8 @@ var _animation = require("./reanimated2/animation");
 
 var _fabricUtils = require("./reanimated2/fabricUtils");
 
+var _shareables = require("./reanimated2/shareables");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -116,8 +118,6 @@ function createAnimatedComponent(Component, options) {
 
       _defineProperty(this, "initialStyle", {});
 
-      _defineProperty(this, "sv", void 0);
-
       _defineProperty(this, "_component", null);
 
       _defineProperty(this, "_setComponentRef", (0, _setAndForwardRef.default)({
@@ -137,15 +137,15 @@ function createAnimatedComponent(Component, options) {
             }
 
             if (layout) {
-              (0, _core.configureLayoutAnimations)(tag, 'layout', maybeBuild(layout), this.sv);
+              (0, _core.configureLayoutAnimations)(tag, 'layout', maybeBuild(layout));
             }
 
             if (entering) {
-              (0, _core.configureLayoutAnimations)(tag, 'entering', maybeBuild(entering), this.sv);
+              (0, _core.configureLayoutAnimations)(tag, 'entering', maybeBuild(entering));
             }
 
             if (exiting) {
-              (0, _core.configureLayoutAnimations)(tag, 'exiting', maybeBuild(exiting), this.sv);
+              (0, _core.configureLayoutAnimations)(tag, 'exiting', maybeBuild(exiting));
             }
           }
 
@@ -160,16 +160,12 @@ function createAnimatedComponent(Component, options) {
           value: {}
         };
       }
-
-      this.sv = (0, _core.makeMutable)({});
     }
 
     componentWillUnmount() {
       this._detachNativeEvents();
 
       this._detachStyles();
-
-      this.sv = null;
     }
 
     componentDidMount() {
@@ -315,7 +311,7 @@ function createAnimatedComponent(Component, options) {
         }
 
         if (global._IS_FABRIC) {
-          shadowNodeWrapper = (0, _fabricUtils.getShadowNodeWrapperFromRef)(this);
+          shadowNodeWrapper = (0, _shareables.makeShareableShadowNodeWrapper)((0, _fabricUtils.getShadowNodeWrapperFromRef)(this));
         }
       }