Fix and refactor animations options (#4880)

lib/ios/RNNAnimationConfigurationOptions.h

@@ -0,0 +1,12 @@
+#import "RNNOptions.h"
+
+@interface RNNAnimationConfigurationOptions : RNNOptions
+
+@property (nonatomic, strong) Double* from;
+@property (nonatomic, strong) Double* to;
+@property (nonatomic, strong) Double* duration;
+@property (nonatomic, strong) Double* startDelay;
+
+- (BOOL)hasAnimation;
+
+@end

lib/ios/RNNAnimationConfigurationOptions.m

@@ -0,0 +1,20 @@
+#import "RNNAnimationConfigurationOptions.h"
+
+@implementation RNNAnimationConfigurationOptions
+
+- (instancetype)initWithDict:(NSDictionary *)dict {
+	self = [super init];
+	
+	self.from = [DoubleParser parse:dict key:@"from"];
+	self.to = [DoubleParser parse:dict key:@"to"];
+	self.startDelay = [DoubleParser parse:dict key:@"startDelay"];
+	self.duration = [DoubleParser parse:dict key:@"duration"];
+	
+	return self;
+}
+
+- (BOOL)hasAnimation {
+	return self.from.hasValue && self.to.hasValue;
+}
+
+@end

lib/ios/RNNTransitionsOptions.h → lib/ios/RNNAnimationsOptions.h

@@ -1,8 +1,7 @@
 #import "RNNOptions.h"
-#import "RNNTransitionStateHolder.h"
 #import "RNNScreenTransition.h"
 
-@interface RNNTransitionsOptions : RNNOptions
+@interface RNNAnimationsOptions : RNNOptions
 
 @property (nonatomic, strong) RNNScreenTransition* push;
 @property (nonatomic, strong) RNNScreenTransition* pop;

lib/ios/RNNAnimationsOptions.m

@@ -0,0 +1,18 @@
+#import "RNNAnimationsOptions.h"
+
+@implementation RNNAnimationsOptions
+
+- (instancetype)initWithDict:(NSDictionary *)dict {
+	self = [super init];
+	
+	self.push = [[RNNScreenTransition alloc] initWithDict:dict[@"push"]];
+	self.pop = [[RNNScreenTransition alloc] initWithDict:dict[@"pop"]];
+	self.showModal = [[RNNScreenTransition alloc] initWithDict:dict[@"showModal"]];
+	self.dismissModal = [[RNNScreenTransition alloc] initWithDict:dict[@"dismissModal"]];
+	self.setStackRoot = [[RNNScreenTransition alloc] initWithDict:dict[@"setStackRoot"]];
+	self.setRoot = [[RNNScreenTransition alloc] initWithDict:dict[@"setRoot"]];
+
+	return self;
+}
+
+@end

lib/ios/RNNModalAnimation.h → lib/ios/RNNAnimationsTransitionDelegate.h

@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
 #import "RNNScreenTransition.h"
 
-@interface RNNModalAnimation : NSObject <UIViewControllerAnimatedTransitioning>
+@interface RNNAnimationsTransitionDelegate : NSObject <UIViewControllerAnimatedTransitioning, UIViewControllerTransitioningDelegate>
 
 @property (nonatomic, strong) RNNScreenTransition* screenTransition;
 @property (nonatomic) BOOL isDismiss;

lib/ios/RNNAnimationsTransitionDelegate.m

@@ -0,0 +1,60 @@
+#import "RNNAnimationsTransitionDelegate.h"
+
+@implementation RNNAnimationsTransitionDelegate
+
+- (instancetype)initWithScreenTransition:(RNNScreenTransition *)screenTransition isDismiss:(BOOL)isDismiss {
+	self = [super init];
+	self.screenTransition = screenTransition;
+	self.isDismiss = isDismiss;
+	return self;
+}
+
+- (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
+	return self;
+}
+
+- (id<UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed {
+	return self;
+}
+
+- (NSTimeInterval)transitionDuration:(id <UIViewControllerContextTransitioning>)transitionContext {
+	return self.screenTransition.maxDuration / 1000;
+}
+
+- (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionContext {
+	UIViewController* toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
+	UIViewController* fromViewController = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
+	
+	[CATransaction begin];
+	[CATransaction setCompletionBlock:^{
+		[transitionContext completeTransition:![transitionContext transitionWasCancelled]];
+	}];
+	
+	if (_isDismiss) {
+		[[transitionContext containerView] addSubview:toViewController.view];
+		[[transitionContext containerView] addSubview:fromViewController.view];
+		[self animateElement:self.screenTransition.content view:fromViewController.view elementName:@"content"];
+	} else {
+		[[transitionContext containerView] addSubview:toViewController.view];
+		[self animateElement:self.screenTransition.content view:toViewController.view elementName:@"content"];
+	}
+	
+	[CATransaction commit];
+}
+
+- (void)animationWithKeyPath:(NSString *)keyPath from:(id)from to:(id)to duration:(CFTimeInterval)duration forView:(UIView *)view animationName:(NSString *)animationName {
+	CABasicAnimation *animation = [CABasicAnimation animation];
+	animation.keyPath = keyPath;
+	animation.fromValue = from;
+	animation.toValue = to;
+	animation.duration = duration / 1000;
+	[view.layer addAnimation:animation forKey:animationName];
+}
+
+- (void)animateElement:(RNNElementTransitionOptions *)element view:(UIView *)view elementName:(NSString *)elementName {
+	[self animationWithKeyPath:@"position.x" from:@(view.layer.position.x + [element.x.from getWithDefaultValue:0]) to:@(view.layer.position.x + [element.x.to getWithDefaultValue:0]) duration:[element.x.duration getWithDefaultValue:1] forView:view animationName:@"element.position.x"];
+	[self animationWithKeyPath:@"position.y" from:@(view.layer.position.y + [element.y.from getWithDefaultValue:0]) to:@(view.layer.position.y + [element.y.to getWithDefaultValue:0]) duration:[element.y.duration getWithDefaultValue:1] forView:view animationName:[NSString stringWithFormat:@"%@.position.y", elementName]];
+	[self animationWithKeyPath:@"opacity" from:@([element.alpha.from getWithDefaultValue:1]) to:@([element.alpha.to getWithDefaultValue:1]) duration:[element.alpha.duration getWithDefaultValue:1] forView:view animationName:[NSString stringWithFormat:@"%@.alpha", elementName]];
+}
+
+@end

lib/ios/RNNAnimator.h

@@ -1,9 +1,9 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import "RNNAnimationOptions.h"
+#import "RNNSharedElementAnimationOptions.h"
 
 @interface RNNAnimator : NSObject <UIViewControllerAnimatedTransitioning>
 
--(instancetype)initWithTransitionOptions:(RNNAnimationOptions *)transitionOptions;
+-(instancetype)initWithTransitionOptions:(RNNSharedElementAnimationOptions *)transitionOptions;
 
 @end

lib/ios/RNNAnimator.m

@@ -2,7 +2,7 @@
 #import "RNNTransition.h"
 
 @interface  RNNAnimator()
-@property (nonatomic, strong) RNNAnimationOptions* transitionOptions;
+@property (nonatomic, strong) RNNSharedElementAnimationOptions* transitionOptions;
 @property (nonatomic) BOOL backButton;
 @property (nonatomic, weak) UIViewController* fromVC;
 @property (nonatomic, weak) UIViewController* toVC;
@@ -10,7 +10,7 @@
 
 @implementation RNNAnimator
 
--(instancetype)initWithTransitionOptions:(RNNAnimationOptions *)transitionOptions {
+-(instancetype)initWithTransitionOptions:(RNNSharedElementAnimationOptions *)transitionOptions {
 	self = [super init];
 	if (transitionOptions.animations) {
 		[self setupTransition:transitionOptions];
@@ -21,7 +21,7 @@
 	return self;
 }
 
--(void)setupTransition:(RNNAnimationOptions *)transitionOptions {
+-(void)setupTransition:(RNNSharedElementAnimationOptions *)transitionOptions {
 	self.transitionOptions = transitionOptions;
 	if (!transitionOptions.animations) {
 		[[NSException exceptionWithName:NSInvalidArgumentException reason:@"No animations" userInfo:nil] raise];

lib/ios/RNNElementTransitionOptions.h

@@ -0,0 +1,18 @@
+#import "RNNOptions.h"
+#import "RNNAnimationConfigurationOptions.h"
+
+@interface RNNElementTransitionOptions : RNNOptions
+
+@property (nonatomic, strong) RNNAnimationConfigurationOptions* alpha;
+@property (nonatomic, strong) RNNAnimationConfigurationOptions* x;
+@property (nonatomic, strong) RNNAnimationConfigurationOptions* y;
+@property (nonatomic, strong) RNNAnimationConfigurationOptions* scaleX;
+@property (nonatomic, strong) RNNAnimationConfigurationOptions* scaleY;
+@property (nonatomic, strong) RNNAnimationConfigurationOptions* rotationX;
+@property (nonatomic, strong) RNNAnimationConfigurationOptions* rotationY;
+@property (nonatomic, strong) Bool* waitForRender;
+
+- (double)maxDuration;
+- (BOOL)hasAnimation;
+
+@end

lib/ios/RNNElementTransitionOptions.m

@@ -0,0 +1,34 @@
+#import "RNNElementTransitionOptions.h"
+
+@implementation RNNElementTransitionOptions
+
+- (instancetype)initWithDict:(NSDictionary *)dict {
+	self = [super init];
+	
+	self.alpha = [[RNNAnimationConfigurationOptions alloc] initWithDict:dict[@"alpha"]];
+	self.x = [[RNNAnimationConfigurationOptions alloc] initWithDict:dict[@"x"]];
+	self.y = [[RNNAnimationConfigurationOptions alloc] initWithDict:dict[@"y"]];
+
+	return self;
+}
+
+- (BOOL)hasAnimation {
+	return self.x.hasAnimation || self.y.hasAnimation || self.alpha.hasAnimation;
+}
+
+- (double)maxDuration {
+	double maxDuration = 0;
+	if ([_x.duration getWithDefaultValue:0] > maxDuration) {
+		maxDuration = [_x.duration getWithDefaultValue:0];
+	}
+	if ([_y.duration getWithDefaultValue:0] > maxDuration) {
+		maxDuration = [_y.duration getWithDefaultValue:0];
+	}
+	if ([_alpha.duration getWithDefaultValue:0] > maxDuration) {
+		maxDuration = [_alpha.duration getWithDefaultValue:0];
+	}
+	
+	return maxDuration;
+}
+
+@end

lib/ios/RNNModalAnimation.m

@@ -1,42 +0,0 @@
-#import "RNNModalAnimation.h"
-
-@implementation RNNModalAnimation
-
-- (instancetype)initWithScreenTransition:(RNNScreenTransition *)screenTransition isDismiss:(BOOL)isDismiss {
-	self = [super init];
-	self.screenTransition = screenTransition;
-	self.isDismiss = isDismiss;
-	
-	return self;
-}
-
-- (NSTimeInterval)transitionDuration:(id <UIViewControllerContextTransitioning>)transitionContext {
-	return self.screenTransition.content.duration;
-}
-
-- (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionContext {
-	UIViewController* toViewController = [transitionContext viewControllerForKey:self.isDismiss ? UITransitionContextFromViewControllerKey : UITransitionContextToViewControllerKey];
-	UIViewController* fromViewController = [transitionContext viewControllerForKey:self.isDismiss ? UITransitionContextToViewControllerKey : UITransitionContextFromViewControllerKey];
-	
-	if (self.isDismiss) {
-		[[transitionContext containerView] addSubview:fromViewController.view];
-		[[transitionContext containerView] addSubview:toViewController.view];
-	} else {
-		[[transitionContext containerView] addSubview:toViewController.view];
-	}
-	
-	[_screenTransition.content setupInitialTransitionForView:toViewController.view];
-	[_screenTransition.topBar setupInitialTransitionForView:toViewController.navigationController.navigationBar];
-	
-	
-	[UIView animateWithDuration:[self transitionDuration:transitionContext] delay:self.screenTransition.content.startDelay options:self.screenTransition.content.interpolation animations:^{
-		[_screenTransition.content completeTransitionForView:toViewController.view];
-		[_screenTransition.topBar completeTransitionForView:toViewController.navigationController.navigationBar];
-	} completion:^(BOOL finished) {
-		[transitionContext completeTransition:![transitionContext transitionWasCancelled]];
-	}];
-}
-
-
-@end
-

lib/ios/RNNModalManager.m

@@ -1,5 +1,6 @@
 #import "RNNModalManager.h"
 #import "RNNRootViewController.h"
+#import "RNNAnimationsTransitionDelegate.h"
 
 @implementation RNNModalManager {
 	NSMutableArray* _pendingModalIdsToDismiss;
@@ -19,7 +20,7 @@
 	[self showModal:viewController animated:animated hasCustomAnimation:NO completion:completion];
 }
 
--(void)showModal:(UIViewController *)viewController animated:(BOOL)animated hasCustomAnimation:(BOOL)hasCustomAnimation completion:(RNNTransitionWithComponentIdCompletionBlock)completion {
+-(void)showModal:(UIViewController<RNNLayoutProtocol> *)viewController animated:(BOOL)animated hasCustomAnimation:(BOOL)hasCustomAnimation completion:(RNNTransitionWithComponentIdCompletionBlock)completion {
 	if (!viewController) {
 		@throw [NSException exceptionWithName:@"ShowUnknownModal" reason:@"showModal called with nil viewController" userInfo:nil];
 	}
@@ -27,8 +28,9 @@
 	UIViewController* topVC = [self topPresentedVC];
 	topVC.definesPresentationContext = YES;
 	
+	RNNAnimationsTransitionDelegate* tr = [[RNNAnimationsTransitionDelegate alloc] initWithScreenTransition:viewController.resolveOptions.animations.showModal isDismiss:NO];
 	if (hasCustomAnimation) {
-		viewController.transitioningDelegate = (UIViewController<UIViewControllerTransitioningDelegate>*)topVC;
+		viewController.transitioningDelegate = tr;
 	}
 	
 	[topVC presentViewController:viewController animated:animated completion:^{
@@ -67,9 +69,9 @@
 	}
 
 	UIViewController* topPresentedVC = [self topPresentedVC];
-
-	if ([options.animations.showModal hasCustomAnimation]) {
-		modalToDismiss.transitioningDelegate = modalToDismiss;
+	RNNAnimationsTransitionDelegate* tr = [[RNNAnimationsTransitionDelegate alloc] initWithScreenTransition:modalToDismiss.resolveOptions.animations.dismissModal isDismiss:YES];
+	if ([options.animations.dismissModal hasCustomAnimation]) {
+		[self topViewControllerParent:modalToDismiss].transitioningDelegate = tr;
 	}
 
 	if (modalToDismiss == topPresentedVC || [[topPresentedVC childViewControllers] containsObject:modalToDismiss]) {
@@ -115,5 +117,14 @@
 	return [root topViewController] ? [root topViewController] : root;
 }
 
+- (UIViewController *)topViewControllerParent:(UIViewController *)viewController {
+	UIViewController* topParent = viewController;
+	while (topParent.parentViewController) {
+		topParent = topParent.parentViewController;
+	}
+	
+	return topParent;
+}
+
 
 @end

lib/ios/RNNNavigationController.m

@@ -1,6 +1,5 @@
 
 #import "RNNNavigationController.h"
-#import "RNNModalAnimation.h"
 #import "RNNRootViewController.h"
 #import "InteractivePopGestureDelegate.h"
 
@@ -107,14 +106,6 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 	return [super popViewControllerAnimated:animated];
 }
 
-- (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getCurrentChild.resolveOptions.animations.showModal isDismiss:NO];
-}
-
-- (id<UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.getCurrentChild.resolveOptions.animations.dismissModal isDismiss:YES];
-}
-
 - (UIViewController *)getCurrentChild {
 	return ((UIViewController<RNNParentProtocol>*)self.topViewController);
 }

lib/ios/RNNNavigationOptions.h

@@ -5,8 +5,8 @@
 #import "RNNTopTabOptions.h"
 #import "RNNTopTabsOptions.h"
 #import "RNNOverlayOptions.h"
-#import "RNNAnimationOptions.h"
-#import "RNNTransitionsOptions.h"
+#import "RNNSharedElementAnimationOptions.h"
+#import "RNNAnimationsOptions.h"
 #import "RNNStatusBarOptions.h"
 #import "RNNPreviewOptions.h"
 #import "RNNLayoutOptions.h"
@@ -24,8 +24,8 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 @property (nonatomic, strong) RNNTopTabOptions* topTab;
 @property (nonatomic, strong) RNNSideMenuOptions* sideMenu;
 @property (nonatomic, strong) RNNOverlayOptions* overlay;
-@property (nonatomic, strong) RNNAnimationOptions* customTransition;
-@property (nonatomic, strong) RNNTransitionsOptions* animations;
+@property (nonatomic, strong) RNNSharedElementAnimationOptions* customTransition;
+@property (nonatomic, strong) RNNAnimationsOptions* animations;
 @property (nonatomic, strong) RNNStatusBarOptions* statusBar;
 @property (nonatomic, strong) RNNPreviewOptions* preview;
 @property (nonatomic, strong) RNNLayoutOptions* layout;

lib/ios/RNNNavigationOptions.m

@@ -24,8 +24,8 @@
 	self.sideMenu = [[RNNSideMenuOptions alloc] initWithDict:dict[@"sideMenu"]];
 	self.splitView = [[RNNSplitViewOptions alloc] initWithDict:dict[@"splitView"]];
 	self.overlay = [[RNNOverlayOptions alloc] initWithDict:dict[@"overlay"]];
-	self.customTransition = [[RNNAnimationOptions alloc] initWithDict:dict[@"customTransition"]];
-	self.animations = [[RNNTransitionsOptions alloc] initWithDict:dict[@"animations"]];
+	self.customTransition = [[RNNSharedElementAnimationOptions alloc] initWithDict:dict[@"customTransition"]];
+	self.animations = [[RNNAnimationsOptions alloc] initWithDict:dict[@"animations"]];
 	self.statusBar = [[RNNStatusBarOptions alloc] initWithDict:dict[@"statusBar"]];
 	self.preview = [[RNNPreviewOptions alloc] initWithDict:dict[@"preview"]];
 	self.layout = [[RNNLayoutOptions alloc] initWithDict:dict[@"layout"]];

lib/ios/RNNPushAnimation.h

@@ -1,8 +1,10 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import "RNNModalAnimation.h"
+#import "RNNScreenTransition.h"
 
-@interface RNNPushAnimation : RNNModalAnimation <UIViewControllerAnimatedTransitioning>
+@interface RNNPushAnimation : NSObject <UIViewControllerAnimatedTransitioning>
+
+@property (nonatomic, strong) RNNScreenTransition* screenTransition;
 
 - (instancetype)initWithScreenTransition:(RNNScreenTransition *)screenTransition;
 

lib/ios/RNNPushAnimation.m

@@ -5,32 +5,45 @@
 - (instancetype)initWithScreenTransition:(RNNScreenTransition *)screenTransition {
 	self = [super init];
 	self.screenTransition = screenTransition;
-	
 	return self;
 }
 
 - (NSTimeInterval)transitionDuration:(id <UIViewControllerContextTransitioning>)transitionContext {
-	return self.screenTransition.content.duration;
+	return self.screenTransition.maxDuration / 1000;
 }
 
 - (void)animateTransition:(id<UIViewControllerContextTransitioning>)transitionContext {
+	UIViewController* fromViewController = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
 	UIViewController* toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
 	
+	[[transitionContext containerView] addSubview:fromViewController.view];
 	[[transitionContext containerView] addSubview:toViewController.view];
 	
-	[self.screenTransition.content setupInitialTransitionForView:toViewController.view];
-	[self.screenTransition.topBar setupInitialTransitionForView:toViewController.navigationController.navigationBar];
-	[self.screenTransition.bottomTabs setupInitialTransitionForView:toViewController.tabBarController.tabBar];
-	
-	
-	[UIView animateWithDuration:[self transitionDuration:transitionContext] delay:self.screenTransition.content.startDelay options:self.screenTransition.content.interpolation animations:^{
-		[self.screenTransition.content completeTransitionForView:toViewController.view];
-		[self.screenTransition.topBar completeTransitionForView:toViewController.navigationController.navigationBar];
-		[self.screenTransition.bottomTabs completeTransitionForView:toViewController.tabBarController.tabBar];
-	} completion:^(BOOL finished) {
+	[CATransaction begin];
+	[CATransaction setCompletionBlock:^{
 		[transitionContext completeTransition:![transitionContext transitionWasCancelled]];
 	}];
+
+	[self animateElement:self.screenTransition.topBar view:toViewController.navigationController.navigationBar elementName:@"topBar"];
+	[self animateElement:self.screenTransition.content view:toViewController.view elementName:@"content"];
+	[self animateElement:self.screenTransition.bottomTabs view:toViewController.tabBarController.tabBar elementName:@"bottomTabs"];
+	
+	[CATransaction commit];
+}
+
+- (void)animationWithKeyPath:(NSString *)keyPath from:(id)from to:(id)to duration:(CFTimeInterval)duration forView:(UIView *)view animationName:(NSString *)animationName {
+	CABasicAnimation *animation = [CABasicAnimation animation];
+	animation.keyPath = keyPath;
+	animation.fromValue = from;
+	animation.toValue = to;
+	animation.duration = duration / 1000;
+	[view.layer addAnimation:animation forKey:animationName];
 }
 
+- (void)animateElement:(RNNElementTransitionOptions *)element view:(UIView *)view elementName:(NSString *)elementName {
+	[self animationWithKeyPath:@"position.x" from:@(view.layer.position.x + [element.x.from getWithDefaultValue:0]) to:@(view.layer.position.x + [element.x.to getWithDefaultValue:0]) duration:[element.x.duration getWithDefaultValue:1] forView:view animationName:@"element.position.x"];
+	[self animationWithKeyPath:@"position.y" from:@(view.layer.position.y + [element.y.from getWithDefaultValue:0]) to:@(view.layer.position.y + [element.y.to getWithDefaultValue:0]) duration:[element.y.duration getWithDefaultValue:1] forView:view animationName:[NSString stringWithFormat:@"%@.position.y", elementName]];
+	[self animationWithKeyPath:@"opacity" from:@([element.alpha.from getWithDefaultValue:1]) to:@([element.alpha.to getWithDefaultValue:1]) duration:[element.alpha.duration getWithDefaultValue:1] forView:view animationName:[NSString stringWithFormat:@"%@.alpha", elementName]];
+}
 
 @end

lib/ios/RNNRootViewController.m

@@ -4,7 +4,7 @@
 #import "RNNPushAnimation.h"
 #import "RNNReactView.h"
 #import "RNNParentProtocol.h"
-
+#import "RNNAnimationsTransitionDelegate.h"
 
 @implementation RNNRootViewController
 
@@ -172,9 +172,9 @@
 	if (self.animator) {
 		return self.animator;
 	} else if (operation == UINavigationControllerOperationPush && self.resolveOptions.animations.push.hasCustomAnimation) {
-		return [[RNNPushAnimation alloc] initWithScreenTransition:self.resolveOptions.animations.push];
+		return [[RNNAnimationsTransitionDelegate alloc] initWithScreenTransition:self.resolveOptions.animations.push isDismiss:NO];
 	} else if (operation == UINavigationControllerOperationPop && self.resolveOptions.animations.pop.hasCustomAnimation) {
-		return [[RNNPushAnimation alloc] initWithScreenTransition:self.resolveOptions.animations.pop];
+		return [[RNNAnimationsTransitionDelegate alloc] initWithScreenTransition:self.resolveOptions.animations.pop isDismiss:YES];
 	} else {
 		return nil;
 	}
@@ -182,19 +182,10 @@
 	return nil;
 }
 
-- (nullable id <UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.resolveOptions.animations.showModal isDismiss:NO];
-}
-
-- (id<UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed {
-	return [[RNNModalAnimation alloc] initWithScreenTransition:self.resolveOptions.animations.dismissModal isDismiss:YES];
-}
-
 - (UIViewController *)previewingContext:(id<UIViewControllerPreviewing>)previewingContext viewControllerForLocation:(CGPoint)location{
 	return self.previewController;
 }
 
-
 - (void)previewingContext:(id<UIViewControllerPreviewing>)previewingContext commitViewController:(UIViewController *)viewControllerToCommit {
 	if (self.previewCallback) {
 		self.previewCallback(self);

lib/ios/RNNScreenTransition.h

@@ -1,15 +1,16 @@
 #import "RNNOptions.h"
-#import "RNNTransitionStateHolder.h"
+#import "RNNElementTransitionOptions.h"
 
 @interface RNNScreenTransition : RNNOptions
 
-@property (nonatomic, strong) RNNTransitionStateHolder* topBar;
-@property (nonatomic, strong) RNNTransitionStateHolder* content;
-@property (nonatomic, strong) RNNTransitionStateHolder* bottomTabs;
+@property (nonatomic, strong) RNNElementTransitionOptions* topBar;
+@property (nonatomic, strong) RNNElementTransitionOptions* content;
+@property (nonatomic, strong) RNNElementTransitionOptions* bottomTabs;
 
 @property (nonatomic, strong) Bool* enable;
 @property (nonatomic, strong) Bool* waitForRender;
 
 - (BOOL)hasCustomAnimation;
+- (double)maxDuration;
 
 @end

lib/ios/RNNScreenTransition.m

@@ -5,9 +5,9 @@
 - (instancetype)initWithDict:(NSDictionary *)dict {
 	self = [super init];
 
-	self.topBar = dict[@"topBar"] ? [[RNNTransitionStateHolder alloc] initWithDict:dict[@"topBar"]] : nil;
-	self.content = dict[@"content"] ? [[RNNTransitionStateHolder alloc] initWithDict:dict[@"content"]] : nil;
-	self.bottomTabs = dict[@"bottomTabs"] ? [[RNNTransitionStateHolder alloc] initWithDict:dict[@"bottomTabs"]] : nil;
+	self.topBar = [[RNNElementTransitionOptions alloc] initWithDict:dict[@"topBar"]];
+	self.content = [[RNNElementTransitionOptions alloc] initWithDict:dict[@"content"]];
+	self.bottomTabs = [[RNNElementTransitionOptions alloc] initWithDict:dict[@"bottomTabs"]];
 	self.enable = [BoolParser parse:dict key:@"enabled"];
 	self.waitForRender = [BoolParser parse:dict key:@"waitForRender"];
 
@@ -15,7 +15,22 @@
 }
 
 - (BOOL)hasCustomAnimation {
-	return (self.topBar || self.content || self.bottomTabs);
+	return (self.topBar.hasAnimation || self.content.hasAnimation || self.bottomTabs.hasAnimation);
+}
+
+- (double)maxDuration {
+	double maxDuration = 0;
+	if ([self.topBar maxDuration] > 0) {
+		maxDuration = [self.topBar maxDuration];
+	}
+	if ([self.content maxDuration] > 0) {
+		maxDuration = [self.content maxDuration];
+	}
+	if ([self.bottomTabs maxDuration] > 0) {
+		maxDuration = [self.bottomTabs maxDuration];
+	}
+	
+	return maxDuration;
 }
 
 @end

lib/ios/RNNAnimationOptions.h → lib/ios/RNNSharedElementAnimationOptions.h

@@ -1,6 +1,6 @@
 #import "RNNOptions.h"
 
-@interface RNNAnimationOptions : RNNOptions
+@interface RNNSharedElementAnimationOptions : RNNOptions
 
 @property (nonatomic, strong) NSArray* animations;
 @property (nonatomic, strong) NSNumber* duration;

lib/ios/RNNAnimationOptions.m → lib/ios/RNNSharedElementAnimationOptions.m

@@ -1,10 +1,10 @@
-#import "RNNAnimationOptions.h"
+#import "RNNSharedElementAnimationOptions.h"
 
 #define DEFAULT_DURATION @(0.7)
 #define DEFAULT_SPRING_VELOCITY @(0.8)
 #define DEFAULT_SPRING_DAMPING @(0.85)
 
-@implementation RNNAnimationOptions
+@implementation RNNSharedElementAnimationOptions
 
 - (instancetype)initWithDict:(NSDictionary *)dict {
 	self = [super init];

lib/ios/RNNTransitionsOptions.m

@@ -1,6 +1,6 @@
-#import "RNNTransitionsOptions.h"
+#import "RNNAnimationsOptions.h"
 
-@implementation RNNTransitionsOptions
+@implementation RNNAnimationsOptions
 
 - (instancetype)initWithDict:(NSDictionary *)dict {
 	self = [super init];

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -136,8 +136,8 @@
 		50415CBB20553B8E00BB682E /* RNNScreenTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = 50415CB920553B8E00BB682E /* RNNScreenTransition.m */; };
 		50451D052042DAEB00695F00 /* RNNPushAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 50451D032042DAEB00695F00 /* RNNPushAnimation.h */; };
 		50451D062042DAEB00695F00 /* RNNPushAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 50451D042042DAEB00695F00 /* RNNPushAnimation.m */; };
-		50451D092042E20600695F00 /* RNNTransitionsOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50451D072042E20600695F00 /* RNNTransitionsOptions.h */; };
-		50451D0A2042E20600695F00 /* RNNTransitionsOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50451D082042E20600695F00 /* RNNTransitionsOptions.m */; };
+		50451D092042E20600695F00 /* RNNAnimationsOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50451D072042E20600695F00 /* RNNAnimationsOptions.h */; };
+		50451D0A2042E20600695F00 /* RNNAnimationsOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50451D082042E20600695F00 /* RNNAnimationsOptions.m */; };
 		50451D0D2042F70900695F00 /* RNNTransition.h in Headers */ = {isa = PBXBuildFile; fileRef = 50451D0B2042F70900695F00 /* RNNTransition.h */; };
 		50451D0E2042F70900695F00 /* RNNTransition.m in Sources */ = {isa = PBXBuildFile; fileRef = 50451D0C2042F70900695F00 /* RNNTransition.m */; };
 		504753782109C13C00FFFBE6 /* RNNOverlayManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 504753772109C13C00FFFBE6 /* RNNOverlayManagerTest.m */; };
@@ -195,10 +195,8 @@
 		506F630F216A5AD700AD0D0A /* RNNViewControllerPresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 506F630E216A5AD700AD0D0A /* RNNViewControllerPresenterTest.m */; };
 		50706E6D20CE7CA5003345C3 /* UIImage+tint.h in Headers */ = {isa = PBXBuildFile; fileRef = 50706E6B20CE7CA5003345C3 /* UIImage+tint.h */; };
 		50706E6E20CE7CA5003345C3 /* UIImage+tint.m in Sources */ = {isa = PBXBuildFile; fileRef = 50706E6C20CE7CA5003345C3 /* UIImage+tint.m */; };
-		50762D08205E96C200E3D18A /* RNNModalAnimation.h in Headers */ = {isa = PBXBuildFile; fileRef = 50762D06205E96C200E3D18A /* RNNModalAnimation.h */; };
-		50762D09205E96C200E3D18A /* RNNModalAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = 50762D07205E96C200E3D18A /* RNNModalAnimation.m */; };
-		507E7D57201DDD3000444E6C /* RNNAnimationOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 507E7D55201DDD3000444E6C /* RNNAnimationOptions.h */; };
-		507E7D58201DDD3000444E6C /* RNNAnimationOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 507E7D56201DDD3000444E6C /* RNNAnimationOptions.m */; };
+		507E7D57201DDD3000444E6C /* RNNSharedElementAnimationOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 507E7D55201DDD3000444E6C /* RNNSharedElementAnimationOptions.h */; };
+		507E7D58201DDD3000444E6C /* RNNSharedElementAnimationOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 507E7D56201DDD3000444E6C /* RNNSharedElementAnimationOptions.m */; };
 		507F43C51FF4F17C00D9425B /* RNNTopTabsViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F43C31FF4F17C00D9425B /* RNNTopTabsViewController.h */; };
 		507F43C61FF4F17C00D9425B /* RNNTopTabsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 507F43C41FF4F17C00D9425B /* RNNTopTabsViewController.m */; };
 		507F43C91FF4F9CC00D9425B /* RNNTopTabOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F43C71FF4F9CC00D9425B /* RNNTopTabOptions.h */; };
