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

package/ios/LayoutReanimation/REASnapshot.m

@@ -1,27 +1,112 @@
 #import <Foundation/Foundation.h>
+#import <RNReanimated/REAScreensHelper.h>
 #import <RNReanimated/REASnapshot.h>
+#import <React/UIView+React.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-@implementation REASnapshot {
-  UIView *_view;
-}
+@implementation REASnapshot
+
+const int ScreenStackPresentationModal = 1; // RNSScreenStackPresentationModal
+const int DEFAULT_MODAL_TOP_OFFSET = 69; // Default iOS modal is shifted from screen top edge by 69px
 
 - (instancetype)init:(UIView *)view
 {
   self = [super init];
-  _view = view;
-  UIView *windowView = UIApplication.sharedApplication.keyWindow;
-  CGPoint originFromRootPerspective = [[view superview] convertPoint:view.center toView:windowView];
+  [self makeSnapshotForView:view useAbsolutePositionOnly:NO];
+  return self;
+}
+
+- (instancetype)initWithAbsolutePosition:(UIView *)view
+{
+  self = [super init];
+  [self makeSnapshotForView:view useAbsolutePositionOnly:YES];
+  return self;
+}
+
+- (void)makeSnapshotForView:(UIView *)view useAbsolutePositionOnly:(BOOL)useAbsolutePositionOnly
+{
+  UIView *mainWindow = UIApplication.sharedApplication.keyWindow;
+  CGPoint absolutePosition = [[view superview] convertPoint:view.center toView:mainWindow];
   _values = [NSMutableDictionary new];
+  _values[@"windowWidth"] = [NSNumber numberWithDouble:mainWindow.bounds.size.width];
+  _values[@"windowHeight"] = [NSNumber numberWithDouble:mainWindow.bounds.size.height];
   _values[@"width"] = [NSNumber numberWithDouble:(double)(view.bounds.size.width)];
   _values[@"height"] = [NSNumber numberWithDouble:(double)(view.bounds.size.height)];
-  _values[@"originX"] = [NSNumber numberWithDouble:view.center.x - view.bounds.size.width / 2.0];
-  _values[@"originY"] = [NSNumber numberWithDouble:view.center.y - view.bounds.size.height / 2.0];
-  _values[@"globalOriginX"] = [NSNumber numberWithDouble:originFromRootPerspective.x - view.bounds.size.width / 2.0];
-  _values[@"globalOriginY"] = [NSNumber numberWithDouble:originFromRootPerspective.y - view.bounds.size.height / 2.0];
+  _values[@"globalOriginX"] = [NSNumber numberWithDouble:absolutePosition.x - view.bounds.size.width / 2.0];
+  _values[@"globalOriginY"] = [NSNumber numberWithDouble:absolutePosition.y - view.bounds.size.height / 2.0];
+  if (useAbsolutePositionOnly) {
+    _values[@"originX"] = _values[@"globalOriginX"];
+    _values[@"originY"] = _values[@"globalOriginY"];
+    _values[@"originXByParent"] = [NSNumber numberWithDouble:view.center.x - view.bounds.size.width / 2.0];
+    _values[@"originYByParent"] = [NSNumber numberWithDouble:view.center.y - view.bounds.size.height / 2.0];
 
-  return self;
+    UIView *navigationContainer = view.reactViewController.navigationController.view;
+    UIView *header = [navigationContainer.subviews count] > 1 ? navigationContainer.subviews[1] : nil;
+    if (header != nil) {
+      CGFloat headerHeight = header.frame.size.height;
+      CGFloat headerOriginY = header.frame.origin.y;
+      UIView *screen = [REAScreensHelper getScreenForView:view];
+      if ([REAScreensHelper isScreenModal:screen] && screen.superview == nil) {
+        int additionalModalOffset = 0;
+        UIView *screenWrapper = [REAScreensHelper getScreenWrapper:view];
+        int screenType = [REAScreensHelper getScreenType:screenWrapper];
+        if (screenType == ScreenStackPresentationModal) {
+          additionalModalOffset = DEFAULT_MODAL_TOP_OFFSET;
+        }
+        float originY = [_values[@"originY"] doubleValue] + headerHeight + headerOriginY + additionalModalOffset;
+        _values[@"originY"] = @(originY);
+      }
+      _values[@"headerHeight"] = @(headerHeight);
+    } else {
+      _values[@"headerHeight"] = @(0);
+    }
+
+    UIView *transformedView = [self findTransformedView:view];
+    if (transformedView != nil) {
+      // iOS affine matrix: https://developer.apple.com/documentation/corefoundation/cgaffinetransform?language=objc
+      CGAffineTransform transform = transformedView.transform;
+      NSNumber *a = @(transform.a);
+      NSNumber *b = @(transform.b);
+      NSNumber *c = @(transform.c);
+      NSNumber *d = @(transform.d);
+      NSNumber *tx = @(transform.tx);
+      NSNumber *ty = @(transform.tx);
+      _values[@"transformMatrix"] = @[ a, b, @(0), c, d, @(0), tx, ty, @(1) ];
+      _values[@"originX"] = @([_values[@"originX"] doubleValue] - [tx doubleValue]);
+      _values[@"originY"] = @([_values[@"originY"] doubleValue] - [ty doubleValue]);
+    } else {
+      // Identity matrix is an default value
+      _values[@"transformMatrix"] = @[ @(1), @(0), @(0), @(0), @(1), @(0), @(0), @(0), @(1) ];
+    }
+  } else {
+    _values[@"originX"] = [NSNumber numberWithDouble:view.center.x - view.bounds.size.width / 2.0];
+    _values[@"originY"] = [NSNumber numberWithDouble:view.center.y - view.bounds.size.height / 2.0];
+  }
+}
+
+- (UIView *)findTransformedView:(UIView *)view
+{
+  UIView *transformedView;
+  bool isTransformed = false;
+  do {
+    if (transformedView == nil) {
+      transformedView = view;
+    } else {
+      transformedView = transformedView.superview;
+    }
+    CGAffineTransform transform = transformedView.transform;
+    isTransformed = transform.a != 1 || transform.b != 0 || transform.c != 0 || transform.d != 1 || transform.tx != 0 ||
+        transform.ty != 0;
+  } while (!isTransformed &&
+           transformedView != nil
+           // Ignore views above screen
+           && ![REAScreensHelper isRNSScreenType:transformedView]);
+
+  if (isTransformed && transformedView != nil) {
+    return transformedView;
+  }
+  return nil;
 }
 
 @end

