@callstack/react-native-brownfield 1.0.0-rc.1 → 1.0.0-rc.2

package/ReactBrownfield.podspec

@@ -15,8 +15,13 @@ Pod::Spec.new do |spec|
   spec.module_name = "ReactBrownfield"
   spec.source       = { :git => "git@github.com:callstack/react-native-brownfield.git", :tag => "#{spec.version}" }
   spec.source_files  = "ios/**/*.{h,m,mm,swift}"
-  spec.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
+  spec.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    'OTHER_SWIFT_FLAGS' => "-enable-experimental-feature AccessLevelOnImport"
+  }
 
   spec.dependency 'ReactAppDependencyProvider'
+  add_dependency(spec, "React-RCTAppDelegate")
+
   install_modules_dependencies(spec)
 end

package/ios/ReactNativeBrownfield.swift

@@ -1,16 +1,44 @@
-import React
-import React_RCTAppDelegate
-import ReactAppDependencyProvider
+import UIKit
+internal import React
+internal import React_RCTAppDelegate
+internal import ReactAppDependencyProvider
 
-@objc public class ReactNativeBrownfield: RCTDefaultReactNativeFactoryDelegate {
-  @objc public static let shared = ReactNativeBrownfield()
-  private var onBundleLoaded: (() -> Void)?
+class ReactNativeBrownfieldDelegate: RCTDefaultReactNativeFactoryDelegate {
+  var entryFile = "index"
+  // MARK: - RCTReactNativeFactoryDelegate Methods
+  
+  override func sourceURL(for bridge: RCTBridge) -> URL? {
+    return bundleURL()
+  }
+  
+  public override func bundleURL() -> URL? {
+#if DEBUG
+    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: entryFile)
+#else
+    let resourceURLComponents = bundlePath.components(separatedBy: ".")
+    let withoutLast = resourceURLComponents[..<(resourceURLComponents.count - 1)]
+    let resourceName = withoutLast.joined()
+    let fileExtension = resourceURLComponents.last ?? ""
+    
+    return Bundle.main.url(forResource: resourceName, withExtension: fileExtension)
+#endif
+  }
+}
 
