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

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.162.2-test.8-debug"
+        version = "0.162.2-test.9-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/src/commonMain/kotlin/vn/momo/kits/const/Typography.kt

@@ -44,31 +44,28 @@ fun scaleSize(size: Float, userScaleRate: Float? = null): Float {
     // param userScaleRate overrides config; if absent -> config.userScaleRate -> 1f (no scaling)
     val customRate = userScaleRate ?: fontScaleConfig.userScaleRate ?: 1f
 
-    val deviceWidth = getScreenDimensions().width
-    val deviceScale = deviceWidth / DEFAULT_SCREEN_SIZE
+    // Read composables unconditionally (rule of Compose) before branching on the math below.
+    val deviceScale = getScreenDimensions().width / DEFAULT_SCREEN_SIZE
+    val fontScale = LocalDensity.current.fontScale
 
-    val density = LocalDensity.current
-    val fontScale = density.fontScale
+    // useOSFontScale off -> the user has full control via customRate; skip device-width scaling
+    // entirely and apply only the custom rate (capped at MAX_FONT_SCALE).
+    if (!useOSFontScale) {
+        return if (customRate > 1f) min(customRate * size, size * MAX_FONT_SCALE) else size
+    }
 
+    // useOSFontScale on -> device-width scale + OS font scale, take the larger.
     var fontSizeScaleDevice = size
     var fontSizeScaleOS = size
-
     if (deviceScale > 1) {
         fontSizeScaleDevice =
             min(deviceScale * fontSizeScaleDevice, fontSizeScaleDevice + MAX_DEVICE_SCALE)
     }
-
-    // useOSFontScale on -> apply the OS scale, ignore the user's custom rate.
-    // off -> use the user's custom rate. Both hard-capped at MAX_FONT_SCALE (150%).
-    val appliedRate = if (useOSFontScale) fontScale else customRate
-    if (appliedRate > 1f) {
-        fontSizeScaleOS = min(appliedRate * fontSizeScaleOS, fontSizeScaleOS * MAX_FONT_SCALE)
+    if (fontScale > 1f) {
+        fontSizeScaleOS = min(fontScale * fontSizeScaleOS, fontSizeScaleOS * MAX_FONT_SCALE)
     }
 
-    return max(
-        fontSizeScaleDevice,
-        fontSizeScaleOS
-    )
+    return max(fontSizeScaleDevice, fontSizeScaleOS)
 }
 
 @Composable

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.162.2-test.8
+version=0.162.2-test.9
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

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-debug",
+  "version": "0.162.2-test.9-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},