fix(iOS,Tabs): fix title being errorneously assigned to tabKey (#124)

Fixes #121

Author: kkafar

ios/bottom-tabs/RNSBottomTabsHostComponentView.mm

@@ -61,13 +61,13 @@ - (void)resetProps
   _props = defaultProps;
   _tabBarBlurEffect = nil;
   _tabBarBackgroundColor = nil;
-  
+
   _tabBarItemTitleFontFamily = nil;
   _tabBarItemTitleFontSize = nil;
   _tabBarItemTitleFontWeight = nil;
   _tabBarItemTitleFontStyle = nil;
   _tabBarItemTitleFontColor = nil;
-  
+
   _tabBarItemBadgeBackgroundColor = nil;
 }
 
@@ -180,7 +180,7 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
     _tabBarBlurEffect =
         rnscreens::conversion::RNSUIBlurEffectFromRNSBottomTabsTabBarBlurEffect(newComponentProps.tabBarBlurEffect);
   }
-  
+
   if (newComponentProps.tabBarItemTitleFontFamily != oldComponentProps.tabBarItemTitleFontFamily) {
     _tabBarItemTitleFontFamily = RCTNSStringFromStringNilIfEmpty(newComponentProps.tabBarItemTitleFontFamily);
     _needsTabBarAppearanceUpdate = YES;
@@ -190,22 +190,22 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
     _tabBarItemTitleFontSize = [NSNumber numberWithFloat:newComponentProps.tabBarItemTitleFontSize];
     _needsTabBarAppearanceUpdate = YES;
   }
-  
+
   if (newComponentProps.tabBarItemTitleFontWeight != oldComponentProps.tabBarItemTitleFontWeight) {
     _tabBarItemTitleFontWeight = RCTNSStringFromStringNilIfEmpty(newComponentProps.tabBarItemTitleFontWeight);
     _needsTabBarAppearanceUpdate = YES;
   }
-  
+
   if (newComponentProps.tabBarItemTitleFontStyle != oldComponentProps.tabBarItemTitleFontStyle) {
     _tabBarItemTitleFontStyle = RCTNSStringFromStringNilIfEmpty(newComponentProps.tabBarItemTitleFontStyle);
     _needsTabBarAppearanceUpdate = YES;
   }
-  
+
   if (newComponentProps.tabBarItemTitleFontColor != oldComponentProps.tabBarItemTitleFontColor) {
     _tabBarItemTitleFontColor = RCTUIColorFromSharedColor(newComponentProps.tabBarItemTitleFontColor);
     _needsTabBarAppearanceUpdate = YES;
   }
-  
+
   if (newComponentProps.tabBarItemBadgeBackgroundColor != oldComponentProps.tabBarItemBadgeBackgroundColor) {
     _tabBarItemBadgeBackgroundColor = RCTUIColorFromSharedColor(newComponentProps.tabBarItemBadgeBackgroundColor);
     _needsTabBarAppearanceUpdate = YES;

ios/bottom-tabs/RNSBottomTabsScreenComponentView.mm

@@ -1,7 +1,7 @@
 #import "RNSBottomTabsScreenComponentView.h"
+#import "RNSConversions.h"
 #import "RNSDefines.h"
 #import "RNSTabBarController.h"
-#import "RNSConversions.h"
 
 #import <React/RCTConversions.h>
 #import <react/renderer/components/rnscreens/ComponentDescriptors.h>
@@ -55,7 +55,7 @@ - (void)resetProps
   _tabBarItemTitleFontWeight = nil;
   _tabBarItemTitleFontStyle = nil;
   _tabBarItemTitleFontColor = nil;
-  
+
   _tabBarItemBadgeBackgroundColor = nil;
 }
 
@@ -96,7 +96,7 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
 
   if (newComponentProps.tabKey != oldComponentProps.tabKey) {
     RCTAssert(!newComponentProps.tabKey.empty(), @"[RNScreens] tabKey must not be empty!");
-    _tabKey = RCTNSStringFromString(newComponentProps.title);
+    _tabKey = RCTNSStringFromString(newComponentProps.tabKey);
   }
 
   if (newComponentProps.isFocused != oldComponentProps.isFocused) {
@@ -116,15 +116,15 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
     NSLog(@"TabsScreen [%ld] update badgeColor to %@", self.tag, _tabBarItemBadgeBackgroundColor);
     tabItemNeedsAppearanceUpdate = YES;
   }