@@ -232,6 +230,12 @@
 		50E02BD921A6EE0F00A43942 /* SideMenuOpenMode.m in Sources */ = {isa = PBXBuildFile; fileRef = 50E02BD721A6EE0F00A43942 /* SideMenuOpenMode.m */; };
 		50E02BDC21A6EE7900A43942 /* SideMenuOpenGestureModeParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 50E02BDA21A6EE7900A43942 /* SideMenuOpenGestureModeParser.m */; };
 		50E02BDD21A6EE7900A43942 /* SideMenuOpenGestureModeParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E02BDB21A6EE7900A43942 /* SideMenuOpenGestureModeParser.h */; };
+		50E5F78D223F9FAF002AFEAD /* RNNElementTransitionOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E5F78B223F9FAF002AFEAD /* RNNElementTransitionOptions.h */; };
+		50E5F78E223F9FAF002AFEAD /* RNNElementTransitionOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50E5F78C223F9FAF002AFEAD /* RNNElementTransitionOptions.m */; };
+		50E5F791223FA04C002AFEAD /* RNNAnimationConfigurationOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E5F78F223FA04C002AFEAD /* RNNAnimationConfigurationOptions.h */; };
+		50E5F792223FA04C002AFEAD /* RNNAnimationConfigurationOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50E5F790223FA04C002AFEAD /* RNNAnimationConfigurationOptions.m */; };
+		50E5F7952240EBD6002AFEAD /* RNNAnimationsTransitionDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 50E5F7932240EBD6002AFEAD /* RNNAnimationsTransitionDelegate.h */; };
+		50E5F7962240EBD6002AFEAD /* RNNAnimationsTransitionDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 50E5F7942240EBD6002AFEAD /* RNNAnimationsTransitionDelegate.m */; };
 		50EB4ED72068EBE000D6ED34 /* RNNBackgroundOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50EB4ED52068EBE000D6ED34 /* RNNBackgroundOptions.h */; };
 		50EB4ED82068EBE000D6ED34 /* RNNBackgroundOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50EB4ED62068EBE000D6ED34 /* RNNBackgroundOptions.m */; };
 		50EB93421FE14A3E00BD8EEE /* RNNBottomTabOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50EB93401FE14A3E00BD8EEE /* RNNBottomTabOptions.m */; };
