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
103 changes: 75 additions & 28 deletions patches/react-native-screens@4.25.2.patch
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,45 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// appearance does not apply to the tvOS so we need to use lagacy customization
#if TARGET_OS_TV
@@ -637,10 +675,458 @@ + (void)updateViewController:(UIViewController *)vc
@@ -550,31 +588,25 @@ + (void)updateViewController:(UIViewController *)vc
navitem.titleView = nil;
- navitem.leftBarButtonItems = nil;
- navitem.rightBarButtonItems = nil;
-
+
#if !TARGET_OS_TV
// We want to set navitem.searchController to nil only if we are sure
// that we are removing the search bar from the header.
bool searchBarPresent = false;
#endif /* !TARGET_OS_TV */
-
+
+ NSMutableArray<UIBarButtonItem *> *subviewLeftItems = [NSMutableArray array];
+ NSMutableArray<UIBarButtonItem *> *subviewRightItems = [NSMutableArray array];
for (RNSScreenStackHeaderSubview *subview in config.reactSubviews) {
// This code should be kept in sync on Fabric with analogous switch statement in
// `- [RNSScreenStackHeaderConfig replaceNavigationBarViewsWithSnapshotOfSubview:]` method.
switch (subview.type) {
case RNSScreenStackHeaderSubviewTypeLeft: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.leftBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.leftBarButtonItems = mutableItems;
+ [subviewLeftItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeRight: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.rightBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.rightBarButtonItems = mutableItems;
+ [subviewRightItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeCenter:
case RNSScreenStackHeaderSubviewTypeTitle: {
navitem.titleView = subview;
@@ -637,10 +669,467 @@ + (void)updateViewController:(UIViewController *)vc
// This assignment should be done after `navitem.titleView = ...` assignment (iOS 16.0 bug).
// See: https://github.com/software-mansion/react-native-screens/issues/1570 (comments)
navitem.title = config.title;
Expand All@@ -237,29 +275,43 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ NSArray *headerLeftConfigs = config.headerLeftBarButtonItems ?: @[];
+ NSArray *headerRightConfigs = config.headerRightBarButtonItems ?: @[];
+ NSArray *headerCenterConfigs = config.headerCenterBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewLeftItems = navitem.leftBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewRightItems = navitem.rightBarButtonItems ?: @[];
+ // The key includes the config instance's identity: cached items capture
+ // this config's event emitter in their press handlers, so a remounted
+ // header-config view with value-equal configs must still rebuild — reusing
+ // the old items would dispatch presses into the dead config's emitter.
+ NSArray *headerItemsKey =
+ @[ @((uintptr_t)config), headerLeftConfigs, headerRightConfigs, headerCenterConfigs ];
+ // Retain the config in the key so its address cannot be reused while cached.
+ // Items capture this config's event emitter in their press handlers, so a
+ // remounted header-config view with value-equal configs must still rebuild
+ // instead of dispatching presses into the old config's emitter.
+ // getUIBarButtonItem is stable for the lifetime of its React header
+ // subview. Include those native identities in the key so React-backed
+ // items can use the same cache without reusing a group after its view was
+ // replaced.
+ NSArray *headerItemsKey = @[
+ config,
+ headerLeftConfigs,
+ headerRightConfigs,
+ headerCenterConfigs,
+ subviewLeftItems,
+ subviewRightItems,
+ ];
+ // Rebuilding bar button items creates brand-new native buttons (glass
+ // UIButton custom views on iOS 26). Replacing them while UIKit animates an
+ // existing one (menu capsule morph, push/pop glass transitions) strands the
+ // animation overlay — a stuck expanded capsule or an unmasked square back
+ // button. When the JS configs are unchanged, keep the already-applied items.
+ // Subview-backed items are re-derived every pass, so their presence forces
+ // the rebuild path.
+ BOOL reuseHeaderBarButtonItems = subviewLeftItems.count == 0 && subviewRightItems.count == 0 &&
+ // button. When both the JS configs and React-backed item identities are
+ // unchanged, keep the already-applied item groups. Item groups are only
+ // available from iOS 16, so older platforms keep the legacy rebuild path.
+ BOOL canReuseHeaderBarButtonItems = NO;
+#if !TARGET_OS_TV
+ if (@available(iOS 16.0, *)) {
+ canReuseHeaderBarButtonItems = YES;
+ }
+#endif
+ BOOL reuseHeaderBarButtonItems = canReuseHeaderBarButtonItems &&
+ [objc_getAssociatedObject(navitem, &RNSAppliedHeaderBarButtonConfigsKey) isEqual:headerItemsKey];
+ if (!reuseHeaderBarButtonItems) {
+ NSArray<UIBarButtonItem *> *leftBarButtonItems = [config barButtonItemsFromConfigs:config.headerLeftBarButtonItems
+ withCurrentItems:navitem.leftBarButtonItems
+ withCurrentItems:subviewLeftItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *rightBarButtonItems = [config barButtonItemsFromConfigs:config.headerRightBarButtonItems
+ withCurrentItems:navitem.rightBarButtonItems
+ withCurrentItems:subviewRightItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *centerBarButtonItems = [config barButtonItemsFromConfigs:config.headerCenterBarButtonItems
+ withCurrentItems:@[]
Expand All@@ -271,8 +323,6 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ if (@available(iOS 26.0, *)) {
+ navitem.centerItemGroups = [config barButtonItemGroupsFromItems:centerBarButtonItems];
+ }
+ navitem.leftBarButtonItems = nil;
+ navitem.rightBarButtonItems = nil;
+ } else {
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
Expand All@@ -281,13 +331,10 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
+#endif
+ // Only dict-driven items can be reused: with subview-backed items in the
+ // mix the applied state depends on view identity, so clear the key to
+ // force a rebuild on the next pass.
+ objc_setAssociatedObject(
+ navitem,
+ &RNSAppliedHeaderBarButtonConfigsKey,
+ subviewLeftItems.count == 0 && subviewRightItems.count == 0 ? headerItemsKey : nil,
+ headerItemsKey,
+ OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ }
+ NSDictionary<NSString *, id> *mailSearchToolbarConfig = nil;
Expand DownExpand Up@@ -689,15 +736,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// Setting navigation bar visibility is split to mitigate iOS 26 bug with bar button items
// (setting nav bar visibility should be done after `navitem.*BarButtonItems`).
@@ -773,6 +1259,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -773,6 +1262,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *

- (NSArray<UIBarButtonItem *> *)barButtonItemsFromConfigs:(NSArray<NSDictionary<NSString *, id> *> *)dicts
withCurrentItems:(NSArray<UIBarButtonItem *> *)currentItems
+ navigationItem:(UINavigationItem *)navitem
{
if (dicts.count == 0) {
return currentItems;
@@ -781,7 +1268,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -781,7 +1271,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
[items addObjectsFromArray:currentItems];
for (NSUInteger i = 0; i < dicts.count; i++) {
NSDictionary *dict = dicts[i];
Expand DownExpand Up@@ -896,7 +943,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNSBarButtonItem *item = [[RNSBarButtonItem alloc] initWithConfig:dict
action:^(NSString *buttonId) {
auto eventEmitter = std::static_pointer_cast<const facebook::react::RNSScreenStackHeaderConfigEventEmitter>(
@@ -803,19 +1480,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -803,19 +1483,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
}
imageLoader:_imageLoader];
NSNumber *index = dict[@"index"];
Expand DownExpand Up@@ -926,7 +973,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
[items insertObject:item atIndex:index.integerValue];
} else {
[items addObject:item];
@@ -825,6 +1506,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -825,6 +1509,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
return items;
}

Expand DownExpand Up@@ -974,7 +1021,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNS_IGNORE_SUPER_CALL_BEGIN
- (void)insertReactSubview:(RNSScreenStackHeaderSubview *)subview atIndex:(NSInteger)atIndex
{
@@ -1013,6 +1735,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1013,6 +1738,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
}

_title = RCTNSStringFromStringNilIfEmpty(newScreenProps.title);
Expand All@@ -983,15 +1030,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
if (newScreenProps.titleFontFamily != oldScreenProps.titleFontFamily) {
_titleFontFamily = RCTNSStringFromStringNilIfEmpty(newScreenProps.titleFontFamily);
}
@@ -1038,6 +1762,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1038,6 +1765,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_disableBackButtonMenu = newScreenProps.disableBackButtonMenu;
_backButtonDisplayMode =
[RNSConvert UINavigationItemBackButtonDisplayModeFromCppEquivalent:newScreenProps.backButtonDisplayMode];
+ _navigationItemStyle = navigationItemStyleFromCppEquivalent(newScreenProps.navigationItemStyle);

if (newScreenProps.userInterfaceStyle != oldScreenProps.userInterfaceStyle) {
_userInterfaceStyle = [RNSConvert UIUserInterfaceStyleFromCppEquivalent:newScreenProps.userInterfaceStyle];
@@ -1084,6 +1809,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1084,6 +1812,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_headerRightBarButtonItems = array;
}

Expand Down
14 changes: 7 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
103 changes: 75 additions & 28 deletions patches/react-native-screens@4.25.2.patch
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,45 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// appearance does not apply to the tvOS so we need to use lagacy customization
#if TARGET_OS_TV
@@ -637,10 +675,458 @@ + (void)updateViewController:(UIViewController *)vc
@@ -550,31 +588,25 @@ + (void)updateViewController:(UIViewController *)vc
navitem.titleView = nil;
- navitem.leftBarButtonItems = nil;
- navitem.rightBarButtonItems = nil;
-
+
#if !TARGET_OS_TV
// We want to set navitem.searchController to nil only if we are sure
// that we are removing the search bar from the header.
bool searchBarPresent = false;
#endif /* !TARGET_OS_TV */
-
+
+ NSMutableArray<UIBarButtonItem *> *subviewLeftItems = [NSMutableArray array];
+ NSMutableArray<UIBarButtonItem *> *subviewRightItems = [NSMutableArray array];
for (RNSScreenStackHeaderSubview *subview in config.reactSubviews) {
// This code should be kept in sync on Fabric with analogous switch statement in
// `- [RNSScreenStackHeaderConfig replaceNavigationBarViewsWithSnapshotOfSubview:]` method.
switch (subview.type) {
case RNSScreenStackHeaderSubviewTypeLeft: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.leftBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.leftBarButtonItems = mutableItems;
+ [subviewLeftItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeRight: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.rightBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.rightBarButtonItems = mutableItems;
+ [subviewRightItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeCenter:
case RNSScreenStackHeaderSubviewTypeTitle: {
navitem.titleView = subview;
@@ -637,10 +669,467 @@ + (void)updateViewController:(UIViewController *)vc
// This assignment should be done after `navitem.titleView = ...` assignment (iOS 16.0 bug).
// See: https://github.com/software-mansion/react-native-screens/issues/1570 (comments)
navitem.title = config.title;
Expand All@@ -237,29 +275,43 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ NSArray *headerLeftConfigs = config.headerLeftBarButtonItems ?: @[];
+ NSArray *headerRightConfigs = config.headerRightBarButtonItems ?: @[];
+ NSArray *headerCenterConfigs = config.headerCenterBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewLeftItems = navitem.leftBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewRightItems = navitem.rightBarButtonItems ?: @[];
+ // The key includes the config instance's identity: cached items capture
+ // this config's event emitter in their press handlers, so a remounted
+ // header-config view with value-equal configs must still rebuild — reusing
+ // the old items would dispatch presses into the dead config's emitter.
+ NSArray *headerItemsKey =
+ @[ @((uintptr_t)config), headerLeftConfigs, headerRightConfigs, headerCenterConfigs ];
+ // Retain the config in the key so its address cannot be reused while cached.
+ // Items capture this config's event emitter in their press handlers, so a
+ // remounted header-config view with value-equal configs must still rebuild
+ // instead of dispatching presses into the old config's emitter.
+ // getUIBarButtonItem is stable for the lifetime of its React header
+ // subview. Include those native identities in the key so React-backed
+ // items can use the same cache without reusing a group after its view was
+ // replaced.
+ NSArray *headerItemsKey = @[
+ config,
+ headerLeftConfigs,
+ headerRightConfigs,
+ headerCenterConfigs,
+ subviewLeftItems,
+ subviewRightItems,
+ ];
+ // Rebuilding bar button items creates brand-new native buttons (glass
+ // UIButton custom views on iOS 26). Replacing them while UIKit animates an
+ // existing one (menu capsule morph, push/pop glass transitions) strands the
+ // animation overlay — a stuck expanded capsule or an unmasked square back
+ // button. When the JS configs are unchanged, keep the already-applied items.
+ // Subview-backed items are re-derived every pass, so their presence forces
+ // the rebuild path.
+ BOOL reuseHeaderBarButtonItems = subviewLeftItems.count == 0 && subviewRightItems.count == 0 &&
+ // button. When both the JS configs and React-backed item identities are
+ // unchanged, keep the already-applied item groups. Item groups are only
+ // available from iOS 16, so older platforms keep the legacy rebuild path.
+ BOOL canReuseHeaderBarButtonItems = NO;
+#if !TARGET_OS_TV
+ if (@available(iOS 16.0, *)) {
+ canReuseHeaderBarButtonItems = YES;
+ }
+#endif
+ BOOL reuseHeaderBarButtonItems = canReuseHeaderBarButtonItems &&
+ [objc_getAssociatedObject(navitem, &RNSAppliedHeaderBarButtonConfigsKey) isEqual:headerItemsKey];
+ if (!reuseHeaderBarButtonItems) {
+ NSArray<UIBarButtonItem *> *leftBarButtonItems = [config barButtonItemsFromConfigs:config.headerLeftBarButtonItems
+ withCurrentItems:navitem.leftBarButtonItems
+ withCurrentItems:subviewLeftItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *rightBarButtonItems = [config barButtonItemsFromConfigs:config.headerRightBarButtonItems
+ withCurrentItems:navitem.rightBarButtonItems
+ withCurrentItems:subviewRightItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *centerBarButtonItems = [config barButtonItemsFromConfigs:config.headerCenterBarButtonItems
+ withCurrentItems:@[]
Expand All@@ -271,8 +323,6 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ if (@available(iOS 26.0, *)) {
+ navitem.centerItemGroups = [config barButtonItemGroupsFromItems:centerBarButtonItems];
+ }
+ navitem.leftBarButtonItems = nil;
+ navitem.rightBarButtonItems = nil;
+ } else {
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
Expand All@@ -281,13 +331,10 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
+#endif
+ // Only dict-driven items can be reused: with subview-backed items in the
+ // mix the applied state depends on view identity, so clear the key to
+ // force a rebuild on the next pass.
+ objc_setAssociatedObject(
+ navitem,
+ &RNSAppliedHeaderBarButtonConfigsKey,
+ subviewLeftItems.count == 0 && subviewRightItems.count == 0 ? headerItemsKey : nil,
+ headerItemsKey,
+ OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ }
+ NSDictionary<NSString *, id> *mailSearchToolbarConfig = nil;
Expand DownExpand Up@@ -689,15 +736,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// Setting navigation bar visibility is split to mitigate iOS 26 bug with bar button items
// (setting nav bar visibility should be done after `navitem.*BarButtonItems`).
@@ -773,6 +1259,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -773,6 +1262,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *

- (NSArray<UIBarButtonItem *> *)barButtonItemsFromConfigs:(NSArray<NSDictionary<NSString *, id> *> *)dicts
withCurrentItems:(NSArray<UIBarButtonItem *> *)currentItems
+ navigationItem:(UINavigationItem *)navitem
{
if (dicts.count == 0) {
return currentItems;
@@ -781,7 +1268,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -781,7 +1271,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
[items addObjectsFromArray:currentItems];
for (NSUInteger i = 0; i < dicts.count; i++) {
NSDictionary *dict = dicts[i];
Expand DownExpand Up@@ -896,7 +943,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNSBarButtonItem *item = [[RNSBarButtonItem alloc] initWithConfig:dict
action:^(NSString *buttonId) {
auto eventEmitter = std::static_pointer_cast<const facebook::react::RNSScreenStackHeaderConfigEventEmitter>(
@@ -803,19 +1480,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -803,19 +1483,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
}
imageLoader:_imageLoader];
NSNumber *index = dict[@"index"];
Expand DownExpand Up@@ -926,7 +973,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
[items insertObject:item atIndex:index.integerValue];
} else {
[items addObject:item];
@@ -825,6 +1506,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -825,6 +1509,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
return items;
}

Expand DownExpand Up@@ -974,7 +1021,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNS_IGNORE_SUPER_CALL_BEGIN
- (void)insertReactSubview:(RNSScreenStackHeaderSubview *)subview atIndex:(NSInteger)atIndex
{
@@ -1013,6 +1735,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1013,6 +1738,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
}

_title = RCTNSStringFromStringNilIfEmpty(newScreenProps.title);
Expand All@@ -983,15 +1030,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
if (newScreenProps.titleFontFamily != oldScreenProps.titleFontFamily) {
_titleFontFamily = RCTNSStringFromStringNilIfEmpty(newScreenProps.titleFontFamily);
}
@@ -1038,6 +1762,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1038,6 +1765,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_disableBackButtonMenu = newScreenProps.disableBackButtonMenu;
_backButtonDisplayMode =
[RNSConvert UINavigationItemBackButtonDisplayModeFromCppEquivalent:newScreenProps.backButtonDisplayMode];
+ _navigationItemStyle = navigationItemStyleFromCppEquivalent(newScreenProps.navigationItemStyle);

if (newScreenProps.userInterfaceStyle != oldScreenProps.userInterfaceStyle) {
_userInterfaceStyle = [RNSConvert UIUserInterfaceStyleFromCppEquivalent:newScreenProps.userInterfaceStyle];
@@ -1084,6 +1809,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1084,6 +1812,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_headerRightBarButtonItems = array;
}

Expand Down
14 changes: 7 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
103 changes: 75 additions & 28 deletions patches/react-native-screens@4.25.2.patch
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,45 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// appearance does not apply to the tvOS so we need to use lagacy customization
#if TARGET_OS_TV
@@ -637,10 +675,458 @@ + (void)updateViewController:(UIViewController *)vc
@@ -550,31 +588,25 @@ + (void)updateViewController:(UIViewController *)vc
navitem.titleView = nil;
- navitem.leftBarButtonItems = nil;
- navitem.rightBarButtonItems = nil;
-
+
#if !TARGET_OS_TV
// We want to set navitem.searchController to nil only if we are sure
// that we are removing the search bar from the header.
bool searchBarPresent = false;
#endif /* !TARGET_OS_TV */
-
+
+ NSMutableArray<UIBarButtonItem *> *subviewLeftItems = [NSMutableArray array];
+ NSMutableArray<UIBarButtonItem *> *subviewRightItems = [NSMutableArray array];
for (RNSScreenStackHeaderSubview *subview in config.reactSubviews) {
// This code should be kept in sync on Fabric with analogous switch statement in
// `- [RNSScreenStackHeaderConfig replaceNavigationBarViewsWithSnapshotOfSubview:]` method.
switch (subview.type) {
case RNSScreenStackHeaderSubviewTypeLeft: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.leftBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.leftBarButtonItems = mutableItems;
+ [subviewLeftItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeRight: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.rightBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.rightBarButtonItems = mutableItems;
+ [subviewRightItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeCenter:
case RNSScreenStackHeaderSubviewTypeTitle: {
navitem.titleView = subview;
@@ -637,10 +669,467 @@ + (void)updateViewController:(UIViewController *)vc
// This assignment should be done after `navitem.titleView = ...` assignment (iOS 16.0 bug).
// See: https://github.com/software-mansion/react-native-screens/issues/1570 (comments)
navitem.title = config.title;
Expand All@@ -237,29 +275,43 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ NSArray *headerLeftConfigs = config.headerLeftBarButtonItems ?: @[];
+ NSArray *headerRightConfigs = config.headerRightBarButtonItems ?: @[];
+ NSArray *headerCenterConfigs = config.headerCenterBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewLeftItems = navitem.leftBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewRightItems = navitem.rightBarButtonItems ?: @[];
+ // The key includes the config instance's identity: cached items capture
+ // this config's event emitter in their press handlers, so a remounted
+ // header-config view with value-equal configs must still rebuild — reusing
+ // the old items would dispatch presses into the dead config's emitter.
+ NSArray *headerItemsKey =
+ @[ @((uintptr_t)config), headerLeftConfigs, headerRightConfigs, headerCenterConfigs ];
+ // Retain the config in the key so its address cannot be reused while cached.
+ // Items capture this config's event emitter in their press handlers, so a
+ // remounted header-config view with value-equal configs must still rebuild
+ // instead of dispatching presses into the old config's emitter.
+ // getUIBarButtonItem is stable for the lifetime of its React header
+ // subview. Include those native identities in the key so React-backed
+ // items can use the same cache without reusing a group after its view was
+ // replaced.
+ NSArray *headerItemsKey = @[
+ config,
+ headerLeftConfigs,
+ headerRightConfigs,
+ headerCenterConfigs,
+ subviewLeftItems,
+ subviewRightItems,
+ ];
+ // Rebuilding bar button items creates brand-new native buttons (glass
+ // UIButton custom views on iOS 26). Replacing them while UIKit animates an
+ // existing one (menu capsule morph, push/pop glass transitions) strands the
+ // animation overlay — a stuck expanded capsule or an unmasked square back
+ // button. When the JS configs are unchanged, keep the already-applied items.
+ // Subview-backed items are re-derived every pass, so their presence forces
+ // the rebuild path.
+ BOOL reuseHeaderBarButtonItems = subviewLeftItems.count == 0 && subviewRightItems.count == 0 &&
+ // button. When both the JS configs and React-backed item identities are
+ // unchanged, keep the already-applied item groups. Item groups are only
+ // available from iOS 16, so older platforms keep the legacy rebuild path.
+ BOOL canReuseHeaderBarButtonItems = NO;
+#if !TARGET_OS_TV
+ if (@available(iOS 16.0, *)) {
+ canReuseHeaderBarButtonItems = YES;
+ }
+#endif
+ BOOL reuseHeaderBarButtonItems = canReuseHeaderBarButtonItems &&
+ [objc_getAssociatedObject(navitem, &RNSAppliedHeaderBarButtonConfigsKey) isEqual:headerItemsKey];
+ if (!reuseHeaderBarButtonItems) {
+ NSArray<UIBarButtonItem *> *leftBarButtonItems = [config barButtonItemsFromConfigs:config.headerLeftBarButtonItems
+ withCurrentItems:navitem.leftBarButtonItems
+ withCurrentItems:subviewLeftItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *rightBarButtonItems = [config barButtonItemsFromConfigs:config.headerRightBarButtonItems
+ withCurrentItems:navitem.rightBarButtonItems
+ withCurrentItems:subviewRightItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *centerBarButtonItems = [config barButtonItemsFromConfigs:config.headerCenterBarButtonItems
+ withCurrentItems:@[]
Expand All@@ -271,8 +323,6 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ if (@available(iOS 26.0, *)) {
+ navitem.centerItemGroups = [config barButtonItemGroupsFromItems:centerBarButtonItems];
+ }
+ navitem.leftBarButtonItems = nil;
+ navitem.rightBarButtonItems = nil;
+ } else {
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
Expand All@@ -281,13 +331,10 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
+#endif
+ // Only dict-driven items can be reused: with subview-backed items in the
+ // mix the applied state depends on view identity, so clear the key to
+ // force a rebuild on the next pass.
+ objc_setAssociatedObject(
+ navitem,
+ &RNSAppliedHeaderBarButtonConfigsKey,
+ subviewLeftItems.count == 0 && subviewRightItems.count == 0 ? headerItemsKey : nil,
+ headerItemsKey,
+ OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ }
+ NSDictionary<NSString *, id> *mailSearchToolbarConfig = nil;
Expand DownExpand Up@@ -689,15 +736,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// Setting navigation bar visibility is split to mitigate iOS 26 bug with bar button items
// (setting nav bar visibility should be done after `navitem.*BarButtonItems`).
@@ -773,6 +1259,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -773,6 +1262,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *

- (NSArray<UIBarButtonItem *> *)barButtonItemsFromConfigs:(NSArray<NSDictionary<NSString *, id> *> *)dicts
withCurrentItems:(NSArray<UIBarButtonItem *> *)currentItems
+ navigationItem:(UINavigationItem *)navitem
{
if (dicts.count == 0) {
return currentItems;
@@ -781,7 +1268,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -781,7 +1271,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
[items addObjectsFromArray:currentItems];
for (NSUInteger i = 0; i < dicts.count; i++) {
NSDictionary *dict = dicts[i];
Expand DownExpand Up@@ -896,7 +943,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNSBarButtonItem *item = [[RNSBarButtonItem alloc] initWithConfig:dict
action:^(NSString *buttonId) {
auto eventEmitter = std::static_pointer_cast<const facebook::react::RNSScreenStackHeaderConfigEventEmitter>(
@@ -803,19 +1480,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -803,19 +1483,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
}
imageLoader:_imageLoader];
NSNumber *index = dict[@"index"];
Expand DownExpand Up@@ -926,7 +973,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
[items insertObject:item atIndex:index.integerValue];
} else {
[items addObject:item];
@@ -825,6 +1506,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -825,6 +1509,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
return items;
}

Expand DownExpand Up@@ -974,7 +1021,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNS_IGNORE_SUPER_CALL_BEGIN
- (void)insertReactSubview:(RNSScreenStackHeaderSubview *)subview atIndex:(NSInteger)atIndex
{
@@ -1013,6 +1735,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1013,6 +1738,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
}

_title = RCTNSStringFromStringNilIfEmpty(newScreenProps.title);
Expand All@@ -983,15 +1030,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
if (newScreenProps.titleFontFamily != oldScreenProps.titleFontFamily) {
_titleFontFamily = RCTNSStringFromStringNilIfEmpty(newScreenProps.titleFontFamily);
}
@@ -1038,6 +1762,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1038,6 +1765,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_disableBackButtonMenu = newScreenProps.disableBackButtonMenu;
_backButtonDisplayMode =
[RNSConvert UINavigationItemBackButtonDisplayModeFromCppEquivalent:newScreenProps.backButtonDisplayMode];
+ _navigationItemStyle = navigationItemStyleFromCppEquivalent(newScreenProps.navigationItemStyle);

if (newScreenProps.userInterfaceStyle != oldScreenProps.userInterfaceStyle) {
_userInterfaceStyle = [RNSConvert UIUserInterfaceStyleFromCppEquivalent:newScreenProps.userInterfaceStyle];
@@ -1084,6 +1809,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1084,6 +1812,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_headerRightBarButtonItems = array;
}

Expand Down
14 changes: 7 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
103 changes: 75 additions & 28 deletions patches/react-native-screens@4.25.2.patch
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,45 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// appearance does not apply to the tvOS so we need to use lagacy customization
#if TARGET_OS_TV
@@ -637,10 +675,458 @@ + (void)updateViewController:(UIViewController *)vc
@@ -550,31 +588,25 @@ + (void)updateViewController:(UIViewController *)vc
navitem.titleView = nil;
- navitem.leftBarButtonItems = nil;
- navitem.rightBarButtonItems = nil;
-
+
#if !TARGET_OS_TV
// We want to set navitem.searchController to nil only if we are sure
// that we are removing the search bar from the header.
bool searchBarPresent = false;
#endif /* !TARGET_OS_TV */
-
+
+ NSMutableArray<UIBarButtonItem *> *subviewLeftItems = [NSMutableArray array];
+ NSMutableArray<UIBarButtonItem *> *subviewRightItems = [NSMutableArray array];
for (RNSScreenStackHeaderSubview *subview in config.reactSubviews) {
// This code should be kept in sync on Fabric with analogous switch statement in
// `- [RNSScreenStackHeaderConfig replaceNavigationBarViewsWithSnapshotOfSubview:]` method.
switch (subview.type) {
case RNSScreenStackHeaderSubviewTypeLeft: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.leftBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.leftBarButtonItems = mutableItems;
+ [subviewLeftItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeRight: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.rightBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.rightBarButtonItems = mutableItems;
+ [subviewRightItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeCenter:
case RNSScreenStackHeaderSubviewTypeTitle: {
navitem.titleView = subview;
@@ -637,10 +669,467 @@ + (void)updateViewController:(UIViewController *)vc
// This assignment should be done after `navitem.titleView = ...` assignment (iOS 16.0 bug).
// See: https://github.com/software-mansion/react-native-screens/issues/1570 (comments)
navitem.title = config.title;
Expand All@@ -237,29 +275,43 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ NSArray *headerLeftConfigs = config.headerLeftBarButtonItems ?: @[];
+ NSArray *headerRightConfigs = config.headerRightBarButtonItems ?: @[];
+ NSArray *headerCenterConfigs = config.headerCenterBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewLeftItems = navitem.leftBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewRightItems = navitem.rightBarButtonItems ?: @[];
+ // The key includes the config instance's identity: cached items capture
+ // this config's event emitter in their press handlers, so a remounted
+ // header-config view with value-equal configs must still rebuild — reusing
+ // the old items would dispatch presses into the dead config's emitter.
+ NSArray *headerItemsKey =
+ @[ @((uintptr_t)config), headerLeftConfigs, headerRightConfigs, headerCenterConfigs ];
+ // Retain the config in the key so its address cannot be reused while cached.
+ // Items capture this config's event emitter in their press handlers, so a
+ // remounted header-config view with value-equal configs must still rebuild
+ // instead of dispatching presses into the old config's emitter.
+ // getUIBarButtonItem is stable for the lifetime of its React header
+ // subview. Include those native identities in the key so React-backed
+ // items can use the same cache without reusing a group after its view was
+ // replaced.
+ NSArray *headerItemsKey = @[
+ config,
+ headerLeftConfigs,
+ headerRightConfigs,
+ headerCenterConfigs,
+ subviewLeftItems,
+ subviewRightItems,
+ ];
+ // Rebuilding bar button items creates brand-new native buttons (glass
+ // UIButton custom views on iOS 26). Replacing them while UIKit animates an
+ // existing one (menu capsule morph, push/pop glass transitions) strands the
+ // animation overlay — a stuck expanded capsule or an unmasked square back
+ // button. When the JS configs are unchanged, keep the already-applied items.
+ // Subview-backed items are re-derived every pass, so their presence forces
+ // the rebuild path.
+ BOOL reuseHeaderBarButtonItems = subviewLeftItems.count == 0 && subviewRightItems.count == 0 &&
+ // button. When both the JS configs and React-backed item identities are
+ // unchanged, keep the already-applied item groups. Item groups are only
+ // available from iOS 16, so older platforms keep the legacy rebuild path.
+ BOOL canReuseHeaderBarButtonItems = NO;
+#if !TARGET_OS_TV
+ if (@available(iOS 16.0, *)) {
+ canReuseHeaderBarButtonItems = YES;
+ }
+#endif
+ BOOL reuseHeaderBarButtonItems = canReuseHeaderBarButtonItems &&
+ [objc_getAssociatedObject(navitem, &RNSAppliedHeaderBarButtonConfigsKey) isEqual:headerItemsKey];
+ if (!reuseHeaderBarButtonItems) {
+ NSArray<UIBarButtonItem *> *leftBarButtonItems = [config barButtonItemsFromConfigs:config.headerLeftBarButtonItems
+ withCurrentItems:navitem.leftBarButtonItems
+ withCurrentItems:subviewLeftItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *rightBarButtonItems = [config barButtonItemsFromConfigs:config.headerRightBarButtonItems
+ withCurrentItems:navitem.rightBarButtonItems
+ withCurrentItems:subviewRightItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *centerBarButtonItems = [config barButtonItemsFromConfigs:config.headerCenterBarButtonItems
+ withCurrentItems:@[]
Expand All@@ -271,8 +323,6 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ if (@available(iOS 26.0, *)) {
+ navitem.centerItemGroups = [config barButtonItemGroupsFromItems:centerBarButtonItems];
+ }
+ navitem.leftBarButtonItems = nil;
+ navitem.rightBarButtonItems = nil;
+ } else {
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
Expand All@@ -281,13 +331,10 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
+#endif
+ // Only dict-driven items can be reused: with subview-backed items in the
+ // mix the applied state depends on view identity, so clear the key to
+ // force a rebuild on the next pass.
+ objc_setAssociatedObject(
+ navitem,
+ &RNSAppliedHeaderBarButtonConfigsKey,
+ subviewLeftItems.count == 0 && subviewRightItems.count == 0 ? headerItemsKey : nil,
+ headerItemsKey,
+ OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ }
+ NSDictionary<NSString *, id> *mailSearchToolbarConfig = nil;
Expand DownExpand Up@@ -689,15 +736,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// Setting navigation bar visibility is split to mitigate iOS 26 bug with bar button items
// (setting nav bar visibility should be done after `navitem.*BarButtonItems`).
@@ -773,6 +1259,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -773,6 +1262,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *

- (NSArray<UIBarButtonItem *> *)barButtonItemsFromConfigs:(NSArray<NSDictionary<NSString *, id> *> *)dicts
withCurrentItems:(NSArray<UIBarButtonItem *> *)currentItems
+ navigationItem:(UINavigationItem *)navitem
{
if (dicts.count == 0) {
return currentItems;
@@ -781,7 +1268,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -781,7 +1271,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
[items addObjectsFromArray:currentItems];
for (NSUInteger i = 0; i < dicts.count; i++) {
NSDictionary *dict = dicts[i];
Expand DownExpand Up@@ -896,7 +943,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNSBarButtonItem *item = [[RNSBarButtonItem alloc] initWithConfig:dict
action:^(NSString *buttonId) {
auto eventEmitter = std::static_pointer_cast<const facebook::react::RNSScreenStackHeaderConfigEventEmitter>(
@@ -803,19 +1480,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -803,19 +1483,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
}
imageLoader:_imageLoader];
NSNumber *index = dict[@"index"];
Expand DownExpand Up@@ -926,7 +973,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
[items insertObject:item atIndex:index.integerValue];
} else {
[items addObject:item];
@@ -825,6 +1506,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -825,6 +1509,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
return items;
}

Expand DownExpand Up@@ -974,7 +1021,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNS_IGNORE_SUPER_CALL_BEGIN
- (void)insertReactSubview:(RNSScreenStackHeaderSubview *)subview atIndex:(NSInteger)atIndex
{
@@ -1013,6 +1735,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1013,6 +1738,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
}

_title = RCTNSStringFromStringNilIfEmpty(newScreenProps.title);
Expand All@@ -983,15 +1030,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
if (newScreenProps.titleFontFamily != oldScreenProps.titleFontFamily) {
_titleFontFamily = RCTNSStringFromStringNilIfEmpty(newScreenProps.titleFontFamily);
}
@@ -1038,6 +1762,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1038,6 +1765,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_disableBackButtonMenu = newScreenProps.disableBackButtonMenu;
_backButtonDisplayMode =
[RNSConvert UINavigationItemBackButtonDisplayModeFromCppEquivalent:newScreenProps.backButtonDisplayMode];
+ _navigationItemStyle = navigationItemStyleFromCppEquivalent(newScreenProps.navigationItemStyle);

if (newScreenProps.userInterfaceStyle != oldScreenProps.userInterfaceStyle) {
_userInterfaceStyle = [RNSConvert UIUserInterfaceStyleFromCppEquivalent:newScreenProps.userInterfaceStyle];
@@ -1084,6 +1809,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1084,6 +1812,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_headerRightBarButtonItems = array;
}

Expand Down
14 changes: 7 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
103 changes: 75 additions & 28 deletions patches/react-native-screens@4.25.2.patch
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,45 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// appearance does not apply to the tvOS so we need to use lagacy customization
#if TARGET_OS_TV
@@ -637,10 +675,458 @@ + (void)updateViewController:(UIViewController *)vc
@@ -550,31 +588,25 @@ + (void)updateViewController:(UIViewController *)vc
navitem.titleView = nil;
- navitem.leftBarButtonItems = nil;
- navitem.rightBarButtonItems = nil;
-
+
#if !TARGET_OS_TV
// We want to set navitem.searchController to nil only if we are sure
// that we are removing the search bar from the header.
bool searchBarPresent = false;
#endif /* !TARGET_OS_TV */
-
+
+ NSMutableArray<UIBarButtonItem *> *subviewLeftItems = [NSMutableArray array];
+ NSMutableArray<UIBarButtonItem *> *subviewRightItems = [NSMutableArray array];
for (RNSScreenStackHeaderSubview *subview in config.reactSubviews) {
// This code should be kept in sync on Fabric with analogous switch statement in
// `- [RNSScreenStackHeaderConfig replaceNavigationBarViewsWithSnapshotOfSubview:]` method.
switch (subview.type) {
case RNSScreenStackHeaderSubviewTypeLeft: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.leftBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.leftBarButtonItems = mutableItems;
+ [subviewLeftItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeRight: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.rightBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.rightBarButtonItems = mutableItems;
+ [subviewRightItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeCenter:
case RNSScreenStackHeaderSubviewTypeTitle: {
navitem.titleView = subview;
@@ -637,10 +669,467 @@ + (void)updateViewController:(UIViewController *)vc
// This assignment should be done after `navitem.titleView = ...` assignment (iOS 16.0 bug).
// See: https://github.com/software-mansion/react-native-screens/issues/1570 (comments)
navitem.title = config.title;
Expand All@@ -237,29 +275,43 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ NSArray *headerLeftConfigs = config.headerLeftBarButtonItems ?: @[];
+ NSArray *headerRightConfigs = config.headerRightBarButtonItems ?: @[];
+ NSArray *headerCenterConfigs = config.headerCenterBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewLeftItems = navitem.leftBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewRightItems = navitem.rightBarButtonItems ?: @[];
+ // The key includes the config instance's identity: cached items capture
+ // this config's event emitter in their press handlers, so a remounted
+ // header-config view with value-equal configs must still rebuild — reusing
+ // the old items would dispatch presses into the dead config's emitter.
+ NSArray *headerItemsKey =
+ @[ @((uintptr_t)config), headerLeftConfigs, headerRightConfigs, headerCenterConfigs ];
+ // Retain the config in the key so its address cannot be reused while cached.
+ // Items capture this config's event emitter in their press handlers, so a
+ // remounted header-config view with value-equal configs must still rebuild
+ // instead of dispatching presses into the old config's emitter.
+ // getUIBarButtonItem is stable for the lifetime of its React header
+ // subview. Include those native identities in the key so React-backed
+ // items can use the same cache without reusing a group after its view was
+ // replaced.
+ NSArray *headerItemsKey = @[
+ config,
+ headerLeftConfigs,
+ headerRightConfigs,
+ headerCenterConfigs,
+ subviewLeftItems,
+ subviewRightItems,
+ ];
+ // Rebuilding bar button items creates brand-new native buttons (glass
+ // UIButton custom views on iOS 26). Replacing them while UIKit animates an
+ // existing one (menu capsule morph, push/pop glass transitions) strands the
+ // animation overlay — a stuck expanded capsule or an unmasked square back
+ // button. When the JS configs are unchanged, keep the already-applied items.
+ // Subview-backed items are re-derived every pass, so their presence forces
+ // the rebuild path.
+ BOOL reuseHeaderBarButtonItems = subviewLeftItems.count == 0 && subviewRightItems.count == 0 &&
+ // button. When both the JS configs and React-backed item identities are
+ // unchanged, keep the already-applied item groups. Item groups are only
+ // available from iOS 16, so older platforms keep the legacy rebuild path.
+ BOOL canReuseHeaderBarButtonItems = NO;
+#if !TARGET_OS_TV
+ if (@available(iOS 16.0, *)) {
+ canReuseHeaderBarButtonItems = YES;
+ }
+#endif
+ BOOL reuseHeaderBarButtonItems = canReuseHeaderBarButtonItems &&
+ [objc_getAssociatedObject(navitem, &RNSAppliedHeaderBarButtonConfigsKey) isEqual:headerItemsKey];
+ if (!reuseHeaderBarButtonItems) {
+ NSArray<UIBarButtonItem *> *leftBarButtonItems = [config barButtonItemsFromConfigs:config.headerLeftBarButtonItems
+ withCurrentItems:navitem.leftBarButtonItems
+ withCurrentItems:subviewLeftItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *rightBarButtonItems = [config barButtonItemsFromConfigs:config.headerRightBarButtonItems
+ withCurrentItems:navitem.rightBarButtonItems
+ withCurrentItems:subviewRightItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *centerBarButtonItems = [config barButtonItemsFromConfigs:config.headerCenterBarButtonItems
+ withCurrentItems:@[]
Expand All@@ -271,8 +323,6 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ if (@available(iOS 26.0, *)) {
+ navitem.centerItemGroups = [config barButtonItemGroupsFromItems:centerBarButtonItems];
+ }
+ navitem.leftBarButtonItems = nil;
+ navitem.rightBarButtonItems = nil;
+ } else {
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
Expand All@@ -281,13 +331,10 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
+#endif
+ // Only dict-driven items can be reused: with subview-backed items in the
+ // mix the applied state depends on view identity, so clear the key to
+ // force a rebuild on the next pass.
+ objc_setAssociatedObject(
+ navitem,
+ &RNSAppliedHeaderBarButtonConfigsKey,
+ subviewLeftItems.count == 0 && subviewRightItems.count == 0 ? headerItemsKey : nil,
+ headerItemsKey,
+ OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ }
+ NSDictionary<NSString *, id> *mailSearchToolbarConfig = nil;
Expand DownExpand Up@@ -689,15 +736,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// Setting navigation bar visibility is split to mitigate iOS 26 bug with bar button items
// (setting nav bar visibility should be done after `navitem.*BarButtonItems`).
@@ -773,6 +1259,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -773,6 +1262,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *

- (NSArray<UIBarButtonItem *> *)barButtonItemsFromConfigs:(NSArray<NSDictionary<NSString *, id> *> *)dicts
withCurrentItems:(NSArray<UIBarButtonItem *> *)currentItems
+ navigationItem:(UINavigationItem *)navitem
{
if (dicts.count == 0) {
return currentItems;
@@ -781,7 +1268,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -781,7 +1271,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
[items addObjectsFromArray:currentItems];
for (NSUInteger i = 0; i < dicts.count; i++) {
NSDictionary *dict = dicts[i];
Expand DownExpand Up@@ -896,7 +943,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNSBarButtonItem *item = [[RNSBarButtonItem alloc] initWithConfig:dict
action:^(NSString *buttonId) {
auto eventEmitter = std::static_pointer_cast<const facebook::react::RNSScreenStackHeaderConfigEventEmitter>(
@@ -803,19 +1480,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -803,19 +1483,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
}
imageLoader:_imageLoader];
NSNumber *index = dict[@"index"];
Expand DownExpand Up@@ -926,7 +973,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
[items insertObject:item atIndex:index.integerValue];
} else {
[items addObject:item];
@@ -825,6 +1506,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -825,6 +1509,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
return items;
}

Expand DownExpand Up@@ -974,7 +1021,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNS_IGNORE_SUPER_CALL_BEGIN
- (void)insertReactSubview:(RNSScreenStackHeaderSubview *)subview atIndex:(NSInteger)atIndex
{
@@ -1013,6 +1735,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1013,6 +1738,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
}

_title = RCTNSStringFromStringNilIfEmpty(newScreenProps.title);
Expand All@@ -983,15 +1030,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
if (newScreenProps.titleFontFamily != oldScreenProps.titleFontFamily) {
_titleFontFamily = RCTNSStringFromStringNilIfEmpty(newScreenProps.titleFontFamily);
}
@@ -1038,6 +1762,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1038,6 +1765,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_disableBackButtonMenu = newScreenProps.disableBackButtonMenu;
_backButtonDisplayMode =
[RNSConvert UINavigationItemBackButtonDisplayModeFromCppEquivalent:newScreenProps.backButtonDisplayMode];
+ _navigationItemStyle = navigationItemStyleFromCppEquivalent(newScreenProps.navigationItemStyle);

if (newScreenProps.userInterfaceStyle != oldScreenProps.userInterfaceStyle) {
_userInterfaceStyle = [RNSConvert UIUserInterfaceStyleFromCppEquivalent:newScreenProps.userInterfaceStyle];
@@ -1084,6 +1809,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1084,6 +1812,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_headerRightBarButtonItems = array;
}

Expand Down
14 changes: 7 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
103 changes: 75 additions & 28 deletions patches/react-native-screens@4.25.2.patch
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,45 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// appearance does not apply to the tvOS so we need to use lagacy customization
#if TARGET_OS_TV
@@ -637,10 +675,458 @@ + (void)updateViewController:(UIViewController *)vc
@@ -550,31 +588,25 @@ + (void)updateViewController:(UIViewController *)vc
navitem.titleView = nil;
- navitem.leftBarButtonItems = nil;
- navitem.rightBarButtonItems = nil;
-
+
#if !TARGET_OS_TV
// We want to set navitem.searchController to nil only if we are sure
// that we are removing the search bar from the header.
bool searchBarPresent = false;
#endif /* !TARGET_OS_TV */
-
+
+ NSMutableArray<UIBarButtonItem *> *subviewLeftItems = [NSMutableArray array];
+ NSMutableArray<UIBarButtonItem *> *subviewRightItems = [NSMutableArray array];
for (RNSScreenStackHeaderSubview *subview in config.reactSubviews) {
// This code should be kept in sync on Fabric with analogous switch statement in
// `- [RNSScreenStackHeaderConfig replaceNavigationBarViewsWithSnapshotOfSubview:]` method.
switch (subview.type) {
case RNSScreenStackHeaderSubviewTypeLeft: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.leftBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.leftBarButtonItems = mutableItems;
+ [subviewLeftItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeRight: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.rightBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.rightBarButtonItems = mutableItems;
+ [subviewRightItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeCenter:
case RNSScreenStackHeaderSubviewTypeTitle: {
navitem.titleView = subview;
@@ -637,10 +669,467 @@ + (void)updateViewController:(UIViewController *)vc
// This assignment should be done after `navitem.titleView = ...` assignment (iOS 16.0 bug).
// See: https://github.com/software-mansion/react-native-screens/issues/1570 (comments)
navitem.title = config.title;
Expand All@@ -237,29 +275,43 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ NSArray *headerLeftConfigs = config.headerLeftBarButtonItems ?: @[];
+ NSArray *headerRightConfigs = config.headerRightBarButtonItems ?: @[];
+ NSArray *headerCenterConfigs = config.headerCenterBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewLeftItems = navitem.leftBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewRightItems = navitem.rightBarButtonItems ?: @[];
+ // The key includes the config instance's identity: cached items capture
+ // this config's event emitter in their press handlers, so a remounted
+ // header-config view with value-equal configs must still rebuild — reusing
+ // the old items would dispatch presses into the dead config's emitter.
+ NSArray *headerItemsKey =
+ @[ @((uintptr_t)config), headerLeftConfigs, headerRightConfigs, headerCenterConfigs ];
+ // Retain the config in the key so its address cannot be reused while cached.
+ // Items capture this config's event emitter in their press handlers, so a
+ // remounted header-config view with value-equal configs must still rebuild
+ // instead of dispatching presses into the old config's emitter.
+ // getUIBarButtonItem is stable for the lifetime of its React header
+ // subview. Include those native identities in the key so React-backed
+ // items can use the same cache without reusing a group after its view was
+ // replaced.
+ NSArray *headerItemsKey = @[
+ config,
+ headerLeftConfigs,
+ headerRightConfigs,
+ headerCenterConfigs,
+ subviewLeftItems,
+ subviewRightItems,
+ ];
+ // Rebuilding bar button items creates brand-new native buttons (glass
+ // UIButton custom views on iOS 26). Replacing them while UIKit animates an
+ // existing one (menu capsule morph, push/pop glass transitions) strands the
+ // animation overlay — a stuck expanded capsule or an unmasked square back
+ // button. When the JS configs are unchanged, keep the already-applied items.
+ // Subview-backed items are re-derived every pass, so their presence forces
+ // the rebuild path.
+ BOOL reuseHeaderBarButtonItems = subviewLeftItems.count == 0 && subviewRightItems.count == 0 &&
+ // button. When both the JS configs and React-backed item identities are
+ // unchanged, keep the already-applied item groups. Item groups are only
+ // available from iOS 16, so older platforms keep the legacy rebuild path.
+ BOOL canReuseHeaderBarButtonItems = NO;
+#if !TARGET_OS_TV
+ if (@available(iOS 16.0, *)) {
+ canReuseHeaderBarButtonItems = YES;
+ }
+#endif
+ BOOL reuseHeaderBarButtonItems = canReuseHeaderBarButtonItems &&
+ [objc_getAssociatedObject(navitem, &RNSAppliedHeaderBarButtonConfigsKey) isEqual:headerItemsKey];
+ if (!reuseHeaderBarButtonItems) {
+ NSArray<UIBarButtonItem *> *leftBarButtonItems = [config barButtonItemsFromConfigs:config.headerLeftBarButtonItems
+ withCurrentItems:navitem.leftBarButtonItems
+ withCurrentItems:subviewLeftItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *rightBarButtonItems = [config barButtonItemsFromConfigs:config.headerRightBarButtonItems
+ withCurrentItems:navitem.rightBarButtonItems
+ withCurrentItems:subviewRightItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *centerBarButtonItems = [config barButtonItemsFromConfigs:config.headerCenterBarButtonItems
+ withCurrentItems:@[]
Expand All@@ -271,8 +323,6 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ if (@available(iOS 26.0, *)) {
+ navitem.centerItemGroups = [config barButtonItemGroupsFromItems:centerBarButtonItems];
+ }
+ navitem.leftBarButtonItems = nil;
+ navitem.rightBarButtonItems = nil;
+ } else {
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
Expand All@@ -281,13 +331,10 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
+#endif
+ // Only dict-driven items can be reused: with subview-backed items in the
+ // mix the applied state depends on view identity, so clear the key to
+ // force a rebuild on the next pass.
+ objc_setAssociatedObject(
+ navitem,
+ &RNSAppliedHeaderBarButtonConfigsKey,
+ subviewLeftItems.count == 0 && subviewRightItems.count == 0 ? headerItemsKey : nil,
+ headerItemsKey,
+ OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ }
+ NSDictionary<NSString *, id> *mailSearchToolbarConfig = nil;
Expand DownExpand Up@@ -689,15 +736,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// Setting navigation bar visibility is split to mitigate iOS 26 bug with bar button items
// (setting nav bar visibility should be done after `navitem.*BarButtonItems`).
@@ -773,6 +1259,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -773,6 +1262,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *

- (NSArray<UIBarButtonItem *> *)barButtonItemsFromConfigs:(NSArray<NSDictionary<NSString *, id> *> *)dicts
withCurrentItems:(NSArray<UIBarButtonItem *> *)currentItems
+ navigationItem:(UINavigationItem *)navitem
{
if (dicts.count == 0) {
return currentItems;
@@ -781,7 +1268,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -781,7 +1271,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
[items addObjectsFromArray:currentItems];
for (NSUInteger i = 0; i < dicts.count; i++) {
NSDictionary *dict = dicts[i];
Expand DownExpand Up@@ -896,7 +943,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNSBarButtonItem *item = [[RNSBarButtonItem alloc] initWithConfig:dict
action:^(NSString *buttonId) {
auto eventEmitter = std::static_pointer_cast<const facebook::react::RNSScreenStackHeaderConfigEventEmitter>(
@@ -803,19 +1480,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -803,19 +1483,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
}
imageLoader:_imageLoader];
NSNumber *index = dict[@"index"];
Expand DownExpand Up@@ -926,7 +973,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
[items insertObject:item atIndex:index.integerValue];
} else {
[items addObject:item];
@@ -825,6 +1506,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -825,6 +1509,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
return items;
}

Expand DownExpand Up@@ -974,7 +1021,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNS_IGNORE_SUPER_CALL_BEGIN
- (void)insertReactSubview:(RNSScreenStackHeaderSubview *)subview atIndex:(NSInteger)atIndex
{
@@ -1013,6 +1735,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1013,6 +1738,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
}

_title = RCTNSStringFromStringNilIfEmpty(newScreenProps.title);
Expand All@@ -983,15 +1030,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
if (newScreenProps.titleFontFamily != oldScreenProps.titleFontFamily) {
_titleFontFamily = RCTNSStringFromStringNilIfEmpty(newScreenProps.titleFontFamily);
}
@@ -1038,6 +1762,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1038,6 +1765,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_disableBackButtonMenu = newScreenProps.disableBackButtonMenu;
_backButtonDisplayMode =
[RNSConvert UINavigationItemBackButtonDisplayModeFromCppEquivalent:newScreenProps.backButtonDisplayMode];
+ _navigationItemStyle = navigationItemStyleFromCppEquivalent(newScreenProps.navigationItemStyle);

if (newScreenProps.userInterfaceStyle != oldScreenProps.userInterfaceStyle) {
_userInterfaceStyle = [RNSConvert UIUserInterfaceStyleFromCppEquivalent:newScreenProps.userInterfaceStyle];
@@ -1084,6 +1809,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1084,6 +1812,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_headerRightBarButtonItems = array;
}

Expand Down
14 changes: 7 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
103 changes: 75 additions & 28 deletions patches/react-native-screens@4.25.2.patch
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,45 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// appearance does not apply to the tvOS so we need to use lagacy customization
#if TARGET_OS_TV
@@ -637,10 +675,458 @@ + (void)updateViewController:(UIViewController *)vc
@@ -550,31 +588,25 @@ + (void)updateViewController:(UIViewController *)vc
navitem.titleView = nil;
- navitem.leftBarButtonItems = nil;
- navitem.rightBarButtonItems = nil;
-
+
#if !TARGET_OS_TV
// We want to set navitem.searchController to nil only if we are sure
// that we are removing the search bar from the header.
bool searchBarPresent = false;
#endif /* !TARGET_OS_TV */
-
+
+ NSMutableArray<UIBarButtonItem *> *subviewLeftItems = [NSMutableArray array];
+ NSMutableArray<UIBarButtonItem *> *subviewRightItems = [NSMutableArray array];
for (RNSScreenStackHeaderSubview *subview in config.reactSubviews) {
// This code should be kept in sync on Fabric with analogous switch statement in
// `- [RNSScreenStackHeaderConfig replaceNavigationBarViewsWithSnapshotOfSubview:]` method.
switch (subview.type) {
case RNSScreenStackHeaderSubviewTypeLeft: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.leftBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.leftBarButtonItems = mutableItems;
+ [subviewLeftItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeRight: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.rightBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.rightBarButtonItems = mutableItems;
+ [subviewRightItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeCenter:
case RNSScreenStackHeaderSubviewTypeTitle: {
navitem.titleView = subview;
@@ -637,10 +669,467 @@ + (void)updateViewController:(UIViewController *)vc
// This assignment should be done after `navitem.titleView = ...` assignment (iOS 16.0 bug).
// See: https://github.com/software-mansion/react-native-screens/issues/1570 (comments)
navitem.title = config.title;
Expand All@@ -237,29 +275,43 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ NSArray *headerLeftConfigs = config.headerLeftBarButtonItems ?: @[];
+ NSArray *headerRightConfigs = config.headerRightBarButtonItems ?: @[];
+ NSArray *headerCenterConfigs = config.headerCenterBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewLeftItems = navitem.leftBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewRightItems = navitem.rightBarButtonItems ?: @[];
+ // The key includes the config instance's identity: cached items capture
+ // this config's event emitter in their press handlers, so a remounted
+ // header-config view with value-equal configs must still rebuild — reusing
+ // the old items would dispatch presses into the dead config's emitter.
+ NSArray *headerItemsKey =
+ @[ @((uintptr_t)config), headerLeftConfigs, headerRightConfigs, headerCenterConfigs ];
+ // Retain the config in the key so its address cannot be reused while cached.
+ // Items capture this config's event emitter in their press handlers, so a
+ // remounted header-config view with value-equal configs must still rebuild
+ // instead of dispatching presses into the old config's emitter.
+ // getUIBarButtonItem is stable for the lifetime of its React header
+ // subview. Include those native identities in the key so React-backed
+ // items can use the same cache without reusing a group after its view was
+ // replaced.
+ NSArray *headerItemsKey = @[
+ config,
+ headerLeftConfigs,
+ headerRightConfigs,
+ headerCenterConfigs,
+ subviewLeftItems,
+ subviewRightItems,
+ ];
+ // Rebuilding bar button items creates brand-new native buttons (glass
+ // UIButton custom views on iOS 26). Replacing them while UIKit animates an
+ // existing one (menu capsule morph, push/pop glass transitions) strands the
+ // animation overlay — a stuck expanded capsule or an unmasked square back
+ // button. When the JS configs are unchanged, keep the already-applied items.
+ // Subview-backed items are re-derived every pass, so their presence forces
+ // the rebuild path.
+ BOOL reuseHeaderBarButtonItems = subviewLeftItems.count == 0 && subviewRightItems.count == 0 &&
+ // button. When both the JS configs and React-backed item identities are
+ // unchanged, keep the already-applied item groups. Item groups are only
+ // available from iOS 16, so older platforms keep the legacy rebuild path.
+ BOOL canReuseHeaderBarButtonItems = NO;
+#if !TARGET_OS_TV
+ if (@available(iOS 16.0, *)) {
+ canReuseHeaderBarButtonItems = YES;
+ }
+#endif
+ BOOL reuseHeaderBarButtonItems = canReuseHeaderBarButtonItems &&
+ [objc_getAssociatedObject(navitem, &RNSAppliedHeaderBarButtonConfigsKey) isEqual:headerItemsKey];
+ if (!reuseHeaderBarButtonItems) {
+ NSArray<UIBarButtonItem *> *leftBarButtonItems = [config barButtonItemsFromConfigs:config.headerLeftBarButtonItems
+ withCurrentItems:navitem.leftBarButtonItems
+ withCurrentItems:subviewLeftItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *rightBarButtonItems = [config barButtonItemsFromConfigs:config.headerRightBarButtonItems
+ withCurrentItems:navitem.rightBarButtonItems
+ withCurrentItems:subviewRightItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *centerBarButtonItems = [config barButtonItemsFromConfigs:config.headerCenterBarButtonItems
+ withCurrentItems:@[]
Expand All@@ -271,8 +323,6 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ if (@available(iOS 26.0, *)) {
+ navitem.centerItemGroups = [config barButtonItemGroupsFromItems:centerBarButtonItems];
+ }
+ navitem.leftBarButtonItems = nil;
+ navitem.rightBarButtonItems = nil;
+ } else {
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
Expand All@@ -281,13 +331,10 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
+#endif
+ // Only dict-driven items can be reused: with subview-backed items in the
+ // mix the applied state depends on view identity, so clear the key to
+ // force a rebuild on the next pass.
+ objc_setAssociatedObject(
+ navitem,
+ &RNSAppliedHeaderBarButtonConfigsKey,
+ subviewLeftItems.count == 0 && subviewRightItems.count == 0 ? headerItemsKey : nil,
+ headerItemsKey,
+ OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ }
+ NSDictionary<NSString *, id> *mailSearchToolbarConfig = nil;
Expand DownExpand Up@@ -689,15 +736,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// Setting navigation bar visibility is split to mitigate iOS 26 bug with bar button items
// (setting nav bar visibility should be done after `navitem.*BarButtonItems`).
@@ -773,6 +1259,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -773,6 +1262,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *

- (NSArray<UIBarButtonItem *> *)barButtonItemsFromConfigs:(NSArray<NSDictionary<NSString *, id> *> *)dicts
withCurrentItems:(NSArray<UIBarButtonItem *> *)currentItems
+ navigationItem:(UINavigationItem *)navitem
{
if (dicts.count == 0) {
return currentItems;
@@ -781,7 +1268,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -781,7 +1271,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
[items addObjectsFromArray:currentItems];
for (NSUInteger i = 0; i < dicts.count; i++) {
NSDictionary *dict = dicts[i];
Expand DownExpand Up@@ -896,7 +943,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNSBarButtonItem *item = [[RNSBarButtonItem alloc] initWithConfig:dict
action:^(NSString *buttonId) {
auto eventEmitter = std::static_pointer_cast<const facebook::react::RNSScreenStackHeaderConfigEventEmitter>(
@@ -803,19 +1480,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -803,19 +1483,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
}
imageLoader:_imageLoader];
NSNumber *index = dict[@"index"];
Expand DownExpand Up@@ -926,7 +973,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
[items insertObject:item atIndex:index.integerValue];
} else {
[items addObject:item];
@@ -825,6 +1506,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -825,6 +1509,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
return items;
}

Expand DownExpand Up@@ -974,7 +1021,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNS_IGNORE_SUPER_CALL_BEGIN
- (void)insertReactSubview:(RNSScreenStackHeaderSubview *)subview atIndex:(NSInteger)atIndex
{
@@ -1013,6 +1735,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1013,6 +1738,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
}

_title = RCTNSStringFromStringNilIfEmpty(newScreenProps.title);
Expand All@@ -983,15 +1030,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
if (newScreenProps.titleFontFamily != oldScreenProps.titleFontFamily) {
_titleFontFamily = RCTNSStringFromStringNilIfEmpty(newScreenProps.titleFontFamily);
}
@@ -1038,6 +1762,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1038,6 +1765,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_disableBackButtonMenu = newScreenProps.disableBackButtonMenu;
_backButtonDisplayMode =
[RNSConvert UINavigationItemBackButtonDisplayModeFromCppEquivalent:newScreenProps.backButtonDisplayMode];
+ _navigationItemStyle = navigationItemStyleFromCppEquivalent(newScreenProps.navigationItemStyle);

if (newScreenProps.userInterfaceStyle != oldScreenProps.userInterfaceStyle) {
_userInterfaceStyle = [RNSConvert UIUserInterfaceStyleFromCppEquivalent:newScreenProps.userInterfaceStyle];
@@ -1084,6 +1809,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1084,6 +1812,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_headerRightBarButtonItems = array;
}

Expand Down
14 changes: 7 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
103 changes: 75 additions & 28 deletions patches/react-native-screens@4.25.2.patch
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,7 +226,45 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// appearance does not apply to the tvOS so we need to use lagacy customization
#if TARGET_OS_TV
@@ -637,10 +675,458 @@ + (void)updateViewController:(UIViewController *)vc
@@ -550,31 +588,25 @@ + (void)updateViewController:(UIViewController *)vc
navitem.titleView = nil;
- navitem.leftBarButtonItems = nil;
- navitem.rightBarButtonItems = nil;
-
+
#if !TARGET_OS_TV
// We want to set navitem.searchController to nil only if we are sure
// that we are removing the search bar from the header.
bool searchBarPresent = false;
#endif /* !TARGET_OS_TV */
-
+
+ NSMutableArray<UIBarButtonItem *> *subviewLeftItems = [NSMutableArray array];
+ NSMutableArray<UIBarButtonItem *> *subviewRightItems = [NSMutableArray array];
for (RNSScreenStackHeaderSubview *subview in config.reactSubviews) {
// This code should be kept in sync on Fabric with analogous switch statement in
// `- [RNSScreenStackHeaderConfig replaceNavigationBarViewsWithSnapshotOfSubview:]` method.
switch (subview.type) {
case RNSScreenStackHeaderSubviewTypeLeft: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.leftBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.leftBarButtonItems = mutableItems;
+ [subviewLeftItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeRight: {
- NSArray<UIBarButtonItem *> *currentItems = navitem.rightBarButtonItems ?: @[];
- NSMutableArray<UIBarButtonItem *> *mutableItems = [currentItems mutableCopy];
- [mutableItems addObject:[subview getUIBarButtonItem]];
- navitem.rightBarButtonItems = mutableItems;
+ [subviewRightItems addObject:[subview getUIBarButtonItem]];
break;
}
case RNSScreenStackHeaderSubviewTypeCenter:
case RNSScreenStackHeaderSubviewTypeTitle: {
navitem.titleView = subview;
@@ -637,10 +669,467 @@ + (void)updateViewController:(UIViewController *)vc
// This assignment should be done after `navitem.titleView = ...` assignment (iOS 16.0 bug).
// See: https://github.com/software-mansion/react-native-screens/issues/1570 (comments)
navitem.title = config.title;
Expand All@@ -237,29 +275,43 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ NSArray *headerLeftConfigs = config.headerLeftBarButtonItems ?: @[];
+ NSArray *headerRightConfigs = config.headerRightBarButtonItems ?: @[];
+ NSArray *headerCenterConfigs = config.headerCenterBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewLeftItems = navitem.leftBarButtonItems ?: @[];
+ NSArray<UIBarButtonItem *> *subviewRightItems = navitem.rightBarButtonItems ?: @[];
+ // The key includes the config instance's identity: cached items capture
+ // this config's event emitter in their press handlers, so a remounted
+ // header-config view with value-equal configs must still rebuild — reusing
+ // the old items would dispatch presses into the dead config's emitter.
+ NSArray *headerItemsKey =
+ @[ @((uintptr_t)config), headerLeftConfigs, headerRightConfigs, headerCenterConfigs ];
+ // Retain the config in the key so its address cannot be reused while cached.
+ // Items capture this config's event emitter in their press handlers, so a
+ // remounted header-config view with value-equal configs must still rebuild
+ // instead of dispatching presses into the old config's emitter.
+ // getUIBarButtonItem is stable for the lifetime of its React header
+ // subview. Include those native identities in the key so React-backed
+ // items can use the same cache without reusing a group after its view was
+ // replaced.
+ NSArray *headerItemsKey = @[
+ config,
+ headerLeftConfigs,
+ headerRightConfigs,
+ headerCenterConfigs,
+ subviewLeftItems,
+ subviewRightItems,
+ ];
+ // Rebuilding bar button items creates brand-new native buttons (glass
+ // UIButton custom views on iOS 26). Replacing them while UIKit animates an
+ // existing one (menu capsule morph, push/pop glass transitions) strands the
+ // animation overlay — a stuck expanded capsule or an unmasked square back
+ // button. When the JS configs are unchanged, keep the already-applied items.
+ // Subview-backed items are re-derived every pass, so their presence forces
+ // the rebuild path.
+ BOOL reuseHeaderBarButtonItems = subviewLeftItems.count == 0 && subviewRightItems.count == 0 &&
+ // button. When both the JS configs and React-backed item identities are
+ // unchanged, keep the already-applied item groups. Item groups are only
+ // available from iOS 16, so older platforms keep the legacy rebuild path.
+ BOOL canReuseHeaderBarButtonItems = NO;
+#if !TARGET_OS_TV
+ if (@available(iOS 16.0, *)) {
+ canReuseHeaderBarButtonItems = YES;
+ }
+#endif
+ BOOL reuseHeaderBarButtonItems = canReuseHeaderBarButtonItems &&
+ [objc_getAssociatedObject(navitem, &RNSAppliedHeaderBarButtonConfigsKey) isEqual:headerItemsKey];
+ if (!reuseHeaderBarButtonItems) {
+ NSArray<UIBarButtonItem *> *leftBarButtonItems = [config barButtonItemsFromConfigs:config.headerLeftBarButtonItems
+ withCurrentItems:navitem.leftBarButtonItems
+ withCurrentItems:subviewLeftItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *rightBarButtonItems = [config barButtonItemsFromConfigs:config.headerRightBarButtonItems
+ withCurrentItems:navitem.rightBarButtonItems
+ withCurrentItems:subviewRightItems
+ navigationItem:navitem];
+ NSArray<UIBarButtonItem *> *centerBarButtonItems = [config barButtonItemsFromConfigs:config.headerCenterBarButtonItems
+ withCurrentItems:@[]
Expand All@@ -271,8 +323,6 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ if (@available(iOS 26.0, *)) {
+ navitem.centerItemGroups = [config barButtonItemGroupsFromItems:centerBarButtonItems];
+ }
+ navitem.leftBarButtonItems = nil;
+ navitem.rightBarButtonItems = nil;
+ } else {
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
Expand All@@ -281,13 +331,10 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
+ navitem.leftBarButtonItems = leftBarButtonItems;
+ navitem.rightBarButtonItems = rightBarButtonItems;
+#endif
+ // Only dict-driven items can be reused: with subview-backed items in the
+ // mix the applied state depends on view identity, so clear the key to
+ // force a rebuild on the next pass.
+ objc_setAssociatedObject(
+ navitem,
+ &RNSAppliedHeaderBarButtonConfigsKey,
+ subviewLeftItems.count == 0 && subviewRightItems.count == 0 ? headerItemsKey : nil,
+ headerItemsKey,
+ OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+ }
+ NSDictionary<NSString *, id> *mailSearchToolbarConfig = nil;
Expand DownExpand Up@@ -689,15 +736,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21

// Setting navigation bar visibility is split to mitigate iOS 26 bug with bar button items
// (setting nav bar visibility should be done after `navitem.*BarButtonItems`).
@@ -773,6 +1259,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -773,6 +1262,7 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *

- (NSArray<UIBarButtonItem *> *)barButtonItemsFromConfigs:(NSArray<NSDictionary<NSString *, id> *> *)dicts
withCurrentItems:(NSArray<UIBarButtonItem *> *)currentItems
+ navigationItem:(UINavigationItem *)navitem
{
if (dicts.count == 0) {
return currentItems;
@@ -781,7 +1268,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -781,7 +1271,197 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
[items addObjectsFromArray:currentItems];
for (NSUInteger i = 0; i < dicts.count; i++) {
NSDictionary *dict = dicts[i];
Expand DownExpand Up@@ -896,7 +943,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNSBarButtonItem *item = [[RNSBarButtonItem alloc] initWithConfig:dict
action:^(NSString *buttonId) {
auto eventEmitter = std::static_pointer_cast<const facebook::react::RNSScreenStackHeaderConfigEventEmitter>(
@@ -803,19 +1480,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -803,19 +1483,23 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
}
imageLoader:_imageLoader];
NSNumber *index = dict[@"index"];
Expand DownExpand Up@@ -926,7 +973,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
[items insertObject:item atIndex:index.integerValue];
} else {
[items addObject:item];
@@ -825,6 +1506,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
@@ -825,6 +1509,47 @@ - (void)applySemanticContentAttributeIfNeededToNavCtrl:(UINavigationController *
return items;
}

Expand DownExpand Up@@ -974,7 +1021,7 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
RNS_IGNORE_SUPER_CALL_BEGIN
- (void)insertReactSubview:(RNSScreenStackHeaderSubview *)subview atIndex:(NSInteger)atIndex
{
@@ -1013,6 +1735,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1013,6 +1738,8 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
}

_title = RCTNSStringFromStringNilIfEmpty(newScreenProps.title);
Expand All@@ -983,15 +1030,15 @@ index 5970e3e3a624b9498b8dedfc16831df03a274d0c..5ebff085788d813f1139eb6f9129fb21
if (newScreenProps.titleFontFamily != oldScreenProps.titleFontFamily) {
_titleFontFamily = RCTNSStringFromStringNilIfEmpty(newScreenProps.titleFontFamily);
}
@@ -1038,6 +1762,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1038,6 +1765,7 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_disableBackButtonMenu = newScreenProps.disableBackButtonMenu;
_backButtonDisplayMode =
[RNSConvert UINavigationItemBackButtonDisplayModeFromCppEquivalent:newScreenProps.backButtonDisplayMode];
+ _navigationItemStyle = navigationItemStyleFromCppEquivalent(newScreenProps.navigationItemStyle);

if (newScreenProps.userInterfaceStyle != oldScreenProps.userInterfaceStyle) {
_userInterfaceStyle = [RNSConvert UIUserInterfaceStyleFromCppEquivalent:newScreenProps.userInterfaceStyle];
@@ -1084,6 +1809,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
@@ -1084,6 +1812,30 @@ - (void)updateProps:(react::Props::Shared const &)props oldProps:(react::Props::
_headerRightBarButtonItems = array;
}

Expand Down
14 changes: 7 additions & 7 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading