From 8548eb5d2ad7c61d5489bd248251b9df074fd19d Mon Sep 17 00:00:00 2001 From: Phillip Pan Date: Thu, 17 Aug 2023 16:59:44 -0700 Subject: [PATCH] delete unused RCTSurfaceHostingView selectors (#38869) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/38869 ## Changelog: [iOS][Breaking]- After [#38866](https://github.com/facebook/react-native/pull/38866) and [#38868](https://github.com/facebook/react-native/pull/38868), these are not needed anymore. instead of depending on the host view and overriding `createSurfaceWithBridge:` in a subclass create a specialized surface, we just rely on composition instead and provide a surface to the hosting view. Reviewed By: mdvacca, cipolleschi Differential Revision: D48140317 fbshipit-source-id: 930c79b3828e0197c5dd2841875b830fc211e2a6 --- .../RCTSurfaceHostingView.h | 17 --------------- .../RCTSurfaceHostingView.mm | 21 ------------------- 2 files changed, 38 deletions(-) diff --git a/packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h b/packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h index 03a8d8eab0c..47096221a7d 100644 --- a/packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h +++ b/packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h @@ -27,13 +27,6 @@ NS_ASSUME_NONNULL_BEGIN */ @interface RCTSurfaceHostingView : UIView -/** - * Create an instance of RCTSurface to be hosted. - */ -+ (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge - moduleName:(NSString *)moduleName - initialProperties:(NSDictionary *)initialProperties; - /** * Designated initializer. * Instantiates a view with given Surface object. @@ -42,16 +35,6 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithSurface:(id)surface sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode NS_DESIGNATED_INITIALIZER; -/** - * Convenience initializer. - * Instantiates a Surface object with given `bridge`, `moduleName`, and - * `initialProperties`, and then use it to instantiate a view. - */ -- (instancetype)initWithBridge:(RCTBridge *)bridge - moduleName:(NSString *)moduleName - initialProperties:(NSDictionary *)initialProperties - sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode; - /** * Surface object which is currently using to power the view. * Read-only. diff --git a/packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm b/packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm index 1056ff08dbb..78f991eecfb 100644 --- a/packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm +++ b/packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm @@ -26,31 +26,10 @@ RCTSurfaceStage _stage; } -+ (id)createSurfaceWithBridge:(RCTBridge *)bridge - moduleName:(NSString *)moduleName - initialProperties:(NSDictionary *)initialProperties -{ - return [[RCTSurface alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties]; -} - RCT_NOT_IMPLEMENTED(-(instancetype)init) RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame) RCT_NOT_IMPLEMENTED(-(nullable instancetype)initWithCoder : (NSCoder *)coder) -- (instancetype)initWithBridge:(RCTBridge *)bridge - moduleName:(NSString *)moduleName - initialProperties:(NSDictionary *)initialProperties - sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode -{ - id surface = [[self class] createSurfaceWithBridge:bridge - moduleName:moduleName - initialProperties:initialProperties]; - if (self = [self initWithSurface:surface sizeMeasureMode:sizeMeasureMode]) { - [surface start]; - } - return self; -} - - (instancetype)initWithSurface:(id)surface sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode {