react-native-reanimated 2.3.0-beta.2 → 2.3.1

package/Common/cpp/headers/SharedItems/ValueWrapper.h

@@ -1,7 +1,9 @@
 #pragma once
 
 #include <jsi/jsi.h>
+#include <memory>
 #include <string>
+#include <vector>
 #include "HostFunctionHandler.h"
 #include "JSIStoreValueUser.h"
 #include "SharedParent.h"
@@ -13,8 +15,8 @@ class HostFunctionWrapper;
 
 class ValueWrapper {
  public:
-  ValueWrapper(){};
-  ValueWrapper(ValueType _type) : type(_type){};
+  ValueWrapper() {}
+  explicit ValueWrapper(ValueType _type) : type(_type) {}
   ValueType getType() const {
     return type;
   }
@@ -47,105 +49,107 @@ class ValueWrapper {
 
 class BooleanValueWrapper : public ValueWrapper {
  public:
-  BooleanValueWrapper(const bool _value)
-      : ValueWrapper(ValueType::BoolType), value(_value){};
+  explicit BooleanValueWrapper(const bool _value)
+      : ValueWrapper(ValueType::BoolType), value(_value) {}
   bool value;
 };
 
 class NumberValueWrapper : public ValueWrapper {
  public:
-  NumberValueWrapper(const double _value)
-      : ValueWrapper(ValueType::NumberType), value(_value){};
+  explicit NumberValueWrapper(const double _value)
+      : ValueWrapper(ValueType::NumberType), value(_value) {}
   double value;
 };
 
 class StringValueWrapper : public ValueWrapper {
  public:
-  StringValueWrapper(const std::string &_value)
-      : ValueWrapper(ValueType::StringType), value(_value){};
+  explicit StringValueWrapper(const std::string &_value)
+      : ValueWrapper(ValueType::StringType), value(_value) {}
   std::string value;
 };
 
 class HostFunctionWrapper : public ValueWrapper {
  public:
-  HostFunctionWrapper(const std::shared_ptr<HostFunctionHandler> &_value)
-      : ValueWrapper(ValueType::HostFunctionType), value(_value){};
+  explicit HostFunctionWrapper(
+      const std::shared_ptr<HostFunctionHandler> &_value)
+      : ValueWrapper(ValueType::HostFunctionType), value(_value) {}
   std::shared_ptr<HostFunctionHandler> value;
 };
 
 class FrozenObjectWrapper : public ValueWrapper {
  public:
-  FrozenObjectWrapper(const std::shared_ptr<FrozenObject> &_value)
-      : ValueWrapper(ValueType::FrozenObjectType), value(_value){};
+  explicit FrozenObjectWrapper(const std::shared_ptr<FrozenObject> &_value)
+      : ValueWrapper(ValueType::FrozenObjectType), value(_value) {}
   std::shared_ptr<FrozenObject> value;
 };
 
 class RemoteObjectWrapper : public ValueWrapper {
  public:
-  RemoteObjectWrapper(const std::shared_ptr<RemoteObject> &_value)
-      : ValueWrapper(ValueType::RemoteObjectType), value(_value){};
+  explicit RemoteObjectWrapper(const std::shared_ptr<RemoteObject> &_value)
+      : ValueWrapper(ValueType::RemoteObjectType), value(_value) {}
   std::shared_ptr<RemoteObject> value;
 };
 
 class FrozenArrayWrapper : public ValueWrapper {
  public:
-  FrozenArrayWrapper() : ValueWrapper(ValueType::FrozenArrayType){};
-  FrozenArrayWrapper(const std::vector<std::shared_ptr<ShareableValue>> &_value)
-      : ValueWrapper(ValueType::FrozenArrayType), value(_value){};
+  FrozenArrayWrapper() : ValueWrapper(ValueType::FrozenArrayType) {}
+  explicit FrozenArrayWrapper(
+      const std::vector<std::shared_ptr<ShareableValue>> &_value)
+      : ValueWrapper(ValueType::FrozenArrayType), value(_value) {}
   std::vector<std::shared_ptr<ShareableValue>> value;
 };
 
 class MutableValueWrapper : public ValueWrapper {
  public:
-  MutableValueWrapper(const std::shared_ptr<MutableValue> &_value)
-      : ValueWrapper(ValueType::MutableValueType), value(_value){};
+  explicit MutableValueWrapper(const std::shared_ptr<MutableValue> &_value)
+      : ValueWrapper(ValueType::MutableValueType), value(_value) {}
   std::shared_ptr<MutableValue> value;
 };
 
 inline bool ValueWrapper::asBoolean(
     const std::unique_ptr<ValueWrapper> &valueContainer) {
   return static_cast<BooleanValueWrapper *>(valueContainer.get())->value;
-};
+}
 
 inline double ValueWrapper::asNumber(
     const std::unique_ptr<ValueWrapper> &valueContainer) {
   return static_cast<NumberValueWrapper *>(valueContainer.get())->value;
-};
+}
 
 inline const std::string &ValueWrapper::asString(
     const std::unique_ptr<ValueWrapper> &valueContainer) {
   return static_cast<StringValueWrapper *>(valueContainer.get())->value;
-};
+}
 
 inline const std::shared_ptr<HostFunctionHandler> &ValueWrapper::asHostFunction(
     const std::unique_ptr<ValueWrapper> &valueContainer) {
   return static_cast<HostFunctionWrapper *>(valueContainer.get())->value;
-};
+}
 
 inline const std::shared_ptr<FrozenObject> &ValueWrapper::asFrozenObject(
     const std::unique_ptr<ValueWrapper> &valueContainer) {
   return static_cast<FrozenObjectWrapper *>(valueContainer.get())->value;
-};
+}
 
 inline const std::shared_ptr<RemoteObject> &ValueWrapper::asRemoteObject(
     const std::unique_ptr<ValueWrapper> &valueContainer) {
   return static_cast<RemoteObjectWrapper *>(valueContainer.get())->value;
-};
+}
 
 inline std::vector<std::shared_ptr<ShareableValue>>
     &ValueWrapper::asFrozenArray(
         const std::unique_ptr<ValueWrapper> &valueContainer) {
   return static_cast<FrozenArrayWrapper *>(valueContainer.get())->value;
-};
+}
 
 inline const std::shared_ptr<MutableValue> &ValueWrapper::asMutableValue(
     const std::unique_ptr<ValueWrapper> &valueContainer) {
   return static_cast<MutableValueWrapper *>(valueContainer.get())->value;
-};
+}
 
 inline const HostFunctionWrapper *ValueWrapper::asHostFunctionWrapper(
     const std::unique_ptr<ValueWrapper> &valueContainer) {
   return static_cast<HostFunctionWrapper *>(valueContainer.get());
-};
+}
 
 } // namespace reanimated