package/ios/LayoutReanimation/REAUIManager.mm

@@ -24,12 +24,6 @@
         removeAtIndices:(NSArray<NSNumber *> *)removeAtIndices
                registry:(NSMutableDictionary<NSNumber *, id<RCTComponent>> *)registry;
 
-- (void)_removeChildren:(NSArray<UIView *> *)children fromContainer:(UIView *)container;
-
-- (void)_removeChildren:(NSArray<UIView *> *)children
-          fromContainer:(UIView *)container
-          withAnimation:(RCTLayoutAnimationGroup *)animation;
-
 - (RCTViewManagerUIBlock)uiBlockWithLayoutUpdateForRootView:(RCTRootShadowView *)rootShadowView;
 
 - (NSArray<id<RCTComponent>> *)_childrenToRemoveFromContainer:(id<RCTComponent>)container
@@ -37,7 +31,6 @@
 @end
 
 @implementation REAUIManager {
-  RCTLayoutAnimationGroup *_reactLayoutAnimationGroup;
   NSMutableDictionary<NSNumber *, NSMutableSet<id<RCTComponent>> *> *_toBeRemovedRegister;
   NSMutableDictionary<NSNumber *, NSNumber *> *_parentMapper;
   REAAnimationsManager *_animationsManager;
@@ -49,15 +42,14 @@
   return NSStringFromClass([RCTUIManager class]);
 }
 
+- (void)invalidate
+{
+  [_animationsManager invalidate];
+  [super invalidate];
+}
+
 - (void)setBridge:(RCTBridge *)bridge
 {
-  // setting a layout animation group with a deleting animation in order to
-  // allows us to call a different method in RCTUIManager for cleaning up exiting views
-  RCTLayoutAnimation *deletingAnimation = [[RCTLayoutAnimation alloc] initWithDuration:0 config:@{}];
-  _reactLayoutAnimationGroup = [[RCTLayoutAnimationGroup alloc] initWithCreatingLayoutAnimation:nil
-                                                                        updatingLayoutAnimation:nil
-                                                                        deletingLayoutAnimation:deletingAnimation
-                                                                                       callback:nil];
   if (!_blockSetter) {
     _blockSetter = true;
 
@@ -79,21 +71,6 @@
   }
 }
 
