Fix bottom tabs attach mode (#5757)

Improved attach mode together unit test

lib/ios/BottomTabsAttachMode.h

@@ -1,4 +1,4 @@
-#import "Text.h"
+#import "Enum.h"
 
 typedef NS_ENUM(NSInteger, AttachMode) {
     BottomTabsAttachModeTogether = 0,
@@ -6,7 +6,7 @@ typedef NS_ENUM(NSInteger, AttachMode) {
     BottomTabsAttachModeOnSwitchToTab
 };
 
-@interface BottomTabsAttachMode : Text
+@interface BottomTabsAttachMode : Enum
 
 - (AttachMode)get;
 

lib/ios/BottomTabsAttachMode.m

@@ -3,12 +3,8 @@
 
 @implementation BottomTabsAttachMode
 
-- (AttachMode)get {
-    return [self.class AttachMode:[super get]];
-}
-
-- (AttachMode)getWithDefaultValue:(id)defaultValue {
-    return [self.class AttachMode:[super getWithDefaultValue:defaultValue]];
+- (AttachMode)convertString:(NSString *)string {
+    return [self.class AttachMode:string];
 }
 
 RCT_ENUM_CONVERTER(AttachMode,

lib/ios/Enum.h

@@ -0,0 +1,12 @@
+#import <Foundation/Foundation.h>
+#import "Param.h"
+
+@interface Enum : Param
+
+- (int)get;
+
+- (int)getWithDefaultValue:(int)defaultValue;
+
+- (int)convertString:(NSString *)string;
+
+@end

lib/ios/Enum.m

@@ -0,0 +1,22 @@
+#import "Enum.h"
+
+@implementation Enum
+
+- (int)get {
+    return [self convertString:super.get];
+}
+
+- (int)getWithDefaultValue:(int)defaultValue {
+    NSString* value = [super getWithDefaultValue:nil];
+	if (value) {
+        return [self convertString:value];
+    } else {
+        return defaultValue;
+    }
+}
+
+- (int)convertString:(NSString *)string {
+    return 0;
+}
+
+@end

lib/ios/EnumParser.h

@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+#import "Enum.h"
+
+@interface EnumParser : NSObject
+
++ (Enum *)parse:(NSDictionary *)json key:(NSString *)key ofClass:(Class)class;
+
+@end

lib/ios/EnumParser.m

@@ -0,0 +1,13 @@
+#import "EnumParser.h"
+#import "NullEnum.h"
+
+@implementation EnumParser
+
++ (Enum *)parse:(NSDictionary *)json key:(NSString *)key ofClass:(Class)class {
+	if (json[key]) {
+		return [json[key] isKindOfClass:[NSString class]] ? [[class alloc] initWithValue:json[key]] : [NullEnum new];
+	}
+	return [NullEnum new];
+}
+
+@end

lib/ios/NullEnum.h

@@ -0,0 +1,5 @@
+#import "Enum.h"
+
+@interface NullEnum : Enum
+
+@end

lib/ios/NullEnum.m

@@ -0,0 +1,10 @@
+#import "NullEnum.h"
+
+@implementation NullEnum
+
+- (instancetype)init {
+	self = [super initWithValue:nil];
+	return self;
+}
+
+@end

lib/ios/RNNBottomTabsOptions.m

@@ -20,7 +20,7 @@
 	self.barStyle = [TextParser parse:dict key:@"barStyle"];
 	self.fontFamily = [TextParser parse:dict key:@"fontFamily"];
 	self.titleDisplayMode = [TextParser parse:dict key:@"titleDisplayMode"];
-    self.tabsAttachMode = [TextParser parse:dict key:@"tabsAttachMode"];
+    self.tabsAttachMode = (BottomTabsAttachMode *)[EnumParser parse:dict key:@"tabsAttachMode" ofClass:BottomTabsAttachMode.class];
 	
 	return self;
 }

lib/ios/RNNComponentViewController.m

@@ -52,8 +52,8 @@
 - (void)render {
     if (!self.waitForRender)
         [self readyForPresentation];
-    else
-        [self renderReactViewIfNeeded];
+
+    [self renderReactViewIfNeeded];
 }
 
 - (void)renderReactViewIfNeeded {

lib/ios/RNNOptions.h

@@ -8,6 +8,7 @@
 #import "ImageParser.h"
 #import "IntNumberParser.h"
 #import "DoubleParser.h"
+#import "EnumParser.h"
 
 @interface RNNOptions : NSObject
 

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -215,6 +215,12 @@
 		50887CA920F26BFE00D06111 /* RNNOverlayWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 50887CA720F26BFD00D06111 /* RNNOverlayWindow.m */; };
 		50887CAA20F26BFE00D06111 /* RNNOverlayWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 50887CA820F26BFE00D06111 /* RNNOverlayWindow.h */; };
 		508EBDBD2278746400BEC144 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 508EBDBA2278742700BEC144 /* JavaScriptCore.framework */; };
+		509416A323A11C340036092C /* Enum.h in Headers */ = {isa = PBXBuildFile; fileRef = 509416A123A11C340036092C /* Enum.h */; };
+		509416A423A11C340036092C /* Enum.m in Sources */ = {isa = PBXBuildFile; fileRef = 509416A223A11C340036092C /* Enum.m */; };
+		509416A723A11C630036092C /* EnumParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 509416A523A11C630036092C /* EnumParser.h */; };
+		509416A823A11C630036092C /* EnumParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 509416A623A11C630036092C /* EnumParser.m */; };
+		509416AB23A11CB20036092C /* NullEnum.h in Headers */ = {isa = PBXBuildFile; fileRef = 509416A923A11CB20036092C /* NullEnum.h */; };
+		509416AC23A11CB20036092C /* NullEnum.m in Sources */ = {isa = PBXBuildFile; fileRef = 509416AA23A11CB20036092C /* NullEnum.m */; };
 		50967F5B232FC2C200BEEA92 /* RNNFontAttributesCreatorTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 50967F5A232FC2C200BEEA92 /* RNNFontAttributesCreatorTest.m */; };
 		509B2480217873FF00C83C23 /* UINavigationController+RNNOptionsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 509B247F217873FF00C83C23 /* UINavigationController+RNNOptionsTest.m */; };
 		509B258F2178BE7A00C83C23 /* RNNStackPresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 509B258E2178BE7A00C83C23 /* RNNStackPresenterTest.m */; };
@@ -585,6 +591,12 @@
 		50887CA720F26BFD00D06111 /* RNNOverlayWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNOverlayWindow.m; sourceTree = "<group>"; };
 		50887CA820F26BFE00D06111 /* RNNOverlayWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNOverlayWindow.h; sourceTree = "<group>"; };
 		508EBDBA2278742700BEC144 /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
+		509416A123A11C340036092C /* Enum.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Enum.h; sourceTree = "<group>"; };
+		509416A223A11C340036092C /* Enum.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Enum.m; sourceTree = "<group>"; };
+		509416A523A11C630036092C /* EnumParser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EnumParser.h; sourceTree = "<group>"; };
+		509416A623A11C630036092C /* EnumParser.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EnumParser.m; sourceTree = "<group>"; };
+		509416A923A11CB20036092C /* NullEnum.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NullEnum.h; sourceTree = "<group>"; };
+		509416AA23A11CB20036092C /* NullEnum.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NullEnum.m; sourceTree = "<group>"; };
 		50967F5A232FC2C200BEEA92 /* RNNFontAttributesCreatorTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNFontAttributesCreatorTest.m; sourceTree = "<group>"; };
 		509B247F217873FF00C83C23 /* UINavigationController+RNNOptionsTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+RNNOptionsTest.m"; sourceTree = "<group>"; };
 		509B258E2178BE7A00C83C23 /* RNNStackPresenterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNStackPresenterTest.m; sourceTree = "<group>"; };
@@ -910,10 +922,14 @@
 				5012241521736667000F5F98 /* Color.m */,
 				5012241821736678000F5F98 /* Image.h */,
 				5012241921736678000F5F98 /* Image.m */,
+				509416A123A11C340036092C /* Enum.h */,
+				509416A223A11C340036092C /* Enum.m */,
 				50E02BD621A6EE0F00A43942 /* SideMenuOpenMode.h */,
 				50E02BD721A6EE0F00A43942 /* SideMenuOpenMode.m */,
 				50495940216F5E5D006D2B81 /* NullBool.h */,
 				50495941216F5E5D006D2B81 /* NullBool.m */,
+				509416A923A11CB20036092C /* NullEnum.h */,
+				509416AA23A11CB20036092C /* NullEnum.m */,
 				50495948216F5FE6006D2B81 /* NullText.h */,
 				50495949216F5FE6006D2B81 /* NullText.m */,
 				50495950216F62BD006D2B81 /* NullNumber.h */,
@@ -959,6 +975,8 @@
 				5039559A2174867000B0A663 /* DoubleParser.m */,
 				309874E37C7E9764C7B694E5 /* DotIndicatorParser.m */,
 				309871FBA64AD937CEF3E191 /* DotIndicatorParser.h */,
