@callstack/react-native-brownfield 3.5.0 → 3.6.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @callstack/react-native-brownfield
 
+## 3.6.0
+
+### Minor Changes
+
+- [#301](https://github.com/callstack/react-native-brownfield/pull/301) [`c8816e9`](https://github.com/callstack/react-native-brownfield/commit/c8816e9418a472e0e8a388db105121381243e496) Thanks [@marcinszalski-callstack](https://github.com/marcinszalski-callstack)! - feat: add method to deallocate reactNativeFactory instance
+
+### Patch Changes
+
+- Updated dependencies [[`5ac357b`](https://github.com/callstack/react-native-brownfield/commit/5ac357bb8802ecf3562d92be191f6681ae94a055)]:
+  - @callstack/brownfield-cli@3.6.0
+
+## 3.5.1
+
+### Patch Changes
+
+- [#288](https://github.com/callstack/react-native-brownfield/pull/288) [`096cc3b`](https://github.com/callstack/react-native-brownfield/commit/096cc3bbf580d9bf22374fa8b67021d2f29e211c) Thanks [@marcinszalski-callstack](https://github.com/marcinszalski-callstack)! - fix: restore back-button propagation from native to RN
+
+- Updated dependencies []:
+  - @callstack/brownfield-cli@3.5.1
+
 ## 3.5.0
 
 ### Minor Changes

package/android/src/main/java/com/callstack/reactnativebrownfield/ReactNativeBrownfield.kt

@@ -167,7 +167,7 @@ class ReactNativeBrownfield private constructor(val reactHost: ReactHost) {
         val resolvedDelegate =
             reactDelegate ?: ReactDelegateWrapper(activity, reactHost, moduleName, launchOptions)
 
-        val mBackPressedCallback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
+        val backPressedCallback: OnBackPressedCallback = object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 // invoked for JS stack back navigation
                 resolvedDelegate.onBackPressed()
@@ -175,11 +175,12 @@ class ReactNativeBrownfield private constructor(val reactHost: ReactHost) {
         }
 
         // Register back press callback
-        activity?.onBackPressedDispatcher?.addCallback(mBackPressedCallback)
+        activity?.onBackPressedDispatcher?.addCallback(backPressedCallback)
         // invoked on the last RN screen exit
         resolvedDelegate.setHardwareBackHandler {
-            mBackPressedCallback.isEnabled = false
+            backPressedCallback.isEnabled = false
             activity?.onBackPressedDispatcher?.onBackPressed()
+            backPressedCallback.isEnabled = true
         }
 
         /**

package/ios/ExpoHostRuntime.swift

@@ -28,16 +28,14 @@ final class ExpoHostRuntime {
   public func startReactNative(onBundleLoaded: (() -> Void)?) {
     guard reactNativeFactory == nil else { return }
 
-    let factory = ExpoReactNativeFactory(delegate: delegate)
-    delegate.dependencyProvider = RCTAppDependencyProvider()
-
-    reactNativeFactory = factory
-
     let appDelegate = ExpoAppDelegate()
+    delegate.dependencyProvider = RCTAppDependencyProvider()
+    reactNativeFactory = ExpoReactNativeFactory(delegate: delegate)
     // below: https://github.com/expo/expo/pull/39418/changes/5abd332b55b2ee7daee848284ed5f7fe1639452e
     // has removed bindReactNativeFactory method from ExpoAppDelegate
     #if !EXPO_SDK_GTE_55 // this define comes from the Brownfield Expo config plugin
-      appDelegate.bindReactNativeFactory(factory)
+    guard let reactNativeFactory else { return }
+    appDelegate.bindReactNativeFactory(reactNativeFactory)
     #endif
     expoDelegate = appDelegate
 
@@ -46,6 +44,19 @@ final class ExpoHostRuntime {
     }
   }
 
+  /**
+   * Stops React Native and releases the underlying factory instance.
+   */
+  public func stopReactNative() {
+    if !Thread.isMainThread {
+      DispatchQueue.main.async { [weak self] in self?.stopReactNative() }
+      return
+    }
+
+    reactNativeFactory = nil
+    expoDelegate = nil
+  }
+
   /**
    * Path to JavaScript root.
    * Default value: ".expo/.virtual-metro-entry"
@@ -125,19 +136,19 @@ final class ExpoHostRuntime {
     // below: https://github.com/expo/expo/commit/2013760c46cde1404872d181a691da72fbf207a4
     // has moved the recreateRootView method to ExpoReactNativeFactory
     #if EXPO_SDK_GTE_55 // this define comes from the Brownfield Expo config plugin
-      return (reactNativeFactory as? ExpoReactNativeFactory)?.recreateRootView(
-        withBundleURL: bundleURL,
-        moduleName: moduleName,
-        initialProps: initialProps,
-        launchOptions: launchOptions
-      )
+    return (reactNativeFactory as? ExpoReactNativeFactory)?.recreateRootView(
+      withBundleURL: bundleURL,
+      moduleName: moduleName,
+      initialProps: initialProps,
+      launchOptions: launchOptions
+    )
     #else
-      return expoDelegate?.recreateRootView(
-        withBundleURL: bundleURL,
-        moduleName: moduleName,
-        initialProps: initialProps,
-        launchOptions: launchOptions
-      )
+    return expoDelegate?.recreateRootView(
+      withBundleURL: bundleURL,
+      moduleName: moduleName,
+      initialProps: initialProps,
+      launchOptions: launchOptions
+    )
     #endif
   }
 }

package/ios/ReactNativeBrownfield.swift

@@ -82,6 +82,17 @@ internal import Expo
     #endif
   }
 
+  /**
+   * Stops React Native.
+   */
+  @objc public func stopReactNative() {
+    #if canImport(Expo)
+    ExpoHostRuntime.shared.stopReactNative()
+    #else
+    ReactNativeHostRuntime.shared.stopReactNative()
+    #endif
+  }
+
   @objc public func view(
     moduleName: String,
     initialProps: [AnyHashable: Any]?,

package/ios/ReactNativeHostRuntime.swift

@@ -59,6 +59,7 @@ final class ReactNativeHostRuntime {
       delegate.bundlePath = bundlePath
     }
   }
+
   /**
    * Bundle instance to lookup the JavaScript bundle.
    * Default value: Bundle.main
@@ -68,6 +69,7 @@ final class ReactNativeHostRuntime {
       delegate.bundle = bundle
     }
   }
+
   /**
    * Dynamic bundle URL provider called on every bundle load.
    * When set, this overrides the default bundleURL() behavior in the delegate.
@@ -79,17 +81,12 @@ final class ReactNativeHostRuntime {
       delegate.bundleURLOverride = bundleURLOverride
     }
   }
+
   /**
    * React Native factory instance created when starting React Native.
    * 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
-  }()
 
   /**
    * Starts React Native with default parameters.
@@ -98,12 +95,24 @@ final class ReactNativeHostRuntime {
     startReactNative(onBundleLoaded: nil)
   }
 
+  /**
+   * Stops React Native and releases the underlying factory instance.
+   */
+  public func stopReactNative() {
+    if !Thread.isMainThread {
+      DispatchQueue.main.async { [weak self] in self?.stopReactNative() }
+      return
+    }
+
+    reactNativeFactory = nil
+  }
+
   public func view(
     moduleName: String,
     initialProps: [AnyHashable: Any]?,
     launchOptions: [AnyHashable: Any]? = nil
   ) -> UIView? {
-    rootViewFactory?.view(
+    reactNativeFactory?.rootViewFactory.view(
       withModuleName: moduleName,
       initialProperties: initialProps,
       launchOptions: launchOptions
@@ -145,7 +154,7 @@ final class ReactNativeHostRuntime {
     guard reactNativeFactory == nil else { return }
 
     delegate.dependencyProvider = RCTAppDependencyProvider()
-    self.reactNativeFactory = RCTReactNativeFactory(delegate: delegate)
+    reactNativeFactory = RCTReactNativeFactory(delegate: delegate)
 
     if let onBundleLoaded {
       jsBundleLoadObserver.observeOnce(onBundleLoaded: onBundleLoaded)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@callstack/react-native-brownfield",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "license": "MIT",
   "author": "Michal Chudziak <mike.chudziak@callstack.com>",
   "bin": {
@@ -86,7 +86,7 @@
     "@expo/config-plugins": "^54.0.4"
   },
   "dependencies": {
-    "@callstack/brownfield-cli": "^3.5.0"
+    "@callstack/brownfield-cli": "^3.6.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",