-- (void)_removeChildren:(NSArray<UIView *> *)children
-          fromContainer:(UIView *)container
-          withAnimation:(RCTLayoutAnimationGroup *)animation
-{
-  if (animation == _reactLayoutAnimationGroup) {
-    // if a removed view in this batch has an `exiting` animation,
-    // let REAAnimationsManager handle the removal
-    [_animationsManager removeChildren:children fromContainer:container];
-  } else {
-    // otherwise, if there's a layout animation group set,
-    // delegate to the React Native implementation for layout animations
-    [super _removeChildren:children fromContainer:container withAnimation:animation];
-  }
-}
-
 - (void)_manageChildren:(NSNumber *)containerTag
         moveFromIndices:(NSArray<NSNumber *> *)moveFromIndices
           moveToIndices:(NSArray<NSNumber *> *)moveToIndices
@@ -102,40 +79,32 @@
         removeAtIndices:(NSArray<NSNumber *> *)removeAtIndices
                registry:(NSMutableDictionary<NSNumber *, id<RCTComponent>> *)registry
 {
-  if (!reanimated::FeaturesConfig::isLayoutAnimationEnabled()) {
-    [super _manageChildren:containerTag
-           moveFromIndices:moveFromIndices
-             moveToIndices:moveToIndices
-         addChildReactTags:addChildReactTags
-              addAtIndices:addAtIndices
-           removeAtIndices:removeAtIndices
-                  registry:registry];
-    return;
-  }
+  bool isLayoutAnimationEnabled = reanimated::FeaturesConfig::isLayoutAnimationEnabled();
+  id<RCTComponent> container;
+  NSArray<id<RCTComponent>> *permanentlyRemovedChildren;
+  BOOL containerIsRootOfViewController = NO;
+  if (isLayoutAnimationEnabled) {
+    container = registry[containerTag];
+    permanentlyRemovedChildren = [self _childrenToRemoveFromContainer:container atIndices:removeAtIndices];
+
+    if ([container isKindOfClass:[UIView class]]) {
+      UIViewController *controller = ((UIView *)container).reactViewController;
+      UIViewController *parentController = ((UIView *)container).superview.reactViewController;
+      containerIsRootOfViewController = controller != parentController;
+    }
 
-  // Reanimated changes /start
-  BOOL isUIViewRegistry = ((id)registry == (id)[self valueForKey:@"_viewRegistry"]);
-  if (isUIViewRegistry) {
-    BOOL wasProxyRemovalSet = [self valueForKey:@"_layoutAnimationGroup"] == _reactLayoutAnimationGroup;
-    BOOL wantProxyRemoval = NO;
-    if (!wasProxyRemovalSet) {
-      id<RCTComponent> container = registry[containerTag];
+    // we check if the container we`re removing from is a root view
+    // of some view controller. In that case, we skip running exiting animations
+    // in its children, to prevent issues with RN Screens.
+    if (containerIsRootOfViewController) {
       NSArray<id<RCTComponent>> *permanentlyRemovedChildren = [self _childrenToRemoveFromContainer:container
                                                                                          atIndices:removeAtIndices];
-      for (UIView *removedChild in permanentlyRemovedChildren) {
-        if ([_animationsManager wantsHandleRemovalOfView:removedChild]) {
-          wantProxyRemoval = YES;
-          break;
-        }
-        [_animationsManager removeAnimationsFromSubtree:removedChild];
-      }
-      if (wantProxyRemoval) {
-        // set layout animation group
-        [super setNextLayoutAnimationGroup:_reactLayoutAnimationGroup];
+      for (UIView *view in permanentlyRemovedChildren) {
+        [_animationsManager endAnimationsRecursive:view];
       }
+      [_animationsManager removeAnimationsFromSubtree:(UIView *)container];
     }
   }
-  // Reanimated changes /end
 
   [super _manageChildren:containerTag
          moveFromIndices:moveFromIndices
@@ -144,6 +113,28 @@
             addAtIndices:addAtIndices
          removeAtIndices:removeAtIndices
                 registry:registry];
+
+  if (!isLayoutAnimationEnabled) {
+    return;
+  }
+
+  if (containerIsRootOfViewController) {
+    return;
+  }
+
+  // we sort the (index, view) pairs to make sure we insert views back in order
+  NSMutableArray<NSArray<id> *> *removedViewsWithIndices = [NSMutableArray new];
+  for (int i = 0; i < removeAtIndices.count; i++) {
+    removedViewsWithIndices[i] = @[ removeAtIndices[i], permanentlyRemovedChildren[i] ];
+  }
+  [removedViewsWithIndices
+      sortUsingComparator:^NSComparisonResult(NSArray<id> *_Nonnull obj1, NSArray<id> *_Nonnull obj2) {
+        return [(NSNumber *)obj1[0] compare:(NSNumber *)obj2[0]];
+      }];
+
+  [_animationsManager reattachAnimatedChildren:permanentlyRemovedChildren
+                                   toContainer:container
+                                     atIndices:removeAtIndices];
 }
 
 - (void)callAnimationForTree:(UIView *)view parentTag:(NSNumber *)parentTag
@@ -238,6 +229,8 @@
 
     __block NSUInteger completionsCalled = 0;
 
+    NSMutableDictionary<NSNumber *, REASnapshot *> *snapshotsBefore = [NSMutableDictionary dictionary];
+
     NSInteger index = 0;
     for (NSNumber *reactTag in reactTags) {
       RCTFrameData frameData = frameDataArray[index++];
@@ -274,6 +267,7 @@
 
       // Reanimated changes /start
       REASnapshot *snapshotBefore = isNew ? nil : [self->_animationsManager prepareSnapshotBeforeMountForView:view];
+      snapshotsBefore[reactTag] = snapshotBefore;
       // Reanimated changes /end
 
       if (creatingLayoutAnimation) {
@@ -320,17 +314,30 @@
         [view reactSetFrame:frame];
         completion(YES);
       }
+    }
+
+    // Reanimated changes /start
+    index = 0;
+    for (NSNumber *reactTag in reactTags) {
+      RCTFrameData frameData = frameDataArray[index++];
+      UIView *view = viewRegistry[reactTag];
+      BOOL isNew = frameData.isNew;
+      CGRect frame = frameData.frame;
+
+      REASnapshot *snapshotBefore = snapshotsBefore[reactTag];
 
-      // Reanimated changes /start
       if (isNew || snapshotBefore != nil) {
-        [self->_animationsManager viewDidMount:view withBeforeSnapshot:snapshotBefore];
+        [self->_animationsManager viewDidMount:view withBeforeSnapshot:snapshotBefore withNewFrame:frame];
       }
-      // Reanimated changes /end
     }
+
     // Clean up
     // below line serves as this one uiManager->_layoutAnimationGroup = nil;, because we don't have access to the
     // private field
     [uiManager setNextLayoutAnimationGroup:nil];
+
+    [self->_animationsManager viewsDidLayout];
+    // Reanimated changes /end
   };
 }
 

package/ios/REAModule.mm

@@ -19,14 +19,9 @@
 
 #import <RNReanimated/REAModule.h>
 #import <RNReanimated/REANodesManager.h>
+#import <RNReanimated/ReanimatedVersion.h>
 #import <RNReanimated/SingleInstanceChecker.h>
 
-#ifdef REANIMATED_VERSION
-#define STRINGIZE(x) #x
-#define STRINGIZE2(x) STRINGIZE(x)
-#define REANIMATED_VERSION_STRING STRINGIZE2(REANIMATED_VERSION)
-#endif // REANIMATED_VERSION
-
 using namespace facebook::react;
 using namespace reanimated;
 
@@ -222,7 +217,7 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(installTurboModule)
 
     runtime.global().setProperty(runtime, "_IS_FABRIC", true);
 
-    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/REANodesManager.mm

@@ -313,24 +313,6 @@ using namespace facebook::react;
 }
 #endif
 
