Use RCTFont instead of RCTConvert

This commit is contained in:
Dima
2016-08-22 15:58:29 +03:00
committed by GitHub
parent c9a64c44fc
commit 8bd66fc2b0
+4 -2
View File
@@ -14,6 +14,7 @@
#import "RCTLog.h" #import "RCTLog.h"
#import "RNSVGCGFCRule.h" #import "RNSVGCGFCRule.h"
#import "RNSVGVBMOS.h" #import "RNSVGVBMOS.h"
#import "RCTFont.h"
@implementation RCTConvert (RNSVG) @implementation RCTConvert (RNSVG)
@@ -104,8 +105,9 @@ RCT_ENUM_CONVERTER(RNSVGVBMOS, (@{
if (![[UIFont familyNames] containsObject:fontFamily]) { if (![[UIFont familyNames] containsObject:fontFamily]) {
fontFamily = nil; fontFamily = nil;
} }
CTFontRef font = (__bridge CTFontRef)[self UIFont:nil withFamily:fontFamily size:fontDict[@"fontSize"] weight:fontDict[@"fontWeight"] style:fontDict[@"fontStyle"] scaleMultiplier:1.0]; CTFontRef font = (__bridge CTFontRef)[RCTFont updateFont:nil withFamily:fontFamily size:fontDict[@"fontSize"] weight:fontDict[@"fontWeight"] style:fontDict[@"fontStyle"]
variant:nil scaleMultiplier:1.0];
if (!font) { if (!font) {
return frame; return frame;
} }