react-native-reanimated 2.7.0 → 2.9.1

package/Common/cpp/Tools/RuntimeDecorator.cpp

@@ -71,21 +71,27 @@ void RuntimeDecorator::decorateRuntime(
           1,
           setGlobalConsole));
 
+  auto chronoNow = [](jsi::Runtime &rt,
+                      const jsi::Value &thisValue,
+                      const jsi::Value *args,
+                      size_t count) -> jsi::Value {
+    double now = std::chrono::system_clock::now().time_since_epoch() /
+        std::chrono::milliseconds(1);
+    return jsi::Value(now);
+  };
+
   rt.global().setProperty(
       rt,
       "_chronoNow",
       jsi::Function::createFromHostFunction(
-          rt,
-          jsi::PropNameID::forAscii(rt, "_chronoNow"),
-          0,
-          [](jsi::Runtime &rt,
-             const jsi::Value &thisValue,
-             const jsi::Value *args,
-             size_t count) -> jsi::Value {
-            double now = std::chrono::system_clock::now().time_since_epoch() /
-                std::chrono::milliseconds(1);
-            return jsi::Value(now);
-          }));
+          rt, jsi::PropNameID::forAscii(rt, "_chronoNow"), 0, chronoNow));
+  jsi::Object performance(rt);
+  performance.setProperty(
+      rt,
+      "now",
+      jsi::Function::createFromHostFunction(
+          rt, jsi::PropNameID::forAscii(rt, "now"), 0, chronoNow));
+  rt.global().setProperty(rt, "performance", performance);
 }
 
 void RuntimeDecorator::decorateUIRuntime(

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

@@ -1,2 +1,2 @@
-#Mon Apr 11 15:37:15 UTC 2022
+#Fri Jul 01 09:56:56 UTC 2022
 gradle.version=7.2

package/android/CMakeLists.txt

@@ -1,3 +1,4 @@
+project(Reanimated)
 cmake_minimum_required(VERSION 3.5.1)
 
 set (CMAKE_VERBOSE_MAKEFILE ON)
@@ -13,6 +14,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
 
 set (PACKAGE_NAME "reanimated")
+set (BUILD_DIR ${CMAKE_SOURCE_DIR}/build)
 set (SRC_DIR ${CMAKE_SOURCE_DIR}/src)
 
 if(${CLIENT_SIDE_BUILD})
@@ -119,12 +121,23 @@ find_library(
         PATHS ${LIBRN_DIR}
         NO_CMAKE_FIND_ROOT_PATH
 )
-find_library(
-        FOLLY_JSON_LIB
-        folly_json
-        PATHS ${LIBRN_DIR}
-        NO_CMAKE_FIND_ROOT_PATH
-)
+
+if(${REACT_NATIVE_TARGET_VERSION} LESS 69)
+        find_library(
+                FOLLY_LIB
+                folly_json
+                PATHS ${LIBRN_DIR}
+                NO_CMAKE_FIND_ROOT_PATH
+        )
+else()
+        find_library(
+                FOLLY_LIB
+                folly_runtime
+                PATHS ${LIBRN_DIR}
+                NO_CMAKE_FIND_ROOT_PATH
+        )
+endif()
+
 find_library(
         REACT_NATIVE_JNI_LIB
         reactnativejni
@@ -169,7 +182,7 @@ if(${FOR_HERMES})
             ${HERMES_LIB}
             ${GLOG_LIB}
             ${FBJNI_LIB}
-            ${FOLLY_JSON_LIB}
+            ${FOLLY_LIB}
             ${REACT_NATIVE_JNI_LIB}
             android
     )
@@ -181,7 +194,7 @@ else()
             ${JSEXECUTOR_LIB}
             ${GLOG_LIB}
             ${FBJNI_LIB}
-            ${FOLLY_JSON_LIB}
+            ${FOLLY_LIB}
             ${REACT_NATIVE_JNI_LIB}
             android
     )

package/android/build.gradle

@@ -149,10 +149,10 @@ def detectAAR(minor, engine) {
             println "\n\n\n"
             println "****************************************************************************************"
             println "\n\n\n"
-            println "WARNING reanimated - no version-specific reanimated AAR for react-native version $rnMinorVersion found."
+            println "WARNING reanimated - no version-specific reanimated AAR for react-native version $minor found."
             println "Falling back to AAR for react-native version $rnMinorVersionCopy."
             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 $rnMinorVersion to the reanimated repo."
+            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 "****************************************************************************************"
@@ -351,8 +351,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.2.2"
-        classpath "de.undercouch:gradle-download-task:4.1.2"
+        classpath "com.android.tools.build:gradle:7.1.1"
+        classpath "de.undercouch:gradle-download-task:5.0.1"
         classpath "com.diffplug.spotless:spotless-plugin-gradle:5.15.0"
     }
 }
