forward declare type, fixes, nits

coado · coado · commit d9e75c4e0334 · 2025-09-05T12:15:04.000+02:00
diff --git a/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.h b/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.h
@@ -7,7 +7,6 @@
 
 #import <React/RCTBridgeDelegate.h>
 #import <React/RCTConvert.h>
-#import <React/RCTDevMenu.h>
 #import <UIKit/UIKit.h>
 #import "RCTArchConfiguratorProtocol.h"
 #import "RCTDependencyProvider.h"
@@ -25,6 +24,7 @@
 @class RCTBridge;
 @protocol RCTComponentViewProtocol;
 @class RCTSurfacePresenterBridgeAdapter;
+@class RCTDevMenuConfiguration;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.mm b/packages/react-native/Libraries/AppDelegate/RCTReactNativeFactory.mm
@@ -11,6 +11,7 @@
 #import <React/RCTRootView.h>
 #import <React/RCTSurfacePresenterBridgeAdapter.h>
 #import <React/RCTUtils.h>
+#import <React/RCTDevMenu.h>
 #import <ReactCommon/RCTHost.h>
 #import <objc/runtime.h>
 #import <react/featureflags/ReactNativeFeatureFlagsOverridesOSSCanary.h>
diff --git a/packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.h b/packages/react-native/Libraries/AppDelegate/RCTRootViewFactory.h
@@ -6,7 +6,6 @@
  */
 
 #import <React/RCTBridge.h>
-#import <React/RCTDevMenu.h>
 #import <React/RCTRootView.h>
 #import <React/RCTUtils.h>
 #import "RCTJSRuntimeConfiguratorProtocol.h"
@@ -19,6 +18,7 @@
 @class RCTHost;
 @class RCTRootView;
 @class RCTSurfacePresenterBridgeAdapter;
+@class RCTDevMenuConfiguration;
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/packages/react-native/React/Base/RCTDevMenuConfigurationDecorator.h b/packages/react-native/React/Base/RCTDevMenuConfigurationDecorator.h
@@ -5,16 +5,18 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTDevMenu.h>
+#import "RCTBridgeModule.h"
+
+@class RCTDevMenuConfiguration;
 
 @interface RCTDevMenuConfigurationDecorator : NSObject
 
 #if RCT_DEV_MENU
 
-@property (nonatomic, strong, readonly) RCTDevMenuConfiguration *devMenuConfiguration;
+@property (nonatomic, strong, readonly) RCTDevMenuConfiguration *__nullable devMenuConfiguration;
 
 - (instancetype)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *__nullable)devMenuConfiguration;
-- (void)decorate:(RCTDevMenu *)devMenuModule;
+- (void)decorate:(id<RCTBridgeModule>)devMenuModule;
 
 #endif
 
diff --git a/packages/react-native/React/Base/RCTDevMenuConfigurationDecorator.mm b/packages/react-native/React/Base/RCTDevMenuConfigurationDecorator.mm
@@ -10,10 +10,11 @@
 #if RCT_DEV_MENU
 
 #import <React/RCTDevSettings.h>
+#import <React/RCTDevMenu.h>
 
 @implementation RCTDevMenuConfigurationDecorator
 
-- (instancetype)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *)devMenuConfiguration
+- (instancetype)initWithDevMenuConfiguration:(RCTDevMenuConfiguration *__nullable)devMenuConfiguration
 {
   if (self = [super init]) {
     _devMenuConfiguration = devMenuConfiguration;
diff --git a/packages/react-native/React/CoreModules/RCTDevMenu.mm b/packages/react-native/React/CoreModules/RCTDevMenu.mm
@@ -140,7 +140,7 @@ - (instancetype)init
                                                  name:RCTShowDevMenuNotification
                                                object:nil];
     _extraMenuItems = [NSMutableArray new];
-    
+
     _areKeyboardShortcutsEnabled = true;
     _isDevMenuEnabled = true;
     [self registerHotkeys];
@@ -272,11 +272,11 @@ - (void)addItem:(RCTDevMenuItem *)item
   [_extraMenuItems addObject:item];
 }
 
--(void)setAreKeyboardShortcutsEnabled:(BOOL)areKeyboardShortcutsEnabled
+- (void)setAreKeyboardShortcutsEnabled:(BOOL)areKeyboardShortcutsEnabled
 {
   if (_areKeyboardShortcutsEnabled != areKeyboardShortcutsEnabled) {
     [self setHotkeysEnabled:areKeyboardShortcutsEnabled];
-    
+
     if (areKeyboardShortcutsEnabled == false) {
       [self disableReloadCommand];
     }
@@ -555,6 +555,10 @@ - (void)addItem:(RCTDevMenu *)item
 {
 }
 
+- (void)disableReloadCommand
+{
+}
+
 - (BOOL)isActionSheetShown
 {
   return NO;
diff --git a/packages/react-native/React/CoreModules/RCTDevSettings.mm b/packages/react-native/React/CoreModules/RCTDevSettings.mm
@@ -314,7 +314,6 @@ - (BOOL)isHotLoadingAvailable
 
 - (BOOL)isShakeToShowDevMenuEnabled
 {
-  BOOL x = [[self settingForKey:kRCTDevSettingShakeToShowDevMenu] boolValue];
   return _isShakeGestureEnabled && [[self settingForKey:kRCTDevSettingShakeToShowDevMenu] boolValue];
 }
 
diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.h b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.h
@@ -10,7 +10,6 @@
 #import <memory>
 
 #import <React/RCTBridgeModuleDecorator.h>
-#import <React/RCTDevMenuConfigurationDecorator.h>
 #import <React/RCTDefines.h>
 #import <React/RCTTurboModuleRegistry.h>
 #import <ReactCommon/RuntimeExecutor.h>
@@ -20,6 +19,7 @@
 
 @class RCTBridgeProxy;
 @class RCTTurboModuleManager;
+@class RCTDevMenuConfigurationDecorator;
 
 @protocol RCTTurboModuleManagerDelegate <NSObject>
 
@@ -69,6 +69,11 @@
                       delegate:(id<RCTTurboModuleManagerDelegate>)delegate
                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker;
 
+- (instancetype)initWithBridgeProxy:(RCTBridgeProxy *)bridgeProxy
+              bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
+                           delegate:(id<RCTTurboModuleManagerDelegate>)delegate
+                          jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker;
+
 - (instancetype)initWithBridgeProxy:(RCTBridgeProxy *)bridgeProxy
               bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
                            delegate:(id<RCTTurboModuleManagerDelegate>)delegate
diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModuleManager.mm
@@ -27,6 +27,7 @@
 #import <React/RCTModuleData.h>
 #import <React/RCTPerformanceLogger.h>
 #import <React/RCTUtils.h>
+#import <React/RCTDevMenuConfigurationDecorator.h>
 #import <ReactCommon/CxxTurboModuleUtils.h>
 #import <ReactCommon/RCTTurboModuleWithJSIBindings.h>
 #import <ReactCommon/TurboCxxModule.h>
@@ -283,6 +284,19 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
       devMenuConfigurationDecorator:nil];
 }
 
+- (instancetype)initWithBridgeProxy:(RCTBridgeProxy *)bridgeProxy
+              bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
+                           delegate:(id<RCTTurboModuleManagerDelegate>)delegate
+                          jsInvoker:(std::shared_ptr<CallInvoker>)jsInvoker
+{
+  return [self initWithBridge:nil
+                        bridgeProxy:bridgeProxy
+              bridgeModuleDecorator:bridgeModuleDecorator
+                           delegate:delegate
+                          jsInvoker:jsInvoker
+      devMenuConfigurationDecorator:nil];
+}
+
 - (instancetype)initWithBridgeProxy:(RCTBridgeProxy *)bridgeProxy
               bridgeModuleDecorator:(RCTBridgeModuleDecorator *)bridgeModuleDecorator
                            delegate:(id<RCTTurboModuleManagerDelegate>)delegate
@@ -777,7 +791,7 @@ - (BOOL)_shouldCreateObjCModule:(Class)moduleClass
   }
   
 #if RCT_DEV_MENU
-
+  
   [_devMenuConfigurationDecorator decorate:module];
 
 #endif
diff --git a/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHost.h b/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHost.h
@@ -8,7 +8,6 @@
 #import <Foundation/Foundation.h>
 
 #import <React/RCTDefines.h>
-#import <React/RCTDevMenu.h>
 #import <react/renderer/core/ReactPrimitives.h>
 #import <react/runtime/JSRuntimeFactory.h>
 
@@ -19,6 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @class RCTFabricSurface;
 @class RCTHost;
 @class RCTModuleRegistry;
+@class RCTDevMenuConfiguration;
 
 @protocol RCTTurboModuleManagerDelegate;
 
