@momo-kits/native-kits 0.167.1-beta.17 → 0.167.1-beta.18

package/ios/Title/Title.swift

@@ -155,7 +155,7 @@ public struct Title: View {
         let fontSize = fontScale(titleFontSize)
         // lineSpacing is added on top of the font's natural line height, not on top of fontSize.
         let lineSpacing = max(0, fontScale(titleLineHeight)
-            - UIFont.systemFont(ofSize: fontSize, weight: uiFontWeight(titleFontWeight)).lineHeight)
+            - UIFont.systemFont(ofSize: fontSize).lineHeight)
 
         return SwiftUI.Text(title)
             .font(.system(size: fontSize, weight: titleFontWeight))

package/ios/Typography/Text.swift

@@ -123,27 +123,13 @@ private func momoFont(size: CGFloat, weight: Font.Weight, family: String) -> Fon
     return .custom(name, fixedSize: size)
 }
 
-// UIFont twin of momoFont(); only used to read the real line height for lineSpacing.
-private func momoUIFont(size: CGFloat, weight: Font.Weight, family: String) -> UIFont {
-    if let name = momoFontName(family: family, weight: weight),
+// lineHeight is identical across weights of a family, so the regular face is enough.
+private func momoLineHeight(size: CGFloat, family: String) -> CGFloat {
+    if let name = momoFontName(family: family, weight: .regular),
        let font = UIFont(name: name, size: size) {
-        return font
-    }
-    return .systemFont(ofSize: size, weight: uiFontWeight(weight))
-}
-
-func uiFontWeight(_ weight: Font.Weight) -> UIFont.Weight {
-    switch weight {
-    case .ultraLight: return .ultraLight
-    case .thin: return .thin
-    case .light: return .light
-    case .medium: return .medium
-    case .semibold: return .semibold
-    case .bold: return .bold
-    case .heavy: return .heavy
-    case .black: return .black
-    default: return .regular
+        return font.lineHeight
     }
+    return UIFont.systemFont(ofSize: size).lineHeight
 }
 
 public struct MomoText: View {
@@ -248,7 +234,7 @@ public struct MomoText: View {
         let fontSize = fontScale(typography.fontSize)
         // lineSpacing is added on top of the font's natural line height, not on top of fontSize.
         let lineSpacing = max(0, fontScale(typography.lineHeight)
-            - momoUIFont(size: fontSize, weight: typography.fontWeight, family: theme.font).lineHeight)
+            - momoLineHeight(size: fontSize, family: theme.font))
 
         var text = baseText
             .font(momoFont(size: fontSize, weight: typography.fontWeight, family: theme.font))

package/ios/native-kits.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKits'
-  s.version          = '0.167.1-beta.17'
+  s.version          = '0.167.1-beta.18'
   s.summary          = 'MoMoUIKits for iOS'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/ios-demo/MoMoUIKitsDemo.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'MoMoUIKitsDemo'
-  s.version          = '0.167.1-beta.17'
+  s.version          = '0.167.1-beta.18'
   s.summary          = 'Demo browser for MoMoUIKits SwiftUI components'
   s.homepage         = 'https://momo.vn'
   s.license          = { :type => 'MIT' }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.167.1-beta.17",
+  "version": "0.167.1-beta.18",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},