@momo-kits/native-kits 0.162.2-test.8 → 0.162.2-test.9

package/ios/Typography/Text.swift

@@ -8,8 +8,15 @@ public func scaleSize(_ size: CGFloat, _ scaleRate: CGFloat? = nil) -> CGFloat {
     let maxFontScale: CGFloat = scaleRate ?? 1.5
     let maxDeviceScale: CGFloat = 5
 
-    let deviceWidth = UIScreen.main.bounds.width
-    let deviceScale = deviceWidth / defaultScreenSize
+    // useOSFontScale off -> the user has full control via userScaleRate; skip device-width scaling
+    // entirely and apply only the custom rate (capped at maxFontScale). Mirrors Compose / RN.
+    if !config.useOSFontScale {
+        let customRate = config.userScaleRate ?? 1
+        return customRate > 1 ? min(size * customRate, size * maxFontScale) : size
+    }
+
+    // useOSFontScale on -> device-width scale + OS font scale, take the larger.
+    let deviceScale = UIScreen.main.bounds.width / defaultScreenSize
 
     let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
     let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
@@ -18,16 +25,11 @@ public func scaleSize(_ size: CGFloat, _ scaleRate: CGFloat? = nil) -> CGFloat {
     var fontSizeDeviceScale = size
     var fontSizeOSScale = size
 
-
     if deviceScale > 1 {
         fontSizeDeviceScale = min(fontSizeDeviceScale * deviceScale, fontSizeDeviceScale + maxDeviceScale)
     }
-
-    // useOSFontScale on -> follow OS Dynamic Type; off -> use the user rate (default 1 = no scaling).
-    // Both capped at maxFontScale. Mirrors Compose scaleSize / RN useScaleSize.
-    let appliedRate = config.useOSFontScale ? osFontScale : (config.userScaleRate ?? 1)
-    if appliedRate > 1 {
-        fontSizeOSScale = min(fontSizeOSScale * appliedRate, fontSizeOSScale * maxFontScale)
+    if osFontScale > 1 {
+        fontSizeOSScale = min(fontSizeOSScale * osFontScale, fontSizeOSScale * maxFontScale)
     }
 
     return max(fontSizeDeviceScale, fontSizeOSScale)

package/ios/Typography/Typography.swift

@@ -11,8 +11,16 @@ public extension Font {
         let maxFontScale: CGFloat = 1.5
         let maxDeviceScale: CGFloat = 5
 
-        let deviceWidth = UIScreen.main.bounds.width
-        let deviceScale = deviceWidth / defaultScreenSize
+        // useOSFontScale off -> the user has full control via userScaleRate; skip device-width
+        // scaling entirely and apply only the custom rate (capped at maxFontScale).
+        if !config.useOSFontScale {
+            let customRate = config.userScaleRate ?? 1
+            let scaled = customRate > 1 ? min(size * customRate, size * maxFontScale) : size
+            return Font.system(size: scaled)
+        }
+
+        // useOSFontScale on -> device-width scale, then OS font scale on top (existing behavior).
+        let deviceScale = UIScreen.main.bounds.width / defaultScreenSize
 
         let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
         let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
@@ -23,10 +31,8 @@ public extension Font {
         if deviceScale > 1 {
             fontSize = min(fontSize * deviceScale, fontSize + maxDeviceScale)
         }
-
-        let appliedRate = config.useOSFontScale ? osFontScale : (config.userScaleRate ?? 1)
-        if appliedRate > 1 {
-            fontSize = min(fontSize * appliedRate, fontSize * maxFontScale)
+        if osFontScale > 1 {
+            fontSize = min(fontSize * osFontScale, fontSize * maxFontScale)
         }
 
         return Font.system(size: fontSize)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.2-test.8",
+  "version": "0.162.2-test.9",
   "private": false,
   "dependencies": {},
   "devDependencies": {},