status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fabric: Using exact UIFontWeight* constants instead of CGFloat 

Summary: SUDDENLY, `-[UIFont systemFontOfSize:weight:]` returns incorrect result if `weight` is not exactly equal to any of built-in constants.

Reviewed By: fkgozali

Differential Revision: D8246712

fbshipit-source-id: 13d59cc8d66a4494437f28d791fd93fa83ebe6fb
This commit is contained in:
Valentin Shergin 2018-06-08 20:16:15 -07:00 committed by Facebook Github Bot
parent 8b62e7a550
commit bb9bf26169
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ReactCommon/fabric/textlayoutmanager/RCTFontUtils.mm
View File

@ -7,6 +7,7 @@
#import "RCTFontUtils.h"
#import <cmath>
#import <mutex>
static RCTFontProperties RCTDefaultFontProperties() {
@ -55,6 +56,25 @@ static NSArray *RCTFontFeatures(RCTFontVariant fontVariant) {
return @[];
}
static UIFontWeight RCTUIFontWeightFromFloat(CGFloat fontWeight) {
// Note: Even if the underlying type of `UIFontWeight` is `CGFloat`
// and UIKit uses the same numerical notation, we have to use exact
// `UIFontWeight*` constants to make it work properly (because
// float values comparison is tricky).
static UIFontWeight weights[] = {
/* ~100 */ UIFontWeightUltraLight,
/* ~200 */ UIFontWeightThin,
/* ~300 */ UIFontWeightLight,
/* ~400 */ UIFontWeightRegular,
/* ~500 */ UIFontWeightMedium,
/* ~600 */ UIFontWeightSemibold,
/* ~700 */ UIFontWeightBold,
/* ~800 */ UIFontWeightHeavy,
/* ~900 */ UIFontWeightBlack
};
return weights[std::llround((fontWeight / 100) - 1)];
}
static UIFont *RCTDefaultFontWithFontProperties(RCTFontProperties fontProperties) {
static NSCache *fontCache;
static std::mutex fontCacheMutex;
@ -72,7 +92,7 @@ static UIFont *RCTDefaultFontWithFontProperties(RCTFontProperties fontProperties
if (!font) {
font = [UIFont systemFontOfSize:fontProperties.size
weight:fontProperties.weight];
weight:RCTUIFontWeightFromFloat(fontProperties.weight)];
if (fontProperties.variant == RCTFontStyleItalic) {
UIFontDescriptor *fontDescriptor = [font fontDescriptor];
@ -114,7 +134,7 @@ UIFont *RCTFontWithFontProperties(RCTFontProperties fontProperties) {
if (!font) {
// Failback to system font.
font = [UIFont systemFontOfSize:effectiveFontSize weight:fontProperties.weight];
font = [UIFont systemFontOfSize:effectiveFontSize weight:RCTUIFontWeightFromFloat(fontProperties.weight)];
}
} else {
// Get the closest font that matches the given weight for the fontFamily