Fix default modalPresentationStyle on iOS 13 (#5709)

* Set  as default modalPresentationStyle

* Sets the system default modalPresentationStyle

* Fix tests

* Fix unit tests

* Fix unit tests

* Add modal.swipeToDismiss option

docs/docs/styling.md

@@ -68,7 +68,7 @@ Navigation.mergeOptions(this.props.componentId, {
     backgroundColor: 'white',
     orientation: ['portrait', 'landscape'] // An array of supported orientations
   },
-  modalPresentationStyle: 'overCurrentContext', // Supported styles are: 'formSheet', 'pageSheet', 'overFullScreen', 'overCurrentContext', 'currentContext', 'popover', 'fullScreen' and 'none'. On Android, only overCurrentContext and none are supported.
+  modalPresentationStyle: 'overCurrentContext', // Supported styles are: 'default', 'formSheet', 'pageSheet', 'overFullScreen', 'overCurrentContext', 'currentContext', 'popover', 'fullScreen' and 'none'. On Android, only overCurrentContext and none are supported.
   topBar: {
     visible: true,
     animate: false, // Controls whether TopBar visibility changes should be animated
@@ -175,6 +175,9 @@ Navigation.mergeOptions(this.props.componentId, {
     interceptTouchOutside: true,
     handleKeyboardEvents: true
   },
+  modal: {
+    swipeToDismiss: true
+  }
   preview: {
     reactTag: 0, // result from findNodeHandle(ref)
     width: 100,

lib/ios/RCTConvert+Modal.h

@@ -2,27 +2,38 @@
 
 @interface RCTConvert (Modal)
 
++ (UIModalPresentationStyle)defaultModalPresentationStyle;
+
 @end
 
 @implementation RCTConvert (Modal)
 
++ (UIModalPresentationStyle)defaultModalPresentationStyle {
+    if (@available(iOS 13.0, *)) {
+        return UIModalPresentationAutomatic;
+    } else {
+        return UIModalPresentationOverFullScreen;
+    }
+}
+
 RCT_ENUM_CONVERTER(UIModalTransitionStyle,
-				   (@{@"coverVertical": @(UIModalTransitionStyleCoverVertical),
-					  @"flipHorizontal": @(UIModalTransitionStyleFlipHorizontal),
-					  @"crossDissolve": @(UIModalTransitionStyleCrossDissolve),
-					  @"partialCurl": @(UIModalTransitionStylePartialCurl)
-					  }), UIModalTransitionStyleCoverVertical, integerValue)
+                   (@{@"coverVertical": @(UIModalTransitionStyleCoverVertical),
+                      @"flipHorizontal": @(UIModalTransitionStyleFlipHorizontal),
+                      @"crossDissolve": @(UIModalTransitionStyleCrossDissolve),
+                      @"partialCurl": @(UIModalTransitionStylePartialCurl)
+                   }), UIModalTransitionStyleCoverVertical, integerValue)
 
 RCT_ENUM_CONVERTER(UIModalPresentationStyle,
-				   (@{@"fullScreen": @(UIModalPresentationFullScreen),
-					  @"pageSheet": @(UIModalPresentationPageSheet),
-					  @"formSheet": @(UIModalPresentationFormSheet),
-					  @"currentContext": @(UIModalPresentationCurrentContext),
-					  @"custom": @(UIModalPresentationCustom),
-					  @"overFullScreen": @(UIModalPresentationOverFullScreen),
-					  @"overCurrentContext": @(UIModalPresentationOverCurrentContext),
-					  @"popover": @(UIModalPresentationPopover),
-					  @"none": @(UIModalPresentationNone)
-					  }), UIModalPresentationFullScreen, integerValue)
+                   (@{@"fullScreen": @(UIModalPresentationFullScreen),
+                      @"pageSheet": @(UIModalPresentationPageSheet),
+                      @"formSheet": @(UIModalPresentationFormSheet),
+                      @"currentContext": @(UIModalPresentationCurrentContext),
+                      @"custom": @(UIModalPresentationCustom),
+                      @"overFullScreen": @(UIModalPresentationOverFullScreen),
+                      @"overCurrentContext": @(UIModalPresentationOverCurrentContext),
+                      @"popover": @(UIModalPresentationPopover),
+                      @"none": @(UIModalPresentationNone),
+                      @"default": @([RCTConvert defaultModalPresentationStyle])
+                   }), UIModalPresentationFullScreen, integerValue)
 @end
 

lib/ios/RNNBasePresenter.m

@@ -5,6 +5,7 @@
 #import "UIViewController+LayoutProtocol.h"
 #import "DotIndicatorOptions.h"
 #import "RNNDotIndicatorPresenter.h"
+#import "RCTConvert+Modal.h"
 
 @interface RNNBasePresenter ()
 @property(nonatomic, strong) RNNDotIndicatorPresenter* dotIndicatorPresenter;
@@ -28,7 +29,14 @@
 }
 
 - (void)applyOptionsOnInit:(RNNNavigationOptions *)initialOptions {
-
+    UIViewController* viewController = self.boundViewController;
+    RNNNavigationOptions *withDefault = [initialOptions withDefault:[self defaultOptions]];
+    [viewController setModalPresentationStyle:[RCTConvert UIModalPresentationStyle:[withDefault.modalPresentationStyle getWithDefaultValue:@"default"]]];
+    [viewController setModalTransitionStyle:[RCTConvert UIModalTransitionStyle:[withDefault.modalTransitionStyle getWithDefaultValue:@"coverVertical"]]];
+    
+    if (@available(iOS 13.0, *)) {
+        viewController.modalInPresentation = ![withDefault.modal.swipeToDismiss getWithDefaultValue:YES];
+    }
 }
 
 - (void)applyOptionsOnViewDidLayoutSubviews:(RNNNavigationOptions *)options {

lib/ios/RNNBottomTabsPresenter.m

@@ -6,6 +6,7 @@
 @implementation RNNBottomTabsPresenter
 
 - (void)applyOptionsOnInit:(RNNNavigationOptions *)options {
+    [super applyOptionsOnInit:options];
     UITabBarController *bottomTabs = self.boundViewController;
     RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
     [bottomTabs setCurrentTabIndex:[withDefault.bottomTabs.currentTabIndex getWithDefaultValue:0]];

lib/ios/RNNComponentPresenter.m

@@ -64,8 +64,6 @@
 	
 	UIViewController* viewController = self.boundViewController;
 	RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
-	[viewController setModalPresentationStyle:[RCTConvert UIModalPresentationStyle:[withDefault.modalPresentationStyle getWithDefaultValue:@"fullScreen"]]];
-	[viewController setModalTransitionStyle:[RCTConvert UIModalTransitionStyle:[withDefault.modalTransitionStyle getWithDefaultValue:@"coverVertical"]]];
 	[viewController setDrawBehindTopBar:[withDefault.topBar.drawBehind getWithDefaultValue:NO]];
 	[viewController setDrawBehindTabBar:[withDefault.bottomTabs.drawBehind getWithDefaultValue:NO] || ![withDefault.bottomTabs.visible getWithDefaultValue:YES]];
 	

lib/ios/RNNModalOptions.h

@@ -0,0 +1,7 @@
+#import "RNNOptions.h"
+
+@interface RNNModalOptions : RNNOptions
+
+@property (nonatomic, strong) Bool* swipeToDismiss;
+
+@end

lib/ios/RNNModalOptions.m

@@ -0,0 +1,11 @@
+#import "RNNModalOptions.h"
+
+@implementation RNNModalOptions
+
+- (instancetype)initWithDict:(NSDictionary *)dict {
+    self = [super init];
+    self.swipeToDismiss = [BoolParser parse:dict key:@"swipeToDismiss"];
+    return self;
+}
+
+@end

lib/ios/RNNNavigationOptions.h

@@ -11,6 +11,7 @@
 #import "RNNPreviewOptions.h"
 #import "RNNLayoutOptions.h"
 #import "RNNSplitViewOptions.h"
+#import "RNNModalOptions.h"
 
 extern const NSInteger BLUR_TOPBAR_TAG;
 extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
@@ -30,6 +31,7 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 @property (nonatomic, strong) RNNPreviewOptions* preview;
 @property (nonatomic, strong) RNNLayoutOptions* layout;
 @property (nonatomic, strong) RNNSplitViewOptions* splitView;
+@property (nonatomic, strong) RNNModalOptions* modal;
 
 @property (nonatomic, strong) Bool* popGesture;
 @property (nonatomic, strong) Image* backgroundImage;

lib/ios/RNNNavigationOptions.m

@@ -29,6 +29,7 @@
 	self.statusBar = [[RNNStatusBarOptions alloc] initWithDict:dict[@"statusBar"]];
 	self.preview = [[RNNPreviewOptions alloc] initWithDict:dict[@"preview"]];
 	self.layout = [[RNNLayoutOptions alloc] initWithDict:dict[@"layout"]];
+    self.modal = [[RNNModalOptions alloc] initWithDict:dict[@"modal"]];
 	
 	self.popGesture = [[Bool alloc] initWithValue:dict[@"popGesture"]];
 	

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -208,6 +208,8 @@
 		509B258F2178BE7A00C83C23 /* RNNStackPresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 509B258E2178BE7A00C83C23 /* RNNStackPresenterTest.m */; };
 		50A00C37200F84D6000F01A6 /* RNNOverlayOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */; };
 		50A00C38200F84D6000F01A6 /* RNNOverlayOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50A00C36200F84D6000F01A6 /* RNNOverlayOptions.m */; };
+		50A246372395399700A192C5 /* RNNModalOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50A246352395399700A192C5 /* RNNModalOptions.h */; };
+		50A246382395399700A192C5 /* RNNModalOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50A246362395399700A192C5 /* RNNModalOptions.m */; };
 		50A409CA238D444900D5FF7D /* UINavigationBar+utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 50A409C8238D444900D5FF7D /* UINavigationBar+utils.h */; };
 		50A409CB238D444900D5FF7D /* UINavigationBar+utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 50A409C9238D444900D5FF7D /* UINavigationBar+utils.m */; };
 		50AB0B1C2255F8640039DAED /* UIViewController+LayoutProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50AB0B1A2255F8640039DAED /* UIViewController+LayoutProtocol.h */; };
