react-native-navigation 7.33.3-snapshot.991 → 7.33.3-snapshot.992

package/lib/ios/RNNBaseIconCreator.m

@@ -18,7 +18,7 @@
 
 - (UIImage *)createEnabledIcon:(RNNButtonOptions *)buttonOptions {
     UIColor *backgroundColor = [buttonOptions.iconBackground.color withDefault:UIColor.clearColor];
-    UIColor *tintColor = [buttonOptions.color withDefault:nil];
+    UIColor *tintColor = buttonOptions.resolveColor;
 
     return [self createIcon:buttonOptions tintColor:tintColor backgroundColor:backgroundColor];
 }

package/lib/ios/RNNButtonOptions.h

@@ -22,10 +22,11 @@
 @property(nonatomic, strong) Bool *selectTabOnPress;
 @property(nonatomic, strong) RNNComponentOptions *component;
 @property(nonatomic, strong) RNNIconBackgroundOptions *iconBackground;
+@property(nonatomic, strong) Bool *disableIconTint;
 
 - (RNNButtonOptions *)withDefault:(RNNButtonOptions *)defaultOptions;
 
-- (Color *)resolveColor;
+- (UIColor *)resolveColor;
 
 - (RNNButtonOptions *)withDefaultColor:(Color *)color disabledColor:(Color *)disabledColor;
 

package/lib/ios/RNNButtonOptions.m

@@ -1,4 +1,5 @@
 #import "RNNButtonOptions.h"
+#import "NullColor.h"
 
 @implementation RNNButtonOptions
 
@@ -23,6 +24,7 @@
     self.iconBackground = [[RNNIconBackgroundOptions alloc] initWithDict:dict[@"iconBackground"]
                                                                  enabled:self.enabled];
     self.systemItem = [TextParser parse:dict key:@"systemItem"];
+    self.disableIconTint = [BoolParser parse:dict key:@"disableIconTint"];
 
     return self;
 }
@@ -46,6 +48,7 @@
     newOptions.selectTabOnPress = self.selectTabOnPress.copy;
     newOptions.iconBackground = self.iconBackground.copy;
     newOptions.systemItem = self.systemItem.copy;
+    newOptions.disableIconTint = self.disableIconTint.copy;
     return newOptions;
 }
 
@@ -83,6 +86,8 @@
         self.selectTabOnPress = options.selectTabOnPress;
     if (options.systemItem.hasValue)
         self.systemItem = options.systemItem;
+    if (options.disableIconTint.hasValue)
+        self.disableIconTint = options.disableIconTint;
 }
 
 - (BOOL)shouldCreateCustomView {
@@ -93,11 +98,13 @@
     return [self.enabled withDefault:YES];
 }
 
-- (Color *)resolveColor {
+- (UIColor *)resolveColor {
+    if ([_disableIconTint withDefault:NO])
+        return NullColor.new.get;
     if (![_enabled withDefault:YES] && _disabledColor.hasValue)
-        return _disabledColor;
+        return _disabledColor.get;
     else
-        return _color;
+        return [_color withDefault:nil];
 }
 
 - (RNNButtonOptions *)withDefault:(RNNButtonOptions *)defaultOptions {

package/lib/ios/RNNUIBarButtonItem.m

@@ -139,17 +139,16 @@
     [self applyDisabledTitleTextAttributes:buttonOptions];
 }
 
-- (void)applyColor:(Color *)color {
-    if (color.hasValue) {
+- (void)applyColor:(UIColor *)color {
+    if (color) {
         NSMutableDictionary *titleTextAttributes = [NSMutableDictionary
             dictionaryWithDictionary:[self titleTextAttributesForState:UIControlStateNormal]];
-        [titleTextAttributes setValue:color.get forKey:NSForegroundColorAttributeName];
+        [titleTextAttributes setValue:color forKey:NSForegroundColorAttributeName];
         [self setTitleTextAttributes:titleTextAttributes forState:UIControlStateNormal];
         [self setTitleTextAttributes:titleTextAttributes forState:UIControlStateHighlighted];
+        self.tintColor = color;
     } else
         self.image = [self.image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
-
-    self.tintColor = color.get;
 }
 
 - (void)mergeBackgroundColor:(Color *)color {
@@ -159,7 +158,7 @@
 
 - (void)mergeColor:(Color *)color {
     _buttonOptions.color = color;
-    [self applyColor:color];
+    [self applyColor:color.get];
     [self redrawIcon];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-navigation",
-  "version": "7.33.3-snapshot.991",
+  "version": "7.33.3-snapshot.992",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "license": "MIT",
   "nativePackage": true,