Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

[WEEX-132][iOS] support text writing direction from right to left #886

Closed
Closed
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
30 changes: 30 additions & 0 deletions ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ @implementation WXTextComponent
WXTextStyle _fontStyle;
NSUInteger _lines;
NSTextAlignment _textAlign;
NSString *_direction;
WXTextDecoration _textDecoration;
NSString *_textOverflow;
CGFloat _lineHeight;
Expand Down Expand Up @@ -232,6 +233,7 @@ - (void)fillCSSStyles:(NSDictionary *)styles
WX_STYLE_FILL_TEXT(textOverflow, textOverflow, NSString, NO)
WX_STYLE_FILL_TEXT_PIXEL(lineHeight, lineHeight, YES)
WX_STYLE_FILL_TEXT_PIXEL(letterSpacing, letterSpacing, YES)
WX_STYLE_FILL_TEXT(direction, direction, NSString, YES)

UIEdgeInsets padding = {
WXFloorPixelValue(self.cssNode->style.padding[CSS_TOP] + self.cssNode->style.border[CSS_TOP]),
Expand Down Expand Up @@ -438,6 +440,20 @@ - (NSMutableAttributedString *)buildCTAttributeString

NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];

// handle text direction style, default ltr
if ([_direction isEqualToString:@"rtl"]) {
if (0 == _textAlign) {
//force text right-align if don't specified any align.
_textAlign = NSTextAlignmentRight;
}
paragraphStyle.baseWritingDirection = NSWritingDirectionRightToLeft;
} else {
//if you specify NSWritingDirectionNaturalDirection, the receiver resolves the writing
//directionto eitherNSWritingDirectionLeftToRight or NSWritingDirectionRightToLeft,
//depending on the direction for the user’s language preference setting.
paragraphStyle.baseWritingDirection = NSWritingDirectionNatural;
}

if (_textAlign) {
paragraphStyle.alignment = _textAlign;
}
Expand Down Expand Up @@ -513,6 +529,20 @@ - (NSAttributedString *)buildAttributeString

NSMutableParagraphStyle *paragraphStyle = [NSMutableParagraphStyle new];

// handle text direction style, default ltr
if ([_direction isEqualToString:@"rtl"]) {
if (0 == _textAlign) {
//force text right-align if don't specified any align.
_textAlign = NSTextAlignmentRight;
}
paragraphStyle.baseWritingDirection = NSWritingDirectionRightToLeft;
} else {
//if you specify NSWritingDirectionNaturalDirection, the receiver resolves the writing
//directionto eitherNSWritingDirectionLeftToRight or NSWritingDirectionRightToLeft,
//depending on the direction for the user’s language preference setting.
paragraphStyle.baseWritingDirection = NSWritingDirectionNatural;
}

if (_textAlign) {
paragraphStyle.alignment = _textAlign;
}
Expand Down