react-native-reanimated 2.5.0 → 2.8.0

package/Common/cpp/SharedItems/ShareableValue.cpp

@@ -64,7 +64,7 @@ void ShareableValue::adapt(
       jsi::Object hiddenProperty = hiddenValue.asObject(rt);
       if (hiddenProperty.isHostObject<FrozenObject>(rt)) {
         type = ValueType::FrozenObjectType;
-        if (object.hasProperty(rt, "__worklet") && object.isFunction(rt)) {
+        if (object.hasProperty(rt, "__workletHash") && object.isFunction(rt)) {
           type = ValueType::WorkletFunctionType;
         }
         valueContainer = std::make_unique<FrozenObjectWrapper>(
@@ -99,7 +99,7 @@ void ShareableValue::adapt(
   } else if (value.isObject()) {
     auto object = value.asObject(rt);
     if (object.isFunction(rt)) {
-      if (object.getProperty(rt, "__worklet").isUndefined()) {
+      if (object.getProperty(rt, "__workletHash").isUndefined()) {
         // not a worklet, we treat this as a host function
         type = ValueType::HostFunctionType;
         containsHostFunction = true;

package/Common/cpp/Tools/RuntimeDecorator.cpp

@@ -31,20 +31,6 @@ void RuntimeDecorator::decorateRuntime(
       rt, "_LABEL", jsi::String::createFromAscii(rt, label));
 
   jsi::Object dummyGlobal(rt);
-  auto dummyFunction = [](jsi::Runtime &rt,
-                          const jsi::Value &thisValue,
-                          const jsi::Value *args,
-                          size_t count) -> jsi::Value {
-    return jsi::Value::undefined();
-  };
-  jsi::Function __reanimatedWorkletInit = jsi::Function::createFromHostFunction(
-      rt,
-      jsi::PropNameID::forAscii(rt, "__reanimatedWorkletInit"),
-      1,
-      dummyFunction);
-
-  dummyGlobal.setProperty(
-      rt, "__reanimatedWorkletInit", __reanimatedWorkletInit);
   rt.global().setProperty(rt, "global", dummyGlobal);
 
   rt.global().setProperty(rt, "jsThis", jsi::Value::undefined());

package/RNReanimated.podspec

@@ -3,27 +3,34 @@ require "json"
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
 
 reactVersion = '0.0.0'
+reactTargetTvOS = false
 
 begin
   # 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"]
+  reactJson = JSON.parse(File.read(File.join(__dir__, "..", "..", "node_modules", "react-native", "package.json")))
+  reactVersion = reactJson["version"]
+  reactTargetTvOS = reactJson["name"] == "react-native-tvos"
 rescue
   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"]
+    reactJson = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "node_modules", "react-native", "package.json")))
+    reactVersion = reactJson["version"]
+    reactTargetTvOS = reactJson["name"] == "react-native-tvos"
   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"]
+      reactJson = JSON.parse(File.read(File.join(__dir__, "node_modules", "react-native", "package.json")))
+      reactVersion = reactJson["version"]
+      reactTargetTvOS = ENV["ReanimatedTVOSExample"] == "1"
     rescue
       # should never happen
-      reactVersion = '0.66.0'
+      reactVersion = '0.68.0'
       puts "[RNReanimated] Unable to recognized your `react-native` version! Default `react-native` version: " + reactVersion
     end
   end
@@ -78,7 +85,7 @@ Pod::Spec.new do |s|
 
   s.requires_arc = true
 
-  s.dependency "React"
+  s.dependency "React-Core"
   s.dependency 'FBLazyVector'
   s.dependency 'FBReactNativeSpec'
   s.dependency 'RCTRequired'
@@ -86,7 +93,9 @@ Pod::Spec.new do |s|
   s.dependency 'React-Core'
   s.dependency 'React-CoreModules'
   s.dependency 'React-Core/DevSupport'
-  s.dependency 'React-RCTActionSheet'
+  if !reactTargetTvOS
+    s.dependency 'React-RCTActionSheet'
+  end
   s.dependency 'React-RCTNetwork'
   s.dependency 'React-RCTAnimation'
   s.dependency 'React-RCTLinking'

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Mar 21 07:47:31 UTC 2022
+#Thu Apr 21 15:44:53 UTC 2022
 gradle.version=7.2

package/android/build.gradle

@@ -74,15 +74,6 @@ def resolveBuildType() {
     return true
 }
 
-def resolveExpoLinkingGradle() {
-    def gradleScript = file("./expo/linking.gradle")
-    if (gradleScript.exists()) {
-        return "./expo/linking.gradle"
-    } else {
-        return "../android-npm/expo/linking.gradle"
-    }
-}
-
 def isDeveloperMode() {
     // developer mode, to run Example app
     return file("$projectDir/../node_modules/react-native/package.json").exists()
@@ -291,9 +282,6 @@ if (!BUILD_FROM_SOURCE) {
 // end if already loaded aar
 if (!BUILD_FROM_SOURCE) return
 
-// apply expo config
-apply from: resolveExpoLinkingGradle()
-
 def localProps = new Properties()
 def localPropertiesFile = file("local.properties")
 if (localPropertiesFile.exists()) {
@@ -701,17 +689,19 @@ task downloadNdkBuildDependencies {
 task prepareThirdPartyNdkHeaders(dependsOn:[downloadNdkBuildDependencies, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog]) {
 }
 
-tasks.whenTaskAdded { task ->
-    if (
-        task.name.contains("externalNativeBuild")
-        || task.name.contains("buildCMake")
-    ) {
-        task.dependsOn(prepareThirdPartyNdkHeaders)
-        extractAARHeaders.dependsOn(prepareThirdPartyNdkHeaders)
-        extractSOFiles.dependsOn(prepareThirdPartyNdkHeaders)
-        task.dependsOn(extractAARHeaders)
-        task.dependsOn(extractSOFiles)
-    }
+def nativeBuildDependsOn(dependsOnTask) {
+    def buildTasks = tasks.findAll({ task ->
+        !task.name.contains("Clean") && (task.name.contains("externalNative") || task.name.contains("CMake")) })
+    buildTasks.forEach { task -> task.dependsOn(dependsOnTask) }
+}
+
+afterEvaluate {
+    extractAARHeaders.dependsOn(prepareThirdPartyNdkHeaders)
+    extractSOFiles.dependsOn(prepareThirdPartyNdkHeaders)
+
+    nativeBuildDependsOn(prepareThirdPartyNdkHeaders)
+    nativeBuildDependsOn(extractAARHeaders)
+    nativeBuildDependsOn(extractSOFiles)
 }
 
 if (CLIENT_SIDE_BUILD) {

package/android/src/main/cpp/NativeProxy.cpp

@@ -37,6 +37,13 @@ NativeProxy::NativeProxy(
       scheduler_(scheduler),
       layoutAnimations(std::move(_layoutAnimations)) {}
 
+NativeProxy::~NativeProxy() {
+  runtime_->global().setProperty(
+      *runtime_,
+      jsi::PropNameID::forAscii(*runtime_, "__reanimatedModuleProxy"),
+      jsi::Value::undefined());
+}
+
 jni::local_ref<NativeProxy::jhybriddata> NativeProxy::initHybrid(
     jni::alias_ref<jhybridobject> jThis,
     jlong jsContext,
@@ -192,18 +199,21 @@ void NativeProxy::installJSIBindings() {
       platformDepMethodsHolder);
 
   _nativeReanimatedModule = module;
-
-  this->registerEventHandler([module, getCurrentTime](
-                                 std::string eventName,
-                                 std::string eventAsString) {
-    jsi::Object global = module->runtime->global();
-    jsi::String eventTimestampName =
-        jsi::String::createFromAscii(*module->runtime, "_eventTimestamp");
-    global.setProperty(*module->runtime, eventTimestampName, getCurrentTime());
-    module->onEvent(eventName, eventAsString);
-    global.setProperty(
-        *module->runtime, eventTimestampName, jsi::Value::undefined());
-  });
+  std::weak_ptr<NativeReanimatedModule> weakModule = module;
+  this->registerEventHandler(
+      [weakModule, getCurrentTime](
+          std::string eventName, std::string eventAsString) {
+        if (auto module = weakModule.lock()) {
+          jsi::Object global = module->runtime->global();
+          jsi::String eventTimestampName =
+              jsi::String::createFromAscii(*module->runtime, "_eventTimestamp");
+          global.setProperty(
+              *module->runtime, eventTimestampName, getCurrentTime());
+          module->onEvent(eventName, eventAsString);
+          global.setProperty(
+              *module->runtime, eventTimestampName, jsi::Value::undefined());
+        }
+      });
 
   runtime_->global().setProperty(
       *runtime_,

package/android/src/main/cpp/headers/NativeProxy.h

@@ -131,6 +131,8 @@ class NativeProxy : public jni::HybridClass<NativeProxy> {
       jni::alias_ref<LayoutAnimations::javaobject> layoutAnimations);
   static void registerNatives();
 
+  ~NativeProxy();
+
  private:
   friend HybridBase;
   jni::global_ref<NativeProxy::javaobject> javaPart_;

package/android/src/main/java/com/swmansion/reanimated/NativeProxy.java

@@ -147,14 +147,17 @@ public class NativeProxy {
   }
 
   private void addDevMenuOption() {
-    final DevSupportManager devSupportManager =
-        ((ReactApplication) mContext.get().getApplicationContext())
-            .getReactNativeHost()
-            .getReactInstanceManager()
-            .getDevSupportManager();
-
-    devSupportManager.addCustomDevOption(
-        "Toggle slow animations (Reanimated)", this::toggleSlowAnimations);
+    // In Expo, `ApplicationContext` is not an instance of `ReactApplication`
+    if (mContext.get().getApplicationContext() instanceof ReactApplication) {
+      final DevSupportManager devSupportManager =
+          ((ReactApplication) mContext.get().getApplicationContext())
+              .getReactNativeHost()
+              .getReactInstanceManager()
+              .getDevSupportManager();
+
+      devSupportManager.addCustomDevOption(
+          "Toggle slow animations (Reanimated)", this::toggleSlowAnimations);
+    }
   }
 
   @DoNotStrip

package/android/src/main/java/com/swmansion/reanimated/layoutReanimation/AnimationsManager.java

@@ -1,5 +1,6 @@
 package com.swmansion.reanimated.layoutReanimation;
 
+import android.app.Activity;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.View;
@@ -368,12 +369,18 @@ public class AnimationsManager implements ViewHierarchyObserver {
       preparedValues.put(key, PixelUtil.toDIPFromPixel((int) values.get(key)));
     }
 
-    DisplayMetrics displaymetrics = new DisplayMetrics();
-    mContext.getCurrentActivity().getWindowManager().getDefaultDisplay().getMetrics(displaymetrics);
-    int height = displaymetrics.heightPixels;
-    int width = displaymetrics.widthPixels;
-    preparedValues.put("windowWidth", PixelUtil.toDIPFromPixel(width));
-    preparedValues.put("windowHeight", PixelUtil.toDIPFromPixel(height));
+    DisplayMetrics displayMetrics = new DisplayMetrics();
+    Activity currentActivity = mContext.getCurrentActivity();
+    if (currentActivity != null) {
+      currentActivity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+      int height = displayMetrics.heightPixels;
+      int width = displayMetrics.widthPixels;
+      preparedValues.put("windowWidth", PixelUtil.toDIPFromPixel(width));
+      preparedValues.put("windowHeight", PixelUtil.toDIPFromPixel(height));
+    } else {
+      preparedValues.put("windowWidth", PixelUtil.toDIPFromPixel(0));
+      preparedValues.put("windowHeight", PixelUtil.toDIPFromPixel(0));
+    }
     return preparedValues;
   }
 

package/ios/LayoutReanimation/REAAnimationsManager.h

@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
+#import <RNReanimated/REASnapshot.h>
 #import <React/RCTUIManager.h>
-#import "REASnapshot.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

package/ios/LayoutReanimation/REAAnimationsManager.m

@@ -1,9 +1,9 @@
-#import "REAAnimationsManager.h"
+#import <RNReanimated/REAAnimationsManager.h>
+#import <RNReanimated/REAUIManager.h>
 #import <React/RCTComponentData.h>
 #import <React/RCTTextView.h>
 #import <React/UIView+Private.h>
 #import <React/UIView+React.h>
-#import "REAUIManager.h"
 
 @interface REAAnimationsManager ()
 

package/ios/LayoutReanimation/REASnapshot.m

@@ -1,5 +1,5 @@
-#import "REASnapshot.h"
 #import <Foundation/Foundation.h>
+#import <RNReanimated/REASnapshot.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

package/ios/LayoutReanimation/REAUIManager.h

@@ -1,7 +1,7 @@
+#import <RNReanimated/REAAnimationsManager.h>
 #import <React/RCTBridge+Private.h>
 #import <React/RCTDefines.h>
 #import <React/RCTUIManager.h>
-#import "REAAnimationsManager.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

package/ios/LayoutReanimation/REAUIManager.mm

@@ -1,9 +1,8 @@
-#import "REAUIManager.h"
 #import <Foundation/Foundation.h>
-#include "FeaturesConfig.h"
-#import "REAIOSScheduler.h"
-#include "Scheduler.h"
-
+#import <RNReanimated/FeaturesConfig.h>
+#import <RNReanimated/REAIOSScheduler.h>
+#import <RNReanimated/REAUIManager.h>
+#import <RNReanimated/Scheduler.h>
 #import <React/RCTComponentData.h>
 #import <React/RCTLayoutAnimation.h>
 #import <React/RCTLayoutAnimationGroup.h>

package/ios/Nodes/REAAlwaysNode.h

@@ -1,4 +1,4 @@
-#import "REANode.h"
+#import <RNReanimated/REANode.h>
 
 @interface REAAlwaysNode : REANode <REAFinalNode>
 @end

package/ios/Nodes/REAAlwaysNode.m

@@ -1,11 +1,11 @@
-#import "REAAlwaysNode.h"
+#import <RNReanimated/REAAlwaysNode.h>
+#import <RNReanimated/REAModule.h>
+#import <RNReanimated/REANodesManager.h>
+#import <RNReanimated/REAStyleNode.h>
+#import <RNReanimated/REAUtils.h>
 #import <React/RCTConvert.h>
 #import <React/RCTLog.h>
 #import <React/RCTUIManager.h>
-#import "REAModule.h"
-#import "REANodesManager.h"
-#import "REAStyleNode.h"
-#import "REAUtils.h"
 
 @implementation REAAlwaysNode {
   NSNumber *_nodeToBeEvaluated;

package/ios/Nodes/REABezierNode.h

@@ -1,4 +1,4 @@
-#import "REANode.h"
+#import <RNReanimated/REANode.h>
 
 @interface REABezierNode : REANode
 

package/ios/Nodes/REABezierNode.m

@@ -1,10 +1,9 @@
-#include <tgmath.h>
-
+#import <RNReanimated/REABezierNode.h>
+#import <RNReanimated/REANodesManager.h>
+#import <RNReanimated/REAUtils.h>
 #import <React/RCTConvert.h>
 #import <React/RCTLog.h>
-#import "REABezierNode.h"
-#import "REANodesManager.h"
-#import "REAUtils.h"
+#include <tgmath.h>
 
 #define EPS 1e-5
 

package/ios/Nodes/REABlockNode.h

@@ -1,4 +1,4 @@
-#import "REANode.h"
+#import <RNReanimated/REANode.h>
 
 @interface REABlockNode : REANode
 

package/ios/Nodes/REABlockNode.m

@@ -1,5 +1,5 @@
-#import "REABlockNode.h"
-#import "REANodesManager.h"
+#import <RNReanimated/REABlockNode.h>
+#import <RNReanimated/REANodesManager.h>
 
 @implementation REABlockNode {
   NSArray<NSNumber *> *_block;

package/ios/Nodes/REACallFuncNode.h

@@ -1,5 +1,5 @@
 
-#import "REANode.h"
+#import <RNReanimated/REANode.h>
 
 @interface REACallFuncNode : REANode
 

package/ios/Nodes/REACallFuncNode.m

@@ -1,10 +1,10 @@
 
 
-#import "REACallFuncNode.h"
-#import "REAFunctionNode.h"
-#import "REANodesManager.h"
-#import "REAParamNode.h"
-#import "REAUtils.h"
+#import <RNReanimated/REACallFuncNode.h>
+#import <RNReanimated/REAFunctionNode.h>
+#import <RNReanimated/REANodesManager.h>
+#import <RNReanimated/REAParamNode.h>
+#import <RNReanimated/REAUtils.h>
 
 @implementation REACallFuncNode {
   NSNumber *_whatNodeID;

package/ios/Nodes/REAClockNodes.h

@@ -1,4 +1,4 @@
-#import "REANode.h"
+#import <RNReanimated/REANode.h>
 
 @interface REAClockNode : REANode
 @property (nonatomic, readonly) BOOL isRunning;

package/ios/Nodes/REAClockNodes.m

@@ -1,9 +1,9 @@
-#import "REAClockNodes.h"
+#import <RNReanimated/REAClockNodes.h>
+#import <RNReanimated/REANodesManager.h>
+#import <RNReanimated/REAParamNode.h>
+#import <RNReanimated/REAUtils.h>
 #import <React/RCTConvert.h>
 #import <React/RCTLog.h>
-#import "REANodesManager.h"
-#import "REAParamNode.h"
-#import "REAUtils.h"
 
 @interface REAClockNode ()
 

package/ios/Nodes/REAConcatNode.h

@@ -1,4 +1,4 @@
-#import "REANode.h"
+#import <RNReanimated/REANode.h>
 
 @interface REAConcatNode : REANode
 

package/ios/Nodes/REAConcatNode.m

@@ -1,6 +1,6 @@
-#import "REAConcatNode.h"
-#import "REANodesManager.h"
-#import "REAValueNode.h"
+#import <RNReanimated/REAConcatNode.h>
+#import <RNReanimated/REANodesManager.h>
+#import <RNReanimated/REAValueNode.h>
 
 @implementation REAConcatNode {
   NSArray<NSNumber *> *_input;

package/ios/Nodes/REACondNode.h

@@ -1,4 +1,4 @@
-#import "REANode.h"
+#import <RNReanimated/REANode.h>
 
 @interface REACondNode : REANode
 

package/ios/Nodes/REACondNode.m

@@ -1,8 +1,8 @@
-#import "REACondNode.h"
+#import <RNReanimated/REACondNode.h>
+#import <RNReanimated/REANodesManager.h>
+#import <RNReanimated/REAUtils.h>
 #import <React/RCTConvert.h>
 #import <React/RCTLog.h>
-#import "REANodesManager.h"
-#import "REAUtils.h"
 
 @implementation REACondNode {
   NSNumber *_condNodeID;

package/ios/Nodes/READebugNode.h

@@ -1,4 +1,4 @@
-#import "REANode.h"
+#import <RNReanimated/REANode.h>
 
 @interface READebugNode : REANode
 

package/ios/Nodes/READebugNode.m

@@ -1,8 +1,8 @@
-#import "READebugNode.h"
+#import <RNReanimated/READebugNode.h>
+#import <RNReanimated/REANodesManager.h>
+#import <RNReanimated/REAUtils.h>
 #import <React/RCTConvert.h>
 #import <React/RCTLog.h>
-#import "REANodesManager.h"
-#import "REAUtils.h"
 
 @implementation READebugNode {
   NSNumber *_valueNodeID;

package/ios/Nodes/REAEventNode.h

@@ -1,5 +1,4 @@
-#import "REANode.h"
-
+#import <RNReanimated/REANode.h>
 #import <React/RCTEventDispatcher.h>
 
 @interface REAEventNode : REANode

package/ios/Nodes/REAEventNode.m

@@ -1,6 +1,6 @@
-#import "REAEventNode.h"
-#import "REANodesManager.h"
-#import "REAValueNode.h"
+#import <RNReanimated/REAEventNode.h>
+#import <RNReanimated/REANodesManager.h>
+#import <RNReanimated/REAValueNode.h>
 
 @implementation REAEventNode {
   NSArray *_argMapping;

package/ios/Nodes/REAFunctionNode.h

@@ -1,5 +1,5 @@
 
-#import "REANode.h"
+#import <RNReanimated/REANode.h>
 
 @interface REAFunctionNode : REANode
 

package/ios/Nodes/REAFunctionNode.m

@@ -1,7 +1,7 @@
 
-#import "REAFunctionNode.h"
-#import "REANodesManager.h"
-#import "REAParamNode.h"
+#import <RNReanimated/REAFunctionNode.h>
+#import <RNReanimated/REANodesManager.h>
+#import <RNReanimated/REAParamNode.h>
 
 @implementation REAFunctionNode {
   NSNumber *_nodeToBeEvaluated;

package/ios/Nodes/REAJSCallNode.h

@@ -1,4 +1,4 @@
-#import "REANode.h"
+#import <RNReanimated/REANode.h>
 
 @interface REAJSCallNode : REANode
 

package/ios/Nodes/REAJSCallNode.m

@@ -1,6 +1,6 @@
-#import "REAJSCallNode.h"
-#import "REAModule.h"
-#import "REANodesManager.h"
+#import <RNReanimated/REAJSCallNode.h>
+#import <RNReanimated/REAModule.h>
+#import <RNReanimated/REANodesManager.h>
 
 @implementation REAJSCallNode {
   NSArray<NSNumber *> *_input;

package/ios/Nodes/REANode.m

@@ -1,5 +1,5 @@
-#import "REANode.h"
-#import "REANodesManager.h"
+#import <RNReanimated/REANode.h>
+#import <RNReanimated/REANodesManager.h>
 
 #import <React/RCTDefines.h>
 

package/ios/Nodes/REAOperatorNode.h

@@ -1,4 +1,4 @@
-#import "REANode.h"
+#import <RNReanimated/REANode.h>
 
 @interface REAOperatorNode : REANode