Fix Apple TV TabBarIOS issue (facebook#15081)

douglowder · Jul 19, 2017 · 6bdb585 · 6bdb585
1 parent 1afee0b
commit 6bdb585
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/React/Views/RCTTabBar.m b/React/Views/RCTTabBar.m
@@ -175,6 +175,18 @@ - (void)setItemPositioning:(UITabBarItemPositioning)itemPositioning
 
 #pragma mark - UITabBarControllerDelegate
 
+#if TARGET_OS_TV
+
+- (void)tabBarController:(UITabBarController *)tabBarController didSelectViewController:(nonnull UIViewController *)viewController
+{
+  NSUInteger index = [tabBarController.viewControllers indexOfObject:viewController];
+  RCTTabBarItem *tab = (RCTTabBarItem *)self.reactSubviews[index];
+  if (tab.onPress) tab.onPress(nil);
+  return;
+}
+
+#else
+
 - (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectViewController:(UIViewController *)viewController
 {
   NSUInteger index = [tabBarController.viewControllers indexOfObject:viewController];
@@ -183,6 +195,8 @@ - (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectView
   return NO;
 }
 
+#endif
+
 #if TARGET_OS_TV
 
 - (BOOL)isUserInteractionEnabled