react-native-navigation 7.29.0 → 7.29.1-snapshot.730

package/autolink/postlink/activityLinker.js

@@ -69,19 +69,24 @@ class ActivityLinker {
   }
 
   _extendNavigationActivity(activityContent) {
+    if (this._hasAlreadyExtendNavigationActivity(activityContent)) {
+      warnn('   MainActivity already extends NavigationActivity');
+      return activityContent;
+    }
+
     if (this._doesActivityExtendReactActivity(activityContent)) {
       debugn('   Extending NavigationActivity');
       return activityContent
         .replace(/extends\s+ReactActivity\s*/, 'extends NavigationActivity ')
+        .replace(
+          /public\s+MainActivityDelegate\s*\(\s*ReactActivity\s+activity,\s*String\s+mainComponentName\s*\)/,
+          'public MainActivityDelegate(NavigationActivity activity, String mainComponentName)'
+        )
         .replace(
           'import com.facebook.react.ReactActivity;',
           'import com.reactnativenavigation.NavigationActivity;'
         );
     }
-    if (this._hasAlreadyExtendReactActivity(activityContent)) {
-      warnn('   MainActivity already extends NavigationActivity');
-      return activityContent;
-    }
 
     throw new Error(
       'MainActivity was not successfully replaced. Please check the documentation and proceed manually.'
@@ -92,8 +97,8 @@ class ActivityLinker {
     return /public\s+class\s+MainActivity\s+extends\s+ReactActivity\s*/.test(activityContent);
   }
 
-  _hasAlreadyExtendReactActivity(activityContent) {
-    return /public\s+class\s+MainActivity\s+extends\s+ReactActivity\s*/.test(activityContent);
+  _hasAlreadyExtendNavigationActivity(activityContent) {
+    return /public\s+class\s+MainActivity\s+extends\s+NavigationActivity\s*/.test(activityContent);
   }
 
   _removeCreateReactActivityDelegate(activityContent) {
@@ -101,19 +106,17 @@ class ActivityLinker {
       debugn('   Removing createReactActivityDelegate function');
       return activityContent.replace(
         /\/\*\*(\s+\*.+)+\s+@Override\s+protected ReactActivityDelegate createReactActivityDelegate\(\) {(\s*[\w*(,);])*\s*}/,
-        '',
+        ''
       );
     } else {
-      warnn(
-        '   createReactActivityDelegate is already not defined in MainActivity',
-      );
+      warnn('   createReactActivityDelegate is already not defined in MainActivity');
       return activityContent;
     }
   }
 
   _hasCreateReactActivityDelegate(activityContent) {
     return /\/\*\*(\s+\*.+)+\s+@Override\s+protected ReactActivityDelegate createReactActivityDelegate\(\) {(\s*[\w*(,);])*\s*}/.test(
-      activityContent,
+      activityContent
     );
   }
 }

package/autolink/postlink/appDelegateLinker.js

@@ -153,7 +153,11 @@ class AppDelegateLinker {
       /rootViewController\.view\s+=\s+rootView;\s+/,
       /self.window.rootViewController\s+=\s+rootViewController;\s+/,
       /\[self.window\s+makeKeyAndVisible];\s+/,
+      // Added from RN 0.69
+      /NSDictionary\s+\*initProps\s+=\s+\[self prepareInitialProps];\s+/,
+      /UIView \*rootView = RCTAppSetupDefaultRootView\(bridge, @".*", initProps\);/,
     ];
+
     let elementsRemovedCount = 0;
 
     toRemove.forEach((element) => {

package/autolink/postlink/path.js

@@ -3,8 +3,6 @@ var ignoreFolders = {
   ignore: ['node_modules/**', '**/build/**', '**/Build/**', '**/DerivedData/**', '**/*-tvOS*/**'],
 };
 
-var manifestPath = glob.sync('**/AndroidManifest.xml', ignoreFolders)[0];
-
 exports.mainActivityJava = glob.sync('**/MainActivity.java', ignoreFolders)[0];
 exports.mainActivityKotlin = glob.sync('**/MainActivity.kt', ignoreFolders)[0];
 var mainApplicationJava = glob.sync('**/MainApplication.java', ignoreFolders)[0];

package/jest-setup.js

@@ -4,9 +4,6 @@ mockDetox(() => require('./playground/index'));
 
 beforeEach(() => {
   const { mockNativeComponents } = require('react-native-navigation/Mock');
-  setTimeout = (func) => {
-    func();
-  };
   mockNativeComponents();
   mockUILib();
 });

package/jest.config.js

@@ -1,7 +1,7 @@
 module.exports = {
   preset: 'react-native',
   transformIgnorePatterns: [
-    'node_modules/(?!(@react-native|react-native|react-native-ui-lib|react-native-animatable)/)',
+    'node_modules/(?!(@react-native|react-native|react-native-ui-lib|react-native-animatable|react-native-reanimated)/)',
   ],
   transform: {
     '\\.[jt]sx?$': 'babel-jest',
@@ -12,6 +12,7 @@ module.exports = {
     '<rootDir>/integration/',
     '<rootDir>/scripts/',
     '<rootDir>/e2e/',
+    '<rootDir>/autolink/',
   ],
   setupFilesAfterEnv: ['./jest-setup.js'],
   testPathIgnorePatterns: ['/node_modules/'],

package/lib/Mock/Components/NavigationButton.tsx

@@ -45,8 +45,10 @@ export const NavigationButton = class extends Component<ButtonProps> {
       <TouchableOpacity
         onPress={() => {
           if (this.ref) {
-            // @ts-ignore
-            this.invokeOnClick(this.ref!._reactInternalFiber.return.stateNode);
+            this.invokeOnClick(
+              // @ts-ignore
+              (this.ref!._reactInternalFiber || this.ref!._reactInternals).return.stateNode
+            );
           }
 
           events.invokeNavigationButtonPressed({

package/lib/android/app/build.gradle

@@ -65,11 +65,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8
+        jvmTarget = JavaVersion.VERSION_11
     }
 
     flavorDimensions "RNN.reactNativeVersion"

package/lib/android/app/src/main/java/com/reactnativenavigation/options/TopBarOptions.java

@@ -50,6 +50,8 @@ public class TopBarOptions {
         options.leftButtonColor = ThemeColour.parse(context, json.optJSONObject("leftButtonColor"));
         options.leftButtonDisabledColor = ThemeColour.parse(context, json.optJSONObject("leftButtonDisabledColor"));
         options.rightButtonDisabledColor = ThemeColour.parse(context, json.optJSONObject("rightButtonDisabledColor"));
+        options.leftButtonBackgroundColor = ThemeColour.parse(context, json.optJSONObject("leftButtonBackgroundColor"));
+        options.rightButtonBackgroundColor = ThemeColour.parse(context, json.optJSONObject("rightButtonBackgroundColor"));
 
         options.validate();
         return options;
@@ -76,6 +78,8 @@ public class TopBarOptions {
     public ThemeColour leftButtonColor = new NullThemeColour();
     public ThemeColour rightButtonDisabledColor = new NullThemeColour();
     public ThemeColour leftButtonDisabledColor = new NullThemeColour();
+    public ThemeColour rightButtonBackgroundColor = new NullThemeColour();
+    public ThemeColour leftButtonBackgroundColor = new NullThemeColour();
 
     public TopBarOptions copy() {
         TopBarOptions result = new TopBarOptions();
@@ -94,6 +98,8 @@ public class TopBarOptions {
         if (other.leftButtonColor.hasValue()) leftButtonColor = other.leftButtonColor;
         if (other.rightButtonDisabledColor.hasValue()) rightButtonDisabledColor = other.rightButtonDisabledColor;
         if (other.leftButtonDisabledColor.hasValue()) leftButtonDisabledColor = other.leftButtonDisabledColor;
+        if (other.rightButtonBackgroundColor.hasValue()) rightButtonBackgroundColor = other.rightButtonBackgroundColor;
+        if (other.leftButtonBackgroundColor.hasValue()) rightButtonBackgroundColor = other.rightButtonBackgroundColor;
 
         if (other.testId.hasValue()) testId = other.testId;
         if (other.visible.hasValue()) visible = other.visible;
@@ -122,6 +128,8 @@ public class TopBarOptions {
         if (!leftButtonColor.hasValue()) leftButtonColor = defaultOptions.leftButtonColor;
         if (!rightButtonDisabledColor.hasValue()) rightButtonDisabledColor = defaultOptions.rightButtonDisabledColor;
         if (!leftButtonDisabledColor.hasValue()) leftButtonDisabledColor = defaultOptions.leftButtonDisabledColor;
+        if (!rightButtonBackgroundColor.hasValue()) rightButtonBackgroundColor = defaultOptions.rightButtonBackgroundColor;
+        if (!leftButtonBackgroundColor.hasValue()) rightButtonBackgroundColor = defaultOptions.rightButtonBackgroundColor;
 
         if (!visible.hasValue()) visible = defaultOptions.visible;
         if (!animate.hasValue()) animate = defaultOptions.animate;

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackPresenter.java

@@ -458,12 +458,12 @@ public class StackPresenter {
     private void mergeButtons(TopBarOptions options, TopBarOptions optionsToMerge, View child, StackController stack) {
         mergeRightButtons(options, optionsToMerge.buttons, child);
         mergeLeftButton(options, optionsToMerge.buttons, child);
-        mergeLeftButtonsColor(child, optionsToMerge.leftButtonColor, optionsToMerge.leftButtonDisabledColor);
-        mergeRightButtonsColor(child, optionsToMerge.rightButtonColor, optionsToMerge.rightButtonDisabledColor);
+        mergeLeftButtonsColor(child, optionsToMerge.leftButtonColor, optionsToMerge.leftButtonDisabledColor, optionsToMerge.leftButtonBackgroundColor);
+        mergeRightButtonsColor(child, optionsToMerge.rightButtonColor, optionsToMerge.rightButtonDisabledColor, optionsToMerge.rightButtonBackgroundColor);
         mergeBackButton(optionsToMerge.buttons, stack);
     }
 
-    private void mergeLeftButtonsColor(View child, ThemeColour color, ThemeColour disabledColor) {
+    private void mergeLeftButtonsColor(View child, ThemeColour color, ThemeColour disabledColor, ThemeColour backgroundColor) {
         if (color.hasValue() || disabledColor.hasValue()) {
             Map<String, ButtonController> stringButtonControllerMap = componentLeftButtons.get(child);
             if (stringButtonControllerMap != null) {
@@ -474,12 +474,15 @@ public class StackPresenter {
                     if (disabledColor.hasValue()) {
                         btnController.applyDisabledColor(topBarController.getView().getLeftButtonBar(), disabledColor);
                     }
+                    if (backgroundColor.hasValue()) {
+                        btnController.applyBackgroundColor(topBarController.getView().getLeftButtonBar(), backgroundColor);
+                    }
                 });
             }
         }
     }
 
-    private void mergeRightButtonsColor(View child, ThemeColour color, ThemeColour disabledColor) {
+    private void mergeRightButtonsColor(View child, ThemeColour color, ThemeColour disabledColor, ThemeColour backgroundColor) {
         if (color.hasValue() || disabledColor.hasValue()) {
             Map<String, ButtonController> stringButtonControllerMap = componentRightButtons.get(child);
             if (stringButtonControllerMap != null) {
@@ -490,6 +493,9 @@ public class StackPresenter {
                     if (disabledColor.hasValue()) {
                         btnController.applyDisabledColor(topBarController.getView().getRightButtonBar(), disabledColor);
                     }
+                    if (backgroundColor.hasValue()) {
+                        btnController.applyBackgroundColor(topBarController.getView().getRightButtonBar(), backgroundColor);
+                    }
                 });
             }
         }

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonController.kt

@@ -81,6 +81,8 @@ open class ButtonController(activity: Activity,
 
     open fun applyDisabledColor(toolbar: Toolbar, disabledColour: ThemeColour) = this.menuItem?.let { presenter.applyDisabledColor(toolbar, it, disabledColour) }
 
+    open fun applyBackgroundColor(toolbar: Toolbar, color: ThemeColour) = this.menuItem?.let { presenter.applyBackgroundColor(toolbar, it, color) }
+
     fun addToMenu(buttonBar: ButtonBar, order: Int) {
         if (button.component.hasValue() && buttonBar.containsButton(menuItem, order)) return
         buttonBar.menu.removeItem(button.intId)

package/lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/topbar/button/ButtonPresenter.kt

@@ -71,6 +71,11 @@ open class ButtonPresenter(private val context: Context, private val button: But
         }
     }
 
+    fun applyBackgroundColor(toolbar: Toolbar, menuItem: MenuItem, color: ThemeColour) {
+        button.iconBackground.color = color
+        applyIcon(menuItem)
+    }
+
     private fun applyAccessibilityLabel(menuItem: MenuItem) {
         if (button.accessibilityLabel.hasValue()) {
             if (button.component.hasValue()) {

package/lib/android/build.gradle

@@ -3,6 +3,7 @@
 buildscript {
     ext {
         RNNKotlinVersion = '1.4.31'
+        appCompatVersion = '1.6.0-alpha05'
     }
 
     repositories {

package/lib/dist/Mock/Components/NavigationButton.js

@@ -31,8 +31,9 @@ const NavigationButton = class extends react_1.Component {
         const props = react_native_navigation_1.Navigation.mock.store.getPropsForId(buttonComponentId);
         return (react_1.default.createElement(react_native_1.TouchableOpacity, { onPress: () => {
                 if (this.ref) {
+                    this.invokeOnClick(
                     // @ts-ignore
-                    this.invokeOnClick(this.ref._reactInternalFiber.return.stateNode);
+                    (this.ref._reactInternalFiber || this.ref._reactInternals).return.stateNode);
                 }
                 EventsStore_1.events.invokeNavigationButtonPressed({
                     buttonId: button.id,

package/lib/dist/src/interfaces/Options.d.ts

@@ -568,6 +568,8 @@ export interface OptionsTopBar {
      */
     leftButtonColor?: Color;
     rightButtonColor?: Color;
+    leftButtonBackgroundColor?: Color;
+    rightButtonBackgroundColor?: Color;
     leftButtonDisabledColor?: Color;
     rightButtonDisabledColor?: Color;
     /**

package/lib/ios/RNNButtonOptions.h

@@ -25,7 +25,7 @@
 
 - (RNNButtonOptions *)withDefault:(RNNButtonOptions *)defaultOptions;
 
-- (UIColor *)resolveColor;
+- (Color *)resolveColor;
 
 - (RNNButtonOptions *)withDefaultColor:(Color *)color disabledColor:(Color *)disabledColor;
 
@@ -33,4 +33,6 @@
 
 - (BOOL)isEnabled;
 
+- (UIControlState)state;
+
 @end

package/lib/ios/RNNButtonOptions.m

@@ -93,11 +93,11 @@
     return [self.enabled withDefault:YES];
 }
 
-- (UIColor *)resolveColor {
+- (Color *)resolveColor {
     if (![_enabled withDefault:YES] && _disabledColor.hasValue)
-        return _disabledColor.get;
+        return _disabledColor;
     else
-        return [_color withDefault:nil];
+        return _color;
 }
 
 - (RNNButtonOptions *)withDefault:(RNNButtonOptions *)defaultOptions {
@@ -116,4 +116,8 @@
     return self;
 }
 
+- (UIControlState)state {
+    return self.isEnabled ? UIControlStateNormal : UIControlStateDisabled;
+}
+
 @end

package/lib/ios/RNNButtonsPresenter.h

@@ -20,9 +20,13 @@
      defaultDisabledColor:(Color *)defaultDisabledColor
                  animated:(BOOL)animated;
 
-- (void)applyLeftButtonsColor:(UIColor *)color;
+- (void)applyLeftButtonsColor:(Color *)color;
 
-- (void)applyRightButtonsColor:(UIColor *)color;
+- (void)applyRightButtonsColor:(Color *)color;
+
+- (void)applyLeftButtonsBackgroundColor:(Color *)color;
+
+- (void)applyRightButtonsBackgroundColor:(Color *)color;
 
 - (void)componentWillAppear;
 

package/lib/ios/RNNButtonsPresenter.m

@@ -47,15 +47,27 @@
         defaultDisabledColor:defaultDisabledColor];
 }
 
-- (void)applyLeftButtonsColor:(UIColor *)color {
+- (void)applyLeftButtonsColor:(Color *)color {
     for (RNNUIBarButtonItem *button in self.viewController.navigationItem.leftBarButtonItems) {
-        [button applyColor:color];
+        [button mergeColor:color];
     }
 }
 
-- (void)applyRightButtonsColor:(UIColor *)color {
+- (void)applyRightButtonsColor:(Color *)color {
     for (RNNUIBarButtonItem *button in self.viewController.navigationItem.rightBarButtonItems) {
-        [button applyColor:color];
+        [button mergeColor:color];
+    }
+}
+
+- (void)applyRightButtonsBackgroundColor:(Color *)color {
+    for (RNNUIBarButtonItem *button in self.viewController.navigationItem.rightBarButtonItems) {
+        [button mergeBackgroundColor:color];
+    }
+}
+
+- (void)applyLeftButtonsBackgroundColor:(Color *)color {
+    for (RNNUIBarButtonItem *button in self.viewController.navigationItem.leftBarButtonItems) {
+        [button mergeBackgroundColor:color];
     }
 }
 

package/lib/ios/RNNComponentPresenter.m

@@ -209,11 +209,19 @@
     }
 
     if (mergeOptions.topBar.leftButtonColor.hasValue) {
-        [_buttonsPresenter applyLeftButtonsColor:mergeOptions.topBar.leftButtonColor.get];
+        [_buttonsPresenter applyLeftButtonsColor:mergeOptions.topBar.leftButtonColor];
     }
 
     if (mergeOptions.topBar.rightButtonColor.hasValue) {
-        [_buttonsPresenter applyRightButtonsColor:mergeOptions.topBar.rightButtonColor.get];
+        [_buttonsPresenter applyRightButtonsColor:mergeOptions.topBar.rightButtonColor];
+    }
+    
+    if (mergeOptions.topBar.rightButtonBackgroundColor.hasValue) {
+        [_buttonsPresenter applyRightButtonsBackgroundColor:mergeOptions.topBar.rightButtonBackgroundColor];
+    }
+    
+    if (mergeOptions.topBar.leftButtonBackgroundColor.hasValue) {
+        [_buttonsPresenter applyLeftButtonsBackgroundColor:mergeOptions.topBar.leftButtonBackgroundColor];
     }
 
     if (mergeOptions.overlay.interceptTouchOutside.hasValue) {

package/lib/ios/RNNIconDrawer.m

@@ -29,7 +29,7 @@
     UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
     UIGraphicsEndImageContext();
 
-    return [newImage imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+    return newImage;
 }
 
 @end

package/lib/ios/RNNTitleViewHelper.h

@@ -8,6 +8,10 @@
 
 @property(nonatomic, strong) UILabel *subtitleLabel;
 
+- (void)setTitleColor:(UIColor *)color;
+
+- (void)setSubtitleColor:(UIColor *)color;
+
 @end
 
 @interface RNNTitleViewHelper : NSObject
@@ -21,4 +25,8 @@
 
 - (void)setup;
 
+- (void)setTitleColor:(UIColor *)color;
+
+- (void)setSubtitleColor:(UIColor *)color;
+
 @end

package/lib/ios/RNNTitleViewHelper.m

@@ -16,6 +16,14 @@
                                         self.frame.size.width, _subtitleLabel.frame.size.height)];
 }
 
+- (void)setTitleColor:(UIColor *)color {
+    _titleLabel.textColor = color;
+}
+
+- (void)setSubtitleColor:(UIColor *)color {
+    _subtitleLabel.textColor = color;
+}
+
 @end
 
 @interface RNNTitleViewHelper ()
@@ -170,4 +178,12 @@
     return titleLabel;
 }
 
+- (void)setTitleColor:(UIColor *)color {
+    [_titleView setTitleColor:color];
+}
+
+- (void)setSubtitleColor:(UIColor *)color {
+    [_titleView setSubtitleColor:color];
+}
+
 @end

package/lib/ios/RNNTopBarOptions.h

@@ -20,6 +20,8 @@
 @property(nonatomic, strong) Color *rightButtonColor;
 @property(nonatomic, strong) Color *leftButtonDisabledColor;
 @property(nonatomic, strong) Color *rightButtonDisabledColor;
+@property(nonatomic, strong) Color *leftButtonBackgroundColor;
+@property(nonatomic, strong) Color *rightButtonBackgroundColor;
 @property(nonatomic, strong) Bool *drawBehind;
 @property(nonatomic, strong) Bool *noBorder;
 @property(nonatomic, strong) Color *borderColor;

package/lib/ios/RNNTopBarOptions.m

@@ -14,6 +14,8 @@
     self.rightButtonColor = [ColorParser parse:dict key:@"rightButtonColor"];
     self.leftButtonDisabledColor = [ColorParser parse:dict key:@"leftButtonDisabledColor"];
     self.rightButtonDisabledColor = [ColorParser parse:dict key:@"rightButtonDisabledColor"];
+    self.leftButtonBackgroundColor = [ColorParser parse:dict key:@"leftButtonBackgroundColor"];
+    self.rightButtonBackgroundColor = [ColorParser parse:dict key:@"rightButtonBackgroundColor"];
     self.drawBehind = [BoolParser parse:dict key:@"drawBehind"];
     self.noBorder = [BoolParser parse:dict key:@"noBorder"];
     self.borderColor = [ColorParser parse:dict key:@"borderColor"];
@@ -63,6 +65,10 @@
         self.leftButtonDisabledColor = options.leftButtonDisabledColor;
     if (options.rightButtonDisabledColor.hasValue)
         self.rightButtonDisabledColor = options.rightButtonDisabledColor;
+    if (options.leftButtonBackgroundColor.hasValue)
+        self.leftButtonBackgroundColor = options.leftButtonBackgroundColor;
+    if (options.rightButtonBackgroundColor.hasValue)
+        self.rightButtonBackgroundColor = options.rightButtonBackgroundColor;
     if (options.drawBehind.hasValue)
         self.drawBehind = options.drawBehind;
     if (options.noBorder.hasValue)

package/lib/ios/RNNUIBarButtonItem.h

@@ -26,7 +26,8 @@ typedef void (^RNNButtonPressCallback)(NSString *buttonId);
 - (instancetype)initWithSystemItem:(RNNButtonOptions *)buttonOptions
                            onPress:(RNNButtonPressCallback)onPress;
 
-- (void)applyColor:(UIColor *)color;
+- (void)mergeColor:(Color *)color;
+- (void)mergeBackgroundColor:(Color *)color;
 
 - (void)notifyWillAppear;
 - (void)notifyDidAppear;

package/lib/ios/RNNUIBarButtonItem.m

@@ -11,7 +11,10 @@
 
 @end
 
-@implementation RNNUIBarButtonItem
+@implementation RNNUIBarButtonItem {
+    RNNIconCreator* _iconCreator;
+    RNNButtonOptions* _buttonOptions;
+}
 
 - (instancetype)init {
     self = [super init];
@@ -52,16 +55,17 @@
 - (instancetype)initCustomIcon:(RNNButtonOptions *)buttonOptions
                    iconCreator:(RNNIconCreator *)iconCreator
                        onPress:(RNNButtonPressCallback)onPress {
-    UIImage *icon = [iconCreator create:buttonOptions];
+    _iconCreator = iconCreator;
+    UIImage *icon = [_iconCreator create:buttonOptions];
     UIButton *button =
         [[UIButton alloc] initWithFrame:CGRectMake(0, 0, icon.size.width, icon.size.height)];
-
     [button addTarget:self
                   action:@selector(onButtonPressed:)
         forControlEvents:UIControlEventTouchUpInside];
     [button setImage:icon
             forState:buttonOptions.isEnabled ? UIControlStateNormal : UIControlStateDisabled];
-
+    [button.widthAnchor constraintEqualToConstant:icon.size.width].active = YES;
+    [button.heightAnchor constraintEqualToConstant:icon.size.height].active = YES;
     self = [super initWithCustomView:button];
     [self applyOptions:buttonOptions];
     self.onPress = onPress;
@@ -125,6 +129,7 @@
 }
 
 - (void)applyOptions:(RNNButtonOptions *)buttonOptions {
+    _buttonOptions = buttonOptions;
     self.buttonId = buttonOptions.identifier.get;
     self.accessibilityLabel = [buttonOptions.accessibilityLabel withDefault:nil];
     self.enabled = [buttonOptions.enabled withDefault:YES];
@@ -134,17 +139,35 @@
     [self applyDisabledTitleTextAttributes:buttonOptions];
 }
 
-- (void)applyColor:(UIColor *)color {
-    if (color) {
+- (void)applyColor:(Color *)color {
+    if (color.hasValue) {
         NSMutableDictionary *titleTextAttributes = [NSMutableDictionary
             dictionaryWithDictionary:[self titleTextAttributesForState:UIControlStateNormal]];
-        [titleTextAttributes setValue:color forKey:NSForegroundColorAttributeName];
+        [titleTextAttributes setValue:color.get forKey:NSForegroundColorAttributeName];
         [self setTitleTextAttributes:titleTextAttributes forState:UIControlStateNormal];
         [self setTitleTextAttributes:titleTextAttributes forState:UIControlStateHighlighted];
     } else
         self.image = [self.image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
 
-    self.tintColor = color;
+    self.tintColor = color.get;
+}
+
+- (void)mergeBackgroundColor:(Color *)color {
+    _buttonOptions.iconBackground.color = color;
+    [self redrawIcon];
+}
+
+- (void)mergeColor:(Color *)color {
+    _buttonOptions.color = color;
+    [self applyColor:color];
+    [self redrawIcon];
+}
+
+- (void)redrawIcon {
+    if (_buttonOptions.icon.hasValue && [self.customView isKindOfClass:UIButton.class]) {
+        UIImage* icon = [_iconCreator create:_buttonOptions];
+        [(UIButton *)self.customView setImage:icon forState:_buttonOptions.state];
+    }
 }
 
 - (void)applyTitleTextAttributes:(RNNButtonOptions *)button {

package/lib/ios/TopBarTitlePresenter.m

@@ -33,6 +33,13 @@
         [self removeTitleComponents];
         self.boundViewController.navigationItem.title = resolvedOptions.title.text.get;
     }
+    
+    if (options.title.color.hasValue) {
+        [_titleViewHelper setTitleColor:options.title.color.get];
+    }
+    if (options.subtitle.color.hasValue) {
+        [_titleViewHelper setSubtitleColor:options.subtitle.color.get];
+    }
 }
 
 - (void)setTitleViewWithSubtitle:(RNNTopBarOptions *)options {

package/lib/src/interfaces/Options.ts

@@ -637,6 +637,8 @@ export interface OptionsTopBar {
 
   leftButtonColor?: Color;
   rightButtonColor?: Color;
+  leftButtonBackgroundColor?: Color;
+  rightButtonBackgroundColor?: Color;
   leftButtonDisabledColor?: Color;
   rightButtonDisabledColor?: Color;
   /**