Skip to content

fix(ios): align text to the right by default in RTL #57634

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

Closed
zoontek wants to merge 1 commit into from
+7 −6
Closed

fix(ios): align text to the right by default in RTL #57634

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions ...textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@

using namespace facebook::react;

inline static TextAlignment RCTResolveTextAlignment(TextAlignment textAlignment, LayoutDirection layoutDirection)
inline static TextAlignment RCTResolveTextAlignment(TextAlignment textAlignment, bool isRTL)
{
const bool isRTL = layoutDirection == LayoutDirection::RightToLeft;
switch (textAlignment) {
case TextAlignment::Natural:
return isRTL ? TextAlignment::Right : TextAlignment::Left;
case TextAlignment::Start:
return isRTL ? TextAlignment::Right : TextAlignment::Left;
case TextAlignment::End:
Expand Down Expand Up @@ -212,10 +213,10 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
// Paragraph Style
NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
BOOL isParagraphStyleUsed = NO;
if (textAttributes.alignment.has_value()) {
TextAlignment textAlignment = RCTResolveTextAlignment(
textAttributes.alignment.value_or(TextAlignment::Natural),
textAttributes.layoutDirection.value_or(LayoutDirection::LeftToRight));
const bool isRTL = textAttributes.layoutDirection == LayoutDirection::RightToLeft;
if (textAttributes.alignment.has_value() || isRTL) {
TextAlignment textAlignment =
RCTResolveTextAlignment(textAttributes.alignment.value_or(TextAlignment::Natural), isRTL);

paragraphStyle.alignment = RCTNSTextAlignmentFromTextAlignment(textAlignment);
isParagraphStyleUsed = YES;
Expand Down
Loading