react-native-reanimated 2.3.0-alpha.3 → 2.3.0-beta.4

package/ios/LayoutReanimation/REAAnimationsManager.m

@@ -1,14 +1,14 @@
 #import "REAAnimationsManager.h"
 #import <React/RCTComponentData.h>
-#import <React/UIView+React.h>
+#import <React/RCTTextView.h>
 #import <React/UIView+Private.h>
+#import <React/UIView+React.h>
 #import "REAUIManager.h"
-#import <React/RCTTextView.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;
 - (void)scheduleCleaning;
@@ -16,29 +16,29 @@
 @end
 
 @implementation REAAnimationsManager {
-  RCTUIManager* _uiManager;
-  REAUIManager* _reaUiManager;
-  NSMutableDictionary<NSNumber*, NSNumber *>* _states;
-  NSMutableDictionary<NSNumber*, UIView *>* _viewForTag;
-  NSMutableSet<NSNumber*>* _toRemove;
+  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;
+  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;
+    _reaUiManager = (REAUIManager *)uiManager;
     _states = [NSMutableDictionary new];
     _viewForTag = [NSMutableDictionary new];
     _toRemove = [NSMutableSet new];
@@ -58,7 +58,8 @@
   _cleaningScheduled = false;
 }
 
-- (void)setAnimationStartingBlock:(void (^)(NSNumber * tag, NSString * type, NSDictionary* yogaValues, NSNumber* depth))startAnimation
+- (void)setAnimationStartingBlock:
+    (void (^)(NSNumber *tag, NSString *type, NSDictionary *yogaValues, NSNumber *depth))startAnimation
 {
   _startAnimationForTag = startAnimation;
 }
