simple native recursive parsing

ios/RNNBridgeModule.m

@@ -14,7 +14,7 @@ RCT_EXPORT_MODULE();
 
 RCT_EXPORT_METHOD(startApp:(NSDictionary*)layout)
 {
-    UIApplication.sharedApplication.delegate.window.rootViewController = [RNNControllerFactory createRootViewController:layout];
+    UIApplication.sharedApplication.delegate.window.rootViewController = [[RNNControllerFactory new] createRootViewController:layout];
     [UIApplication.sharedApplication.delegate.window makeKeyAndVisible];
 }
 

ios/RNNControllerFactory.h

@@ -4,6 +4,6 @@
 
 @interface RNNControllerFactory : NSObject
 
-+(UIViewController*)createRootViewController:(NSDictionary*)layout;
+-(UIViewController*)createRootViewController:(NSDictionary*)layout;
 
 @end

ios/RNNControllerFactory.m

@@ -6,28 +6,34 @@
 
 @implementation RNNControllerFactory
 
-+(UIViewController *)createRootViewController:(NSDictionary *)layout
+-(UIViewController *)createRootViewController:(NSDictionary *)layout
 {
-    if ([layout[@"type"] isEqualToString:@"ContainerStack"]) {
-        UINavigationController* stack = [[UINavigationController alloc] init];
-        
-        NSString* containerName = [layout[@"children"] objectAtIndex:0][@"data"][@"name"];
-        NSString* containerId = [layout[@"children"] objectAtIndex:0][@"id"];
-        
-        [stack setViewControllers:@[[RNNControllerFactory create:containerName containerId:containerId]] animated:false];
-        
-        return stack;
-    }
+    return [self fromTree:layout];
+}
+
+-(UIViewController*)fromTree:(NSDictionary*)node
+{
+    NSString* nodeType = node[@"type"];
+    
+    NSString* nodeId = node[@"id"];
+    NSArray* children = node[@"children"];
+    NSDictionary* data = node[@"data"];
     
-//    NSString* containerName = layout[@"container"][@"name"];
-//    NSString* containerId = layout[@"container"][@"id"];
+    if ([nodeType isEqualToString:@"Container"])
+    {
+        return [self createContainer:nodeId data:data];
+    } else if([nodeType isEqualToString:@"ContainerStack"])
+    {
+        return [self createContainerStack:nodeId data:data children:children];
+    }
     
-//    return [RNNControllerFactory create:containerName containerId:containerId];
-    return nil;
+    @throw @"unknown container type";
 }
 
-+(UIViewController*)create:(NSString*)containerName containerId:(NSString*)containerId
+-(UIViewController*)createContainer:(NSString*)containerId data:(NSDictionary*)data
 {
+    NSString* containerName = data[@"name"];
+                                   
     RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:RNN.instance.bridge
                                                       moduleName:containerName
                                                initialProperties:@{@"containerId": containerId}];
@@ -37,4 +43,17 @@
     return controller;
 }
 
+-(UINavigationController*)createContainerStack:(NSString*)containerId data:(NSDictionary*)data children:(NSArray*)children
+{
+    UINavigationController* vc = [[UINavigationController alloc] init];
+    
+    NSMutableArray* controllers = [NSMutableArray new];
+    for (NSDictionary* node in children) {
+        [controllers addObject:[self fromTree:node]];
+    }
+    [vc setViewControllers:controllers];
+    
+    return vc;
+}
+
 @end

src/commands/Commands.js

@@ -7,6 +7,6 @@ export default class Commands {
   }
 
   startApp(simpleApi) {
-    this.nativeCommandsSender.startApp(this.layoutTreeParser.parseSimpleApi(simpleApi));
+    this.nativeCommandsSender.startApp(this.layoutTreeParser.parseSimpleJSON(simpleApi));
   }
 }

src/commands/LayoutTreeParser.js

@@ -5,24 +5,8 @@ export default class LayoutTreeParser {
     this.uniqueIdProvider = uniqueIdProvider;
   }
 
-  parseSimpleApi(params) {
+  parseSimpleJSON(params) {
     const layout = this.createContainerStackWithContainer(params.container);
-
-    //const layout = _.cloneDeep(params);
-    //if (layout.container) {
-    //  this.generateIdFor(layout.container);
-    //}
-    //if (layout.sideMenu) {
-    //  if (layout.sideMenu.left) {
-    //    this.generateIdFor(layout.sideMenu.left);
-    //  }
-    //  if (layout.sideMenu.right) {
-    //    this.generateIdFor(layout.sideMenu.right);
-    //  }
-    //}
-    //if (layout.tabs) {
-    //  _.forEach(layout.tabs, this.generateIdFor);
-    //}
     return layout;
   }
 

src/commands/LayoutTreeParser.test.js

@@ -10,7 +10,7 @@ describe('LayoutTreeParser', () => {
   });
 
   it('parses single screen', () => {
-    expect(uut.parseSimpleApi(SimpleLayouts.singleScreenApp))
+    expect(uut.parseSimpleJSON(SimpleLayouts.singleScreenApp))
       .toEqual({
         type: 'ContainerStack',
         id: 'ContainerStack+UNIQUE_ID',
@@ -28,7 +28,7 @@ describe('LayoutTreeParser', () => {
   });
 
   it('parses single screen with props', () => {
-    expect(uut.parseSimpleApi(SimpleLayouts.singleScreenWithAditionalParams))
+    expect(uut.parseSimpleJSON(SimpleLayouts.singleScreenWithAditionalParams))
       .toEqual({
         type: 'ContainerStack',
         id: 'ContainerStack+UNIQUE_ID',
@@ -55,7 +55,7 @@ describe('LayoutTreeParser', () => {
   });
 
   xit('parses tab based', () => {
-    expect(uut.parseSimpleApi(SimpleLayouts.tabBasedApp))
+    expect(uut.parseSimpleJSON(SimpleLayouts.tabBasedApp))
       .toEqual({
         type: 'Tabs',
         id: 'Tabs+UNIQUE_ID',