Merge pull request #331 from valtech-sd/develop

iOS: Add formSheetPreferredContentSize prop to allow for custom sized formSheet modals

Author: jdnichollsc

CHANGELOG.md

@@ -22,6 +22,11 @@ in case of vulnerabilities.
 
 ## [Unreleased]
 
+## [3.7.0] - 2022-03-01
+
+### Added
+- iOS: Add formSheetPreferredContentSize prop to allow for custom sized formSheet modals by [@ShaneMckenna23](https://github.com/ShaneMckenna23) ([#331](https://github.com/proyecto26/react-native-inappbrowser/pull/331)).
+
 ## [3.6.3] - 2021-07-05
 
 ### Fixed

README.md

@@ -159,6 +159,7 @@ Property       | Description
 `modalEnabled` (Boolean)             | Present the **SafariViewController** modally or as push instead. [`true`/`false`]
 `enableBarCollapsing` (Boolean)      | Determines whether the browser's tool bars will collapse or not. [`true`/`false`]
 `ephemeralWebSession` (Boolean)      | Prevent re-use cookies of previous session (openAuth only) [`true`/`false`]
+`formSheetPreferredContentSize` (Object)      | Custom size for iPad `formSheet` modals [`{width: 400, height: 500}`]
 
 ### Android Options
 Property       | Description

index.d.ts

@@ -36,7 +36,8 @@ declare module 'react-native-inappbrowser-reborn' {
       | 'partialCurl',
     modalEnabled?: boolean,
     enableBarCollapsing?: boolean,
-    ephemeralWebSession?: boolean
+    ephemeralWebSession?: boolean,
+    formSheetPreferredContentSize?: { width: number, height: number },
   }
 
   export type InAppBrowserAndroidOptions = {

ios/RNInAppBrowser.m

@@ -148,6 +148,7 @@ + (BOOL)requiresMainQueueSetup
   NSNumber* preferredControlTintColor = [options valueForKey:@"preferredControlTintColor"];
   NSString* modalPresentationStyle = [options valueForKey:@"modalPresentationStyle"];
   NSString* modalTransitionStyle = [options valueForKey:@"modalTransitionStyle"];
+  NSDictionary* formSheetPreferredContentSize = [options valueForKey:@"formSheetPreferredContentSize"];
 
   BOOL readerMode = [options[@"readerMode"] boolValue];
   BOOL enableBarCollapsing = [options[@"enableBarCollapsing"] boolValue];
@@ -207,6 +208,16 @@ + (BOOL)requiresMainQueueSetup
     if(animated) {
       safariHackVC.modalTransitionStyle = [self getTransitionStyle: modalTransitionStyle];
     }
+      
+    if([modalPresentationStyle isEqualToString:@"formSheet"] && formSheetPreferredContentSize){
+      NSNumber *width = [formSheetPreferredContentSize valueForKey:@"width"];
+      NSNumber *height = [formSheetPreferredContentSize valueForKey:@"height"];
+      
+      if(width && height){
+        safariHackVC.preferredContentSize = CGSizeMake([width doubleValue], [height doubleValue]);
+      }
+    }
+    
     safariHackVC.presentationController.delegate = self;
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wpartial-availability"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-inappbrowser-reborn",
-  "version": "3.6.3",
+  "version": "3.7.0",
   "description": "InAppBrowser for React Native",
   "main": "index.js",
   "scripts": {

types.js

@@ -41,6 +41,7 @@ export type InAppBrowseriOSOptions = {|
   modalEnabled?: boolean,
   enableBarCollapsing?: boolean,
   ephemeralWebSession?: boolean,
+  formSheetPreferredContentSize?: { width: number, height: number },
 |};
 
 export type InAppBrowserAndroidOptions = {|