fix: font style

triniwiz · triniwiz · commit fb942ae22f52 · 2026-06-14T07:07:19.000-04:00
diff --git a/packages/font-manager/font-face.ios.ts b/packages/font-manager/font-face.ios.ts
@@ -233,7 +233,7 @@ export class FontFace {
   }
 
   get style() {
-    return this.native_.fontDescriptors.style;
+    return NSCFontStyleToString(this.native_.fontDescriptors.style);
   }
 
   set style(value: string) {
diff --git a/packages/font-manager/nativescript.config.ts b/packages/font-manager/nativescript.config.ts
@@ -6,7 +6,7 @@ export default {
       {
         name: 'FontManager',
         libs: ['FontManager'],
-        version: '1.0.4',
+        version: '1.0.5',
         repositoryURL: 'https://github.com/NativeScript/font-manager.git',
       },
     ],
diff --git a/packages/font-manager/package.json b/packages/font-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/font-manager",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "A NativeScript plugin for managing fonts",
   "main": "index",
   "types": "index.d.ts",
diff --git a/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontDescriptors.h b/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontDescriptors.h
@@ -7,7 +7,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic) NSCFontWeight weight;
 @property (nonatomic, copy) NSString *family;
-@property (nonatomic, copy) NSString *style;
+@property (nonatomic) NSCFontStyle style;
 @property (nonatomic, copy, nullable) NSString *obliqueAngle;
 @property (nonatomic, copy) NSString *variant;
 @property (nonatomic, copy) NSString *ascentOverride;
