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

package/Common/cpp/SharedItems/ShareableValue.cpp

@@ -1,4 +1,5 @@
 #include <cxxabi.h>
+#include <utility>
 
 #ifdef RCT_NEW_ARCH_ENABLED
 #include <react/renderer/uimanager/primitives.h>
@@ -10,6 +11,7 @@
 #include "RemoteObject.h"
 #include "RuntimeDecorator.h"
 #include "RuntimeManager.h"
+#include "ShareableValue.h"
 #include "SharedParent.h"
 
 namespace reanimated {
@@ -414,6 +416,10 @@ jsi::Value ShareableValue::toJSValue(jsi::Runtime &rt) {
             }
           } catch (jsi::JSError &e) {
             throw e;
+          } catch (std::exception &e) {
+            std::string str = e.what();
+            runtimeManager->errorHandler->setError(str);
+            runtimeManager->errorHandler->raise();
           } catch (...) {
             if (demangleExceptionName(
                     abi::__cxa_current_exception_type()->name()) ==

package/Common/cpp/Tools/JSIStoreValueUser.cpp

@@ -1,6 +1,6 @@
 #include "JSIStoreValueUser.h"
 #include "RuntimeManager.h"
-#ifdef ONANDROID
+#ifdef ANDROID
 #include <AndroidScheduler.h>
 #endif
 
@@ -32,7 +32,7 @@ StoreUser::~StoreUser() {
   std::shared_ptr<Scheduler> strongScheduler = scheduler.lock();
   if (strongScheduler != nullptr) {
     std::shared_ptr<StaticStoreUser> sud = storeUserData;
-#ifdef ONANDROID
+#ifdef ANDROID
     jni::ThreadScope::WithClassLoader([&] {
       strongScheduler->scheduleOnUI([id, sud]() {
         const std::lock_guard<std::recursive_mutex> lock(sud->storeMutex);

package/Common/cpp/{headers/Tools → Tools}/ReanimatedHiddenHeaders.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#if defined(ONANDROID)
+#ifdef ANDROID
 #include "Logger.h"
 #include "LoggerInterface.h"
 #include "SpeedChecker.h"

package/Common/cpp/Tools/SingleInstanceChecker.h

@@ -0,0 +1,58 @@
+#pragma once
+
+#ifdef DEBUG
+
+#include <cxxabi.h>
+
+#include <iostream>
+#include <string>
+
+namespace reanimated {
+
+// This is a class that counts how many instances of a different class there
+// are. It is meant only to be used with classes that should only have one
+// instance.
+
+template <class T>
+class SingleInstanceChecker {
+ public:
+  SingleInstanceChecker();
+  ~SingleInstanceChecker();
+
+ private:
+  void assertWithMessage(bool condition, std::string message) {
+    if (!condition) {
+      std::cerr << message << std::endl;
+      assert(condition);
+    }
+  }
+
+  // A static field will exist separately for every class template.
+  // This has to be inline for automatic initialization.
+  inline static int instanceCount_;
+};
+
+template <class T>
+SingleInstanceChecker<T>::SingleInstanceChecker() {
+  int status = 0;
+  std::string className =
+      __cxxabiv1::__cxa_demangle(typeid(T).name(), nullptr, nullptr, &status);
+
+  // Only one instance should exist, but it is possible for two instances
+  // to co-exist during a reload.
+  assertWithMessage(
+      instanceCount_ <= 1,
+      "More than one instance of " + className +
+          " present. This may indicate a memory leak due to a retain cycle.");
+
+  instanceCount_++;
+}
+
+template <class T>
+SingleInstanceChecker<T>::~SingleInstanceChecker() {
+  instanceCount_--;
+}
+
+} // namespace reanimated
+
+#endif // DEBUG

package/RNReanimated.podspec

@@ -2,26 +2,29 @@ require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
-reactVersion = '0.0.0'
+reactNativeVersion = '0.0.0'
 reactTargetTvOS = false
 isUserApp = false
+nodeModulesDir = File.join(__dir__, "..", "..", "node_modules")
 
 begin
   # user app
   # /appName/node_modules/react-native-reanimated/RNReanimated.podspec
   # /appName/node_modules/react-native/package.json
-  reactJson = JSON.parse(File.read(File.join(__dir__, "..", "..", "node_modules", "react-native", "package.json")))
-  reactVersion = reactJson["version"]
-  reactTargetTvOS = reactJson["name"] == "react-native-tvos"
+  nodeModulesDir = File.join(__dir__, "..", "..", "node_modules")
+  reactNativePackageJson = JSON.parse(File.read(File.join(nodeModulesDir, "react-native", "package.json")))
+  reactNativeVersion = reactNativePackageJson["version"]
+  reactTargetTvOS = reactNativePackageJson["name"] == "react-native-tvos"
   isUserApp = true
 rescue
   begin
     # monorepo
     # /monorepo/packages/appName/node_modules/react-native-reanimated/RNReanimated.podspec
     # /monorepo/node_modules/react-native/package.json
-    reactJson = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "node_modules", "react-native", "package.json")))
-    reactVersion = reactJson["version"]
-    reactTargetTvOS = reactJson["name"] == "react-native-tvos"
+    nodeModulesDir = File.join(__dir__, "..", "..", "..", "..", "node_modules")
+    reactNativePackageJson = JSON.parse(File.read(File.join(nodeModulesDir, "react-native", "package.json")))
+    reactNativeVersion = reactNativePackageJson["version"]
+    reactTargetTvOS = reactNativePackageJson["name"] == "react-native-tvos"
   rescue
     begin
       # Example app in reanimated repo
@@ -34,19 +37,22 @@ rescue
       else
         appName = "Example"
       end
-      reactJson = JSON.parse(File.read(File.join(__dir__, appName, "node_modules", "react-native", "package.json")))
-      reactVersion = reactJson["version"]
+      nodeModulesDir = File.join(__dir__, appName, "node_modules")
+      reactNativePackageJson = JSON.parse(File.read(File.join(nodeModulesDir, "react-native", "package.json")))
+      reactNativeVersion = reactNativePackageJson["version"]
       reactTargetTvOS = ENV["ReanimatedTVOSExample"] == "1"
     rescue
       # should never happen
-      reactVersion = '0.68.0'
-      puts "[RNReanimated] Unable to recognize your `react-native` version! Default `react-native` version: " + reactVersion
+      reactNativeVersion = '0.68.0'
+      puts "[RNReanimated] Unable to recognize your `react-native` version! Default `react-native` version: " + reactNativeVersion
     end
   end
 end
 
+reactCommonDir = File.join(nodeModulesDir, "react-native", "ReactCommon")
+
 if isUserApp
-  libInstances = %x[find ../../ -name "package.json" | grep "/react-native-reanimated/package.json"]
+  libInstances = %x[find ../../ -name "package.json" | grep "/react-native-reanimated/package.json" | grep -v "/.yarn/"]
   libInstancesArray = libInstances.split("\n")
   if libInstancesArray.length() > 1
     parsedLocation = ''
@@ -59,16 +65,16 @@ if isUserApp
   end
 end
 
-rnVersion = reactVersion.split('.')[1]
+reactNativeMinorVersion = reactNativeVersion.split('.')[1].to_i
 
 fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
 
 folly_prefix = ""
-if rnVersion.to_i >= 64
+if reactNativeMinorVersion >= 64
   folly_prefix = "RCT-"
 end
 
-folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DRNVERSION=' + rnVersion
+folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DREACT_NATIVE_MINOR_VERSION=' + reactNativeMinorVersion.to_s
 folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
 boost_compiler_flags = '-Wno-documentation'
 fabric_flags = ''
@@ -92,8 +98,7 @@ Pod::Spec.new do |s|
 
   s.source_files = [
     "ios/**/*.{mm,h,m}",
-    "Common/cpp/**/*.cpp",
-    "Common/cpp/headers/**/*.h"
+    "Common/cpp/**/*.{cpp,h}"
   ]
 
   s.preserve_paths = [
@@ -105,9 +110,9 @@ Pod::Spec.new do |s|
     "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\"",
     "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
   }
-  s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags
+  s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags + ' -DHERMES_ENABLE_DEBUGGER'
   s.xcconfig               = {
-    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\"",
+    "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\" \"#{reactCommonDir}\"",
                                "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags + " " + fabric_flags }
 
   s.requires_arc = true
@@ -147,12 +152,9 @@ Pod::Spec.new do |s|
   s.dependency 'DoubleConversion'
   s.dependency 'glog'
 
-  if reactVersion.match(/^0.62/)
+  if reactNativeMinorVersion == 62
     s.dependency 'ReactCommon/callinvoker'
   else
     s.dependency 'React-callinvoker'
   end
-
-
 end
-

package/android/CMakeLists.txt

@@ -1,17 +1,20 @@
 project(Reanimated)
-cmake_minimum_required(VERSION 3.12.0)
+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 -DON_ANDROID -DONANDROID -DANDROID -DRNVERSION=${RNVERSION} -fexceptions -fno-omit-frame-pointer -frtti -Wno-sign-compare -std=c++17 -Wall")
+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")
 if(${IS_NEW_ARCHITECTURE_ENABLED})
     set (ALL_FLAGS "${DEFAULT_FLAGS} -DRCT_NEW_ARCH_ENABLED")
 else()
     set (ALL_FLAGS ${DEFAULT_FLAGS})
 endif()
+if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+    set (ALL_FLAGS "${ALL_FLAGS} -DDEBUG")
+endif()
 set (CMAKE_CXX_FLAGS ${ALL_FLAGS})
 
-if(${NATIVE_DEBUG})
+if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g")
     set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
 endif()
@@ -23,13 +26,7 @@ set (PACKAGE_NAME "reanimated")
 set (BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
 set (SRC_DIR ${CMAKE_SOURCE_DIR}/src)
 
-set (ignoreMe "${PLAYGROUND_APP_NAME}")
-
-if(${CLIENT_SIDE_BUILD})
-    set (COMMON_SRC_DIR "${CMAKE_SOURCE_DIR}/../Common")
-else()
-    set (COMMON_SRC_DIR "${SRC_DIR}/main/Common")
-endif()
+set (COMMON_SRC_DIR "${CMAKE_SOURCE_DIR}/../Common")
 
 if(${IS_NEW_ARCHITECTURE_ENABLED})
     if(${CLIENT_SIDE_BUILD})
@@ -49,7 +46,7 @@ file (GLOB LIBRN_DIR "${RN_SO_DIR}/${ANDROID_ABI}")
 file(GLOB_RECURSE SOURCES_COMMON CONFIGURE_DEPENDS "${COMMON_SRC_DIR}/cpp/**.cpp")
 file(GLOB_RECURSE SOURCES_ANDROID CONFIGURE_DEPENDS "${SRC_DIR}/main/cpp/**.cpp")
 
-if(${REACT_NATIVE_TARGET_VERSION} LESS 66)
+if(${REACT_NATIVE_MINOR_VERSION} LESS 66)
         set (
                 INCLUDE_JSI_CPP
                 "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi/jsi/jsi.cpp"
@@ -60,17 +57,6 @@ if(${REACT_NATIVE_TARGET_VERSION} LESS 66)
         )
 endif()
 
-if(${IS_NEW_ARCHITECTURE_ENABLED})
-    set(
-        FABRIC_UTILS_CPP
-        "${COMMON_SRC_DIR}/cpp/Fabric/FabricUtils.cpp"
-    )
-    set(
-        REANIMATED_UI_MANAGER_BINDING_CPP
-        "${COMMON_SRC_DIR}/cpp/Fabric/ReanimatedUIManagerBinding.cpp"
-    )
-endif()
-
 add_library(
         ${PACKAGE_NAME}
         SHARED
@@ -78,8 +64,6 @@ add_library(
         ${SOURCES_ANDROID}
         ${INCLUDE_JSI_CPP}
         ${INCLUDE_JSIDYNAMIC_CPP}
-        ${FABRIC_UTILS_CPP}
-        ${REANIMATED_UI_MANAGER_BINDING_CPP}
 )
 
 # includes
@@ -102,21 +86,23 @@ target_include_directories(
         "${NODE_MODULES_DIR}/react-native/ReactCommon"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/callinvoker"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/jsi"
+        "${NODE_MODULES_DIR}/react-native/ReactCommon/hermes"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/react/renderer/graphics/platform/cxx"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/runtimeexecutor"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/turbomodule/core"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/turbomodule"
         "${NODE_MODULES_DIR}/react-native/ReactCommon/yoga"
-        "${COMMON_SRC_DIR}/cpp/headers/Tools"
-        "${COMMON_SRC_DIR}/cpp/headers/SpecTools"
-        "${COMMON_SRC_DIR}/cpp/headers/NativeModules"
-        "${COMMON_SRC_DIR}/cpp/headers/SharedItems"
-        "${COMMON_SRC_DIR}/cpp/headers/Registries"
-        "${COMMON_SRC_DIR}/cpp/headers/LayoutAnimations"
-        "${COMMON_SRC_DIR}/cpp/headers/AnimatedSensor"
-        "${COMMON_SRC_DIR}/cpp/headers/Fabric"
+        "${COMMON_SRC_DIR}/cpp/Tools"
+        "${COMMON_SRC_DIR}/cpp/SpecTools"
+        "${COMMON_SRC_DIR}/cpp/NativeModules"
+        "${COMMON_SRC_DIR}/cpp/SharedItems"
+        "${COMMON_SRC_DIR}/cpp/ReanimatedRuntime"
+        "${COMMON_SRC_DIR}/cpp/Registries"
+        "${COMMON_SRC_DIR}/cpp/LayoutAnimations"
+        "${COMMON_SRC_DIR}/cpp/AnimatedSensor"
+        "${COMMON_SRC_DIR}/cpp/Fabric"
         "${COMMON_SRC_DIR}/cpp/hidden_headers"
-        "${SRC_DIR}/main/cpp/headers"
+        "${SRC_DIR}/main/cpp"
 )
 
 find_library(
@@ -142,7 +128,7 @@ find_library(
         NO_CMAKE_FIND_ROOT_PATH
 )
 
-if(${REACT_NATIVE_TARGET_VERSION} LESS 69)
+if(${REACT_NATIVE_MINOR_VERSION} LESS 69)
     find_library(
             FOLLY_LIB
             folly_json
@@ -158,7 +144,7 @@ else()
     )
 endif()
 
-if(${REACT_NATIVE_TARGET_VERSION} LESS 66)
+if(${REACT_NATIVE_MINOR_VERSION} LESS 66)
     set (JSI_LIB "")
 else()
     find_library(
@@ -250,7 +236,7 @@ target_link_libraries(
 
 if(${JS_RUNTIME} STREQUAL "hermes")
     string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_HERMES=1")
-    if(${REACT_NATIVE_TARGET_VERSION} LESS 69)
+    if(${REACT_NATIVE_MINOR_VERSION} LESS 69)
         # From `hermes-engine` npm package
         target_include_directories(
             ${PACKAGE_NAME}
@@ -266,6 +252,18 @@ if(${JS_RUNTIME} STREQUAL "hermes")
             "${JS_RUNTIME_DIR}/public"
         )
     endif()
+    if (${HERMES_ENABLE_DEBUGGER})
+        find_library(
+                HERMES_EXECUTOR_LIB
+                hermes-executor-debug
+                PATHS ${LIBRN_DIR}
+                NO_CMAKE_FIND_ROOT_PATH
+        )
+        target_link_libraries(
+                ${PACKAGE_NAME}
+                ${HERMES_EXECUTOR_LIB}
+        )
+    endif()
     target_link_libraries(
             ${PACKAGE_NAME}
             "${BUILD_DIR}/third-party-ndk/hermes/jni/${ANDROID_ABI}/libhermes.so"
@@ -289,7 +287,6 @@ elseif(${JS_RUNTIME} STREQUAL "v8")
             ${V8EXECUTOR_LIB}
     )
 else()
-    set (ignoreMe "${JS_RUNTIME_DIR}")
     string(APPEND CMAKE_CXX_FLAGS " -DJS_RUNTIME_JSC=1")
     find_library(
             JSEXECUTOR_LIB
@@ -319,7 +316,7 @@ if(${IS_NEW_ARCHITECTURE_ENABLED})
     )
 endif()
 
-if(${REACT_NATIVE_TARGET_VERSION} LESS 64)
+if(${REACT_NATIVE_MINOR_VERSION} LESS 64)
     add_library(
             turbomodulejsijni
             # Sets the library as a shared library.
@@ -328,3 +325,9 @@ if(${REACT_NATIVE_TARGET_VERSION} LESS 64)
             ./empty.cpp
     )
 endif()
+
+# Resolves "CMake Warning: Manually-specified variables were not used by the project"
+# when any of the following variables is not used in some build configuration.
+set (ignoreMe "${CLIENT_SIDE_BUILD}")
+set (ignoreMe "${JS_RUNTIME_DIR}")
+set (ignoreMe "${PLAYGROUND_APP_NAME}")