diff --git a/packages/react-native/React/Base/RCTBridge.h b/packages/react-native/React/Base/RCTBridge.h index cdfd10f6f6d..6403591222a 100644 --- a/packages/react-native/React/Base/RCTBridge.h +++ b/packages/react-native/React/Base/RCTBridge.h @@ -82,9 +82,6 @@ void RCTSetTurboModuleInteropBridgeProxyLogLevel(RCTBridgeProxyLoggingLevel logL BOOL RCTTurboModuleInteropForAllTurboModulesEnabled(void); void RCTEnableTurboModuleInteropForAllTurboModules(BOOL enabled); -BOOL RCTBridgeModuleBatchDidCompleteDisabled(void); -void RCTDisableBridgeModuleBatchDidComplete(BOOL disabled); - typedef enum { kRCTGlobalScope, kRCTGlobalScopeUsingRetainJSCallback, diff --git a/packages/react-native/React/Base/RCTBridge.mm b/packages/react-native/React/Base/RCTBridge.mm index 3f1cbeb7bb2..2fa60819d21 100644 --- a/packages/react-native/React/Base/RCTBridge.mm +++ b/packages/react-native/React/Base/RCTBridge.mm @@ -254,17 +254,6 @@ void RCTEnableTurboModuleSyncVoidMethods(BOOL enabled) gTurboModuleEnableSyncVoidMethods = enabled; } -static BOOL gBridgeModuleDisableBatchDidComplete = NO; -BOOL RCTBridgeModuleBatchDidCompleteDisabled(void) -{ - return gBridgeModuleDisableBatchDidComplete; -} - -void RCTDisableBridgeModuleBatchDidComplete(BOOL disabled) -{ - gBridgeModuleDisableBatchDidComplete = disabled; -} - BOOL kDispatchAccessibilityManagerInitOntoMain = NO; BOOL RCTUIManagerDispatchAccessibilityManagerInitOntoMain(void) { diff --git a/packages/react-native/React/CxxBridge/RCTCxxBridge.mm b/packages/react-native/React/CxxBridge/RCTCxxBridge.mm index 7348b2f4caf..780768d35af 100644 --- a/packages/react-native/React/CxxBridge/RCTCxxBridge.mm +++ b/packages/react-native/React/CxxBridge/RCTCxxBridge.mm @@ -1458,27 +1458,15 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithBundleURL - (void)batchDidComplete { - if (RCTBridgeModuleBatchDidCompleteDisabled()) { - id uiManager = [self moduleForName:@"UIManager"]; - if ([uiManager respondsToSelector:@selector(batchDidComplete)] && - [uiManager respondsToSelector:@selector(methodQueue)]) { + // TODO #12592471: batchDidComplete is only used by RCTUIManager, + // can we eliminate this special case? + for (RCTModuleData *moduleData in _moduleDataByID) { + if (moduleData.implementsBatchDidComplete) { [self dispatchBlock:^{ - [uiManager batchDidComplete]; + [moduleData.instance batchDidComplete]; } - queue:[uiManager methodQueue]]; - } - } else { - // TODO #12592471: batchDidComplete is only used by RCTUIManager, - // can we eliminate this special case? - for (RCTModuleData *moduleData in _moduleDataByID) { - if (moduleData.implementsBatchDidComplete) { - [self - dispatchBlock:^{ - [moduleData.instance batchDidComplete]; - } - queue:moduleData.methodQueue]; - } + queue:moduleData.methodQueue]; } } }