diff --git a/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHost.mm b/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHost.mm
@@ -22,6 +22,7 @@
 #import <React/RCTPerformanceLogger.h>
 #import <React/RCTReloadCommand.h>
 #import <React/RCTUtils.h>
+#import <React/RCTDevMenu.h>
 #import <jsinspector-modern/InspectorFlags.h>
 #import <jsinspector-modern/InspectorInterfaces.h>
 #import <jsinspector-modern/ReactCdp.h>
diff --git a/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.h b/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.h
@@ -8,7 +8,6 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTDefines.h>
-#import <React/RCTDevMenu.h>
 #import <React/RCTJavaScriptLoader.h>
 #import <jsinspector-modern/ReactCdp.h>
 #import <react/runtime/JSRuntimeFactory.h>
@@ -33,6 +32,7 @@ RCT_EXTERN void RCTInstanceSetRuntimeDiagnosticFlags(NSString *_Nullable flags);
 @class RCTPerformanceLogger;
 @class RCTSource;
 @class RCTSurfacePresenter;
+@class RCTDevMenuConfiguration;
 
 @protocol RCTTurboModuleManagerDelegate;
 
diff --git a/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm b/packages/react-native/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTInstance.mm
@@ -26,6 +26,8 @@
 #import <React/RCTDisplayLink.h>
 #import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTLog.h>
+#import <React/RCTDevMenu.h>
+#import <React/RCTDevMenuConfigurationDecorator.h>
 #import <React/RCTLogBox.h>
 #import <React/RCTModuleData.h>
 #import <React/RCTPerformanceLogger.h>
diff --git a/packages/rn-tester/RNTester/AppDelegate.mm b/packages/rn-tester/RNTester/AppDelegate.mm
@@ -11,7 +11,6 @@
 
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTDefines.h>
-#import <React/RCTDevMenu.h>
 #import <React/RCTLinkingManager.h>
 #import <ReactCommon/RCTSampleTurboModule.h>
 #import <ReactCommon/RCTTurboModuleManager.h>

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ - (instancetype)init`
`140`	`140`	`name:RCTShowDevMenuNotification`
`141`	`141`	`object:nil];`
`142`	`142`	`_extraMenuItems = [NSMutableArray new];`
`143`		`-`
	`143`	`+`
`144`	`144`	`_areKeyboardShortcutsEnabled = true;`
`145`	`145`	`_isDevMenuEnabled = true;`
`146`	`146`	`[self registerHotkeys];`
`@@ -272,11 +272,11 @@ - (void)addItem:(RCTDevMenuItem *)item`
`272`	`272`	`[_extraMenuItems addObject:item];`
`273`	`273`	`}`
`274`	`274`
`275`		`--(void)setAreKeyboardShortcutsEnabled:(BOOL)areKeyboardShortcutsEnabled`
	`275`	`+- (void)setAreKeyboardShortcutsEnabled:(BOOL)areKeyboardShortcutsEnabled`
`276`	`276`	`{`
`277`	`277`	`if (_areKeyboardShortcutsEnabled != areKeyboardShortcutsEnabled) {`
`278`	`278`	`[self setHotkeysEnabled:areKeyboardShortcutsEnabled];`
`279`		`-`
	`279`	`+`
`280`	`280`	`if (areKeyboardShortcutsEnabled == false) {`
`281`	`281`	`[self disableReloadCommand];`
`282`	`282`	`}`
`@@ -555,6 +555,10 @@ - (void)addItem:(RCTDevMenu *)item`
`555`	`555`	`{`
`556`	`556`	`}`
`557`	`557`
	`558`	`+- (void)disableReloadCommand`
	`559`	`+{`
	`560`	`+}`
	`561`	`+`
`558`	`562`	`- (BOOL)isActionSheetShown`
`559`	`563`	`{`
`560`	`564`	`return NO;`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,6 @@ - (BOOL)isHotLoadingAvailable`
`314`	`314`
`315`	`315`	`- (BOOL)isShakeToShowDevMenuEnabled`
`316`	`316`	`{`
`317`		`- BOOL x = [[self settingForKey:kRCTDevSettingShakeToShowDevMenu] boolValue];`
`318`	`317`	`return _isShakeGestureEnabled && [[self settingForKey:kRCTDevSettingShakeToShowDevMenu] boolValue];`
`319`	`318`	`}`
`320`	`319`