@@ -381,8 +381,7 @@ android {
                         "-DBOOST_VERSION=${BOOST_VERSION}",
                         "-DBUILD_DIR=${buildDir}",
                         "-DFOR_HERMES=${FOR_HERMES}",
-                        "-DCLIENT_SIDE_BUILD=${CLIENT_SIDE_BUILD}",
-                        "--clean-first"
+                        "-DCLIENT_SIDE_BUILD=${CLIENT_SIDE_BUILD}"
                 abiFilters (*reactNativeArchitectures())
                 _stackProtectorFlag ? (cppFlags("-fstack-protector-all")) : null
             }
@@ -407,6 +406,7 @@ android {
                 "**/libfbjni.so",
                 "**/libjsi.so",
                 "**/libfolly_json.so",
+                "**/libfolly_runtime.so",
                 "**/libglog.so",
                 "**/libhermes.so",
                 "**/libreactnativejni.so",
@@ -459,7 +459,12 @@ task createNativeDepsDirectories(dependsOn: applyJavaPatches) {
 }
 
 task downloadBoost(dependsOn: createNativeDepsDirectories, type: Download) {
-    src("https://github.com/react-native-community/boost-for-react-native/releases/download/v${BOOST_VERSION.replace("_", ".")}-0/boost_${BOOST_VERSION}.tar.gz")
+    def transformedVersion = BOOST_VERSION.replace("_", ".")
+    def srcUrl = "https://boostorg.jfrog.io/artifactory/main/release/${transformedVersion}/source/boost_${BOOST_VERSION}.tar.gz"
+    if (rnMinorVersion < 69) {
+        srcUrl = "https://github.com/react-native-community/boost-for-react-native/releases/download/v${transformedVersion}-0/boost_${BOOST_VERSION}.tar.gz"
+    }
+    src(srcUrl)
     onlyIfNewer(true)
     overwrite(false)
     dest(new File(downloadsDir, "boost_${BOOST_VERSION}.tar.gz"))
@@ -672,7 +677,17 @@ dependencies {
     extractHeaders("com.facebook.fbjni:fbjni:" + FBJNI_VERSION + ":headers")
     extractSO("com.facebook.fbjni:fbjni:" + FBJNI_VERSION)
 
-    def rnAAR = fileTree("$reactNative/android").matching({ it.include "**/**/*.aar" }).singleFile
+    def buildType = "debug"
+    tasks.all({ task ->
+        if (task.name == "buildCMakeRelease") {
+            buildType = "release"
+        }
+    })
+    def rnAarMatcher = "**/react-native/**/*${buildType}.aar"
+    if (rnMinorVersion < 69) {
+        rnAarMatcher = "**/**/*.aar"
+    }
+    def rnAAR = fileTree("$reactNative/android").matching({ it.include rnAarMatcher }).singleFile
     def jscAAR = fileTree("$reactNative/../jsc-android/dist/org/webkit/android-jsc").matching({ it.include "**/**/*.aar" }).singleFile
     extractSO(files(rnAAR, jscAAR))
 }

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,
@@ -138,11 +145,22 @@ void NativeProxy::installJSIBindings() {
   std::shared_ptr<jsi::Runtime> animatedRuntime =
       facebook::jsc::makeJSCRuntime();
 #endif
+  auto workletRuntimeValue = runtime_->global()
+    .getProperty(*runtime_, "ArrayBuffer")
+    .asObject(*runtime_)
+    .asFunction(*runtime_)
+    .callAsConstructor(*runtime_, {static_cast<double>(sizeof(void*))});
+  uintptr_t* workletRuntimeData = reinterpret_cast<uintptr_t*>(
+    workletRuntimeValue
+      .getObject(*runtime_)
+      .getArrayBuffer(*runtime_)
+      .data(*runtime_));
+  workletRuntimeData[0] = reinterpret_cast<uintptr_t>(animatedRuntime.get());
+
   runtime_->global().setProperty(
       *runtime_,
       "_WORKLET_RUNTIME",
-      static_cast<double>(
-          reinterpret_cast<std::uintptr_t>(animatedRuntime.get())));
+      workletRuntimeValue);
 
   std::shared_ptr<ErrorHandler> errorHandler =
       std::make_shared<AndroidErrorHandler>(scheduler_);
@@ -192,18 +210,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/sensor/ReanimatedSensorListener.java

@@ -3,6 +3,7 @@ package com.swmansion.reanimated.sensor;
 import android.hardware.Sensor;
 import android.hardware.SensorEvent;
 import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
 import com.swmansion.reanimated.NativeProxy;
 
 public class ReanimatedSensorListener implements SensorEventListener {
@@ -11,6 +12,10 @@ public class ReanimatedSensorListener implements SensorEventListener {
   private double lastRead = (double) System.currentTimeMillis();
   private final double interval;
 
+  private float[] rotation = new float[9];
+  private float[] orientation = new float[3];
+  private float[] quaternion = new float[4];
+
   ReanimatedSensorListener(NativeProxy.SensorSetter setter, double interval) {
     this.setter = setter;
     this.interval = interval;
@@ -22,8 +27,26 @@ public class ReanimatedSensorListener implements SensorEventListener {
     if (current - lastRead < interval) {
       return;
     }
+    int sensorType = event.sensor.getType();
     lastRead = current;
-    setter.sensorSetter(event.values);
+    if (sensorType == Sensor.TYPE_ROTATION_VECTOR) {
+      SensorManager.getQuaternionFromVector(quaternion, event.values);
+      SensorManager.getRotationMatrixFromVector(rotation, event.values);
+      SensorManager.getOrientation(rotation, orientation);
+      float[] data =
+          new float[] {
+            quaternion[1], // qx
+            quaternion[2], // qy
+            quaternion[3], // qz
+            quaternion[0], // qw
+            orientation[0], // yaw
+            orientation[1], // pitch
+            orientation[2] // roll
+          };
+      setter.sensorSetter(data);
+    } else {
+      setter.sensorSetter(event.values);
+    }
   }
 
   @Override

package/android/src/main/java/com/swmansion/reanimated/sensor/ReanimatedSensorType.java

@@ -1,11 +1,13 @@
 package com.swmansion.reanimated.sensor;
 
+import android.hardware.Sensor;
+
 public enum ReanimatedSensorType {
-  ACCELEROMETER(1),
-  GYROSCOPE(2),
-  GRAVITY(3),
-  MAGNETIC_FIELD(4),
-  ROTATION_VECTOR(5);
+  ACCELEROMETER(Sensor.TYPE_ACCELEROMETER),
+  GYROSCOPE(Sensor.TYPE_GYROSCOPE),
+  GRAVITY(Sensor.TYPE_GRAVITY),
+  MAGNETIC_FIELD(Sensor.TYPE_MAGNETIC_FIELD),
+  ROTATION_VECTOR(Sensor.TYPE_ROTATION_VECTOR);
 
   private final int type;
 

package/ios/native/NativeProxy.mm

@@ -162,8 +162,12 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
     scrollTo(viewTag, uiManager, x, y, animated);
   };
 
-  id<RNGestureHandlerStateManager> gestureHandlerStateManager = [bridge moduleForName:@"RNGestureHandlerModule"];
-  auto setGestureStateFunction = [gestureHandlerStateManager](int handlerTag, int newState) {
+  id<RNGestureHandlerStateManager> gestureHandlerStateManager = nil;
+  auto setGestureStateFunction = [gestureHandlerStateManager, bridge](int handlerTag, int newState) mutable {
+    if (gestureHandlerStateManager == nil) {
+      gestureHandlerStateManager = [bridge moduleForName:@"RNGestureHandlerModule"];
+    }
+
     setGestureState(gestureHandlerStateManager, handlerTag, newState);
   };
 

package/ios/native/REAInitializer.mm

@@ -45,10 +45,20 @@ JSIExecutor::RuntimeInstaller REAJSIExecutorRuntimeInstaller(
     auto callInvoker = std::make_shared<react::BridgeJSCallInvoker>(bridge.reactInstance);
     auto reanimatedModule = reanimated::createReanimatedModule(bridge, callInvoker);
 #endif
+    auto workletRuntimeValue = runtime
+        .global()
+        .getProperty(runtime, "ArrayBuffer")
+        .asObject(runtime)
+        .asFunction(runtime)
+        .callAsConstructor(runtime, {static_cast<double>(sizeof(void*))});
+    uintptr_t* workletRuntimeData = reinterpret_cast<uintptr_t*>(
+        workletRuntimeValue.getObject(runtime).getArrayBuffer(runtime).data(runtime));
+    workletRuntimeData[0] = reinterpret_cast<uintptr_t>(reanimatedModule->runtime.get());
+
     runtime.global().setProperty(
         runtime,
         "_WORKLET_RUNTIME",
-        static_cast<double>(reinterpret_cast<std::uintptr_t>(reanimatedModule->runtime.get())));
+        workletRuntimeValue);
 
     runtime.global().setProperty(
         runtime,

package/ios/sensor/ReanimatedSensor.m

@@ -141,9 +141,9 @@
                                                         attitude.quaternion.y,
                                                         attitude.quaternion.z,
                                                         attitude.quaternion.w,
-                                                        attitude.pitch,
-                                                        attitude.roll,
                                                         attitude.yaw,
+                                                        attitude.pitch,
+                                                        attitude.roll
                                                     };
                                                     self->_setter(data);
                                                     self->_lastTimestamp = currentTime;

package/lib/Animated.js

@@ -1,31 +1,9 @@
-import { LogBox } from 'react-native';
-import createAnimatedComponent from './createAnimatedComponent';
-import {
-  addWhitelistedNativeProps,
-  addWhitelistedUIProps,
-} from './ConfigHelper';
-import * as reanimated1 from './reanimated1';
-import ReanimatedComponents from './reanimated2/component';
-
-const Animated = {
-  // components
-  ...ReanimatedComponents,
-  createAnimatedComponent,
-  // configuration
-  addWhitelistedNativeProps,
-  addWhitelistedUIProps,
-  // reanimated 1
-  ...reanimated1,
-};
-
-export * from './reanimated2';
+export { default as createAnimatedComponent } from './createAnimatedComponent';
+export { addWhitelistedNativeProps, addWhitelistedUIProps, } from './ConfigHelper';
+export { default as Text } from './reanimated2/component/Text';
+export { default as View } from './reanimated2/component/View';
+export { default as ScrollView } from './reanimated2/component/ScrollView';
+export { default as Image } from './reanimated2/component/Image';
+export { default as FlatList } from './reanimated2/component/FlatList';
+// @ts-ignore backward compatibility with treeshaking
 export * from './reanimated1';
-export default Animated;
-
-// I think we can ignore this message as long as Gesture Handler doesn't
-// try to load the Reanimated module. I figured it should be here instead of
-// RNGH because this prevents the message from being displayed for all
-// versions of RNGH.
-LogBox.ignoreLogs([
-  'RCTBridge required dispatch_sync to load RNGestureHandlerModule. This may lead to deadlocks',
-]);

package/lib/index.js

@@ -1,31 +1,6 @@
-import { LogBox } from 'react-native';
-import createAnimatedComponent from './createAnimatedComponent';
-import {
-  addWhitelistedNativeProps,
-  addWhitelistedUIProps,
-} from './ConfigHelper';
-import * as reanimated1 from './reanimated1';
-import ReanimatedComponents from './reanimated2/component';
-
-const Animated = {
-  // components
-  ...ReanimatedComponents,
-  createAnimatedComponent,
-  // configuration
-  addWhitelistedNativeProps,
-  addWhitelistedUIProps,
-  // reanimated 1
-  ...reanimated1,
-};
-
-export * from './reanimated2';
+// tree-shaken side effects
+import './reanimated2/js-reanimated/global';
+// @ts-ignore backward compatibility with treeshaking
 export * from './reanimated1';
-export default Animated;
-
-// I think we can ignore this message as long as Gesture Handler doesn't
-// try to load the Reanimated module. I figured it should be here instead of
-// RNGH because this prevents the message from being displayed for all
-// versions of RNGH.
-LogBox.ignoreLogs([
-  'RCTBridge required dispatch_sync to load RNGestureHandlerModule. This may lead to deadlocks',
-]);
+export * from './reanimated2';
+export * as default from './Animated';

package/lib/reanimated2/NativeReanimated/NativeReanimated.js

@@ -1,7 +1,7 @@
 import { NativeModules } from 'react-native';
 export class NativeReanimated {
     constructor(native = true) {
-        if (global.__reanimatedModuleProxy === undefined) {
+        if (global.__reanimatedModuleProxy === undefined && native) {
             const { ReanimatedModule } = NativeModules;
             ReanimatedModule === null || ReanimatedModule === void 0 ? void 0 : ReanimatedModule.installTurboModule();
         }

package/lib/reanimated2/animation/sequence.js

@@ -43,9 +43,6 @@ export function withSequence(..._animations) {
             return false;
         }
         function onStart(animation, value, now, previousAnimation) {
-            if (animations.length === 1) {
-                throw Error('withSequence() animation require more than one animation as argument');
-            }
             animation.animationIndex = 0;
             if (previousAnimation === undefined) {
                 previousAnimation = animations[animations.length - 1];

package/lib/reanimated2/component/FlatList.js

@@ -11,14 +11,14 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import React from 'react';
 import { FlatList } from 'react-native';
-import WrappedComponents from './WrappedComponents';
+import ReanimatedView from './View';
 import createAnimatedComponent from '../../createAnimatedComponent';
 const AnimatedFlatList = createAnimatedComponent(FlatList);
 const createCellRenderer = (itemLayoutAnimation) => {
     const cellRenderer = (props) => {
-        return (<WrappedComponents.View layout={itemLayoutAnimation} onLayout={props.onLayout}>
+        return (<ReanimatedView layout={itemLayoutAnimation} onLayout={props.onLayout}>
         {props.children}
-      </WrappedComponents.View>);
+      </ReanimatedView>);
     };
     return cellRenderer;
 };

package/lib/reanimated2/component/Image.js

@@ -0,0 +1,4 @@
+import { Image } from 'react-native';
+import createAnimatedComponent from '../../createAnimatedComponent';
+const AnimatedImage = createAnimatedComponent(Image);
+export default AnimatedImage;

package/lib/reanimated2/component/ScrollView.js

@@ -0,0 +1,4 @@
+import { ScrollView } from 'react-native';
+import createAnimatedComponent from '../../createAnimatedComponent';
+const AnimatedScrollView = createAnimatedComponent(ScrollView);
+export default AnimatedScrollView;

package/lib/reanimated2/component/Text.js

@@ -0,0 +1,4 @@
+import { Text } from 'react-native';
+import createAnimatedComponent from '../../createAnimatedComponent';
+const AnimatedText = createAnimatedComponent(Text);
+export default AnimatedText;

package/lib/reanimated2/component/View.js

@@ -0,0 +1,4 @@
+import { View } from 'react-native';
+import createAnimatedComponent from '../../createAnimatedComponent';
+const AnimatedView = createAnimatedComponent(View);
+export default AnimatedView;

package/lib/reanimated2/core.js

@@ -238,11 +238,6 @@ if (!isWeb() && isConfigured()) {
             info: runOnJS(capturableConsole.info),
         };
         _setGlobalConsole(console);
-        if (global.performance == null) {
-            global.performance = {
-                now: global._chronoNow,
-            }; // due to conflict with lib.dom.d.ts -> Performance
-        }
     })();
 }
 let featuresConfig = {

package/lib/reanimated2/hook/utils.js

@@ -12,11 +12,6 @@ export function useEvent(handler, eventNames = [], rebuild = false) {
     else if (rebuild) {
         initRef.current.updateWorklet(handler);
     }
-    useEffect(() => {
-        return () => {
-            initRef.current = null;
-        };
-    }, []);
     return initRef;
 }
 export function useHandler(handlers, dependencies) {

package/lib/reanimated2/js-reanimated/global.js

@@ -0,0 +1,25 @@
+// In order to keep bundle size down, we treat this file as a polyfill for Web.
+import { shouldBeUseWeb } from '../PlatformChecker';
+if (shouldBeUseWeb()) {
+    global._frameTimestamp = null;
+    global._setGlobalConsole = (_val) => {
+        // noop
+    };
+    global._measure = () => {
+        console.warn("[Reanimated] You can't use `measure` with Chrome Debugger or with web version");
+        return {
+            x: 0,
+            y: 0,
+            width: 0,
+            height: 0,
+            pageX: 0,
+            pageY: 0,
+        };
+    };
+    global._scrollTo = () => {
+        console.warn("[Reanimated] You can't use `scrollTo` with Chrome Debugger or with web version");
+    };
+    global._setGestureState = () => {
+        console.warn("[Reanimated] You can't use `setGestureState` with Chrome Debugger or with web version");
+    };
+}