Fix backButton.color change on mergeOptions (#6145)

Co-authored-by: Guy Carmeli <[email protected]>
wix · Apr 21, 2020 · da0fd19 · da0fd19
1 parent 03dd211
commit da0fd19
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 25 deletions.
diff --git a/lib/ios/RNNStackPresenter.m b/lib/ios/RNNStackPresenter.m
@@ -63,7 +63,6 @@ - (void)applyOptions:(RNNNavigationOptions *)options {
 
     [stack setNavigationBarBlur:[withDefault.topBar.background.blur getWithDefaultValue:NO]];
     [stack setNavigationBarClipsToBounds:[withDefault.topBar.background.clipToBounds getWithDefaultValue:NO]];
-    [stack setBackButtonColor:[withDefault.topBar.backButton.color getWithDefaultValue:nil]];
 
 	[stack.view setBackgroundColor:[withDefault.layout.backgroundColor getWithDefaultValue:nil]];
 }
@@ -114,10 +113,6 @@ - (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigat
     if (options.topBar.background.blur.hasValue) {
         [stack setNavigationBarBlur:[options.topBar.background.blur get]];
     }
-
-    if (options.topBar.backButton.color.hasValue) {
-        [stack setBackButtonColor:options.topBar.backButton.color.get];
-    }
 
     if (options.topBar.background.component.name.hasValue) {
         [self setCustomNavigationComponentBackground:options perform:nil];

diff --git a/lib/ios/TopBarPresenter.m b/lib/ios/TopBarPresenter.m
@@ -123,7 +123,7 @@ - (void)setBackButtonOptions:(RNNBackButtonOptions *)backButtonOptions {
 
     NSArray* stackChildren = self.navigationController.viewControllers;
     UIViewController *lastViewControllerInStack = stackChildren.count > 1 ? stackChildren[stackChildren.count - 2] : self.navigationController.topViewController;
-    UIBarButtonItem *backItem = lastViewControllerInStack.navigationItem.backBarButtonItem ?: [UIBarButtonItem new];
+    UIBarButtonItem *backItem = [UIBarButtonItem new];
     backItem.accessibilityIdentifier = testID;
 
     icon = color

diff --git a/lib/ios/UINavigationController+RNNOptions.h b/lib/ios/UINavigationController+RNNOptions.h
@@ -16,6 +16,4 @@
 
 - (void)setNavigationBarClipsToBounds:(BOOL)clipsToBounds;
 
-- (void)setBackButtonColor:(UIColor *)color;
-
 @end
diff --git a/lib/ios/UINavigationController+RNNOptions.m b/lib/ios/UINavigationController+RNNOptions.m
@@ -54,10 +54,6 @@ - (void)setNavigationBarBlur:(BOOL)blur {
 	}
 }
 
-- (void)setBackButtonColor:(UIColor *)color {
-	self.navigationBar.tintColor = color;
-}
-
 - (void)setNavigationBarClipsToBounds:(BOOL)clipsToBounds {
 	self.navigationBar.clipsToBounds = clipsToBounds;
 }

diff --git a/playground/ios/NavigationTests/RNNStackPresenterTest.m b/playground/ios/NavigationTests/RNNStackPresenterTest.m
@@ -25,19 +25,6 @@ - (void)setUp {
 	self.options = [[RNNNavigationOptions alloc] initEmptyOptions];
 }
 
-- (void)testApplyOptions_shouldSetBackButtonColor_withDefaultValues {
-	[[(id)_boundViewController expect] setBackButtonColor:nil];
-	[self.uut applyOptions:self.options];
-	[(id)_boundViewController verify];
-}
-
-- (void)testApplyOptions_shouldSetBackButtonColor_withColor {
-	self.options.topBar.backButton.color = [[Color alloc] initWithValue:[UIColor redColor]];
-	[[(id)_boundViewController expect] setBackButtonColor:[UIColor redColor]];
-	[self.uut applyOptions:self.options];
-	[(id)_boundViewController verify];
-}
-
 - (void)testApplyOptionsBeforePoppingShouldSetTopBarBackgroundForPoppingViewController {
 	_options.topBar.background.color = [[Color alloc] initWithValue:[UIColor redColor]];