@callstack/react-native-brownfield 5.1.0 → 5.1.1

package/ios/Views/ReactNativeViewController.swift

@@ -7,6 +7,25 @@ internal import EXUpdates
 @objc public class ReactNativeViewController: UIViewController {
   private var moduleName: String
   private var initialProperties: [String: Any]?
+  /// Identifies this surface in `BrownfieldSurfaceRegistry`, which decides
+  /// which single surface may act on `popToNative()`.
+  private var surfaceID: BrownfieldSurfaceID?
+
+  /// Set by `ReactNativeView`. SwiftUI owns its navigation state, so an
+  /// imperative `popViewController` is reverted; the SwiftUI host dismisses
+  /// instead and this controller stands down.
+  internal var isHostedBySwiftUI = false
+
+  /// True from the start of a disappearance transition until the surface next
+  /// appears. `view.window` stays non-nil for the whole animation, so this is
+  /// what distinguishes "the host already dismissed us" from "nothing happened".
+  private var isDisappearing = false
+
+  /// Whether this surface is the one allowed to act on `popToNative()`.
+  internal var isPopTarget: Bool {
+    guard let surfaceID else { return false }
+    return BrownfieldSurfaceRegistry.shared.isPopTarget(surfaceID)
+  }
 
 #if canImport(EXUpdates)
   private let expoUpdatesDelegate = ReactNativeExpoUpdatesDelegate()
@@ -39,6 +58,12 @@ internal import EXUpdates
 #if !canImport(EXUpdates)
       renderReactNativeView()
 #endif
+
+      // Visibility is resolved live: SwiftUI recreates hosted controllers, so a
+      // cached lifecycle flag is stale when the notification arrives.
+      surfaceID = BrownfieldSurfaceRegistry.shared.register { [weak self] in
+        self?.viewIfLoaded?.window != nil
+      }
         
       NotificationCenter.default.addObserver(
         self,
@@ -56,8 +81,31 @@ internal import EXUpdates
     }
   }
 
+  public override func viewWillAppear(_ animated: Bool) {
+    super.viewWillAppear(animated)
+
+    isDisappearing = false
+
+    // Ordered here rather than in `viewDidAppear`: during a modal presentation
+    // the covered surface is still in a window, so waiting for `viewDidAppear`
+    // would let it out-rank the surface being presented over it.
+    if let surfaceID {
+      BrownfieldSurfaceRegistry.shared.markShown(surfaceID)
+    }
+  }
+
+  public override func viewWillDisappear(_ animated: Bool) {
+    super.viewWillDisappear(animated)
+
+    isDisappearing = true
+  }
+
   deinit {
     NotificationCenter.default.removeObserver(self)
+
+    if let surfaceID {
+      BrownfieldSurfaceRegistry.shared.unregister(surfaceID)
+    }
   }
 
   @objc private func togglePopGestureRecognizer(_ notification: Notification) {
@@ -73,11 +121,82 @@ internal import EXUpdates
     guard let userInfo = notification.userInfo,
           let animated = userInfo["animated"] as? Bool else { return }
 
+    // `.popToNative` is public API, so a host may post it from any thread.
+    // Everything below reads UIKit state — including the registry's visibility
+    // check — so hop to main first.
     DispatchQueue.main.async { [weak self] in
-      self?.navigationController?.popViewController(animated: animated)
+      guard let self else { return }
+
+      // The notification is app-wide, so every live surface receives it. Only
+      // the topmost visible one may act, otherwise surfaces buried under other
+      // screens tear down the whole navigation stack.
+      // https://github.com/callstack/react-native-brownfield/issues/354
+      let target = BrownfieldSurfaceRegistry.shared.popTarget()
+
+      guard let surfaceID = self.surfaceID, target == surfaceID else {
+        if target == nil {
+          NSLog("[ReactBrownfield] popToNative(): no React Native surface is on screen; ignoring.")
+        }
+        return
+      }
+
+      guard self.isHostedBySwiftUI else {
+        self.popFromNativeNavigationStack(animated: animated)
+        return
+      }
+
+      // SwiftUI owns its navigation state and reverts an imperative pop, so the
+      // SwiftUI host dismisses instead. It cannot always succeed though — a
+      // `ReactNativeView` inside a `UIHostingController` pushed onto a UIKit
+      // navigation stack has nothing for `dismiss()` to act on. Give the host a
+      // moment, then fall back, so `popToNative()` is never silently inert.
+      //
+      // `isDisappearing` — not the delay — is what makes this safe: a dismiss
+      // that is merely slow has already begun its transition by the time this
+      // runs, so a late timer stands down instead of popping a second entry.
+      DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { [weak self] in
+        guard let self,
+              !self.isDisappearing,
+              self.viewIfLoaded?.window != nil,
+              // Re-established: the entitlement was resolved before the wait.
+              self.isPopTarget else { return }
+
+        self.popFromNativeNavigationStack(animated: animated)
+      }
     }
   }
 