package/Common/cpp/headers/SpecTools/ErrorHandler.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <memory>
 #include <string>
 #include "Scheduler.h"
 

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

@@ -0,0 +1,19 @@
+#pragma once
+#include <string>
+
+namespace reanimated {
+
+class FeaturesConfig {
+ public:
+  static inline bool isLayoutAnimationEnabled() {
+    return _isLayoutAnimationEnabled;
+  }
+  static inline void setLayoutAnimationEnabled(bool isLayoutAnimationEnabled) {
+    _isLayoutAnimationEnabled = isLayoutAnimationEnabled;
+  }
+
+ private:
+  static bool _isLayoutAnimationEnabled;
+};
+
+} // namespace reanimated

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

@@ -1,5 +1,4 @@
-#ifndef JSIStoreValueUser_h
-#define JSIStoreValueUser_h
+#pragma once
 
 #include <jsi/jsi.h>
 #include <stdio.h>
@@ -27,7 +26,7 @@ class StoreUser {
   std::shared_ptr<StaticStoreUser> storeUserData;
 
  public:
-  StoreUser(std::shared_ptr<Scheduler> s, RuntimeManager &runtimeManager);
+  StoreUser(std::shared_ptr<Scheduler> s, const RuntimeManager &runtimeManager);
 
   std::weak_ptr<jsi::Value> getWeakRef(jsi::Runtime &rt);
   void removeRefs();
@@ -36,5 +35,3 @@ class StoreUser {
 };
 
 } // namespace reanimated
-
-#endif /* JSIStoreValueUser_h */

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

@@ -2,6 +2,8 @@
 
 #include <jsi/jsi.h>
 #include <stdio.h>
+#include <memory>
+#include <vector>
 #include "NativeReanimatedModule.h"
 #include "ShareableValue.h"
 

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

