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

introduce RCTHostJSEngineProvider (#37326)

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

Changelog: [Internal]

in this change, i introduced a block type that returns a `JSEngineInstance`. a block gives a bit more flexibility in terms of lazily loading the engine + its dependencies, but i might get rid of it later and just pass down the engine itself.

Reviewed By: javache

Differential Revision: D45678969

fbshipit-source-id: 52d3ec0de77a3ab74d3cf304ea22fb5fc1315a2e
This commit is contained in:
Phillip Pan
2023-05-09 17:49:13 -07:00
committed by Facebook GitHub Bot
parent 268d95eca5
commit 9e0bab28d6
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactCommon/react/bridgeless/platform/ios/Core/RCTHost.h
+4 -1
View File
@@ -34,6 +34,8 @@ RCT_EXTERN NSString *const RCTHostWillReloadNotification;
*/
RCT_EXTERN NSString *const RCTHostDidReloadNotification;
typedef std::shared_ptr<facebook::react::JSEngineInstance> (^RCTHostJSEngineProvider)(void);
@protocol RCTHostDelegate <NSObject>
- (std::shared_ptr<facebook::react::JSEngineInstance>)getJSEngine;
@@ -53,7 +55,8 @@ RCT_EXTERN NSString *const RCTHostDidReloadNotification;
turboModuleManagerDelegate:(id<RCTTurboModuleManagerDelegate>)turboModuleManagerDelegate
bindingsInstallFunc:(facebook::react::ReactInstance::BindingsInstallFunc)bindingsInstallFunc
jsErrorHandlingFunc:(facebook::react::JsErrorHandler::JsErrorHandlingFunc)jsErrorHandlingFunc
NS_DESIGNATED_INITIALIZER FB_OBJC_DIRECT;
jsEngineProvider:(nullable RCTHostJSEngineProvider)jsEngineProvider NS_DESIGNATED_INITIALIZER
FB_OBJC_DIRECT;
/**
* This function initializes an RCTInstance if one does not yet exist. This function is currently only called on the
packages/react-native/ReactCommon/react/bridgeless/platform/ios/Core/RCTHost.mm
+22 -17
View File
@@ -34,6 +34,7 @@ NSString *const RCTHostDidReloadNotification = @"RCTHostDidReloadNotification";
RCTBundleManager *_bundleManager;
facebook::react::ReactInstance::BindingsInstallFunc _bindingsInstallFunc;
JsErrorHandler::JsErrorHandlingFunc _jsErrorHandlingFunc;
RCTHostJSEngineProvider _jsEngineProvider;
// All the surfaces that need to be started after main bundle execution
NSMutableArray<RCTFabricSurface *> *_surfaceStartBuffer;
@@ -57,7 +58,8 @@ NSString *const RCTHostDidReloadNotification = @"RCTHostDidReloadNotification";
- (instancetype)initWithHostDelegate:(id<RCTHostDelegate>)hostDelegate
turboModuleManagerDelegate:(id<RCTTurboModuleManagerDelegate>)turboModuleManagerDelegate
bindingsInstallFunc:(facebook::react::ReactInstance::BindingsInstallFunc)bindingsInstallFunc
jsErrorHandlingFunc:(JsErrorHandler::JsErrorHandlingFunc)jsErrorHandlingFunc;
jsErrorHandlingFunc:(JsErrorHandler::JsErrorHandlingFunc)jsErrorHandlingFunc
jsEngineProvider:(nullable RCTHostJSEngineProvider)jsEngineProvider
{
if (self = [super init]) {
_hostDelegate = hostDelegate;
@@ -67,6 +69,7 @@ NSString *const RCTHostDidReloadNotification = @"RCTHostDidReloadNotification";
_bindingsInstallFunc = bindingsInstallFunc;
_moduleRegistry = [RCTModuleRegistry new];
_jsErrorHandlingFunc = jsErrorHandlingFunc;
_jsEngineProvider = [jsEngineProvider copy];
__weak RCTHost *weakHost = self;
@@ -148,14 +151,15 @@ NSString *const RCTHostDidReloadNotification = @"RCTHostDidReloadNotification";
}
[self _refreshBundleURL];
RCTReloadCommandSetBundleURL(_bundleURL);
_instance = [[RCTInstance alloc] initWithDelegate:self
jsEngineInstance:[_hostDelegate getJSEngine]
bundleManager:_bundleManager
turboModuleManagerDelegate:_turboModuleManagerDelegate
onInitialBundleLoad:_onInitialBundleLoad
bindingsInstallFunc:_bindingsInstallFunc
moduleRegistry:_moduleRegistry
jsErrorHandlingFunc:_jsErrorHandlingFunc];
_instance =
[[RCTInstance alloc] initWithDelegate:self
jsEngineInstance:_jsEngineProvider ? _jsEngineProvider() : [_hostDelegate getJSEngine]
bundleManager:_bundleManager
turboModuleManagerDelegate:_turboModuleManagerDelegate
onInitialBundleLoad:_onInitialBundleLoad
bindingsInstallFunc:_bindingsInstallFunc
moduleRegistry:_moduleRegistry
jsErrorHandlingFunc:_jsErrorHandlingFunc];
}
- (RCTFabricSurface *)createSurfaceWithModuleName:(NSString *)moduleName
@@ -212,14 +216,15 @@ NSString *const RCTHostDidReloadNotification = @"RCTHostDidReloadNotification";
_surfaceStartBuffer = [NSMutableArray arrayWithArray:[self _getAttachedSurfaces]];
}
_instance = [[RCTInstance alloc] initWithDelegate:self
jsEngineInstance:[_hostDelegate getJSEngine]
bundleManager:_bundleManager
turboModuleManagerDelegate:_turboModuleManagerDelegate
onInitialBundleLoad:_onInitialBundleLoad
bindingsInstallFunc:_bindingsInstallFunc
moduleRegistry:_moduleRegistry
jsErrorHandlingFunc:_jsErrorHandlingFunc];
_instance =
[[RCTInstance alloc] initWithDelegate:self
jsEngineInstance:_jsEngineProvider ? _jsEngineProvider() : [_hostDelegate getJSEngine]
bundleManager:_bundleManager
turboModuleManagerDelegate:_turboModuleManagerDelegate
onInitialBundleLoad:_onInitialBundleLoad
bindingsInstallFunc:_bindingsInstallFunc
moduleRegistry:_moduleRegistry
jsErrorHandlingFunc:_jsErrorHandlingFunc];
[[NSNotificationCenter defaultCenter]
postNotification:[NSNotification notificationWithName:RCTHostDidReloadNotification object:nil]];