@@ -562,6 +564,8 @@
 		509B258E2178BE7A00C83C23 /* RNNStackPresenterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNStackPresenterTest.m; 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>"; };
+		50A246352395399700A192C5 /* RNNModalOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNModalOptions.h; sourceTree = "<group>"; };
+		50A246362395399700A192C5 /* RNNModalOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNModalOptions.m; sourceTree = "<group>"; };
 		50A409C8238D444900D5FF7D /* UINavigationBar+utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UINavigationBar+utils.h"; sourceTree = "<group>"; };
 		50A409C9238D444900D5FF7D /* UINavigationBar+utils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UINavigationBar+utils.m"; sourceTree = "<group>"; };
 		50AB0B1A2255F8640039DAED /* UIViewController+LayoutProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIViewController+LayoutProtocol.h"; sourceTree = "<group>"; };
@@ -963,6 +967,8 @@
 				506317AD220B550600B26FC3 /* RNNInsetsOptions.m */,
 				309876223177761614786DCC /* DotIndicatorOptions.m */,
 				30987122507D8CBF16624F93 /* DotIndicatorOptions.h */,
+				50A246352395399700A192C5 /* RNNModalOptions.h */,
+				50A246362395399700A192C5 /* RNNModalOptions.m */,
 			);
 			name = Options;
 			sourceTree = "<group>";
