Present the SafariViewController modally or as push instead

Author: jdnichollsc

README.md

@@ -97,6 +97,7 @@ Property       | Description
 `animated` (Boolean)                 | Animate the presentation. [`true`/`false`]
 `modalPresentationStyle` (String)    | The presentation style for modally presented view controllers. [`none`/`fullScreen`/`pageSheet`/`formSheet`/`currentContext`/`custom`/`overFullScreen`/`overCurrentContext`/`popover`]
 `modalTransitionStyle` (String)      | The transition style to use when presenting the view controller. [`coverVertical`/`flipHorizontal`/`crossDissolve`/`partialCurl`]
+`modalEnabled` (Boolean)             | Present the **SafariViewController** modally or as push instead. [`true`/`false`]
 
 ### Android Options
 Property       | Description

example/App.js

@@ -54,6 +54,7 @@ export default class App extends Component {
           animated: true,
           modalPresentationStyle: 'fullScreen',
           modalTransitionStyle: 'partialCurl',
+          modalEnabled: true,
           // Android Properties
           showTitle: true,
           toolbarColor: '#6200EE',

index.d.ts

@@ -32,7 +32,8 @@ declare module 'react-native-inappbrowser-reborn' {
       | 'coverVertical'
       | 'flipHorizontal'
       | 'crossDissolve'
-      | 'partialCurl'
+      | 'partialCurl',
+    modalEnabled?: boolean
   }
 
   type InAppBrowserAndroidOptions = {

index.js

@@ -38,7 +38,8 @@ type InAppBrowseriOSOptions = {
     | 'coverVertical'
     | 'flipHorizontal'
     | 'crossDissolve'
-    | 'partialCurl'
+    | 'partialCurl',
+  modalEnabled?: boolean
 };
 
 type InAppBrowserAndroidOptions = {
@@ -63,12 +64,15 @@ async function open(
   url: string,
   options: InAppBrowserOptions = {}
 ): Promise<BrowserResult> {
+  const modalEnabled =
+    options.modalEnabled !== undefined ? options.modalEnabled : true;
   const inAppBrowseroptions = {
     ...options,
     url,
     dismissButtonStyle: options.dismissButtonStyle || 'close',
     readerMode: options.readerMode !== undefined ? options.readerMode : false,
-    animated: options.animated !== undefined ? options.animated : true
+    animated: options.animated !== undefined ? options.animated : true,
+    modalEnabled
   };
   if (inAppBrowseroptions.preferredBarTintColor) {
     inAppBrowseroptions.preferredBarTintColor = processColor(

ios/RNInAppBrowser.m

@@ -113,6 +113,7 @@ - (dispatch_queue_t)methodQueue
   self.animated = [options[@"animated"] boolValue];
   NSString* modalPresentationStyle = [options valueForKey:@"modalPresentationStyle"];
   NSString* modalTransitionStyle = [options valueForKey:@"modalTransitionStyle"];
+  BOOL modalEnabled = [options[@"modalEnabled"] boolValue];
 
   // Safari View Controller to authorize request
   NSURL *url = [[NSURL alloc] initWithString:authURL];
@@ -138,15 +139,21 @@ - (dispatch_queue_t)methodQueue
     }
   }
 
-  safariVC.modalPresentationStyle = [self modalPresentationStyleWithString: modalPresentationStyle];
-  safariVC.modalTransitionStyle = [self modalTransitionStyleWithString: modalTransitionStyle];
-
-  // This is a hack to present the SafariViewController modally
-  UINavigationController *safariHackVC = [[UINavigationController alloc] initWithRootViewController:safariVC];
-  [safariHackVC setNavigationBarHidden:true animated:false];
+  if(self.animated) {
+    safariVC.modalPresentationStyle = [self getPresentationStyle: modalPresentationStyle];
+    safariVC.modalTransitionStyle = [self getTransitionStyle: modalTransitionStyle];
+  }
 
   UIViewController *ctrl = RCTPresentedViewController();
-  [ctrl presentViewController:safariHackVC animated:[self animated] completion:nil];
+  if (modalEnabled) {
+    // This is a hack to present the SafariViewController modally
+    UINavigationController *safariHackVC = [[UINavigationController alloc] initWithRootViewController:safariVC];
+    [safariHackVC setNavigationBarHidden:true animated:false];
+    [ctrl presentViewController:safariHackVC animated:self.animated completion:nil];
+  }
+  else {
+    [ctrl presentViewController:safariVC animated:self.animated completion:nil];
+  }
 }
 
 - (void)performSynchronouslyOnMainThread:(void (^)(void))block
@@ -163,7 +170,7 @@ - (void)_close
   __weak typeof(self) weakSelf = self;
   [self performSynchronouslyOnMainThread:^{
     UIViewController *ctrl = RCTPresentedViewController();
-    [ctrl dismissViewControllerAnimated:[weakSelf animated] completion:^{
+    [ctrl dismissViewControllerAnimated:weakSelf.animated completion:^{
       __strong typeof(self) strongSelf = weakSelf;
       if (strongSelf) {
         strongSelf.redirectResolve(@{
@@ -235,7 +242,7 @@ -(void)flowDidFinish
   _redirectReject = nil;
 }
 
-- (UIModalPresentationStyle)modalPresentationStyleWithString:(NSString *)modalPresentationStyleString {
+- (UIModalPresentationStyle)getPresentationStyle:(NSString *)styleKey {
   NSDictionary *styles = @{
     @"fullScreen": @(UIModalPresentationFullScreen),
     @"pageSheet": @(UIModalPresentationPageSheet),
@@ -247,21 +254,21 @@ - (UIModalPresentationStyle)modalPresentationStyleWithString:(NSString *)modalPr
     @"popover": @(UIModalPresentationPopover)
   };
   UIModalPresentationStyle modalPresentationStyle = UIModalPresentationNone;
-  NSNumber *style = [styles objectForKey: modalPresentationStyleString];
+  NSNumber *style = [styles objectForKey: styleKey];
   if (style != nil) {
     modalPresentationStyle = [style intValue];
   }
   return modalPresentationStyle;
 }
 
-- (UIModalTransitionStyle)modalTransitionStyleWithString:(NSString *)modalTransitionStyleString {
+- (UIModalTransitionStyle)getTransitionStyle:(NSString *)styleKey {
   NSDictionary *styles = @{
     @"flipHorizontal": @(UIModalTransitionStyleFlipHorizontal),
     @"crossDissolve": @(UIModalTransitionStyleCrossDissolve),
     @"partialCurl": @(UIModalTransitionStylePartialCurl)
   };
   UIModalTransitionStyle modalTransitionStyle = UIModalTransitionStyleCoverVertical;
-  NSNumber *style = [styles objectForKey: modalTransitionStyleString];
+  NSNumber *style = [styles objectForKey: styleKey];
   if (style != nil) {
     modalTransitionStyle = [style intValue];
   }