react-native-reanimated 3.0.0-rc.0 → 3.0.0-rc.1

package/ios/keyboardObserver/REAKeyboardEventObserver.m

@@ -0,0 +1,198 @@
+#import "REAKeyboardEventObserver.h"
+#import <Foundation/Foundation.h>
+#import <React/RCTDefines.h>
+#import <React/RCTUIManager.h>
+
+typedef NS_ENUM(NSUInteger, KeyboardState) {
+  UNKNOWN = 0,
+  OPENING = 1,
+  OPEN = 2,
+  CLOSING = 3,
+  CLOSED = 4,
+};
+
+@implementation REAKeyboardEventObserver {
+  NSNumber *_nextListenerId;
+  NSMutableDictionary *_listeners;
+  CADisplayLink *displayLink;
+  int _windowsCount;
+  UIView *_keyboardView;
+  KeyboardState _state;
+}
+
+- (instancetype)init
+{
+  self = [super init];
+  _listeners = [[NSMutableDictionary alloc] init];
+  _nextListenerId = @0;
+  _state = UNKNOWN;
+  return self;
+}
+
+// copied from
+// https://github.com/tonlabs/UIKit/blob/bd5651e4723d547bde0cb86ca1c27813cedab4a9/casts/keyboard/ios/UIKitKeyboardIosFrameListener.m
+- (UIView *)findKeyboardView
+{
+  for (UIWindow *window in [UIApplication.sharedApplication.windows objectEnumerator]) {
+    if ([window isKindOfClass:NSClassFromString(@"UITextEffectsWindow")]) {
+      for (UIView *containerView in window.subviews) {
+        if ([containerView isKindOfClass:NSClassFromString(@"UIInputSetContainerView")]) {
+          for (UIView *hostView in containerView.subviews) {
+            if ([hostView isKindOfClass:NSClassFromString(@"UIInputSetHostView")]) {
+              return hostView;
+            }
+          }
+        }
+      }
+    }
+  }
+  return nil;
+}
+
+- (UIView *)getKeyboardView
+{
+  /**
+   * If the count of windows has changed it means there might be a new UITextEffectsWindow,
+   * thus we have to obtain a new `keyboardView`
+   */
+  int windowsCount = [UIApplication.sharedApplication.windows count];
+
+  if (_keyboardView == nil || windowsCount != _windowsCount) {
+    _keyboardView = [self findKeyboardView];
+    _windowsCount = windowsCount;
+  }
+  return _keyboardView;
+}
+
+#if TARGET_OS_TV
+- (int)subscribeForKeyboardEvents:(KeyboardEventListenerBlock)listener
+{
+  NSLog(@"Keyboard handling is not supported on tvOS");
+  return 0;
+}
+
+- (void)unsubscribeFromKeyboardEvents:(int)listenerId
+{
+  NSLog(@"Keyboard handling is not supported on tvOS");
+}
+#else
+
+- (void)runAnimation
+{
+  displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(updateKeyboardFrame)];
+  [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+}
+
+- (void)stopAnimation
+{
+  [displayLink invalidate];
+  displayLink = nil;
+  [self updateKeyboardFrame];
+}
+
+- (void)updateKeyboardFrame
+{
+  UIView *keyboardView = [self getKeyboardView];
+  if (keyboardView == nil) {
+    return;
+  }
+
+  CGFloat keyboardHeight = [self computeKeyboardHeight:keyboardView];
+  for (NSString *key in _listeners.allKeys) {
+    ((KeyboardEventListenerBlock)_listeners[key])(_state, keyboardHeight);
+  }
+}
+
+- (CGFloat)computeKeyboardHeight:(UIView *)keyboardView
+{
+  CGFloat keyboardFrameY = [keyboardView.layer presentationLayer].frame.origin.y;
+  CGFloat keyboardWindowH = keyboardView.window.bounds.size.height;
+  CGFloat keyboardHeight = keyboardWindowH - keyboardFrameY;
+  return keyboardHeight;
+}
+
+- (void)keyboardWillShow:(NSNotification *)notification
+{
+  _state = OPENING;
+  [self runAnimation];
+}
+
+- (void)keyboardDidShow:(NSNotification *)notification
+{
+  _state = OPEN;
+  [self stopAnimation];
+}
+
+- (void)keyboardWillHide:(NSNotification *)notification
+{
+  _state = CLOSING;
+  [self runAnimation];
+}
+
+- (void)keyboardDidHide:(NSNotification *)notification
+{
+  _state = CLOSED;
+  [self stopAnimation];
+}
+
+- (int)subscribeForKeyboardEvents:(KeyboardEventListenerBlock)listener
+{
+  NSNumber *listenerId = [_nextListenerId copy];
+  _nextListenerId = [NSNumber numberWithInt:[_nextListenerId intValue] + 1];
+  if ([_listeners count] == 0) {
+    NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+
+    [notificationCenter addObserver:self
+                           selector:@selector(keyboardWillHide:)
+                               name:UIKeyboardWillHideNotification
+                             object:nil];
+
+    [notificationCenter addObserver:self
+                           selector:@selector(keyboardWillShow:)
+                               name:UIKeyboardWillShowNotification
+                             object:nil];
+
+    [notificationCenter addObserver:self
+                           selector:@selector(keyboardDidHide:)
+                               name:UIKeyboardDidHideNotification
+                             object:nil];
+
+    [notificationCenter addObserver:self
+                           selector:@selector(keyboardDidShow:)
+                               name:UIKeyboardDidShowNotification
+                             object:nil];
+  }
+
+  [_listeners setObject:listener forKey:listenerId];
+  if (_state == UNKNOWN) {
+    [self recognizeInitialKeyboardState];
+  }
+  return [listenerId intValue];
+}
+
+- (void)unsubscribeFromKeyboardEvents:(int)listenerId
+{
+  NSNumber *_listenerId = [NSNumber numberWithInt:listenerId];
+  [_listeners removeObjectForKey:_listenerId];
+  if ([_listeners count] == 0) {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+  }
+}
+
+- (void)recognizeInitialKeyboardState
+{
+  RCTExecuteOnMainQueue(^() {
+    UIView *keyboardView = [self getKeyboardView];
+    if (keyboardView == nil) {
+      self->_state = CLOSED;
+    } else {
+      CGFloat keyboardHeight = [self computeKeyboardHeight:keyboardView];
+      self->_state = keyboardHeight == 0 ? CLOSED : OPEN;
+    }
+    [self updateKeyboardFrame];
+  });
+}
+
+#endif
+
+@end