@@ -2,6 +2,9 @@
 
 #include <jsi/jsi.h>
 #include <stdio.h>
+#include <string>
+#include <utility>
+#include <vector>
 
 using namespace facebook;
 
@@ -18,6 +21,7 @@ using ScrollToFunction = std::function<void(int, double, double, bool)>;
 using MeasuringFunction =
     std::function<std::vector<std::pair<std::string, double>>(int)>;
 using TimeProviderFunction = std::function<double(void)>;
+using SetGestureStateFunction = std::function<void(int, int)>;
 
 struct PlatformDepMethodsHolder {
   RequestRender requestRender;
@@ -25,6 +29,7 @@ struct PlatformDepMethodsHolder {
   ScrollToFunction scrollToFunction;
   MeasuringFunction measuringFunction;
   TimeProviderFunction getCurrentTime;
+  SetGestureStateFunction setGestureStateFunction;
 };
 
 } // namespace reanimated

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

@@ -1,6 +1,4 @@
-
-#ifndef REANIMATEDEXAMPLE_REANIMATEDHIDDEN_H
-#define REANIMATEDEXAMPLE_REANIMATEDHIDDEN_H
+#pragma once
 
 #if defined(ONANDROID)
 #include "Logger.h"
@@ -11,5 +9,3 @@
 #include "Common/cpp/hidden_headers/LoggerInterface.h"
 #include "Common/cpp/hidden_headers/SpeedChecker.h"
 #endif
-
-#endif // REANIMATEDEXAMPLE_REANIMATEDHIDDEN_H

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

@@ -2,6 +2,8 @@
 
 #include <jsi/jsi.h>
 #include <stdio.h>
+#include <memory>
+#include <string>
 #include <unordered_map>
 #include "LayoutAnimationsProxy.h"
 #include "PlatformDepMethodsHolder.h"