@@ -471,8 +475,8 @@
 		50415CB920553B8E00BB682E /* RNNScreenTransition.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNScreenTransition.m; sourceTree = "<group>"; };
 		50451D032042DAEB00695F00 /* RNNPushAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNPushAnimation.h; sourceTree = "<group>"; };
 		50451D042042DAEB00695F00 /* RNNPushAnimation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNPushAnimation.m; sourceTree = "<group>"; };
-		50451D072042E20600695F00 /* RNNTransitionsOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTransitionsOptions.h; sourceTree = "<group>"; };
-		50451D082042E20600695F00 /* RNNTransitionsOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTransitionsOptions.m; sourceTree = "<group>"; };
+		50451D072042E20600695F00 /* RNNAnimationsOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNAnimationsOptions.h; sourceTree = "<group>"; };
+		50451D082042E20600695F00 /* RNNAnimationsOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNAnimationsOptions.m; sourceTree = "<group>"; };
 		50451D0B2042F70900695F00 /* RNNTransition.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTransition.h; sourceTree = "<group>"; };
 		50451D0C2042F70900695F00 /* RNNTransition.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTransition.m; sourceTree = "<group>"; };
 		504753772109C13C00FFFBE6 /* RNNOverlayManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNOverlayManagerTest.m; sourceTree = "<group>"; };
@@ -528,10 +532,8 @@
 		506F630E216A5AD700AD0D0A /* RNNViewControllerPresenterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNViewControllerPresenterTest.m; sourceTree = "<group>"; };
 		50706E6B20CE7CA5003345C3 /* UIImage+tint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIImage+tint.h"; sourceTree = "<group>"; };
 		50706E6C20CE7CA5003345C3 /* UIImage+tint.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UIImage+tint.m"; sourceTree = "<group>"; };
-		50762D06205E96C200E3D18A /* RNNModalAnimation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNModalAnimation.h; sourceTree = "<group>"; };
-		50762D07205E96C200E3D18A /* RNNModalAnimation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNModalAnimation.m; sourceTree = "<group>"; };
-		507E7D55201DDD3000444E6C /* RNNAnimationOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNAnimationOptions.h; sourceTree = "<group>"; };
-		507E7D56201DDD3000444E6C /* RNNAnimationOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNAnimationOptions.m; sourceTree = "<group>"; };
+		507E7D55201DDD3000444E6C /* RNNSharedElementAnimationOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSharedElementAnimationOptions.h; sourceTree = "<group>"; };
+		507E7D56201DDD3000444E6C /* RNNSharedElementAnimationOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSharedElementAnimationOptions.m; sourceTree = "<group>"; };
 		507F43C31FF4F17C00D9425B /* RNNTopTabsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTopTabsViewController.h; sourceTree = "<group>"; };
 		507F43C41FF4F17C00D9425B /* RNNTopTabsViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTopTabsViewController.m; sourceTree = "<group>"; };
 		507F43C71FF4F9CC00D9425B /* RNNTopTabOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTopTabOptions.h; sourceTree = "<group>"; };
@@ -564,6 +566,12 @@
 		50E02BD721A6EE0F00A43942 /* SideMenuOpenMode.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SideMenuOpenMode.m; sourceTree = "<group>"; };
 		50E02BDA21A6EE7900A43942 /* SideMenuOpenGestureModeParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SideMenuOpenGestureModeParser.m; sourceTree = "<group>"; };
 		50E02BDB21A6EE7900A43942 /* SideMenuOpenGestureModeParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SideMenuOpenGestureModeParser.h; sourceTree = "<group>"; };
+		50E5F78B223F9FAF002AFEAD /* RNNElementTransitionOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNElementTransitionOptions.h; sourceTree = "<group>"; };
+		50E5F78C223F9FAF002AFEAD /* RNNElementTransitionOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNElementTransitionOptions.m; sourceTree = "<group>"; };
+		50E5F78F223FA04C002AFEAD /* RNNAnimationConfigurationOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNAnimationConfigurationOptions.h; sourceTree = "<group>"; };
+		50E5F790223FA04C002AFEAD /* RNNAnimationConfigurationOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNAnimationConfigurationOptions.m; sourceTree = "<group>"; };
+		50E5F7932240EBD6002AFEAD /* RNNAnimationsTransitionDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNAnimationsTransitionDelegate.h; sourceTree = "<group>"; };
+		50E5F7942240EBD6002AFEAD /* RNNAnimationsTransitionDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNAnimationsTransitionDelegate.m; sourceTree = "<group>"; };
 		50EB4ED52068EBE000D6ED34 /* RNNBackgroundOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBackgroundOptions.h; sourceTree = "<group>"; };
 		50EB4ED62068EBE000D6ED34 /* RNNBackgroundOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNBackgroundOptions.m; sourceTree = "<group>"; };
 		50EB933F1FE14A3E00BD8EEE /* RNNBottomTabOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNBottomTabOptions.h; sourceTree = "<group>"; };
@@ -915,6 +923,10 @@
 				50570B252061473D006A1B5C /* RNNTitleOptions.m */,
 				50C4A494206BDDBB00DB292E /* RNNSubtitleOptions.h */,
 				50C4A495206BDDBB00DB292E /* RNNSubtitleOptions.m */,