-- (BOOL)isDirectEvent:(id<RCTEvent>)event
-{
-  static NSArray<NSString *> *directEventNames;
-  static dispatch_once_t directEventNamesToken;
-  dispatch_once(&directEventNamesToken, ^{
-    directEventNames = @[
-      @"topContentSizeChange",
-      @"topMomentumScrollBegin",
-      @"topMomentumScrollEnd",
-      @"topScroll",
-      @"topScrollBeginDrag",
-      @"topScrollEndDrag"
-    ];
-  });
-
-  return [directEventNames containsObject:RCTNormalizeInputEventName(event.eventName)];
-}
-
 - (void)dispatchEvent:(id<RCTEvent>)event
 {
   NSString *key = [NSString stringWithFormat:@"%@%@", event.viewTag, RCTNormalizeInputEventName(event.eventName)];
@@ -349,9 +331,7 @@ using namespace facebook::react;
         return;
       }
       eventHandler(eventHash, event);
-      if ([strongSelf isDirectEvent:event]) {
-        [strongSelf performOperations];
-      }
+      [strongSelf performOperations];
     });
   }
 }

package/ios/keyboardObserver/REAKeyboardEventObserver.m

@@ -18,6 +18,7 @@ typedef NS_ENUM(NSUInteger, KeyboardState) {
   int _windowsCount;
   UIView *_keyboardView;
   KeyboardState _state;
+  bool _shouldInvalidateDisplayLink;
 }
 
 - (instancetype)init
