react-native-reanimated 3.0.0-rc.8 → 3.0.0

package/ios/native/NativeProxy.mm

@@ -1,3 +1,4 @@
+#import <RNReanimated/LayoutAnimationsManager.h>
 #import <RNReanimated/NativeMethods.h>
 #import <RNReanimated/NativeProxy.h>
 #import <RNReanimated/REAAnimationsManager.h>
@@ -75,66 +76,6 @@ static CFTimeInterval calculateTimestampWithSlowAnimations(CFTimeInterval curren
 #endif
 }
 
-// COPIED FROM RCTTurboModule.mm
-static id convertJSIValueToObjCObject(jsi::Runtime &runtime, const jsi::Value &value);
-
-static NSString *convertJSIStringToNSString(jsi::Runtime &runtime, const jsi::String &value)
-{
-  return [NSString stringWithUTF8String:value.utf8(runtime).c_str()];
-}
-
-static NSDictionary *convertJSIObjectToNSDictionary(jsi::Runtime &runtime, const jsi::Object &value)
-{
-  jsi::Array propertyNames = value.getPropertyNames(runtime);
-  size_t size = propertyNames.size(runtime);
-  NSMutableDictionary *result = [NSMutableDictionary new];
-  for (size_t i = 0; i < size; i++) {
-    jsi::String name = propertyNames.getValueAtIndex(runtime, i).getString(runtime);
-    NSString *k = convertJSIStringToNSString(runtime, name);
-    id v = convertJSIValueToObjCObject(runtime, value.getProperty(runtime, name));
-    if (v) {
-      result[k] = v;
-    }
-  }
-  return [result copy];
-}
-
-static NSArray *convertJSIArrayToNSArray(jsi::Runtime &runtime, const jsi::Array &value)
-{
-  size_t size = value.size(runtime);
-  NSMutableArray *result = [NSMutableArray new];
-  for (size_t i = 0; i < size; i++) {
-    // Insert kCFNull when it's `undefined` value to preserve the indices.
-    [result addObject:convertJSIValueToObjCObject(runtime, value.getValueAtIndex(runtime, i)) ?: (id)kCFNull];
-  }
-  return [result copy];
-}
-
-static id convertJSIValueToObjCObject(jsi::Runtime &runtime, const jsi::Value &value)
-{
-  if (value.isUndefined() || value.isNull()) {
-    return nil;
-  }
-  if (value.isBool()) {
-    return @(value.getBool());
-  }
-  if (value.isNumber()) {
-    return @(value.getNumber());
-  }
-  if (value.isString()) {
-    return convertJSIStringToNSString(runtime, value.getString(runtime));
-  }
-  if (value.isObject()) {
-    jsi::Object o = value.getObject(runtime);
-    if (o.isArray(runtime)) {
-      return convertJSIArrayToNSArray(runtime, o.getArray(runtime));
-    }
-    return convertJSIObjectToNSDictionary(runtime, o);
-  }
-
-  throw std::runtime_error("Unsupported jsi::jsi::Value kind");
-}
-
 static NSSet *convertProps(jsi::Runtime &rt, const jsi::Value &props)
 {
   NSMutableSet *propsSet = [[NSMutableSet alloc] init];
@@ -213,11 +154,7 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
   auto requestRender = [nodesManager, &module](std::function<void(double)> onRender, jsi::Runtime &rt) {
     [nodesManager postOnAnimation:^(CADisplayLink *displayLink) {
       double frameTimestamp = calculateTimestampWithSlowAnimations(displayLink.targetTimestamp) * 1000;
-      jsi::Object global = rt.global();
-      jsi::String frameTimestampName = jsi::String::createFromAscii(rt, "_frameTimestamp");
-      global.setProperty(rt, frameTimestampName, frameTimestamp);
       onRender(frameTimestamp);
-      global.setProperty(rt, frameTimestampName, jsi::Value::undefined());
     }];
   };
 
@@ -228,7 +165,7 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
     [nodesManager synchronouslyUpdateViewOnUIThread:viewTag props:uiProps];
   };
 
