refactored animated prop

lib/ios/RNNAnimator.m

@@ -33,7 +33,7 @@
 -(NSArray*)prepareSharedElementTransitionWithComponentView:(UIView*)componentView {
 	NSMutableArray* transitions = [NSMutableArray new];
 	for (NSDictionary* transition in self.transitionOptions.animations) {
-		RNNTransitionStateHolder* transitionStateHolder = [[RNNTransitionStateHolder alloc] initWithTransition:transition];
+		RNNTransitionStateHolder* transitionStateHolder = [[RNNTransitionStateHolder alloc] initWithDict:transition];
 		RNNTransition* transition = [[RNNTransition alloc] initFromVC:self.fromVC toVC:self.toVC transitionOptions:transitionStateHolder isBackButton:self.backButton];
 
 		[componentView addSubview:transition.animatedView];

lib/ios/RNNModalManager.m

@@ -22,10 +22,10 @@
 -(void)showModalAfterLoad:(NSDictionary*)notif {
 	[[NSNotificationCenter defaultCenter] removeObserver:self name:@"RCTContentDidAppearNotification" object:nil];
 	RNNRootViewController *topVC = (RNNRootViewController*)[self topPresentedVC];
-	if (topVC.options.animations.showModal) {
+	if (topVC.options.animations.showModal.hasCustomAnimation) {
 		self.toVC.transitioningDelegate = topVC;
 	}
-	[topVC presentViewController:self.toVC animated:self.toVC.isAnimated completion:^{
+	[topVC presentViewController:self.toVC animated:self.toVC.options.animations.showModal.enabled completion:^{
 		if (_completionBlock) {
 			_completionBlock();
 			_completionBlock = nil;
@@ -74,7 +74,7 @@
 	}
 	
 	if (modalToDismiss == topPresentedVC || [[topPresentedVC childViewControllers] containsObject:modalToDismiss]) {
-		[modalToDismiss dismissViewControllerAnimated:modalToDismiss.isAnimated completion:^{
+		[modalToDismiss dismissViewControllerAnimated:modalToDismiss.options.animations.dismissModal.enabled completion:^{
 			[[_store pendingModalIdsToDismiss] removeObject:componentId];
 			[_store removeComponent:componentId];
 			[self removePendingNextModalIfOnTop];

lib/ios/RNNNavigationController.m

@@ -16,11 +16,6 @@
 	return [((UIViewController<RNNRootViewProtocol>*)self.topViewController) isCustomViewController];
 }
 
-- (BOOL)isAnimated {
-	UIViewController<RNNRootViewProtocol>* rootVC = (UIViewController<RNNRootViewProtocol>*) self.topViewController;
-	return rootVC.isAnimated;
-}
-
 - (void)mergeOptions:(NSDictionary *)options {
 	[((UIViewController<RNNRootViewProtocol>*)self.topViewController) mergeOptions:options];
 }

lib/ios/RNNNavigationOptions.h

@@ -26,7 +26,6 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 @property (nonatomic, strong) RNNTransitionsOptions* animations;
 
 
-@property (nonatomic, strong) NSNumber* animated;
 @property (nonatomic, strong) NSNumber* statusBarHidden;
 @property (nonatomic, strong) NSNumber* screenBackgroundColor;
 @property (nonatomic, strong) NSMutableDictionary* originalTopBarImages;

lib/ios/RNNNavigationOptions.m

@@ -33,7 +33,6 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 	self.rootBackgroundImage = [RCTConvert UIImage:[options objectForKey:@"rootBackgroundImage"]];
 	self.bottomTab = [[RNNBottomTabOptions alloc] initWithDict:[options objectForKey:@"bottomTab"]];
 	self.overlay = [[RNNOverlayOptions alloc] initWithDict:[options objectForKey:@"overlay"]];
-	self.animated = [options objectForKey:@"animated"];
 	self.customTransition = [[RNNAnimationOptions alloc] initWithDict:[options objectForKey:@"customTransition"]];
 	self.animations = [[RNNTransitionsOptions alloc] initWithDict:[options objectForKey:@"animations"]];
 

lib/ios/RNNNavigationStackManager.m

@@ -30,7 +30,7 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	self.fromVC = vc;
 	
 	
-	if (self.toVC.options.animations.push || self.toVC.isCustomTransitioned) {
+	if (self.toVC.options.animations.push.hasCustomAnimation || self.toVC.isCustomTransitioned) {
 		vc.navigationController.delegate = newTop;
 	} else {
 		vc.navigationController.delegate = nil;
@@ -57,7 +57,7 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 		}
 	}];
 	
-	[[self.fromVC navigationController] pushViewController:self.toVC animated:self.toVC.isAnimated];
+	[[self.fromVC navigationController] pushViewController:self.toVC animated:self.toVC.options.animations.push.enabled];
 	[CATransaction commit];
 	
 	self.toVC = nil;
@@ -71,35 +71,35 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 	if ([nvc topViewController] == vc) {
 		if (vc.options.animations.pop) {
 			nvc.delegate = vc;
-			[nvc popViewControllerAnimated:vc.isAnimated];
+			[nvc popViewControllerAnimated:vc.options.animations.pop.enabled];
 		} else {
 			nvc.delegate = nil;
-			[nvc popViewControllerAnimated:vc.isAnimated];
+			[nvc popViewControllerAnimated:vc.options.animations.pop.enabled];
 		}
 	} else {
 		NSMutableArray * vcs = nvc.viewControllers.mutableCopy;
 		[vcs removeObject:vc];
-		[nvc setViewControllers:vcs animated:YES];
+		[nvc setViewControllers:vcs animated:vc.options.animations.pop.enabled];
 	}
 	[_store removeComponent:componentId];
 }
 
 -(void)popTo:(NSString*)componentId {
-	UIViewController *vc = [_store findComponentForId:componentId];
+	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
 	
 	if (vc) {
 		UINavigationController *nvc = [vc navigationController];
 		if(nvc) {
-			NSArray *poppedVCs = [nvc popToViewController:vc animated:YES];
+			NSArray *poppedVCs = [nvc popToViewController:vc animated:vc.options.animations.pop.enabled];
 			[self removePopedViewControllers:poppedVCs];
 		}
 	}
 }
 
 -(void)popToRoot:(NSString*)componentId {
-	UIViewController* vc = [_store findComponentForId:componentId];
+	RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
 	UINavigationController* nvc = [vc navigationController];
-	NSArray* poppedVCs = [nvc popToRootViewControllerAnimated:YES];
+	NSArray* poppedVCs = [nvc popToRootViewControllerAnimated:vc.options.animations.pop.enabled];
 	[self removePopedViewControllers:poppedVCs];
 }
 
@@ -113,7 +113,7 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 		}
 	}];
 	
-	[nvc setViewControllers:@[newRoot] animated:[newRoot.options.animated boolValue]];
+	[nvc setViewControllers:@[newRoot] animated:newRoot.options.animations.push.enabled];
 	
 	[CATransaction commit];
 }

lib/ios/RNNRootViewController.m

@@ -5,7 +5,11 @@
 #import "RNNCustomTitleView.h"
 #import "RNNPushAnimation.h"
 
-@interface RNNRootViewController()
+@interface RNNRootViewController() {
+	UIView* _customTitleView;
+	UIView* _customTopBar;
+	UIView* _customTopBarBackground;
+}
 @property (nonatomic, strong) NSString* componentName;
 @property (nonatomic) BOOL _statusBarHidden;
 @property (nonatomic) BOOL isExternalComponent;
@@ -48,10 +52,8 @@
 
 -(void)viewWillAppear:(BOOL)animated{
 	[super viewWillAppear:animated];
-    if (!self._optionsApplied) {
-        [self.options applyOn:self];
-    }
-    self._optionsApplied = true;
+	[self.options applyOn:self];
+	[self optionsUpdated];
 }
 
 -(void)viewDidAppear:(BOOL)animated {
@@ -83,41 +85,47 @@
 }
 
 - (void)setCustomNavigationTitleView {
-	if (self.options.topBar.title.component.name) {
-		RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.options.topBar.title.component];
-
-		RNNCustomTitleView *titleView = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:self.options.topBar.title.component.alignment];
-        reactView.backgroundColor = UIColor.clearColor;
-		titleView.backgroundColor = UIColor.clearColor;
-		self.navigationItem.titleView = titleView;
-	} if ([self.navigationItem.title isKindOfClass:[RNNCustomTitleView class]]) {
-		self.navigationItem.title = nil;
+	if (!_customTitleView) {
+		if (self.options.topBar.title.component.name) {
+			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.options.topBar.title.component];
+			
+			_customTitleView = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:self.options.topBar.title.component.alignment];
+			reactView.backgroundColor = UIColor.clearColor;
+			_customTitleView.backgroundColor = UIColor.clearColor;
+			self.navigationItem.titleView = _customTitleView;
+		} if ([self.navigationItem.title isKindOfClass:[RNNCustomTitleView class]] && !_customTitleView) {
+			self.navigationItem.title = nil;
+		}
 	}
 }
 
 - (void)setCustomNavigationBarView {
-	if (self.options.topBar.component.name) {
-		RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.options.topBar.component];
-
-		RNNCustomTitleView *titleView = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
-		reactView.backgroundColor = UIColor.clearColor;
-		titleView.backgroundColor = UIColor.clearColor;
-		[self.navigationController.navigationBar addSubview:titleView];
-	} else if ([[self.navigationController.navigationBar.subviews lastObject] isKindOfClass:[RNNCustomTitleView class]]) {
-		[[self.navigationController.navigationBar.subviews lastObject] removeFromSuperview];
+	if (!_customTopBar) {
+		if (self.options.topBar.component.name) {
+			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.options.topBar.component];
+			
+			_customTopBar = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
+			reactView.backgroundColor = UIColor.clearColor;
+			_customTopBar.backgroundColor = UIColor.clearColor;
+			[self.navigationController.navigationBar addSubview:_customTopBar];
+		} else if ([[self.navigationController.navigationBar.subviews lastObject] isKindOfClass:[RNNCustomTitleView class]] && !_customTopBar) {
+			[[self.navigationController.navigationBar.subviews lastObject] removeFromSuperview];
+		}
 	}
 }
 
 - (void)setCustomNavigationComponentBackground {
-	if (self.options.topBar.background.component.name) {
-		RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.options.topBar.background.component];
-
-		RNNCustomTitleView *titleView = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
-		[self.navigationController.navigationBar insertSubview:titleView atIndex:1];
-		self.navigationController.navigationBar.clipsToBounds = YES;
-	} else if ([[self.navigationController.navigationBar.subviews objectAtIndex:1] isKindOfClass:[RNNCustomTitleView class]]) {
-		[[self.navigationController.navigationBar.subviews objectAtIndex:1] removeFromSuperview];
-		self.navigationController.navigationBar.clipsToBounds = NO;
+	if (!_customTopBarBackground) {
+		if (self.options.topBar.background.component.name) {
+			RCTRootView *reactView = (RCTRootView*)[_creator createRootViewFromComponentOptions:self.options.topBar.background.component];
+			
+			_customTopBarBackground = [[RNNCustomTitleView alloc] initWithFrame:self.navigationController.navigationBar.bounds subView:reactView alignment:@"fill"];
+			[self.navigationController.navigationBar insertSubview:_customTopBarBackground atIndex:1];
+			self.navigationController.navigationBar.clipsToBounds = YES;
+		} else if ([[self.navigationController.navigationBar.subviews objectAtIndex:1] isKindOfClass:[RNNCustomTitleView class]]) {
+			[[self.navigationController.navigationBar.subviews objectAtIndex:1] removeFromSuperview];
+			self.navigationController.navigationBar.clipsToBounds = NO;
+		}
 	}
 }
 
@@ -125,10 +133,6 @@
 	return self.options.customTransition.animations != nil;
 }
 
-- (BOOL)isAnimated {
-	return self.options.animated ? [self.options.animated boolValue] : YES;
-}
-
 - (BOOL)isCustomViewController {
 	return self.isExternalComponent;
 }
@@ -176,9 +180,9 @@
 {
 	if (self.animator) {
 		return self.animator;
-	} else if (operation == UINavigationControllerOperationPush && self.options.animations.push) {
+	} else if (operation == UINavigationControllerOperationPush && self.options.animations.push.hasCustomAnimation) {
 		return [[RNNPushAnimation alloc] initWithScreenTransition:self.options.animations.push];
-	} else if (operation == UINavigationControllerOperationPop && self.options.animations.pop) {
+	} else if (operation == UINavigationControllerOperationPop && self.options.animations.pop.hasCustomAnimation) {
 		return [[RNNPushAnimation alloc] initWithScreenTransition:self.options.animations.pop];
 	} else {
 		return nil;

lib/ios/RNNRootViewProtocol.h

@@ -5,12 +5,11 @@
 @optional
 - (void)mergeOptions:(NSDictionary*)options;
 - (BOOL)isCustomViewController;
-- (void)optionsUpdated;
 - (void)performOnRotation:(void (^)(void))block;
+- (void)optionsUpdated;
 
 @required
 - (BOOL)isCustomTransitioned;
-- (BOOL)isAnimated;
 - (RNNNavigationOptions*)options;
 - (NSString *)componentId;
 

lib/ios/RNNScreenTransition.h

@@ -7,4 +7,8 @@
 @property (nonatomic, strong) RNNTransitionStateHolder* content;
 @property (nonatomic, strong) RNNTransitionStateHolder* bottomTabs;
 
+@property (nonatomic) BOOL enabled;
+
+- (BOOL)hasCustomAnimation;
+
 @end

lib/ios/RNNScreenTransition.m

@@ -4,11 +4,18 @@
 
 - (instancetype)initWithDict:(NSDictionary *)dict {
 	self = [super init];
-	self.topBar = [[RNNTransitionStateHolder alloc] initWithTransition:dict[@"topBar"]];
-	self.content = [[RNNTransitionStateHolder alloc] initWithTransition:dict[@"content"]];
-	self.bottomTabs = [[RNNTransitionStateHolder alloc] initWithTransition:dict[@"bottomTabs"]];
-	
+
+	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.enabled = dict[@"enabled"] ? [dict[@"enabled"] boolValue] : YES;
+
 	return self;
 }
 
+- (BOOL)hasCustomAnimation {
+	return (self.topBar || self.content || self.bottomTabs);
+}
+
 @end

lib/ios/RNNSideMenuChildVC.m

@@ -37,10 +37,6 @@
 	return NO;
 }
 
-- (BOOL)isAnimated {
-	return YES;
-}
-
 - (RNNOptions *)options {
 	return nil;
 }

lib/ios/RNNSideMenuController.m

@@ -76,10 +76,6 @@
 	return NO;
 }
 
-- (BOOL)isAnimated {
-	return YES;
-}
-
 - (RNNOptions *)options {
 	return nil;
 }

lib/ios/RNNTabBarController.m

@@ -37,10 +37,6 @@
 	return NO;
 }
 
