Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

decouple root views from native modules (#38872)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/38872

## Changelog:

[iOS][Breaking] - RCTTurboModuleRegistry is unavailable in RCTRootView and RCTSurfaceHostingProxyRootView

now after all the diffs in this stack, we can finally decouple the root views from the module registry, and remove the dependency from fabric root views on bridge.

for what i'm breaking, i only found this module library: https://github.com/flyskywhy/react-native-blob-util/blob/3d5155e11426fa458a9e2dbf7fe691cf9863ff01/ios/ReactNativeBlobUtil/ReactNativeBlobUtil.mm#L45. they can replace this with synthesize moduleRegistry API to get access.

for eventDispatcher, i didn't see anyone using this.

Reviewed By: mdvacca, cipolleschi

Differential Revision: D48179428

fbshipit-source-id: d08fbd0adf6177d56e32a0ce4b21b6acb0682a2d
This commit is contained in:
Phillip Pan
2023-08-29 14:23:01 -07:00
committed by Facebook GitHub Bot
parent f60c5ddc4b
commit 268d9edad6
5 changed files with 3 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
+1 -2
View File
@@ -93,8 +93,7 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
RCTSurfaceHostingProxyRootView *surfaceHostingProxyRootView = [[RCTSurfaceHostingProxyRootView alloc]
initWithSurface:surface
sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact
moduleRegistry:[_reactHost getModuleRegistry]];
sizeMeasureMode:RCTSurfaceSizeMeasureModeWidthExact | RCTSurfaceSizeMeasureModeHeightExact];
rootView = (RCTRootView *)surfaceHostingProxyRootView;
#endif
packages/react-native/React/Base/RCTRootView.h
-8
View File
@@ -77,14 +77,6 @@ extern
initialProperties:(nullable NSDictionary *)initialProperties
launchOptions:(nullable NSDictionary *)launchOptions;
/**
* This API allows users of RCTRootView to access other NativeModules, without
* directly accessing the bridge.
*/
@property (nonatomic, strong, readonly) RCTModuleRegistry *moduleRegistry;
@property (nonatomic, strong, readonly) id<RCTEventDispatcherProtocol> eventDispatcher;
/**
* The name of the JavaScript module to execute within the
* specified scriptURL (required). Setting this will not have
packages/react-native/React/Base/RCTRootView.m
-10
View File
@@ -121,16 +121,6 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
return self;
}
- (RCTModuleRegistry *)moduleRegistry
{
return _bridge.moduleRegistry;
}
- (id<RCTEventDispatcherProtocol>)eventDispatcher
{
return [self.moduleRegistry moduleForName:"EventDispatcher"];
}
#pragma mark - passThroughTouches
- (BOOL)passThroughTouches
packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.h
+1 -10
View File
@@ -27,8 +27,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, copy, readonly) NSString *moduleName;
@property (nonatomic, strong, readonly) RCTBridge *bridge;
@property (nonatomic, strong, readonly) RCTModuleRegistry *moduleRegistry;
@property (nonatomic, strong, readonly) id<RCTEventDispatcherProtocol> eventDispatcher;
@property (nonatomic, copy, readwrite) NSDictionary *appProperties;
@property (nonatomic, assign) RCTRootViewSizeFlexibility sizeFlexibility;
@property (nonatomic, weak) id<RCTRootViewDelegate> delegate;
@@ -41,14 +39,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign) NSTimeInterval loadingViewFadeDuration;
@property (nonatomic, assign) CGSize minimumSize;
/**
* Bridgeless mode initializer
*/
- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
moduleRegistry:(RCTModuleRegistry *)moduleRegistry;
- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface;
- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface NS_DESIGNATED_INITIALIZER;
- (void)cancelTouches;
packages/react-native/React/Base/Surface/SurfaceHostingView/RCTSurfaceHostingProxyRootView.mm
+1 -29
View File
@@ -49,20 +49,7 @@ static RCTRootViewSizeFlexibility convertToRootViewSizeFlexibility(RCTSurfaceSiz
}
}
@implementation RCTSurfaceHostingProxyRootView {
RCTModuleRegistry *_moduleRegistry;
}
- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
sizeMeasureMode:(RCTSurfaceSizeMeasureMode)sizeMeasureMode
moduleRegistry:(RCTModuleRegistry *)moduleRegistry
{
if (self = [super initWithSurface:surface sizeMeasureMode:sizeMeasureMode]) {
_moduleRegistry = moduleRegistry;
}
return self;
}
@implementation RCTSurfaceHostingProxyRootView
- (instancetype)initWithSurface:(id<RCTSurfaceProtocol>)surface
{
@@ -73,21 +60,6 @@ static RCTRootViewSizeFlexibility convertToRootViewSizeFlexibility(RCTSurfaceSiz
return self;
}
- (RCTModuleRegistry *)moduleRegistry
{
// In bridgeless mode, RCTSurfaceHostingProxyRootView is created with an RCTModuleRegistry
if (_moduleRegistry) {
return _moduleRegistry;
}
return _bridge.moduleRegistry;
}
- (id<RCTEventDispatcherProtocol>)eventDispatcher
{
return [self.moduleRegistry moduleForName:"EventDispatcher"];
}
RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)