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

package/ios/{REANodesManager.m → REANodesManager.mm}

@@ -1,29 +1,20 @@
-#import "REANodesManager.h"
-
+#import <RNReanimated/REAModule.h>
+#import <RNReanimated/REANodesManager.h>
 #import <React/RCTConvert.h>
 
-#import <React/RCTShadowView.h>
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <React/RCTComponentViewRegistry.h>
+#import <React/RCTMountingManager.h>
+#import <React/RCTSurfacePresenter.h>
+#import <react/renderer/core/ShadowNode.h>
+#import <react/renderer/uimanager/UIManager.h>
+#else
 #import <stdatomic.h>
-#import "Nodes/REAAlwaysNode.h"
-#import "Nodes/REABezierNode.h"
-#import "Nodes/REABlockNode.h"
-#import "Nodes/REACallFuncNode.h"
-#import "Nodes/REAClockNodes.h"
-#import "Nodes/REAConcatNode.h"
-#import "Nodes/REACondNode.h"
-#import "Nodes/READebugNode.h"
-#import "Nodes/REAEventNode.h"
-#import "Nodes/REAFunctionNode.h"
-#import "Nodes/REAJSCallNode.h"
-#import "Nodes/REANode.h"
-#import "Nodes/REAOperatorNode.h"
-#import "Nodes/REAParamNode.h"
-#import "Nodes/REAPropsNode.h"
-#import "Nodes/REASetNode.h"
-#import "Nodes/REAStyleNode.h"
-#import "Nodes/REATransformNode.h"
-#import "Nodes/REAValueNode.h"
-#import "REAModule.h"
+#endif
+
+#ifdef RCT_NEW_ARCH_ENABLED
+using namespace facebook::react;
+#endif
 
 // Interface below has been added in order to use private methods of RCTUIManager,
 // RCTUIManager#UpdateView is a React Method which is exported to JS but in
