[V2][iOS] Fix bottomTabs’s animate option (#4465)

* [V2][iOS] Fix bottomTabs’s animate option Signed-off-by: wilson <wilson@waveo.com> * change animated default value to false Signed-off-by: wilson <wilson@waveo.com> * fix self.tabBar.hidden value Signed-off-by: wilson <wilson@waveo.com> * Fix tests Signed-off-by: wilson <wilson@waveo.com> * fix value check Signed-off-by: wilson <wilson@waveo.com>
wix · Apr 21, 2019 · 9836730 · 9836730
1 parent be00c4c
commit 9836730
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 7 deletions.
diff --git a/lib/ios/RNNBottomTabsOptions.h b/lib/ios/RNNBottomTabsOptions.h
@@ -5,6 +5,7 @@
 @property (nonatomic, strong) Bool* visible;
 @property (nonatomic, strong) IntNumber* currentTabIndex;
 @property (nonatomic, strong) Bool* drawBehind;
+@property (nonatomic, strong) Bool* animate;
 @property (nonatomic, strong) Color* tabColor;
 @property (nonatomic, strong) Color* selectedTabColor;
 @property (nonatomic, strong) Bool* translucent;

diff --git a/lib/ios/RNNBottomTabsOptions.m b/lib/ios/RNNBottomTabsOptions.m
@@ -8,6 +8,7 @@ - (instancetype)initWithDict:(NSDictionary *)dict {
 	self.visible = [BoolParser parse:dict key:@"visible"];
 	self.currentTabIndex = [IntNumberParser parse:dict key:@"currentTabIndex"];
 	self.drawBehind = [BoolParser parse:dict key:@"drawBehind"];
+	self.animate = [BoolParser parse:dict key:@"animate"];
 	self.tabColor = [ColorParser parse:dict key:@"tabColor"];
 	self.selectedTabColor = [ColorParser parse:dict key:@"selectedTabColor"];
 	self.translucent = [BoolParser parse:dict key:@"translucent"];

diff --git a/lib/ios/RNNTabBarPresenter.m b/lib/ios/RNNTabBarPresenter.m
@@ -16,7 +16,7 @@ - (void)applyOptions:(RNNNavigationOptions *)options {
 	[tabBarController rnn_setTabBarTranslucent:[options.bottomTabs.translucent getWithDefaultValue:NO]];
 	[tabBarController rnn_setTabBarHideShadow:[options.bottomTabs.hideShadow getWithDefaultValue:NO]];
 	[tabBarController rnn_setTabBarStyle:[RCTConvert UIBarStyle:[options.bottomTabs.barStyle getWithDefaultValue:@"default"]]];
-	[tabBarController rnn_setTabBarVisible:[options.bottomTabs.visible getWithDefaultValue:YES]];
+	[tabBarController rnn_setTabBarVisible:[options.bottomTabs.visible getWithDefaultValue:YES] animated:[options.bottomTabs.animate getWithDefaultValue:NO]];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions defaultOptions:(RNNNavigationOptions *)defaultOptions {
@@ -55,7 +55,11 @@ - (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavig
 	}
 
 	if (newOptions.bottomTabs.visible.hasValue) {
-		[tabBarController rnn_setTabBarVisible:newOptions.bottomTabs.visible.get];
+		if (newOptions.bottomTabs.animate.hasValue) {
+			[tabBarController rnn_setTabBarVisible:newOptions.bottomTabs.visible.get animated:[newOptions.bottomTabs.animate getWithDefaultValue:NO]];
+		} else {
+			[tabBarController rnn_setTabBarVisible:newOptions.bottomTabs.visible.get animated:NO];
+		}
 	}
 }
 

diff --git a/lib/ios/ReactNativeNavigationTests/RNNTabBarPresenterTest.m b/lib/ios/ReactNativeNavigationTests/RNNTabBarPresenterTest.m
@@ -29,7 +29,7 @@ - (void)testApplyOptions_shouldSetDefaultEmptyOptions {
 	[[self.bindedViewController expect] rnn_setTabBarTranslucent:NO];
 	[[self.bindedViewController expect] rnn_setTabBarHideShadow:NO];
     [[self.bindedViewController expect] rnn_setTabBarStyle:UIBarStyleDefault];
-	[[self.bindedViewController expect] rnn_setTabBarVisible:YES];
+	[[self.bindedViewController expect] rnn_setTabBarVisible:YES animated:NO];
 	[self.uut applyOptions:emptyOptions];
 	[self.bindedViewController verify];
 }
@@ -48,7 +48,7 @@ - (void)testApplyOptions_shouldApplyOptions {
 	[[self.bindedViewController expect] rnn_setTabBarTranslucent:NO];
 	[[self.bindedViewController expect] rnn_setTabBarHideShadow:YES];
 	[[self.bindedViewController expect] rnn_setTabBarStyle:UIBarStyleBlack];
-	[[self.bindedViewController expect] rnn_setTabBarVisible:NO];
+	[[self.bindedViewController expect] rnn_setTabBarVisible:NO animated:NO];
 
 	[self.uut applyOptions:initialOptions];
 	[self.bindedViewController verify];

diff --git a/lib/ios/UITabBarController+RNNOptions.h b/lib/ios/UITabBarController+RNNOptions.h
@@ -16,6 +16,6 @@
 
 - (void)rnn_setTabBarHideShadow:(BOOL)hideShadow;
 
-- (void)rnn_setTabBarVisible:(BOOL)visible;
+- (void)rnn_setTabBarVisible:(BOOL)visible animated:(BOOL)animated;
 
 @end
diff --git a/lib/ios/UITabBarController+RNNOptions.m b/lib/ios/UITabBarController+RNNOptions.m
@@ -31,8 +31,47 @@ - (void)rnn_setTabBarHideShadow:(BOOL)hideShadow {
 	self.tabBar.clipsToBounds = hideShadow;
 }
 
-- (void)rnn_setTabBarVisible:(BOOL)visible {
-	self.tabBar.hidden = !visible;
+- (void)rnn_setTabBarVisible:(BOOL)visible animated:(BOOL)animated {
+    const CGRect tabBarFrame = self.tabBar.frame;
+	const CGRect tabBarVisibleFrame = CGRectMake(tabBarFrame.origin.x,
+												 self.view.frame.size.height - tabBarFrame.size.height,
+												 tabBarFrame.size.width,
+												 tabBarFrame.size.height);
+	const CGRect tabBarHiddenFrame = CGRectMake(tabBarFrame.origin.x,
+												self.view.frame.size.height,
+												tabBarFrame.size.width,
+												tabBarFrame.size.height);
+	if (!animated) {
+		self.tabBar.hidden = !visible;
+		self.tabBar.frame = visible ? tabBarVisibleFrame : tabBarHiddenFrame;
+		return;
+	}
+	static const CGFloat animationDuration = 0.15;
+
+	if (visible) {
+		self.tabBar.hidden = NO;
+		[UIView animateWithDuration: animationDuration
+							  delay: 0
+							options: UIViewAnimationOptionCurveEaseOut
+						 animations:^()
+		 {
+			 self.tabBar.frame = tabBarVisibleFrame;
+		 }
+						 completion:^(BOOL finished)
+		 {}];
+	} else {
+		[UIView animateWithDuration: animationDuration
+							  delay: 0
+							options: UIViewAnimationOptionCurveEaseIn
+						 animations:^()
+		 {
+			 self.tabBar.frame = tabBarHiddenFrame;
+		 }
+						 completion:^(BOOL finished)
+		 {
+			 self.tabBar.hidden = YES;
+		 }];
+	}
 }
 
 @end