-- (BOOL)isAnimated {
-	return YES;
-}
-
 - (RNNOptions *)options {
 	return nil;
 }

lib/ios/RNNTopTabsViewController.m

@@ -76,10 +76,6 @@
 	return NO;
 }
 
-- (BOOL)isAnimated {
-	return YES;
-}
-
 - (RNNOptions *)options {
 	return nil;
 }

lib/ios/RNNTransitionStateHolder.h

@@ -20,8 +20,6 @@
 @property (nonatomic) double endX;
 @property (nonatomic) UIViewAnimationOptions interpolation;
 
-- (instancetype)initWithTransition:(NSDictionary*)transition;
-
 - (void)setupInitialTransitionForView:(UIView *)view;
 
 - (void)completeTransitionForView:(UIView*)view;

lib/ios/RNNTransitionStateHolder.m

@@ -8,7 +8,7 @@
 @end
 @implementation RNNTransitionStateHolder
 
--(instancetype)initWithTransition:(NSDictionary *)transition {
+-(instancetype)initWithDict:(NSDictionary *)transition {
 	self = [super init];
 	
 	self.springDamping = [RNNUtils getDoubleOrKey:transition withKey:@"springDamping" withDefault:0.85];
@@ -31,6 +31,24 @@
 	return self;
 }
 
+- (void)mergeWith:(NSDictionary *)transition {
+	self.springDamping = [RNNUtils getDoubleOrKey:transition withKey:@"springDamping" withDefault:0.85];
+	self.springVelocity = [RNNUtils getDoubleOrKey:transition withKey:@"springVelocity" withDefault:0.8];
+	self.startDelay = [RNNUtils getDoubleOrKey:transition withKey:@"startDelay" withDefault:0];
+	self.duration = [RNNUtils getDoubleOrKey:transition withKey:@"duration" withDefault:1];
+	self.startAlpha = [RNNUtils getDoubleOrKey:transition withKey:@"startAlpha" withDefault:1];
+	self.endAlpha = [RNNUtils getDoubleOrKey:transition withKey:@"endAlpha" withDefault:1];
+	self.interactivePop = [RNNUtils getBoolOrKey:transition withKey:@"interactivePop" withDefault:NO];
+	self.startX = [RNNUtils getDoubleOrKey:transition[@"x"] withKey:@"from" withDefault:0];
+	self.startY = [RNNUtils getDoubleOrKey:transition[@"y"] withKey:@"from" withDefault:0];
+	self.endX = [RNNUtils getDoubleOrKey:transition[@"x"] withKey:@"to" withDefault:0];
+	self.endY = [RNNUtils getDoubleOrKey:transition[@"y"] withKey:@"to" withDefault:0];
+	self.fromId = [transition objectForKey:@"fromId"];
+	self.toId = [transition objectForKey:@"toId"];
+	self.isSharedElementTransition = [[transition objectForKey:@"type"] isEqualToString:@"sharedElement"];
+	self.interpolation = [self animationOptionsFromString:transition[@"interpolation"]];
+}
+
 - (UIViewAnimationOptions)animationOptionsFromString:(NSString*)interpolationString {
 	if ([interpolationString isEqualToString:@"accelerate"]) {
 		return UIViewAnimationOptionCurveEaseIn;

lib/ios/RNNTransitionsOptions.m

@@ -3,18 +3,11 @@
 @implementation RNNTransitionsOptions
 
 - (instancetype)initWithDict:(NSDictionary *)dict {
-	self = [super init];
+	self = [super initWithDict:dict];
 	
 	[self mergeWith:dict];
 	
 	return self;
 }
 
-- (void)mergeWith:(NSDictionary *)otherOptions {
-	self.push = otherOptions[@"push"] ? [[RNNScreenTransition alloc] initWithDict:otherOptions[@"push"]] : _push;
-	self.pop = otherOptions[@"pop"] ? [[RNNScreenTransition alloc] initWithDict:otherOptions[@"pop"]] : _pop;
-	self.showModal = otherOptions[@"showModal"] ? [[RNNScreenTransition alloc] initWithDict:otherOptions[@"showModal"]] : _showModal;
-	self.dismissModal = otherOptions[@"dismissModal"] ? [[RNNScreenTransition alloc] initWithDict:otherOptions[@"dismissModal"]] : _dismissModal;
-}
-
 @end

playground/src/screens/WelcomeScreen.js

@@ -302,7 +302,11 @@ class WelcomeScreen extends Component {
       component: {
         name: 'navigation.playground.OptionsScreen',
         options: {
-          animated: false
+          animations: {
+            push: {
+              enabled: false
+            }
+          }
         }
       }
     });