From 8f07b01ac81ca5962a48ed996d616a065622fb24 Mon Sep 17 00:00:00 2001 From: Martin Kralik Date: Fri, 1 Apr 2016 06:52:59 -0700 Subject: [PATCH] move `RCTBatchedBridge` interface to a private header Summary:Interface to `RCTBatchedBridge` was being declared in two different implementation files. This is suboptimal, since it makes it hard to mock that class in a test. So I've merged and moved these two definitions in `RCTBridge+Private.h`, so it's still obvious it's a private class, but can be included if you really need it. Reviewed By: javache Differential Revision: D3126135 fb-gh-sync-id: 173e4c5c2925be387b92deb7f99952ca7bf28588 fbshipit-source-id: 173e4c5c2925be387b92deb7f99952ca7bf28588 --- React/Base/RCTBatchedBridge.m | 8 -------- React/Base/RCTBridge+Private.h | 10 ++++++++++ React/Base/RCTBridge.m | 8 -------- 3 files changed, 10 insertions(+), 16 deletions(-) diff --git a/React/Base/RCTBatchedBridge.m b/React/Base/RCTBatchedBridge.m index 9f30f4040..86326ee7b 100644 --- a/React/Base/RCTBatchedBridge.m +++ b/React/Base/RCTBatchedBridge.m @@ -41,14 +41,6 @@ typedef NS_ENUM(NSUInteger, RCTBridgeFields) { RCT_EXTERN NSArray *RCTGetModuleClasses(void); -@interface RCTBatchedBridge : RCTBridge - -@property (nonatomic, weak) RCTBridge *parentBridge; -@property (nonatomic, weak) id javaScriptExecutor; -@property (nonatomic, assign) BOOL moduleSetupComplete; - -@end - @implementation RCTBatchedBridge { BOOL _wasBatchActive; diff --git a/React/Base/RCTBridge+Private.h b/React/Base/RCTBridge+Private.h index 8f093262c..fd0dd9a38 100644 --- a/React/Base/RCTBridge+Private.h +++ b/React/Base/RCTBridge+Private.h @@ -117,3 +117,13 @@ - (void)_immediatelyCallTimer:(NSNumber *)timer; @end + +@interface RCTBatchedBridge : RCTBridge + +@property (nonatomic, weak) RCTBridge *parentBridge; +@property (nonatomic, weak) id javaScriptExecutor; +@property (nonatomic, assign) BOOL moduleSetupComplete; + +- (instancetype)initWithParentBridge:(RCTBridge *)bridge NS_DESIGNATED_INITIALIZER; + +@end diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m index a57248c5a..f568c58b8 100644 --- a/React/Base/RCTBridge.m +++ b/React/Base/RCTBridge.m @@ -25,14 +25,6 @@ NSString *const RCTJavaScriptDidLoadNotification = @"RCTJavaScriptDidLoadNotific NSString *const RCTJavaScriptDidFailToLoadNotification = @"RCTJavaScriptDidFailToLoadNotification"; NSString *const RCTDidInitializeModuleNotification = @"RCTDidInitializeModuleNotification"; -@interface RCTBatchedBridge : RCTBridge - -@property (nonatomic, weak) RCTBridge *parentBridge; - -- (instancetype)initWithParentBridge:(RCTBridge *)bridge NS_DESIGNATED_INITIALIZER; - -@end - static NSMutableArray *RCTModuleClasses; NSArray *RCTGetModuleClasses(void); NSArray *RCTGetModuleClasses(void)