diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm index 53d4d0dbc75..ff11b061c34 100644 --- a/React/Fabric/RCTSurfacePresenter.mm +++ b/React/Fabric/RCTSurfacePresenter.mm @@ -301,7 +301,9 @@ static BackgroundExecutor RCTGetBackgroundExecutor() return std::make_unique(activities, owner); }; - toolbox.backgroundExecutor = RCTGetBackgroundExecutor(); + if (reactNativeConfig && reactNativeConfig->getBool("react_fabric:enable_background_executor_ios")) { + toolbox.backgroundExecutor = RCTGetBackgroundExecutor(); + } toolbox.synchronousEventBeatFactory = [runtimeExecutor, runtimeScheduler = runtimeScheduler](EventBeat::SharedOwnerBox const &ownerBox) { diff --git a/ReactAndroid/src/main/jni/react/fabric/Binding.cpp b/ReactAndroid/src/main/jni/react/fabric/Binding.cpp index c2ebabec1f0..3e8dd0075ea 100644 --- a/ReactAndroid/src/main/jni/react/fabric/Binding.cpp +++ b/ReactAndroid/src/main/jni/react/fabric/Binding.cpp @@ -472,8 +472,11 @@ void Binding::installFabricUIManager( toolbox.synchronousEventBeatFactory = synchronousBeatFactory; toolbox.asynchronousEventBeatFactory = asynchronousBeatFactory; - backgroundExecutor_ = JBackgroundExecutor::create("fabric_bg"); - toolbox.backgroundExecutor = backgroundExecutor_; + if (reactNativeConfig_->getBool( + "react_fabric:enable_background_executor_android")) { + backgroundExecutor_ = JBackgroundExecutor::create("fabric_bg"); + toolbox.backgroundExecutor = backgroundExecutor_; + } animationDriver_ = std::make_shared( runtimeExecutor, contextContainer, this); diff --git a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp index c8af3e88232..2e31a722444 100644 --- a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp +++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp @@ -395,8 +395,9 @@ jsi::Value UIManagerBinding::get( RuntimeSchedulerBinding::getBinding(runtime); auto surfaceId = surfaceIdFromValue(runtime, arguments[0]); - if (runtimeSchedulerBinding && - runtimeSchedulerBinding->getIsSynchronous()) { + if (!uiManager->backgroundExecutor_ || + (runtimeSchedulerBinding && + runtimeSchedulerBinding->getIsSynchronous())) { auto weakShadowNodeList = weakShadowNodeListFromValue(runtime, arguments[1]); auto shadowNodeList =