@@ -70,11 +71,11 @@
 
 - (void)scheduleCleaning
 {
-  if(_cleaningScheduled) {
+  if (_cleaningScheduled) {
     return;
   }
   _cleaningScheduled = true;
-  
+
   __weak REAAnimationsManager *weakSelf = self;
   dispatch_async(dispatch_get_main_queue(), ^{
     self->_cleaningScheduled = false;
@@ -85,44 +86,44 @@
   });
 }
 
-- (void) findRoot:(UIView*)view roots:(NSMutableSet<NSNumber*>*)roots
+- (void)findRoot:(UIView *)view roots:(NSMutableSet<NSNumber *> *)roots
 {
-  UIView* currentView = view;
-  NSNumber* lastToRemoveTag = nil;
+  UIView *currentView = view;
+  NSNumber *lastToRemoveTag = nil;
   while (currentView != nil) {
     ViewState state = [_states[currentView.reactTag] intValue];
-    if(state == Disappearing) {
+    if (state == Disappearing) {
       return;
     }
-    if(state == ToRemove) {
+    if (state == ToRemove) {
       lastToRemoveTag = currentView.reactTag;
     }
     currentView = currentView.superview;
   }
-  if(lastToRemoveTag != nil) {
+  if (lastToRemoveTag != nil) {
     [roots addObject:lastToRemoveTag];
   }
 }
 
-- (BOOL) dfs:(UIView*)root view:(UIView*)view cands:(NSMutableSet<NSNumber*>*)cands
+- (BOOL)dfs:(UIView *)root view:(UIView *)view cands:(NSMutableSet<NSNumber *> *)cands
 {
-  NSNumber* tag = view.reactTag;
+  NSNumber *tag = view.reactTag;
   if (tag == nil) {
     return true;
   }
-  if(![cands containsObject:tag] && _states[tag] != nil) {
+  if (![cands containsObject:tag] && _states[tag] != nil) {
     return true;
   }
   BOOL cannotStripe = false;
-  NSArray<UIView*>* toRemoveCopy = [view.reactSubviews copy];
-  for (UIView* child in toRemoveCopy) {
+  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];
+  if (!cannotStripe) {
+    if (view.reactSuperview != nil) {
+      [_reaUiManager unregisterView:view];
     }
     [_states removeObjectForKey:tag];
     [_viewForTag removeObjectForKey:tag];
@@ -133,18 +134,18 @@
 
 - (void)removeLeftovers
 {
-  NSMutableSet<NSNumber*>* roots = [NSMutableSet new];
-  for(NSNumber* viewTag in _toRemove) {
-    UIView* view = _viewForTag[viewTag];
+  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];
+  for (NSNumber *viewTag in roots) {
+    UIView *view = _viewForTag[viewTag];
     [self dfs:view view:view cands:_toRemove];
   }
 }
 
-- (void)notifyAboutEnd:(NSNumber*)tag cancelled:(BOOL)cancelled
+- (void)notifyAboutEnd:(NSNumber *)tag cancelled:(BOOL)cancelled
 {
   if (!cancelled) {
     ViewState state = [_states[tag] intValue];
@@ -153,7 +154,7 @@
     }
     if (state == Disappearing) {
       _states[tag] = [NSNumber numberWithInt:ToRemove];
-      if(tag != nil) {
+      if (tag != nil) {
         [_toRemove addObject:tag];
       }
       [self scheduleCleaning];
@@ -161,7 +162,7 @@
   }
 }
 
-- (void)notifyAboutProgress:(NSDictionary *)newStyle tag:(NSNumber*)tag
+- (void)notifyAboutProgress:(NSDictionary *)newStyle tag:(NSNumber *)tag
 {
   if (_states[tag] == nil) {
     return;
@@ -170,67 +171,69 @@
   if (state == Inactive) {
     _states[tag] = [NSNumber numberWithInt:Appearing];
   }
-  
-  NSMutableDictionary* dataComponenetsByName = [_uiManager valueForKey:@"_componentDataByName"];
+
+  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
+- (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
+- (void)onViewRemoval:(UIView *)view before:(REASnapshot *)before
 {
-  NSNumber* tag = view.reactTag;
+  NSNumber *tag = view.reactTag;
   ViewState state = [_states[tag] intValue];
-  if(state == Disappearing || state == ToRemove || tag == nil) {
+  if (state == Disappearing || state == ToRemove || tag == nil) {
     return;
   }
-  NSMutableDictionary<NSString*, NSObject*>* startValues = before.values;
-  if(state == Inactive) {
-    if(startValues != nil) {
+  NSMutableDictionary<NSString *, NSObject *> *startValues = before.values;
+  if (state == Inactive) {
+    if (startValues != nil) {
       _states[tag] = [NSNumber numberWithInt:ToRemove];
       [_toRemove addObject:tag];
       [self scheduleCleaning];
@@ -238,57 +241,58 @@
     return;
   }
   _states[tag] = [NSNumber numberWithInt:Disappearing];
-  NSDictionary* preparedValues = [self prepareDataForAnimatingWorklet:startValues];
+  NSDictionary *preparedValues = [self prepareDataForAnimatingWorklet:startValues];
   _startAnimationForTag(tag, @"exiting", preparedValues, @(0));
 }
 
-- (void) onViewCreate:(UIView*) view after:(REASnapshot*) after
+- (void)onViewCreate:(UIView *)view after:(REASnapshot *)after
 {
-  NSNumber* tag = view.reactTag;
-  if(_states[tag] == nil) {
+  _reaUiManager.flushUiOperations();
+  NSNumber *tag = view.reactTag;
+  if (_states[tag] == nil) {
     _states[tag] = [NSNumber numberWithInt:Inactive];
     _viewForTag[tag] = view;
   }
-  NSMutableDictionary* targetValues = after.values;
+  NSMutableDictionary *targetValues = after.values;
   ViewState state = [_states[tag] intValue];
-  if(state == Inactive) {
-    if(targetValues != nil) {
-      NSDictionary* preparedValues = [self prepareDataForAnimatingWorklet:targetValues];
+  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
+- (void)onViewUpdate:(UIView *)view before:(REASnapshot *)before after:(REASnapshot *)after
 {
-  NSNumber* tag = view.reactTag;
-  NSMutableDictionary* targetValues = after.values;
-  NSMutableDictionary* startValues = before.values;
+  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) {
+  if (state == Disappearing || state == ToRemove || state == Inactive) {
     return;
   }
-  if(state == Appearing) {
+  if (state == Appearing) {
     BOOL doNotStartLayout = true;
-    for (NSString * key in [[self class] layoutKeys]) {
-        if ([((NSNumber *)startValues[key]) doubleValue] !=  [((NSNumber *)targetValues[key]) doubleValue]) {
-          doNotStartLayout = false;
-        }
+    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];
+  _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) {
+  for (NSString *key in preparedStartValues.allKeys) {
     preparedValues[[NSString stringWithFormat:@"%@%@", @"b", key]] = preparedStartValues[key];
   }
   _startAnimationForTag(view.reactTag, @"layout", preparedValues, @(0));

package/ios/LayoutReanimation/REASnapshot.h

@@ -4,9 +4,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface REASnapshot : NSObject
 
-@property NSMutableDictionary* values;
+@property NSMutableDictionary *values;
 
-- (instancetype) init:(UIView*)view;
+- (instancetype)init:(UIView *)view;
 
 @end
 

package/ios/LayoutReanimation/REASnapshot.m

@@ -4,10 +4,11 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @implementation REASnapshot {
-  UIView* _view;
+  UIView *_view;
 }
 
-- (instancetype) init:(UIView*)view {
+- (instancetype)init:(UIView *)view
+{
   self = [super init];
   _view = view;
   UIView *windowView = UIApplication.sharedApplication.keyWindow;
@@ -15,11 +16,11 @@ NS_ASSUME_NONNULL_BEGIN
   _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];
-  
+  _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;
 }
 

package/ios/LayoutReanimation/REAUIManager.h

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