V2 current tab (#2205)

* readme

* WIP

* ios, tests

* refactoring

* current tab

* android tests

* readme

* current tab index ios

* fix tests

* readme

* test fix

* probabl test fix

.gitignore

@@ -212,3 +212,14 @@ buck-out/
 \.buckd/
 android/app/libs
 android/keystores/debug.keystore
+AndroidE2E/app/.settings
+AndroidE2E/.settings
+AndroidE2E/app/.project
+AndroidE2E/app/.classpath
+AndroidE2E/.project
+lib/android/.settings
+lib/android/.project
+lib/android/app/.settings
+playground/android/.settings
+playground/android/.project
+playground/android/app/.settings

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/TopLevelApiTest.java

@@ -11,6 +11,14 @@ public class TopLevelApiTest extends BaseTest {
 		elementByText("SWITCH TO TAB BASED APP").click();
 		assertExists(By.text("This is tab 1"));
 		assertExists(By.text("Hello from a function!"));
+  }
+  
+  @Test
+	public void switchToTabBasedApp_SwitchTab() throws Exception {
+		elementByText("SWITCH TO TAB BASED APP").click();
+		assertExists(By.text("This is tab 1"));
+    elementByText("SWITCH TO TAB 2").click();
+    assertExists(By.text("This is tab 2"));
 	}
 
 	@Test

README.md

@@ -99,8 +99,8 @@ v2 is written in Test Driven Development. We have a test for every feature inclu
 | drawUnder          |    WIP @gran33     |      [Contribute](/docs/docs/CONTRIBUTING.md)       | |
 | hidden   |   ✅     |    [Contribute](/docs/docs/CONTRIBUTING.md)        | @gtchance|
 | tabBadge          |       ✅    | [Contribute](/docs/docs/CONTRIBUTING.md)| Wix|
-| currentTab by Index          |       [Contribute](/docs/docs/CONTRIBUTING.md)    | [Contribute](/docs/docs/CONTRIBUTING.md)| |
-| currentTab by cointainerId         |       [Contribute](/docs/docs/CONTRIBUTING.md)    | [Contribute](/docs/docs/CONTRIBUTING.md)| |
+| currentTab by Index          |       ✅    | ✅ | Wix |
+| currentTab by cointainerId         |       [Contribute](/docs/docs/CONTRIBUTING.md)    | ✅ | Wix |
 
 |       buttons        | iOS  | Android | contributors|
 |--------------------|-----|----|-----|

lib/android/app/src/main/java/com/reactnativenavigation/parse/BottomTabsOptions.java

@@ -0,0 +1,44 @@
+package com.reactnativenavigation.parse;
+
+
+import org.json.JSONObject;
+
+public class BottomTabsOptions implements DEFAULT_VALUES {
+
+	public static BottomTabsOptions parse(JSONObject json) {
+		BottomTabsOptions options = new BottomTabsOptions();
+		if (json == null) return options;
+
+		options.currentTabId = json.optString("currentTabId", NO_VALUE);
+		options.currentTabIndex = json.optInt("currentTabIndex", NO_INT_VALUE);
+		options.tabBadge = json.optInt("tabBadge", NO_INT_VALUE);
+		options.hidden = NavigationOptions.BooleanOptions.parse(json.optString("hidden"));
+		options.animateHide = NavigationOptions.BooleanOptions.parse(json.optString("animateHide"));
+
+		return options;
+	}
+
+	public int tabBadge = NO_INT_VALUE;
+	public NavigationOptions.BooleanOptions hidden = NavigationOptions.BooleanOptions.False;
+	public NavigationOptions.BooleanOptions animateHide = NavigationOptions.BooleanOptions.False;
+	public int currentTabIndex;
+	public String currentTabId;
+
+	void mergeWith(final BottomTabsOptions other) {
+		if (!NO_VALUE.equals(other.currentTabId)) {
+			currentTabId = other.currentTabId;
+		}
+		if(NO_INT_VALUE != other.currentTabIndex) {
+			currentTabId = other.currentTabId;
+		}
+		if(NO_INT_VALUE != other.tabBadge) {
+			tabBadge = other.tabBadge;
+		}
+		if (other.hidden != NavigationOptions.BooleanOptions.NoValue) {
+			hidden = other.hidden;
+		}
+		if (other.animateHide != NavigationOptions.BooleanOptions.NoValue) {
+			animateHide = other.animateHide;
+		}
+	}
+}

lib/android/app/src/main/java/com/reactnativenavigation/parse/DEFAULT_VALUES.java

@@ -3,7 +3,7 @@ package com.reactnativenavigation.parse;
 
 import android.graphics.Color;
 
-interface DEFAULT_VALUES {
+public interface DEFAULT_VALUES {
 	String NO_VALUE = "";
 	int NO_INT_VALUE = Integer.MIN_VALUE;
 	float NO_FLOAT_VALUE = Float.MIN_VALUE;

lib/android/app/src/main/java/com/reactnativenavigation/parse/NavigationOptions.java

@@ -27,13 +27,16 @@ public class NavigationOptions implements DEFAULT_VALUES {
 		if (json == null) return result;
 
 		result.topBarOptions = TopBarOptions.parse(json.optJSONObject("topBar"));
+		result.bottomTabsOptions = BottomTabsOptions.parse(json.optJSONObject("tabBar"));
 
 		return result;
 	}
 
 	public TopBarOptions topBarOptions = new TopBarOptions();
+	public BottomTabsOptions bottomTabsOptions = new BottomTabsOptions();
 
 	public void mergeWith(final NavigationOptions other) {
 		topBarOptions.mergeWith(other.topBarOptions);
+		bottomTabsOptions.mergeWith(other.bottomTabsOptions);
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/presentation/NavigationOptionsListener.java

@@ -0,0 +1,8 @@
+package com.reactnativenavigation.presentation;
+
+
+import com.reactnativenavigation.parse.NavigationOptions;
+
+public interface NavigationOptionsListener {
+	void mergeNavigationOptions(NavigationOptions options);
+}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/BottomTabsController.java

@@ -10,6 +10,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 
+import com.reactnativenavigation.parse.NavigationOptions;
+import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.utils.CompatUtils;
 
 import java.util.ArrayList;
@@ -20,8 +22,11 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 import static android.widget.RelativeLayout.ABOVE;
 import static android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM;
+import static com.reactnativenavigation.parse.DEFAULT_VALUES.NO_INT_VALUE;
+import static com.reactnativenavigation.parse.DEFAULT_VALUES.NO_VALUE;
 
-public class BottomTabsController extends ParentController implements BottomNavigationView.OnNavigationItemSelectedListener {
+public class BottomTabsController extends ParentController
+		implements BottomNavigationView.OnNavigationItemSelectedListener, NavigationOptionsListener {
 	private BottomNavigationView bottomNavigationView;
 	private List<ViewController> tabs = new ArrayList<>();
 	private int selectedIndex = 0;
@@ -86,8 +91,43 @@ public class BottomTabsController extends ParentController implements BottomNavi
 		return selectedIndex;
 	}
 
+	@NonNull
 	@Override
 	public Collection<ViewController> getChildControllers() {
 		return tabs;
 	}
+
+	@Override
+	public void mergeNavigationOptions(NavigationOptions options) {
+		if (options.bottomTabsOptions != null) {
+			if (options.bottomTabsOptions.currentTabIndex != NO_INT_VALUE) {
+				selectTabAtIndex(options.bottomTabsOptions.currentTabIndex);
+			}
+			if (!NO_VALUE.equals(options.bottomTabsOptions.currentTabId)) {
+				String id = options.bottomTabsOptions.currentTabId;
+				for (ViewController controller : tabs) {
+					if (controller.getId().equals(id)) {
+						selectTabAtIndex(tabs.indexOf(controller));
+					}
+					if (controller instanceof StackController) {
+						if (hasControlWithId((StackController) controller, id)) {
+							selectTabAtIndex(tabs.indexOf(controller));
+						}
+					}
+				}
+			}
+		}
+	}
+
+	private boolean hasControlWithId(StackController controller, String id) {
+		for (ViewController child : controller.getChildControllers()) {
+			if (id.equals(child.getId())) {
+				return true;
+			}
+			if (child instanceof StackController) {
+				return hasControlWithId((StackController) child, id);
+			}
+		}
+		return false;
+	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java

@@ -7,11 +7,12 @@ import android.view.View;
 
 import com.reactnativenavigation.anim.StackAnimator;
 import com.reactnativenavigation.parse.NavigationOptions;
+import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.presentation.OptionsPresenter;
 import com.reactnativenavigation.views.TopBar;
 import com.reactnativenavigation.views.TopbarContainerView;
 
-public class ContainerViewController extends ViewController {
+public class ContainerViewController extends ViewController implements NavigationOptionsListener {
 
 	public interface ContainerViewCreator {
 
@@ -87,7 +88,8 @@ public class ContainerViewController extends ViewController {
 		return containerView.asView();
 	}
 
-	void mergeNavigationOptions(NavigationOptions options) {
+	@Override
+	public void mergeNavigationOptions(NavigationOptions options) {
 		navigationOptions.mergeWith(options);
 		applyOptions();
 	}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java

@@ -8,6 +8,7 @@ import android.widget.FrameLayout;
 import com.facebook.react.bridge.Promise;
 import com.reactnativenavigation.parse.NavigationOptions;
 import com.reactnativenavigation.parse.OverlayOptions;
+import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.presentation.OverlayPresenter;
 import com.reactnativenavigation.utils.CompatUtils;
 
@@ -70,8 +71,11 @@ public class Navigator extends ParentController {
 
 	public void setOptions(final String containerId, NavigationOptions options) {
 		ViewController target = findControllerById(containerId);
-		if (target instanceof ContainerViewController) {
-			((ContainerViewController) target).mergeNavigationOptions(options);
+		if (target instanceof NavigationOptionsListener) {
+			((NavigationOptionsListener) target).mergeNavigationOptions(options);
+		}
+		if (root instanceof NavigationOptionsListener) {
+			((NavigationOptionsListener) root).mergeNavigationOptions(options);
 		}
 	}
 

lib/android/app/src/test/java/com/reactnativenavigation/parse/NavigationOptionsTest.java

@@ -29,6 +29,15 @@ public class NavigationOptionsTest extends BaseTest {
 
 		json.put("topBar", topBarJson);
 
+		JSONObject tabBarJson = new JSONObject();
+		tabBarJson.put("currentTabId", "ContainerId");
+		tabBarJson.put("currentTabIndex", 1);
+		tabBarJson.put("hidden", true);
+		tabBarJson.put("animateHide", true);
+		tabBarJson.put("tabBadge", 3);
+
+		json.put("tabBar", tabBarJson);
+
 		NavigationOptions result = NavigationOptions.parse(json);
 		assertThat(result.topBarOptions.title).isEqualTo("the title");
 		assertThat(result.topBarOptions.backgroundColor).isEqualTo(0xff123456);
@@ -36,6 +45,11 @@ public class NavigationOptionsTest extends BaseTest {
 		assertThat(result.topBarOptions.textFontSize).isEqualTo(18);
 		assertThat(result.topBarOptions.textFontFamily).isEqualTo("HelveticaNeue-CondensedBold");
 		assertThat(result.topBarOptions.hidden).isEqualTo(True);
+		assertThat(result.bottomTabsOptions.animateHide).isEqualTo(True);
+		assertThat(result.bottomTabsOptions.hidden).isEqualTo(True);
+		assertThat(result.bottomTabsOptions.tabBadge).isEqualTo(3);
+		assertThat(result.bottomTabsOptions.currentTabId).isEqualTo("ContainerId");
+		assertThat(result.bottomTabsOptions.currentTabIndex).isEqualTo(1);
 	}
 
 	@Test

lib/ios/RNNBridgeModule.m

@@ -54,9 +54,5 @@ RCT_EXPORT_METHOD(dismissAllModals) {
 	[_commandsHandler dismissAllModals];
 }
 
-RCT_EXPORT_METHOD(switchToTab:(NSString*)containerId tabIndex:(nonnull NSNumber*)tabIndex) {
-	[_commandsHandler switchToTab:containerId tabIndex:tabIndex];
-}
-
 @end
 

lib/ios/RNNCommandsHandler.h

@@ -26,6 +26,4 @@
 
 -(void) dismissAllModals;
 
--(void) switchToTab:(NSString*)containerId tabIndex:(NSNumber*)tabIndex;
-
 @end

lib/ios/RNNCommandsHandler.m

@@ -91,13 +91,6 @@
 	[_modalManager dismissAllModals];
 }
 
--(void) switchToTab:(NSString *)containerId tabIndex:(NSNumber *)tabIndex {
-	[self assertReady];
-	
-	UIViewController* vc = [_store findContainerForId:containerId];
-	[vc.tabBarController setSelectedIndex:[tabIndex unsignedIntegerValue]];
-}
-
 #pragma mark - private
 
 -(void) assertReady {

lib/ios/RNNNavigationOptions.h

@@ -1,6 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "RNNTopBarOptions.h"
+#import "RNNTabBarOptions.h"
 
 extern const NSInteger BLUR_STATUS_TAG;
 extern const NSInteger BLUR_TOPBAR_TAG;
@@ -9,14 +10,13 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 
 @property (nonatomic, strong) NSNumber* statusBarHidden;
 @property (nonatomic, strong) NSNumber* screenBackgroundColor;
-@property (nonatomic, strong) NSString* tabBadge;
 @property (nonatomic, strong) id orientation;
 @property (nonatomic, strong) NSArray* leftButtons;
 @property (nonatomic, strong) NSArray* rightButtons;
 @property (nonatomic, strong) NSNumber* statusBarBlur;
 @property (nonatomic, strong) NSNumber* statusBarHideWithTopBar;
-@property (nonatomic, strong) NSNumber* tabBarHidden;
 @property (nonatomic, strong) RNNTopBarOptions* topBar;
+@property (nonatomic, strong) RNNTabBarOptions* tabBar;
 
 
 - (UIInterfaceOrientationMask)supportedOrientations;

lib/ios/RNNNavigationOptions.m

@@ -17,12 +17,11 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 	self = [super init];
 	self.statusBarHidden = [navigationOptions objectForKey:@"statusBarHidden"];
 	self.screenBackgroundColor = [navigationOptions objectForKey:@"screenBackgroundColor"];
-	self.tabBadge = [navigationOptions objectForKey:@"tabBadge"];
 	self.orientation = [navigationOptions objectForKey:@"orientation"];
 	self.leftButtons = [navigationOptions objectForKey:@"leftButtons"];
 	self.rightButtons = [navigationOptions objectForKey:@"rightButtons"];
-	self.tabBarHidden = [navigationOptions objectForKey:@"tabBarHidden"];
 	self.topBar = [[RNNTopBarOptions alloc] initWithDict:[navigationOptions objectForKey:@"topBar"]];
+	self.tabBar = [[RNNTabBarOptions alloc] initWithDict:[navigationOptions objectForKey:@"tabBar"]];
 	
 	return self;
 }
@@ -30,7 +29,9 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 -(void)mergeWith:(NSDictionary *)otherOptions {
 	for (id key in otherOptions) {
 		if ([key isEqualToString:@"topBar"]) {
-			[self.topBar mergeWith:[otherOptions objectForKey:@"topBar"]];
+			[self.topBar mergeWith:[otherOptions objectForKey:key]];
+		} else if ([key isEqualToString:@"tabBar"]) {
+			[self.tabBar mergeWith:[otherOptions objectForKey:key]];
 		} else {
 			[self setValue:[otherOptions objectForKey:key] forKey:key];
 		}
@@ -66,16 +67,16 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 			}
 			viewController.navigationController.navigationBar.titleTextAttributes = navigationBarTitleTextAttributes;
 		}
-
-
+		
+		
 		if (self.topBar.hidden){
 			[viewController.navigationController setNavigationBarHidden:[self.topBar.hidden boolValue] animated:[self.topBar.animateHide boolValue]];
 		}
-
+		
 		if (self.topBar.hideOnScroll) {
 			viewController.navigationController.hidesBarsOnSwipe = [self.topBar.hideOnScroll boolValue];
 		}
-
+		
 		if (self.topBar.buttonColor) {
 			UIColor* buttonColor = [RCTConvert UIColor:self.topBar.buttonColor];
 			viewController.navigationController.navigationBar.tintColor = buttonColor;
@@ -125,12 +126,17 @@ const NSInteger BLUR_TOPBAR_TAG = 78264802;
 		viewController.view.backgroundColor = screenColor;
 	}
 	
-	if (self.tabBadge) {
-		NSString *badge = [RCTConvert NSString:self.tabBadge];
-		if (viewController.navigationController) {
-			viewController.navigationController.tabBarItem.badgeValue = badge;
-		} else {
-			viewController.tabBarItem.badgeValue = badge;
+	if (self.tabBar) {
+		if (self.tabBar.tabBadge) {
+			NSString *badge = [RCTConvert NSString:self.tabBar.tabBadge];
+			if (viewController.navigationController) {
+				viewController.navigationController.tabBarItem.badgeValue = badge;
+			} else {
+				viewController.tabBarItem.badgeValue = badge;
+			}
+		}
+		if (self.tabBar.currentTabIndex) {
+			[viewController.tabBarController setSelectedIndex:[self.tabBar.currentTabIndex unsignedIntegerValue]];
 		}
 	}
 	

lib/ios/RNNRootViewController.m

@@ -55,8 +55,8 @@
 
 - (BOOL)hidesBottomBarWhenPushed
 {
-	if (self.navigationOptions.tabBarHidden) {
-		return [self.navigationOptions.tabBarHidden boolValue];
+	if (self.navigationOptions.tabBar && self.navigationOptions.tabBar.hidden) {
+		return [self.navigationOptions.tabBar.hidden boolValue];
 	}
 	return NO;
 }

lib/ios/RNNTabBarOptions.h

@@ -0,0 +1,16 @@
+#import <Foundation/Foundation.h>
+
+extern const NSInteger BLUR_TOPBAR_TAG;
+
+@interface RNNTabBarOptions : NSObject
+
+@property (nonatomic, strong) NSNumber* hidden;
+@property (nonatomic, strong) NSNumber* animateHide;
+@property (nonatomic, strong) NSString* tabBadge;
+@property (nonatomic, strong) NSNumber* currentTabIndex;
+
+-(instancetype)init;
+-(instancetype)initWithDict:(NSDictionary *)topBarOptions;
+-(void)mergeWith:(NSDictionary*)otherOptions;
+
+@end

lib/ios/RNNTabBarOptions.m

@@ -0,0 +1,25 @@
+#import "RNNTabBarOptions.h"
+
+@implementation RNNTabBarOptions
+
+-(instancetype)init {
+	return [self initWithDict:@{}];
+}
+
+-(instancetype)initWithDict:(NSDictionary *)tabBarOptions {
+	self = [super init];
+	
+	self.hidden = [tabBarOptions valueForKey:@"hidden"];
+	self.animateHide = [tabBarOptions valueForKey:@"animateHide"];
+	self.tabBadge = [tabBarOptions valueForKey:@"tabBadge"];
+	self.currentTabIndex = [tabBarOptions valueForKey:@"currentTabIndex"];
+	
+	return self;
+}
+
+-(void)mergeWith:(NSDictionary *)otherOptions {
+	for (id key in otherOptions) {
+		[self setValue:[otherOptions objectForKey:key] forKey:key];
+	}
+}
+@end

lib/ios/RNNTopBarOptions.h

@@ -1,6 +1,5 @@
 #import <Foundation/Foundation.h>
 
-extern const NSInteger BLUR_STATUS_TAG;
 extern const NSInteger BLUR_TOPBAR_TAG;
 
 @interface RNNTopBarOptions : NSObject

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -98,6 +98,8 @@
 		7BEF0D1C1E43771B003E96B0 /* RNNLayoutNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BEF0D1A1E43771B003E96B0 /* RNNLayoutNode.h */; };
 		7BEF0D1D1E43771B003E96B0 /* RNNLayoutNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 7BEF0D1B1E43771B003E96B0 /* RNNLayoutNode.m */; };
 		A7626BFD1FC2FB2C00492FB8 /* RNNTopBarOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = A7626BFC1FC2FB2C00492FB8 /* RNNTopBarOptions.m */; };
+		A7626C011FC5796200492FB8 /* RNNTabBarOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = A7626C001FC5796200492FB8 /* RNNTabBarOptions.m */; };
+		A7626BFD1FC2FB2C00492FB8 /* RNNTopBarOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = A7626BFC1FC2FB2C00492FB8 /* RNNTopBarOptions.m */; };
 		E83BAD681F2734B500A9F3DD /* RNNNavigationOptionsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E83BAD671F2734B500A9F3DD /* RNNNavigationOptionsTest.m */; };
 		E83BAD6B1F27363A00A9F3DD /* RNNNavigationOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = E83BAD6A1F27363A00A9F3DD /* RNNNavigationOptions.m */; };
 		E83BAD791F27416B00A9F3DD /* RNNRootViewControllerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = E83BAD781F27416B00A9F3DD /* RNNRootViewControllerTest.m */; };
@@ -223,6 +225,8 @@
 		7BEF0D1B1E43771B003E96B0 /* RNNLayoutNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNLayoutNode.m; sourceTree = "<group>"; };
 		A7626BFC1FC2FB2C00492FB8 /* RNNTopBarOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTopBarOptions.m; sourceTree = "<group>"; };
 		A7626BFE1FC2FB6700492FB8 /* RNNTopBarOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTopBarOptions.h; sourceTree = "<group>"; };
+		A7626BFF1FC578AB00492FB8 /* RNNTabBarOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNTabBarOptions.h; sourceTree = "<group>"; };
+		A7626C001FC5796200492FB8 /* RNNTabBarOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNTabBarOptions.m; sourceTree = "<group>"; };
 		D8AFADBD1BEE6F3F00A4592D /* libReactNativeNavigation.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libReactNativeNavigation.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		E83BAD671F2734B500A9F3DD /* RNNNavigationOptionsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNNavigationOptionsTest.m; sourceTree = "<group>"; };
 		E83BAD691F27362500A9F3DD /* RNNNavigationOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNNavigationOptions.h; sourceTree = "<group>"; };
@@ -373,6 +377,8 @@
 				214545241F4DC125006E8DA1 /* RNNUIBarButtonItem.m */,
 				A7626BFC1FC2FB2C00492FB8 /* RNNTopBarOptions.m */,
 				A7626BFE1FC2FB6700492FB8 /* RNNTopBarOptions.h */,
+				A7626BFF1FC578AB00492FB8 /* RNNTabBarOptions.h */,
+				A7626C001FC5796200492FB8 /* RNNTabBarOptions.m */,
 			);
 			name = Controllers;
 			sourceTree = "<group>";
@@ -636,6 +642,7 @@
 				263905B81E4C6F440023D7D3 /* UIViewController+MMDrawerController.m in Sources */,
 				263905CD1E4C6F440023D7D3 /* SidebarWunderlistAnimation.m in Sources */,
 				263905CF1E4C6F440023D7D3 /* TheSidebarController.m in Sources */,
+				A7626C011FC5796200492FB8 /* RNNTabBarOptions.m in Sources */,
 				263905AF1E4C6F440023D7D3 /* MMDrawerBarButtonItem.m in Sources */,
 				7B4928091E70415400555040 /* RNNCommandsHandler.m in Sources */,
 				268692831E5054F800E2C612 /* RNNStore.m in Sources */,

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -158,7 +158,7 @@
 
 -(void)testTabBadge {
 	NSString* tabBadgeInput = @"5";
-	self.options.tabBadge = tabBadgeInput;
+	self.options.tabBar.tabBadge = tabBadgeInput;
 	__unused RNNTabBarController* vc = [[RNNTabBarController alloc] init];
 	NSMutableArray* controllers = [NSMutableArray new];
 	UITabBarItem* item = [[UITabBarItem alloc] initWithTitle:@"A Tab" image:nil tag:1];
@@ -417,7 +417,7 @@
 
 
 - (void)testTabBarHidden_true {
-	self.options.tabBarHidden = @(1);
+	self.options.tabBar.hidden = @(1);
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 
@@ -425,7 +425,7 @@
 }
 
 - (void)testTabBarHidden_false {
-	self.options.tabBarHidden = @(0);
+	self.options.tabBar.hidden = @(0);
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
 	[self.uut viewWillAppear:false];
 

lib/src/Navigation.js

@@ -64,10 +64,6 @@ class Navigation {
     return this.commands.popToRoot(containerId);
   }
 
-  switchToTab(onContainerId, tabIndex) {
-    return this.commands.switchToTab(onContainerId, tabIndex);
-  }
-
   events() {
     return this.publicEventsRegistry;
   }

lib/src/adapters/NativeCommandsSender.js

@@ -41,11 +41,6 @@ class NativeCommandsSender {
     return this.nativeCommandsModule.dismissAllModals();
   }
 
-  switchToTab(containerId, tabIndex) {
-    this.nativeCommandsModule.switchToTab(containerId, tabIndex);
-    return Promise.resolve(containerId);
-  }
-
   showOverlay(type, options) {
     return this.nativeCommandsModule.showOverlay(type, options);
   }

lib/src/commands/Commands.js

@@ -55,10 +55,6 @@ class Commands {
     return this.nativeCommandsSender.popToRoot(containerId);
   }
 
-  switchToTab(containerId, tabIndex) {
-    return this.nativeCommandsSender.switchToTab(containerId, tabIndex);
-  }
-
   showOverlay(type, options) {
     const input = _.cloneDeep(options);
     OptionsProcessor.processOptions(input);

lib/src/commands/Commands.test.js

@@ -223,21 +223,6 @@ describe('Commands', () => {
     });
   });
 
-  describe('switchToTab', () => {
-    it('switch tab in tabs controller', () => {
-      const tabIndex = 1;
-      uut.switchToTab('theContainerId', tabIndex);
-      expect(mockCommandsSender.switchToTab).toHaveBeenCalledTimes(1);
-      expect(mockCommandsSender.switchToTab).toHaveBeenCalledWith('theContainerId', tabIndex);
-    });
-
-    it('returns a promise that resolves to targetId', async () => {
-      mockCommandsSender.switchToTab.mockReturnValue(Promise.resolve('theContainerId', 1));
-      const result = await uut.switchToTab('theContainerId');
-      expect(result).toEqual('theContainerId');
-    });
-  });
-
   describe('showOverlay', () => {
     it('deep clones input to avoid mutation errors', () => {
       const obj = { title: 'test' };

playground/src/containers/TextScreen.js

@@ -30,12 +30,18 @@ class TextScreen extends Component {
 
   onButtonPress() {
     Navigation.setOptions(this.props.containerId, {
-      tabBadge: `TeSt`
+      tabBar: {
+        tabBadge: `TeSt`
+      }
     });
   }
 
   onClickSwitchToTab() {
-    Navigation.switchToTab(this.props.containerId, 1);
+    Navigation.setOptions(this.props.containerId, {
+      tabBar: {
+        currentTabIndex: 1
+      }
+    });
   }
 }
 module.exports = TextScreen;