package/ios/native/NativeProxy.mm

@@ -4,6 +4,8 @@
 #import <RNReanimated/REAAnimationsManager.h>
 #import <RNReanimated/REAIOSErrorHandler.h>
 #import <RNReanimated/REAIOSScheduler.h>
+#import <RNReanimated/REAJSIUtils.h>
+#import <RNReanimated/REAKeyboardEventObserver.h>
 #import <RNReanimated/REAModule.h>
 #import <RNReanimated/REANodesManager.h>
 #import <RNReanimated/REAUIManager.h>
@@ -136,74 +138,6 @@ static id convertJSIValueToObjCObject(jsi::Runtime &runtime, const jsi::Value &v
   throw std::runtime_error("Unsupported jsi::jsi::Value kind");
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
-/**
- * All static helper functions are ObjC++ specific.
- */
-static jsi::Value convertNSNumberToJSIBoolean(jsi::Runtime &runtime, NSNumber *value)
-{
-  return jsi::Value((bool)[value boolValue]);
-}
-
-static jsi::Value convertNSNumberToJSINumber(jsi::Runtime &runtime, NSNumber *value)
-{
-  return jsi::Value([value doubleValue]);
-}
-
-static jsi::String convertNSStringToJSIString(jsi::Runtime &runtime, NSString *value)
-{
-  return jsi::String::createFromUtf8(runtime, [value UTF8String] ?: "");
-}
-
-static jsi::Value convertObjCObjectToJSIValue(jsi::Runtime &runtime, id value);
-static jsi::Object convertNSDictionaryToJSIObject(jsi::Runtime &runtime, NSDictionary *value)
-{
-  jsi::Object result = jsi::Object(runtime);
-  for (NSString *k in value) {
-    result.setProperty(runtime, [k UTF8String], convertObjCObjectToJSIValue(runtime, value[k]));
-  }
-  return result;
-}
-
-static jsi::Array convertNSArrayToJSIArray(jsi::Runtime &runtime, NSArray *value)
-{
-  jsi::Array result = jsi::Array(runtime, value.count);
-  for (size_t i = 0; i < value.count; i++) {
-    result.setValueAtIndex(runtime, i, convertObjCObjectToJSIValue(runtime, value[i]));
-  }
-  return result;
-}
-
-static std::vector<jsi::Value> convertNSArrayToStdVector(jsi::Runtime &runtime, NSArray *value)
-{
-  std::vector<jsi::Value> result;
-  for (size_t i = 0; i < value.count; i++) {
-    result.emplace_back(convertObjCObjectToJSIValue(runtime, value[i]));
-  }
-  return result;
-}
-
-static jsi::Value convertObjCObjectToJSIValue(jsi::Runtime &runtime, id value)
-{
-  if ([value isKindOfClass:[NSString class]]) {
-    return convertNSStringToJSIString(runtime, (NSString *)value);
-  } else if ([value isKindOfClass:[NSNumber class]]) {
-    if ([value isKindOfClass:[@YES class]]) {
-      return convertNSNumberToJSIBoolean(runtime, (NSNumber *)value);
-    }
-    return convertNSNumberToJSINumber(runtime, (NSNumber *)value);
-  } else if ([value isKindOfClass:[NSDictionary class]]) {
-    return convertNSDictionaryToJSIObject(runtime, (NSDictionary *)value);
-  } else if ([value isKindOfClass:[NSArray class]]) {
-    return convertNSArrayToJSIArray(runtime, (NSArray *)value);
-  } else if (value == (id)kCFNull) {
-    return jsi::Value::null();
-  }
-  return jsi::Value::undefined();
-}
-// COPIED FROM RCTTurboModule.mm END
-#endif // RCT_NEW_ARCH_ENABLED
-
 static NSSet *convertProps(jsi::Runtime &rt, const jsi::Value &props)
 {
   NSMutableSet *propsSet = [[NSMutableSet alloc] init];
@@ -395,6 +329,21 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
   auto unregisterSensorFunction = [=](int sensorId) { [reanimatedSensorContainer unregisterSensor:sensorId]; };
   // end sensors
 
+  // keyboard events
+
+  static REAKeyboardEventObserver *keyboardObserver = [[REAKeyboardEventObserver alloc] init];
+  auto subscribeForKeyboardEventsFunction =
+      [](std::function<void(int keyboardState, int height)> keyboardEventDataUpdater) {
+        return [keyboardObserver subscribeForKeyboardEvents:^(int keyboardState, int height) {
+          keyboardEventDataUpdater(keyboardState, height);
+        }];
+      };
+
+  auto unsubscribeFromKeyboardEventsFunction = [](int listenerId) {
+    [keyboardObserver unsubscribeFromKeyboardEvents:listenerId];
+  };
+  // end keyboard events
+
   PlatformDepMethodsHolder platformDepMethodsHolder = {
       requestRender,
 #ifdef RCT_NEW_ARCH_ENABLED
@@ -409,6 +358,8 @@ std::shared_ptr<NativeReanimatedModule> createReanimatedModule(
       registerSensorFunction,
       unregisterSensorFunction,
       setGestureStateFunction,
+      subscribeForKeyboardEventsFunction,
+      unsubscribeFromKeyboardEventsFunction,
   };
 
   module = std::make_shared<NativeReanimatedModule>(

package/ios/native/REAJSIUtils.h

@@ -0,0 +1,66 @@
+#pragma once
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#include <jsi/jsi.h>
+
+using namespace facebook;
+
+// Copied from RCTTurboModule.mm
+
+/**
+ * All static helper functions are ObjC++ specific.
+ */
+static jsi::Value convertNSNumberToJSIBoolean(jsi::Runtime &runtime, NSNumber *value)
+{
+  return jsi::Value((bool)[value boolValue]);
+}
+
+static jsi::Value convertNSNumberToJSINumber(jsi::Runtime &runtime, NSNumber *value)
+{
+  return jsi::Value([value doubleValue]);
+}
+
+static jsi::String convertNSStringToJSIString(jsi::Runtime &runtime, NSString *value)
+{
+  return jsi::String::createFromUtf8(runtime, [value UTF8String] ?: "");
+}
+
+static jsi::Value convertObjCObjectToJSIValue(jsi::Runtime &runtime, id value);
+static jsi::Object convertNSDictionaryToJSIObject(jsi::Runtime &runtime, NSDictionary *value)
+{
+  jsi::Object result = jsi::Object(runtime);
+  for (NSString *k in value) {
+    result.setProperty(runtime, [k UTF8String], convertObjCObjectToJSIValue(runtime, value[k]));
+  }
+  return result;
+}
+
+static jsi::Array convertNSArrayToJSIArray(jsi::Runtime &runtime, NSArray *value)
+{
+  jsi::Array result = jsi::Array(runtime, value.count);
+  for (size_t i = 0; i < value.count; i++) {
+    result.setValueAtIndex(runtime, i, convertObjCObjectToJSIValue(runtime, value[i]));
+  }
+  return result;
+}
+
+static jsi::Value convertObjCObjectToJSIValue(jsi::Runtime &runtime, id value)
+{
+  if ([value isKindOfClass:[NSString class]]) {
+    return convertNSStringToJSIString(runtime, (NSString *)value);
+  } else if ([value isKindOfClass:[NSNumber class]]) {
+    if ([value isKindOfClass:[@YES class]]) {
+      return convertNSNumberToJSIBoolean(runtime, (NSNumber *)value);
+    }
+    return convertNSNumberToJSINumber(runtime, (NSNumber *)value);
+  } else if ([value isKindOfClass:[NSDictionary class]]) {
+    return convertNSDictionaryToJSIObject(runtime, (NSDictionary *)value);
+  } else if ([value isKindOfClass:[NSArray class]]) {
+    return convertNSArrayToJSIArray(runtime, (NSArray *)value);
+  } else if (value == (id)kCFNull) {
+    return jsi::Value::null();
+  }
+  return jsi::Value::undefined();
+}
+
+#endif // RCT_NEW_ARCH_ENABLED

package/ios/sensor/ReanimatedSensor.m

@@ -7,7 +7,11 @@
 {
   self = [super init];
   _sensorType = sensorType;
-  _interval = interval / 1000; // in seconds
+  if (interval == -1) {
+    _interval = 1.0 / UIScreen.mainScreen.maximumFramesPerSecond;
+  } else {
+    _interval = interval / 1000.0; // in seconds
+  }
   _setter = setter;
   _motionManager = [[CMMotionManager alloc] init];
   return self;
@@ -59,18 +63,21 @@
   }
   [_motionManager setAccelerometerUpdateInterval:_interval];
   [_motionManager startAccelerometerUpdates];
-  [_motionManager
-      startAccelerometerUpdatesToQueue:[NSOperationQueue mainQueue]
-                           withHandler:^(CMAccelerometerData *sensorData, NSError *error) {
-                             double currentTime = [[NSProcessInfo processInfo] systemUptime];
-                             if (currentTime - self->_lastTimestamp < self->_interval) {
-                               return;
-                             }
-                             double data[] = {
-                                 sensorData.acceleration.x, sensorData.acceleration.y, sensorData.acceleration.z};
-                             self->_setter(data);
-                             self->_lastTimestamp = currentTime;
-                           }];
+  [_motionManager startAccelerometerUpdatesToQueue:[NSOperationQueue mainQueue]
+                                       withHandler:^(CMAccelerometerData *sensorData, NSError *error) {
+                                         double currentTime = [[NSProcessInfo processInfo] systemUptime];
+                                         if (currentTime - self->_lastTimestamp < self->_interval) {
+                                           return;
+                                         }
+                                         double G = 9.81;
+                                         // convert G to m/s^2
+                                         double data[] = {
+                                             sensorData.acceleration.x * G,
+                                             sensorData.acceleration.y * G,
+                                             sensorData.acceleration.z * G};
+                                         self->_setter(data);
+                                         self->_lastTimestamp = currentTime;
+                                       }];
 
   return true;
 }
@@ -89,7 +96,10 @@
                             if (currentTime - self->_lastTimestamp < self->_interval) {
                               return;
                             }
-                            double data[] = {sensorData.gravity.x, sensorData.gravity.y, sensorData.gravity.z};
+                            double G = 9.81;
+                            // convert G to m/s^2
+                            double data[] = {
+                                sensorData.gravity.x * G, sensorData.gravity.y * G, sensorData.gravity.z * G};
                             self->_setter(data);
                             self->_lastTimestamp = currentTime;
                           }];
@@ -128,7 +138,7 @@
   [_motionManager setDeviceMotionUpdateInterval:_interval];
 
   [_motionManager setShowsDeviceMovementDisplay:YES];
-  [_motionManager startDeviceMotionUpdatesUsingReferenceFrame:CMAttitudeReferenceFrameXTrueNorthZVertical
+  [_motionManager startDeviceMotionUpdatesUsingReferenceFrame:CMAttitudeReferenceFrameXArbitraryZVertical
                                                       toQueue:[NSOperationQueue mainQueue]
                                                   withHandler:^(CMDeviceMotion *sensorData, NSError *error) {
                                                     double currentTime = [[NSProcessInfo processInfo] systemUptime];
@@ -141,10 +151,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/commonjs/Animated.js

@@ -0,0 +1,70 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "FlatList", {
+  enumerable: true,
+  get: function () {
+    return _FlatList.default;
+  }
+});
+Object.defineProperty(exports, "Image", {
+  enumerable: true,
+  get: function () {
+    return _Image.default;
+  }
+});
+Object.defineProperty(exports, "ScrollView", {
+  enumerable: true,
+  get: function () {
+    return _ScrollView.default;
+  }
+});
+Object.defineProperty(exports, "Text", {
+  enumerable: true,
+  get: function () {
+    return _Text.default;
+  }
+});
+Object.defineProperty(exports, "View", {
+  enumerable: true,
+  get: function () {
+    return _View.default;
+  }
+});
+Object.defineProperty(exports, "addWhitelistedNativeProps", {
+  enumerable: true,
+  get: function () {
+    return _ConfigHelper.addWhitelistedNativeProps;
+  }
+});
+Object.defineProperty(exports, "addWhitelistedUIProps", {
+  enumerable: true,
+  get: function () {
+    return _ConfigHelper.addWhitelistedUIProps;
+  }
+});
+Object.defineProperty(exports, "createAnimatedComponent", {
+  enumerable: true,
+  get: function () {
+    return _createAnimatedComponent.default;
+  }
+});
+
+var _createAnimatedComponent = _interopRequireDefault(require("./createAnimatedComponent"));
+
+var _ConfigHelper = require("./ConfigHelper");
+
+var _Text = _interopRequireDefault(require("./reanimated2/component/Text"));
+
+var _View = _interopRequireDefault(require("./reanimated2/component/View"));
+
+var _ScrollView = _interopRequireDefault(require("./reanimated2/component/ScrollView"));
+
+var _Image = _interopRequireDefault(require("./reanimated2/component/Image"));
+
+var _FlatList = _interopRequireDefault(require("./reanimated2/component/FlatList"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+//# sourceMappingURL=Animated.js.map

package/lib/commonjs/Animated.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["Animated.ts"],"sourcesContent":["export { default as createAnimatedComponent } from './createAnimatedComponent';\nexport {\n  addWhitelistedNativeProps,\n  addWhitelistedUIProps,\n} from './ConfigHelper';\n\nexport { default as Text } from './reanimated2/component/Text';\nexport { default as View } from './reanimated2/component/View';\nexport { default as ScrollView } from './reanimated2/component/ScrollView';\nexport { default as Image } from './reanimated2/component/Image';\nexport { default as FlatList } from './reanimated2/component/FlatList';\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AAKA;;AACA;;AACA;;AACA;;AACA"}