-  
+
   if (newComponentProps.tabBarBackgroundColor != oldComponentProps.tabBarBackgroundColor) {
     _tabBarBackgroundColor = RCTUIColorFromSharedColor(newComponentProps.tabBarBackgroundColor);
     tabItemNeedsAppearanceUpdate = YES;
   }
 
   if (newComponentProps.tabBarBlurEffect != oldComponentProps.tabBarBlurEffect) {
-    _tabBarBlurEffect =
-        rnscreens::conversion::RNSUIBlurEffectFromRNSBottomTabsScreenTabBarBlurEffect(newComponentProps.tabBarBlurEffect);
+    _tabBarBlurEffect = rnscreens::conversion::RNSUIBlurEffectFromRNSBottomTabsScreenTabBarBlurEffect(
+        newComponentProps.tabBarBlurEffect);
     tabItemNeedsAppearanceUpdate = YES;
   }
 
@@ -137,17 +137,17 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props
     _tabBarItemTitleFontSize = [NSNumber numberWithFloat:newComponentProps.tabBarItemTitleFontSize];
     tabItemNeedsAppearanceUpdate = YES;
   }
-  
+
   if (newComponentProps.tabBarItemTitleFontWeight != oldComponentProps.tabBarItemTitleFontWeight) {
     _tabBarItemTitleFontWeight = RCTNSStringFromStringNilIfEmpty(newComponentProps.tabBarItemTitleFontWeight);
     tabItemNeedsAppearanceUpdate = YES;
   }
-  
+
   if (newComponentProps.tabBarItemTitleFontStyle != oldComponentProps.tabBarItemTitleFontStyle) {
     _tabBarItemTitleFontStyle = RCTNSStringFromStringNilIfEmpty(newComponentProps.tabBarItemTitleFontStyle);
     tabItemNeedsAppearanceUpdate = YES;
   }
-  
+
   if (newComponentProps.tabBarItemTitleFontColor != oldComponentProps.tabBarItemTitleFontColor) {
     _tabBarItemTitleFontColor = RCTUIColorFromSharedColor(newComponentProps.tabBarItemTitleFontColor);
     tabItemNeedsAppearanceUpdate = YES;

ios/bottom-tabs/RNSTabBarAppearanceProvider.h

@@ -4,16 +4,16 @@ NS_ASSUME_NONNULL_BEGIN
 
 @protocol RNSTabBarAppearanceProvider
 
--(UIColor *)tabBarBackgroundColor;
--(UIBlurEffect *)tabBarBlurEffect;
+- (UIColor *)tabBarBackgroundColor;
+- (UIBlurEffect *)tabBarBlurEffect;
 
--(NSString *)tabBarItemTitleFontFamily;
--(NSNumber *)tabBarItemTitleFontSize;
--(NSString *)tabBarItemTitleFontWeight;
--(NSString *)tabBarItemTitleFontStyle;
--(UIColor *)tabBarItemTitleFontColor;
+- (NSString *)tabBarItemTitleFontFamily;
+- (NSNumber *)tabBarItemTitleFontSize;
+- (NSString *)tabBarItemTitleFontWeight;
+- (NSString *)tabBarItemTitleFontStyle;
+- (UIColor *)tabBarItemTitleFontColor;
 
--(UIColor *)tabBarItemBadgeBackgroundColor;
+- (UIColor *)tabBarItemBadgeBackgroundColor;
 
 @end
 

ios/conversion/RNSConversions-BottomTabs.mm

@@ -149,9 +149,11 @@
   }
 }
 
-UIBlurEffect *RNSUIBlurEffectFromRNSBottomTabsScreenTabBarBlurEffect(react::RNSBottomTabsScreenTabBarBlurEffect blurEffect)
+UIBlurEffect *RNSUIBlurEffectFromRNSBottomTabsScreenTabBarBlurEffect(
+    react::RNSBottomTabsScreenTabBarBlurEffect blurEffect)
 {
-  std::optional<UIBlurEffectStyle> maybeStyle = RNSMaybeUIBlurEffectStyleFromRNSBottomTabsScreenTabBarBlurEffect(blurEffect);
+  std::optional<UIBlurEffectStyle> maybeStyle =
+      RNSMaybeUIBlurEffectStyleFromRNSBottomTabsScreenTabBarBlurEffect(blurEffect);
   if (maybeStyle) {
     return [UIBlurEffect effectWithStyle:maybeStyle.value()];
   }