diff --git a/packages/react-native/React/CoreModules/RCTDevLoadingView.mm b/packages/react-native/React/CoreModules/RCTDevLoadingView.mm index 8ad0fc0d327..19ccd0398f5 100644 --- a/packages/react-native/React/CoreModules/RCTDevLoadingView.mm +++ b/packages/react-native/React/CoreModules/RCTDevLoadingView.mm @@ -25,7 +25,7 @@ using namespace facebook::react; @interface RCTDevLoadingView () @end -#if RCT_DEV | RCT_ENABLE_LOADING_VIEW +#if RCT_DEV_MENU @implementation RCTDevLoadingView { UIWindow *_window; diff --git a/packages/react-native/React/CxxBridge/RCTCxxBridge.mm b/packages/react-native/React/CxxBridge/RCTCxxBridge.mm index 45c29a24fc9..0f88507ce24 100644 --- a/packages/react-native/React/CxxBridge/RCTCxxBridge.mm +++ b/packages/react-native/React/CxxBridge/RCTCxxBridge.mm @@ -64,7 +64,7 @@ #import #endif -#if (RCT_DEV | RCT_ENABLE_LOADING_VIEW) && __has_include() +#if RCT_DEV_MENU && __has_include() #import #endif @@ -476,7 +476,7 @@ struct RCTInstanceCallback : public InstanceCallback { dispatch_group_enter(prepareBridge); __block NSData *sourceCode; -#if (RCT_DEV | RCT_ENABLE_LOADING_VIEW) && __has_include() +#if RCT_DEV_MENU && __has_include() { id loadingView = [self moduleForName:@"DevLoadingView" lazilyLoadIfNecessary:YES]; [loadingView showWithURL:self.bundleURL]; @@ -493,7 +493,7 @@ struct RCTInstanceCallback : public InstanceCallback { dispatch_group_leave(prepareBridge); } onProgress:^(RCTLoadingProgress *progressData) { -#if (RCT_DEV | RCT_ENABLE_LOADING_VIEW) && __has_include() +#if RCT_DEV_MENU && __has_include() id loadingView = [weakSelf moduleForName:@"DevLoadingView" lazilyLoadIfNecessary:YES]; [loadingView updateProgress:progressData]; @@ -1092,7 +1092,7 @@ struct RCTInstanceCallback : public InstanceCallback { __weak __typeof(self) weakSelf = self; [RCTJavaScriptLoader loadBundleAtURL:bundleURL onProgress:^(RCTLoadingProgress *progressData) { -#if (RCT_DEV_MENU | RCT_ENABLE_LOADING_VIEW) && __has_include() +#if (RCT_DEV_MENU | RCT_DEV_MENU) && __has_include() id loadingView = [weakSelf moduleForName:@"DevLoadingView" lazilyLoadIfNecessary:YES]; [loadingView updateProgress:progressData]; diff --git a/packages/react-native/React/DevSupport/RCTDevLoadingViewSetEnabled.m b/packages/react-native/React/DevSupport/RCTDevLoadingViewSetEnabled.m index 66361cfdd9b..9c121db16e2 100644 --- a/packages/react-native/React/DevSupport/RCTDevLoadingViewSetEnabled.m +++ b/packages/react-native/React/DevSupport/RCTDevLoadingViewSetEnabled.m @@ -7,7 +7,7 @@ #import "RCTDevLoadingViewSetEnabled.h" -#if RCT_DEV | RCT_ENABLE_LOADING_VIEW +#if RCT_DEV_MENU static BOOL isDevLoadingViewEnabled = YES; #else static BOOL isDevLoadingViewEnabled = NO; diff --git a/packages/react-native/ReactCommon/react/bridgeless/platform/ios/Core/RCTInstance.mm b/packages/react-native/ReactCommon/react/bridgeless/platform/ios/Core/RCTInstance.mm index 9a4c899c570..4d4e5acde1e 100644 --- a/packages/react-native/ReactCommon/react/bridgeless/platform/ios/Core/RCTInstance.mm +++ b/packages/react-native/ReactCommon/react/bridgeless/platform/ios/Core/RCTInstance.mm @@ -38,7 +38,7 @@ #import "RCTJSThreadManager.h" #import "RCTPerformanceLoggerUtils.h" -#if (RCT_DEV | RCT_ENABLE_LOADING_VIEW) && __has_include() +#if RCT_DEV_MENU && __has_include() #import #import #endif @@ -319,7 +319,7 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags) - (void)loadJSBundle:(NSURL *)sourceURL FB_OBJC_DIRECT { -#if (RCT_DEV | RCT_ENABLE_LOADING_VIEW) && __has_include() +#if RCT_DEV_MENU && __has_include() { id loadingView = (id)[_turboModuleManager moduleForName:"DevLoadingView"]; @@ -335,7 +335,7 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags) return; } -#if (RCT_DEV | RCT_ENABLE_LOADING_VIEW) && __has_include() +#if RCT_DEV_MENU && __has_include() id loadingView = (id)[strongSelf->_turboModuleManager moduleForName:"DevLoadingView"]; [loadingView updateProgress:progressData];