@momo-kits/native-kits 0.162.2-test.5 → 0.162.2-test.6

package/ios/Application/ApplicationEnvironment.swift

@@ -46,5 +46,7 @@ public class ApplicationEnvironment: ObservableObject {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
         self.config = config
+        // Load + observe the host font-scale config into the global store read by scaleSize/appFont.
+        FontScaleStore.shared.bind(composeApi)
     }
 }

package/ios/Application/FontScaleStore.swift

@@ -0,0 +1,77 @@
+//
+//  FontScaleStore.swift
+//  Momo Design System (SwiftUI)
+//
+//  Global font-scale config read by scaleSize/appFont. SwiftUI counterpart of the
+//  Compose LocalFontScaleConfig and the RN ScaleSizeContext. Populated from the host's
+//  `font_scale_config` observer-storage key via the KitComposeApi bridge.
+//
+
+import SwiftUI
+
+public struct FontScaleConfig {
+    public var useOSFontScale: Bool
+    public var userScaleRate: CGFloat?
+
+    public init(useOSFontScale: Bool = false, userScaleRate: CGFloat? = nil) {
+        self.useOSFontScale = useOSFontScale
+        self.userScaleRate = userScaleRate
+    }
+}
+
+/// Single source of truth for the font scale. `scaleSize`/`appFont` read `shared.config`.
+/// Views that want live updates observe this object (e.g. MomoText).
+public final class FontScaleStore: ObservableObject {
+    public static let shared = FontScaleStore()
+
+    @Published public private(set) var config = FontScaleConfig()
+
+    private var didBind = false
+    private var observerId: String?
+
+    private init() {}
+
+    public func update(_ newConfig: FontScaleConfig) {
+        if Thread.isMainThread {
+            config = newConfig
+        } else {
+            DispatchQueue.main.async { [weak self] in self?.config = newConfig }
+        }
+    }
+
+    /// Load the current config + subscribe to live changes through the host MaxApi bridge.
+    /// Safe no-op when no bridge is provided (config stays at default = no scaling).
+    public func bind(_ api: KitComposeApi?) {
+        guard let api = api, !didBind else { return }
+        didBind = true
+
+        // snapshot at mount
+        api.requestCallback(funcName: "getFontScaleConfig", params: nil) { [weak self] response in
+            self?.apply(response)
+        }
+        // live: re-read on every host write to the key
+        observerId = api.request(funcName: "observer", params: ["font_scale_config"]) { [weak self] response in
+            self?.apply(response)
+        }
+    }
+
+    private func apply(_ response: String) {
+        guard let parsed = FontScaleStore.parse(response) else { return }
+        update(parsed)
+    }
+
+    /// Tolerates the MaxApi envelope {"status":..,"response":{..}} as well as a bare config object.
+    static func parse(_ response: String) -> FontScaleConfig? {
+        guard
+            let data = response.data(using: .utf8),
+            let json = (try? JSONSerialization.jsonObject(with: data)) as? [String: Any]
+        else { return nil }
+
+        let obj = (json["response"] as? [String: Any]) ?? (json["data"] as? [String: Any]) ?? json
+        guard obj["useOSFontScale"] != nil || obj["userScaleRate"] != nil else { return nil }
+
+        let useOS = (obj["useOSFontScale"] as? Bool) ?? false
+        let rate = (obj["userScaleRate"] as? NSNumber).map { CGFloat($0.doubleValue) }
+        return FontScaleConfig(useOSFontScale: useOS, userScaleRate: rate)
+    }
+}

package/ios/Typography/Text.swift

@@ -1,6 +1,9 @@
 import SwiftUI
 
 public func scaleSize(_ size: CGFloat, _ scaleRate: CGFloat? = nil) -> CGFloat {
+    // Single source of truth: useOSFontScale + userScaleRate from the host config.
+    // `scaleRate` param keeps its existing meaning: a hard cap override (default 1.5).
+    let config = FontScaleStore.shared.config
     let defaultScreenSize: CGFloat = 375
     let maxFontScale: CGFloat = scaleRate ?? 1.5
     let maxDeviceScale: CGFloat = 5
@@ -10,7 +13,7 @@ public func scaleSize(_ size: CGFloat, _ scaleRate: CGFloat? = nil) -> CGFloat {
 
     let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
     let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
-    let fontScale = scaledFont.pointSize / defaultFont.pointSize
+    let osFontScale = scaledFont.pointSize / defaultFont.pointSize
 
     var fontSizeDeviceScale = size
     var fontSizeOSScale = size
@@ -20,8 +23,11 @@ public func scaleSize(_ size: CGFloat, _ scaleRate: CGFloat? = nil) -> CGFloat {
         fontSizeDeviceScale = min(fontSizeDeviceScale * deviceScale, fontSizeDeviceScale + maxDeviceScale)
     }
 
-    if fontScale > 1 {
-        fontSizeOSScale = min(fontSizeOSScale * fontScale, fontSizeOSScale * maxFontScale)
+    // 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)
     }
 
     return max(fontSizeDeviceScale, fontSizeOSScale)
@@ -118,6 +124,8 @@ public struct MomoText: View {
     private let content: String
     private let typography: TypographyStyle
     private let color: Color
+    // Observe the global store so the text re-renders live when the host changes the config.
+    @ObservedObject private var fontScale = FontScaleStore.shared
 
     public init(
         _ content: String,
@@ -130,6 +138,7 @@ public struct MomoText: View {
     }
 
     public var body: some View {
+        _ = fontScale.config
         let text = SwiftUI.Text(content)
             .font(.system(size: scaleSize(typography.fontSize), weight: typography.fontWeight))
             .foregroundColor(color)

package/ios/Typography/Typography.swift

@@ -2,16 +2,21 @@ import SwiftUI
 
 public extension Font {
     static func appFont(size: CGFloat) -> Font {
+        // Single source of truth: useOSFontScale + userScaleRate from the host config.
+        // NOTE: the static Font.xxx constants below are evaluated once at type load, so they
+        // capture the config at first access. Live updates apply to scaleSize()/MomoText and
+        // any fresh appFont(size:) call, not to the cached static constants.
+        let config = FontScaleStore.shared.config
         let defaultScreenSize: CGFloat = 375
         let maxFontScale: CGFloat = 1.5
         let maxDeviceScale: CGFloat = 5
-        
+
         let deviceWidth = UIScreen.main.bounds.width
         let deviceScale = deviceWidth / defaultScreenSize
-        
+
         let defaultFont = UIFont.systemFont(ofSize: UIFont.labelFontSize)
         let scaledFont = UIFontMetrics.default.scaledFont(for: defaultFont)
-        let fontScale = scaledFont.pointSize / defaultFont.pointSize
+        let osFontScale = scaledFont.pointSize / defaultFont.pointSize
 
         var fontSize = size
 
@@ -19,8 +24,9 @@ public extension Font {
             fontSize = min(fontSize * deviceScale, fontSize + maxDeviceScale)
         }
 
-        if fontScale > 1 {
-            fontSize = min(fontSize * fontScale, fontSize * maxFontScale)
+        let appliedRate = config.useOSFontScale ? osFontScale : (config.userScaleRate ?? 1)
+        if appliedRate > 1 {
+            fontSize = min(fontSize * appliedRate, fontSize * maxFontScale)
         }
 
         return Font.system(size: fontSize)

package/package.json

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