@@ -99,32 +90,53 @@
 @end
 
 @implementation REANodesManager {
-  NSMutableDictionary<REANodeID, REANode *> *_nodes;
-  NSMapTable<NSString *, REANode *> *_eventMapping;
-  NSMutableArray<id<RCTEvent>> *_eventQueue;
   CADisplayLink *_displayLink;
-  REAUpdateContext *_updateContext;
   BOOL _wantRunUpdates;
-  BOOL _processingDirectEvent;
   NSMutableArray<REAOnAnimationCallback> *_onAnimationCallbacks;
-  NSMutableArray<REANativeAnimationOp> *_operationsInBatch;
   BOOL _tryRunBatchUpdatesSynchronously;
   REAEventHandler _eventHandler;
   volatile void (^_mounting)(void);
   NSMutableDictionary<NSNumber *, ComponentUpdate *> *_componentUpdateBuffer;
-  volatile atomic_bool _shouldFlushUpdateBuffer;
   NSMutableDictionary<NSNumber *, UIView *> *_viewRegistry;
+#ifdef RCT_NEW_ARCH_ENABLED
+  __weak RCTBridge *_bridge;
+  REAPerformOperations _performOperations;
+  __weak id<RCTSurfacePresenterStub> _surfacePresenter;
+  NSMutableDictionary<NSNumber *, NSMutableDictionary *> *_operationsInBatch;
+#else
+  NSMutableArray<REANativeAnimationOp> *_operationsInBatch;
+  volatile atomic_bool _shouldFlushUpdateBuffer;
+#endif
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (nonnull instancetype)initWithModule:(REAModule *)reanimatedModule
+                                bridge:(RCTBridge *)bridge
+                      surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
+{
+  if ((self = [super init])) {
+    _bridge = bridge;
+    _surfacePresenter = surfacePresenter;
+    _reanimatedModule = reanimatedModule;
+    _wantRunUpdates = NO;
+    _onAnimationCallbacks = [NSMutableArray new];
+    _operationsInBatch = [NSMutableDictionary new];
+    _componentUpdateBuffer = [NSMutableDictionary new];
+    _viewRegistry = [_uiManager valueForKey:@"_viewRegistry"];
+  }
+
+  _displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(onAnimationFrame:)];
+  _displayLink.preferredFramesPerSecond = 120; // will fallback to 60 fps for devices without Pro Motion display
+  [_displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+  [_displayLink setPaused:true];
+  return self;
+}
+#else
 - (instancetype)initWithModule:(REAModule *)reanimatedModule uiManager:(RCTUIManager *)uiManager
 {
   if ((self = [super init])) {
     _reanimatedModule = reanimatedModule;
     _uiManager = uiManager;
-    _nodes = [NSMutableDictionary new];
-    _eventMapping = [NSMapTable strongToWeakObjectsMapTable];
-    _eventQueue = [NSMutableArray new];
-    _updateContext = [REAUpdateContext new];
     _wantRunUpdates = NO;
     _onAnimationCallbacks = [NSMutableArray new];
     _operationsInBatch = [NSMutableArray new];
@@ -139,6 +151,7 @@
   [_displayLink setPaused:true];
   return self;
 }
+#endif
 
 - (void)invalidate
 {
@@ -146,6 +159,13 @@
   [_displayLink invalidate];
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
+{
+  _surfacePresenter = surfacePresenter;
+}
+#endif
+
 - (void)operationsBatchDidComplete
 {
   if (![_displayLink isPaused]) {
@@ -160,29 +180,23 @@
   }
 }
 
-- (REANode *)findNodeByID:(REANodeID)nodeID
-{
-  return _nodes[nodeID];
-}
-
 - (void)postOnAnimation:(REAOnAnimationCallback)clb
 {
   [_onAnimationCallbacks addObject:clb];
   [self startUpdatingOnAnimationFrame];
 }
 
-- (void)postRunUpdatesAfterAnimation
+- (void)registerEventHandler:(REAEventHandler)eventHandler
 {
-  _wantRunUpdates = YES;
-  if (!_processingDirectEvent) {
-    [self startUpdatingOnAnimationFrame];
-  }
+  _eventHandler = eventHandler;
 }
 
-- (void)registerEventHandler:(REAEventHandler)eventHandler
+#ifdef RCT_NEW_ARCH_ENABLED
+- (void)registerPerformOperations:(REAPerformOperations)performOperations
 {
-  _eventHandler = eventHandler;
+  _performOperations = performOperations;
 }
+#endif
 
 - (void)startUpdatingOnAnimationFrame
 {
@@ -207,13 +221,6 @@
 {
   _currentAnimationTimestamp = _displayLink.timestamp;
 
-  // We process all enqueued events first
-  for (NSUInteger i = 0; i < _eventQueue.count; i++) {
-    id<RCTEvent> event = _eventQueue[i];
-    [self processEvent:event];
-  }
-  [_eventQueue removeAllObjects];
-
   NSArray<REAOnAnimationCallback> *callbacks = _onAnimationCallbacks;
   _onAnimationCallbacks = [NSMutableArray new];
 
@@ -240,9 +247,10 @@
 
 - (void)performOperations
 {
-  if (_wantRunUpdates) {
-    [REANode runPropUpdates:_updateContext];
-  }
+#ifdef RCT_NEW_ARCH_ENABLED
+  _performOperations(); // calls NativeReanimatedModule::performOperations
+  _wantRunUpdates = NO;
+#else
   if (_operationsInBatch.count != 0) {
     NSMutableArray<REANativeAnimationOp> *copiedOperationsQueue = _operationsInBatch;
     _operationsInBatch = [NSMutableArray new];
@@ -250,7 +258,7 @@
     BOOL trySynchronously = _tryRunBatchUpdatesSynchronously;
     _tryRunBatchUpdatesSynchronously = NO;
 
-    __weak typeof(self) weakSelf = self;
+    __weak __typeof__(self) weakSelf = self;
     dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
     RCTExecuteOnUIManagerQueue(^{
       __typeof__(self) strongSelf = weakSelf;
@@ -285,8 +293,12 @@
     }
   }
   _wantRunUpdates = NO;
+#endif
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+// nothing
+#else
 - (void)enqueueUpdateViewOnNativeThread:(nonnull NSNumber *)reactTag
                                viewName:(NSString *)viewName
                             nativeProps:(NSMutableDictionary *)nativeProps
@@ -299,153 +311,7 @@
     [uiManager updateView:reactTag viewName:viewName props:nativeProps];
   }];
 }
-
-- (void)getValue:(REANodeID)nodeID callback:(RCTResponseSenderBlock)callback
-{
-  id val = _nodes[nodeID].value;
-  if (val) {
-    callback(@[ val ]);
-  } else {
-    // NULL is not an object and it's not possible to pass it as callback's argument
-    callback(@[ [NSNull null] ]);
-  }
-}
-
-#pragma mark-- Graph
-
-- (void)createNode:(REANodeID)nodeID config:(NSDictionary<NSString *, id> *)config
-{
-  static NSDictionary *map;
-  static dispatch_once_t mapToken;
-  dispatch_once(&mapToken, ^{
-    map = @{
-      @"props" : [REAPropsNode class],
-      @"style" : [REAStyleNode class],
-      @"transform" : [REATransformNode class],
-      @"value" : [REAValueNode class],
-      @"block" : [REABlockNode class],
-      @"cond" : [REACondNode class],
-      @"op" : [REAOperatorNode class],
-      @"set" : [REASetNode class],
-      @"debug" : [READebugNode class],
-      @"clock" : [REAClockNode class],
-      @"clockStart" : [REAClockStartNode class],
-      @"clockStop" : [REAClockStopNode class],
-      @"clockTest" : [REAClockTestNode class],
-      @"call" : [REAJSCallNode class],
-      @"bezier" : [REABezierNode class],
-      @"event" : [REAEventNode class],
-      @"always" : [REAAlwaysNode class],
-      @"concat" : [REAConcatNode class],
-      @"param" : [REAParamNode class],
-      @"func" : [REAFunctionNode class],
-      @"callfunc" : [REACallFuncNode class]
-      //            @"listener": nil,
-    };
-  });
-
-  NSString *nodeType = [RCTConvert NSString:config[@"type"]];
-
-  Class nodeClass = map[nodeType];
-  if (!nodeClass) {
-    RCTLogError(@"Animated node type %@ not supported natively", nodeType);
-    return;
-  }
-
-  REANode *node = [[nodeClass alloc] initWithID:nodeID config:config];
-  node.nodesManager = self;
-  node.updateContext = _updateContext;
-  _nodes[nodeID] = node;
-}
-
-- (void)dropNode:(REANodeID)nodeID
-{
-  REANode *node = _nodes[nodeID];
-  if (node) {
-    [node onDrop];
-    [_nodes removeObjectForKey:nodeID];
-  }
-}
-
-- (void)connectNodes:(nonnull NSNumber *)parentID childID:(nonnull REANodeID)childID
-{
-  RCTAssertParam(parentID);
-  RCTAssertParam(childID);
-
-  REANode *parentNode = _nodes[parentID];
-  REANode *childNode = _nodes[childID];
-
-  RCTAssertParam(childNode);
-
-  [parentNode addChild:childNode];
-}
-
-- (void)disconnectNodes:(REANodeID)parentID childID:(REANodeID)childID
-{
-  RCTAssertParam(parentID);
-  RCTAssertParam(childID);
-
-  REANode *parentNode = _nodes[parentID];
-  REANode *childNode = _nodes[childID];
-
-  RCTAssertParam(childNode);
-
-  [parentNode removeChild:childNode];
-}
-
-- (void)connectNodeToView:(REANodeID)nodeID viewTag:(NSNumber *)viewTag viewName:(NSString *)viewName
-{
-  RCTAssertParam(nodeID);
-  REANode *node = _nodes[nodeID];
-  RCTAssertParam(node);
-
-  if ([node isKindOfClass:[REAPropsNode class]]) {
-    [(REAPropsNode *)node connectToView:viewTag viewName:viewName];
-  }
-}
-
-- (void)disconnectNodeFromView:(REANodeID)nodeID viewTag:(NSNumber *)viewTag
-{
-  RCTAssertParam(nodeID);
-  REANode *node = _nodes[nodeID];
-  RCTAssertParam(node);
-
-  if ([node isKindOfClass:[REAPropsNode class]]) {
-    [(REAPropsNode *)node disconnectFromView:viewTag];
-  }
-}
-
-- (void)attachEvent:(NSNumber *)viewTag eventName:(NSString *)eventName eventNodeID:(REANodeID)eventNodeID
-{
-  RCTAssertParam(eventNodeID);
-  REANode *eventNode = _nodes[eventNodeID];
-  RCTAssert([eventNode isKindOfClass:[REAEventNode class]], @"Event node is of an invalid type");
-
-  NSString *key = [NSString stringWithFormat:@"%@%@", viewTag, RCTNormalizeInputEventName(eventName)];
-  RCTAssert([_eventMapping objectForKey:key] == nil, @"Event handler already set for the given view and event type");
-  [_eventMapping setObject:eventNode forKey:key];
-}
-
-- (void)detachEvent:(NSNumber *)viewTag eventName:(NSString *)eventName eventNodeID:(REANodeID)eventNodeID
-{
-  NSString *key = [NSString stringWithFormat:@"%@%@", viewTag, RCTNormalizeInputEventName(eventName)];
-  [_eventMapping removeObjectForKey:key];
-}
-
-- (void)processEvent:(id<RCTEvent>)event
-{
-  NSString *key = [NSString stringWithFormat:@"%@%@", event.viewTag, RCTNormalizeInputEventName(event.eventName)];
-  REAEventNode *eventNode = [_eventMapping objectForKey:key];
-  [eventNode processEvent:event];
-}
-
-- (void)processDirectEvent:(id<RCTEvent>)event
-{
-  _processingDirectEvent = YES;
-  [self processEvent:event];
-  [self performOperations];
-  _processingDirectEvent = NO;
-}
+#endif
 
 - (BOOL)isDirectEvent:(id<RCTEvent>)event
 {
@@ -473,7 +339,7 @@
 
   if (_eventHandler != nil) {
     __weak REAEventHandler eventHandler = _eventHandler;
-    __weak typeof(self) weakSelf = self;
+    __weak __typeof__(self) weakSelf = self;
     RCTExecuteOnMainQueue(^void() {
       __typeof__(self) strongSelf = weakSelf;
       if (strongSelf == nil) {
@@ -488,44 +354,42 @@
       }
     });
   }
-
-  REANode *eventNode = [_eventMapping objectForKey:key];
-
-  if (eventNode != nil) {
-    if ([self isDirectEvent:event]) {
-      // Bypass the event queue/animation frames and process scroll events
-      // immediately to avoid getting out of sync with the scroll position
-      [self processDirectEvent:event];
-    } else {
-      // enqueue node to be processed
-      [_eventQueue addObject:event];
-      [self startUpdatingOnAnimationFrame];
-    }
-  }
 }
 
+#ifdef RCT_NEW_ARCH_ENABLED
+// nothing
+#else
 - (void)configureUiProps:(nonnull NSSet<NSString *> *)uiPropsSet
           andNativeProps:(nonnull NSSet<NSString *> *)nativePropsSet
 {
   _uiProps = uiPropsSet;
   _nativeProps = nativePropsSet;
 }
+#endif
 
 - (BOOL)isNotNativeViewFullyMounted:(NSNumber *)viewTag
 {
   return _viewRegistry[viewTag].superview == nil;
 }
 
-- (void)setValueForNodeID:(nonnull NSNumber *)nodeID value:(nonnull NSNumber *)newValue
-{
-  RCTAssertParam(nodeID);
+#ifdef RCT_NEW_ARCH_ENABLED
 
-  REANode *node = _nodes[nodeID];
+- (void)synchronouslyUpdateViewOnUIThread:(nonnull NSNumber *)viewTag props:(nonnull NSDictionary *)uiProps
+{
+  // adapted from RCTPropsAnimatedNode.m
+  RCTSurfacePresenter *surfacePresenter = _bridge.surfacePresenter ?: _surfacePresenter;
+  [surfacePresenter synchronouslyUpdateViewOnUIThread:viewTag props:uiProps];
 
-  REAValueNode *valueNode = (REAValueNode *)node;
-  [valueNode setValue:newValue];
+  // `synchronouslyUpdateViewOnUIThread` does not flush props like `backgroundColor` etc.
+  // so that's why we need to call `finalizeUpdates` here.
+  RCTComponentViewRegistry *componentViewRegistry = surfacePresenter.mountingManager.componentViewRegistry;
+  UIView<RCTComponentViewProtocol> *componentView =
+      [componentViewRegistry findComponentViewWithTag:[viewTag integerValue]];
+  [componentView finalizeUpdates:RNComponentViewUpdateMask{}];
 }
 
+#else
+
 - (void)updateProps:(nonnull NSDictionary *)props
       ofViewWithTag:(nonnull NSNumber *)viewTag
            withName:(nonnull NSString *)viewName
@@ -603,7 +467,7 @@
     return;
   }
 
-  __weak typeof(self) weakSelf = self;
+  __weak __typeof__(self) weakSelf = self;
   [_uiManager addUIBlock:^(__unused RCTUIManager *manager, __unused NSDictionary<NSNumber *, UIView *> *viewRegistry) {
     __typeof__(self) strongSelf = weakSelf;
     if (strongSelf == nil) {
@@ -625,4 +489,6 @@
   }];
 }
 
+#endif // RCT_NEW_ARCH_ENABLED
+
 @end

package/ios/native/NativeMethods.h

@@ -1,11 +1,9 @@
 #import <Foundation/Foundation.h>
-#import <RNGestureHandlerStateManager.h>
+#import <RNReanimated/RNGestureHandlerStateManager.h>
 #import <React/RCTUIManager.h>
 #include <string>
-#import <string>
 #include <utility>
 #include <vector>
-#import <vector>
 
 namespace reanimated {
 

package/ios/native/NativeMethods.mm

@@ -1,4 +1,4 @@
-#import "NativeMethods.h"
+#import <RNReanimated/NativeMethods.h>
 #import <React/RCTEventDispatcher.h>
 #import <React/RCTScrollView.h>
 

package/ios/native/NativeProxy.h

@@ -1,7 +1,7 @@
-#import <React/RCTEventDispatcher.h>
-
 #if __cplusplus
+
 #import <RNReanimated/NativeReanimatedModule.h>
+#import <React/RCTEventDispatcher.h>
 #include <memory>
 
 namespace reanimated {