feat: integrate ReactAppDependencyProvider and refactor ReactNativeDelegate

Author: YogendraShelke

MendixNative.podspec

@@ -19,6 +19,7 @@ Pod::Spec.new do |s|
 
   s.dependency "SSZipArchive"
   s.dependency "RNCAsyncStorage"
+  s.dependency "ReactAppDependencyProvider"
 
   install_modules_dependencies(s)
 end

example/ios/MendixNativeExample/AppDelegate.swift

@@ -1,25 +1,13 @@
 import UIKit
 import React
 import MendixNative
-import React_RCTAppDelegate
-import ReactAppDependencyProvider
 
 @main
 class AppDelegate: ReactAppProvider {
 
-    var reactNativeDelegate: ReactNativeDelegate?
-    
     override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
-        
-        
-        let delegate = ReactNativeDelegate()
-        let factory = RCTReactNativeFactory(delegate: delegate)
-        delegate.dependencyProvider = RCTAppDependencyProvider()
-
-        reactNativeDelegate = delegate
-        
-        setUpProvider(reactNativeFactory: factory)
-        guard let bundleUrl = bundleUrl else {
+        setUpProvider()
+        guard let bundleUrl = reactNativeDelegate?.bundleURL() else {
             fatalError("Unable to find index.js")
         }
         let mendixApp = MendixApp.init(
@@ -37,27 +25,4 @@ class AppDelegate: ReactAppProvider {
         ReactNative.shared.start()
         return super.application(application, didFinishLaunchingWithOptions: launchOptions)
     }
-//    
-    var bundleUrl: URL? {
-#if DEBUG
-        RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
-#else
-        Bundle.main.url(forResource: "main", withExtension: "jsbundle")
-#endif
-    }
-}
-
-
-class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
-  override func sourceURL(for bridge: RCTBridge) -> URL? {
-    self.bundleURL()
-  }
-
-  override func bundleURL() -> URL? {
-#if DEBUG
-    RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
-#else
-    Bundle.main.url(forResource: "main", withExtension: "jsbundle")
-#endif
-  }
 }

example/ios/Podfile.lock

@@ -20,6 +20,7 @@ PODS:
     - React-renderercss
     - React-rendererdebug
     - React-utils
+    - ReactAppDependencyProvider
     - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
@@ -2125,7 +2126,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   FBLazyVector: e97c19a5a442429d1988f182a1940fb08df514da
   hermes-engine: a7179a4cd45fa3f8143712e52bd3c2d20b5274a0
-  MendixNative: a9d1f912d97cf141eaa5fc8aedf04ef45108dbbc
+  MendixNative: 0014d648c1ad67c7da144e99603ad636b017b424
   op-sqlite: e9ef65bcf95a97863874cee87841425bb71c8396
   OpenSSL-Universal: 9110d21982bb7e8b22a962b6db56a8aa805afde7
   RCTDeprecation: af44b104091a34482596cd9bd7e8d90c4e9b4bd7

ios/Modules/Helper/ReactAppProvider.swift

@@ -1,6 +1,7 @@
 import UIKit
 import React
 import React_RCTAppDelegate
+import ReactAppDependencyProvider
 
 @objcMembers
 open class ReactAppProvider: UIResponder, UIApplicationDelegate {
@@ -9,18 +10,22 @@ open class ReactAppProvider: UIResponder, UIApplicationDelegate {
 
     public var window: UIWindow?
     public var reactNativeFactory: RCTReactNativeFactory?
+    public var reactNativeDelegate: ReactNativeDelegate?
     public var moduleName: String = defaultName
 
     var reactRootViewName: String = defaultName
 
     public func setUpProvider(
         moduleName: String = ReactAppProvider.defaultName,
-        reactRootViewName: String = ReactAppProvider.defaultName,
-        reactNativeFactory: RCTReactNativeFactory?
+        reactRootViewName: String = ReactAppProvider.defaultName
     ) {
         self.moduleName = moduleName
         self.reactRootViewName = reactRootViewName
-        self.reactNativeFactory = reactNativeFactory
+        let delegate = ReactNativeDelegate()
+        let factory = RCTReactNativeFactory(delegate: delegate)
+        delegate.dependencyProvider = RCTAppDependencyProvider()
+        reactNativeDelegate = delegate
+        reactNativeFactory = factory
         window = MendixReactWindow(frame: UIScreen.main.bounds)
     }
 
@@ -64,3 +69,18 @@ open class ReactAppProvider: UIResponder, UIApplicationDelegate {
         return ReactHostHelper().module(forName: name) as? T
     }
 }
+
+
+public class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
+    public override func sourceURL(for bridge: RCTBridge) -> URL? {
+        self.bundleURL()
+    }
+
+    public override func bundleURL() -> URL? {
+        #if DEBUG
+            RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+        #else
+            Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+        #endif
+    }
+}

ios/Modules/Helper/ReactHostHelper.mm

@@ -8,6 +8,7 @@
 #import "ReactHostHelper.h"
 #import <ReactCommon/RCTHost.h>
 #import <React/RCTReloadCommand.h>
+#import "RCTDefaultReactNativeFactoryDelegate.h"
 #import "RCTReactNativeFactory.h"
 #import "MendixNative-Swift.h"
 #import "MxReload.h"

ios/Modules/ReactNative.swift

@@ -1,7 +1,7 @@
 import UIKit
 import React
 
-public protocol ReactNativeDelegate: AnyObject {
+public protocol ReactNativeDelegateInternal: AnyObject {
     func onAppClosed()
 }
 
@@ -13,7 +13,7 @@ open class ReactNative: NSObject, RCTReloadListener {
     private var mendixOTAEnabled: Bool = false
     private var tapGestureHelper: TapGestureRecognizerHelper?
 
-    public weak var delegate: ReactNativeDelegate?
+    public weak var delegate: ReactNativeDelegateInternal?
 
     // MARK: - Singleton
     public static let shared = ReactNative()