refactored custom view controlles

lib/ios/RNNControllerFactory.m

@@ -75,7 +75,7 @@
 		result = [self createSideMenuChild:node type:RNNSideMenuChildTypeRight];
 	}
 	
-	else if ( node.isNativeComponent) {
+	else if (node.isExternalComponent) {
 		result = [self createComponent:node nativeComponent:YES];
 	}
 	
@@ -93,7 +93,7 @@
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
 	options.defaultOptions = _defaultOptions;
 	NSString* componentId = node.nodeId;
-	RNNRootViewController* component = [[RNNRootViewController alloc] initWithName:name withOptions:options withComponentId:componentId rootViewCreator:_creator eventEmitter:_eventEmitter isNativeComponent:nativeComponent];
+	RNNRootViewController* component = [[RNNRootViewController alloc] initWithName:name withOptions:options withComponentId:componentId rootViewCreator:_creator eventEmitter:_eventEmitter isExternalComponent:nativeComponent];
 	if (!component.isCustomViewController) {
 		CGSize availableSize = UIApplication.sharedApplication.delegate.window.bounds.size;
 		[_bridge.uiManager setAvailableSize:availableSize forRootView:component.view];

lib/ios/RNNLayoutNode.h

@@ -12,7 +12,7 @@
 +(instancetype)create:(NSDictionary *)json;
 
 -(BOOL)isComponent;
--(BOOL)isNativeComponent;
+-(BOOL)isExternalComponent;
 -(BOOL)isStack;
 -(BOOL)isTabs;
 -(BOOL)isTopTabs;

lib/ios/RNNLayoutNode.m

@@ -17,9 +17,9 @@
 {
 	return [self.type isEqualToString:@"Component"];
 }
--(BOOL)isNativeComponent
+-(BOOL)isExternalComponent
 {
-	return [self.type isEqualToString:@"NativeComponent"];
+	return [self.type isEqualToString:@"ExternalComponent"];
 }
 -(BOOL)isStack
 {

lib/ios/RNNRootViewController.h

@@ -23,7 +23,7 @@
 			withComponentId:(NSString*)componentId
 			rootViewCreator:(id<RNNRootViewCreator>)creator
 			   eventEmitter:(RNNEventEmitter*)eventEmitter
-		  isNativeComponent:(BOOL)isNativeComponent;
+		  isExternalComponent:(BOOL)isExternalComponent;
 
 
 -(void)applyTabBarItem;

lib/ios/RNNRootViewController.m

@@ -7,7 +7,7 @@
 @interface RNNRootViewController()
 @property (nonatomic, strong) NSString* componentName;
 @property (nonatomic) BOOL _statusBarHidden;
-@property (nonatomic) BOOL isNativeComponent;
+@property (nonatomic) BOOL isExternalComponent;
 @end
 
 @implementation RNNRootViewController
@@ -17,7 +17,7 @@
 			withComponentId:(NSString*)componentId
 			rootViewCreator:(id<RNNRootViewCreator>)creator
 			   eventEmitter:(RNNEventEmitter*)eventEmitter
-		  isNativeComponent:(BOOL)isNativeComponent {
+		  isExternalComponent:(BOOL)isExternalComponent {
 	self = [super init];
 	self.componentId = componentId;
 	self.componentName = name;
@@ -25,9 +25,9 @@
 	self.eventEmitter = eventEmitter;
 	self.animator = [[RNNAnimator alloc] initWithTransitionOptions:self.options.customTransition];
 	self.creator = creator;
-	self.isNativeComponent = isNativeComponent;
+	self.isExternalComponent = isExternalComponent;
 	
-	if (self.isNativeComponent) {
+	if (self.isExternalComponent) {
 		[self addExternalVC:name];
 	} else {
 		self.view = [creator createRootView:self.componentName rootViewId:self.componentId];
@@ -99,7 +99,7 @@
 }
 
 - (BOOL)isCustomViewController {
-	return self.isNativeComponent;
+	return self.isExternalComponent;
 }
 
 - (BOOL)prefersStatusBarHidden {

lib/ios/ReactNativeNavigationTests/RNNCommandsHandlerTest.m

@@ -69,7 +69,7 @@
 															withComponentId:@"componentId"
 															rootViewCreator:[[RNNTestRootViewCreator alloc] init]
 															   eventEmitter:nil
-														  isNativeComponent:NO];
+														  isExternalComponent:NO];
 	RNNNavigationController* nav = [[RNNNavigationController alloc] initWithRootViewController:vc];
 	[vc viewWillAppear:false];
 	XCTAssertTrue([vc.navigationItem.title isEqual:@"the title"]);

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -42,7 +42,7 @@
 	self.componentId = @"cntId";
 	self.emitter = nil;
 	self.options = [RNNNavigationOptions new];
-	self.uut = [[RNNRootViewController alloc] initWithName:self.pageName withOptions:self.options withComponentId:self.componentId rootViewCreator:self.creator eventEmitter:self.emitter isNativeComponent:NO];
+	self.uut = [[RNNRootViewController alloc] initWithName:self.pageName withOptions:self.options withComponentId:self.componentId rootViewCreator:self.creator eventEmitter:self.emitter isExternalComponent:NO];
 }
 
 -(void)testTopBarBackgroundColor_validColor{

lib/src/commands/LayoutTreeParser.test.ts

@@ -22,9 +22,9 @@ describe('LayoutTreeParser', () => {
       });
     });
 
-    it('native component', () => {
-      expect(uut.parse(LayoutExamples.nativeComponent)).toEqual({
-        type: LayoutType.NativeComponent,
+    it('external component', () => {
+      expect(uut.parse(LayoutExamples.externalComponent)).toEqual({
+        type: LayoutType.ExternalComponent,
         data: { name: 'MyReactComponent', options: LayoutExamples.options, passProps: LayoutExamples.passProps },
         children: []
       });
@@ -175,9 +175,9 @@ const singleComponent = {
   }
 };
 
-const nativeComponent = {
-  nativeComponent: {
-    name: 'MyReactComponent',
+const externalComponent = {
+  externalComponent: {
+    className: 'MyReactComponent',
     options,
     passProps
   }
@@ -286,5 +286,5 @@ const LayoutExamples = {
   sideMenu,
   topTabs,
   complexLayout,
-  nativeComponent
+  externalComponent
 };

lib/src/commands/LayoutTreeParser.ts

@@ -18,8 +18,8 @@ export class LayoutTreeParser {
       return this._stack(api.stack);
     } else if (api.component) {
       return this._component(api.component);
-    } else if (api.nativeComponent) {
-      return this._nativeComponent(api.nativeComponent);
+    } else if (api.externalComponent) {
+      return this._externalComponent(api.externalComponent);
     }
     throw new Error(`unknown LayoutType "${_.keys(api)}"`);
   }
@@ -99,11 +99,11 @@ export class LayoutTreeParser {
     };
   }
 
-  _nativeComponent(api): LayoutNode {
+  _externalComponent(api): LayoutNode {
     return {
       id: api.id,
-      type: LayoutType.NativeComponent,
-      data: { name: api.name, options: api.options, passProps: api.passProps },
+      type: LayoutType.ExternalComponent,
+      data: { name: api.className, options: api.options, passProps: api.passProps },
       children: []
     };
   }

lib/src/commands/LayoutType.ts

@@ -7,7 +7,7 @@ export enum LayoutType {
   SideMenuLeft = 'SideMenuLeft',
   SideMenuRight = 'SideMenuRight',
   TopTabs = 'TopTabs',
-  NativeComponent = 'NativeComponent'
+  ExternalComponent = 'ExternalComponent'
 }
 
 export function isLayoutType(name: string): boolean {

playground/src/screens/WelcomeScreen.js

@@ -23,7 +23,7 @@ class WelcomeScreen extends Component {
     this.onClickShowModal = this.onClickShowModal.bind(this);
     this.onClickLifecycleScreen = this.onClickLifecycleScreen.bind(this);
     this.onClickPushOptionsScreen = this.onClickPushOptionsScreen.bind(this);
-    this.onClickPushNativeComponent = this.onClickPushNativeComponent.bind(this);
+    this.onClickPushExternalComponent = this.onClickPushExternalComponent.bind(this);
     this.onClickPushOrientationMenuScreen = this.onClickPushOrientationMenuScreen.bind(this);
     this.onClickBackHandler = this.onClickBackHandler.bind(this);
     this.onClickPushTopTabsScreen = this.onClickPushTopTabsScreen.bind(this);
@@ -41,7 +41,7 @@ class WelcomeScreen extends Component {
         <Button title='Static Lifecycle Events' testID={testIDs.PUSH_STATIC_LIFECYCLE_BUTTON} onPress={this.onClickShowStaticLifecycleOverlay} />
         <Button title='Push' testID={testIDs.PUSH_BUTTON} onPress={this.onClickPush} />
         <Button title='Push Options Screen' testID={testIDs.PUSH_OPTIONS_BUTTON} onPress={this.onClickPushOptionsScreen} />
-        <Button title='Push Native Component' testID={testIDs.PUSH_NATIVE_COMPONENT_BUTTON} onPress={this.onClickPushNativeComponent} />
+        <Button title='Push Native Component' testID={testIDs.PUSH_NATIVE_COMPONENT_BUTTON} onPress={this.onClickPushExternalComponent} />
         {Platform.OS === 'android' && <Button title='Push Top Tabs screen' testID={testIDs.PUSH_TOP_TABS_BUTTON} onPress={this.onClickPushTopTabsScreen} />}
         {Platform.OS === 'android' && <Button title='Back Handler' testID={testIDs.BACK_HANDLER_BUTTON} onPress={this.onClickBackHandler} />}
         <Button title='Show Modal' testID={testIDs.SHOW_MODAL_BUTTON} onPress={this.onClickShowModal} />
@@ -233,10 +233,10 @@ class WelcomeScreen extends Component {
     });
   }
 
-  async onClickPushNativeComponent() {
+  async onClickPushExternalComponent() {
     await Navigation.push(this.props.componentId, {
-      nativeComponent: {
-        name: 'RNNCustomViewController',
+      externalComponent: {
+        className: 'RNNCustomViewController',
         options: {
           topBar: {
             title: 'pushed',