Skip to content

Align text to the left by default in LTR on iOS #59004

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

Open
YevheniiKotyrlo wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −1
Open

Align text to the left by default in LTR on iOS #59004

Show file tree
Hide file tree
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
25 changes: 25 additions & 0 deletions packages/react-native/React/Tests/Text/RCTAttributedTextUtilsTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,15 @@ static NSTextAlignment NSTextAlignmentFromTextAlign(NSString *textAlign, LayoutD
return paragraphStyle.alignment;
}

static NSParagraphStyle *ParagraphStyleFromLayoutDirection(std::optional<LayoutDirection> layoutDirection)
{
TextAttributes textAttributes;
textAttributes.layoutDirection = layoutDirection;

NSDictionary<NSAttributedStringKey, id> *attributes = RCTNSTextAttributesFromTextAttributes(textAttributes);
return attributes[NSParagraphStyleAttributeName];
}

static UIFont *FontFromSettings(std::optional<std::string> settings, std::optional<FontWeight> weight = std::nullopt)
{
TextAttributes textAttributes;
Expand Down Expand Up @@ -133,6 +142,22 @@ - (void)testTextAlignmentStartAndEndResolveWithLayoutDirection
XCTAssertEqual(NSTextAlignmentFromTextAlign(@"end", LayoutDirection::RightToLeft), NSTextAlignmentLeft);
}

- (void)testUndeclaredTextAlignmentResolvesWithLayoutDirection
{
NSParagraphStyle *leftToRight = ParagraphStyleFromLayoutDirection(LayoutDirection::LeftToRight);
XCTAssertNotNil(leftToRight);
XCTAssertEqual(leftToRight.alignment, NSTextAlignmentLeft);

NSParagraphStyle *rightToLeft = ParagraphStyleFromLayoutDirection(LayoutDirection::RightToLeft);
XCTAssertNotNil(rightToLeft);
XCTAssertEqual(rightToLeft.alignment, NSTextAlignmentRight);
}

- (void)testUndeclaredTextAlignmentWithoutLayoutDirectionStaysNatural
{
XCTAssertNil(ParagraphStyleFromLayoutDirection(std::nullopt));
}

- (void)testSamenessOfEmptyAttributedStrings
{
NSAttributedString *attributedString1 = [[NSAttributedString alloc] initWithString:@""];
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -218,7 +218,7 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];
BOOL isParagraphStyleUsed = NO;
const bool isRTL = textAttributes.layoutDirection == LayoutDirection::RightToLeft;
if (textAttributes.alignment.has_value() || isRTL) {
if (textAttributes.alignment.has_value() || textAttributes.layoutDirection.has_value()) {
TextAlignment textAlignment =
RCTResolveTextAlignment(textAttributes.alignment.value_or(TextAlignment::Natural), isRTL);

Expand Down
Loading