From 8bd66fc2b09a5fb2a8b4b3727fadb7cf8e696879 Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 22 Aug 2016 15:58:29 +0300 Subject: [PATCH] Use RCTFont instead of RCTConvert --- ios/Utils/RCTConvert+RNSVG.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ios/Utils/RCTConvert+RNSVG.m b/ios/Utils/RCTConvert+RNSVG.m index 16c2df70..0d841a69 100644 --- a/ios/Utils/RCTConvert+RNSVG.m +++ b/ios/Utils/RCTConvert+RNSVG.m @@ -14,6 +14,7 @@ #import "RCTLog.h" #import "RNSVGCGFCRule.h" #import "RNSVGVBMOS.h" +#import "RCTFont.h" @implementation RCTConvert (RNSVG) @@ -104,8 +105,9 @@ RCT_ENUM_CONVERTER(RNSVGVBMOS, (@{ if (![[UIFont familyNames] containsObject:fontFamily]) { 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) { return frame; }