Skip to content

Commit ab6349a

Browse files
philIipfacebook-github-bot
authored andcommitted
delete unused selectors from hosting views (#39118)
Summary: Pull Request resolved: #39118 ## Changelog: [iOS][Breaking]- After [#38866](#38866) and [#38868](#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: christophpurrer Differential Revision: D48577192 fbshipit-source-id: 8dbc96f1844d0ca1ed603cbe446575571c5f3e3b
1 parent 21e3e2f commit ab6349a

File tree

3 files changed

+0
-78
lines changed

3 files changed

+0
-78
lines changed

packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -53,46 +53,6 @@ @implementation RCTSurfaceHostingProxyRootView {
5353
RCTModuleRegistry *_moduleRegistry;
5454
}
5555

56-
- (instancetype)initWithBridge:(RCTBridge *)bridge
57-
moduleName:(NSString *)moduleName
58-
initialProperties:(NSDictionary *)initialProperties
59-
{
60-
RCTAssertMainQueue();
61-
RCTAssert(bridge, @"A bridge instance is required to create an RCTSurfaceHostingProxyRootView");
62-
RCTAssert(moduleName, @"A moduleName is required to create an RCTSurfaceHostingProxyRootView");
63-
64-
RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"-[RCTSurfaceHostingProxyRootView init]", nil);
65-
66-
_bridge = bridge;
67-
_minimumSize = CGSizeZero;
68-
69-
if (!bridge.isLoading) {
70-
[bridge.performanceLogger markStartForTag:RCTPLTTI];
71-
}
72-
73-
// `RCTRootViewSizeFlexibilityNone` is the RCTRootView's default.
74-
RCTSurfaceSizeMeasureMode sizeMeasureMode = convertToSurfaceSizeMeasureMode(RCTRootViewSizeFlexibilityNone);
75-
76-
self = [super initWithBridge:bridge
77-
moduleName:moduleName
78-
initialProperties:initialProperties
79-
sizeMeasureMode:sizeMeasureMode];
80-
81-
RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
82-
83-
return self;
84-
}
85-
86-
- (instancetype)initWithBundleURL:(NSURL *)bundleURL
87-
moduleName:(NSString *)moduleName
88-
initialProperties:(NSDictionary *)initialProperties
89-
launchOptions:(NSDictionary *)launchOptions
90-
{
91-
RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:bundleURL moduleProvider:nil launchOptions:launchOptions];
92-
93-
return [self initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
94-
}
95-
9656
- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
9757
sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
9858
moduleRegistry:(RCTModuleRegistry *)moduleRegistry

packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.h

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ NS_ASSUME_NONNULL_BEGIN
2727
*/
2828
@interface RCTSurfaceHostingView : UIView <RCTSurfaceDelegate>
2929

30-
/**
31-
* Create an instance of RCTSurface to be hosted.
32-
*/
33-
+ (RCTSurface *)createSurfaceWithBridge:(RCTBridge *)bridge
34-
moduleName:(NSString *)moduleName
35-
initialProperties:(NSDictionary *)initialProperties;
36-
3730
/**
3831
* Designated initializer.
3932
* Instantiates a view with given Surface object.
@@ -42,16 +35,6 @@ NS_ASSUME_NONNULL_BEGIN
4235
- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
4336
sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode NS_DESIGNATED_INITIALIZER;
4437

45-
/**
46-
* Convenience initializer.
47-
* Instantiates a Surface object with given `bridge`, `moduleName`, and
48-
* `initialProperties`, and then use it to instantiate a view.
49-
*/
50-
- (instancetype)initWithBridge:(RCTBridge *)bridge
51-
moduleName:(NSString *)moduleName
52-
initialProperties:(NSDictionary *)initialProperties
53-
sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode;
54-
5538
/**
5639
* Surface object which is currently using to power the view.
5740
* Read-only.

packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingView.mm

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,10 @@ @implementation RCTSurfaceHostingView {
2626
RCTSurfaceStage _stage;
2727
}
2828

29-
+ (id<RCTSurfaceProtocol>)createSurfaceWithBridge:(RCTBridge *)bridge
30-
moduleName:(NSString *)moduleName
31-
initialProperties:(NSDictionary *)initialProperties
32-
{
33-
return [[RCTSurface alloc] initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
34-
}
35-
3629
RCT_NOT_IMPLEMENTED(-(instancetype)init)
3730
RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
3831
RCT_NOT_IMPLEMENTED(-(nullable instancetype)initWithCoder : (NSCoder *)coder)
3932

40-
- (instancetype)initWithBridge:(RCTBridge *)bridge
41-
moduleName:(NSString *)moduleName
42-
initialProperties:(NSDictionary *)initialProperties
43-
sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
44-
{
45-
id<RCTSurfaceProtocol> surface = [[self class] createSurfaceWithBridge:bridge
46-
moduleName:moduleName
47-
initialProperties:initialProperties];
48-
if (self = [self initWithSurface:surface sizeMeasureMode:sizeMeasureMode]) {
49-
[surface start];
50-
}
51-
return self;
52-
}
53-
5433
- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
5534
sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
5635
{

0 commit comments

Comments
 (0)