Skip to content

Commit 3c125e8

Browse files
zhongwuzwfacebook-github-bot
authored andcommitted
Call designated initializer for SurfaceHostingProxyRootView (#24368)
Summary: 1. Call designated initializer for SurfaceHostingProxyRootView. 2. Make super class designated initializer `-initWithSurface:sizeMeasureMode:` `NS_UNAVAILABLE`. cc. shergin [iOS] [Fixed] - Call designated initializer for SurfaceHostingProxyRootView Pull Request resolved: #24368 Differential Revision: D15144991 Pulled By: shergin fbshipit-source-id: c999ac64c766242ceff157b0d9600190c1f3add8
1 parent a0523da commit 3c125e8

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h

+4
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ NS_ASSUME_NONNULL_BEGIN
4545
initialProperties:(NSDictionary *)initialProperties
4646
launchOptions:(NSDictionary *)launchOptions;
4747

48+
- (instancetype)initWithSurface:(RCTSurface *)surface
49+
sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
50+
NS_UNAVAILABLE;
51+
4852
- (void)cancelTouches;
4953

5054
@end

React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm

+3-2
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,10 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
6767
// `RCTRootViewSizeFlexibilityNone` is the RCTRootView's default.
6868
RCTSurfaceSizeMeasureMode sizeMeasureMode = convertToSurfaceSizeMeasureMode(RCTRootViewSizeFlexibilityNone);
6969

70-
if (self = [super initWithBridge:bridge moduleName:moduleName initialProperties:initialProperties sizeMeasureMode:sizeMeasureMode]) {
70+
RCTSurface *surface = [[self class] createSurfaceWithBridge:bridge moduleName:moduleName initialProperties:initialProperties];
71+
[surface start];
72+
if (self = [super initWithSurface:surface sizeMeasureMode:sizeMeasureMode]) {
7173
self.backgroundColor = [UIColor whiteColor];
72-
[super.surface start];
7374
}
7475

7576
RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");

0 commit comments

Comments
 (0)