Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ios/RNSScreenStackHeaderConfig.mm
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
#import <React/RCTFont.h>
#import <React/RCTImageLoader.h>
#import <React/RCTImageSource.h>
#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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import <UIKit/UIKit.h>

@interface RNSUIBarButtonItem : UIBarButtonItem
@interface RNSBackBarButtonItem : UIBarButtonItem

@property (nonatomic) BOOL menuHidden;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "./RNSUIBarButtonItem.h"
#import "./RNSBackBarButtonItem.h"

@implementation RNSUIBarButtonItem
@implementation RNSBackBarButtonItem

- (void)setMenuHidden:(BOOL)menuHidden
{
Expand Down
Loading