@@ -34,6 +36,7 @@ class RuntimeDecorator {
       const ScrollToFunction scrollTo,
       const MeasuringFunction measure,
       const TimeProviderFunction getCurrentTime,
+      const SetGestureStateFunction setGestureState,
       std::shared_ptr<LayoutAnimationsProxy> layoutAnimationsProxy);
 
   /**
@@ -56,27 +59,27 @@ class RuntimeDecorator {
   static void registerRuntime(jsi::Runtime *runtime, RuntimeType runtimeType);
 
  private:
-  static std::unordered_map<RuntimePointer, RuntimeType> runtimeRegistry;
+  static std::unordered_map<RuntimePointer, RuntimeType> &runtimeRegistry();
 };
 
 inline bool RuntimeDecorator::isUIRuntime(jsi::Runtime &rt) {
-  auto iterator = runtimeRegistry.find(&rt);
-  if (iterator == runtimeRegistry.end())
+  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())
+  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())
+  auto iterator = runtimeRegistry().find(&rt);
+  if (iterator == runtimeRegistry().end())
     return true;
   return false;
 }

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

@@ -3,9 +3,11 @@
 #include <ReactCommon/CallInvoker.h>
 #include <condition_variable>
 #include <functional>
+#include <memory>
 #include <mutex>
 #include <queue>
 #include <thread>
+#include <utility>
 
 namespace reanimated {
 

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

@@ -2,6 +2,7 @@
 
 #include <jsi/jsi.h>
 #include <string>
+#include <utility>
 
 using namespace facebook;
 
@@ -23,7 +24,7 @@ class WorkletEventHandler {
       std::string eventName,
       jsi::Function &&handler)
       : id(id), eventName(eventName), handler(std::move(handler)) {}
-  void process(jsi::Runtime &rt, jsi::Value &eventValue);
+  void process(jsi::Runtime &rt, const jsi::Value &eventValue);
 };
 
 } // namespace reanimated

package/Common/cpp/hidden_headers/Logger.h

@@ -13,10 +13,10 @@ class Logger {
       throw std::runtime_error("no logger specified");
     }
     instance->log(value);
-  };
+  }
 
  private:
   static std::unique_ptr<LoggerInterface> instance;
 };
 
-} // namespace reanimated
+} // namespace reanimated

package/Common/cpp/hidden_headers/LoggerInterface.h

@@ -11,4 +11,4 @@ class LoggerInterface {
   virtual ~LoggerInterface() {}
 };
 
-} // namespace reanimated
+} // namespace reanimated

package/README.md

@@ -19,7 +19,7 @@ Check out our dedicated documentation page for info about this library, API refe
 
 ## Examples
 
-The source code for the example (showcase) app is under the [`Example/`](https://github.com/software-mansion/react-native-reanimated/blob/master/Example/) directory.
+The source code for the example (showcase) app is under the [`Example/`](https://github.com/software-mansion/react-native-reanimated/blob/main/Example/) directory.
 If you want to play with the API but don't feel like trying it on a real app, you can run the example project. Check Example/ directory README for installation instructions.
 
 ## License

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.66.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]
@@ -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

@@ -31,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
@@ -64,8 +58,9 @@ 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
@@ -88,4 +83,29 @@ 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)
+
+apply from: './expo/linking.gradle'

package/android/expo/linking.gradle

@@ -0,0 +1,46 @@
+def isExpoLinked = false
+rootProject.getSubprojects().forEach({ project ->
+    if (project.plugins.hasPlugin("com.android.application")) {
+        if (project.configurations.implementation.getDependencies().find { dep -> dep.name == "expo" }) {
+            isExpoLinked = true
+        }
+    }
+})
+
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
+if (isExpoLinked) {
+    apply plugin: 'com.android.library'
+
+    android {
+        // Disable aar bundling to fix the error when running `gradle assembleRelease` over `gradle :app:assembleRelease`
+        // which will throw `Direct local .aar file dependencies are not supported when building an AAR.`
+        tasks.whenTaskAdded { task ->
+            if (['bundleDebugAar', 'bundleReleaseAar'].contains(task.name)) {
+                task.enabled = false
+            }
+        }
+
+        compileSdkVersion safeExtGet('compileSdkVersion', 30)
+
+        sourceSets {
+            main.manifest.srcFile 'src/AndroidManifest.xml'
+            main.java.srcDirs = [ 'expo/src/main/java' ]
+        }
+
+        libraryVariants.all {
+            generateBuildConfigProvider?.get()?.enabled = false
+        }
+    }
+
+    dependencies {
+        implementation 'com.facebook.react:react-native:+'
+        implementation project(':expo-modules-core')
+
+        project.configurations.default.artifacts.each { artifact ->
+            api files(artifact.file)
+        }
+    }
+}

package/android/expo/src/main/java/com/swmansion/reanimated/EXReanimatedAdapter.java

@@ -0,0 +1,12 @@
+package com.swmansion.reanimated;
+
+import com.facebook.react.bridge.JavaScriptContextHolder;
+import com.facebook.react.bridge.ReactApplicationContext;
+
+public class EXReanimatedAdapter {
+  public static void registerJSIModules(ReactApplicationContext reactApplicationContext, JavaScriptContextHolder jsContext) {
+    NodesManager nodesManager =
+      reactApplicationContext.getNativeModule(ReanimatedModule.class).getNodesManager();
+    nodesManager.initWithContext(reactApplicationContext);
+  }
+}

package/android/expo/src/main/java/expo/modules/adapters/reanimated/EXReanimatedPackage.java

@@ -0,0 +1,26 @@
+package expo.modules.adapters.reanimated;
+
+import android.content.Context;
+
+import com.facebook.react.bridge.JavaScriptContextHolder;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.swmansion.reanimated.EXReanimatedAdapter;
+
+import java.util.Collections;
+import java.util.List;
+
+import expo.modules.core.interfaces.Package;
+import expo.modules.core.interfaces.ReactNativeHostHandler;
+
+public class EXReanimatedPackage implements Package {
+  @Override
+  public List<? extends ReactNativeHostHandler> createReactNativeHostHandlers(Context context) {
+    final ReactNativeHostHandler handler = new ReactNativeHostHandler() {
+      @Override
+      public void onRegisterJSIModules(ReactApplicationContext reactApplicationContext, JavaScriptContextHolder jsContext, boolean useDeveloperSupport) {
+        EXReanimatedAdapter.registerJSIModules(reactApplicationContext, jsContext);
+      }
+    };
+    return Collections.singletonList(handler);
+  }
+}

package/expo-module.config.json

@@ -0,0 +1,3 @@
+{
+  "platforms": ["android"]
+}