+@objc public class ReactNativeBrownfield: NSObject {
+  public static let shared = ReactNativeBrownfield()
+  private var onBundleLoaded: (() -> Void)?
+  private var delegate = ReactNativeBrownfieldDelegate()
+  
   /**
    * Path to JavaScript root.
    * Default value: "index"
    */
-  @objc public var entryFile: String = "index"
+  @objc public var entryFile: String = "index" {
+    didSet {
+      delegate.entryFile = entryFile
+    }
+  }
   /**
    * Path to bundle fallback resource.
    * Default value: nil
@@ -25,14 +53,14 @@ import ReactAppDependencyProvider
    * React Native factory instance created when starting React Native.
    * Default value: nil
    */
-  @objc public var reactNativeFactory: RCTReactNativeFactory? = nil
+  private var reactNativeFactory: RCTReactNativeFactory? = nil
   /**
    * Root view factory used to create React Native views.
    */
-  @objc lazy public var rootViewFactory: RCTRootViewFactory? = {
+  lazy private var rootViewFactory: RCTRootViewFactory? = {
     return reactNativeFactory?.rootViewFactory
   }()
-
+  
   /**
    * Starts React Native with default parameters.
    */
@@ -40,9 +68,21 @@ import ReactAppDependencyProvider
     startReactNative(onBundleLoaded: nil)
   }
   
+  @objc public func view(
+    moduleName: String,
+    initialProps: [AnyHashable: Any]?,
+    launchOptions: [AnyHashable: Any]? = nil
+  ) -> UIView? {
+    reactNativeFactory?.rootViewFactory.view(
+      withModuleName: moduleName,
+      initialProperties: initialProps,
+      launchOptions: launchOptions
+    )
+  }
+  
   /**
    * Starts React Native with optional callback when bundle is loaded.
-   * 
+   *
    * @param onBundleLoaded Optional callback invoked after JS bundle is fully loaded.
    */
   @objc public func startReactNative(onBundleLoaded: (() -> Void)?) {
@@ -51,15 +91,15 @@ import ReactAppDependencyProvider
   
   /**
    * Starts React Native with optional callback and launch options.
-   * 
+   *
    * @param onBundleLoaded Optional callback invoked after JS bundle is fully loaded.
    * @param launchOptions Launch options, typically passed from AppDelegate.
    */
   @objc public func startReactNative(onBundleLoaded: (() -> Void)?, launchOptions: [AnyHashable: Any]?) {
     guard reactNativeFactory == nil else { return }
     
-    self.dependencyProvider = RCTAppDependencyProvider()
-    self.reactNativeFactory = RCTReactNativeFactory(delegate: self)
+    delegate.dependencyProvider = RCTAppDependencyProvider()
+    self.reactNativeFactory = RCTReactNativeFactory(delegate: delegate)
     
     if let onBundleLoaded {
       self.onBundleLoaded = onBundleLoaded
@@ -86,25 +126,6 @@ import ReactAppDependencyProvider
     onBundleLoaded = nil
     NotificationCenter.default.removeObserver(self)
   }
-  
-  // MARK: - RCTReactNativeFactoryDelegate Methods
-  
-  @objc public override func sourceURL(for bridge: RCTBridge) -> URL? {
-    return bundleURL()
-  }
-  
-  public override func bundleURL() -> URL? {
-#if DEBUG
-    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: entryFile)
-#else
-    let resourceURLComponents = bundlePath.components(separatedBy: ".")
-    let withoutLast = resourceURLComponents[..<(resourceURLComponents.count - 1)]
-    let resourceName = withoutLast.joined()
-    let fileExtension = resourceURLComponents.last ?? ""
-    
-    return Bundle.main.url(forResource: resourceName, withExtension: fileExtension)
-#endif
-  }
 }
 
 extension Notification.Name {

package/ios/ReactNativeBrownfieldModule.h

@@ -1,6 +1,5 @@
 #ifdef __cplusplus
 
-#import <React-RCTAppDelegate/RCTDefaultReactNativeFactoryDelegate.h>
 #import <ReactNativeBrownfield/ReactNativeBrownfield.h>
 
 @interface ReactNativeBrownfieldModule : NSObject <NativeReactNativeBrownfieldModuleSpec>

package/ios/ReactNativeBrownfieldModule.swift

@@ -1,4 +1,4 @@
-import React
+internal import React
 
 @objcMembers
 public class ReactNativeBrownfieldModuleImpl: NSObject {
@@ -8,7 +8,7 @@ public class ReactNativeBrownfieldModuleImpl: NSObject {
       NotificationCenter.default.post(name: Notification.Name.togglePopGestureRecognizer, object: nil, userInfo: userInfo)
     }
   }
-  
+
   static public func popToNative(animated: Bool) {
     let userInfo = ["animated": animated]
     DispatchQueue.main.async {

package/ios/ReactNativeViewController.swift

@@ -1,38 +1,37 @@
 import UIKit
-import React
+internal import React
 
 @objc public class ReactNativeViewController: UIViewController {
   private var moduleName: String
   private var initialProperties: [String: Any]?
-  
+
   @objc public init(moduleName: String, initialProperties: [String: Any]? = nil) {
     self.moduleName = moduleName
     self.initialProperties = initialProperties
     super.init(nibName: nil, bundle: nil)
   }
-  
+
   required init?(coder: NSCoder) {
     fatalError("init(coder:) has not been implemented")
   }
-  
+
   public override func viewDidLoad() {
     super.viewDidLoad()
-    
-    guard let factory = ReactNativeBrownfield.shared.rootViewFactory else {
-      print("Error: You need to start React Native in order to use ReactNativeViewController, make sure to run BridgeManager.shared.startReactNative() before instantiating it.")
-      return
-    }
-    
+
     if !moduleName.isEmpty {
-      view = factory.view(withModuleName: moduleName, initialProperties: initialProperties)
-      
+      view = ReactNativeBrownfield.shared.view(
+        moduleName: moduleName,
+        initialProps: initialProperties,
+        launchOptions: nil
+      )
+
       NotificationCenter.default.addObserver(
         self,
         selector: #selector(togglePopGestureRecognizer(_:)),
         name: NSNotification.Name.togglePopGestureRecognizer,
         object: nil
       )
-      
+
       NotificationCenter.default.addObserver(
         self,
         selector: #selector(popToNative(_:)),
@@ -41,24 +40,24 @@ import React
       )
     }
   }
-  
+
   deinit {
     NotificationCenter.default.removeObserver(self)
   }
-  
+
   @objc private func togglePopGestureRecognizer(_ notification: Notification) {
     guard let userInfo = notification.userInfo,
           let enabled = userInfo["enabled"] as? Bool else { return }
-    
+
     DispatchQueue.main.async { [weak self] in
       self?.navigationController?.interactivePopGestureRecognizer?.isEnabled = enabled
     }
   }
-  
+
   @objc private func popToNative(_ notification: Notification) {
     guard let userInfo = notification.userInfo,
           let animated = userInfo["animated"] as? Bool else { return }
-    
+
     DispatchQueue.main.async { [weak self] in
       self?.navigationController?.popViewController(animated: animated)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@callstack/react-native-brownfield",
-  "version": "1.0.0-rc.1",
+  "version": "1.0.0-rc.2",
   "license": "MIT",
   "author": "Michal Chudziak <mike.chudziak@callstack.com>",
   "contributors": [