@@ -33,52 +33,8 @@ + (UIBarButtonItem *)barButtonItemForHeaderItem:(id<RNSHeaderItemDataProviding>)
3333
3434 barButtonItem.enabled = !item.disabled ;
3535 barButtonItem.tintColor = item.tintColor ;
36- barButtonItem.width = MAX (0 , item.width );
3736 barButtonItem.style = item.style ;
3837
39- if ((item.width > 0 || item.height > 0 ) && item.customView == nil ) {
40- // UIKit's iOS 26 bar renderer ignores width on ordinary title items.
41- // A native UIButton preserves system styling while honoring the constraint.
42- BOOL prominent = ![item.variant isEqualToString: @" plain" ];
43- UIButtonConfiguration *configuration;
44- #if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0) && !TARGET_OS_VISION
45- if (@available (iOS 26.0 , tvOS 26.0 , *)) {
46- configuration = prominent ? [UIButtonConfiguration prominentGlassButtonConfiguration ]
47- : [UIButtonConfiguration glassButtonConfiguration ];
48- } else
49- #endif
50- {
51- configuration = prominent ? [UIButtonConfiguration filledButtonConfiguration ]
52- : [UIButtonConfiguration plainButtonConfiguration ];
53- configuration.cornerStyle = UIButtonConfigurationCornerStyleCapsule;
54- }
55- // An explicit empty title keeps UIAction from restoring its accessibility title.
56- configuration.title = item.icon == nil ? item.title : @" " ;
57- configuration.image = barButtonItem.image ;
58- if (prominent && item.tintColor != nil ) {
59- configuration.baseBackgroundColor = item.tintColor ;
60- CGFloat red = 0 , green = 0 , blue = 0 , alpha = 0 ;
61- [item.tintColor getRed: &red green: &green blue: &blue alpha: &alpha];
62- configuration.baseForegroundColor = red + green + blue > 1.5 ? UIColor.blackColor : UIColor.whiteColor ;
63- }
64- UIAction *action = barButtonItem.primaryAction ;
65- if (item.icon != nil ) {
66- action.title = @" " ;
67- }
68- UIButton *button = [UIButton buttonWithConfiguration: configuration primaryAction: action];
69- button.configuration = configuration;
70- button.accessibilityLabel = item.title ;
71- button.tintColor = item.tintColor ;
72- button.enabled = !item.disabled && (item.respondsToOnPress || item.menu != nil );
73- button.showsMenuAsPrimaryAction = !item.respondsToOnPress && item.menu != nil ;
74- button.translatesAutoresizingMaskIntoConstraints = NO ;
75- if (item.width > 0 ) {
76- [button.widthAnchor constraintEqualToConstant: item.width].active = YES ;
77- }
78- [button.heightAnchor constraintEqualToConstant: item.height > 0 ? item.height : 48 ].active = YES ;
79- barButtonItem.customView = button;
80- }
81-
8238 return barButtonItem;
8339}
8440
@@ -114,12 +70,6 @@ + (UIBarButtonItem *)labelBarButtonItemForHeaderItem:(id<RNSHeaderItemDataProvid
11470 return ;
11571 }
11672 weakBarButtonItem.image = image;
117- if ([weakBarButtonItem.customView isKindOfClass: UIButton.class ]) {
118- UIButton *button = (UIButton *)weakBarButtonItem.customView ;
119- UIButtonConfiguration *configuration = button.configuration ;
120- configuration.image = image;
121- button.configuration = configuration;
122- }
12373 }];
12474 barButtonItem.image = syncImage ? syncImage : [RNSHeaderIconResolver placeholderImageForIcon: item.icon];
12575 }
0 commit comments