Revert "Apple TV: RCTTabBar selection controlled by native after rend…

…er (fix facebook#15081)" This reverts commit 0e7375a.
sheck · Apr 10, 2019 · 7866620 · 7866620
1 parent bce0765
commit 7866620
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 41 deletions.
diff --git a/React/Views/RCTTabBar.m b/React/Views/RCTTabBar.m
@@ -112,17 +112,9 @@ - (void)uiManagerDidPerformMounting
     [tab.barItem setTitleTextAttributes:@{NSForegroundColorAttributeName: self.tintColor} forState:UIControlStateSelected];
 
     controller.tabBarItem = tab.barItem;
-#if TARGET_OS_TV
-// On Apple TV, disable JS control of selection after initial render
-    if (tab.selected && !tab.wasSelectedInJS) {
-      self->_tabController.selectedViewController = controller;
-    }
-    tab.wasSelectedInJS = YES;
-#else
     if (tab.selected) {
       self->_tabController.selectedViewController = controller;
     }
-#endif
   }];
 }
 
@@ -194,18 +186,6 @@ - (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];
@@ -214,8 +194,6 @@ - (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectView
   return NO;
 }
 
-#endif
-
 #if TARGET_OS_TV
 
 - (BOOL)isUserInteractionEnabled

diff --git a/React/Views/RCTTabBarItem.h b/React/Views/RCTTabBarItem.h
@@ -28,8 +28,4 @@
 @property (nonatomic, copy) RCTBubblingEventBlock onPress;
 @property (nonatomic, strong) NSString *testID;
 
-#if TARGET_OS_TV
-@property (nonatomic, assign) BOOL wasSelectedInJS;
-#endif
-
 @end
diff --git a/React/Views/RCTTabBarItem.m b/React/Views/RCTTabBarItem.m
@@ -40,9 +40,6 @@ - (instancetype)initWithFrame:(CGRect)frame
 {
   if ((self = [super initWithFrame:frame])) {
     _systemIcon = NSNotFound;
-#if TARGET_OS_TV
-    _wasSelectedInJS = NO;
-#endif
   }
   return self;
 }
@@ -124,16 +121,4 @@ - (UIViewController *)reactViewController
   return self.superview.reactViewController;
 }
 
-#if TARGET_OS_TV
-
-// On Apple TV, we let native control the tab bar selection after initial render
-- (void)setSelected:(BOOL)selected
-{
-  if (!_wasSelectedInJS) {
-    _selected = selected;
-  }
-}
-
-#endif
-
 @end