react-native-reanimated 2.3.0-alpha.1 → 2.3.0-beta.2

package/ios/LayoutReanimation/REAAnimationsManager.m

@@ -1,46 +1,48 @@
 #import "REAAnimationsManager.h"
 #import <React/RCTComponentData.h>
-#import "REAAnimationRootView.h"
-#import <React/UIView+React.h>
+#import <React/RCTTextView.h>
 #import <React/UIView+Private.h>
-#import "REAViewTraverser.h"
+#import <React/UIView+React.h>
+#import "REAUIManager.h"
 
 @interface REAAnimationsManager ()
 
-@property (atomic, nullable) void(^startAnimationForTag)(NSNumber *, NSString *, NSDictionary *, NSNumber*);
-@property (atomic, nullable) void(^removeConfigForTag)(NSNumber *);
+@property (atomic, nullable) void (^startAnimationForTag)(NSNumber *, NSString *, NSDictionary *, NSNumber *);
+@property (atomic, nullable) void (^removeConfigForTag)(NSNumber *);
 
-- (void)removeLeftovers:(NSNumber*)tag;
+- (void)removeLeftovers;
 - (void)scheduleCleaning;
 
 @end
 
-typedef NS_ENUM(NSInteger, ViewState) {
-    Appearing,
-    Disappearing,
-    Layout,
-    Inactive,
-    ToRemove,
-};
-
 @implementation REAAnimationsManager {
-  RCTUIManager* _uiManager;
-  NSMutableDictionary<NSNumber*, NSNumber *>* _states;
-  NSMutableDictionary<NSNumber*, UIView *>* _viewForTag;
-  NSMutableDictionary<NSNumber*, NSNumber *>* _animatedLayout;
-  NSMutableSet<NSNumber*>* _toRemove;
-  NSMutableDictionary<NSNumber*, UIView *>* _animatedLayoutHangingPoint;
+  RCTUIManager *_uiManager;
+  REAUIManager *_reaUiManager;
+  NSMutableDictionary<NSNumber *, NSNumber *> *_states;
+  NSMutableDictionary<NSNumber *, UIView *> *_viewForTag;
+  NSMutableSet<NSNumber *> *_toRemove;
+  BOOL _cleaningScheduled;
+}
+
++ (NSArray *)layoutKeys
+{
+  static NSArray *_array;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    _array = @[ @"originX", @"originY", @"width", @"height" ];
+  });
+  return _array;
 }
 
 - (instancetype)initWithUIManager:(RCTUIManager *)uiManager
 {
   if (self = [super init]) {
     _uiManager = uiManager;
+    _reaUiManager = (REAUIManager *)uiManager;
     _states = [NSMutableDictionary new];
     _viewForTag = [NSMutableDictionary new];
-    _animatedLayout = [NSMutableDictionary new];
     _toRemove = [NSMutableSet new];
-    _animatedLayoutHangingPoint = [NSMutableDictionary new];
+    _cleaningScheduled = false;
   }
   return self;
 }
@@ -51,255 +53,248 @@ typedef NS_ENUM(NSInteger, ViewState) {
   _removeConfigForTag = nil;
   _uiManager = nil;
   _states = nil;
-  _animatedLayout = nil;
   _viewForTag = nil;
   _toRemove = nil;
-  _animatedLayoutHangingPoint = nil;
+  _cleaningScheduled = false;
 }
 
