Skip to content

Commit 372b357

Browse files
authored
chore(iOS): Rename RNSUIBarButtonItem to RNSBackBarButtonItem (#3119)
## Description From discussion in #2987 (comment). We should rename the class into something more specific because it really does one specific thing. ## Changes title ## Test code and steps to reproduce No changes, disabling back button menu should still work. You can modify BottomTabsTest / Tab4 with `screenOption={{ headerBackButtonMenuEnabled: false }}`
1 parent b4358fd commit 372b357

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

ios/RNSScreenStackHeaderConfig.mm

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
#import <React/RCTFont.h>
2626
#import <React/RCTImageLoader.h>
2727
#import <React/RCTImageSource.h>
28+
#import "RNSBackBarButtonItem.h"
2829
#import "RNSConvert.h"
2930
#import "RNSDefines.h"
3031
#import "RNSScreen.h"
3132
#import "RNSScreenStackHeaderConfig.h"
3233
#import "RNSSearchBar.h"
33-
#import "RNSUIBarButtonItem.h"
3434

3535
#ifdef RCT_NEW_ARCH_ENABLED
3636
namespace react = facebook::react;
@@ -673,7 +673,7 @@ + (void)updateViewController:(UIViewController *)vc
673673
#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && defined(__IPHONE_26_0) && \
674674
__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_26_0
675675
if (@available(iOS 26.0, *)) {
676-
// Workaround for missing search bar on root stack screen.
676+
// Workaround for missing search bar on root stack screen.
677677
// See: https://github.com/software-mansion/react-native-screens/pull/3098
678678
navitem.searchBarPlacementAllowsToolbarIntegration = NO;
679679
}
@@ -746,10 +746,10 @@ - (void)configureBackItem:(nullable UINavigationItem *)prevItem API_UNAVAILABLE(
746746
prevItem.backButtonDisplayMode = config.backButtonDisplayMode;
747747

748748
if (config.isBackTitleVisible) {
749-
RNSUIBarButtonItem *backBarButtonItem = [[RNSUIBarButtonItem alloc] initWithTitle:resolvedBackTitle
750-
style:UIBarButtonItemStylePlain
751-
target:nil
752-
action:nil];
749+
RNSBackBarButtonItem *backBarButtonItem = [[RNSBackBarButtonItem alloc] initWithTitle:resolvedBackTitle
750+
style:UIBarButtonItemStylePlain
751+
target:nil
752+
action:nil];
753753
auto shouldUseCustomBackBarButtonItem = config.disableBackButtonMenu;
754754
[backBarButtonItem setMenuHidden:config.disableBackButtonMenu];
755755

ios/utils/RNSUIBarButtonItem.h renamed to ios/utils/RNSBackBarButtonItem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#import <UIKit/UIKit.h>
22

3-
@interface RNSUIBarButtonItem : UIBarButtonItem
3+
@interface RNSBackBarButtonItem : UIBarButtonItem
44

55
@property (nonatomic) BOOL menuHidden;
66

ios/utils/RNSUIBarButtonItem.mm renamed to ios/utils/RNSBackBarButtonItem.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#import "./RNSUIBarButtonItem.h"
1+
#import "./RNSBackBarButtonItem.h"
22

3-
@implementation RNSUIBarButtonItem
3+
@implementation RNSBackBarButtonItem
44

55
- (void)setMenuHidden:(BOOL)menuHidden
66
{

0 commit comments

Comments
 (0)