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

Jump to bottom

Vertically center iOS text if lineHeight is set #7603

Closed
wants to merge 5 commits into from
Closed

Vertically center iOS text if lineHeight is set #7603

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4cf9713
Vertically center iOS text if lineHeight is set
tuckerconnelly May 17, 2016
3c2e00e
Merge branch 'facebook/master' into fix-ios-line-height-alignment
tuckerconnelly May 29, 2016
77702c3
Change baseline formatting for PR
tuckerconnelly May 29, 2016
df692d0
Handle unset fontSizes in baseline calculation
tuckerconnelly May 29, 2016
0b50907
Put baseline comment on the right line
tuckerconnelly May 29, 2016
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
8 changes: 8 additions & 0 deletions Libraries/Text/RCTShadowText.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,14 @@ - (void)_setParagraphStyleOnAttributedString:(NSMutableAttributedString *)attrib
CGFloat lineHeight = round(_lineHeight * fontSizeMultiplier);
paragraphStyle.minimumLineHeight = lineHeight;
paragraphStyle.maximumLineHeight = lineHeight;

// vertically center text
CGFloat fontSize = _fontSize && !isnan(_fontSize) ? _fontSize : UIFont.systemFontSize;
fontSize *= fontSizeMultiplier;

[attributedString addAttribute:NSBaselineOffsetAttributeName
value:@(lineHeight/2 - fontSize/2)
range:(NSRange){0, attributedString.length}];
[attributedString addAttribute:NSParagraphStyleAttributeName
value:paragraphStyle
range:(NSRange){0, attributedString.length}];
Expand Down