diff --git a/packages/react-native/React/CoreModules/RCTDevSettings.h b/packages/react-native/React/CoreModules/RCTDevSettings.h index cffe380b9355..242c3f4fbdeb 100644 --- a/packages/react-native/React/CoreModules/RCTDevSettings.h +++ b/packages/react-native/React/CoreModules/RCTDevSettings.h @@ -11,12 +11,6 @@ #import #import -@class RCTPackagerClientResponder; -typedef uint32_t RCTHandlerToken; -typedef void (^RCTNotificationHandler)(NSDictionary *); -typedef void (^RCTRequestHandler)(NSDictionary *, RCTPackagerClientResponder *); -typedef void (^RCTConnectedHandler)(void); - @class RCTPackagerConnection; @protocol RCTPackagerClientMethod; @@ -114,30 +108,7 @@ typedef void (^RCTConnectedHandler)(void); #if RCT_DEV_MENU - (void)addHandler:(id)handler - forPackagerMethod:(NSString *)name __deprecated_msg("Use addRequestHandler or addNotificationHandler instead"); -#endif - -#if RCT_DEV -/** - * Registers a handler for a notification broadcast from the packager. An - * example is "reload" - an instruction to reload from the packager. - * If multiple notification handlers are registered for the same method, they - * will all be invoked sequentially. - */ -- (RCTHandlerToken)addNotificationHandler:(RCTNotificationHandler)handler - queue:(dispatch_queue_t)queue - forMethod:(NSString *)method; - -/** - * Registers a handler for a request from the packager. An example is - * pokeSamplingProfiler; it asks for profile data from the client. - * Only one handler can be registered for a given method; calling this - * displaces any previous request handler registered for that method. - */ -- (RCTHandlerToken)addRequestHandler:(RCTRequestHandler)handler - queue:(dispatch_queue_t)queue - forMethod:(NSString *)method; - + forPackagerMethod:(NSString *)name __deprecated_msg("Use RCTPackagerConnection directly instead"); #endif @end diff --git a/packages/react-native/React/CoreModules/RCTDevSettings.mm b/packages/react-native/React/CoreModules/RCTDevSettings.mm index 72b2d1371c85..20cbc8f8b572 100644 --- a/packages/react-native/React/CoreModules/RCTDevSettings.mm +++ b/packages/react-native/React/CoreModules/RCTDevSettings.mm @@ -55,7 +55,7 @@ void RCTDevSettingsSetEnabled(BOOL enabled) devSettingsMenuEnabled = enabled; } -#if RCT_DEV || RCT_REMOTE_PROFILE +#if RCT_DEV_MENU || RCT_REMOTE_PROFILE @interface RCTDevSettingsUserDefaultsDataSource : NSObject @@ -190,7 +190,7 @@ - (void)initialize #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION if (numInitializedModules++ == 0) { - reloadToken = [self + reloadToken = [_packagerConnection addNotificationHandler:^(id params) { RCTTriggerReloadCommandListeners(@"Global hotkey"); } @@ -198,7 +198,7 @@ - (void)initialize forMethod:@"reload"]; #if RCT_DEV_MENU __weak __typeof(self) weakSelf = self; - devMenuToken = [self + devMenuToken = [_packagerConnection addNotificationHandler:^(id params) { __typeof(self) strongSelf = weakSelf; if (strongSelf == nullptr) { @@ -437,23 +437,6 @@ - (void)setExecutorClass:(Class)executorClass } } -#if RCT_DEV -- (RCTHandlerToken)addNotificationHandler:(RCTNotificationHandler)handler - queue:(dispatch_queue_t)queue - forMethod:(NSString *)method -{ - return [_packagerConnection addNotificationHandler:handler queue:queue forMethod:method]; -} - -- (RCTHandlerToken)addRequestHandler:(RCTRequestHandler)handler - queue:(dispatch_queue_t)queue - forMethod:(NSString *)method -{ - return [_packagerConnection addRequestHandler:handler queue:queue forMethod:method]; -} - -#endif - - (void)addHandler:(id)handler forPackagerMethod:(NSString *)name { #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION @@ -544,7 +527,7 @@ - (void)jsLoaded:(NSNotification *)notification @end -#else // #if RCT_DEV || RCT_REMOTE_PROFILE +#else // #if RCT_DEV_MENU @interface RCTDevSettings () @end @@ -610,10 +593,6 @@ - (void)setIsShakeToShowDevMenuEnabled:(BOOL)enabled return std::make_shared(params); } -- (void)addHandler:(id)handler forPackagerMethod:(NSString *)name -{ -} - @end #endif // #if RCT_DEV_MENU