-  auto progressLayoutAnimation = [=](int tag, const jsi::Object &newStyle) {
+  auto progressLayoutAnimation = [=](int tag, const jsi::Object &newStyle, bool isSharedTransition) {
     // noop
   };
 
@@ -254,9 +191,11 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
   __weak REAAnimationsManager *weakAnimationsManager = animationsManager;
   std::weak_ptr<jsi::Runtime> wrt = animatedRuntime;
 
-  auto progressLayoutAnimation = [=](int tag, const jsi::Object &newStyle) {
+  auto progressLayoutAnimation = [=](int tag, const jsi::Object &newStyle, bool isSharedTransition) {
     NSDictionary *propsDict = convertJSIObjectToNSDictionary(*wrt.lock(), newStyle);
-    [weakAnimationsManager progressLayoutAnimationWithStyle:propsDict forTag:@(tag)];
+    [weakAnimationsManager progressLayoutAnimationWithStyle:propsDict
+                                                     forTag:@(tag)
+                                         isSharedTransition:isSharedTransition];
   };
 
   auto endLayoutAnimation = [=](int tag, bool isCancelled, bool removeView) {
@@ -277,11 +216,13 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
 
   // sensors
   ReanimatedSensorContainer *reanimatedSensorContainer = [[ReanimatedSensorContainer alloc] init];
-  auto registerSensorFunction = [=](int sensorType, int interval, std::function<void(double[])> setter) -> int {
+  auto registerSensorFunction =
+      [=](int sensorType, int interval, int iosReferenceFrame, std::function<void(double[], int)> setter) -> int {
     return [reanimatedSensorContainer registerSensor:(ReanimatedSensorType)sensorType
                                             interval:interval
-                                              setter:^(double *data) {
-                                                setter(data);
+                                   iosReferenceFrame:iosReferenceFrame
+                                              setter:^(double *data, int orientationDegrees) {
+                                                setter(data, orientationDegrees);
                                               }];
   };
 
@@ -290,15 +231,16 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
 
   // keyboard events
 
-  static REAKeyboardEventObserver *keyboardObserver = [[REAKeyboardEventObserver alloc] init];
+  REAKeyboardEventObserver *keyboardObserver = [[REAKeyboardEventObserver alloc] init];
   auto subscribeForKeyboardEventsFunction =
-      [](std::function<void(int keyboardState, int height)> keyboardEventDataUpdater) {
+      [=](std::function<void(int keyboardState, int height)> keyboardEventDataUpdater, bool isStatusBarTranslucent) {
+        // ignore isStatusBarTranslucent - it's Android only
         return [keyboardObserver subscribeForKeyboardEvents:^(int keyboardState, int height) {
           keyboardEventDataUpdater(keyboardState, height);
         }];
       };
 
-  auto unsubscribeFromKeyboardEventsFunction = [](int listenerId) {
+  auto unsubscribeFromKeyboardEventsFunction = [=](int listenerId) {
     [keyboardObserver unsubscribeFromKeyboardEvents:listenerId];
   };
   // end keyboard events
@@ -337,37 +279,15 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
 
   scheduler->setRuntimeManager(module);
 
-#ifdef RCT_NEW_ARCH_ENABLED
   [reanimatedModule.nodesManager registerEventHandler:^(NSString *eventNameNSString, id<RCTEvent> event) {
     // handles RCTEvents from RNGestureHandler
-
     std::string eventName = [eventNameNSString UTF8String];
+    id eventData = [event arguments][2];
     jsi::Runtime &rt = *module->runtime;
-    jsi::Value payload = convertNSDictionaryToJSIObject(rt, [event arguments][2]);
-
-    module->handleEvent(eventName, std::move(payload), CACurrentMediaTime() * 1000);
-  }];
-#else
-  [reanimatedModule.nodesManager registerEventHandler:^(NSString *eventName, id<RCTEvent> event) {
-    std::string eventNameString([eventName UTF8String]);
-
-    std::string eventAsString;
-    try {
-      eventAsString = folly::toJson(convertIdToFollyDynamic([event arguments][2]));
-    } catch (std::exception &) {
-      // Events from other libraries may contain NaN or INF values which cannot be represented in JSON.
-      // See https://github.com/software-mansion/react-native-reanimated/issues/1776 for details.
-      return;
-    }
-
-    eventAsString = "{ NativeMap:" + eventAsString + "}";
-    jsi::Object global = module->runtime->global();
-    jsi::String eventTimestampName = jsi::String::createFromAscii(*module->runtime, "_eventTimestamp");
-    global.setProperty(*module->runtime, eventTimestampName, CACurrentMediaTime() * 1000);
-    module->onEvent(eventNameString, eventAsString);
-    global.setProperty(*module->runtime, eventTimestampName, jsi::Value::undefined());
+    jsi::Value payload = convertObjCObjectToJSIValue(rt, eventData);
+    double currentTime = CACurrentMediaTime() * 1000;
+    module->handleEvent(eventName, payload, currentTime);
   }];
-#endif
 
   std::weak_ptr<NativeReanimatedModule> weakModule = module; // to avoid retain cycle
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -378,26 +298,67 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
   }];
 #else
   // Layout Animation callbacks setup
-  [animationsManager setAnimationStartingBlock:^(
-                         NSNumber *_Nonnull tag, NSString *type, NSDictionary *_Nonnull values, NSNumber *depth) {
-    jsi::Runtime &rt = *wrt.lock();
-    jsi::Object yogaValues(rt);
-    for (NSString *key in values.allKeys) {
-      NSNumber *value = values[key];
-      yogaValues.setProperty(rt, [key UTF8String], [value doubleValue]);
+  [animationsManager
+      setAnimationStartingBlock:^(
+          NSNumber *_Nonnull tag, LayoutAnimationType type, NSDictionary *_Nonnull values, NSNumber *depth) {
+        auto reaModule = weakModule.lock();
+        if (reaModule == nullptr) {
+          return;
+        }
+
+        jsi::Runtime &rt = *wrt.lock();
+        jsi::Object yogaValues(rt);
+        for (NSString *key in values.allKeys) {
+          NSObject *value = values[key];
+          if ([values[key] isKindOfClass:[NSArray class]]) {
+            NSArray *transformArray = (NSArray *)value;
+            jsi::Array matrix(rt, 9);
+            for (int i = 0; i < 9; i++) {
+              matrix.setValueAtIndex(rt, i, [(NSNumber *)transformArray[i] doubleValue]);
+            }
+            yogaValues.setProperty(rt, [key UTF8String], matrix);
+          } else {
+            yogaValues.setProperty(rt, [key UTF8String], [(NSNumber *)value doubleValue]);
+          }
+        }
+
+        reaModule->layoutAnimationsManager().startLayoutAnimation(rt, [tag intValue], type, yogaValues);
+      }];
+
+  [animationsManager setHasAnimationBlock:^(NSNumber *_Nonnull tag, LayoutAnimationType type) {
+    auto reaModule = weakModule.lock();
+    if (reaModule == nullptr) {
+      return NO;
     }
-
-    weakModule.lock()->layoutAnimationsManager().startLayoutAnimation(
-        rt, [tag intValue], std::string([type UTF8String]), yogaValues);
+    bool hasLayoutAnimation = reaModule->layoutAnimationsManager().hasLayoutAnimation([tag intValue], type);
+    return hasLayoutAnimation ? YES : NO;
   }];
 
-  [animationsManager setHasAnimationBlock:^(NSNumber *_Nonnull tag, NSString *_Nonnull type) {
-    return weakModule.lock()->layoutAnimationsManager().hasLayoutAnimation(
-        [tag intValue], std::string([type UTF8String]));
+  [animationsManager setAnimationRemovingBlock:^(NSNumber *_Nonnull tag) {
+    auto reaModule = weakModule.lock();
+    if (reaModule == nullptr) {
+      return;
+    }
+    reaModule->layoutAnimationsManager().clearLayoutAnimationConfig([tag intValue]);
   }];
 
-  [animationsManager setAnimationRemovingBlock:^(NSNumber *_Nonnull tag) {
-    weakModule.lock()->layoutAnimationsManager().clearLayoutAnimationConfig([tag intValue]);
+  [animationsManager
+      setCancelAnimationBlock:^(NSNumber *_Nonnull tag, LayoutAnimationType type, BOOL cancelled, BOOL removeView) {
+        if (auto reaModule = weakModule.lock()) {
+          if (auto runtime = wrt.lock()) {
+            jsi::Runtime &rt = *runtime;
+            reaModule->layoutAnimationsManager().cancelLayoutAnimation(
+                rt, [tag intValue], type, cancelled == YES, removeView == YES);
+          }
+        }
+      }];
+
+  [animationsManager setFindPrecedingViewTagForTransitionBlock:^NSNumber *_Nullable(NSNumber *_Nonnull tag) {
+    if (auto reaModule = weakModule.lock()) {
+      int resultTag = reaModule->layoutAnimationsManager().findPrecedingViewTagForTransition([tag intValue]);
+      return resultTag == -1 ? nil : @(resultTag);
+    }
+    return nil;
   }];
 #endif
 

package/ios/native/REAInitializer.mm

@@ -1,11 +1,6 @@
 #import <RNReanimated/REAInitializer.h>
 #import <RNReanimated/REAUIManager.h>
-
-#ifdef REANIMATED_VERSION
-#define STRINGIZE(x) #x
-#define STRINGIZE2(x) STRINGIZE(x)
-#define REANIMATED_VERSION_STRING STRINGIZE2(REANIMATED_VERSION)
-#endif // REANIMATED_VERSION
+#import <RNReanimated/ReanimatedVersion.h>
 
 @interface RCTEventDispatcher (Reanimated)
 
@@ -64,7 +59,7 @@ JSIExecutor::RuntimeInstaller REAJSIExecutorRuntimeInstaller(
 
     runtime.global().setProperty(runtime, "_IS_FABRIC", false);
 
-    auto version = jsi::String::createFromUtf8(runtime, REANIMATED_VERSION_STRING);
+    auto version = getReanimatedVersionString(runtime);
     runtime.global().setProperty(runtime, "_REANIMATED_VERSION_CPP", version);
 
     runtime.global().setProperty(

package/ios/native/REAJSIUtils.h

@@ -1,5 +1,4 @@
 #pragma once
-#ifdef RCT_NEW_ARCH_ENABLED
 
 #include <jsi/jsi.h>
 
@@ -63,4 +62,63 @@ static jsi::Value convertObjCObjectToJSIValue(jsi::Runtime &runtime, id value)
   return jsi::Value::undefined();
 }
 
-#endif // RCT_NEW_ARCH_ENABLED
+// Other
+
+static id convertJSIValueToObjCObject(jsi::Runtime &runtime, const jsi::Value &value);
+
+static NSString *convertJSIStringToNSString(jsi::Runtime &runtime, const jsi::String &value)
+{
+  return [NSString stringWithUTF8String:value.utf8(runtime).c_str()];
+}
+
+static NSDictionary *convertJSIObjectToNSDictionary(jsi::Runtime &runtime, const jsi::Object &value)
+{
+  jsi::Array propertyNames = value.getPropertyNames(runtime);
+  size_t size = propertyNames.size(runtime);
+  NSMutableDictionary *result = [NSMutableDictionary new];
+  for (size_t i = 0; i < size; i++) {
+    jsi::String name = propertyNames.getValueAtIndex(runtime, i).getString(runtime);
+    NSString *k = convertJSIStringToNSString(runtime, name);
+    id v = convertJSIValueToObjCObject(runtime, value.getProperty(runtime, name));
+    if (v) {
+      result[k] = v;
+    }
+  }
+  return [result copy];
+}
+
+static NSArray *convertJSIArrayToNSArray(jsi::Runtime &runtime, const jsi::Array &value)
+{
+  size_t size = value.size(runtime);
+  NSMutableArray *result = [NSMutableArray new];
+  for (size_t i = 0; i < size; i++) {
+    // Insert kCFNull when it's `undefined` value to preserve the indices.
+    [result addObject:convertJSIValueToObjCObject(runtime, value.getValueAtIndex(runtime, i)) ?: (id)kCFNull];
+  }
+  return [result copy];
+}
+
+static id convertJSIValueToObjCObject(jsi::Runtime &runtime, const jsi::Value &value)
+{
+  if (value.isUndefined() || value.isNull()) {
+    return nil;
+  }
+  if (value.isBool()) {
+    return @(value.getBool());
+  }
+  if (value.isNumber()) {
+    return @(value.getNumber());
+  }
+  if (value.isString()) {
+    return convertJSIStringToNSString(runtime, value.getString(runtime));
+  }
+  if (value.isObject()) {
+    jsi::Object o = value.getObject(runtime);
+    if (o.isArray(runtime)) {
+      return convertJSIArrayToNSArray(runtime, o.getArray(runtime));
+    }
+    return convertJSIObjectToNSDictionary(runtime, o);
+  }
+
+  throw std::runtime_error("Unsupported jsi::Value kind");
+}

package/ios/sensor/ReanimatedSensor.h

@@ -7,13 +7,17 @@
   ReanimatedSensorType _sensorType;
   double _interval;
   double _lastTimestamp;
+  int _referenceFrame;
 #if !TARGET_OS_TV
   CMMotionManager *_motionManager;
 #endif
-  void (^_setter)(double[]);
+  void (^_setter)(double[], int);
 }
 
-- (instancetype)init:(ReanimatedSensorType)sensorType interval:(int)interval setter:(void (^)(double[]))setter;
+- (instancetype)init:(ReanimatedSensorType)sensorType
+             interval:(int)interval
+    iosReferenceFrame:(int)iosReferenceFrame
+               setter:(void (^)(double[], int))setter;
 - (bool)initialize;
 - (bool)initializeGyroscope;
 - (bool)initializeAccelerometer;

package/ios/sensor/ReanimatedSensor.m

@@ -3,7 +3,10 @@
 #if __has_include(<CoreMotion/CoreMotion.h>)
 @implementation ReanimatedSensor
 
-- (instancetype)init:(ReanimatedSensorType)sensorType interval:(int)interval setter:(void (^)(double[]))setter
+- (instancetype)init:(ReanimatedSensorType)sensorType
+             interval:(int)interval
+    iosReferenceFrame:(int)iosReferenceFrame
+               setter:(void (^)(double[], int))setter
 {
   self = [super init];
   _sensorType = sensorType;
@@ -12,6 +15,7 @@
   } else {
     _interval = interval / 1000.0; // in seconds
   }
+  _referenceFrame = iosReferenceFrame;
   _setter = setter;
   _motionManager = [[CMMotionManager alloc] init];
   return self;
@@ -49,7 +53,7 @@
                       return;
                     }
                     double data[] = {sensorData.rotationRate.x, sensorData.rotationRate.y, sensorData.rotationRate.z};
-                    self->_setter(data);
+                    self->_setter(data, [self getInterfaceOrientation]);
                     self->_lastTimestamp = currentTime;
                   }];
 
@@ -75,7 +79,7 @@
                                              sensorData.acceleration.x * G,
                                              sensorData.acceleration.y * G,
                                              sensorData.acceleration.z * G};
-                                         self->_setter(data);
+                                         self->_setter(data, [self getInterfaceOrientation]);
                                          self->_lastTimestamp = currentTime;
                                        }];
 
@@ -100,7 +104,7 @@
                             // convert G to m/s^2
                             double data[] = {
                                 sensorData.gravity.x * G, sensorData.gravity.y * G, sensorData.gravity.z * G};
-                            self->_setter(data);
+                            self->_setter(data, [self getInterfaceOrientation]);
                             self->_lastTimestamp = currentTime;
                           }];
 
@@ -123,7 +127,7 @@
                             }
                             double data[] = {
                                 sensorData.magneticField.x, sensorData.magneticField.y, sensorData.magneticField.z};
-                            self->_setter(data);
+                            self->_setter(data, [self getInterfaceOrientation]);
                             self->_lastTimestamp = currentTime;
                           }];
 
@@ -138,7 +142,19 @@
   [_motionManager setDeviceMotionUpdateInterval:_interval];
 
   [_motionManager setShowsDeviceMovementDisplay:YES];
-  [_motionManager startDeviceMotionUpdatesUsingReferenceFrame:CMAttitudeReferenceFrameXArbitraryZVertical
+
+  // _referenceFrame = Auto, on devices without magnetometer fall back to `XArbitraryZVertical`,
+  // `XArbitraryCorrectedZVertical` otherwise
+  if (_referenceFrame == 4) {
+    if (![_motionManager isMagnetometerAvailable]) {
+      _referenceFrame = 0;
+    } else {
+      _referenceFrame = 1;
+    }
+  }
+
+  // the binary shift works here because of the definition of CMAttitudeReferenceFrame
+  [_motionManager startDeviceMotionUpdatesUsingReferenceFrame:(1 << _referenceFrame)
                                                       toQueue:[NSOperationQueue mainQueue]
                                                   withHandler:^(CMDeviceMotion *sensorData, NSError *error) {
                                                     double currentTime = [[NSProcessInfo processInfo] systemUptime];
@@ -154,7 +170,7 @@
                                                         attitude.yaw,
                                                         attitude.pitch,
                                                         attitude.roll};
-                                                    self->_setter(data);
+                                                    self->_setter(data, [self getInterfaceOrientation]);
                                                     self->_lastTimestamp = currentTime;
                                                   }];
 
@@ -176,6 +192,26 @@
   }
 }
 
