feat: make RCTSpatial decoupled from RCTMainWindow()

Author: okwasniewski

packages/react-native/Libraries/Spatial/ImmersiveBridge.swift

@@ -0,0 +1,50 @@
+import Foundation
+import SwiftUI
+
+@objc public enum ImmersiveSpaceResult: Int {
+  case opened
+  case userCancelled
+  case error
+}
+
+public typealias CompletionHandlerType = (_ result: ImmersiveSpaceResult) -> Void
+
+struct ImmersiveBridgeView: View {
+  @Environment(\.openImmersiveSpace) private var openImmersiveSpace
+  @Environment(\.dismissImmersiveSpace) private var dismissImmersiveSpace
+  
+  var spaceId: String
+  var completionHandler: CompletionHandlerType
+  
+  var body: some View {
+    EmptyView()
+      .onAppear {
+        Task {
+          let result = await openImmersiveSpace(id: spaceId)
+          
+          switch result {
+          case .opened:
+            completionHandler(.opened)
+          case .error:
+            completionHandler(.error)
+          case .userCancelled:
+            completionHandler(.userCancelled)
+          default:
+            break
+          }
+        }
+      }
+      .onDisappear {
+        Task { await dismissImmersiveSpace() }
+      }
+  }
+}
+
+@objc public class ImmersiveBridgeFactory: NSObject {
+  @objc public static func makeImmersiveBridgeView(
+    spaceId: String,
+    completionHandler: @escaping CompletionHandlerType
+  ) -> UIViewController {
+    return UIHostingController(rootView: ImmersiveBridgeView(spaceId: spaceId, completionHandler: completionHandler))
+  }
+}

packages/react-native/Libraries/Spatial/RCTSpatialManager.mm

@@ -4,14 +4,14 @@
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
 #import <React/RCTUtils.h>
-
-static NSString *const kOpenImmersiveSpace = @"RCTOpenImmersiveSpaceNotification";
-static NSString *const kDismissImmersiveSpace = @"RCTDismissImmersiveSpaceNotification";
+#import "RCTSpatial-Swift.h"
 
 @interface RCTSpatialManager () <NativeSpatialManagerSpec>
 @end
 
-@implementation RCTSpatialManager
+@implementation RCTSpatialManager {
+  UIViewController *_immersiveBridgeView;
+}
 
 RCT_EXPORT_MODULE()
 
@@ -23,17 +23,42 @@ @implementation RCTSpatialManager
                   : (RCTPromiseResolveBlock)resolve reject
                   : (RCTPromiseRejectBlock)reject)
 {
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [[NSNotificationCenter defaultCenter] postNotificationName:kDismissImmersiveSpace object:self];
+  RCTExecuteOnMainQueue(^{
+    [self->_immersiveBridgeView willMoveToParentViewController:nil];
+    [self->_immersiveBridgeView.view removeFromSuperview];
+    [self->_immersiveBridgeView removeFromParentViewController];
+    self->_immersiveBridgeView = nil;
+    
+    resolve(nil);
   });
 }
 
 RCT_EXPORT_METHOD(openImmersiveSpace
                   : (NSString *)sceneId resolve
                   : (RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject)
 {
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [[NSNotificationCenter defaultCenter] postNotificationName:kOpenImmersiveSpace object:self userInfo:@{@"sceneId": sceneId}];
+  RCTExecuteOnMainQueue(^{
+    UIWindow *keyWindow = RCTKeyWindow();
+    UIViewController *rootViewController = keyWindow.rootViewController;
+    
+    if (self->_immersiveBridgeView == nil) {
+      self->_immersiveBridgeView = [ImmersiveBridgeFactory makeImmersiveBridgeViewWithSpaceId:sceneId
+                                                                         completionHandler:^(enum ImmersiveSpaceResult result){
+        if (result == ImmersiveSpaceResultError) {
+          reject(@"ERROR", @"Immersive Space failed to open, the system cannot fulfill the request.", nil);
+        } else if (result == ImmersiveSpaceResultUserCancelled) {
+          reject(@"ERROR", @"Immersive Space canceled by user", nil);
+        } else if (result == ImmersiveSpaceResultOpened) {
+          resolve(nil);
+        }
+      }];
+      
+      [rootViewController.view addSubview:self->_immersiveBridgeView.view];
+      [rootViewController addChildViewController:self->_immersiveBridgeView];
+      [self->_immersiveBridgeView didMoveToParentViewController:rootViewController];
+    } else {
+      reject(@"ERROR", @"Immersive Space already opened", nil);
+    }
   });
 }
 

packages/react-native/Libraries/Spatial/React-RCTSpatial.podspec

@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
   s.platforms              = min_supported_versions
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
-  s.source_files           = "*.{m,mm}"
+  s.source_files           = "*.{m,mm,swift}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "RCTSpatial"
   s.pod_target_xcconfig    = {

packages/react-native/Libraries/SwiftExtensions/RCTMainWindow.swift

@@ -2,11 +2,6 @@ import SwiftUI
 import React
 
 
-extension NSNotification.Name {
-    static let openImmersiveSpace = NSNotification.Name("RCTOpenImmersiveSpaceNotification")
-    static let dismissImmersiveSpace = NSNotification.Name("RCTDismissImmersiveSpaceNotification")
-}
-
 /**
  This SwiftUI struct returns main React Native scene. It should be used only once as it conains setup code.
 
@@ -36,24 +31,6 @@ public struct RCTMainWindow: Scene {
   public var body: some Scene {
     WindowGroup {
       RCTRootViewRepresentable(moduleName: moduleName, initialProps: initialProps)
-        .modifier(EnvironmentListener())
     }
   }
 }
-
-struct EnvironmentListener: ViewModifier {
-  @Environment(\.openImmersiveSpace) private var openImmersiveSpace
-  @Environment(\.dismissImmersiveSpace) private var dismissImmersiveSpace
-  
-  func body(content: Content) -> some View {
-    content
-      .onReceive(NotificationCenter.default.publisher(for: .openImmersiveSpace)) { data in
-        print("open immersive space")
-        Task { await openImmersiveSpace(id: "ImmersiveSpace") }
-      }
-      .onReceive(NotificationCenter.default.publisher(for: .dismissImmersiveSpace)) { data in
-        print("dismiss immersive space")
-        Task { await dismissImmersiveSpace() }
-      }
-  }
-}

packages/react-native/Libraries/SwiftExtensions/React-RCTSwiftExtensions.podspec

@@ -24,4 +24,5 @@ Pod::Spec.new do |s|
   s.frameworks = ["UIKit", "SwiftUI"]
 
   s.dependency "React-Core"
+  s.dependency "React-RCTSpatial" 
 end