chore: refactor factory initializer

Author: Nazar Sydiaha

ios/ReactNativeBrownfield.swift

@@ -32,13 +32,6 @@ class ReactNativeBrownfieldDelegate: RCTDefaultReactNativeFactoryDelegate {
   private var onBundleLoaded: (() -> Void)?
   private var delegate = ReactNativeBrownfieldDelegate()
 
-  private func checkFactoryInitialized(launchOptions: [AnyHashable: Any]? = nil) {
-    if reactNativeFactory == nil {
-      delegate.dependencyProvider = RCTAppDependencyProvider()
-      self.reactNativeFactory = RCTReactNativeFactory(delegate: delegate)
-    }
-  }
-  
   /**
    * Path to JavaScript root.
    * Default value: "index"
@@ -76,12 +69,18 @@ class ReactNativeBrownfieldDelegate: RCTDefaultReactNativeFactoryDelegate {
    * Default value: nil
    */
   private var reactNativeFactory: RCTReactNativeFactory? = nil
-  /**
-   * Root view factory used to create React Native views.
-   */
-  lazy private var rootViewFactory: RCTRootViewFactory? = {
-    return reactNativeFactory?.rootViewFactory
-  }()
+  private var hasStartedReactNative = false
+
+  private var factory: RCTReactNativeFactory {
+    if let existingFactory = reactNativeFactory {
+      return existingFactory
+    }
+
+    delegate.dependencyProvider = RCTAppDependencyProvider()
+    let createdFactory = RCTReactNativeFactory(delegate: delegate)
+    reactNativeFactory = createdFactory
+    return createdFactory
+  }
 
   /**
    * Starts React Native with default parameters.
@@ -95,9 +94,11 @@ class ReactNativeBrownfieldDelegate: RCTDefaultReactNativeFactoryDelegate {
     initialProps: [AnyHashable: Any]?,
     launchOptions: [AnyHashable: Any]? = nil
   ) -> UIView? {
-      checkFactoryInitialized(launchOptions: launchOptions)
-      
-      return reactNativeFactory?.rootViewFactory.view(
+    let resolvedFactory = factory
+
+    let rootViewFactory = resolvedFactory.rootViewFactory
+
+    return rootViewFactory.view(
       withModuleName: moduleName,
       initialProperties: initialProps,
       launchOptions: launchOptions
@@ -120,27 +121,31 @@ class ReactNativeBrownfieldDelegate: RCTDefaultReactNativeFactoryDelegate {
    * @param launchOptions Launch options, typically passed from AppDelegate.
    */
   @objc public func startReactNative(onBundleLoaded: (() -> Void)?, launchOptions: [AnyHashable: Any]?) {
-    guard reactNativeFactory == nil else { return }
-      checkFactoryInitialized(launchOptions: launchOptions)
+    guard !hasStartedReactNative else { return }
+    _ = launchOptions
+    _ = factory
 
     if let onBundleLoaded {
       self.onBundleLoaded = onBundleLoaded
-      if RCTIsNewArchEnabled() {
-        NotificationCenter.default.addObserver(
-          self,
-          selector: #selector(jsLoaded),
-          name: NSNotification.Name("RCTInstanceDidLoadBundle"),
-          object: nil
-        )
-      } else {
-        NotificationCenter.default.addObserver(
-          self,
-          selector: #selector(jsLoaded),
-          name: NSNotification.Name("RCTJavaScriptDidLoadNotification"),
-          object: nil
-        )
+      let notificationName: Notification.Name = RCTIsNewArchEnabled()
+        ? Notification.Name("RCTInstanceDidLoadBundle")
+        : Notification.Name("RCTJavaScriptDidLoadNotification")
+
+      NotificationCenter.default.addObserver(
+        self,
+        selector: #selector(jsLoaded),
+        name: notificationName,
+        object: nil
+      )
+
+      if let bridge = reactNativeFactory?.bridge, !bridge.isLoading {
+        DispatchQueue.main.async { [weak self] in
+          self?.jsLoaded(Notification(name: notificationName))
+        }
       }
     }
+
+    hasStartedReactNative = true
   }
 
   /**
@@ -152,13 +157,17 @@ class ReactNativeBrownfieldDelegate: RCTDefaultReactNativeFactoryDelegate {
       return
     }
 
-    guard let factory = reactNativeFactory else { return }
+    guard let factory = reactNativeFactory else {
+      hasStartedReactNative = false
+      return
+    }
 
     factory.bridge?.invalidate()
 
     NotificationCenter.default.removeObserver(self)
     onBundleLoaded = nil
 
+    hasStartedReactNative = false
     reactNativeFactory = nil
   }