diff --git a/packages/react-native/Libraries/Image/RCTImageStoreManager.h b/packages/react-native/Libraries/Image/RCTImageStoreManager.h index 61f324d51cd4..87cd99a3ed61 100644 --- a/packages/react-native/Libraries/Image/RCTImageStoreManager.h +++ b/packages/react-native/Libraries/Image/RCTImageStoreManager.h @@ -40,12 +40,6 @@ @end -@interface RCTBridge (RCTImageStoreManager) - -@property (nonatomic, readonly) RCTImageStoreManager *imageStoreManager; - -@end - @interface RCTBridgeProxy (RCTImageStoreManager) @property (nonatomic, readonly) RCTImageStoreManager *imageStoreManager; diff --git a/packages/react-native/Libraries/Network/RCTNetworking.h b/packages/react-native/Libraries/Network/RCTNetworking.h index 430c94f582e7..f6e1313296b6 100644 --- a/packages/react-native/Libraries/Network/RCTNetworking.h +++ b/packages/react-native/Libraries/Network/RCTNetworking.h @@ -61,12 +61,6 @@ @end -@interface RCTBridge (RCTNetworking) - -@property (nonatomic, readonly) RCTNetworking *networking; - -@end - @interface RCTBridgeProxy (RCTNetworking) @property (nonatomic, readonly) RCTNetworking *networking; diff --git a/packages/react-native/React/CoreModules/RCTAccessibilityManager.h b/packages/react-native/React/CoreModules/RCTAccessibilityManager.h index e2063e67c885..734b5fd39ced 100644 --- a/packages/react-native/React/CoreModules/RCTAccessibilityManager.h +++ b/packages/react-native/React/CoreModules/RCTAccessibilityManager.h @@ -32,12 +32,6 @@ extern NSString *const RCTAccessibilityManagerDidUpdateMultiplierNotification; / @end -@interface RCTBridge (RCTAccessibilityManager) - -@property (nonatomic, readonly) RCTAccessibilityManager *accessibilityManager; - -@end - @interface RCTBridgeProxy (RCTAccessibilityManager) @property (nonatomic, readonly) RCTAccessibilityManager *accessibilityManager; diff --git a/packages/react-native/React/CoreModules/RCTDevMenu.h b/packages/react-native/React/CoreModules/RCTDevMenu.h index 976cb8c517b5..ab6132f0a442 100644 --- a/packages/react-native/React/CoreModules/RCTDevMenu.h +++ b/packages/react-native/React/CoreModules/RCTDevMenu.h @@ -137,7 +137,8 @@ typedef NSString * (^RCTDevMenuItemTitleBlock)(void); */ @interface RCTBridge (RCTDevMenu) -@property (nonatomic, readonly) RCTDevMenu *devMenu; +@property (nonatomic, readonly) RCTDevMenu *devMenu __deprecated_msg( + "Access RCTDevMenu through the bridge proxy instead; this accessor will be removed."); @end diff --git a/packages/react-native/React/CoreModules/RCTDevSettings.h b/packages/react-native/React/CoreModules/RCTDevSettings.h index cffe380b9355..421b3d252948 100644 --- a/packages/react-native/React/CoreModules/RCTDevSettings.h +++ b/packages/react-native/React/CoreModules/RCTDevSettings.h @@ -142,12 +142,6 @@ typedef void (^RCTConnectedHandler)(void); @end -@interface RCTBridge (RCTDevSettings) - -@property (nonatomic, readonly) RCTDevSettings *devSettings; - -@end - @interface RCTBridgeProxy (RCTDevSettings) @property (nonatomic, readonly) RCTDevSettings *devSettings; diff --git a/packages/react-native/React/CoreModules/RCTWebSocketModule.h b/packages/react-native/React/CoreModules/RCTWebSocketModule.h index 0deba70671ff..c0e240f10020 100644 --- a/packages/react-native/React/CoreModules/RCTWebSocketModule.h +++ b/packages/react-native/React/CoreModules/RCTWebSocketModule.h @@ -33,12 +33,6 @@ RCT_EXTERN void RCTSetCustomSRWebSocketProvider(SRWebSocketProvider provider); @end -@interface RCTBridge (RCTWebSocketModule) - -- (RCTWebSocketModule *)webSocketModule; - -@end - @interface RCTBridgeProxy (RCTWebSocketModule) - (RCTWebSocketModule *)webSocketModule; diff --git a/packages/react-native/React/Modules/RCTUIManager.mm b/packages/react-native/React/Modules/RCTUIManager.mm index 1ab3804b0398..6bacf3f711d4 100644 --- a/packages/react-native/React/Modules/RCTUIManager.mm +++ b/packages/react-native/React/Modules/RCTUIManager.mm @@ -220,15 +220,6 @@ - (void)invalidate @end -@implementation RCTBridge (RCTUIManager) - -- (RCTUIManager *)uiManager -{ - return [self moduleForClass:[RCTUIManager class]]; -} - -@end - UIView *RCTPaperViewOrCurrentView(UIView *view) { if ([view respondsToSelector:@selector(paperView)]) { diff --git a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api index cb68d6c58bd7..e032af8ee1f6 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleDebugCxx.api @@ -10,18 +10,10 @@ category RCTBridge(Inspector) { public @property (assign, readonly) facebook::react::jsinspector_modern::HostTarget* inspectorTarget; } -category RCTBridge(RCTAccessibilityManager) { - public @property (assign, readonly) RCTAccessibilityManager* accessibilityManager; -} - category RCTBridge(RCTDevMenu) { public @property (assign, readonly) RCTDevMenu* devMenu; } -category RCTBridge(RCTDevSettings) { - public @property (assign, readonly) RCTDevSettings* devSettings; -} - category RCTBridge(RCTEventDispatcher) { public virtual id eventDispatcher(); } @@ -30,14 +22,6 @@ category RCTBridge(RCTImageLoader) { public @property (assign, readonly) RCTImageLoader* imageLoader; } -category RCTBridge(RCTImageStoreManager) { - public @property (assign, readonly) RCTImageStoreManager* imageStoreManager; -} - -category RCTBridge(RCTNetworking) { - public @property (assign, readonly) RCTNetworking* networking; -} - category RCTBridge(RCTSurfacePresenterStub) { public virtual id surfacePresenter(); public virtual void setSurfacePresenter:(id presenter); @@ -47,10 +31,6 @@ category RCTBridge(RCTUIManager) { public @property (assign, readonly) RCTUIManager* uiManager; } -category RCTBridge(RCTWebSocketModule) { - public virtual RCTWebSocketModule* webSocketModule(); -} - category RCTBridgeProxy(Cxx) { public @property (assign) std::shared_ptr jsCallInvoker; } diff --git a/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api index b05f7665f7da..976223dfc0e4 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleFrameworksCxx.api @@ -10,18 +10,10 @@ category RCTBridge(Inspector) { public @property (assign, readonly) facebook::react::jsinspector_modern::HostTarget* inspectorTarget; } -category RCTBridge(RCTAccessibilityManager) { - public @property (assign, readonly) RCTAccessibilityManager* accessibilityManager; -} - category RCTBridge(RCTDevMenu) { public @property (assign, readonly) RCTDevMenu* devMenu; } -category RCTBridge(RCTDevSettings) { - public @property (assign, readonly) RCTDevSettings* devSettings; -} - category RCTBridge(RCTEventDispatcher) { public virtual id eventDispatcher(); } @@ -30,14 +22,6 @@ category RCTBridge(RCTImageLoader) { public @property (assign, readonly) RCTImageLoader* imageLoader; } -category RCTBridge(RCTImageStoreManager) { - public @property (assign, readonly) RCTImageStoreManager* imageStoreManager; -} - -category RCTBridge(RCTNetworking) { - public @property (assign, readonly) RCTNetworking* networking; -} - category RCTBridge(RCTSurfacePresenterStub) { public virtual id surfacePresenter(); public virtual void setSurfacePresenter:(id presenter); @@ -47,10 +31,6 @@ category RCTBridge(RCTUIManager) { public @property (assign, readonly) RCTUIManager* uiManager; } -category RCTBridge(RCTWebSocketModule) { - public virtual RCTWebSocketModule* webSocketModule(); -} - category RCTBridgeProxy(Cxx) { public @property (assign) std::shared_ptr jsCallInvoker; } diff --git a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api index 497a3a43a3ee..618ebcd0dab6 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleNewarchCxx.api @@ -10,18 +10,10 @@ category RCTBridge(Inspector) { public @property (assign, readonly) facebook::react::jsinspector_modern::HostTarget* inspectorTarget; } -category RCTBridge(RCTAccessibilityManager) { - public @property (assign, readonly) RCTAccessibilityManager* accessibilityManager; -} - category RCTBridge(RCTDevMenu) { public @property (assign, readonly) RCTDevMenu* devMenu; } -category RCTBridge(RCTDevSettings) { - public @property (assign, readonly) RCTDevSettings* devSettings; -} - category RCTBridge(RCTEventDispatcher) { public virtual id eventDispatcher(); } @@ -30,14 +22,6 @@ category RCTBridge(RCTImageLoader) { public @property (assign, readonly) RCTImageLoader* imageLoader; } -category RCTBridge(RCTImageStoreManager) { - public @property (assign, readonly) RCTImageStoreManager* imageStoreManager; -} - -category RCTBridge(RCTNetworking) { - public @property (assign, readonly) RCTNetworking* networking; -} - category RCTBridge(RCTSurfacePresenterStub) { public virtual id surfacePresenter(); public virtual void setSurfacePresenter:(id presenter); @@ -47,10 +31,6 @@ category RCTBridge(RCTUIManager) { public @property (assign, readonly) RCTUIManager* uiManager; } -category RCTBridge(RCTWebSocketModule) { - public virtual RCTWebSocketModule* webSocketModule(); -} - category RCTBridgeProxy(Cxx) { public @property (assign) std::shared_ptr jsCallInvoker; } diff --git a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api index 4f7774be13cd..4bd2c0c68fea 100644 --- a/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api +++ b/scripts/cxx-api/api-snapshots/ReactAppleReleaseCxx.api @@ -10,18 +10,10 @@ category RCTBridge(Inspector) { public @property (assign, readonly) facebook::react::jsinspector_modern::HostTarget* inspectorTarget; } -category RCTBridge(RCTAccessibilityManager) { - public @property (assign, readonly) RCTAccessibilityManager* accessibilityManager; -} - category RCTBridge(RCTDevMenu) { public @property (assign, readonly) RCTDevMenu* devMenu; } -category RCTBridge(RCTDevSettings) { - public @property (assign, readonly) RCTDevSettings* devSettings; -} - category RCTBridge(RCTEventDispatcher) { public virtual id eventDispatcher(); } @@ -30,14 +22,6 @@ category RCTBridge(RCTImageLoader) { public @property (assign, readonly) RCTImageLoader* imageLoader; } -category RCTBridge(RCTImageStoreManager) { - public @property (assign, readonly) RCTImageStoreManager* imageStoreManager; -} - -category RCTBridge(RCTNetworking) { - public @property (assign, readonly) RCTNetworking* networking; -} - category RCTBridge(RCTSurfacePresenterStub) { public virtual id surfacePresenter(); public virtual void setSurfacePresenter:(id presenter); @@ -47,10 +31,6 @@ category RCTBridge(RCTUIManager) { public @property (assign, readonly) RCTUIManager* uiManager; } -category RCTBridge(RCTWebSocketModule) { - public virtual RCTWebSocketModule* webSocketModule(); -} - category RCTBridgeProxy(Cxx) { public @property (assign) std::shared_ptr jsCallInvoker; }