From 735d107a740f22d8e38ce00f0f37918376443a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Kwas=CC=81niewski?= Date: Wed, 6 Mar 2024 14:04:20 +0100 Subject: [PATCH 1/3] fix: allow for importing RCTAppDelegate to Swift --- .../Libraries/AppDelegate/RCTAppDelegate+Protected.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate+Protected.h b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate+Protected.h index e74c9c8b43207d..129504ff4c3e3d 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate+Protected.h +++ b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate+Protected.h @@ -4,9 +4,12 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ +#if defined(__cplusplus) #import #import "RCTAppDelegate.h" @interface RCTAppDelegate () @end + +#endif From 2cee0aa9d7345cd2a692b23ed996b8a8c7431b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Kwas=CC=81niewski?= Date: Wed, 6 Mar 2024 14:04:38 +0100 Subject: [PATCH 2/3] fix: remove unnecessary imports from RCTAppDelegate --- .../Libraries/AppDelegate/RCTAppDelegate.mm | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm index f4ea71c1c896b8..dfd4e5217207ee 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm +++ b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm @@ -7,41 +7,28 @@ #import "RCTAppDelegate.h" #import -#import #import #import #import #import #import -#import #import "RCTAppDelegate+Protected.h" #import "RCTAppSetupUtils.h" +#import #if RN_DISABLE_OSS_PLUGIN_HEADER #import #else #import #endif -#import #import #import -#import -#import -#import -#import #if USE_HERMES #import #else #import #endif -#import -#import -#import -#import #import -#import -#import -#import @interface RCTAppDelegate () @end From bdff5b80f5233b0b90665c8f13abc535269fd0f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Kwas=CC=81niewski?= Date: Wed, 6 Mar 2024 14:05:27 +0100 Subject: [PATCH 3/3] fix: set systemBackground color for RCTRootViewFactory --- .../react-native/Libraries/AppDelegate/RCTRootViewFactory.mm | 1 + 1 file changed, 1 insertion(+) 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; }