Fixes bottomTab.badge for bottomTabs inside sideMenu - #4171

e2e/ScreenStyle.test.js

@@ -58,6 +58,12 @@ describe('screen style', () => {
     await expect(element(by.text('TeSt'))).toBeVisible();
   });
 
+  test('set Tab Bar badge on a current Tab appear once', async () => {
+    await elementById(testIDs.TAB_BASED_APP_SIDE_BUTTON).tap();
+    await elementById(testIDs.SET_TAB_BADGE_BUTTON).tap();
+    await expect(element(by.text('TeSt'))).toBeVisible();
+  });
+
   test(':android: hide Tab Bar', async () => {
     await elementById(testIDs.TAB_BASED_APP_BUTTON).tap();
     await expect(elementById(testIDs.BOTTOM_TABS_ELEMENT)).toBeVisible();

lib/ios/RNNBottomTabPresenter.m

@@ -26,14 +26,14 @@
 		[options.bottomTab.selectedIcon consume];
 	}
 	
-	if (![viewController isKindOfClass:[UITabBarController class]]) {
+	if ([viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
 		[viewController rnn_setTabBarItemBadge:[options.bottomTab.badge getWithDefaultValue:nil]];
 	}
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
 	UIViewController* viewController = self.bindedViewController;
-	if (options.bottomTab.badge.hasValue && ![viewController isKindOfClass:[UITabBarController class]]) {
+	if (options.bottomTab.badge.hasValue && [viewController.parentViewController isKindOfClass:[UITabBarController class]]) {
 		[viewController rnn_setTabBarItemBadge:options.bottomTab.badge.get];
 	}
 }

lib/ios/RNNTabBarController.m

@@ -52,10 +52,6 @@
 	[((UIViewController<RNNLayoutProtocol> *)self.parentViewController) mergeOptions:options];
 }
 
-- (UITabBarItem *)tabBarItem {
-	return self.viewControllers.lastObject.tabBarItem;
-}
-
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
 	return self.selectedViewController.supportedInterfaceOrientations;
 }

lib/ios/ReactNativeNavigationTests/RNNBottomTabPresenterTest.m

@@ -21,13 +21,23 @@
     self.options = [[RNNNavigationOptions alloc] initEmptyOptions];
 }
 
-- (void)testApplyOptions_shouldSetTabBarItemBadgeWithDefault {
+- (void)testApplyOptions_shouldSetTabBarItemBadgeWithDefaultWhenParentIsUITabBarController {
+	UITabBarController* tabBarController = [[UITabBarController alloc] init];
+	[tabBarController setViewControllers:@[self.bindedViewController]];
 	[[self.bindedViewController expect] rnn_setTabBarItemBadge:nil];
 	[self.uut applyOptions:self.options];
 	[self.bindedViewController verify];
 }
 
+- (void)testApplyOptions_shouldSetTabBarItemBadgeOnlyWhenParentIsUITabBarController {
+	[[self.bindedViewController reject] rnn_setTabBarItemBadge:[OCMArg any]];
+	[self.uut applyOptions:self.options];
+	[self.bindedViewController verify];
+}
+
 - (void)testApplyOptions_shouldSetTabBarItemBadgeWithValue {
+	UITabBarController* tabBarController = [[UITabBarController alloc] init];
+	[tabBarController setViewControllers:@[self.bindedViewController]];
 	self.options.bottomTab.badge = [[Text alloc] initWithValue:@"badge"];
 	[[self.bindedViewController expect] rnn_setTabBarItemBadge:@"badge"];
 	[self.uut applyOptions:self.options];