Merge branch 'master' of github.com:software-mansion/react-native-reanimated into v2-types

Author: renanmav

.gitignore

@@ -28,6 +28,7 @@ project.xcworkspace
 .idea
 .gradle
 local.properties
+android/src/main/JNILibs/
 
 # node.js
 #

Common/cpp/Registries/WorkletsCache.cpp

@@ -19,11 +19,11 @@ jsi::Function function(jsi::Runtime &rt, const std::string& code) {
 }
 
 std::shared_ptr<jsi::Function> WorkletsCache::getFunction(jsi::Runtime &rt, std::shared_ptr<FrozenObject> frozenObj) {
-  long long workletId = frozenObj->map["__workletID"]->numberValue;
-  if (worklets.count(workletId) == 0) {
+  long long workletHash = frozenObj->map["__workletHash"]->numberValue;
+  if (worklets.count(workletHash) == 0) {
     jsi::Function fun = function(rt, frozenObj->map["asString"]->stringValue);
     std::shared_ptr<jsi::Function> funPtr(new jsi::Function(std::move(fun)));
-    worklets[workletId] = funPtr;
+    worklets[workletHash] = funPtr;
   }
-  return worklets[workletId];
+  return worklets[workletHash];
 }

Common/cpp/SharedItems/Shareable.cpp

@@ -195,7 +195,19 @@ jsi::Value ShareableValue::toJSValue(jsi::Runtime &rt) {
                    const jsi::Value *args,
                    size_t count
                    ) mutable -> jsi::Value {
-          return funPtr->callWithThis(rt, *jsThis, args, count);
+           jsi::Value oldJSThis = rt.global().getProperty(rt, "jsThis");
+           rt.global().setProperty(rt, "jsThis", *jsThis); //set jsThis
+
+           jsi::Value res = jsi::Value::undefined();
+
+           if (thisValue.isObject()) {
+             res = funPtr->callWithThis(rt, thisValue.asObject(rt), args, count);
+           } else {
+             res = funPtr->call(rt, args, count);
+           }
+
+           rt.global().setProperty(rt, "jsThis", oldJSThis); //clean jsThis
+           return res;
         };
         return jsi::Function::createFromHostFunction(rt, jsi::PropNameID::forAscii(rt, "workletFunction"), 0, clb);
       } else {
@@ -230,11 +242,15 @@ jsi::Value ShareableValue::toJSValue(jsi::Runtime &rt) {
 
             jsi::Value returnedValue;
 
-            returnedValue = funPtr->callWithThis(rt,
-                                             jsThis,
+            jsi::Value oldJSThis = rt.global().getProperty(rt, "jsThis");
+            rt.global().setProperty(rt, "jsThis", jsThis); //set jsThis
+            
+            returnedValue = funPtr->call(rt,
                                              static_cast<const jsi::Value*>(args),
                                              (size_t)params.size());
 
+            rt.global().setProperty(rt, "jsThis", oldJSThis); //clean jsThis
+            
             delete [] args;
             // ToDo use returned value to return promise
           });
@@ -292,14 +308,15 @@ void MutableValue::set(jsi::Runtime &rt, const jsi::PropNameID &name, const jsi:
 
   if (module->isHostRuntime(rt)) {
     if (propName == "value") {
-      {
-        std::lock_guard<std::mutex> lock(readWriteMutex);
-        value = ShareableValue::adapt(rt, newValue, module);
-      }
-      module->scheduler->scheduleOnUI([this] {
-        for (auto listener : listeners) {
-          listener.second();
-        }
+      auto shareable = ShareableValue::adapt(rt, newValue, module);
+      module->scheduler->scheduleOnUI([this, shareable] {
+        jsi::Runtime &rt = *this->module->runtime.get();
+        auto setterProxy = jsi::Object::createFromHostObject(rt, std::make_shared<MutableValueSetterProxy>(shared_from_this()));
+        jsi::Value newValue = shareable->getValue(rt);
+        module->valueSetter->getValue(rt)
+          .asObject(rt)
+          .asFunction(rt)
+          .callWithThis(rt, setterProxy, newValue);
       });
     }
     return;

Common/cpp/Tools/RuntimeDecorator.cpp

@@ -21,6 +21,8 @@ void RuntimeDecorator::addNativeObjects(jsi::Runtime &rt, UpdaterFunction update
 
   dummyGlobal.setProperty(rt, "__reanimatedWorkletInit", __reanimatedWorkletInit);
   rt.global().setProperty(rt, "global", dummyGlobal);
+  
+  rt.global().setProperty(rt, "jsThis", jsi::Value::undefined());
 
   auto callback = [](
       jsi::Runtime &rt,

Common/cpp/headers/NativeModules/NativeReanimatedModule.h

@@ -15,11 +15,13 @@ namespace reanimated {
 using FrameCallback = std::function<void(double)>;
 
 class ShareableValue;
+class MutableValue;
 class MapperRegistry;
 class EventHandlerRegistry;
 
 class NativeReanimatedModule : public NativeReanimatedModuleSpec {
   friend ShareableValue;
+  friend MutableValue;
 
   public:
     NativeReanimatedModule(std::shared_ptr<CallInvoker> jsInvoker,

Example/android/app/build.gradle

@@ -160,7 +160,7 @@ dependencies {
     implementation project(':react-native-gesture-handler')
 
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation project(':react-native')// From node_modules
+    implementation "com.facebook.react:react-native:+"  // From node_modules
     //implementation 'org.webkit:android-jsc:+'
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"

Example/android/build.gradle

@@ -19,14 +19,6 @@ buildscript {
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
-
-    configurations.all {
-        resolutionStrategy {
-            dependencySubstitution {
-                substitute module("com.facebook.react:react-native:+") with project(":react-native")
-            }
-        }
-    }
 }
 
 allprojects {

Example/android/settings.gradle

@@ -7,6 +7,4 @@ include ':react-native-reanimated'
 project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, '../../android')
 include ':react-native-gesture-handler'
 project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
-include ':react-native'
-project(':react-native').projectDir = new File(rootProject.projectDir, '../node_modules/react-native/ReactAndroid')
 include ':app'

Example/ios/Podfile.lock

@@ -264,7 +264,7 @@ PODS:
     - React
   - RNGestureHandler (1.5.2):
     - React
-  - RNReanimated (2.0.0-alpha.1):
+  - RNReanimated (2.0.0-alpha.3):
     - DoubleConversion
     - FBLazyVector
     - FBReactNativeSpec
@@ -428,7 +428,7 @@ SPEC CHECKSUMS:
   ReactCommon: ed4e11d27609d571e7eee8b65548efc191116eb3
   RNCMaskedView: 76c40a1d41c3e2535df09246a2b5487f04de0814
   RNGestureHandler: 946a7691e41df61e2c4b1884deab41a4cdc3afff
-  RNReanimated: cb0dce8f8375ff485c6d4760553ae831500e7787
+  RNReanimated: c7c95835ae5490a0bca3761b84771594bcb8a6f0
   RNSVG: ce9d996113475209013317e48b05c21ee988d42e
   Yoga: 3ebccbdd559724312790e7742142d062476b698e
 

Example/ios/ReanimatedExample/AppDelegate.mm

@@ -55,6 +55,11 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
 {
   _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge delegate:self];
+
+  #if RCT_DEV
+    [_turboModuleManager moduleForName:"RCTDevMenu"];
+  #endif
+
   __weak __typeof(self) weakSelf = self;
   return std::make_unique<facebook::react::JSCExecutorFactory>([weakSelf, bridge](facebook::jsi::Runtime &runtime) {
     if (!bridge) {