Merge branch 'develop' into rework/custom_tab

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
@@ -176,6 +177,7 @@ Property       | Description
 `hasBackButton` (Boolean)         | Sets a back arrow instead of the default `X` icon to close the custom tab. [`true`/`false`]
 `browserPackage` (String)         | Package name of a browser to be used to handle Custom Tabs.
 `showInRecents` (Boolean)         | Determining whether browsed website should be shown as separate entry in Android recents/multitasking view. [`true`/`false`]
+`includeReferrer` (Boolean)         | Determining whether to include your package name as referrer for the website to track. [`true`/`false`]
 
 ### Demo
 

android/build.gradle

@@ -21,10 +21,10 @@ def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
-def DEFAULT_COMPILE_SDK_VERSION = 28
-def DEFAULT_BUILD_TOOLS_VERSION = "28.0.3"
+def DEFAULT_COMPILE_SDK_VERSION = 31
+def DEFAULT_BUILD_TOOLS_VERSION = "31.0.0"
 def DEFAULT_MIN_SDK_VERSION = 16
-def DEFAULT_TARGET_SDK_VERSION = 28
+def DEFAULT_TARGET_SDK_VERSION = 31
 
 android {
   compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
@@ -51,7 +51,7 @@ repositories {
 dependencies {
   implementation fileTree(dir: 'libs', include: ['*.jar'])
   implementation 'com.facebook.react:react-native:+'
-  implementation 'org.greenrobot:eventbus:3.+'
+  implementation 'org.greenrobot:eventbus:3.1.0'
   def supportLibVersion = safeExtGet('supportLibVersion', safeExtGet('supportVersion', null))
   def androidXVersion = safeExtGet('androidXVersion', null)
   if (supportLibVersion && androidXVersion == null) {

android/src/main/AndroidManifest.xml

@@ -6,7 +6,8 @@
 
     <application>
         <activity
-        android:name=".ChromeTabsManagerActivity">
+        android:name=".ChromeTabsManagerActivity"
+        android:exported="false">
         </activity>
     </application>
     <queries>

android/src/main/java/com/proyecto26/inappbrowser/RNInAppBrowser.java

@@ -59,6 +59,7 @@ public class RNInAppBrowser {
   private static final String KEY_HAS_BACK_BUTTON = "hasBackButton";
   private static final String KEY_BROWSER_PACKAGE = "browserPackage";
   private static final String KEY_SHOW_IN_RECENTS = "showInRecents";
+  private static final String KEY_INCLUDE_REFERRER = "includeReferrer";
 
   private static final String ACTION_CUSTOM_TABS_CONNECTION = "android.support.customtabs.action.CustomTabsService";
   private static final String CHROME_PACKAGE_STABLE = "com.android.chrome";
@@ -201,7 +202,7 @@ public void open(Context context, final ReadableMap options, final Promise promi
     }
 
     registerEventBus();
-    
+
     intent.setData(Uri.parse(url));
     if (options.hasKey(KEY_SHOW_PAGE_TITLE)) {
       builder.setShowTitle(options.getBoolean(KEY_SHOW_PAGE_TITLE));
@@ -210,6 +211,12 @@ public void open(Context context, final ReadableMap options, final Promise promi
       intent.putExtra(CustomTabsIntent.EXTRA_TITLE_VISIBILITY_STATE, CustomTabsIntent.NO_TITLE);
     }
 
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && options.hasKey(KEY_INCLUDE_REFERRER)
+        && options.getBoolean(KEY_INCLUDE_REFERRER)) {
+      intent.putExtra(Intent.EXTRA_REFERRER,
+          Uri.parse("android-app://" + context.getApplicationContext().getPackageName()));
+    }
+
     currentActivity.startActivity(
         ChromeTabsManagerActivity.createStartIntent(currentActivity, intent),
         customTabsIntent.startAnimationBundle);

example/android/app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:launchMode="singleTask"
+        android:exported="true"
         android:windowSoftInputMode="adjustResize">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />

example/android/build.gradle

@@ -2,10 +2,10 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "30.0.2"
+        buildToolsVersion = "31.0.0"
         minSdkVersion = 21
-        compileSdkVersion = 30
-        targetSdkVersion = 30
+        compileSdkVersion = 31
+        targetSdkVersion = 31
         ndkVersion = "21.4.7075529"
         androidXAnnotation = "1.2.0"
         androidXBrowser = "1.3.0"
@@ -15,7 +15,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:4.2.2")
+        classpath("com.android.tools.build:gradle:7.0.0")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

example/utils.js

@@ -43,6 +43,7 @@ export const openLink = async (url, statusBarStyle, animated = true) => {
         hasBackButton: true,
         browserPackage: null,
         showInRecents: false,
+        includeReferrer: true,
       });
       // A delay to show an alert when the browser is closed
       await sleep(800);

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 = {
@@ -58,6 +59,7 @@ declare module 'react-native-inappbrowser-reborn' {
     hasBackButton?: boolean,
     browserPackage?: string,
     showInRecents?: boolean
+    includeReferrer?: boolean,
   }
 
   export type InAppBrowserOptions = InAppBrowserAndroidOptions | InAppBrowseriOSOptions;

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 = {|
@@ -62,6 +63,7 @@ export type InAppBrowserAndroidOptions = {|
   hasBackButton?: boolean,
   browserPackage?: string,
   showInRecents?: boolean,
+  includeReferrer?: boolean,
 |};
 
 export type InAppBrowserOptions = {

utils.js

@@ -9,7 +9,8 @@ import {
   Linking,
   Platform,
   AppState,
-  NativeModules
+  NativeModules,
+  EmitterSubscription
 } from 'react-native';
 import type {
   BrowserResult,
@@ -22,6 +23,7 @@ import type {
 export const RNInAppBrowser = NativeModules.RNInAppBrowser;
 
 let _redirectHandler: ?(event: RedirectEvent) => void;
+let _linkingEventSubscription: ?EmitterSubscription;
 
 type AppStateStatus = typeof AppState.currentState
 
@@ -33,7 +35,10 @@ function waitForRedirectAsync(returnUrl: string): Promise<RedirectResult> {
       }
     };
 
-    Linking.addEventListener('url', _redirectHandler);
+    _linkingEventSubscription = Linking.addEventListener(
+      'url',
+      _redirectHandler
+    );
   });
 }
 
@@ -46,13 +51,26 @@ function handleAppStateActiveOnce(): Promise<void> {
     if (AppState.currentState === 'active') {
       return resolve();
     }
+    let appStateEventSubscription: ?EmitterSubscription;
+
     function handleAppStateChange(nextAppState: AppStateStatus) {
       if (nextAppState === 'active') {
-        AppState.removeEventListener('change', handleAppStateChange);
+        if (
+          appStateEventSubscription &&
+          appStateEventSubscription.remove !== undefined
+        ) {
+          appStateEventSubscription.remove();
+        } else {
+          AppState.removeEventListener('change', handleAppStateChange);
+        }
         resolve();
       }
     }
-    AppState.addEventListener('change', handleAppStateChange);
+
+    appStateEventSubscription = AppState.addEventListener(
+      'change',
+      handleAppStateChange
+    );
   });
 }
 
@@ -137,7 +155,15 @@ export async function openAuthSessionPolyfillAsync(
 
 export function closeAuthSessionPolyfillAsync(): void {
   if (_redirectHandler) {
-    Linking.removeEventListener('url', _redirectHandler);
+    if (
+      _linkingEventSubscription &&
+      _linkingEventSubscription.remove !== undefined
+    ) {
+      _linkingEventSubscription.remove();
+      _linkingEventSubscription = null;
+    } else {
+      Linking.removeEventListener('url', _redirectHandler);
+    }
     _redirectHandler = null;
   }
 }