react-native-reanimated 2.3.0-alpha.3 → 2.3.0-beta.4

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

@@ -1,10 +1,12 @@
 #pragma once
 
-#include "PlatformDepMethodsHolder.h"
+#include <jsi/jsi.h>
 #include <stdio.h>
+#include <memory>
+#include <string>
 #include <unordered_map>
-#include <jsi/jsi.h>
 #include "LayoutAnimationsProxy.h"
+#include "PlatformDepMethodsHolder.h"
 
 using namespace facebook;
 
@@ -22,25 +24,28 @@ enum RuntimeType {
    */
   UI
 };
-typedef jsi::Runtime* RuntimePointer;
+typedef jsi::Runtime *RuntimePointer;
 
 class RuntimeDecorator {
-public:
+ public:
   static void decorateRuntime(jsi::Runtime &rt, const std::string &label);
-  static void decorateUIRuntime(jsi::Runtime &rt,
-                                const UpdaterFunction updater,
-                                const RequestFrameFunction requestFrame,
-                                const ScrollToFunction scrollTo,
-                                const MeasuringFunction measure,
-                                const TimeProviderFunction getCurrentTime,
-                                std::shared_ptr<LayoutAnimationsProxy> layoutAnimationsProxy);
-  
+  static void decorateUIRuntime(
+      jsi::Runtime &rt,
+      const UpdaterFunction updater,
+      const RequestFrameFunction requestFrame,
+      const ScrollToFunction scrollTo,
+      const MeasuringFunction measure,
+      const TimeProviderFunction getCurrentTime,
+      const SetGestureStateFunction setGestureState,
+      std::shared_ptr<LayoutAnimationsProxy> layoutAnimationsProxy);
+
   /**
    Returns true if the given Runtime is the Reanimated UI-Thread Runtime.
    */
   inline static bool isUIRuntime(jsi::Runtime &rt);
   /**
-   Returns true if the given Runtime is a Runtime that supports the concept of Workletization. (REA, Vision, ...)
+   Returns true if the given Runtime is a Runtime that supports the concept of
+   Workletization. (REA, Vision, ...)
    */
   inline static bool isWorkletRuntime(jsi::Runtime &rt);
   /**
@@ -48,31 +53,35 @@ public:
    */
   inline static bool isReactRuntime(jsi::Runtime &rt);
   /**
-   Register the given Runtime. This function is required for every RuntimeManager, otherwise future runtime checks will fail.
+   Register the given Runtime. This function is required for every
+   RuntimeManager, otherwise future runtime checks will fail.
    */
-  static void registerRuntime(jsi::Runtime* runtime, RuntimeType runtimeType);
+  static void registerRuntime(jsi::Runtime *runtime, RuntimeType runtimeType);
 
-private:
-  static std::unordered_map<RuntimePointer, RuntimeType> runtimeRegistry;
+ private:
+  static std::unordered_map<RuntimePointer, RuntimeType> &runtimeRegistry();
 };
 
