refactor #824

ios/RNNBridgeModule.m

@@ -4,6 +4,7 @@
 #import "RNNControllerFactory.h"
 #import "RNNReactRootViewCreator.h"
 #import "RNNStore.h"
+#import "RNNModalManager.h"
 
 @implementation RNNBridgeModule
 
@@ -48,46 +49,16 @@ RCT_EXPORT_METHOD(showModal:(NSDictionary*)layout)
 	[self assertReady];
 	RNNControllerFactory *factory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new] store:[RNN instance].store];
 	UIViewController *newVc = [factory createLayoutAndSaveToStore:layout];
-	
-	UIViewController *root = [self topPresentedVC];
-	[root presentViewController:newVc animated:YES completion:^{
-		
-	}];
+	[[[RNNModalManager alloc] initWithStore:[RNN instance].store] showModal:newVc];
 }
 
 RCT_EXPORT_METHOD(dismissModal:(NSString*)containerId)
 {
-	UIViewController *modalToDismiss = [[RNN instance].store findContainerForId:containerId];
-	
-	if (modalToDismiss) {
-		UIViewController *topVC = [self topPresentedVC];
-		
-		if (modalToDismiss == topVC) {
-			[modalToDismiss dismissViewControllerAnimated:YES completion:^{
-				[self removeNextModal];
-
-			}];
-		}
-		else {
-			[[RNN instance].store.modalsToDismissArray addObject:containerId];
-		}
-	}
+	[self assertReady];
+	[[[RNNModalManager alloc] initWithStore:[RNN instance].store] dismissModal:containerId];
 }
 
--(void)removeNextModal {
-	NSString *nextContainerId = [[RNN instance].store.modalsToDismissArray lastObject];
-	UIViewController *vc = [[RNN instance].store findContainerForId:nextContainerId];
-	
-	if (vc) {
-		UIViewController *topVC = [self topPresentedVC];
-		if (vc == topVC) {
-			[vc dismissViewControllerAnimated:YES completion:^{
-				[[RNN instance].store.modalsToDismissArray removeObject:nextContainerId];
-				[self removeNextModal];
-			}];
-		}
-	}
-}
+
 
 - (void)assertReady
 {
@@ -96,13 +67,9 @@ RCT_EXPORT_METHOD(dismissModal:(NSString*)containerId)
 	}
 }
 
--(UIViewController*)topPresentedVC {
-	UIViewController *root = UIApplication.sharedApplication.delegate.window.rootViewController;
-	while(root.presentedViewController) {
-		root = root.presentedViewController;
-	}
-	return root;
-}
+
+
+
 
 @end
 

ios/RNNModalManager.h

@@ -0,0 +1,13 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import "RNNStore.h"
+
+@interface RNNModalManager : NSObject
+
+-(instancetype)initWithStore:(RNNStore*)store;
+
+
+-(void)showModal:(UIViewController*)viewController;
+-(void)dismissModal:(NSString*)containerId;
+
+@end

ios/RNNModalManager.m

