waitForRender animation options

lib/ios/RNNCommandsHandler.m

@@ -128,8 +128,8 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 			[rootVc registerForPreviewingWithDelegate:(id)rootVc sourceView:elementView];
 		}
 	} else {
-		[newVc onReactViewReady:^{
-			id animationDelegate = (newVc.options.animations.push.hasCustomAnimation || newVc.isCustomTransitioned) ? newVc : nil;
+		id animationDelegate = (newVc.options.animations.push.hasCustomAnimation || newVc.isCustomTransitioned) ? newVc : nil;
+		[newVc waitForReactViewRender:newVc.options.animations.push.waitForRender perform:^{
 			[_stackManager push:newVc onTop:fromVC animated:newVc.options.animations.push.enable animationDelegate:animationDelegate completion:^{
 				[_eventEmitter sendOnNavigationCommandCompletion:push params:@{@"componentId": componentId}];
 				completion();

lib/ios/RNNModalManager.m

@@ -12,21 +12,15 @@
 	_store = store;
 	return self;
 }
--(void)waitForContentToAppearAndThen:(SEL)nameOfSelector {
-	[[NSNotificationCenter defaultCenter] addObserver:self
-											 selector:nameOfSelector
-												 name: @"RCTContentDidAppearNotification"
-											   object:nil];
-}
 
 -(void)showModalAfterLoad:(NSDictionary*)notif {
-	[[NSNotificationCenter defaultCenter] removeObserver:self name:@"RCTContentDidAppearNotification" object:nil];
 	RNNRootViewController *topVC = (RNNRootViewController*)[self topPresentedVC];
 	topVC.definesPresentationContext = YES;
 	
 	if (topVC.options.animations.showModal.hasCustomAnimation) {
 		self.toVC.transitioningDelegate = topVC;
 	}
+	
 	[topVC presentViewController:self.toVC animated:self.toVC.options.animations.showModal.enable completion:^{
 		if (_completionBlock) {
 			_completionBlock();
@@ -49,7 +43,9 @@
     ) {
 		[self showModalAfterLoad:nil];
 	} else {
-		[self waitForContentToAppearAndThen:@selector(showModalAfterLoad:)];
+		[self.toVC waitForReactViewRender:self.toVC.options.animations.showModal.waitForRender perform:^{
+			[self showModalAfterLoad:nil];
+		}];
 	}
 }
 

lib/ios/RNNNavigationController.m

@@ -36,6 +36,10 @@
 	[self.getTopViewController applyModalOptions];
 }
 
+- (UIViewController *)popViewControllerAnimated:(BOOL)animated {
+	return [super popViewControllerAnimated:animated];
+}
+
 - (NSString *)componentId {
 	return _componentId ? _componentId : self.getTopViewController.componentId;
 }
@@ -52,6 +56,10 @@
 	return self.getTopViewController.options;
 }
 
+- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
+	[self.getTopViewController waitForReactViewRender:wait perform:readyBlock];
+}
+
 - (UIViewController *)childViewControllerForStatusBarStyle {
 	return self.topViewController;
 }

lib/ios/RNNRootViewController.h

@@ -11,8 +11,6 @@
 
 @class RNNRootViewController;
 
-typedef void (^RNNReactViewReadyCompletionBlock)(void);
-
 @interface RNNRootViewController : UIViewController	<RNNRootViewProtocol, UIViewControllerPreviewingDelegate, UISearchResultsUpdating, UISearchBarDelegate>
 
 @property (nonatomic, strong) RNNNavigationOptions* options;
@@ -31,8 +29,6 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 			   eventEmitter:(RNNEventEmitter*)eventEmitter
 		  isExternalComponent:(BOOL)isExternalComponent;
 
-- (void)onReactViewReady:(RNNReactViewReadyCompletionBlock)readyBlock;
-
 -(void)applyTabBarItem;
 -(void)applyTopTabsOptions;
 

lib/ios/RNNRootViewController.m

@@ -91,6 +91,14 @@
 	[[NSNotificationCenter defaultCenter] removeObserver:self name:@"RCTContentDidAppearNotification" object:nil];
 }
 
+- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
+	if (wait) {
+		[self onReactViewReady:readyBlock];
+	} else {
+		readyBlock();
+	}
+}
+
 - (void)onReactViewReady:(RNNReactViewReadyCompletionBlock)readyBlock {
 	if (self.isCustomViewController) {
 		readyBlock();

lib/ios/RNNRootViewProtocol.h

@@ -1,4 +1,5 @@
 #import "RNNNavigationOptions.h"
+typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 @protocol RNNRootViewProtocol <NSObject, UINavigationControllerDelegate, UIViewControllerTransitioningDelegate, UISplitViewControllerDelegate>
 
@@ -13,6 +14,7 @@
 
 @required
 - (NSString *)componentId;
+- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock;
 
 @end
 

lib/ios/RNNScreenTransition.h

@@ -8,6 +8,7 @@
 @property (nonatomic, strong) RNNTransitionStateHolder* bottomTabs;
 
 @property (nonatomic) BOOL enable;
+@property (nonatomic) BOOL waitForRender;
 
 - (BOOL)hasCustomAnimation;
 

lib/ios/RNNScreenTransition.m

@@ -10,6 +10,7 @@
 	self.bottomTabs = dict[@"bottomTabs"] ? [[RNNTransitionStateHolder alloc] initWithDict:dict[@"bottomTabs"]] : nil;
 
 	self.enable = dict[@"enabled"] ? [dict[@"enabled"] boolValue] : YES;
+	self.waitForRender = dict[@"waitForRender"] ? [dict[@"waitForRender"] boolValue] : NO;
 
 	return self;
 }

lib/ios/RNNSideMenuChildVC.m

@@ -35,6 +35,10 @@
 	[self.child mergeOptions:options];
 }
 
+- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
+	[self.child waitForReactViewRender:wait perform:readyBlock];
+}
+
 - (UIStatusBarStyle)preferredStatusBarStyle {
 	return self.child.preferredStatusBarStyle;
 }

lib/ios/RNNSideMenuController.m

@@ -93,6 +93,10 @@
 	[self.center mergeOptions:options];
 }
 
+- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
+	[self.center waitForReactViewRender:wait perform:readyBlock];
+}
+
 - (NSString *)componentId {
 	return _center.componentId;
 }

lib/ios/RNNSplitViewController.m

@@ -33,6 +33,10 @@
 - (void)optionsUpdated {
 }
 
+- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
+	readyBlock();
+}
+
 - (void)mergeOptions:(RNNOptions *)options {
 	[self.options mergeOptions:options];
 }

lib/ios/RNNTabBarController.m

@@ -45,6 +45,10 @@
 	[((UIViewController<RNNRootViewProtocol>*)self.selectedViewController) mergeOptions:options];
 }
 
+- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
+	[((UIViewController<RNNRootViewProtocol>*)self.selectedViewController) waitForReactViewRender:wait perform:readyBlock];
+}
+
 - (RNNNavigationOptions *)options {
 	return [((UIViewController<RNNRootViewProtocol>*)self.selectedViewController) options];
 }

lib/ios/RNNTopTabsViewController.m

@@ -76,4 +76,8 @@
 	return _currentViewController.componentId;
 }
 
+- (void)waitForReactViewRender:(BOOL)wait perform:(RNNReactViewReadyCompletionBlock)readyBlock {
+	[_currentViewController waitForReactViewRender:wait perform:readyBlock];
+}
+
 @end