ios fixed invalid bridge

ios/RNN.m

@@ -9,14 +9,11 @@
 
 @interface RNN() <RCTBridgeDelegate>
 
-
-
 @end
 
 @implementation RNN {
 	NSURL *_jsCodeLocation;
 	RCTBridge *_bridge;
-	RNNEventEmitter *_eventEmitter;
 	RNNStore *_store;
 }
 
@@ -37,7 +34,6 @@
 
 -(void)bootstrap:(NSURL *)jsCodeLocation launchOptions:(NSDictionary *)launchOptions {
 	_jsCodeLocation = jsCodeLocation;
-	_eventEmitter = [RNNEventEmitter new];
 	
 	UIApplication.sharedApplication.delegate.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
 	UIApplication.sharedApplication.delegate.window.backgroundColor = [UIColor whiteColor];
@@ -56,33 +52,38 @@
 	return _jsCodeLocation;
 }
 
+-(void)onJavaScriptWillLoad {
+	_store = [RNNStore new];
+	[self resetRootViewControllerOnlyOnJSDevReload];
+}
+
 -(NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge {
+	RNNEventEmitter *eventEmitter = [[RNNEventEmitter alloc] init];
 	
-	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:[RNNReactRootViewCreator new] store:_store];
+	RNNControllerFactory *controllerFactory = [[RNNControllerFactory alloc] initWithRootViewCreator:[[RNNReactRootViewCreator alloc]initWithBridge:bridge] store:_store eventEmitter:eventEmitter];
 	RNNCommandsHandler *commandsHandler = [[RNNCommandsHandler alloc]initWithStore:_store controllerFactory:controllerFactory];
 	
 	RNNBridgeModule *bridgeModule = [[RNNBridgeModule alloc] initWithCommandsHandler:commandsHandler];
-	RNNEventEmitter *eventEmitter = [[RNNEventEmitter alloc] initWithBridge:bridge];
 	
 	return @[bridgeModule,eventEmitter];
 }
 
-# pragma mark - private
-
--(void)registerForJsEvents {
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptLoaded) name:RCTJavaScriptDidLoadNotification object:_bridge];
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(onJavaScriptWillLoad) name:RCTJavaScriptWillStartLoadingNotification	object:_bridge];
+-(void)onJavaScriptLoaded {
+	_store.isReadyToReceiveCommands = YES;
+	[[_bridge moduleForClass:[RNNEventEmitter class]] sendOnAppLaunched];
 }
 
+# pragma mark - private
 
