From 7c953698b41af7187504fa56a9a7c943ae724cd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oskar=20Kwas=CC=81niewski?= <oskarkwasniewski@icloud.com>
Date: Wed, 6 Mar 2024 06:51:31 -0800
Subject: [PATCH] Allow importing RCTAppDelegate in Swift (#43339)

Summary:
This PR fixes importing RCTAppDelegate, cleans up the imports, and properly sets the background color for bridgeless mode when using `RCTRootViewFactory`.

The issue with importing to Swift was that `RCTTurboModuleManager` has C++ in headers which caused Swift to error out.

bypass-github-export-checks

## Changelog:

[IOS] [FIXED] - Allow importing RCTAppDelegate in Swift
[INTERNAL] [REMOVED] - Remove unnecessary imports in AppDelegate
[INTERNAL] [FIXED] - Properly set background color for bridgeless

Pull Request resolved: https://github.com/facebook/react-native/pull/43339

Test Plan:
- CI Green
- Check if background color is correct

Reviewed By: dmytrorykun

Differential Revision: D54584489

Pulled By: cipolleschi

fbshipit-source-id: cb4b947ca9d0f375b1852dbf5a7d889e920562f7
---
 .../AppDelegate/RCTAppDelegate+Protected.h        |  4 ++++
 .../Libraries/AppDelegate/RCTAppDelegate.mm       | 15 +--------------
 .../Libraries/AppDelegate/RCTRootViewFactory.mm   |  1 +
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate+Protected.h b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate+Protected.h
index e74c9c8b43207d..2321b43c4da971 100644
--- a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate+Protected.h
+++ b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate+Protected.h
@@ -5,8 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#if defined(__cplusplus)
+
 #import <ReactCommon/RCTTurboModuleManager.h>
 #import "RCTAppDelegate.h"
 
 @interface RCTAppDelegate () <RCTTurboModuleManagerDelegate>
 @end
+
+#endif
diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
index f4ea71c1c896b8..64b9ccceca897a 100644
--- a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
+++ b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
@@ -7,13 +7,12 @@
 
 #import "RCTAppDelegate.h"
 #import <React/RCTColorSpaceUtils.h>
-#import <React/RCTCxxBridgeDelegate.h>
 #import <React/RCTLog.h>
 #import <React/RCTRootView.h>
 #import <React/RCTSurfacePresenterBridgeAdapter.h>
 #import <React/RCTUtils.h>
+#import <objc/runtime.h>
 #import <react/renderer/graphics/ColorComponents.h>
-#import <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #import "RCTAppDelegate+Protected.h"
 #import "RCTAppSetupUtils.h"
 
@@ -22,26 +21,14 @@
 #else
 #import <React/CoreModulesPlugins.h>
 #endif
-#import <React/RCTBundleURLProvider.h>
 #import <React/RCTComponentViewFactory.h>
 #import <React/RCTComponentViewProtocol.h>
-#import <React/RCTFabricSurface.h>
-#import <React/RCTSurfaceHostingProxyRootView.h>
-#import <React/RCTSurfacePresenter.h>
-#import <ReactCommon/RCTContextContainerHandling.h>
 #if USE_HERMES
 #import <ReactCommon/RCTHermesInstance.h>
 #else
 #import <ReactCommon/RCTJscInstance.h>
 #endif
-#import <ReactCommon/RCTHost+Internal.h>
-#import <ReactCommon/RCTHost.h>
-#import <ReactCommon/RCTTurboModuleManager.h>
-#import <react/config/ReactNativeConfig.h>
 #import <react/nativemodule/featureflags/NativeReactNativeFeatureFlags.h>
-#import <react/renderer/runtimescheduler/RuntimeScheduler.h>
-#import <react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h>
-#import <react/runtime/JSRuntimeFactory.h>
 
 @interface RCTAppDelegate () <RCTComponentViewFactoryComponentProvider>
 @end
diff --git a/packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm b/packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm
index e8ebdefba1dc7e..c71ea624423433 100644
--- a/packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm
+++ b/packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.mm
@@ -131,6 +131,7 @@ - (UIView *)viewWithModuleName:(NSString *)moduleName
         initWithSurface:surface
         sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact];
 
+    surfaceHostingProxyRootView.backgroundColor = [UIColor systemBackgroundColor];
     return surfaceHostingProxyRootView;
   }