+				50E5F78B223F9FAF002AFEAD /* RNNElementTransitionOptions.h */,
+				50E5F78C223F9FAF002AFEAD /* RNNElementTransitionOptions.m */,
+				50E5F78F223FA04C002AFEAD /* RNNAnimationConfigurationOptions.h */,
+				50E5F790223FA04C002AFEAD /* RNNAnimationConfigurationOptions.m */,
 				5048862B20BE976D000908DE /* RNNLayoutOptions.h */,
 				5048862C20BE976D000908DE /* RNNLayoutOptions.m */,
 				50BE951120B5A787004F5DF5 /* RNNStatusBarOptions.h */,
@@ -935,12 +947,12 @@
 				5064495C20DC62B90026709C /* RNNSideMenuSideOptions.m */,
 				50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */,
 				50A00C36200F84D6000F01A6 /* RNNOverlayOptions.m */,
-				507E7D55201DDD3000444E6C /* RNNAnimationOptions.h */,
-				507E7D56201DDD3000444E6C /* RNNAnimationOptions.m */,
+				507E7D55201DDD3000444E6C /* RNNSharedElementAnimationOptions.h */,
+				507E7D56201DDD3000444E6C /* RNNSharedElementAnimationOptions.m */,
 				E8E5182C1F83A48B000467AC /* RNNTransitionStateHolder.h */,
 				E8E5182D1F83A48B000467AC /* RNNTransitionStateHolder.m */,