-inline bool RuntimeDecorator::isUIRuntime(jsi::Runtime& rt) {
-  auto iterator = runtimeRegistry.find(&rt);
-  if (iterator == runtimeRegistry.end()) return false;
+inline bool RuntimeDecorator::isUIRuntime(jsi::Runtime &rt) {
+  auto iterator = runtimeRegistry().find(&rt);
+  if (iterator == runtimeRegistry().end())
+    return false;
   return iterator->second == RuntimeType::UI;
 }
 
-inline bool RuntimeDecorator::isWorkletRuntime(jsi::Runtime& rt) {
-  auto iterator = runtimeRegistry.find(&rt);
-  if (iterator == runtimeRegistry.end()) return false;
+inline bool RuntimeDecorator::isWorkletRuntime(jsi::Runtime &rt) {
+  auto iterator = runtimeRegistry().find(&rt);
+  if (iterator == runtimeRegistry().end())
+    return false;
   auto type = iterator->second;
   return type == RuntimeType::UI || type == RuntimeType::Worklet;
 }
 
-inline bool RuntimeDecorator::isReactRuntime(jsi::Runtime& rt) {
-  auto iterator = runtimeRegistry.find(&rt);
-  if (iterator == runtimeRegistry.end()) return true;
+inline bool RuntimeDecorator::isReactRuntime(jsi::Runtime &rt) {
+  auto iterator = runtimeRegistry().find(&rt);
+  if (iterator == runtimeRegistry().end())
+    return true;
   return false;
 }
 
-}
+} // namespace reanimated

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

@@ -1,14 +1,15 @@
 #pragma once
 
-#include <queue>
-#include <thread>
-#include <mutex>
+#include <ReactCommon/CallInvoker.h>
 #include <condition_variable>
 #include <functional>
-#include <ReactCommon/CallInvoker.h>
+#include <memory>
+#include <mutex>
+#include <queue>
+#include <thread>
+#include <utility>
 
-namespace reanimated
-{
+namespace reanimated {
 
 //
 // Copyright (c) 2013 Juan Palacios juan.palacios.puyana@gmail.com
@@ -16,15 +17,11 @@ namespace reanimated
 // - see < http://opensource.org/licenses/BSD-2-Clause>
 //
 template <typename T>
-class Queue
-{
+class Queue {
  public:
-
-  T pop()
-  {
+  T pop() {
     std::unique_lock<std::mutex> mlock(mutex_);
-    while (queue_.empty())
-    {
+    while (queue_.empty()) {
       cond_.wait(mlock);
     }
     auto item = queue_.front();
@@ -32,27 +29,23 @@ class Queue
     return item;
   }
 
-  void pop(T& item)
-  {
+  void pop(T &item) {
     std::unique_lock<std::mutex> mlock(mutex_);
-    while (queue_.empty())
-    {
+    while (queue_.empty()) {
       cond_.wait(mlock);
     }
     item = queue_.front();
     queue_.pop();
   }
 
-  void push(const T& item)
-  {
+  void push(const T &item) {
     std::unique_lock<std::mutex> mlock(mutex_);
     queue_.push(item);
     mlock.unlock();
     cond_.notify_one();
   }
 
-  void push(T&& item)
-  {
+  void push(T &&item) {
     std::unique_lock<std::mutex> mlock(mutex_);
     queue_.push(std::move(item));
     mlock.unlock();
@@ -76,19 +69,21 @@ class Queue
 class RuntimeManager;
 
 class Scheduler {
-  public:
-    Scheduler();
-    void scheduleOnJS(std::function<void()> job);
-    void setJSCallInvoker(std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker);
-    void setRuntimeManager(std::shared_ptr<RuntimeManager> runtimeManager);
-    virtual void scheduleOnUI(std::function<void()> job);
-    virtual void triggerUI();
-    virtual ~Scheduler();
-  protected:
-    std::atomic<bool> scheduledOnUI{};
-    Queue<std::function<void()>> uiJobs;
-    std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker_;
-    std::weak_ptr<RuntimeManager> runtimeManager;
+ public:
+  Scheduler();
+  void scheduleOnJS(std::function<void()> job);
+  void setJSCallInvoker(
+      std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker);
+  void setRuntimeManager(std::shared_ptr<RuntimeManager> runtimeManager);
+  virtual void scheduleOnUI(std::function<void()> job);
+  virtual void triggerUI();
+  virtual ~Scheduler();
+
+ protected:
+  std::atomic<bool> scheduledOnUI{};
+  Queue<std::function<void()>> uiJobs;
+  std::shared_ptr<facebook::react::CallInvoker> jsCallInvoker_;
+  std::weak_ptr<RuntimeManager> runtimeManager;
 };
 
-}
+} // namespace reanimated

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

@@ -1,7 +1,8 @@
 #pragma once
 
-#include <string>
 #include <jsi/jsi.h>
+#include <string>
+#include <utility>
 
 using namespace facebook;
 
@@ -12,16 +13,18 @@ class EventHandlerRegistry;
 class WorkletEventHandler {
   friend EventHandlerRegistry;
 
-private:
+ private:
   unsigned long id;
   std::string eventName;
   jsi::Function handler;
 
-public:
-  WorkletEventHandler(unsigned long id,
-               std::string eventName,
-               jsi::Function &&handler): id(id), eventName(eventName), handler(std::move(handler)) {}
-  void process(jsi::Runtime &rt, jsi::Value &eventValue);
+ public:
+  WorkletEventHandler(
+      unsigned long id,
+      std::string eventName,
+      jsi::Function &&handler)
+      : id(id), eventName(eventName), handler(std::move(handler)) {}
+  void process(jsi::Runtime &rt, const jsi::Value &eventValue);
 };
 
-}
+} // namespace reanimated

package/Common/cpp/hidden_headers/Logger.h

@@ -1,22 +1,22 @@
 #pragma once
 
-#include "./LoggerInterface.h"
 #include <memory>
+#include "./LoggerInterface.h"
 
-namespace reanimated
-{
+namespace reanimated {
 
 class Logger {
-  public:
-  template<typename T>
-    static void log(T value) {
-      if (instance == nullptr) {
-        throw std::runtime_error("no logger specified");
-      }
-      instance->log(value);
-    };
-  private:
-    static std::unique_ptr<LoggerInterface> instance;
+ public:
+  template <typename T>
+  static void log(T value) {
+    if (instance == nullptr) {
+      throw std::runtime_error("no logger specified");
+    }
+    instance->log(value);
+  }
+
+ private:
+  static std::unique_ptr<LoggerInterface> instance;
 };
 
-}
+} // namespace reanimated

package/Common/cpp/hidden_headers/LoggerInterface.h

@@ -1,15 +1,14 @@
 #pragma once
 
-namespace reanimated
-{
+namespace reanimated {
 
 class LoggerInterface {
-  public:
-    virtual void log(const char* str) = 0;
-    virtual void log(double d) = 0;
-    virtual void log(int i) = 0;
-    virtual void log(bool b) = 0;
-    virtual ~LoggerInterface() {}
+ public:
+  virtual void log(const char *str) = 0;
+  virtual void log(double d) = 0;
+  virtual void log(int i) = 0;
+  virtual void log(bool b) = 0;
+  virtual ~LoggerInterface() {}
 };
 
-}
+} // namespace reanimated

package/Common/cpp/hidden_headers/SpeedChecker.h

@@ -2,17 +2,16 @@
 
 #define CHECK_SPEED 1
 
-#include "./Logger.h"
-#include <memory>
+#include <chrono>
 #include <functional>
+#include <memory>
 #include <string>
-#include <chrono>
+#include "./Logger.h"
 
-namespace reanimated
-{
+namespace reanimated {
 
 class SpeedChecker {
-public:
+ public:
   static void checkSpeed(std::string tag, std::function<void()> fun) {
 #if CHECK_SPEED
     auto start = std::chrono::system_clock::now();
@@ -20,11 +19,11 @@ public:
     fun();
 #if CHECK_SPEED
     auto end = std::chrono::system_clock::now();
-    std::chrono::duration<double> elapsed_seconds = end-start;
+    std::chrono::duration<double> elapsed_seconds = end - start;
     tag += " " + std::to_string(elapsed_seconds.count()) + "s";
     Logger::log(tag.c_str());
 #endif
   }
 };
 
-}
+} // namespace reanimated

package/README.md

@@ -11,7 +11,7 @@ comes to gesture based interactions.
 
 ## Installation
 
-Check out [installation](https://docs.swmansion.com/react-native-reanimated/docs/installation) section of our docs for the detailed installation instructions.
+Check out [installation](https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation) section of our docs for the detailed installation instructions.
 
 ## Documentation
 

package/RNReanimated.podspec

@@ -5,9 +5,28 @@ 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"]
+  # standard app
+  # /appName/node_modules/react-native-reanimated/RNReanimated.podspec
+  # /appName/node_modules/react-native/package.json
+  reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "..", "node_modules", "react-native", "package.json")))["version"]
 rescue
-  reactVersion = '0.64.0'
+  begin
+    # monorepo
+    # /monorepo/packages/appName/node_modules/react-native-reanimated/RNReanimated.podspec
+    # /monorepo/node_modules/react-native/package.json
+    reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "node_modules", "react-native", "package.json")))["version"]
+  rescue
+    begin
+      # Example app in reanimated repo
+      # /react-native-reanimated/RNReanimated.podspec
+      # /react-native-reanimated/node_modules/react-native/package.json
+      reactVersion = JSON.parse(File.read(File.join(__dir__, "node_modules", "react-native", "package.json")))["version"]
+    rescue
+      # should never happen
+      reactVersion = '0.66.0'
+      puts "[RNReanimated] Unable to recognized your `react-native` version! Default `react-native` version: " + reactVersion
+    end
+  end
 end
 
 rnVersion = reactVersion.split('.')[1]
@@ -20,7 +39,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 +68,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\" \"${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}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\"",
                                "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags  }
 
   s.requires_arc = true
@@ -74,7 +93,6 @@ Pod::Spec.new do |s|
   s.dependency 'React-RCTBlob'
   s.dependency 'React-RCTSettings'
   s.dependency 'React-RCTText'
-  s.dependency 'React-RCTVibration'
   s.dependency 'React-RCTImage'
   s.dependency 'React-Core/RCTWebSocket'
   s.dependency 'React-cxxreact'

package/android/build.gradle

@@ -13,21 +13,15 @@ def engine = "jsc"
 abstract class replaceSoTask extends DefaultTask {
     public static String appName = ":app"
     public static String buildDir = "../../../android/app/build"
-    public static String engine = "jsc"
-    public static String reactVersion = "64"
 
     @TaskAction
     def run() {
-        ant.unzip(
-            src: "./react-native-reanimated-${reactVersion}-${engine}.aar",
-            dest: "./tmp"
-        )
         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: "./tmp/jni/${abiVersion}/libfbjni.so",
-                    overwrite: true
+                        tofile: "${buildDir}/intermediates/merged_native_libs/debug/out/lib/${abiVersion}/libfbjni.so",
+                        file: "../libSo/fbjni/jni/${abiVersion}/libfbjni.so",
+                        overwrite: true
                 )
             }
         }
@@ -37,20 +31,14 @@ abstract class replaceSoTask extends DefaultTask {
 def getCurrentFlavor() {
     Gradle gradle = getGradle()
     String taskRequestName = gradle.getStartParameter().getTaskRequests().toString()
-    Pattern pattern
-
-    if(taskRequestName.contains("assemble")) {
-        pattern = Pattern.compile("assemble(\\w+)(Release|Debug)")
-    }
-    else {
-        pattern = Pattern.compile("generate(\\w+)(Release|Debug)")
-    }
+    Pattern pattern = Pattern.compile("(assemble|bundle|install|generate)(\\w*)(Release|Debug)")
     Matcher matcher = pattern.matcher(taskRequestName)
 
     if(matcher.find()) {
-        return matcher.group(1).toLowerCase()
+        return matcher.group(2)
     }
-    return ""
+
+    return "NOT-FOUND"
 }
 
 def replaceSoTaskDebug
@@ -70,26 +58,24 @@ rootProject.getSubprojects().forEach({project ->
 
         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"))
+            final NOTFOUND = "NOT-FOUND"
+            if(!NOTFOUND.equals(getCurrentFlavor()) && (!projectProperties.get("reanimated")
+                    || (projectProperties.get("reanimated") && projectProperties.get("reanimated").get("enablePackagingOptions")))
             ) {
                 def flavorString = getCurrentFlavor()
                 replaceSoTask.appName = project.getProperties().path
                 replaceSoTask.buildDir = project.getProperties().buildDir
-                replaceSoTask.engine = engine
-                replaceSoTask.reactVersion = minor
                 def appName = project.getProperties().path
-                project.getProperties().android.packagingOptions.pickFirst("lib/**/libfbjni.so")
 
                 replaceSoTaskDebug.dependsOn(
-                    project.getTasks().getByPath("${appName}:merge${flavorString}DebugNativeLibs"),
-                    project.getTasks().getByPath("${appName}:strip${flavorString}DebugDebugSymbols")
+                        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}:merge${flavorString}ReleaseNativeLibs"),
+                        project.getTasks().getByPath("${appName}:strip${flavorString}ReleaseDebugSymbols")
                 )
                 project.getTasks().getByPath("${appName}:package${flavorString}Release").dependsOn(replaceSoTaskRelease)
             }
@@ -97,4 +83,27 @@ rootProject.getSubprojects().forEach({project ->
     }
 })
 
-artifacts.add("default", file("react-native-reanimated-${minor}-${engine}.aar"))
+def minorCopy = Integer.parseInt(minor)
+def aar = file("react-native-reanimated-${minorCopy}-${engine}.aar")
+
+while (!aar.exists()) {
+    minorCopy -= 1
+    aar = file("react-native-reanimated-${minorCopy}-${engine}.aar")
+    if (minorCopy < 63) {
+      throw new GradleException('No aar for react-native-reanimated found.')
+    }
+    if (aar.exists()) {
+      println "\n\n\n"
+      println "****************************************************************************************"
+      println "\n\n\n"
+      println "WARNING reanimated - no version-specific reanimated AAR for react-native version " . minor . " found."
+      println "Falling back to AAR for react-native version " . minorCopy
+      println "The react-native JSI interface is not ABI-safe yet, this may result in crashes."
+      println "Please post a pull request to implement support for react-native version " . minor . " to the reanimated repo."
+      println "Thanks!"
+      println "\n\n\n"
+      println "****************************************************************************************"
+    }    
+}
+
+artifacts.add("default", aar)

package/ios/LayoutReanimation/REAAnimationsManager.h

@@ -14,16 +14,18 @@ typedef NS_ENUM(NSInteger, ViewState) {
 
 @interface REAAnimationsManager : NSObject
 
-- (instancetype)initWithUIManager:(RCTUIManager*)uiManager;
+- (instancetype)initWithUIManager:(RCTUIManager *)uiManager;
 - (void)setRemovingConfigBlock:(void (^)(NSNumber *tag))block;
-- (void)setAnimationStartingBlock:(void (^)(NSNumber *tag, NSString *type, NSDictionary* target, NSNumber* depth))startAnimation;
-- (void)notifyAboutProgress:(NSDictionary *)newStyle tag:(NSNumber*)tag;
-- (void)notifyAboutEnd:(NSNumber*)tag cancelled:(BOOL)cancelled;
+- (void)setAnimationStartingBlock:
+    (void (^)(NSNumber *tag, NSString *type, NSDictionary *target, NSNumber *depth))startAnimation;
+- (void)notifyAboutProgress:(NSDictionary *)newStyle tag:(NSNumber *)tag;
+- (void)notifyAboutEnd:(NSNumber *)tag cancelled:(BOOL)cancelled;
 - (void)invalidate;
-- (void) onViewRemoval:(UIView*)view before:(REASnapshot*)before;
-- (void) onViewCreate:(UIView*)view after:(REASnapshot*)after;
-- (void) onViewUpdate:(UIView*)view before:(REASnapshot*)before after:(REASnapshot*)after;
-- (void) setToBeRemovedRegistry:(NSMutableDictionary<NSNumber*, NSMutableSet<id<RCTComponent>>*>*) toBeRemovedRegister;
+- (void)onViewRemoval:(UIView *)view before:(REASnapshot *)before;
+- (void)onViewCreate:(UIView *)view after:(REASnapshot *)after;
+- (void)onViewUpdate:(UIView *)view before:(REASnapshot *)before after:(REASnapshot *)after;
+- (void)setToBeRemovedRegistry:(NSMutableDictionary<NSNumber *, NSMutableSet<id<RCTComponent>> *> *)toBeRemovedRegister;
+- (void)removeLeftovers;
 
 @end