@@ -1384,6 +1390,7 @@
 				5049595A216F6B46006D2B81 /* NullDictionary.h in Headers */,
 				501224062173592D000F5F98 /* RNNBottomTabsPresenter.h in Headers */,
 				50706E6D20CE7CA5003345C3 /* UIImage+tint.h in Headers */,
+				50A246372395399700A192C5 /* RNNModalOptions.h in Headers */,
 				309874B40D202C9718F15CBD /* UIView+Utils.h in Headers */,
 				309877B0B5AAA7788F56F3D9 /* UIViewController+Utils.h in Headers */,
 				30987680135A8C78E62D5B8E /* DotIndicatorOptions.h in Headers */,
@@ -1568,6 +1575,7 @@
 				7BA500751E2544B9001B9E1B /* ReactNativeNavigation.m in Sources */,
 				50E5F7962240EBD6002AFEAD /* RNNAnimationsTransitionDelegate.m in Sources */,
 				5038A3BA216DFCFD009280BC /* UITabBarController+RNNOptions.m in Sources */,
+				50A246382395399700A192C5 /* RNNModalOptions.m in Sources */,
 				263905B21E4C6F440023D7D3 /* MMDrawerController.m in Sources */,
 				50644A2120E11A720026709C /* Constants.m in Sources */,
 				501223D82173590F000F5F98 /* RNNStackPresenter.m in Sources */,

