[Fabric] Add NAN check for text font sizeMultiplier #24966
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
facebook-github-bot
added
the
CLA Signed
shergin
suggested changes
May 20, 2019
| @@ -137,8 +137,8 @@ static UIFontWeight RCTUIFontWeightFromFloat(CGFloat fontWeight) { | |||
| RCTFontProperties defaultFontProperties = RCTDefaultFontProperties(); | |||
| fontProperties = RCTResolveFontProperties(fontProperties); | |||
|
|
|||
| CGFloat effectiveFontSize = | |||
| fontProperties.sizeMultiplier * fontProperties.size; | |||
| CGFloat sizeMultiplier = !isnan(fontProperties.sizeMultiplier) ? fontProperties.sizeMultiplier : 1.0; | |||
There was a problem hiding this comment.
That's not a proper fix of a problem.
We must have an assert(!isnan(fontProperties.sizeMultiplier) here, but not defaulting to 1.0.
Instead, we have to figure out why it's happening (the default text attributes are probably wrong) and fix it there.
facebook-github-bot
approved these changes
May 23, 2019
There was a problem hiding this comment.
@shergin is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
|
This pull request was successfully merged by @zhongwuzw in 3616941. When will my fix make it into a release? | Upcoming Releases |
M-i-k-e-l
pushed a commit
to M-i-k-e-l/react-native
that referenced
this pull request
Mar 10, 2020
Summary: Set `sizeMultiplier` to `1.0` if default value is `NAN`, otherwise, text cannot show properly. ## Changelog [iOS] [Fixed] - Add NAN check for text font sizeMultiplier Pull Request resolved: facebook#24966 Differential Revision: D15466559 Pulled By: shergin fbshipit-source-id: 6f8b47eb8e521cb120d7f351cba02dbf1c5411fd
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Set
sizeMultiplierto1.0if default value isNAN, otherwise, text cannot show properly.Changelog
[iOS] [Fixed] - Add NAN check for text font sizeMultiplier
Test Plan
Code like
<Text style={{fontFamily: 'GillSans-Bold'}}>Hello</Text>, can run properly.