-				50451D072042E20600695F00 /* RNNTransitionsOptions.h */,
-				50451D082042E20600695F00 /* RNNTransitionsOptions.m */,
+				50451D072042E20600695F00 /* RNNAnimationsOptions.h */,
+				50451D082042E20600695F00 /* RNNAnimationsOptions.m */,
 				50415CB820553B8E00BB682E /* RNNScreenTransition.h */,
 				50415CB920553B8E00BB682E /* RNNScreenTransition.m */,
 				E33AC20620B5C49E0090DB8A /* RNNSplitViewOptions.h */,
@@ -1168,8 +1180,8 @@
 				E8DA243F1F97459B00CD552B /* RNNElementFinder.m */,
 				50451D032042DAEB00695F00 /* RNNPushAnimation.h */,
 				50451D042042DAEB00695F00 /* RNNPushAnimation.m */,
-				50762D06205E96C200E3D18A /* RNNModalAnimation.h */,
-				50762D07205E96C200E3D18A /* RNNModalAnimation.m */,
+				50E5F7932240EBD6002AFEAD /* RNNAnimationsTransitionDelegate.h */,
+				50E5F7942240EBD6002AFEAD /* RNNAnimationsTransitionDelegate.m */,
 			);
 			name = Animations;
 			sourceTree = "<group>";
