react-native-reanimated 2.3.0-alpha.1 → 2.3.0-beta.2

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

@@ -1,14 +1,13 @@
 #pragma once
 
-#include <queue>
-#include <thread>
-#include <mutex>
+#include <ReactCommon/CallInvoker.h>
 #include <condition_variable>
 #include <functional>
-#include <ReactCommon/CallInvoker.h>
+#include <mutex>
+#include <queue>
+#include <thread>
 
-namespace reanimated
-{
+namespace reanimated {
 
 //
 // Copyright (c) 2013 Juan Palacios juan.palacios.puyana@gmail.com
@@ -16,15 +15,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 +27,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,17 +67,21 @@ class Queue
 class RuntimeManager;
 
 class Scheduler {
-  public:
-    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:
-    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,7 @@
 #pragma once
 
-#include <string>
 #include <jsi/jsi.h>
+#include <string>
 
 using namespace facebook;
 
@@ -12,16 +12,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)) {}
+ 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);
 };
 
-}
+} // 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

@@ -7,7 +7,7 @@ reactVersion = '0.0.0'
 begin
   reactVersion = JSON.parse(File.read(File.join(__dir__, "..", "react-native", "package.json")))["version"]
 rescue
-  reactVersion = '0.64.0'
+  reactVersion = '0.66.0'
 end
 
 rnVersion = reactVersion.split('.')[1]
@@ -20,7 +20,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 +49,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

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')
@@ -7,8 +9,83 @@ def reactNativeVersion = json.version as String
 def (major, minor, patch) = reactNativeVersion.tokenize('.')
 
 def engine = "jsc"
-if (project(':app').ext.react.enableHermes) {
-    engine = "hermes"
+
+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
+
+    if(taskRequestName.contains("assemble")) {
+        pattern = Pattern.compile("assemble(\\w+)(Release|Debug)")
+    }
+    else {
+        pattern = Pattern.compile("generate(\\w+)(Release|Debug)")
+    }
+    Matcher matcher = pattern.matcher(taskRequestName)
+
+    if(matcher.find()) {
+        return matcher.group(1).toLowerCase()
+    }
+    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/LayoutReanimation/REAAnimationsManager.h

@@ -1,22 +1,31 @@
 #import <Foundation/Foundation.h>
-#import "REASnapshooter.h"
 #import <React/RCTUIManager.h>
+#import "REASnapshot.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface REAAnimationsManager : NSObject
-
-- (instancetype)initWithUIManager:(RCTUIManager*)uiManager;
+typedef NS_ENUM(NSInteger, ViewState) {
+  Appearing,
+  Disappearing,
+  Layout,
+  Inactive,
+  ToRemove,
+};
 
-- (void)notifyAboutChangeWithBeforeSnapshots:(REASnapshooter*)beforeSnapshooter afterSnapshooter:(REASnapshooter*)afterSnapshooter;
+@interface REAAnimationsManager : NSObject
 
+- (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)addBlockOnAnimationEnd:(NSNumber*)tag block:(void (^)(void))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)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)removeLeftovers;
 
 @end