diff --git a/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontDescriptors.m b/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontDescriptors.m
@@ -9,7 +9,7 @@ - (instancetype)initWithFamily:(NSString *)family {
     if (self) {
         _weight = NSCFontWeightNormal;
         _family = [family copy];
-        _style = @"normal";
+        _style = NSCFontStyleNormal;
         _obliqueAngle = nil;
         _variant = @"normal";
         _ascentOverride = @"normal";
@@ -169,19 +169,15 @@ - (void)setFontStyleFromString:(NSString *)value {
                          stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
 
     if ([trimmed hasPrefix:@"oblique"]) {
-        _style = @"oblique";
-
-        NSString *rest = [trimmed substringFromIndex:@"oblique".length];
-        rest = [rest stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
-
+        _style = NSCFontStyleOblique;
+        NSString *rest = [[trimmed substringFromIndex:@"oblique".length]
+                          stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
         _obliqueAngle = rest.length > 0 ? rest : @"0deg";
         return;
     }
 
-    if ([trimmed isEqualToString:@"italic"] || [trimmed isEqualToString:@"normal"]) {
-        _style = trimmed;
-        _obliqueAngle = nil;
-    }
+    _style = NSCFontStyleFromString(trimmed);
+    _obliqueAngle = nil;
 }
 
 - (void)setFontDisplayFromString:(NSString *)value {
diff --git a/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontFace.h b/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontFace.h
@@ -1,4 +1,5 @@
 #import <Foundation/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>
 #import "NSCFontTypes.h"
 #import "NSCFontDescriptors.h"
 
@@ -16,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 // Descriptor pass-throughs (mirrors Web FontFace API)
 @property (nonatomic) NSCFontDisplay display;
 @property (nonatomic) NSCFontWeight weight;
-@property (nonatomic, copy) NSString *style;
+@property (nonatomic) NSCFontStyle style;
 @property (nonatomic, copy) NSString *variant;
 @property (nonatomic, copy) NSString *stretch;
 @property (nonatomic, copy) NSString *unicodeRange;
diff --git a/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontFace.m b/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontFace.m
@@ -84,8 +84,8 @@ - (void)setWeight:(NSCFontWeight)weight {
     [self _scheduleReloadIfNeeded];
 }
 
-- (NSString *)style { return self.fontDescriptors.style; }
-- (void)setStyle:(NSString *)style {
+- (NSCFontStyle)style { return self.fontDescriptors.style; }
+- (void)setStyle:(NSCFontStyle)style {
     self.fontDescriptors.style = style;
     [self _scheduleReloadIfNeeded];
 }
diff --git a/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontFaceSet.m b/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontFaceSet.m
@@ -1,7 +1,9 @@
 #import "NSCFontFaceSet.h"
 #import "NSCFontParser.h"
 #import "NSCFontResolver.h"
+#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_MACCATALYST
 #import <UIKit/UIKit.h>
+#endif
 
 @interface NSCFontFaceSet ()
 
@@ -235,7 +237,7 @@ - (BOOL)_isGeneric:(NSString *)family {
         for (NSCFontFace *face in candidates) {
             NSInteger score =
                 labs(face.fontDescriptors.weight - parsed.weight) +
-                ([face.fontDescriptors.style isEqualToString:parsed.style] ? 0 : 1000);
+                (face.fontDescriptors.style == parsed.style ? 0 : 1000);
             if (score < bestScore) { bestScore = score; best = face; }
         }
         if (best) return @[best];
diff --git a/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontParser.h b/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontParser.h
@@ -1,10 +1,11 @@
 #import <Foundation/Foundation.h>
+#import "NSCFontTypes.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface NSCFontParseResult : NSObject
 
-@property (nonatomic, copy) NSString *style;
+@property (nonatomic, assign) NSCFontStyle style;
 @property (nonatomic, assign) NSInteger weight;
 @property (nonatomic, assign) NSInteger sizePx;
 @property (nonatomic, strong, nullable) NSNumber *lineHeight;
diff --git a/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontParser.m b/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontParser.m
@@ -21,7 +21,7 @@ + (nullable NSCFontParseResult *)parse:(NSString *)input {
 
     NSArray<NSString *> *tokens = [self tokenize:input];
 
-    NSString *style = @"normal";
+    NSCFontStyle style = NSCFontStyleNormal;
     NSInteger weight = 400;
     NSInteger size = -1;
     NSNumber *lineHeight = nil;
@@ -40,19 +40,11 @@ + (nullable NSCFontParseResult *)parse:(NSString *)input {
 
         if ([token isEqualToString:@"italic"]) {
 
-            style = @"italic";
+            style = NSCFontStyleItalic;
 
         } else if ([token hasPrefix:@"oblique"]) {
 
-            NSString *angleStr =
-                [[token stringByReplacingOccurrencesOfString:@"oblique"
-                                                 withString:@""]
-                 stringByTrimmingCharactersInSet:
-                    [NSCharacterSet whitespaceCharacterSet]];
-
-            style = angleStr.length == 0
-                ? @"oblique"
-                : [NSString stringWithFormat:@"oblique %@", angleStr];
+            style = NSCFontStyleOblique;
 
         } else if ([token isEqualToString:@"bold"]) {
 
diff --git a/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontResolver.m b/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontResolver.m
@@ -1,6 +1,8 @@
 #import "NSCFontResolver.h"
 #include "NSCFontDescriptors.h"
+#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_MACCATALYST
 #import <UIKit/UIKit.h>
+#endif
 
 static NSDictionary<NSString *, NSString *> *NSCGenericFontFamilies(void) {
     return @{
diff --git a/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontTypes.h b/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontTypes.h
@@ -1,5 +1,7 @@
 #import <Foundation/Foundation.h>
+#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_MACCATALYST
 #import <UIKit/UIKit.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -30,6 +32,16 @@ typedef NS_ENUM(NSInteger, NSCFontFaceStatus) {
     NSCFontFaceStatusError = 3
 };
 
+typedef NS_ENUM(NSInteger, NSCFontStyle) {
+    NSCFontStyleNormal  = 0,
+    NSCFontStyleItalic  = 1,
+    NSCFontStyleOblique = 2,
+};
+
+#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_MACCATALYST
 FOUNDATION_EXPORT UIFontWeight NSCUIFontWeight(NSCFontWeight weight);
+#endif
+FOUNDATION_EXPORT NSCFontStyle NSCFontStyleFromString(NSString *value);
+FOUNDATION_EXPORT NSString    *NSCFontStyleToString(NSCFontStyle style);
 
 NS_ASSUME_NONNULL_END
diff --git a/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontTypes.m b/packages/font-manager/src-native/ios/FontManager/Sources/FontManager/NSCFontTypes.m
@@ -1,32 +1,33 @@
 #import "NSCFontTypes.h"
 
+NSCFontStyle NSCFontStyleFromString(NSString *value) {
+    NSString *trimmed = [value.lowercaseString
+                         stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceCharacterSet];
+    if ([trimmed isEqualToString:@"italic"])          return NSCFontStyleItalic;
+    if ([trimmed hasPrefix:@"oblique"])               return NSCFontStyleOblique;
+    return NSCFontStyleNormal;
+}
+
+NSString *NSCFontStyleToString(NSCFontStyle style) {
+    switch (style) {
+        case NSCFontStyleItalic:  return @"italic";
+        case NSCFontStyleOblique: return @"oblique";
+        case NSCFontStyleNormal:  return @"normal";
+    }
+}
+
+#if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_MACCATALYST
 UIFontWeight NSCUIFontWeight(NSCFontWeight weight) {
     switch (weight) {
-        case NSCFontWeightThin:
-            return UIFontWeightThin;
-
-        case NSCFontWeightExtraLight:
-            return UIFontWeightUltraLight;
-
-        case NSCFontWeightLight:
-            return UIFontWeightLight;
-
-        case NSCFontWeightNormal:
-            return UIFontWeightRegular;
-
-        case NSCFontWeightMedium:
-            return UIFontWeightMedium;
-
-        case NSCFontWeightSemiBold:
-            return UIFontWeightSemibold;
-
-        case NSCFontWeightBold:
-            return UIFontWeightBold;
-
-        case NSCFontWeightExtraBold:
-            return UIFontWeightHeavy;
-
-        case NSCFontWeightBlack:
-            return UIFontWeightBlack;
+        case NSCFontWeightThin:       return UIFontWeightThin;
+        case NSCFontWeightExtraLight: return UIFontWeightUltraLight;
+        case NSCFontWeightLight:      return UIFontWeightLight;
+        case NSCFontWeightNormal:     return UIFontWeightRegular;
+        case NSCFontWeightMedium:     return UIFontWeightMedium;
+        case NSCFontWeightSemiBold:   return UIFontWeightSemibold;
+        case NSCFontWeightBold:       return UIFontWeightBold;
+        case NSCFontWeightExtraBold:  return UIFontWeightHeavy;
+        case NSCFontWeightBlack:      return UIFontWeightBlack;
     }
-}
+}
+#endif
diff --git a/packages/font-manager/typings/objc!NSCFontManager.d.ts b/packages/font-manager/typings/objc!NSCFontManager.d.ts

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ export class FontFace {`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`get style() {`
`236`		`- return this.native_.fontDescriptors.style;`
	`236`	`+ return NSCFontStyleToString(this.native_.fontDescriptors.style);`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`set style(value: string) {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ export default {`
`6`	`6`	`{`
`7`	`7`	`name: 'FontManager',`
`8`	`8`	`libs: ['FontManager'],`
`9`		`- version: '1.0.4',`
	`9`	`+ version: '1.0.5',`
`10`	`10`	`repositoryURL: 'https://github.com/NativeScript/font-manager.git',`
`11`	`11`	`},`
`12`	`12`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@nativescript/font-manager",`
`3`		`- "version": "1.0.4",`
	`3`	`+ "version": "1.0.5",`
`4`	`4`	`"description": "A NativeScript plugin for managing fonts",`
`5`	`5`	`"main": "index",`
`6`	`6`	`"types": "index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ - (void)setWeight:(NSCFontWeight)weight {`
`84`	`84`	`[self _scheduleReloadIfNeeded];`
`85`	`85`	`}`
`86`	`86`
`87`		`-- (NSString *)style { return self.fontDescriptors.style; }`
`88`		`-- (void)setStyle:(NSString *)style {`
	`87`	`+- (NSCFontStyle)style { return self.fontDescriptors.style; }`
	`88`	`+- (void)setStyle:(NSCFontStyle)style {`
`89`	`89`	`self.fontDescriptors.style = style;`
`90`	`90`	`[self _scheduleReloadIfNeeded];`
`91`	`91`	`}`