diff --git a/React/DevSupport/RCTDevMenu.m b/React/DevSupport/RCTDevMenu.m index eff6040f8..d631fa5dc 100644 --- a/React/DevSupport/RCTDevMenu.m +++ b/React/DevSupport/RCTDevMenu.m @@ -219,9 +219,12 @@ RCT_EXPORT_MODULE() if (!devSettings.isRemoteDebuggingAvailable) { [items addObject:[RCTDevMenuItem buttonItemWithTitle:@"Remote JS Debugger Unavailable" handler:^{ + NSString *message = RCTTurboModuleEnabled() ? + @"You cannot use remote JS debugging when TurboModule system is enabled" : + @"You need to include the RCTWebSocket library to enable remote JS debugging"; UIAlertController *alertController = [UIAlertController alertControllerWithTitle:@"Remote JS Debugger Unavailable" - message:@"You need to include the RCTWebSocket library to enable remote JS debugging" + message:message preferredStyle:UIAlertControllerStyleAlert]; __weak typeof(alertController) weakAlertController = alertController; [alertController addAction: diff --git a/React/Modules/RCTDevSettings.mm b/React/Modules/RCTDevSettings.mm index 70454aebc..3a2652c6e 100644 --- a/React/Modules/RCTDevSettings.mm +++ b/React/Modules/RCTDevSettings.mm @@ -220,6 +220,9 @@ RCT_EXPORT_MODULE() - (BOOL)isRemoteDebuggingAvailable { + if (RCTTurboModuleEnabled()) { + return NO; + } Class jsDebuggingExecutorClass = objc_lookUpClass("RCTWebSocketExecutor"); return (jsDebuggingExecutorClass != nil); }