@@ -1231,6 +1243,7 @@
 				50E02BDD21A6EE7900A43942 /* SideMenuOpenGestureModeParser.h in Headers */,
 				263905BD1E4C6F440023D7D3 /* RCCDrawerProtocol.h in Headers */,
 				5038A3B5216DF602009280BC /* UINavigationController+RNNOptions.h in Headers */,
+				50E5F78D223F9FAF002AFEAD /* RNNElementTransitionOptions.h in Headers */,
 				5038A3C1216E1E66009280BC /* RNNFontAttributesCreator.h in Headers */,
 				5016E8EF20209690009D4F7C /* RNNCustomTitleView.h in Headers */,
 				50415CBA20553B8E00BB682E /* RNNScreenTransition.h in Headers */,
@@ -1267,6 +1280,7 @@
 				263905BE1E4C6F440023D7D3 /* RCCTheSideBarManagerViewController.h in Headers */,
 				263905CE1E4C6F440023D7D3 /* TheSidebarController.h in Headers */,
 				50D031342005149000386B3D /* RNNOverlayManager.h in Headers */,
+				50E5F7952240EBD6002AFEAD /* RNNAnimationsTransitionDelegate.h in Headers */,
 				7B1126A71E2D2B6C00F9B03B /* RNNEventEmitter.h in Headers */,
 				E8A430111F9CB87B00B61A20 /* RNNAnimatedView.h in Headers */,
 				506317AA220B547400B26FC3 /* UIImage+insets.h in Headers */,
