overlay refactor

lib/ios/RNNCommandsHandler.m

@@ -7,7 +7,7 @@
 #import "RNNSplitViewController.h"
 #import "RNNElementFinder.h"
 #import "React/RCTUIManager.h"
-
+#import "RNNErrorHandler.h"
 
 static NSString* const setRoot	= @"setRoot";
 static NSString* const setStackRoot	= @"setStackRoot";
@@ -40,7 +40,7 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	_eventEmitter = eventEmitter;
 	_modalManager = [[RNNModalManager alloc] initWithStore:_store];
 	_stackManager = [[RNNNavigationStackManager alloc] init];
-	_overlayManager = [[RNNOverlayManager alloc] initWithStore:_store];
+	_overlayManager = [[RNNOverlayManager alloc] init];
 	return self;
 }
 
@@ -249,19 +249,21 @@ static NSString* const setDefaultOptions	= @"setDefaultOptions";
 	[self assertReady];
 
 	UIViewController<RNNRootViewProtocol>* overlayVC = [_controllerFactory createOverlay:layout];
-	[_overlayManager showOverlay:overlayVC completion:^{
-		[_eventEmitter sendOnNavigationCommandCompletion:showOverlay params:@{@"layout": layout}];
-		completion();
-	}];
+	[_overlayManager showOverlay:overlayVC];
+	[_eventEmitter sendOnNavigationCommandCompletion:showOverlay params:@{@"layout": layout}];
+	completion();
 }
 
 - (void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject {
 	[self assertReady];
-
-	[_overlayManager dismissOverlay:componentId completion:^{
-		[_eventEmitter sendOnNavigationCommandCompletion:dismissModal params:@{@"componentId": componentId}];
+	UIViewController* viewController = [_store findComponentForId:componentId];
+	if (viewController) {
+		[_overlayManager dismissOverlay:viewController];
+		[_eventEmitter sendOnNavigationCommandCompletion:dismissOverlay params:@{@"componentId": componentId}];
 		completion();
-	} rejection:reject];
+	} else {
+		[RNNErrorHandler reject:reject withErrorCode:1010 errorDescription:@"ComponentId not found"];
+	}
 }
 
 #pragma mark - private

lib/ios/RNNOverlayManager.h

@@ -5,9 +5,7 @@
 
 @interface RNNOverlayManager : NSObject
 
-- (instancetype)initWithStore:(RNNStore*)store;
-
-- (void)showOverlay:(UIViewController*)viewController completion:(RNNTransitionCompletionBlock)completion;
-- (void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject;
+- (void)showOverlay:(UIViewController*)viewController;
+- (void)dismissOverlay:(UIViewController*)viewController;
 
 @end

lib/ios/RNNOverlayManager.m

@@ -1,61 +1,46 @@
 #import "RNNOverlayManager.h"
-#import "RNNErrorHandler.h"
 #import "RNNOverlayWindow.h"
 
 @implementation RNNOverlayManager {
-	NSMutableDictionary* _overlayDict;
-	NSMutableDictionary* _overlayWindows;
-	RNNStore* _store;
+	NSMutableArray* _overlayWindows;
 }
 
-- (instancetype)initWithStore:(RNNStore *)store {
+- (instancetype)init {
 	self = [super init];
-	_overlayDict = [[NSMutableDictionary alloc] init];
-	_overlayWindows = [[NSMutableDictionary alloc] init];
-	_store = store;
+	_overlayWindows = [[NSMutableArray alloc] init];
 	return self;
 }
 
 #pragma mark - public
 
-- (void)showOverlay:(RNNRootViewController *)viewController completion:(RNNTransitionCompletionBlock)completion {
-	[self cacheOverlay:viewController];
+- (void)showOverlay:(UIViewController *)viewController {
 	UIWindow* overlayWindow = [[RNNOverlayWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-	[_overlayWindows setObject:overlayWindow forKey:viewController.componentId];
+	[_overlayWindows addObject:overlayWindow];
 	[overlayWindow setWindowLevel:UIWindowLevelNormal];
 	[overlayWindow setRootViewController:viewController];
 	[overlayWindow setHidden:NO];
-	
-	completion();
 }
 
-- (void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion rejection:(RNNTransitionRejectionBlock)reject {
-	RNNRootViewController* viewController = [_overlayDict objectForKey:componentId];
-	if (viewController) {
-		[self detachOverlayWindow:componentId];
-		[self removeCachedOverlay:viewController];
-		completion();
-	} else {
-		[RNNErrorHandler reject:reject withErrorCode:1010 errorDescription:@"ComponentId not found"];
-	}
+- (void)dismissOverlay:(UIViewController*)viewController {
+	UIWindow* overlayWindow = [self findWindowByRootViewController:viewController];
+	[self detachOverlayWindow:overlayWindow];
 }
 
 #pragma mark - private
 
-- (void)cacheOverlay:(RNNRootViewController*)viewController {
-	[_overlayDict setObject:viewController forKey:viewController.componentId];
-}
-
-- (void)removeCachedOverlay:(RNNRootViewController*)viewController {
-	[_overlayDict removeObjectForKey:viewController.componentId];
-	[_store removeComponent:viewController.componentId];
+- (void)detachOverlayWindow:(UIWindow *)overlayWindow {
+	[overlayWindow setHidden:YES];
+	[_overlayWindows removeObject:overlayWindow];
 }
 
-- (void)detachOverlayWindow:(NSString *)componentId {
-	UIWindow* overlayWindow = [_overlayWindows objectForKey:componentId];
-	[overlayWindow setHidden:YES];
-	[overlayWindow setRootViewController:nil];
-	overlayWindow = nil;
+- (UIWindow *)findWindowByRootViewController:(UIViewController *)viewController {
+	for (UIWindow* window in _overlayWindows) {
+		if ([window.rootViewController isEqual:viewController]) {
+			return window;
+		}
+	}
+	
+	return nil;
 }
 
 @end