diff --git a/ios/RNSScreenStackHeaderConfig.mm b/ios/RNSScreenStackHeaderConfig.mm index 0e7fcf9f95..5270e01a2f 100644 --- a/ios/RNSScreenStackHeaderConfig.mm +++ b/ios/RNSScreenStackHeaderConfig.mm @@ -25,12 +25,12 @@ #import #import #import +#import "RNSBackBarButtonItem.h" #import "RNSConvert.h" #import "RNSDefines.h" #import "RNSScreen.h" #import "RNSScreenStackHeaderConfig.h" #import "RNSSearchBar.h" -#import "RNSUIBarButtonItem.h" #ifdef RCT_NEW_ARCH_ENABLED namespace react = facebook::react; @@ -673,7 +673,7 @@ + (void)updateViewController:(UIViewController *)vc #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_26_0) && \ __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_26_0 if (@available(iOS 26.0, *)) { - // Workaround for missing search bar on root stack screen. + // Workaround for missing search bar on root stack screen. // See: https://github.com/software-mansion/react-native-screens/pull/3098 navitem.searchBarPlacementAllowsToolbarIntegration = NO; } @@ -746,10 +746,10 @@ - (void)configureBackItem:(nullable UINavigationItem *)prevItem API_UNAVAILABLE( prevItem.backButtonDisplayMode = config.backButtonDisplayMode; if (config.isBackTitleVisible) { - RNSUIBarButtonItem *backBarButtonItem = [[RNSUIBarButtonItem alloc] initWithTitle:resolvedBackTitle - style:UIBarButtonItemStylePlain - target:nil - action:nil]; + RNSBackBarButtonItem *backBarButtonItem = [[RNSBackBarButtonItem alloc] initWithTitle:resolvedBackTitle + style:UIBarButtonItemStylePlain + target:nil + action:nil]; auto shouldUseCustomBackBarButtonItem = config.disableBackButtonMenu; [backBarButtonItem setMenuHidden:config.disableBackButtonMenu]; diff --git a/ios/utils/RNSUIBarButtonItem.h b/ios/utils/RNSBackBarButtonItem.h similarity index 58% rename from ios/utils/RNSUIBarButtonItem.h rename to ios/utils/RNSBackBarButtonItem.h index d7c6c10fe2..6d35a803e9 100644 --- a/ios/utils/RNSUIBarButtonItem.h +++ b/ios/utils/RNSBackBarButtonItem.h @@ -1,6 +1,6 @@ #import -@interface RNSUIBarButtonItem : UIBarButtonItem +@interface RNSBackBarButtonItem : UIBarButtonItem @property (nonatomic) BOOL menuHidden; diff --git a/ios/utils/RNSUIBarButtonItem.mm b/ios/utils/RNSBackBarButtonItem.mm similarity index 82% rename from ios/utils/RNSUIBarButtonItem.mm rename to ios/utils/RNSBackBarButtonItem.mm index 5b23938b7a..6d309a2040 100644 --- a/ios/utils/RNSUIBarButtonItem.mm +++ b/ios/utils/RNSBackBarButtonItem.mm @@ -1,6 +1,6 @@ -#import "./RNSUIBarButtonItem.h" +#import "./RNSBackBarButtonItem.h" -@implementation RNSUIBarButtonItem +@implementation RNSBackBarButtonItem - (void)setMenuHidden:(BOOL)menuHidden {