refactored navigation options

lib/ios/RNNBottomTabOptions.m

@@ -34,12 +34,6 @@
 	[self resetOptions];
 }
 
--(void)mergeWith:(NSDictionary *)otherOptions {
-	for (id key in otherOptions) {
-		[self setValue:[otherOptions objectForKey:key] forKey:key];
-	}
-}
-
 -(void)resetOptions {
 	self.title = nil;
 	self.badge = nil;

lib/ios/RNNBottomTabsOptions.m

@@ -37,9 +37,4 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 	self.currentTabIndex = nil;
 }
 
--(void)mergeWith:(NSDictionary *)otherOptions {
-	for (id key in otherOptions) {
-		[self setValue:[otherOptions objectForKey:key] forKey:key];
-	}
-}
 @end

lib/ios/RNNControllerFactory.m

@@ -164,9 +164,7 @@
 
 - (UIViewController *)createOverlay:(NSDictionary*)layout {
 	UIViewController *vc = [self fromTree:layout];
-	NSDictionary* options = layout[@"data"][@"options"];
 	RCTRootView* rootView = (RCTRootView*)vc.view;
-	rootView.passThroughTouches = ![options[@"interceptTouches"] boolValue];
 	rootView.backgroundColor = [UIColor clearColor];
 	CGSize availableSize = UIApplication.sharedApplication.delegate.window.bounds.size;
 	rootView.frame = CGRectMake(0, 0, availableSize.width, availableSize.height);

lib/ios/RNNNavigationOptions.h

@@ -5,6 +5,7 @@
 #import "RNNSideMenuOptions.h"
 #import "RNNTopTabOptions.h"
 #import "RNNTopTabsOptions.h"
+#import "RNNOverlayOptions.h"
 
 extern const NSInteger BLUR_STATUS_TAG;
 extern const NSInteger BLUR_TOPBAR_TAG;
@@ -18,6 +19,7 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 @property (nonatomic, strong) RNNTopTabsOptions* topTabs;
 @property (nonatomic, strong) RNNTopTabOptions* topTab;
 @property (nonatomic, strong) RNNSideMenuOptions* sideMenu;
+@property (nonatomic, strong) RNNOverlayOptions* overlay;
 
 @property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 

lib/ios/RNNNavigationOptions.m

@@ -30,7 +30,8 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 	self.backgroundImage = [RCTConvert UIImage:[options objectForKey:@"backgroundImage"]];
 	self.rootBackgroundImage = [RCTConvert UIImage:[options objectForKey:@"rootBackgroundImage"]];
 	self.bottomTab = [[RNNBottomTabOptions alloc] initWithDict:[options objectForKey:@"bottomTab"]];
-    
+	self.overlay = [[RNNOverlayOptions alloc] initWithDict:[options objectForKey:@"overlay"]];
+	
 	return self;
 }
 
@@ -53,6 +54,7 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 	[self.topTab applyOn:viewController];
 	[self.bottomTab applyOn:viewController];
 	[self.sideMenu applyOn:viewController];
+	[self.overlay applyOn:viewController];
 	[self applyOtherOptionsOn:viewController];
 }
 

lib/ios/RNNOverlayOptions.h

@@ -0,0 +1,7 @@
+#import "RNNOptions.h"
+
+@interface RNNOverlayOptions : RNNOptions
+
+@property (nonatomic) BOOL interceptTouches;
+
+@end

lib/ios/RNNOverlayOptions.m

@@ -0,0 +1,11 @@
+#import "RNNOverlayOptions.h"
+#import <React/RCTRootView.h>
+
+@implementation RNNOverlayOptions
+
+- (void)applyOn:(UIViewController *)viewController {
+	RCTRootView* rootView = (RCTRootView*)viewController.view;
+	rootView.passThroughTouches = !self.interceptTouches;
+}
+
+@end

lib/ios/RNNTopTabOptions.m

@@ -9,10 +9,5 @@
 	}
 }
 
--(void)mergeWith:(NSDictionary *)otherOptions {
-	for (id key in otherOptions) {
-		[self setValue:[otherOptions objectForKey:key] forKey:key];
-	}
-}
 @end
 

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -76,6 +76,8 @@
 		507F43F81FF525B500D9425B /* RNNSegmentedControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F43F61FF525B500D9425B /* RNNSegmentedControl.h */; };
 		507F43F91FF525B500D9425B /* RNNSegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 507F43F71FF525B500D9425B /* RNNSegmentedControl.m */; };
 		507F44201FFA8A8800D9425B /* RNNRootViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */; };