lib/src/interfaces/Options.ts

@@ -683,6 +683,14 @@ export interface OverlayOptions {
   handleKeyboardEvents?: boolean;
 }
 
+export interface ModalOptions {
+  /**
+   * Control wether this modal should be dismiss using swipe gesture when the modalPresentationStyle = 'pageSheet'
+   * #### (iOS specific)
+   */
+  swipeToDismiss?: boolean;
+}
+
 export interface OptionsPreviewAction {
   /**
    * Reference ID to get callbacks from
@@ -961,6 +969,10 @@ export interface Options {
    * Configure the overlay
    */
   overlay?: OverlayOptions;
+  /**
+   * Configure the modal
+   */
+  modal?: ModalOptions;
   /**
    * Animation used for navigation commands that modify the layout
    * hierarchy can be controlled in options.

playground/ios/NavigationTests/RNNBasePresenterTest.m

@@ -89,5 +89,13 @@
     XCTAssertEqual([_uut getStatusBarStyle:options], UIStatusBarStyleLightContent);
 }
 
+- (void)testApplyOptionsOnInit_setSwipeToDismiss {
+    self.options.modal.swipeToDismiss = [[Bool alloc] initWithBOOL:NO];
+	XCTAssertFalse(_boundViewController.modalInPresentation);
+    [self.uut applyOptionsOnInit:self.options];
+	XCTAssertTrue(_boundViewController.modalInPresentation);
+}
+
+
 
 @end

playground/ios/NavigationTests/RNNComponentPresenterTest.m

@@ -5,6 +5,7 @@
 #import "RNNComponentViewController.h"
 #import "UIViewController+LayoutProtocol.h"
 #import "RNNTitleViewHelper.h"
+#import "RCTConvert+Modal.h"
 
 @interface RNNComponentPresenterTest : XCTestCase
 
@@ -78,7 +79,7 @@
 }
 
 - (void)testApplyOptionsOnInit_shouldSetModalPresentationStyleWithDefault {
-    [(UIViewController *) [(id) self.boundViewController expect] setModalPresentationStyle:UIModalPresentationFullScreen];
+    [(UIViewController *) [(id) self.boundViewController expect] setModalPresentationStyle:[RCTConvert defaultModalPresentationStyle]];
 	[self.uut applyOptionsOnInit:self.options];
 	[(id)self.boundViewController verify];
 }

playground/ios/NavigationTests/RNNTabBarControllerTest.m

@@ -3,6 +3,7 @@
 #import "RNNComponentViewController.h"
 #import "RNNStackController.h"
 #import <OCMock/OCMock.h>
+#import "RCTConvert+Modal.h"
 
 @interface RNNTabBarControllerTest : XCTestCase
 
@@ -75,6 +76,13 @@
     XCTAssertTrue(uut.delegate == uut);
 }
 
+- (void)testInitWithLayoutInfo_shouldCreateWithDefaultStyles {
+    RNNBottomTabsController *uut = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:[[RNNBottomTabsPresenter alloc] init] eventEmitter:nil childViewControllers:nil];
+	
+    XCTAssertEqual(uut.modalPresentationStyle, UIModalPresentationPageSheet);
+	XCTAssertEqual(uut.modalTransitionStyle, UIModalTransitionStyleCoverVertical);
+}
+
 - (void)testWillMoveToParent_shouldNotInvokePresenterApplyOptionsOnWillMoveToNilParent {
     [[self.mockTabBarPresenter reject] applyOptionsOnWillMoveToParentViewController:[self.uut options]];
     [self.uut willMoveToParentViewController:nil];
@@ -161,4 +169,5 @@
     XCTAssertTrue(uut.selectedIndex == 1);
 }
 
+
 @end

playground/ios/NavigationTests/UIViewController+LayoutProtocolTest.m

@@ -26,10 +26,10 @@
     RNNComponentPresenter* presenter = [[RNNComponentPresenter alloc] init];
     RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initEmptyOptions];
     RNNNavigationOptions* defaultOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
-    defaultOptions.modalPresentationStyle = [[Text alloc] initWithValue:@"fullScreen"];
+    defaultOptions.modalPresentationStyle = [[Text alloc] initWithValue:@"default"];
 
     UIViewController* uut = [[UIViewController alloc] initWithLayoutInfo:nil creator:nil options:options defaultOptions:defaultOptions presenter:presenter eventEmitter:nil childViewControllers:nil];
-    XCTAssertEqual(uut.modalPresentationStyle, [RCTConvert UIModalPresentationStyle:@"fullScreen"]);
+    XCTAssertEqual(uut.modalPresentationStyle, UIModalPresentationPageSheet);
 }
 
 - (void)testInitWithLayoutInfoShouldSetChildViewControllers {

playground/ios/Podfile.lock

@@ -220,7 +220,7 @@ PODS:
     - ReactCommon/jscallinvoker (= 0.61.4)
   - ReactNativeKeyboardTrackingView (5.6.1):
     - React
-  - ReactNativeNavigation (3.7.0):
+  - ReactNativeNavigation (4.0.2):
     - React
   - Yoga (1.14.0)
 
@@ -346,7 +346,7 @@ SPEC CHECKSUMS:
   React-RCTVibration: 0f76400ee3cec6edb9c125da49fed279340d145a
   ReactCommon: a6a294e7028ed67b926d29551aa9394fd989c24c
   ReactNativeKeyboardTrackingView: a240a6a0dba852bb107109a7ec7e98b884055977
-  ReactNativeNavigation: bed6f504aa1a4dadd151503bf99d0ef96d06847f
+  ReactNativeNavigation: f3da2b103f01bc576bbb1a41df67486788dcf6af
   Yoga: ba3d99dbee6c15ea6bbe3783d1f0cb1ffb79af0f
 
 PODFILE CHECKSUM: 8a6eee15d75935b9144e5228ce8fa2a5b98079e7

playground/src/commons/Options.js

@@ -21,7 +21,8 @@ const setDefaultOptions = () => Navigation.setDefaultOptions({
   },
   animations: {
     ...useSlowOpenScreenAnimations ? slowOpenScreenAnimations : {}   
-  }
+  },
+  modalPresentationStyle: 'fullScreen'
 });
 
 const slowOpenScreenAnimations = {