+- (int)getInterfaceOrientation
+{
+  UIInterfaceOrientation orientation = UIInterfaceOrientationPortrait;
+  if (@available(iOS 13.0, *)) {
+    orientation = UIApplication.sharedApplication.windows.firstObject.windowScene.interfaceOrientation;
+  } else {
+    orientation = UIApplication.sharedApplication.statusBarOrientation;
+  }
+  switch (orientation) {
+    case UIInterfaceOrientationLandscapeLeft:
+      return 270;
+    case UIInterfaceOrientationLandscapeRight:
+      return 90;
+    case UIInterfaceOrientationPortraitUpsideDown:
+      return 180;
+    default:
+      return 0;
+  }
+}
+
 @end
 
 #else

package/ios/sensor/ReanimatedSensorContainer.h

@@ -6,7 +6,10 @@
 }
 
 - (instancetype)init;
-- (int)registerSensor:(ReanimatedSensorType)sensorType interval:(int)interval setter:(void (^)(double[]))setter;
+- (int)registerSensor:(ReanimatedSensorType)sensorType
+             interval:(int)interval
+    iosReferenceFrame:(int)iosReferenceFrame
+               setter:(void (^)(double[], int))setter;
 - (void)unregisterSensor:(int)sensorId;
 
 @end

package/ios/sensor/ReanimatedSensorContainer.m

@@ -14,9 +14,15 @@ static NSNumber *_nextSensorId = nil;
   return self;
 }
 
-- (int)registerSensor:(ReanimatedSensorType)sensorType interval:(int)interval setter:(void (^)(double[]))setter
+- (int)registerSensor:(ReanimatedSensorType)sensorType
+             interval:(int)interval
+    iosReferenceFrame:(int)iosReferenceFrame
+               setter:(void (^)(double[], int))setter
 {
-  ReanimatedSensor *sensor = [[ReanimatedSensor alloc] init:sensorType interval:interval setter:setter];
+  ReanimatedSensor *sensor = [[ReanimatedSensor alloc] init:sensorType
+                                                   interval:interval
+                                          iosReferenceFrame:iosReferenceFrame
+                                                     setter:setter];
   if ([sensor initialize]) {
     NSNumber *sensorId = [_nextSensorId copy];
     _nextSensorId = [NSNumber numberWithInt:[_nextSensorId intValue] + 1];