+				509416A523A11C630036092C /* EnumParser.h */,
+				509416A623A11C630036092C /* EnumParser.m */,
 			);
 			name = Parsers;
 			sourceTree = "<group>";
@@ -1337,6 +1355,7 @@
 				504AFE761FFFF1E00076E904 /* RNNNavigationOptions.h in Headers */,
 				504AFE771FFFF1E20076E904 /* RNNTopBarOptions.h in Headers */,
 				5038A3CE216E35E0009280BC /* Dictionary.h in Headers */,
+				509416A323A11C340036092C /* Enum.h in Headers */,
 				26916C981E4B9E7700D13680 /* RNNReactRootViewCreator.h in Headers */,
 				5012241A21736678000F5F98 /* Image.h in Headers */,
 				506A2B1420973DFD00F43A95 /* RNNErrorHandler.h in Headers */,
@@ -1361,6 +1380,7 @@
 				50E02BDD21A6EE7900A43942 /* SideMenuOpenGestureModeParser.h in Headers */,
 				5038A3B5216DF602009280BC /* UINavigationController+RNNOptions.h in Headers */,
 				50E5F78D223F9FAF002AFEAD /* RNNElementTransitionOptions.h in Headers */,
+				509416AB23A11CB20036092C /* NullEnum.h in Headers */,
 				E5F6C3A422DB4D0F0093C2CE /* UIColor+RNNUtils.h in Headers */,
 				5038A3C1216E1E66009280BC /* RNNFontAttributesCreator.h in Headers */,
 				5016E8EF20209690009D4F7C /* RNNCustomTitleView.h in Headers */,
@@ -1396,6 +1416,7 @@
 				7BEF0D181E437684003E96B0 /* RNNComponentViewController.h in Headers */,
 				7B1126A61E2D2B6C00F9B03B /* RNNBridgeModule.h in Headers */,
 				E8DA24401F97459B00CD552B /* RNNElementFinder.h in Headers */,
+				509416A723A11C630036092C /* EnumParser.h in Headers */,
 				50AB0B1C2255F8640039DAED /* UIViewController+LayoutProtocol.h in Headers */,
 				50D031342005149000386B3D /* RNNOverlayManager.h in Headers */,
 				50E5F7952240EBD6002AFEAD /* RNNAnimationsTransitionDelegate.h in Headers */,
@@ -1606,6 +1627,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				50C4A497206BDDBB00DB292E /* RNNSubtitleOptions.m in Sources */,
+				509416A823A11C630036092C /* EnumParser.m in Sources */,
 				50A409CB238D444900D5FF7D /* UINavigationBar+utils.m in Sources */,
 				50AB0B1D2255F8640039DAED /* UIViewController+LayoutProtocol.m in Sources */,
 				263905B41E4C6F440023D7D3 /* MMDrawerVisualState.m in Sources */,
@@ -1623,6 +1645,7 @@
 				501CD320214A5B6900A6E225 /* RNNLayoutInfo.m in Sources */,
 				7BEF0D191E437684003E96B0 /* RNNComponentViewController.m in Sources */,
 				50415CBB20553B8E00BB682E /* RNNScreenTransition.m in Sources */,
+				509416A423A11C340036092C /* Enum.m in Sources */,
 				E8A5CD531F464F0400E89D0D /* RNNAnimator.m in Sources */,
 				50CB3B6A1FDE911400AA153B /* RNNSideMenuOptions.m in Sources */,
 				261F0E6B1E6F028A00989DE2 /* RNNNavigationStackManager.m in Sources */,
@@ -1640,6 +1663,7 @@
 				7B1126A01E2D263F00F9B03B /* RNNEventEmitter.m in Sources */,
 				A7626BFD1FC2FB2C00492FB8 /* RNNTopBarOptions.m in Sources */,
 				5050465521F8F4490035497A /* RNNReactComponentRegistry.m in Sources */,
+				509416AC23A11CB20036092C /* NullEnum.m in Sources */,
 				50570BEB2063E09B006A1B5C /* RNNTitleViewHelper.m in Sources */,
 				263905E71E4CAC950023D7D3 /* RNNSideMenuChildVC.m in Sources */,
 				50495957216F6B3D006D2B81 /* DictionaryParser.m in Sources */,

playground/ios/NavigationTests/RNNCommandsHandlerTest.m

@@ -54,6 +54,7 @@
 @property (nonatomic, strong) id controllerFactory;
 @property (nonatomic, strong) id overlayManager;
 @property (nonatomic, strong) id eventEmmiter;
+@property (nonatomic, strong) id creator;
 
 @end
 
