Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(iOS): back button does not respect I18nManager & improve RTL handling in header #2185

Merged
merged 6 commits into from
Jun 27, 2024
+9 −9
Merged

fix(iOS): back button does not respect I18nManager & improve RTL handling in header #2185

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0fba7fa
fix(iOS): backbutton RTL support
alduzy Jun 14, 2024
a2dcafc
targeting only navctr subitems
alduzy Jun 20, 2024
feb4a9b
PoC: improve current solution
kkafar Jun 26, 2024
9a7960f
chore: update comment
alduzy Jun 26, 2024
1a8664d
refactor: change the searchbar direction new way
alduzy Jun 26, 2024
2b3408a
Update ios/RNSScreenStackHeaderConfig.mm
alduzy Jun 27, 2024
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
18 changes: 9 additions & 9 deletions ios/RNSScreenStackHeaderConfig.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,8 +494,17 @@ + (void)updateViewController:(UIViewController *)vc
config.direction == UISemanticContentAttributeForceRightToLeft) &&
// iOS 12 cancels swipe gesture when direction is changed. See #1091
navctr.view.semanticContentAttribute != config.direction) {
// This is needed for swipe back gesture direction
navctr.view.semanticContentAttribute = config.direction;

// This is responsible for the direction of the navigationBar and its contents
navctr.navigationBar.semanticContentAttribute = config.direction;
[[UIButton appearanceWhenContainedInInstancesOfClasses:@[ navctr.navigationBar.class ]]
setSemanticContentAttribute:config.direction];
[[UIView appearanceWhenContainedInInstancesOfClasses:@[ navctr.navigationBar.class ]]
setSemanticContentAttribute:config.direction];
[[UISearchBar appearanceWhenContainedInInstancesOfClasses:@[ navctr.navigationBar.class ]]
setSemanticContentAttribute:config.direction];
}

if (shouldHide) {
Expand Down Expand Up @@ -606,8 +615,6 @@ + (void)updateViewController:(UIViewController *)vc
#endif
}
#if !TARGET_OS_TV
// Workaround for the wrong rotation of back button arrow in RTL mode.
navitem.hidesBackButton = true;
navitem.hidesBackButton = config.hideBackButton;
#endif
navitem.leftBarButtonItem = nil;
Expand Down Expand Up @@ -665,13 +672,6 @@ + (void)updateViewController:(UIViewController *)vc
}
}

dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0), dispatch_get_main_queue(), ^{
// Position the contents in the navigation bar, regarding to the direction.
for (UIView *view in navctr.navigationBar.subviews) {
view.semanticContentAttribute = config.direction;
}
});

// 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 Down
Loading