WIP

Author: zoontek

README.md

@@ -30,21 +30,26 @@ import { Button, SafeAreaView } from "react-native";
 import parseUrl from "url-parse";
 
 const App = () => {
-  const handleOnPress = useCallback(() => {
-    openBrowser("https://swan.io", {
-      onClose: (url) => {
-        if (url) {
-          const { protocol, host, query } = parseUrl(url, true);
-          const origin = `${protocol}//${host}`;
-
-          if (origin === "com.company.myapp://close") {
-            console.log(JSON.stringify(query, null, 2));
-          }
+  useEffect(() => {
+    const subscription = Linking.addListener(
+      "url",
+      ({ url }: { url: string }) => {
+        const { protocol, host, query } = parseUrl(url, true);
+        const origin = `${protocol}//${host}`;
+
+        if (origin === "com.company.myapp://close") {
+          console.log(JSON.stringify(query, null, 2));
         }
       },
-    }).catch((error) => {
-      console.error(error);
-    });
+    );
+
+    return () => {
+      subscription.remove();
+    };
+  }, []);
+
+  const handleOnPress = useCallback(() => {
+    openBrowser("https://swan.io").catch((error) => console.error(error));
   }, []);
 
   return (
@@ -57,7 +62,7 @@ const App = () => {
 
 ## API
 
-### openBrowser(url: string, options: Options)
+### openBrowser(url: string, options?: Options)
 
 ```tsx
 import { openBrowser } from "@swan-io/react-native-browser";
@@ -67,14 +72,6 @@ openBrowser("https://swan.io", {
   dismissButtonStyle: "close", // "cancel" | "close" | "done" (default to "close")
   barTintColor: "#FFF", // in-app browser UI background color
   controlTintColor: "#000", // in-app browser buttons color
-  onOpen: () => {
-    // fired on browser opened
-    // useful to switch the StatusBar color, for example
-  },
-  onClose: (url) => {
-    // fired on browser closed
-    // url will be defined if the browser has been closed via deeplink
-  },
 }).catch((error) => {
   console.error(error);
 });
@@ -85,7 +82,7 @@ openBrowser("https://swan.io", {
 
 ## Handle deeplinks
 
-In order to receive deeplink on browser close event, you have to setup them first. We **highly** recommand defining a custom schema + url for this specific task. For example, `com.company.myapp://close`.
+In order to receive deeplink on browser close, you have to setup them first. We **highly** recommand defining a custom schema + url for this specific task. For example, `com.company.myapp://close`.
 
 ### On iOS
 

RNSwanBrowser.podspec

@@ -11,12 +11,16 @@ Pod::Spec.new do |s|
   s.author       = package["author"]
   s.homepage     = package["homepage"]
 
-  s.platforms    = { :ios => "15.1", :tvos => "15.1" }
+  s.platforms    = { :ios => "13.4", :tvos => "13.4" }
   s.requires_arc = true
 
-  s.frameworks   = "SafariServices"
   s.source       = { :git => package["repository"]["url"], :tag => s.version }
   s.source_files = "ios/**/*.{h,m,mm}"
+  s.frameworks   = "SafariServices"
 
-  install_modules_dependencies(s)
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    install_modules_dependencies(s)
+  else
+    s.dependency   "React-Core"
+  end
 end

android/build.gradle

@@ -7,8 +7,8 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet("kotlinVersion", "1.8.0")}")
-        classpath("com.android.tools.build:gradle:7.3.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${safeExtGet("kotlinVersion", "1.9.22")}")
+        classpath("com.android.tools.build:gradle:8.2.1")
     }
 }
 
@@ -24,20 +24,13 @@ if (isNewArchitectureEnabled()) {
 }
 
 android {
+    namespace "io.swan.rnbrowser"
+
     buildToolsVersion safeExtGet("buildToolsVersion", "34.0.0")
     compileSdkVersion safeExtGet("compileSdkVersion", 34)
 
-    if (project.android.hasProperty("namespace")) {
-        namespace "io.swan.rnbrowser"
-
-        buildFeatures {
-            buildConfig true
-        }
-        sourceSets {
-            main {
-                manifest.srcFile "src/main/AndroidManifestNew.xml"
-            }
-        }
+    buildFeatures {
+        buildConfig true
     }
     defaultConfig {
         buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())

android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="io.swan.rnbrowser">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <queries>
         <intent>
             <action android:name="android.support.customtabs.action.CustomTabsService" />

android/src/main/AndroidManifestNew.xml

@@ -79,7 +79,7 @@ GEM
       mutex_m
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.13.1)
+    json (2.13.2)
     logger (1.7.0)
     minitest (5.25.5)
     molinillo (0.8.0)

example/Gemfile.lock

@@ -2456,7 +2456,7 @@ SPEC CHECKSUMS:
   ReactAppDependencyProvider: 8df342c127fd0c1e30e8b9f71ff814c22414a7c0
   ReactCodegen: 439c427ccc115d71d16cc84256e5fbdc7fcef57a
   ReactCommon: 592ef441605638b95e533653259254b4bd35ff4f
-  RNSwanBrowser: 855f0e20b2acd92fcb11fd3a4757dfee64581a93
+  RNSwanBrowser: 48cdb9a43eb0697602371982ecceffdb6566095d
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: a742cc68e8366fcfc681808162492bc0aa7a9498
 

example/ios/Podfile.lock

@@ -1,13 +1,6 @@
 import { openBrowser } from "@swan-io/react-native-browser";
-import * as React from "react";
-import {
-  type StatusBarProps,
-  Button,
-  Platform,
-  SafeAreaView,
-  StatusBar,
-  StyleSheet,
-} from "react-native";
+import { useCallback, useEffect } from "react";
+import { Alert, Button, Linking, SafeAreaView, StyleSheet } from "react-native";
 import parseUrl from "url-parse";
 
 const styles = StyleSheet.create({
@@ -19,37 +12,30 @@ const styles = StyleSheet.create({
 });
 
 export const App = () => {
-  const handleOnPress = React.useCallback(() => {
-    let entry: StatusBarProps | undefined;
+  useEffect(() => {
+    const subscription = Linking.addListener(
+      "url",
+      ({ url }: { url: string }) => {
+        const { protocol, host, query } = parseUrl(url, true);
+        const origin = `${protocol}//${host}`;
 
+        if (origin === "io.swan.rnbrowserexample://close") {
+          Alert.alert("Deeplink received", JSON.stringify(query, null, 2));
+        }
+      },
+    );
+
+    return () => {
+      subscription.remove();
+    };
+  }, []);
+
+  const handleOnPress = useCallback(() => {
     openBrowser("https://swan.io", {
       animationType: "slide",
       dismissButtonStyle: "close",
       barTintColor: "#FFF",
       controlTintColor: "#000",
-      onOpen: () => {
-        entry = StatusBar.pushStackEntry({
-          animated: true,
-          barStyle:
-            Platform.OS === "ios" && Number.parseInt(Platform.Version, 10) >= 13
-              ? "light-content"
-              : "dark-content",
-        });
-      },
-      onClose: (url) => {
-        if (entry) {
-          StatusBar.popStackEntry(entry);
-        }
-
-        if (url) {
-          const { protocol, host, query } = parseUrl(url, true);
-          const origin = `${protocol}//${host}`;
-
-          if (origin === "io.swan.rnbrowserexample://close") {
-            console.log(JSON.stringify(query, null, 2));
-          }
-        }
-      },
     }).catch((error) => {
       console.error(error);
     });

example/src/App.tsx

@@ -1868,9 +1868,9 @@ babel-plugin-transform-flow-enums@^0.0.2:
     "@babel/plugin-syntax-flow" "^7.12.1"
 
 babel-preset-current-node-syntax@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz#9a929eafece419612ef4ae4f60b1862ebad8ef30"
-  integrity sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.1.tgz#204c610030f7e74d4cb1ad7d0ff3c044abf48688"
+  integrity sha512-23fWKohMTvS5s0wwJKycOe0dBdCwQ6+iiLaNR9zy8P13mtFRFM9qLLX6HJX5DL2pi/FNDf3fCQHM4FIMoHH/7w==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-bigint" "^7.8.3"
@@ -3151,12 +3151,12 @@ kleur@^3.0.3:
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
 launch-editor@^2.9.1:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.10.0.tgz#5ca3edfcb9667df1e8721310f3a40f1127d4bc42"
-  integrity sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA==
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.11.0.tgz#1ec15b3ed249b04763453661a9785428b38d5b33"
+  integrity sha512-R/PIF14L6e2eHkhvQPu7jDRCr0msfCYCxbYiLgkkAGi0dVPWuM+RrsPu0a5dpuNe0KWGL3jpAkOlv53xGfPheQ==
   dependencies:
-    picocolors "^1.0.0"
-    shell-quote "^1.8.1"
+    picocolors "^1.1.1"
+    shell-quote "^1.8.3"
 
 leven@^3.1.0:
   version "3.1.0"
@@ -3810,7 +3810,7 @@ path-to-regexp@3.3.0:
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.3.0.tgz#f7f31d32e8518c2660862b644414b6d5c63a611b"
   integrity sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==
 
-picocolors@^1.0.0, picocolors@^1.1.1:
+picocolors@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
   integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
@@ -4251,7 +4251,7 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.6.1, shell-quote@^1.8.1:
+shell-quote@^1.6.1, shell-quote@^1.8.3:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.3.tgz#55e40ef33cf5c689902353a3d8cd1a6725f08b4b"
   integrity sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==

example/yarn.lock

@@ -1,9 +1,15 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
 #import <RNSwanBrowserSpec/RNSwanBrowserSpec.h>
 
-NS_ASSUME_NONNULL_BEGIN
+@interface RNSwanBrowser : NSObject <NativeRNSwanBrowserSpec>
+@end
+
+#else
 
-@interface RNSwanBrowser : NativeRNSwanBrowserSpecBase <NativeRNSwanBrowserSpec>
+#import <React/RCTBridgeModule.h>
 
+@interface RNSwanBrowser : NSObject <RCTBridgeModule>
 @end
 
-NS_ASSUME_NONNULL_END
+#endif