WOW! no recursion on app layout creation - iterative baby!

ios/RNNViewController.m

@@ -1,15 +1,8 @@
-//
-//  RNNViewController.m
-//  ReactNativeNavigation
-//
-//  Created by Ran Greenberg on 21/12/2016.
-//  Copyright © 2016 artal. All rights reserved.
-//
-
 #import "RNNViewController.h"
 #import "RCTRootView.h"
 #import "MMDrawerController.h"
 
+
 #define SCREEN                  @"screen"
 #define SIDE_MENU               @"sideMenu"
 #define TABS                    @"tabs"
@@ -18,141 +11,137 @@
 #define SIDE_MENU_RIGHT         @"right"
 
 
-@interface RNNViewController ()
-@end
+typedef enum
+{
+    SideMenuModeNone        = 0,
+    SideMenuModeLeft        = 1 << 0,
+    SideMenuModeRight       = 1 << 1,
+} SideMenuMode;
 
 
 @implementation RNNViewController
 
 
-#pragma mark - Static function
-
-
-+ (UIViewController*)controllerWithLayout:(NSDictionary *)layout bridge:(RCTBridge *)bridge {
-    
-    UIViewController *controller = nil;
-    NSDictionary *screen = layout[SCREEN];
-    NSArray *tabs = layout[TABS];
++(SideMenuMode)sideMenuModeForLayout:(NSDictionary*)layout {
     NSDictionary *sideMenu = layout[SIDE_MENU];
-    
+    SideMenuMode mode = SideMenuModeNone;
     if (sideMenu) {
-        NSDictionary *centerScreenDictionary;
-        if (screen) {
-            centerScreenDictionary = @{SCREEN: screen};
+        if (sideMenu[SIDE_MENU_LEFT]) {
+            mode |= SideMenuModeLeft;
         }
-        else if (tabs){
-            centerScreenDictionary = @{TABS: layout[TABS]};
+        if (sideMenu[SIDE_MENU_RIGHT]) {
+            mode |= SideMenuModeRight;
         }
-        else {
-            return nil;
-        }
-        
-        UIViewController *centerViewController = [RNNViewController controllerWithLayout:centerScreenDictionary bridge:bridge];
-        controller = [RNNViewController sideMenuWithLayout:sideMenu centerViewController:centerViewController bridge:bridge];
-        
-        return controller;
     }
+    return mode;
+}
+
+
++ (UIViewController*)controllerWithLayout:(NSDictionary *)layout bridge:(RCTBridge *)bridge {
+    UIViewController *controller = nil;
+    SideMenuMode sideMenuMode = [RNNViewController sideMenuModeForLayout:layout];
+    UIViewController *centerViewController = [RNNViewController centerControllerWithLayout:layout bridge:bridge];
     
-    if (tabs) {
-        controller = [RNNViewController tabBarWithTabsArray:tabs bridge:bridge];
-        return controller;
+    if (sideMenuMode == SideMenuModeNone) {
+        controller = centerViewController;
     }
-    
-    if (screen) {
-        NSString *screenKey = screen[SCREEN_KEY];
-        if (screenKey) {
-            controller = [RNNViewController navigationControllerWithScreenKey:screenKey bridge:bridge];
-        }
-        
-        return controller;
+    else {
+        NSDictionary *sideMenuLayout = layout[SIDE_MENU];
+        controller = [RNNViewController sideMenuControllerWithSideMenuLayout:sideMenuLayout
+                                                                sideMenuMode:sideMenuMode
+                                                        centerViewController:centerViewController
+                                                                      bridge:bridge];
     }
-    
     return controller;
 }
 
 
-+(UIViewController*)controllerWithScreenKey:(NSString*)screenKey bridge:(RCTBridge *)bridge {
-    
++(UIViewController*)centerControllerWithLayout:(NSDictionary*)layout bridge:(RCTBridge*)bridge {
     UIViewController *controller = nil;
     
-    RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:bridge moduleName:screenKey initialProperties:nil];
-    if (!reactView) return nil;
-    
-    controller = [UIViewController new];
-    controller.view = reactView;
+    NSDictionary *tabs = layout[TABS];
+    NSDictionary *screen = layout[SCREEN];
+    if (tabs) {
+        controller = [RNNViewController tabBarControllerWithArray:tabs bridge:bridge];
+    }
+    else if (screen) {
+        NSDictionary *screenLayout = @{SCREEN: screen};
+        controller = [RNNViewController controllerWithScreenLayout:screenLayout bridge:bridge];
+    }
     
     return controller;
 }
 
 
-+(UINavigationController*)navigationControllerWithScreenKey:(NSString*)screenKey bridge:(RCTBridge*)bridge {
++(MMDrawerController*)sideMenuControllerWithSideMenuLayout:(NSDictionary*)sideMenuLayout sideMenuMode:(SideMenuMode)sideMenuMode centerViewController:(UIViewController*)centerVC bridge:(RCTBridge*)bridge {
+    UIViewController *leftVC, *rightVC = nil;
     
-    UINavigationController *controller = nil;
+    if (sideMenuMode & SideMenuModeLeft) {
+        NSDictionary *leftLayout = sideMenuLayout[SIDE_MENU_LEFT];
+        NSString *leftScreenKey = leftLayout[SCREEN_KEY];
+        leftVC = [RNNViewController controllerWithScreenKey:leftScreenKey bridge:bridge];
+    }
+    if (sideMenuMode & SideMenuModeRight) {
+        NSDictionary *rightLayout = sideMenuLayout[SIDE_MENU_RIGHT];
+        NSString *rightScreenKey = rightLayout[SCREEN_KEY];
+        rightVC = [RNNViewController controllerWithScreenKey:rightScreenKey bridge:bridge];
+    }
     
-    UIViewController *viewController = [RNNViewController controllerWithScreenKey:screenKey bridge:bridge];
-    if (!viewController) return nil;
+    MMDrawerController *controller = [[MMDrawerController alloc] initWithCenterViewController:centerVC
+                                                                     leftDrawerViewController:leftVC
+                                                                    rightDrawerViewController:rightVC];
     
-    controller = [[UINavigationController alloc] initWithRootViewController:viewController];
-    [controller.tabBarItem setTitle:@"tab"];
+    controller.openDrawerGestureModeMask = MMOpenDrawerGestureModeAll;
+    controller.closeDrawerGestureModeMask = MMCloseDrawerGestureModeAll;
     
     return controller;
 }
 
 
-+(UIViewController*)sideMenuWithLayout:(NSDictionary*)layout centerViewController:(UIViewController*)centerViewController bridge:(RCTBridge*)bridge {
-    
-    UIViewController *leftViewController, *rightViewController, *sideMenuViewController = nil;
++(UITabBarController*)tabBarControllerWithArray:(NSArray*)tabs bridge:(RCTBridge*)bridge {
+    UIViewController *controller = nil;
     
-    NSDictionary *left = layout[SIDE_MENU_LEFT];
-    if (left) {
-        NSString *leftScreenKey = left[SCREEN_KEY];
-        leftViewController = [RNNViewController controllerWithScreenKey:leftScreenKey bridge:bridge];
+    NSMutableArray *tabsVC = [NSMutableArray new];
+    for (NSDictionary* tab in tabs) {
+        UIViewController *tabVC = [RNNViewController controllerWithScreenLayout:tab bridge:bridge];
+        if (tabVC) {
+            [tabsVC addObject:tabVC];
+        }
     }
-    
-    NSDictionary *right = layout[SIDE_MENU_RIGHT];
-    if (right) {
-        NSString *rightScreenKey = right[SCREEN_KEY];
-        rightViewController = [RNNViewController controllerWithScreenKey:rightScreenKey bridge:bridge];
+    if ([tabsVC count] > 0) {
+        UITabBarController *tabController = [[UITabBarController alloc] init];
+        tabController.viewControllers = tabsVC;
+        controller = tabController;
     }
-    
-    if (rightViewController || leftViewController) {
-        sideMenuViewController = [[MMDrawerController alloc] initWithCenterViewController:centerViewController leftDrawerViewController:leftViewController rightDrawerViewController:rightViewController];
-        
-        // TODO: CHANGE THIS
-        ((MMDrawerController*)sideMenuViewController).openDrawerGestureModeMask = MMOpenDrawerGestureModeAll;
-        ((MMDrawerController*)sideMenuViewController).closeDrawerGestureModeMask = MMCloseDrawerGestureModeAll;
-    }
-    
-    return sideMenuViewController;
+    return controller;
 }
 
-+(UITabBarController*)tabBarWithTabsArray:(NSArray*)tabsArray bridge:(RCTBridge*)bridge {
-    
-    UITabBarController *tabBarController = nil;
-    NSMutableArray *tabsViewControllersArray = [[NSMutableArray alloc] init];
-    
-    for (NSDictionary *tab in tabsArray) {
-        UIViewController *tabViewController = [RNNViewController controllerWithLayout:tab bridge:bridge];
-        if (tabViewController) {
-            [tabsViewControllersArray addObject:tabViewController];
+
++(UIViewController*)controllerWithScreenLayout:(NSDictionary*)screenLayout bridge:(RCTBridge*)bridge {
+    UIViewController *controller = nil;
+    NSDictionary *screen = screenLayout[SCREEN];
+    NSDictionary *screenKey = screen[SCREEN_KEY];
+    if (screen && screenKey) {
+        UIViewController *rootVC = [RNNViewController controllerWithScreenKey:screenKey bridge:bridge];
+        if (rootVC) {
+            controller = [[UINavigationController alloc] initWithRootViewController:rootVC];
+            [controller.tabBarItem setTitle:screenKey];
         }
     }
-    if ([tabsViewControllersArray count] > 0) {
-        tabBarController = [UITabBarController new];
-        tabBarController.viewControllers = tabsViewControllersArray;
-    }
-    
-    return tabBarController;
-}
-
--(void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    
+    return controller;
 }
 
 
-
++(UIViewController*)controllerWithScreenKey:(NSString*)screenKey bridge:(RCTBridge*)bridge {
+    UIViewController *controller = nil;
+    if (screenKey) {
+        RCTRootView *reactView = [[RCTRootView alloc] initWithBridge:bridge moduleName:screenKey initialProperties:nil];
+        if (!reactView) return nil;
+        controller = [UIViewController new];
+        controller.view = reactView;
+    }
+    return controller;
+}
 
 
 @end
-

src2/commands/valid-commands.js

@@ -1,6 +1,6 @@
 export const singleScreenApp = {
   screen: {
-    key: 'example.FirstTabScreen'
+    key: 'com.example.FirstTabScreen'
   }
 };