-- (void)notifyAboutChangeWithBeforeSnapshots:(REASnapshooter*)before afterSnapshooter:(REASnapshooter*)after
+- (void)setAnimationStartingBlock:
+    (void (^)(NSNumber *tag, NSString *type, NSDictionary *yogaValues, NSNumber *depth))startAnimation
 {
-  // TODO native view which are not a part of React may not have reactTag use NSData instead;
-  NSMutableArray<UIView*>* allViews = [[NSMutableArray alloc] initWithArray:before.listView];
-  [allViews addObjectsFromArray:after.listView];
-  allViews = [[NSOrderedSet orderedSetWithArray:allViews].array mutableCopy];
-  
-  //update view for tag and setAnimatedLayout
-  for (UIView * view in allViews) {
-    if (_states[view.reactTag] == nil) {
-      _states[view.reactTag] = [NSNumber numberWithInt:Inactive];
-    }
-    _viewForTag[view.reactTag] = view;
-    _animatedLayout[view.reactTag] = before.tag;
-  }
-  
-  // attach all orphan views
-  for (UIView * view in allViews) {
-    if (view.superview != nil) {
-      continue;
-    }
-    if ([view isKindOfClass:[REAAnimationRootView class]]) {
-      NSArray<UIView *> *pathToTheRoot = (NSArray<UIView *>*)before.capturedValues[[REASnapshooter idFor:view]][@"pathToWindow"];
-      for (int i = 1; i < [pathToTheRoot count]; ++i) {
-        UIView * current = pathToTheRoot[i-1];
-        UIView * parent = pathToTheRoot[i];
-        if (current.superview == nil) {
-          [parent addSubview:current];
-          _animatedLayoutHangingPoint[view.reactTag] = parent;
-        }
-      }
-    } else {
-      UIView * parent = (UIView*) before.capturedValues[[REASnapshooter idFor:view]][@"parent"];
-      [parent addSubview:view];
-    }
-  }
-  
-  for (UIView * view in allViews) {
-    int tag = [view.reactTag intValue];
-    NSString * type = @"entering";
-    NSMutableDictionary * startValues = before.capturedValues[[REASnapshooter idFor:view]];
-    NSMutableDictionary * targetValues = after.capturedValues[[REASnapshooter idFor:view]];
-    
-    ViewState viewState = [_states[view.reactTag] intValue];
-    if (viewState == Appearing || viewState == Disappearing || viewState == ToRemove) {
-      if (viewState == Appearing && startValues != nil && targetValues == nil) {
-        _states[view.reactTag] = [NSNumber numberWithInt: Disappearing];
-        type = @"exiting";
-        NSDictionary* preparedValues = [self prepareDataForAnimatingWorklet:startValues];
-        _startAnimationForTag(view.reactTag, type, preparedValues, @(0));      }
-      continue; // Maybe we should update an animation instead of skipping
-    }
-  
-    if (viewState == Inactive) { // it can be a fresh view
-      if (startValues == nil && targetValues != nil) {
-        NSDictionary* preparedValues = [self prepareDataForAnimatingWorklet:targetValues];
-        _startAnimationForTag(view.reactTag, type, preparedValues, @(0));
-      }
-      if (startValues != nil && targetValues == nil) {
-        _states[view.reactTag] = [NSNumber numberWithInt:ToRemove];
-      }
-      continue;
-    }
-    // View must be in Layout State
-    type = @"layout";
-    if (targetValues == nil && startValues != nil) {
-      _states[view.reactTag] = [NSNumber numberWithInt: Disappearing];
-      type = @"exiting";
-      NSDictionary* preparedValues = [self prepareDataForAnimatingWorklet:startValues];
-      _startAnimationForTag(view.reactTag, type, preparedValues, @(0));
-      continue;
-    }
-    
-    NSDictionary* preparedStartValues = [self prepareDataForAnimatingWorklet:startValues];
-    NSDictionary* preparedTargetValues = [self prepareDataForAnimatingWorklet:targetValues];
-    NSMutableDictionary * preparedValues = [NSMutableDictionary new];
-    [preparedValues addEntriesFromDictionary:preparedTargetValues];
-    for (NSString* key in preparedStartValues.allKeys) {
-      preparedValues[[NSString stringWithFormat:@"%@%@", @"b", key]] = preparedStartValues[key];
-    }
-    
-    _startAnimationForTag(view.reactTag, type, preparedValues, @(0));
-  }
-  
-  [self removeLeftovers: before.tag];
+  _startAnimationForTag = startAnimation;
+}
+
+- (void)setRemovingConfigBlock:(void (^)(NSNumber *tag))block
+{
+  _removeConfigForTag = block;
 }
 
 - (void)scheduleCleaning
 {
+  if (_cleaningScheduled) {
+    return;
+  }
+  _cleaningScheduled = true;
+
   __weak REAAnimationsManager *weakSelf = self;
   dispatch_async(dispatch_get_main_queue(), ^{
+    self->_cleaningScheduled = false;
     if (weakSelf == nil) {
       return;
     }
-    NSMutableSet<NSNumber*> * toRemove = _toRemove;
-    _toRemove = [NSMutableSet new];
-    
-    NSMutableSet<NSNumber *>* candidates = [NSMutableSet new];
-    for (NSNumber * tag in toRemove) {
-      UIView * view = _viewForTag[tag];
-      if (view == nil) {
-        continue;
-      }
-      [candidates addObject: _animatedLayout[tag]];
-    }
-    
-    for (NSNumber * tag in candidates) {
-      [self removeLeftovers:tag];
-    }
+    [self removeLeftovers];
   });
 }
 