@@ -0,0 +1,56 @@
+#import "RNNModalManager.h"
+
+@interface RNNModalManager ()
+
+@property RNNStore *store;
+
+@end
+
+@implementation RNNModalManager
+
+
+-(instancetype)initWithStore:(RNNStore*)store {
+	self = [super init];
+	self.store = store;
+	return self;
+}
+
+-(void)showModal:(UIViewController *)viewController {
+	UIViewController *topVC = [self topPresentedVC];
+	[topVC presentViewController:viewController animated:YES completion:nil];
+}
+
+-(void)dismissModal:(NSString *)containerId {
+	[self.store.modalsToDismissArray addObject:containerId];
+	[self removePendingNextModalIfOnTop];
+}
+
+#pragma mark - private
+
+-(void)removePendingNextModalIfOnTop {
+	NSString *containerId = [self.store.modalsToDismissArray lastObject];
+	
+	UIViewController *modalToDismiss = [self.store findContainerForId:containerId];
+	
+	if(!modalToDismiss) {
+		return;
+	}
+	
+	if (modalToDismiss == [self topPresentedVC]) {
+		[modalToDismiss dismissViewControllerAnimated:YES completion:^{
+			[self.store.modalsToDismissArray removeObject:containerId];
+			[self removePendingNextModalIfOnTop];
+		}];
+	}
+}
+
+-(UIViewController*)topPresentedVC {
+	UIViewController *root = UIApplication.sharedApplication.delegate.window.rootViewController;
+	while(root.presentedViewController) {
+		root = root.presentedViewController;
+	}
+	return root;
+}
+
+
+@end

ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		261F0E641E6EC94900989DE2 /* RNNModalManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 261F0E621E6EC94900989DE2 /* RNNModalManager.h */; };
+		261F0E651E6EC94900989DE2 /* RNNModalManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 261F0E631E6EC94900989DE2 /* RNNModalManager.m */; };
 		263905AE1E4C6F440023D7D3 /* MMDrawerBarButtonItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 2639058A1E4C6F440023D7D3 /* MMDrawerBarButtonItem.h */; };
 		263905AF1E4C6F440023D7D3 /* MMDrawerBarButtonItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 2639058B1E4C6F440023D7D3 /* MMDrawerBarButtonItem.m */; };
 		263905B01E4C6F440023D7D3 /* MMDrawerController+Subclass.h in Headers */ = {isa = PBXBuildFile; fileRef = 2639058C1E4C6F440023D7D3 /* MMDrawerController+Subclass.h */; };
@@ -80,6 +82,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		261F0E621E6EC94900989DE2 /* RNNModalManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNModalManager.h; sourceTree = "<group>"; };
+		261F0E631E6EC94900989DE2 /* RNNModalManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNModalManager.m; sourceTree = "<group>"; };
 		2639058A1E4C6F440023D7D3 /* MMDrawerBarButtonItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MMDrawerBarButtonItem.h; sourceTree = "<group>"; };
 		2639058B1E4C6F440023D7D3 /* MMDrawerBarButtonItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MMDrawerBarButtonItem.m; sourceTree = "<group>"; };
 		2639058C1E4C6F440023D7D3 /* MMDrawerController+Subclass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MMDrawerController+Subclass.h"; sourceTree = "<group>"; };
@@ -221,6 +225,8 @@
 		7B1E4C4B1E2D173700C3A525 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
+				261F0E621E6EC94900989DE2 /* RNNModalManager.h */,
+				261F0E631E6EC94900989DE2 /* RNNModalManager.m */,
 				26916C941E4B9CCC00D13680 /* RNNRootViewCreator.h */,
 				26916C961E4B9E7700D13680 /* RNNReactRootViewCreator.h */,
 				26916C971E4B9E7700D13680 /* RNNReactRootViewCreator.m */,
@@ -297,6 +303,7 @@
 				263905B51E4C6F440023D7D3 /* MMExampleDrawerVisualStateManager.h in Headers */,
 				263905C61E4C6F440023D7D3 /* SidebarFeedlyAnimation.h in Headers */,
 				7B1126A31E2D2B6C00F9B03B /* RNNSplashScreen.h in Headers */,
+				261F0E641E6EC94900989DE2 /* RNNModalManager.h in Headers */,
 				7B1126A51E2D2B6C00F9B03B /* RNN.h in Headers */,
 				263905C01E4C6F440023D7D3 /* SidebarAirbnbAnimation.h in Headers */,
 				263905E61E4CAC950023D7D3 /* RNNSideMenuChildVC.h in Headers */,
@@ -387,6 +394,7 @@
 				7BA500751E2544B9001B9E1B /* ReactNativeNavigation.m in Sources */,
 				263905B21E4C6F440023D7D3 /* MMDrawerController.m in Sources */,
 				7BBFE5441E25330E002A6182 /* RNNBridgeModule.m in Sources */,
+				261F0E651E6EC94900989DE2 /* RNNModalManager.m in Sources */,
 				7BEF0D1D1E43771B003E96B0 /* RNNLayoutNode.m in Sources */,
 				7BA500781E254908001B9E1B /* RNNSplashScreen.m in Sources */,
 				263905BA1E4C6F440023D7D3 /* RCCDrawerController.m in Sources */,