@@ -26,6 +27,14 @@ typedef NS_ENUM(NSUInteger, KeyboardState) {
   _listeners = [[NSMutableDictionary alloc] init];
   _nextListenerId = @0;
   _state = UNKNOWN;
+  _shouldInvalidateDisplayLink = false;
+
+  NSNotificationCenter *notificationCenter = [NSNotificationCenter defaultCenter];
+
+  [notificationCenter addObserver:self
+                         selector:@selector(clearListeners)
+                             name:RCTBridgeDidInvalidateModulesNotification
+                           object:nil];
   return self;
 }
 
@@ -79,15 +88,19 @@ typedef NS_ENUM(NSUInteger, KeyboardState) {
 
 - (void)runAnimation
 {
-  displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(updateKeyboardFrame)];
-  [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+  if (!displayLink) {
+    displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(updateKeyboardFrame)];
+    [displayLink addToRunLoop:[NSRunLoop mainRunLoop] forMode:NSRunLoopCommonModes];
+  }
 }
 
 - (void)stopAnimation
 {
-  [displayLink invalidate];
-  displayLink = nil;
   [self updateKeyboardFrame];
+  // there might be a case that keyboard will change height in the next frame
+  // (for example changing keyboard language so that suggestions appear)
+  // so we invalidate display link after we handle that in the next frame
+  _shouldInvalidateDisplayLink = true;
 }
 
 - (void)updateKeyboardFrame
@@ -101,6 +114,12 @@ typedef NS_ENUM(NSUInteger, KeyboardState) {
   for (NSString *key in _listeners.allKeys) {
     ((KeyboardEventListenerBlock)_listeners[key])(_state, keyboardHeight);
   }
+
+  if (_shouldInvalidateDisplayLink) {
+    _shouldInvalidateDisplayLink = false;
+    [displayLink invalidate];
+    displayLink = nil;
+  }
 }
 
 - (CGFloat)computeKeyboardHeight:(UIView *)keyboardView
@@ -139,44 +158,51 @@ typedef NS_ENUM(NSUInteger, KeyboardState) {
 {
   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];
-  }
+  RCTExecuteOnMainQueue(^() {
+    if ([self->_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];
-  }
+    [self->_listeners setObject:listener forKey:listenerId];
+    if (self->_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];
-  }
+  RCTExecuteOnMainQueue(^() {
+    NSNumber *_listenerId = [NSNumber numberWithInt:listenerId];
+    [self->_listeners removeObjectForKey:_listenerId];
+    if ([self->_listeners count] == 0) {
+      [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillHideNotification object:nil];
+      [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil];
+      [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardDidHideNotification object:nil];
+      [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardDidShowNotification object:nil];
+    }
+  });
 }
 
 - (void)recognizeInitialKeyboardState
@@ -193,6 +219,16 @@ typedef NS_ENUM(NSUInteger, KeyboardState) {
   });
 }
 
+- (void)clearListeners
+{
+  RCTUnsafeExecuteOnMainQueueSync(^() {
+    [self->_listeners removeAllObjects];
+    [self->displayLink invalidate];
+    self->displayLink = nil;
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+  });
+}
+
 #endif
 
 @end