@@ -1278,6 +1292,7 @@
 				268692821E5054F800E2C612 /* RNNStore.h in Headers */,
 				E8AEDB3C1F55A1C2000F5A6A /* RNNElementView.h in Headers */,
 				E8E518321F83B3E0000467AC /* RNNUtils.h in Headers */,
+				50E5F791223FA04C002AFEAD /* RNNAnimationConfigurationOptions.h in Headers */,
 				5049594E216F6277006D2B81 /* NumberParser.h in Headers */,
 				50BE951320B5A787004F5DF5 /* RNNStatusBarOptions.h in Headers */,
 				507F44201FFA8A8800D9425B /* RNNParentProtocol.h in Headers */,
@@ -1285,12 +1300,11 @@
 				263905CA1E4C6F440023D7D3 /* SidebarLuvocracyAnimation.h in Headers */,
 				50495956216F6B3D006D2B81 /* DictionaryParser.h in Headers */,
 				4534E72520CB6724009F8185 /* RNNLargeTitleOptions.h in Headers */,
-				50762D08205E96C200E3D18A /* RNNModalAnimation.h in Headers */,
 				390AD477200F499D00A8250D /* RNNSwizzles.h in Headers */,
 				263905B11E4C6F440023D7D3 /* MMDrawerController.h in Headers */,
 				263905B91E4C6F440023D7D3 /* RCCDrawerController.h in Headers */,
 				263905B31E4C6F440023D7D3 /* MMDrawerVisualState.h in Headers */,
