Switch to new architecture only

Author: zoontek

RNSwanBrowser.podspec

@@ -11,16 +11,12 @@ Pod::Spec.new do |s|
   s.author       = package["author"]
   s.homepage     = package["homepage"]
 
-  s.platforms    = { :ios => "12.4", :tvos => "12.4" }
+  s.platforms    = { :ios => "15.1", :tvos => "15.1" }
   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"
 
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    install_modules_dependencies(s)
-  else
-    s.dependency   "React-Core"
-  end
+  install_modules_dependencies(s)
 end

ios/RNSwanBrowser.h

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

ios/RNSwanBrowser.mm

@@ -9,9 +9,7 @@ @interface RNSwanBrowser() <SFSafariViewControllerDelegate, UIAdaptivePresentati
 
 @end
 
-@implementation RNSwanBrowser {
-  bool hasListeners;
-}
+@implementation RNSwanBrowser
 
 RCT_EXPORT_MODULE();
 
@@ -23,24 +21,9 @@ - (dispatch_queue_t)methodQueue {
   return dispatch_get_main_queue();
 }
 
-- (void)startObserving {
-  hasListeners = YES;
-}
-
-- (void)stopObserving {
-  hasListeners = NO;
-}
-
-- (NSArray<NSString *> *)supportedEvents {
-  return @[@"swanBrowserDidClose"];
-}
-
 - (void)handleOnClose {
   _safariVC = nil;
-
-  if (hasListeners) {
-    [self sendEventWithName:@"swanBrowserDidClose" body:nil];
-  }
+  [self emitOnClose:true];
 }
 
 - (void)presentationControllerDidDismiss:(UIPresentationController *)controller {
@@ -51,7 +34,6 @@ - (void)safariViewControllerDidFinish:(SFSafariViewController *)controller {
   [self handleOnClose];
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
   return std::make_shared<facebook::react::NativeRNSwanBrowserSpecJSI>(params);
 }
@@ -66,18 +48,6 @@ - (void)open:(NSString *)url
   NSNumber *barTintColor = options.barTintColor().has_value() ? [NSNumber numberWithDouble:options.barTintColor().value()] : nil;
   NSNumber *controlTintColor = options.controlTintColor().has_value() ? [NSNumber numberWithDouble:options.controlTintColor().value()] : nil;
 
-#else
-RCT_EXPORT_METHOD(open:(NSString *)url
-                  options:(NSDictionary * _Nonnull)options
-                  resolve:(RCTPromiseResolveBlock)resolve
-                  reject:(RCTPromiseRejectBlock)reject) {
-
-  NSString *animationType = [options valueForKey:@"animationType"];
-  NSString *dismissButtonStyle = [options valueForKey:@"dismissButtonStyle"];
-  NSNumber *barTintColor = [options valueForKey:@"barTintColor"];
-  NSNumber *controlTintColor = [options valueForKey:@"controlTintColor"];
-
-#endif
   if (_safariVC != nil) {
     return reject(@"swan_browser_visible", @"An instance of the swan browser is already visible", nil);
   }
@@ -123,11 +93,7 @@ - (void)open:(NSString *)url
   }
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
 - (void)close {
-#else
-RCT_EXPORT_METHOD(close) {
-#endif
   if (_safariVC != nil) {
     [RCTPresentedViewController() dismissViewControllerAnimated:true completion:^{
       [self handleOnClose];

src/NativeRNSwanBrowser.ts

@@ -1,5 +1,6 @@
 import type { TurboModule } from "react-native";
 import { TurboModuleRegistry } from "react-native";
+import type { EventEmitter } from "react-native/Libraries/Types/CodegenTypes";
 
 type Options = {
   animationType?: string;
@@ -11,9 +12,7 @@ type Options = {
 export interface Spec extends TurboModule {
   open(url: string, options: Options): Promise<null>;
   close(): void;
-  // Events
-  addListener: (eventName: string) => void;
-  removeListeners: (count: number) => void;
+  readonly onClose: EventEmitter<boolean>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>("RNSwanBrowser");

src/index.ts

@@ -1,8 +1,6 @@
-import { Linking, NativeEventEmitter, processColor } from "react-native";
+import { Linking, processColor } from "react-native";
 import NativeModule from "./NativeRNSwanBrowser";
 
-const emitter = new NativeEventEmitter(NativeModule);
-
 export type AnimationType = "fade" | "slide";
 export type DismissButtonStyle = "cancel" | "close" | "done";
 
@@ -48,7 +46,7 @@ export const openBrowser = (url: string, options: Options): Promise<void> => {
       },
     );
 
-    const closeListener = emitter.addListener("swanBrowserDidClose", () => {
+    const closeListener = NativeModule.onClose(() => {
       onClose?.(deeplink);
 
       linkListener.remove();