-- (BOOL) dfs:(UIView *)view disapperingAbove:(BOOL)disappearingAbove
+- (void)findRoot:(UIView *)view roots:(NSMutableSet<NSNumber *> *)roots
 {
-  BOOL active = false;
-  ViewState state = [_states[view.reactTag] intValue];
-  BOOL disappearing = state == ToRemove || state == Disappearing;
-  
-  for (UIView* child in view.subviews) {
-    BOOL childAns = [self dfs:child disapperingAbove:(disappearingAbove || disappearing)];
-    active |= childAns;
+  UIView *currentView = view;
+  NSNumber *lastToRemoveTag = nil;
+  while (currentView != nil) {
+    ViewState state = [_states[currentView.reactTag] intValue];
+    if (state == Disappearing) {
+      return;
+    }
+    if (state == ToRemove) {
+      lastToRemoveTag = currentView.reactTag;
+    }
+    currentView = currentView.superview;
   }
-  
-  if (!disappearingAbove && state == ToRemove && !active) {
-    [REAViewTraverser traverse:view withBlock:^(UIView * _Nonnull current) {
-      [_states removeObjectForKey:current.reactTag];
-      [_animatedLayout removeObjectForKey:current.reactTag];
-      [_viewForTag removeObjectForKey:current.reactTag];
-      _removeConfigForTag(current.reactTag);
-      if (view.reactTag == current.reactTag) { 
-        if ([view isKindOfClass:[REAAnimationRootView class]]) {
-          UIView * hangingPoint = _animatedLayoutHangingPoint[view.reactTag];
-          UIView * tmp = view;
-          while (tmp.superview != nil && tmp != hangingPoint) {
-            UIView * next = tmp.superview;
-            [tmp removeFromSuperview];
-            tmp = next;
-          }
-          [_animatedLayoutHangingPoint removeObjectForKey:view.reactTag];
-        } else {
-          [view removeFromSuperview];
-        }
-      }
-      for (UIView * child in view.subviews) {
-        [child removeFromSuperview];
-      }
-      
-    } shouldSkipAnimationRoots:false depth:(1e9)];
+  if (lastToRemoveTag != nil) {
+    [roots addObject:lastToRemoveTag];
   }
-  
-  return active || (!(ToRemove == state));
 }
 
-- (void)removeLeftovers:(NSNumber*)tag
+- (BOOL)dfs:(UIView *)root view:(UIView *)view cands:(NSMutableSet<NSNumber *> *)cands
 {
-  UIView * view = _viewForTag[tag];
-  if (view == nil) {
-    return;
+  NSNumber *tag = view.reactTag;
+  if (tag == nil) {
+    return true;
   }
-  [self dfs:view disapperingAbove:false];
-}
-
-- (void)setAnimationStartingBlock:(void (^)(NSNumber * tag, NSString * type, NSDictionary* yogaValues, NSNumber* depth))startAnimation
-{
-  _startAnimationForTag = startAnimation;
-}
-
-- (void)setRemovingConfigBlock:(void (^)(NSNumber *tag))block
-{
-  _removeConfigForTag = block;
+  if (![cands containsObject:tag] && _states[tag] != nil) {
+    return true;
+  }
+  BOOL cannotStripe = false;
+  NSArray<UIView *> *toRemoveCopy = [view.reactSubviews copy];
+  for (UIView *child in toRemoveCopy) {
+    if (![view isKindOfClass:[RCTTextView class]]) {
+      cannotStripe |= [self dfs:root view:child cands:cands];
+    }
+  }
+  if (!cannotStripe) {
+    if (view.reactSuperview != nil) {
+      [_reaUiManager unregisterView:view];
+    }
+    [_states removeObjectForKey:tag];
+    [_viewForTag removeObjectForKey:tag];
+    [_toRemove removeObject:tag];
+  }
+  return cannotStripe;
 }
 
-- (void)notifyAboutProgress:(NSDictionary *)newStyle tag:(NSNumber*)tag
+- (void)removeLeftovers
 {
-  ViewState state = [_states[tag] intValue];
-  if (state == Inactive) {
-    _states[tag] = [NSNumber numberWithInt:Appearing];
+  NSMutableSet<NSNumber *> *roots = [NSMutableSet new];
+  for (NSNumber *viewTag in _toRemove) {
+    UIView *view = _viewForTag[viewTag];
+    [self findRoot:view roots:roots];
+  }
+  for (NSNumber *viewTag in roots) {
+    UIView *view = _viewForTag[viewTag];
+    [self dfs:view view:view cands:_toRemove];
   }
-  
-  NSMutableDictionary* dataComponenetsByName = [_uiManager valueForKey:@"_componentDataByName"];
-  RCTComponentData *componentData = dataComponenetsByName[@"RCTView"];
-  [self setNewProps:[newStyle mutableCopy] forView:_viewForTag[tag] withComponentData:componentData];
 }
 
-- (void)notifyAboutEnd:(NSNumber*)tag cancelled:(BOOL)cancelled
+- (void)notifyAboutEnd:(NSNumber *)tag cancelled:(BOOL)cancelled
 {
   if (!cancelled) {
-    //Update State
     ViewState state = [_states[tag] intValue];
     if (state == Appearing) {
       _states[tag] = [NSNumber numberWithInt:Layout];
     }
     if (state == Disappearing) {
       _states[tag] = [NSNumber numberWithInt:ToRemove];
-      [_toRemove addObject:tag];
+      if (tag != nil) {
+        [_toRemove addObject:tag];
+      }
       [self scheduleCleaning];
     }
   }
 }
 
-- (void)setNewProps:(NSMutableDictionary *)newProps forView:(UIView*)view withComponentData:(RCTComponentData*)componentData
+- (void)notifyAboutProgress:(NSDictionary *)newStyle tag:(NSNumber *)tag
+{
+  if (_states[tag] == nil) {
+    return;
+  }
+  ViewState state = [_states[tag] intValue];
+  if (state == Inactive) {
+    _states[tag] = [NSNumber numberWithInt:Appearing];
+  }
+
+  NSMutableDictionary *dataComponenetsByName = [_uiManager valueForKey:@"_componentDataByName"];
+  RCTComponentData *componentData = dataComponenetsByName[@"RCTView"];
+  [self setNewProps:[newStyle mutableCopy] forView:_viewForTag[tag] withComponentData:componentData];
+}
+
+- (void)setNewProps:(NSMutableDictionary *)newProps
+              forView:(UIView *)view
+    withComponentData:(RCTComponentData *)componentData
 {
   if (newProps[@"height"]) {
     double height = [newProps[@"height"] doubleValue];
     double oldHeight = view.bounds.size.height;
     view.bounds = CGRectMake(0, 0, view.bounds.size.width, height);
-    view.center = CGPointMake(view.center.x, view.center.y - oldHeight/2.0 + view.bounds.size.height/2.0);
+    view.center = CGPointMake(view.center.x, view.center.y - oldHeight / 2.0 + view.bounds.size.height / 2.0);
     [newProps removeObjectForKey:@"height"];
   }
   if (newProps[@"width"]) {
     double width = [newProps[@"width"] doubleValue];
     double oldWidth = view.bounds.size.width;
     view.bounds = CGRectMake(0, 0, width, view.bounds.size.height);
-    view.center = CGPointMake(view.center.x + view.bounds.size.width/2.0 - oldWidth/2.0, view.center.y);
+    view.center = CGPointMake(view.center.x + view.bounds.size.width / 2.0 - oldWidth / 2.0, view.center.y);
     [newProps removeObjectForKey:@"width"];
   }
   if (newProps[@"originX"]) {
     double originX = [newProps[@"originX"] doubleValue];
-    view.center = CGPointMake(originX + view.bounds.size.width/2.0, view.center.y);
+    view.center = CGPointMake(originX + view.bounds.size.width / 2.0, view.center.y);
     [newProps removeObjectForKey:@"originX"];
   }
   if (newProps[@"originY"]) {
     double originY = [newProps[@"originY"] doubleValue];
-    view.center = CGPointMake(view.center.x, originY + view.bounds.size.height/2.0);
+    view.center = CGPointMake(view.center.x, originY + view.bounds.size.height / 2.0);
     [newProps removeObjectForKey:@"originY"];
   }
   [componentData setProps:newProps forView:view];
 }
 
-- (NSDictionary*) prepareDataForAnimatingWorklet:(NSMutableDictionary*)values
+- (NSDictionary *)prepareDataForAnimatingWorklet:(NSMutableDictionary *)values
 {
   UIView *windowView = UIApplication.sharedApplication.keyWindow;
-  NSDictionary* preparedData = @{
-    @"width": values[@"width"],
-    @"height": values[@"height"],
-    @"originX": values[@"originX"],
-    @"originY": values[@"originY"],
-    @"globalOriginX": values[@"globalOriginX"],
-    @"globalOriginY": values[@"globalOriginY"],
-    @"windowWidth": [NSNumber numberWithDouble:windowView.bounds.size.width],
-    @"windowHeight": [NSNumber numberWithDouble:windowView.bounds.size.height]
+  NSDictionary *preparedData = @{
+    @"width" : values[@"width"],
+    @"height" : values[@"height"],
+    @"originX" : values[@"originX"],
+    @"originY" : values[@"originY"],
+    @"globalOriginX" : values[@"globalOriginX"],
+    @"globalOriginY" : values[@"globalOriginY"],
+    @"windowWidth" : [NSNumber numberWithDouble:windowView.bounds.size.width],
+    @"windowHeight" : [NSNumber numberWithDouble:windowView.bounds.size.height]
   };
   return preparedData;
 }
 
+- (void)onViewRemoval:(UIView *)view before:(REASnapshot *)before
+{
+  NSNumber *tag = view.reactTag;
+  ViewState state = [_states[tag] intValue];
+  if (state == Disappearing || state == ToRemove || tag == nil) {
+    return;
+  }
+  NSMutableDictionary<NSString *, NSObject *> *startValues = before.values;
+  if (state == Inactive) {
+    if (startValues != nil) {
+      _states[tag] = [NSNumber numberWithInt:ToRemove];
+      [_toRemove addObject:tag];
+      [self scheduleCleaning];
+    }
+    return;
+  }
+  _states[tag] = [NSNumber numberWithInt:Disappearing];
+  NSDictionary *preparedValues = [self prepareDataForAnimatingWorklet:startValues];
+  _startAnimationForTag(tag, @"exiting", preparedValues, @(0));
+}
+
+- (void)onViewCreate:(UIView *)view after:(REASnapshot *)after
+{
+  NSNumber *tag = view.reactTag;
+  if (_states[tag] == nil) {
+    _states[tag] = [NSNumber numberWithInt:Inactive];
+    _viewForTag[tag] = view;
+  }
+  NSMutableDictionary *targetValues = after.values;
+  ViewState state = [_states[tag] intValue];
+  if (state == Inactive) {
+    if (targetValues != nil) {
+      NSDictionary *preparedValues = [self prepareDataForAnimatingWorklet:targetValues];
+      _startAnimationForTag(tag, @"entering", preparedValues, @(0));
+    }
+    return;
+  }
+}
+
+- (void)onViewUpdate:(UIView *)view before:(REASnapshot *)before after:(REASnapshot *)after
+{
+  NSNumber *tag = view.reactTag;
+  NSMutableDictionary *targetValues = after.values;
+  NSMutableDictionary *startValues = before.values;
+  if (_states[tag] == nil) {
+    return;
+  }
+  ViewState state = [_states[tag] intValue];
+  if (state == Disappearing || state == ToRemove || state == Inactive) {
+    return;
+  }
+  if (state == Appearing) {
+    BOOL doNotStartLayout = true;
+    for (NSString *key in [[self class] layoutKeys]) {
+      if ([((NSNumber *)startValues[key]) doubleValue] != [((NSNumber *)targetValues[key]) doubleValue]) {
+        doNotStartLayout = false;
+      }
+    }
+    if (doNotStartLayout) {
+      return;
+    }
+  }
+  _states[view.reactTag] = [NSNumber numberWithInt:Layout];
+  NSDictionary *preparedStartValues = [self prepareDataForAnimatingWorklet:startValues];
+  NSDictionary *preparedTargetValues = [self prepareDataForAnimatingWorklet:targetValues];
+  NSMutableDictionary *preparedValues = [NSMutableDictionary new];
+  [preparedValues addEntriesFromDictionary:preparedTargetValues];
+  for (NSString *key in preparedStartValues.allKeys) {
+    preparedValues[[NSString stringWithFormat:@"%@%@", @"b", key]] = preparedStartValues[key];
+  }
+  _startAnimationForTag(view.reactTag, @"layout", preparedValues, @(0));
+}
+
 @end

package/ios/LayoutReanimation/REASnapshot.h

@@ -0,0 +1,13 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface REASnapshot : NSObject
+
+@property NSMutableDictionary *values;
+
+- (instancetype)init:(UIView *)view;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/LayoutReanimation/REASnapshot.m

@@ -0,0 +1,29 @@
+#import "REASnapshot.h"
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@implementation REASnapshot {
+  UIView *_view;
+}
+
+- (instancetype)init:(UIView *)view
+{
+  self = [super init];
+  _view = view;
+  UIView *windowView = UIApplication.sharedApplication.keyWindow;
+  CGPoint originFromRootPerspective = [[view superview] convertPoint:view.center toView:windowView];
+  _values = [NSMutableDictionary new];
+  _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];
+
+  return self;
+}
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/LayoutReanimation/REAUIManager.h

@@ -0,0 +1,16 @@
+#import <React/RCTBridge+Private.h>
+#import <React/RCTDefines.h>
+#import <React/RCTUIManager.h>
+#import "REAAnimationsManager.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface REAUIManager : RCTUIManager
+@property BOOL blockSetter;
+- (void)setBridge:(RCTBridge *)bridge;
+- (void)setUp:(REAAnimationsManager *)animationsManager;
+- (void)unregisterView:(id<RCTComponent>)view;
+@property (nonatomic, copy) void (^flushUiOperations)();
+@end
+
+NS_ASSUME_NONNULL_END