@@ -61,22 +62,25 @@
 
 - (void)setUp {
 	[super setUp];
+	self.creator = [OCMockObject partialMockForObject:[RNNTestRootViewCreator new]];
 	self.mainWindow = [OCMockObject partialMockForObject:[UIWindow new]];
 	self.eventEmmiter = [OCMockObject partialMockForObject:[RNNEventEmitter new]];
 	self.overlayManager = [OCMockObject partialMockForObject:[RNNOverlayManager new]];
 	self.modalManager = [OCMockObject partialMockForObject:[RNNModalManager new]];
 	self.controllerFactory = [OCMockObject partialMockForObject:[[RNNControllerFactory alloc] initWithRootViewCreator:nil eventEmitter:self.eventEmmiter store:nil componentRegistry:nil andBridge:nil bottomTabsAttachModeFactory:[BottomTabsAttachModeFactory new]]];
 	self.uut = [[RNNCommandsHandler alloc] initWithControllerFactory:self.controllerFactory eventEmitter:self.eventEmmiter stackManager:[RNNNavigationStackManager new] modalManager:self.modalManager overlayManager:self.overlayManager mainWindow:_mainWindow];
-	self.vc1 = self.generateComponent;
-	self.vc2 = self.generateComponent;
-	self.vc3 = self.generateComponent;
+	self.vc1 = [self generateComponentWithComponentId:@"1"];
+	self.vc2 = [self generateComponentWithComponentId:@"2"];
+	self.vc3 = [self generateComponentWithComponentId:@"3"];
 	_nvc = [[MockUINavigationController alloc] init];
 	[_nvc setViewControllers:@[self.vc1, self.vc2, self.vc3]];
 	OCMStub([self.sharedApplication keyWindow]).andReturn(self.mainWindow);
 }
 
-- (RNNComponentViewController *)generateComponent {
-	return [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:[[RNNTestRootViewCreator alloc] init] eventEmitter:nil presenter:[RNNComponentPresenter new] options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil];
+- (RNNComponentViewController *)generateComponentWithComponentId:(NSString *)componentId {
+	RNNLayoutInfo* layoutInfo = [[RNNLayoutInfo alloc] init];
+	layoutInfo.componentId = componentId;
+	return [[RNNComponentViewController alloc] initWithLayoutInfo:layoutInfo rootViewCreator:_creator eventEmitter:nil presenter:[RNNComponentPresenter new] options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil];
 }
 
 - (void)testAssertReadyForEachMethodThrowsExceptoins {
@@ -187,7 +191,7 @@
 
 - (void)testShowOverlay_withCreatedLayout {
 	[self.uut setReadyToReceiveCommands:true];
-	UIViewController* layoutVC = self.generateComponent;
+	UIViewController* layoutVC = [self generateComponentWithComponentId:nil];
 	OCMStub([self.controllerFactory createLayout:[OCMArg any]]).andReturn(layoutVC);
 	
 	[[self.overlayManager expect] showOverlayWindow:[OCMArg any]];
@@ -364,7 +368,6 @@
 	[self.uut setReadyToReceiveCommands:true];
 	RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initEmptyOptions];
 	options.bottomTabs.tabsAttachMode = [[BottomTabsAttachMode alloc] initWithValue:@"together"];
-	options.animations.setRoot.waitForRender = [[Bool alloc] initWithBOOL:YES];
 
 	BottomTabsBaseAttacher* attacher = [[[BottomTabsAttachModeFactory alloc] initWithDefaultOptions:nil] fromOptions:options];
 	RNNBottomTabsController* tabBarController = [[RNNBottomTabsController alloc] initWithLayoutInfo:nil creator:nil options:options defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions] presenter:[RNNBasePresenter new] eventEmitter:_eventEmmiter childViewControllers:@[_vc1, _vc2] bottomTabsAttacher:attacher];
@@ -374,6 +377,8 @@
 	[self.uut setRoot:@{} commandId:@"" completion:^{}];
 	XCTAssertTrue(_vc1.isViewLoaded);
 	XCTAssertTrue(_vc2.isViewLoaded);
+	XCTAssertEqual(_vc1.view.tag, 1);
+	XCTAssertEqual(_vc2.view.tag, 2);
 }
 
 - (void)testSetRoot_withBottomTabsAttachModeOnSwitchToTab {

playground/ios/NavigationTests/RNNTestRootViewCreator.m

@@ -4,6 +4,7 @@
 
 - (UIView*)createRootView:(NSString*)name rootViewId:(NSString*)rootViewId reactViewReadyBlock:(RNNReactViewReadyCompletionBlock)reactViewReadyBlock {
 	UIView *view = [[UIView alloc] init];
+	view.tag = [rootViewId intValue];
 	return view;
 }