-				50451D092042E20600695F00 /* RNNTransitionsOptions.h in Headers */,
+				50451D092042E20600695F00 /* RNNAnimationsOptions.h in Headers */,
 				5048862D20BE976D000908DE /* RNNLayoutOptions.h in Headers */,
 				5038A374216CDDB6009280BC /* UIViewController+SideMenuController.h in Headers */,
 				E8A5CD621F49114F00E89D0D /* RNNElement.h in Headers */,
@@ -1306,7 +1320,7 @@
 				5039558F217482FE00B0A663 /* NullIntNumber.h in Headers */,
 				5038A3CA216E328A009280BC /* Param.h in Headers */,
 				50887CAA20F26BFE00D06111 /* RNNOverlayWindow.h in Headers */,
-				507E7D57201DDD3000444E6C /* RNNAnimationOptions.h in Headers */,
+				507E7D57201DDD3000444E6C /* RNNSharedElementAnimationOptions.h in Headers */,
 				5053CE7F2175FB1900D0386B /* RNNDefaultOptionsHelper.h in Headers */,
 				2DCD9195200014A900EDC75D /* RNNBridgeManager.h in Headers */,
 				7B1126A91E2D2B6C00F9B03B /* RNNControllerFactory.h in Headers */,
@@ -1456,6 +1470,7 @@
 				263905B41E4C6F440023D7D3 /* MMDrawerVisualState.m in Sources */,
 				5012240B21735959000F5F98 /* RNNSideMenuPresenter.m in Sources */,
 				502CB46F20CD1DDA0019B2FE /* RNNBackButtonOptions.m in Sources */,
+				50E5F78E223F9FAF002AFEAD /* RNNElementTransitionOptions.m in Sources */,
 				7365071221E4B16F004E020F /* RCTConvert+UIBarButtonSystemItem.m in Sources */,
 				5012241B21736678000F5F98 /* Image.m in Sources */,
 				50495943216F5E5D006D2B81 /* NullBool.m in Sources */,
@@ -1491,6 +1506,7 @@
 				390AD478200F499D00A8250D /* RNNSwizzles.m in Sources */,
 				50E02BD921A6EE0F00A43942 /* SideMenuOpenMode.m in Sources */,
 				7BA500751E2544B9001B9E1B /* ReactNativeNavigation.m in Sources */,
+				50E5F7962240EBD6002AFEAD /* RNNAnimationsTransitionDelegate.m in Sources */,
 				5038A3BA216DFCFD009280BC /* UITabBarController+RNNOptions.m in Sources */,
 				263905B21E4C6F440023D7D3 /* MMDrawerController.m in Sources */,
 				50644A2120E11A720026709C /* Constants.m in Sources */,
@@ -1525,7 +1541,7 @@
 				C2A57A1D21E815F80066711C /* InteractivePopGestureDelegate.m in Sources */,
 				263905BC1E4C6F440023D7D3 /* RCCDrawerHelper.m in Sources */,
 				4534E72620CB6724009F8185 /* RNNLargeTitleOptions.m in Sources */,
-				507E7D58201DDD3000444E6C /* RNNAnimationOptions.m in Sources */,
+				507E7D58201DDD3000444E6C /* RNNSharedElementAnimationOptions.m in Sources */,
 				2145452A1F4DC85F006E8DA1 /* RCTHelpers.m in Sources */,
 				2DCD9196200014A900EDC75D /* RNNBridgeManager.m in Sources */,
 				263905C11E4C6F440023D7D3 /* SidebarAirbnbAnimation.m in Sources */,
@@ -1546,16 +1562,16 @@
 				E8A430121F9CB87B00B61A20 /* RNNAnimatedView.m in Sources */,
 				507F43F51FF4FCFE00D9425B /* HMSegmentedControl.m in Sources */,
 				5012242321736883000F5F98 /* NullColor.m in Sources */,
-				50451D0A2042E20600695F00 /* RNNTransitionsOptions.m in Sources */,
+				50451D0A2042E20600695F00 /* RNNAnimationsOptions.m in Sources */,
 				5039558C2174829400B0A663 /* IntNumberParser.m in Sources */,
 				507F43C61FF4F17C00D9425B /* RNNTopTabsViewController.m in Sources */,
 				50706E6E20CE7CA5003345C3 /* UIImage+tint.m in Sources */,
 				501224072173592D000F5F98 /* RNNTabBarPresenter.m in Sources */,
 				50A00C38200F84D6000F01A6 /* RNNOverlayOptions.m in Sources */,
-				50762D09205E96C200E3D18A /* RNNModalAnimation.m in Sources */,
 				5039559C2174867000B0A663 /* DoubleParser.m in Sources */,
 				5049593F216F5D73006D2B81 /* BoolParser.m in Sources */,
 				50EB93421FE14A3E00BD8EEE /* RNNBottomTabOptions.m in Sources */,
+				50E5F792223FA04C002AFEAD /* RNNAnimationConfigurationOptions.m in Sources */,
 				5049595B216F6B46006D2B81 /* NullDictionary.m in Sources */,
 				5038A3BE216E1490009280BC /* RNNTabBarItemCreator.m in Sources */,
 				E8367B811F7A8A4700675C05 /* VICMAImageView.m in Sources */,