+		50A00C37200F84D6000F01A6 /* RNNOverlayOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */; };
+		50A00C38200F84D6000F01A6 /* RNNOverlayOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50A00C36200F84D6000F01A6 /* RNNOverlayOptions.m */; };
 		50CB3B691FDE911400AA153B /* RNNSideMenuOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50CB3B671FDE911400AA153B /* RNNSideMenuOptions.h */; };
 		50CB3B6A1FDE911400AA153B /* RNNSideMenuOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50CB3B681FDE911400AA153B /* RNNSideMenuOptions.m */; };
 		50D031342005149000386B3D /* RNNOverlayManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 50D031322005149000386B3D /* RNNOverlayManager.h */; };
@@ -243,6 +245,8 @@
 		507F43F61FF525B500D9425B /* RNNSegmentedControl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSegmentedControl.h; sourceTree = "<group>"; };
 		507F43F71FF525B500D9425B /* RNNSegmentedControl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSegmentedControl.m; sourceTree = "<group>"; };
 		507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNRootViewProtocol.h; sourceTree = "<group>"; };
+		50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNOverlayOptions.h; sourceTree = "<group>"; };
+		50A00C36200F84D6000F01A6 /* RNNOverlayOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNOverlayOptions.m; sourceTree = "<group>"; };
 		50CB3B671FDE911400AA153B /* RNNSideMenuOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNSideMenuOptions.h; sourceTree = "<group>"; };
 		50CB3B681FDE911400AA153B /* RNNSideMenuOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNSideMenuOptions.m; sourceTree = "<group>"; };
 		50D031322005149000386B3D /* RNNOverlayManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNOverlayManager.h; sourceTree = "<group>"; };
@@ -455,6 +459,8 @@
 				504AFE731FFFF0540076E904 /* RNNTopTabsOptions.m */,
 				50CB3B671FDE911400AA153B /* RNNSideMenuOptions.h */,
 				50CB3B681FDE911400AA153B /* RNNSideMenuOptions.m */,
+				50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */,
+				50A00C36200F84D6000F01A6 /* RNNOverlayOptions.m */,
 			);
 			name = Options;
 			sourceTree = "<group>";
@@ -663,6 +669,7 @@
 				263905BB1E4C6F440023D7D3 /* RCCDrawerHelper.h in Headers */,
 				263905CC1E4C6F440023D7D3 /* SidebarWunderlistAnimation.h in Headers */,
 				507F43F41FF4FCFE00D9425B /* HMSegmentedControl.h in Headers */,
+				50A00C37200F84D6000F01A6 /* RNNOverlayOptions.h in Headers */,
 				7B4928081E70415400555040 /* RNNCommandsHandler.h in Headers */,
 				263905AE1E4C6F440023D7D3 /* MMDrawerBarButtonItem.h in Headers */,
 				50F5DFC11F407A8C001A00BC /* RNNTabBarController.h in Headers */,
@@ -862,6 +869,7 @@
 				E8A430121F9CB87B00B61A20 /* RNNAnimatedView.m in Sources */,
 				507F43F51FF4FCFE00D9425B /* HMSegmentedControl.m in Sources */,
 				507F43C61FF4F17C00D9425B /* RNNTopTabsViewController.m in Sources */,
+				50A00C38200F84D6000F01A6 /* RNNOverlayOptions.m in Sources */,
 				50EB93421FE14A3E00BD8EEE /* RNNBottomTabOptions.m in Sources */,
 				E8367B811F7A8A4700675C05 /* VICMAImageView.m in Sources */,
 				A7626C011FC5796200492FB8 /* RNNBottomTabsOptions.m in Sources */,

playground/src/screens/OptionsScreen.js

@@ -198,7 +198,11 @@ class OptionsScreen extends Component {
     Navigation.showOverlay({
       component: {
         name: 'navigation.playground.CustomDialog',
-        options: { interceptTouches }
+        options: {
+          overlay: {
+            interceptTouches
+          }
+        }
       }
     });
   }