From dd7696cb8d18a7ff3e02e10d892b29700d7564f9 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@meta.com>
Date: Wed, 19 Feb 2025 13:29:18 -0800
Subject: [PATCH] move RCTInitializeUIKitProxies to RCTFabricSurface init

Summary:
changelog: [internal]

`RCTSurfacePresenter` may be initialised from a background thread. This breaks the requirement of `RCTInitializeUIKitProxies`, which must be always called on the main thread.

Differential Revision: D69874923
---
 packages/react-native/React/Fabric/RCTSurfacePresenter.mm      | 2 --
 packages/react-native/React/Fabric/Surface/RCTFabricSurface.mm | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-native/React/Fabric/RCTSurfacePresenter.mm b/packages/react-native/React/Fabric/RCTSurfacePresenter.mm
index 11452ab5602d..dbea5607fb98 100644
--- a/packages/react-native/React/Fabric/RCTSurfacePresenter.mm
+++ b/packages/react-native/React/Fabric/RCTSurfacePresenter.mm
@@ -18,7 +18,6 @@
 #import <React/RCTFabricSurface.h>
 #import <React/RCTFollyConvert.h>
 #import <React/RCTI18nUtil.h>
-#import <React/RCTInitializeUIKitProxies.h>
 #import <React/RCTMountingManager.h>
 #import <React/RCTMountingManagerDelegate.h>
 #import <React/RCTScheduler.h>
@@ -65,7 +64,6 @@ - (instancetype)initWithContextContainer:(ContextContainer::Shared)contextContai
               bridgelessBindingsExecutor:(std::optional<RuntimeExecutor>)bridgelessBindingsExecutor
 {
   if (self = [super init]) {
-    RCTInitializeUIKitProxies();
     assert(contextContainer && "RuntimeExecutor must be not null.");
     _runtimeExecutor = runtimeExecutor;
     _bridgelessBindingsExecutor = bridgelessBindingsExecutor;
diff --git a/packages/react-native/React/Fabric/Surface/RCTFabricSurface.mm b/packages/react-native/React/Fabric/Surface/RCTFabricSurface.mm
index 7b3ce5918ce5..3a9c5a939d1d 100644
--- a/packages/react-native/React/Fabric/Surface/RCTFabricSurface.mm
+++ b/packages/react-native/React/Fabric/Surface/RCTFabricSurface.mm
@@ -14,6 +14,7 @@
 #import <React/RCTConversions.h>
 #import <React/RCTFollyConvert.h>
 #import <React/RCTI18nUtil.h>
+#import <React/RCTInitializeUIKitProxies.h>
 #import <React/RCTMountingManager.h>
 #import <React/RCTSurfaceDelegate.h>
 #import <React/RCTSurfaceRootView.h>
@@ -54,6 +55,7 @@ - (instancetype)initWithSurfacePresenter:(RCTSurfacePresenter *)surfacePresenter
                        initialProperties:(NSDictionary *)initialProperties
 {
   if (self = [super init]) {
+    RCTInitializeUIKitProxies();
     _surfacePresenter = surfacePresenter;
 
     _surfaceHandler =