--(void)onJavaScriptWillLoad {
-	_store = [RNNStore new];
-	[self resetRootViewControllerOnlyOnJSDevReload];
-}
-
--(void)onJavaScriptLoaded {
-	_store.isReadyToReceiveCommands = true;
-	[_eventEmitter sendOnAppLaunched];
+-(void)registerForJsEvents {
+	[[NSNotificationCenter defaultCenter] addObserver:self
+											 selector:@selector(onJavaScriptLoaded)
+												 name:RCTJavaScriptDidLoadNotification
+											   object:nil];
+	[[NSNotificationCenter defaultCenter] addObserver:self
+											 selector:@selector(onJavaScriptWillLoad)
+												 name:RCTJavaScriptWillStartLoadingNotification
+											   object:nil];
 }
 
 -(void)resetRootViewControllerOnlyOnJSDevReload {

ios/RNNBridgeModule.h

@@ -1,6 +1,5 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-
 #import <React/RCTBridgeModule.h>
 
 #import "RNNCommandsHandler.h"

ios/RNNBridgeModule.m

@@ -1,10 +1,8 @@
 #import "RNNBridgeModule.h"
 
-@interface RNNBridgeModule ()
-@property RNNCommandsHandler* commandsHandler;
-@end
-
-@implementation RNNBridgeModule
+@implementation RNNBridgeModule {
+	RNNCommandsHandler* _commandsHandler;
+}
 
 RCT_EXPORT_MODULE();
 
@@ -14,34 +12,34 @@ RCT_EXPORT_MODULE();
 
 -(instancetype)initWithCommandsHandler:(RNNCommandsHandler *)commandsHandler {
 	self = [super init];
-	self.commandsHandler = commandsHandler;
+	_commandsHandler = commandsHandler;
 	return self;
 }
 
 #pragma mark - JS interface
 
 RCT_EXPORT_METHOD(setRoot:(NSDictionary*)layout) {
-	[self.commandsHandler setRoot:layout];
+	[_commandsHandler setRoot:layout];
 }
 
 RCT_EXPORT_METHOD(push:(NSString*)containerId layout:(NSDictionary*)layout) {
-	[self.commandsHandler push:containerId layout:layout];
+	[_commandsHandler push:containerId layout:layout];
 }
 
 RCT_EXPORT_METHOD(pop:(NSString*)containerId) {
-	[self.commandsHandler pop:containerId];
+	[_commandsHandler pop:containerId];
 }
 
 RCT_EXPORT_METHOD(showModal:(NSDictionary*)layout) {
-	[self.commandsHandler showModal:layout];
+	[_commandsHandler showModal:layout];
 }
 
 RCT_EXPORT_METHOD(dismissModal:(NSString*)containerId) {
-	[self.commandsHandler dismissModal:containerId];
+	[_commandsHandler dismissModal:containerId];
 }
 
 RCT_EXPORT_METHOD(dismissAllModals) {
-	[self.commandsHandler dismissAllModals];
+	[_commandsHandler dismissAllModals];
 }
 
 @end

ios/RNNCommandsHandler.m

@@ -4,17 +4,15 @@
 #import "RNNModalManager.h"
 #import "RNNNavigationStackManager.h"
 
-@interface RNNCommandsHandler ()
-@property RNNControllerFactory *controllerFactory;
-@property RNNStore *store;
-@end
-
-@implementation RNNCommandsHandler
+@implementation RNNCommandsHandler {
+	RNNControllerFactory *_controllerFactory;
+	RNNStore *_store;
+}
 
 -(instancetype) initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory {
 	self = [super init];
-	self.store = store;
-	self.controllerFactory = controllerFactory;
+	_store = store;
+	_controllerFactory = controllerFactory;
 	return self;
 }
 
@@ -22,7 +20,7 @@
 
 -(void) setRoot:(NSDictionary*)layout {
 	[self assertReady];
-	UIViewController *vc = [self.controllerFactory createLayoutAndSaveToStore:layout];
+	UIViewController *vc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	
 	UIApplication.sharedApplication.delegate.window.rootViewController = vc;
 	[UIApplication.sharedApplication.delegate.window makeKeyAndVisible];
@@ -31,47 +29,47 @@
 -(void) push:(NSString*)containerId layout:(NSDictionary*)layout {
 	[self assertReady];
 	
-	UIViewController *newVc = [self.controllerFactory createLayoutAndSaveToStore:layout];
+	UIViewController *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
 	
 	// find on who to push
-	UIViewController *vc = [self.store findContainerForId:containerId];
+	UIViewController *vc = [_store findContainerForId:containerId];
 	
 	// do the actual pushing
-	[[[RNNNavigationStackManager alloc] initWithStore:self.store] push:newVc onTop:vc animated:YES];
+	[[[RNNNavigationStackManager alloc] initWithStore:_store] push:newVc onTop:vc animated:YES];
 }
 
 -(void) pop:(NSString*)containerId {
 	[self assertReady];
 	
 	// find who to pop
-	UIViewController *vc = [self.store findContainerForId:containerId];
+	UIViewController *vc = [_store findContainerForId:containerId];
 	
 	// do the popping
-	[[[RNNNavigationStackManager alloc] initWithStore:self.store] pop:vc animated:YES];
-	[self.store removeContainer:containerId];
+	[[[RNNNavigationStackManager alloc] initWithStore:_store] pop:vc animated:YES];
+	[_store removeContainer:containerId];
 }
 
 -(void) showModal:(NSDictionary*)layout {
 	[self assertReady];
 	
-	UIViewController *newVc = [self.controllerFactory createLayoutAndSaveToStore:layout];
-	[[[RNNModalManager alloc] initWithStore:self.store] showModal:newVc];
+	UIViewController *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
+	[[[RNNModalManager alloc] initWithStore:_store] showModal:newVc];
 }
 
 -(void) dismissModal:(NSString*)containerId {
 	[self assertReady];
-	[[[RNNModalManager alloc] initWithStore:self.store] dismissModal:containerId];
+	[[[RNNModalManager alloc] initWithStore:_store] dismissModal:containerId];
 }
 
 -(void) dismissAllModals {
 	[self assertReady];
-	[[[RNNModalManager alloc] initWithStore:self.store] dismissAllModals];
+	[[[RNNModalManager alloc] initWithStore:_store] dismissAllModals];
 }
 
 #pragma mark - private
 
 -(void) assertReady {
-	if (!self.store.isReadyToReceiveCommands) {
+	if (!_store.isReadyToReceiveCommands) {
 		@throw [NSException exceptionWithName:@"BridgeNotLoadedError" reason:@"Bridge not yet loaded! Send commands after Navigation.events().onAppLaunched() has been called." userInfo:nil];
 	}
 }

ios/RNNControllerFactory.h

@@ -2,14 +2,14 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "RNNRootViewCreator.h"
-#import "RNNRootViewController.h"
-#import "RNNSideMenuController.h"
-#import "RNNSideMenuChildVC.h"
 #import "RNNStore.h"
+#import "RNNEventEmitter.h"
 
 @interface RNNControllerFactory : NSObject
 
--(instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator store:(RNNStore*)store;
+-(instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator
+								 store:(RNNStore*)store
+						  eventEmitter:(RNNEventEmitter*)eventEmitter;
 
 -(UIViewController*)createLayoutAndSaveToStore:(NSDictionary*)layout;
 

ios/RNNControllerFactory.m

@@ -1,26 +1,28 @@
 
 #import "RNNControllerFactory.h"
 #import "RNNLayoutNode.h"
+#import "RNNRootViewController.h"
+#import "RNNSideMenuController.h"
+#import "RNNSideMenuChildVC.h"
 
 
-
-@interface RNNControllerFactory ()
-
-@property (nonatomic, strong) id<RNNRootViewCreator> creator;
-@property (nonatomic, strong) RNNStore *store;
-
-@end
-
-@implementation RNNControllerFactory
+@implementation RNNControllerFactory {
+	id<RNNRootViewCreator> _creator;
+	RNNStore *_store;
+	RNNEventEmitter *_eventEmitter;
+}
 
 # pragma mark public
 
 
-- (instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator store:(RNNStore *)store {
+- (instancetype)initWithRootViewCreator:(id <RNNRootViewCreator>)creator
+								  store:(RNNStore *)store
+						   eventEmitter:(RNNEventEmitter*)eventEmitter {
 	
 	self = [super init];
-	self.creator = creator;
-	self.store = store;
+	_creator = creator;
+	_store = store;
+	_eventEmitter = eventEmitter;
 	
 	return self;
 }
@@ -67,13 +69,13 @@
 		@throw [NSException exceptionWithName:@"UnknownControllerType" reason:[@"Unknown controller type " stringByAppendingString:node.type] userInfo:nil];
 	}
 
-	[self.store setContainer:result containerId:node.nodeId];
+	[_store setContainer:result containerId:node.nodeId];
 	
 	return result;
 }
 
 - (RNNRootViewController*)createContainer:(RNNLayoutNode*)node {
-	return [[RNNRootViewController alloc] initWithNode:node rootViewCreator:self.creator];
+	return [[RNNRootViewController alloc] initWithNode:node rootViewCreator:_creator eventEmitter:_eventEmitter];
 }
 
 - (UINavigationController*)createContainerStack:(RNNLayoutNode*)node {

ios/RNNEventEmitter.h

@@ -6,8 +6,6 @@
 
 @interface RNNEventEmitter : RCTEventEmitter <RCTBridgeModule>
 
--(instancetype)initWithBridge:(RCTBridge*)bridge;
-
 -(void)sendOnAppLaunched;
 
 -(void)sendContainerStart:(NSString*)containerId;

ios/RNNEventEmitter.m

@@ -1,8 +1,6 @@
 #import "RNNEventEmitter.h"
 
-@implementation RNNEventEmitter {
-	RCTBridge *_bridge;
-}
+@implementation RNNEventEmitter
 
 RCT_EXPORT_MODULE();
 
@@ -10,41 +8,29 @@ static NSString* const onAppLaunched	= @"RNN.appLaunched";
 static NSString* const containerStart	= @"RNN.containerStart";
 static NSString* const containerStop	= @"RNN.containerStop";
 
--(instancetype)initWithBridge:(RCTBridge*)bridge {
-	self = [super init];
-	
-	_bridge = bridge;
-	
-	return self;
-}
 
--(NSArray<NSString *> *)supportedEvents
-{
+-(NSArray<NSString *> *)supportedEvents {
 	return @[onAppLaunched, containerStart, containerStop];
 }
 
 # pragma mark public
 
--(void)sendOnAppLaunched
-{
+-(void)sendOnAppLaunched {
 	[self send:onAppLaunched body:nil];
 }
 
--(void)sendContainerStart:(NSString *)containerId
-{
+-(void)sendContainerStart:(NSString *)containerId {
 	[self send:containerStart body:containerId];
 }
 
--(void)sendContainerStop:(NSString *)containerId
-{
+-(void)sendContainerStop:(NSString *)containerId {
 	[self send:containerStop body:containerId];
 }
 
 # pragma mark private
 
--(void)send:(NSString *)eventName body:(id)body
-{
-	[[_bridge moduleForClass:[RNNEventEmitter class]] sendEventWithName:eventName body:body];
+-(void)send:(NSString *)eventName body:(id)body {
+	[self sendEventWithName:eventName body:body];
 }
 
 @end

ios/RNNModalManager.m

@@ -1,17 +1,13 @@
 #import "RNNModalManager.h"
 
-@interface RNNModalManager ()
-
-@property RNNStore *store;
-
-@end
-
-@implementation RNNModalManager
+@implementation RNNModalManager {
+	RNNStore *_store;
+}
 
 
 -(instancetype)initWithStore:(RNNStore*)store {
 	self = [super init];
-	self.store = store;
+	_store = store;
 	return self;
 }
 
@@ -21,14 +17,14 @@
 }
 
 -(void)dismissModal:(NSString *)containerId {
-	[self.store.modalsToDismissArray addObject:containerId];
+	[_store.modalsToDismissArray addObject:containerId];
 	[self removePendingNextModalIfOnTop];
 }
 
 -(void)dismissAllModals {
 	UIViewController *root = UIApplication.sharedApplication.delegate.window.rootViewController;
 	[root dismissViewControllerAnimated:YES completion:nil];
-	[self.store.modalsToDismissArray removeAllObjects];
+	[_store.modalsToDismissArray removeAllObjects];
 }
 
 
@@ -36,9 +32,9 @@
 
 
 -(void)removePendingNextModalIfOnTop {
-	NSString *containerId = [self.store.modalsToDismissArray lastObject];
+	NSString *containerId = [_store.modalsToDismissArray lastObject];
 	
-	UIViewController *modalToDismiss = [self.store findContainerForId:containerId];
+	UIViewController *modalToDismiss = [_store findContainerForId:containerId];
 	
 	if(!modalToDismiss) {
 		return;
@@ -46,7 +42,7 @@
 	
 	if (modalToDismiss == [self topPresentedVC]) {
 		[modalToDismiss dismissViewControllerAnimated:YES completion:^{
-			[self.store.modalsToDismissArray removeObject:containerId];
+			[_store.modalsToDismissArray removeObject:containerId];
 			[self removePendingNextModalIfOnTop];
 		}];
 	}

ios/RNNNavigationStackManager.m

@@ -1,18 +1,13 @@
 #import "RNNNavigationStackManager.h"
 
-@interface RNNNavigationStackManager ()
-
-@property RNNStore *store;
-
-@end
-
-
-@implementation RNNNavigationStackManager
+@implementation RNNNavigationStackManager {
+	RNNStore *_store;
+}
 
 
 -(instancetype)initWithStore:(RNNStore*)store {
 	self = [super init];
-	self.store = store;
+	_store = store;
 	return self;
 }
 

ios/RNNReactRootViewCreator.h

@@ -5,4 +5,6 @@
 
 @interface RNNReactRootViewCreator : NSObject <RNNRootViewCreator>
 
+-(instancetype)initWithBridge:(RCTBridge*)bridge;
+
 @end

ios/RNNReactRootViewCreator.m

@@ -3,18 +3,14 @@
 #import "RNN.h"
 #import <React/RCTRootView.h>
 
-@interface RNNReactRootViewCreator ()
-
-@property RCTBridge *bridge;
-
-@end
-
-@implementation RNNReactRootViewCreator
+@implementation RNNReactRootViewCreator {
+	RCTBridge *_bridge;
+}
 
 -(instancetype)initWithBridge:(RCTBridge*)bridge {
 	self = [super init];
 	
-	self.bridge = bridge;
+	_bridge = bridge;
 	
 	return self;
 	
@@ -25,7 +21,7 @@
 		@throw [NSException exceptionWithName:@"MissingViewId" reason:@"Missing view id" userInfo:nil];
 	}
 	
-	UIView *view = [[RCTRootView alloc] initWithBridge:self.bridge
+	UIView *view = [[RCTRootView alloc] initWithBridge:_bridge
 										 moduleName:name
 								  initialProperties:@{@"id": rootViewId}];
 	return view;

ios/RNNStore.h

@@ -2,11 +2,10 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-
 @interface RNNStore : NSObject
 
-@property NSMutableArray *modalsToDismissArray;
-@property BOOL isReadyToReceiveCommands;
+@property (nonatomic, strong) NSMutableArray *modalsToDismissArray;
+@property (atomic) BOOL isReadyToReceiveCommands;
 
 - (UIViewController*)findContainerForId:(NSString*)containerId;
 - (void)setContainer:(UIViewController*)viewController containerId:(NSString*)containerId;

ios/RNNStore.m

@@ -3,23 +3,21 @@
 
 @interface RNNStore ()
 
-@property NSMapTable *containerStore;
-
 @end
 
-@implementation RNNStore
-
+@implementation RNNStore {
+	NSMapTable* _containerStore;
+}
 
 -(instancetype)init {
 	self = [super init];
-	self.containerStore = [NSMapTable strongToWeakObjectsMapTable];
+	_containerStore = [NSMapTable strongToWeakObjectsMapTable];
 	self.modalsToDismissArray = [NSMutableArray new];
 	return self;
 }
 
-
 -(UIViewController *)findContainerForId:(NSString *)containerId {
-	return [self.containerStore objectForKey:containerId];
+	return [_containerStore objectForKey:containerId];
 }
 
 - (void)setContainer:(UIViewController*)viewController containerId:(NSString*)containerId {
@@ -28,11 +26,11 @@
 		@throw [NSException exceptionWithName:@"MultipleContainerId" reason:[@"Container id already exists " stringByAppendingString:containerId] userInfo:nil];
 	}
 	
-	[self.containerStore setObject:viewController forKey:containerId];
+	[_containerStore setObject:viewController forKey:containerId];
 }
 
 - (void)removeContainer:(NSString*)containerId {
-	[self.containerStore removeObjectForKey:containerId];
+	[_containerStore removeObjectForKey:containerId];
 }
 
 

playground/ios/playgroundTests/RNNControllerFactoryTest.m

@@ -1,13 +1,9 @@
-//
-//  RNNControllerFactoryTest.m
-//  playground
-//
-//  Created by Ran Greenberg on 08/02/2017.
-//  Copyright © 2017 Wix. All rights reserved.
-//
 
 #import <XCTest/XCTest.h>
 #import "RNNControllerFactory.h"
+#import "RNNRootViewController.h"
+#import "RNNSideMenuController.h"
+#import "RNNSideMenuChildVC.h"
 
 
 @interface RNNControllerFactoryTest : XCTestCase
@@ -24,7 +20,7 @@
 	[super setUp];
 	self.creator = nil;
 	self.store = [RNNStore new];
-	self.factory = [[RNNControllerFactory alloc] initWithRootViewCreator:self.creator store:self.store];
+	self.factory = [[RNNControllerFactory alloc] initWithRootViewCreator:self.creator store:self.store eventEmitter:nil];
 }
 
 - (void)tearDown {