kill RCTFabricSurfaceHostingProxyRootView

Differential Revision: D48139820 fbshipit-source-id: a26abb34ec82ec4ecc6b609eac4798707ce6ae02
philIip · Aug 9, 2023 · 855d8ff · 855d8ff
1 parent baa2714
commit 855d8ff
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 41 deletions.
diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
@@ -17,7 +17,6 @@
 #import <React/RCTComponentViewProtocol.h>
 #import <React/RCTCxxBridgeDelegate.h>
 #import <React/RCTFabricSurface.h>
-#import <React/RCTFabricSurfaceHostingProxyRootView.h>
 #import <React/RCTLegacyViewManagerInteropComponentView.h>
 #import <React/RCTSurfaceHostingProxyRootView.h>
 #import <React/RCTSurfacePresenter.h>

diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm
@@ -20,7 +20,8 @@
 #import <React/RCTNetworking.h>
 
 // Fabric
-#import <React/RCTFabricSurfaceHostingProxyRootView.h>
+#import <React/RCTFabricSurface.h>
+#import <React/RCTSurfaceHostingProxyRootView.h>
 #import <react/renderer/runtimescheduler/RuntimeScheduler.h>
 #import <react/renderer/runtimescheduler/RuntimeSchedulerBinding.h>
 #endif
@@ -68,9 +69,10 @@ void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled)
 {
 #if RCT_NEW_ARCH_ENABLED
   if (fabricEnabled) {
-    return [[RCTFabricSurfaceHostingProxyRootView alloc] initWithBridge:bridge
-                                                             moduleName:moduleName
-                                                      initialProperties:initialProperties];
+    id<RCTSurfaceProtocol> surface = [[RCTFabricSurface alloc] initWithBridge:bridge
+                                                                   moduleName:moduleName
+                                                            initialProperties:initialProperties];
+    return [[RCTSurfaceHostingProxyRootView alloc] initWithSurface:surface];
   }
 #endif
   return [[RCTRootView alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];

diff --git a/packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h b/packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
@@ -58,6 +58,8 @@ NS_ASSUME_NONNULL_BEGIN
                 sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
                  moduleRegistry:(RCTModuleRegistry *)moduleRegistry;
 
+- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface;
+
 - (void)cancelTouches;
 
 @end

diff --git a/...ages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm b/...ages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
@@ -104,6 +104,15 @@ - (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
   return self;
 }
 
+- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
+{
+  if (self = [super initWithSurface:surface
+                    sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact]) {
+    [surface start];
+  }
+  return self;
+}
+
 - (BOOL)hasBridge
 {
   return _bridge != nil;

diff --git a/packages/react-native/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h b/packages/react-native/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.h
diff --git a/packages/react-native/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.mm b/packages/react-native/React/Fabric/Surface/RCTFabricSurfaceHostingProxyRootView.mm