diff --git a/packages/react-native/React/Base/RCTBridge.mm b/packages/react-native/React/Base/RCTBridge.mm index 50cf8c676f2..d7e75552044 100644 --- a/packages/react-native/React/Base/RCTBridge.mm +++ b/packages/react-native/React/Base/RCTBridge.mm @@ -279,8 +279,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init) - (void)didReceiveReloadCommand { #if RCT_ENABLE_INSPECTOR - // Disable debugger to resume the JsVM & avoid thread locks while reloading - [RCTInspectorDevServerHelper disableDebugger]; + auto &inspectorFlags = facebook::react::jsinspector_modern::InspectorFlags::getInstance(); + if (!inspectorFlags.getEnableModernCDPRegistry()) { + // Disable debugger to resume the JsVM & avoid thread locks while reloading + [RCTInspectorDevServerHelper disableDebugger]; + } #endif [[NSNotificationCenter defaultCenter] postNotificationName:RCTBridgeWillReloadNotification object:self userInfo:nil]; diff --git a/packages/react-native/React/DevSupport/RCTInspectorDevServerHelper.mm b/packages/react-native/React/DevSupport/RCTInspectorDevServerHelper.mm index 2db91e64b0c..662aa39eca5 100644 --- a/packages/react-native/React/DevSupport/RCTInspectorDevServerHelper.mm +++ b/packages/react-native/React/DevSupport/RCTInspectorDevServerHelper.mm @@ -145,7 +145,10 @@ static void sendEventToAllConnections(NSString *event) + (void)disableDebugger { - sendEventToAllConnections(kDebuggerMsgDisable); + auto &inspectorFlags = facebook::react::jsinspector_modern::InspectorFlags::getInstance(); + if (!inspectorFlags.getEnableModernCDPRegistry()) { + sendEventToAllConnections(kDebuggerMsgDisable); + } } + (id)connectWithBundleURL:(NSURL *)bundleURL