+  /// Pops this surface off the host's `UINavigationController`.
+  ///
+  /// Deliberately does not fall back to `dismiss()` when there is no navigation
+  /// stack: `presentingViewController` is inherited, so an inline surface hosted
+  /// inside a presented native screen would tear down that whole screen — the
+  /// same over-dismissal this fix exists to prevent.
+  private func popFromNativeNavigationStack(animated: Bool) {
+    guard let navigationController else { return }
+
+    // This controller is usually a child of a host controller (SwiftUI wraps it
+    // in one), so find the stack entry containing it rather than assuming it is
+    // itself on the stack — and pop to the entry below that, so a screen pushed
+    // while we were waiting is not the one that gets popped.
+    let stack = navigationController.viewControllers
+    guard let index = stack.firstIndex(where: { $0 === self || self.isDescendant(of: $0) }),
+          index > 0 else { return }
+
+    navigationController.popToViewController(stack[index - 1], animated: animated)
+  }
+
+  private func isDescendant(of controller: UIViewController) -> Bool {
+    var ancestor = parent
+
+    while let current = ancestor {
+      if current === controller { return true }
+      ancestor = current.parent
+    }
+
+    return false
+  }
+
   private func renderReactNativeView() {
     guard !moduleName.isEmpty else { return }
     

package/lib/commonjs/expo-config-plugin/android/utils/constants.js

@@ -1,2 +1,2 @@
-Object.defineProperty(exports,"__esModule",{value:true});exports.brownfieldGradlePluginDependency=exports.BROWNFIELD_PLUGIN_VERSION=void 0;var BROWNFIELD_PLUGIN_VERSION=exports.BROWNFIELD_PLUGIN_VERSION='2.0.0-alpha08';var brownfieldGradlePluginDependency=exports.brownfieldGradlePluginDependency=`classpath("com.callstack.react:brownfield-gradle-plugin:${BROWNFIELD_PLUGIN_VERSION}")`;
+Object.defineProperty(exports,"__esModule",{value:true});exports.brownfieldGradlePluginDependency=exports.BROWNFIELD_PLUGIN_VERSION=void 0;var BROWNFIELD_PLUGIN_VERSION=exports.BROWNFIELD_PLUGIN_VERSION='2.0.0-alpha09';var brownfieldGradlePluginDependency=exports.brownfieldGradlePluginDependency=`classpath("com.callstack.react:brownfield-gradle-plugin:${BROWNFIELD_PLUGIN_VERSION}")`;
 //# sourceMappingURL=constants.js.map

package/lib/module/expo-config-plugin/android/utils/constants.js

@@ -1,2 +1,2 @@
-Object.defineProperty(exports,"__esModule",{value:true});exports.brownfieldGradlePluginDependency=exports.BROWNFIELD_PLUGIN_VERSION=void 0;var BROWNFIELD_PLUGIN_VERSION=exports.BROWNFIELD_PLUGIN_VERSION='2.0.0-alpha08';var brownfieldGradlePluginDependency=exports.brownfieldGradlePluginDependency=`classpath("com.callstack.react:brownfield-gradle-plugin:${BROWNFIELD_PLUGIN_VERSION}")`;
+Object.defineProperty(exports,"__esModule",{value:true});exports.brownfieldGradlePluginDependency=exports.BROWNFIELD_PLUGIN_VERSION=void 0;var BROWNFIELD_PLUGIN_VERSION=exports.BROWNFIELD_PLUGIN_VERSION='2.0.0-alpha09';var brownfieldGradlePluginDependency=exports.brownfieldGradlePluginDependency=`classpath("com.callstack.react:brownfield-gradle-plugin:${BROWNFIELD_PLUGIN_VERSION}")`;
 //# sourceMappingURL=constants.js.map

package/lib/typescript/commonjs/src/expo-config-plugin/android/utils/constants.d.ts

@@ -1,3 +1,3 @@
-export declare const BROWNFIELD_PLUGIN_VERSION = "2.0.0-alpha08";
-export declare const brownfieldGradlePluginDependency = "classpath(\"com.callstack.react:brownfield-gradle-plugin:2.0.0-alpha08\")";
+export declare const BROWNFIELD_PLUGIN_VERSION = "2.0.0-alpha09";
+export declare const brownfieldGradlePluginDependency = "classpath(\"com.callstack.react:brownfield-gradle-plugin:2.0.0-alpha09\")";
 //# sourceMappingURL=constants.d.ts.map

package/lib/typescript/module/src/expo-config-plugin/android/utils/constants.d.ts

@@ -1,3 +1,3 @@
-export declare const BROWNFIELD_PLUGIN_VERSION = "2.0.0-alpha08";
-export declare const brownfieldGradlePluginDependency = "classpath(\"com.callstack.react:brownfield-gradle-plugin:2.0.0-alpha08\")";
+export declare const BROWNFIELD_PLUGIN_VERSION = "2.0.0-alpha09";
+export declare const brownfieldGradlePluginDependency = "classpath(\"com.callstack.react:brownfield-gradle-plugin:2.0.0-alpha09\")";
 //# sourceMappingURL=constants.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@callstack/react-native-brownfield",
-  "version": "5.1.0",
+  "version": "5.1.1",
   "license": "MIT",
   "author": "Michal Chudziak <mike.chudziak@callstack.com>",
   "bin": {
@@ -89,7 +89,7 @@
     "@expo/config-plugins": ">=54 <100"
   },
   "dependencies": {
-    "@callstack/brownfield-cli": "^5.1.0"
+    "@callstack/brownfield-cli": "^5.1.1"
   },
   "devDependencies": {
     "@babel/core": "^7.29.6",

package/src/expo-config-plugin/android/utils/constants.ts

@@ -1,2 +1,2 @@
-export const BROWNFIELD_PLUGIN_VERSION = '2.0.0-alpha08';
+export const BROWNFIELD_PLUGIN_VERSION = '2.0.0-alpha09';
 export const brownfieldGradlePluginDependency = `classpath("com.callstack.react:brownfield-gradle-plugin:${BROWNFIELD_PLUGIN_VERSION}")`;