@momo-kits/native-kits 0.167.1-beta.16-debug → 0.167.1-beta.17-debug

package/CLAUDE.md

@@ -41,9 +41,7 @@ Publishing is automated (`publish.sh` + GitLab CI on `[ci build]` / `main`). Do
 
 - **Entry point:** wrap content in `NavigationContainer(...)` from `navigation/`. It builds the `Navigator`, takes a host-supplied `Localize` (falls back to an empty one), and provides the CompositionLocals below. **Do not use** `ApplicationContainer` (`application/NavigationContainer.kt`) — deprecated and does **not** wire `LocalLocalize` / `LocalNavigator` / `LocalMaxApi`.
 - **Configuration flows via CompositionLocals**, not params. Public ones: `AppTheme`, `AppStatusBar`, `AppNavigationBar` (`const/Theme.kt`); `ApplicationContext`, `AppConfig`, `AppLanguage`, `LocalLocalize` (`application/`); `LocalNavigator`, `LocalMaxApi` (`navigation/`). Read with `X.current`.
-- **`DesignSystemKits`** (`application/DesignSystemKits.kt`) is the single app-wide holder for the host-owned design-system inputs: font scale (`userScaleRate` / `useOSScaleRate`), whitelist (`isWhiteList`) and the remote `DesignSystemConfig`, bundled as `DesignSystemKitsConfigs`. The host calls `DesignSystemKits.init(source)` once at startup with its `DesignSystemKitsSource` (sync `getConfigs()` seed + `configsFlow`); `init` is idempotent. Without a source, call `setConfigs(...)` directly. Read with `getConfigs()` (snapshot state, recomposes); non-Compose observers use `configsFlow`.
-- **SwiftUI twin:** `ios/Application/DesignSystemKits.swift` mirrors it field for field (`DesignSystemKitsConfigs` with `designSystemConfig: KitConfig?`, `setConfigs` / `getConfigs`), plus the OS Dynamic Type factor (`osFontScale`). There is no `init(source:)` (Swift reserves `init`): the host observes its own bridge and pushes. A host that can't share Swift types (the KMP bridge) calls `DesignSystemKits.shared.setConfigs(json:)` (`ios/Application/DesignSystemKitsPayload.swift`); the JSON field names are a contract with momo-app's serializer (`HostDesignSystemKits.observeConfigsJson`, payload classes in `DesignSystemData.kt`) — change both together. Invalid JSON is ignored. The SwiftUI kit can't link the Kotlin `kits` framework (a second Kotlin/Native runtime would hold a second, never-initialized singleton), so the render-time logic — `FontScale` formula, Dynamic Type observation — is intentionally duplicated in Swift; only values flow across.
-- **Design-system config** (`trustBanner`, `headerBar`, `headerGradient`): `NavigationContainer` provides it as `LocalDesignSystemConfig` (param `designSystemConfig` → parent → `DesignSystemKits`) and applies `headerBar` as the header image when the theme has none.
+- **Design-system config** (`trustBanner`, `headerBar`, `headerGradient`): the host seeds `KitDesignSystemConfig.update(...)` once (same pattern as `KitFontScale`); `NavigationContainer` provides it as `LocalDesignSystemConfig` (param `designSystemConfig` → parent → global) and applies `headerBar` as the header image when the theme has none.
 - **Platform code** goes through `expect`/`actual` in `platform/` — never reference Android/iOS APIs from `commonMain` directly.
 - **Native bridge:** `IMaxApi` (`vn.momo.maxapi`, exposed as `LocalMaxApi`) is the host-app bridge (dismiss, tracking, device info, language).
 - Navigation uses a runtime `DynamicScreenRegistry`; overlays (modal/bottom-sheet/snackbar) go through `Navigator` + `OverplayComponentRegistry`.
@@ -71,9 +69,9 @@ The SwiftUI port differs from Compose in one important way: **it follows the hos
 
 One formula, both platforms: the device-width scale (`width / 375`, capped at `+5pt`) and the OS Dynamic Type scale (capped at `1.5×`) are computed independently and the **larger wins**. When `useOSScaleRate` is false neither applies — the size is just multiplied by `userScaleRate`. Max font scale is fixed at 1.5; the old per-call/per-scope override is deprecated and ignored on both sides.
 
-- **Compose** — `const/Typography.kt` (`scaleSize` overloads for `Float`/`Dp`/`TextUnit`/`TextStyle`). The `TextUnit` overload divides by `density.fontScale` so Compose's own `sp` scaling isn't applied twice. Inputs: `LocalContext.current` (`MiniAppContext.userScaleRate` / `useOSScaleRate`, per-field) falling back to `DesignSystemKits.getConfigs()`. On iOS, `platform/OsFontScale.ios.kt` observes `UIContentSizeCategoryDidChangeNotification` and overrides `LocalDensity` — Compose MP otherwise reads `fontScale` once at `ComposeUIViewController` creation. Wired at `NavigationContainer`.
-- **SwiftUI** — `ios/Typography/FontScale.swift`. `FontScale` is an immutable snapshot with `callAsFunction`, so a view reads `@Environment(\.momoFontScale) private var fontScale` and calls `fontScale(16)`. `DesignSystemKits.shared` is the `ObservableObject` holding the host inputs and the OS factor (it observes `UIContentSizeCategory.didChangeNotification`); the host pushes them with `setConfigs(_:)`.
-- **Never set `\.momoFontScale` directly** — same trap as `\.localize`. Inject via `.momoFontScale(_:context:)`, which holds `DesignSystemKits` as `@ObservedObject`; that is what re-publishes the snapshot. It also injects `\.designSystemKitsConfigs`, which `MomoText` (whitelist font) and `TrustBanner` (fallback after `ApplicationEnvironment.config`) read so a host push re-renders them. `NavigationContainer` does it (passing `MiniAppContext` so the per-mini-app override applies); a bare `UIHostingController` root must too. The environment default reads the live store, so an un-injected subtree still gets correct values — just not live ones.
+- **Compose** — `const/Typography.kt` (`scaleSize` overloads for `Float`/`Dp`/`TextUnit`/`TextStyle`). The `TextUnit` overload divides by `density.fontScale` so Compose's own `sp` scaling isn't applied twice. Inputs: `LocalContext.current` (`MiniAppContext.userScaleRate` / `useOSScaleRate`, per-field) falling back to the `KitFontScale` global. On iOS, `platform/OsFontScale.ios.kt` observes `UIContentSizeCategoryDidChangeNotification` and overrides `LocalDensity` — Compose MP otherwise reads `fontScale` once at `ComposeUIViewController` creation. Wired at `NavigationContainer`.
+- **SwiftUI** — `ios/Typography/FontScale.swift`. `FontScale` is an immutable snapshot with `callAsFunction`, so a view reads `@Environment(\.momoFontScale) private var fontScale` and calls `fontScale(16)`. `FontScaleStore.shared` is the `ObservableObject` holding both inputs and the OS factor (it observes `UIContentSizeCategory.didChangeNotification`); the host pushes its preference with `update(userScaleRate:useOSScaleRate:)`.
+- **Never set `\.momoFontScale` directly** — same trap as `\.localize`. Inject via `.momoFontScale(_:context:)`, which holds the store as `@ObservedObject`; that is what re-publishes the snapshot. `NavigationContainer` does it (passing `MiniAppContext` so the per-mini-app override applies); a bare `UIHostingController` root must too. The environment default reads the live store, so an un-injected subtree still gets correct values — just not live ones.
 - The global `scaleSize(_:)` and `Font.appFont(size:)` remain for call sites that can't read the environment (UIKit bridges, free functions). They are **not** reactive. `Font.header_default_bold` & friends are computed `static var`s for the same reason — as stored `static let`s they froze the scale at first access. `UIViewRepresentable`s should read `context.environment.momoFontScale` instead, and re-apply the font in `updateUIView`, not only in `makeUIView`.
 
 ## Code conventions

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.167.1-beta.16-debug"
+        version = "0.167.1-beta.17-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.167.1-beta.16-debug'
+    spec.version                  = '0.167.1-beta.17-debug'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/compose/src/commonMain/kotlin/vn/momo/kits/application/Context.kt

@@ -1,6 +1,9 @@
 package vn.momo.kits.application
 
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
 import vn.momo.kits.components.TrustBannerData
 
@@ -16,6 +19,17 @@ data class DesignSystemConfig(
     val headerGradient: String? = null,
 )
 
+// App-wide holder seeded by the host (same pattern as KitFontScale), so direct NavigationContainer
+// callers get the config without passing it. Snapshot state: a config fetched after first frame recomposes.
+object KitDesignSystemConfig {
+    var config by mutableStateOf<DesignSystemConfig?>(null)
+        private set
+
+    fun update(config: DesignSystemConfig?) {
+        this.config = config
+    }
+}
+
 @Immutable
 data class MiniAppContext(
     val appIcon: String = "",

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

@@ -0,0 +1,18 @@
+package vn.momo.kits.const
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+
+// Design-system rollout holder, same shape as KitFontScale: the kit is sandboxed and can't read the
+// host config, so the host seeds this once at startup from DesignSystemConfig. getFontFamily() reads
+// it to decide whether the new default font applies, so every screen follows the flag with no prop
+// threading. Backed by snapshot state: writes recompose text automatically.
+object KitDesignSystem {
+    var isWhiteList by mutableStateOf(false)
+        private set
+
+    fun update(isWhiteList: Boolean) {
+        this.isWhiteList = isWhiteList
+    }
+}

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

@@ -0,0 +1,22 @@
+package vn.momo.kits.const
+
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+
+// App-wide font-scale holder. The kit is sandboxed and can't read the host cache directly, so the
+// host (which sees both core and this kit) seeds this once at startup and pushes runtime updates into
+// it. scaleSize() reads it as the fallback, so every screen — including direct NavigationContainer
+// screens with no host-pushed MiniAppContext — scales with no per-render prop and no async flicker.
+// Backed by snapshot state: writes recompose text automatically.
+object KitFontScale {
+    var userScaleRate by mutableStateOf(1f)
+        private set
+    var useOSScaleRate by mutableStateOf(true)
+        private set
+
+    fun update(userScaleRate: Float, useOSScaleRate: Boolean) {
+        this.userScaleRate = userScaleRate
+        this.useOSScaleRate = useOSScaleRate
+    }
+}

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

@@ -8,7 +8,6 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.*
-import vn.momo.kits.application.DesignSystemKits
 import vn.momo.kits.application.LocalContext
 import vn.momo.kits.platform.getScreenDimensions
 import kotlin.math.max
@@ -21,9 +20,10 @@ const val MAX_DEVICE_SCALE = 5
 @Composable
 fun scaleSize(size: Float): Float {
     val context = LocalContext.current
-    val useOsScale = context?.useOSScaleRate ?: DesignSystemKits.getConfigs().useOSScaleRate
+    // Host-pushed context wins; otherwise fall back to the app-wide KitFontScale holder.
+    val useOsScale = context?.useOSScaleRate ?: KitFontScale.useOSScaleRate
     if (!useOsScale) {
-        return size * (context?.userScaleRate ?: DesignSystemKits.getConfigs().userScaleRate)
+        return size * (context?.userScaleRate ?: KitFontScale.userScaleRate)
     }
     val scaleSizeMaxRate: Float = MAX_FONT_SCALE
     val deviceWidth = getScreenDimensions().width
@@ -83,6 +83,12 @@ fun scaleSize(textStyle: TextStyle): TextStyle {
 }
 
 
+/**
+ * Tên file font trong tài nguyên native của app host (xem [hostFontFamily]).
+ *
+ * SDK không đóng gói font riêng nữa: app host đã bundle sẵn toàn bộ font từ `font-source`
+ * cho cả React Native lẫn native, nên bản copy trong `composeResources` chỉ làm phình app.
+ */
 private const val LEGACY_DEFAULT_FONT_FILE = "SFProText-Regular.ttf"
 private const val NEW_DEFAULT_FONT_FILE = "MomoTrustSans-Regular.ttf"
 
@@ -118,11 +124,11 @@ private const val NEW_DEFAULT_FONT_FAMILY = "MomoTrustSans"
 private const val LEGACY_DEFAULT_FONT_FAMILY = "SFProText"
 
 internal val defaultFontFamily: String
-    get() = if (DesignSystemKits.getConfigs().isWhiteList) NEW_DEFAULT_FONT_FAMILY else LEGACY_DEFAULT_FONT_FAMILY
+    get() = if (KitDesignSystem.isWhiteList) NEW_DEFAULT_FONT_FAMILY else LEGACY_DEFAULT_FONT_FAMILY
 
 @Composable
 fun getFontFamily(fontFamily: String, fontWeight: FontWeight? = FontWeight.Normal): FontFamily {
-    val isWhiteList = DesignSystemKits.getConfigs().isWhiteList
+    val isWhiteList = KitDesignSystem.isWhiteList
     val defaultFile = if (isWhiteList) NEW_DEFAULT_FONT_FILE else LEGACY_DEFAULT_FONT_FILE
     val key = "$fontFamily-${fontWeight?.weight}"
     val fileName = hostFontFiles[key] ?: defaultFile

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/NavigationContainer.kt

@@ -20,7 +20,7 @@ import androidx.navigation.toRoute
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collectLatest
 import vn.momo.kits.application.DesignSystemConfig
-import vn.momo.kits.application.DesignSystemKits
+import vn.momo.kits.application.KitDesignSystemConfig
 import vn.momo.kits.application.LocalContext
 import vn.momo.kits.application.LocalDesignSystemConfig
 import vn.momo.kits.application.LocalLocalize
@@ -63,7 +63,7 @@ fun NavigationContainer(
     val stackTransition = remember { StackTransitionCoordinator() }
     val theme = remember { mutableStateOf(initialTheme) }
     val resolvedDesignSystemConfig =
-        designSystemConfig ?: LocalDesignSystemConfig.current ?: DesignSystemKits.getConfigs().designSystemConfig
+        designSystemConfig ?: LocalDesignSystemConfig.current ?: KitDesignSystemConfig.config
     val headerBar = resolvedDesignSystemConfig?.headerBar
     // RN parity: the theme's own header image wins; config headerBar is only the fallback.
     val resolvedTheme = remember(theme.value, headerBar) {

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/component/HeaderTitle.kt

@@ -8,13 +8,13 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.zIndex
-import vn.momo.kits.application.DesignSystemKits
 import vn.momo.kits.components.Text
+import vn.momo.kits.const.KitDesignSystem
 import vn.momo.kits.const.Typography
 import vn.momo.kits.modifier.setAutomationId
 
 internal val headerFontFamily: String?
-    get() = if (DesignSystemKits.getConfigs().isWhiteList) "MoMoTrustDisplay" else null
+    get() = if (KitDesignSystem.isWhiteList) "MoMoTrustDisplay" else null
 
 @Composable
 internal fun HeaderTitle(

package/gradle.properties

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

package/ios/Application/ApplicationEnvironment.swift

@@ -17,8 +17,8 @@ public class MiniAppContext {
     public var toolkitConfig: [String: Any] = [:]
     public var providerId: String = "momo"
     public var permissions: [[String: Any]] = []
-    // Per-mini-app font-scale override; nil falls back to DesignSystemKits. Mirrors Compose's
-    // MiniAppContext.userScaleRate / useOSScaleRate, which win per field over DesignSystemKits.
+    // Per-mini-app font-scale override; nil falls back to FontScaleStore. Mirrors Compose's
+    // MiniAppContext.userScaleRate / useOSScaleRate, which win per field over KitFontScale.
     public var userScaleRate: CGFloat? = nil
     public var useOSScaleRate: Bool? = nil
 
@@ -37,17 +37,10 @@ public class MiniAppContext {
     }
 }
 
-// Value type so DesignSystemKitsConfigs can dedupe host pushes; mirrors Compose's DesignSystemConfig.
-public struct KitConfig: Equatable {
-    public var trustBanner: TrustBannerData?
-    public var headerBar: String?
-    public var headerGradient: String?
-
-    public init(trustBanner: TrustBannerData? = nil, headerBar: String? = nil, headerGradient: String? = nil) {
-        self.trustBanner = trustBanner
-        self.headerBar = headerBar
-        self.headerGradient = headerGradient
-    }
+public class KitConfig {
+    public var trustBanner: TrustBannerData? = nil
+    public var headerBar: String? = nil
+    public var headerGradient: String? = nil
 }
 
 public class ApplicationEnvironment: ObservableObject {

package/ios/Template/TrustBanner/TrustBanner.swift

@@ -11,7 +11,7 @@ import SDWebImageSwiftUI
 
 let jsonUrl = "https://static.momocdn.net/app/json/component-kits/design_system.json"
 
-public struct TrustBannerData: Decodable, Equatable {
+public struct TrustBannerData: Decodable {
     let content: [String: String]
     let subContent: [String: String]
     let pciImage: String
@@ -50,41 +50,9 @@ let defaultBanner = TrustBannerData(
     momoImage: "https://static.momocdn.net/app/img/kits/trustBanner/ic_secu.png"
 )
 
-// AI-GENERATED START: public init so the host can push its remote trust banner config
-public extension TrustBannerData {
-    /// Missing images / url fall back to the kit's default banner, like the view does per field.
-    init(
-        content: [String: String],
-        subContent: [String: String],
-        pciImage: String?,
-        sslImage: String?,
-        urlConfig: String?,
-        icons: [String]?,
-        momoImage: String?
-    ) {
-        self.init(
-            content: content,
-            subContent: subContent,
-            pciImage: pciImage ?? defaultBanner.pciImage,
-            sslImage: sslImage ?? defaultBanner.sslImage,
-            urlConfig: urlConfig ?? defaultBanner.urlConfig,
-            icons: icons ?? defaultBanner.icons,
-            momoImage: momoImage ?? defaultBanner.momoImage
-        )
-    }
-}
-// AI-GENERATED END: public init so the host can push its remote trust banner config
-
 public struct TrustBanner: View {
     @Environment(\.applicationEnvironment) var applicationEnvironment
     @Environment(\.localize) private var localize
-    // AI-GENERATED START: container config wins, else the host-pushed DesignSystemKits config (Compose parity)
-    @Environment(\.designSystemKitsConfigs) private var designSystemKitsConfigs
-
-    private var trustBanner: TrustBannerData? {
-        (applicationEnvironment.config ?? designSystemKitsConfigs.designSystemConfig)?.trustBanner
-    }
-    // AI-GENERATED END: container config wins, else the host-pushed DesignSystemKits config (Compose parity)
 
     var onPress: ((String)->Void)?
 
@@ -94,19 +62,19 @@ public struct TrustBanner: View {
 
     func onPressSecurity() {
         if (onPress != nil) {
-            onPress!(trustBanner?.urlConfig ?? defaultBanner.urlConfig)
+            onPress!(applicationEnvironment.config?.trustBanner?.urlConfig ?? defaultBanner.urlConfig)
         }
     }
     
     
     public var body: some View {
         HStack(alignment: .center, spacing: 8) {
-            WebImage(url: URL(string: trustBanner?.momoImage ?? defaultBanner.momoImage))
+            WebImage(url: URL(string: applicationEnvironment.config?.trustBanner?.momoImage ?? defaultBanner.momoImage))
                 .resizable()
                 .scaledToFit()
                 .frame(width: 64, height: 64)
             VStack(alignment: .leading){
-                Text(trustBanner?.content[localize.currentLanguage]
+                Text(applicationEnvironment.config?.trustBanner?.content[localize.currentLanguage]
                      ?? localize.translateData(defaultBanner.content))
                     .foregroundColor(Color(hex: "484848"))
                     .lineLimit(2)
@@ -116,7 +84,7 @@ public struct TrustBanner: View {
                     .padding(.bottom, 8)
                 HStack {
                     HStack(spacing: 0) {
-                        Text(trustBanner?.subContent[localize.currentLanguage]
+                        Text(applicationEnvironment.config?.trustBanner?.subContent[localize.currentLanguage]
                              ?? localize.translateData(defaultBanner.subContent))
                             .foregroundColor(Colors.pink03)
                             .font(.system(size: 13, weight: .bold))
@@ -130,11 +98,11 @@ public struct TrustBanner: View {
                     
                     Spacer()
                     HStack{
-                        WebImage(url:  URL(string: trustBanner?.pciImage ?? defaultBanner.pciImage))
+                        WebImage(url:  URL(string: applicationEnvironment.config?.trustBanner?.pciImage ?? defaultBanner.pciImage))
                             .resizable()
                             .scaledToFit()
                             .frame(width: 24, height: 20)
-                        WebImage(url:  URL(string: trustBanner?.sslImage ?? defaultBanner.sslImage))
+                        WebImage(url:  URL(string: applicationEnvironment.config?.trustBanner?.sslImage ?? defaultBanner.sslImage))
                             .resizable()
                             .scaledToFit()
                             .frame(width: 52, height: 20)

package/ios/Title/Title.swift

@@ -152,11 +152,16 @@ public struct Title: View {
     }
 
     private var titleText: some View {
-        SwiftUI.Text(title)
-            .font(.system(size: fontScale(titleFontSize), weight: titleFontWeight))
+        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)
+
+        return SwiftUI.Text(title)
+            .font(.system(size: fontSize, weight: titleFontWeight))
             .ignoreBoldTextSetting()
             .foregroundColor(theme.colors.text.default)
-            .lineSpacing(fontScale(titleLineHeight) - fontScale(titleFontSize))
+            .lineSpacing(lineSpacing)
             .lineLimit(titleMaxLines)
             .truncationMode(.tail)
     }

package/ios/Typography/FontScale.swift

@@ -52,7 +52,7 @@ public struct FontScale: Equatable {
     }
 
     /// A host-pushed mini-app context wins per field, matching Compose's
-    /// `context?.useOSScaleRate ?: DesignSystemKits.getConfigs().useOSScaleRate`.
+    /// `context?.useOSScaleRate ?: KitFontScale.useOSScaleRate`.
     public func overriding(userScaleRate: CGFloat?, useOSScaleRate: Bool?) -> FontScale {
         guard userScaleRate != nil || useOSScaleRate != nil else { return self }
         return FontScale(
@@ -66,7 +66,7 @@ public struct FontScale: Equatable {
 private struct FontScaleKey: EnvironmentKey {
     /// Computed, never stored: a bare `UIHostingController` root that never got `.momoFontScale()`
     /// still reads the live store instead of a value frozen at first access.
-    static var defaultValue: FontScale { DesignSystemKits.shared.fontScale }
+    static var defaultValue: FontScale { FontScaleStore.shared.snapshot }
 }
 
 public extension EnvironmentValues {
@@ -77,10 +77,9 @@ public extension EnvironmentValues {
 }
 
 public extension View {
-    /// Injects a Dynamic-Type-observing font scale plus `\.designSystemKitsConfigs` (whitelist, remote config)
-    /// and re-renders this subtree on change.
+    /// Injects a Dynamic-Type-observing font scale and re-renders this subtree on change.
     /// Use at every `UIHostingController` root that is not inside a `NavigationContainer`.
-    func momoFontScale(_ store: DesignSystemKits = .shared, context: MiniAppContext? = nil) -> some View {
+    func momoFontScale(_ store: FontScaleStore = .shared, context: MiniAppContext? = nil) -> some View {
         modifier(MomoFontScaleModifier(store: store, context: context))
     }
 }
@@ -88,19 +87,17 @@ public extension View {
 /// `@ObservedObject` is load-bearing, same as `MomoLocalizeModifier`: `@Environment(\.momoFontScale)`
 /// only invalidates when the boxed snapshot changes, which requires *this* body to re-run on publish.
 private struct MomoFontScaleModifier: ViewModifier {
-    @ObservedObject var store: DesignSystemKits
+    @ObservedObject var store: FontScaleStore
     let context: MiniAppContext?
 
     func body(content: Content) -> some View {
-        content
-            .environment(
-                \.momoFontScale,
-                store.fontScale.overriding(
-                    userScaleRate: context?.userScaleRate,
-                    useOSScaleRate: context?.useOSScaleRate
-                )
+        content.environment(
+            \.momoFontScale,
+            store.snapshot.overriding(
+                userScaleRate: context?.userScaleRate,
+                useOSScaleRate: context?.useOSScaleRate
             )
-            .environment(\.designSystemKitsConfigs, store.getConfigs())
+        )
     }
 }
 // AI-GENERATED END: reactive font-scale snapshot injected through the environment

package/ios/Typography/FontScaleStore.swift

@@ -0,0 +1,58 @@
+import SwiftUI
+
+/// App-wide font-scale inputs for the SwiftUI kit, and the single place they publish from.
+/// The host writes `update(...)` at startup (from the cache-backed `FontScaleProvider`) and again
+/// whenever the in-app font-size preference changes; the OS Dynamic Type factor is tracked here.
+/// Mirrors Compose's `KitFontScale` + `ProvideOsFontScale` pair, including its live behaviour —
+/// views re-render on change as long as the subtree got `.momoFontScale()` (`NavigationContainer`
+/// applies it). When `useOSScaleRate` is false the kit applies `userScaleRate` instead of the OS factor.
+public final class FontScaleStore: ObservableObject {
+    public static let shared = FontScaleStore()
+
+    @Published public private(set) var userScaleRate: CGFloat = 1
+    @Published public private(set) var useOSScaleRate: Bool = true
+    @Published public private(set) var osFontScale: CGFloat = FontScaleStore.currentOsFontScale()
+
+    private init() {
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(contentSizeCategoryDidChange),
+            name: UIContentSizeCategory.didChangeNotification,
+            object: nil
+        )
+    }
+
+    public var snapshot: FontScale {
+        FontScale(
+            userScaleRate: userScaleRate,
+            useOSScaleRate: useOSScaleRate,
+            osFontScale: osFontScale
+        )
+    }
+
+    public func update(userScaleRate: CGFloat, useOSScaleRate: Bool) {
+        onMain {
+            // Re-assigning an unchanged value would still publish and invalidate every kit subtree.
+            if self.userScaleRate != userScaleRate { self.userScaleRate = userScaleRate }
+            if self.useOSScaleRate != useOSScaleRate { self.useOSScaleRate = useOSScaleRate }
+        }
+    }
+
+    @objc private func contentSizeCategoryDidChange() {
+        let next = Self.currentOsFontScale()
+        guard next != osFontScale else { return }
+        osFontScale = next
+    }
+
+    /// Same factor Compose's iOS `ProvideOsFontScale` derives from
+    /// `UIFont.preferredFont(forTextStyle: .body).pointSize / 17`, so both iOS surfaces scale alike.
+    static func currentOsFontScale() -> CGFloat {
+        let base = UIFont.systemFont(ofSize: UIFont.labelFontSize)
+        return UIFontMetrics.default.scaledFont(for: base).pointSize / base.pointSize
+    }
+
+    /// Synchronous when already on main — an async hop would defer the change by a frame.
+    private func onMain(_ work: @escaping () -> Void) {
+        if Thread.isMainThread { work() } else { DispatchQueue.main.async(execute: work) }
+    }
+}

package/ios/Typography/KitDesignSystem.swift

@@ -0,0 +1,17 @@
+import Foundation
+
+/// Design-system rollout flag for the SwiftUI kit, mirroring Compose's `KitDesignSystem`.
+/// The kit is sandboxed and can't read the host config, so the host writes `update(_:)` once at
+/// startup from `DesignSystemConfig`. Startup-only and non-reactive, like `FontScaleStore` was
+/// before it gained live updates: there is no SwiftUI navigation container to re-render from.
+public final class KitDesignSystem {
+    public static let shared = KitDesignSystem()
+
+    public private(set) var isWhiteList: Bool = false
+
+    private init() {}
+
+    public func update(isWhiteList: Bool) {
+        self.isWhiteList = isWhiteList
+    }
+}

package/ios/Typography/Text.swift

@@ -4,7 +4,7 @@ import SwiftUI
 /// free functions). Inside a SwiftUI view prefer `@Environment(\.momoFontScale)` so the view
 /// re-renders when Dynamic Type or the host preference changes.
 public func scaleSize(_ size: CGFloat) -> CGFloat {
-    DesignSystemKits.shared.fontScale(size)
+    FontScaleStore.shared.snapshot(size)
 }
 
 @available(*, deprecated, message: "Max font scale is fixed at 1.5; this override is no longer applied. Drop the second argument.")
@@ -99,9 +99,9 @@ public extension TypographyStyle {
     }
 }
 
-private func momoFontName(family: String, weight: Font.Weight, isWhiteList: Bool) -> String? {
+private func momoFontName(family: String, weight: Font.Weight) -> String? {
     // Ngoai whitelist thi tra nil de momoFont() roi ve .system(...), dung nhu truoc DS-791.
-    guard isWhiteList else { return nil }
+    guard KitDesignSystem.shared.isWhiteList else { return nil }
     guard family == "MomoTrustSans" else { return nil }
     switch weight {
     case .ultraLight, .thin: return "MomoTrustSans-ExtraLight"
@@ -115,19 +115,40 @@ private func momoFontName(family: String, weight: Font.Weight, isWhiteList: Bool
     }
 }
 
-private func momoFont(size: CGFloat, weight: Font.Weight, family: String, isWhiteList: Bool) -> Font {
-    guard let name = momoFontName(family: family, weight: weight, isWhiteList: isWhiteList),
+private func momoFont(size: CGFloat, weight: Font.Weight, family: String) -> Font {
+    guard let name = momoFontName(family: family, weight: weight),
           UIFont(name: name, size: size) != nil else {
         return .system(size: size, weight: weight)
     }
     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),
+       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
+    }
+}
+
 public struct MomoText: View {
     @Environment(\.appTheme) private var theme
     @Environment(\.momoFontScale) private var fontScale
-    // From the environment, not DesignSystemKits.shared, so a whitelist flip re-renders the text.
-    @Environment(\.designSystemKitsConfigs) private var designSystemKitsConfigs
     private let content: String
     private let typography: TypographyStyle
     private let color: Color?
@@ -188,12 +209,7 @@ public struct MomoText: View {
     private var baseText: SwiftUI.Text {
         let keywords = highlightText.filter { !$0.isEmpty }.sorted { $0.count > $1.count }
         guard !keywords.isEmpty else { return SwiftUI.Text(content) }
-        let highlightFont = momoFont(
-            size: fontScale(typography.fontSize),
-            weight: TypographyStyle.headerXsSemibold.fontWeight,
-            family: theme.font,
-            isWhiteList: designSystemKitsConfigs.isWhiteList
-        )
+        let highlightFont = momoFont(size: fontScale(typography.fontSize), weight: TypographyStyle.headerXsSemibold.fontWeight, family: theme.font)
         func isWordChar(_ character: Character?) -> Bool {
             guard let character else { return false }
             return character.isLetter || character.isNumber || character == "_"
@@ -229,13 +245,13 @@ public struct MomoText: View {
         // *Strikethrough styles) or the explicit `strikethrough` flag.
         let isStrikethrough = strikethrough || typography.isStrikethrough
 
+        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)
+
         var text = baseText
-            .font(momoFont(
-                size: fontScale(typography.fontSize),
-                weight: typography.fontWeight,
-                family: theme.font,
-                isWhiteList: designSystemKitsConfigs.isWhiteList
-            ))
+            .font(momoFont(size: fontSize, weight: typography.fontWeight, family: theme.font))
             .foregroundColor(textColor)
             .strikethrough(isStrikethrough, color: textColor)
             .underline(underline, color: textColor)
@@ -246,7 +262,7 @@ public struct MomoText: View {
 
         return text
             .multilineTextAlignment(textAlign)
-            .lineSpacing(fontScale(typography.lineHeight) - fontScale(typography.fontSize))
+            .lineSpacing(lineSpacing)
             .modifier(LineLimitModifier(range: lineLimitRange))
             .truncationMode(truncationMode)
             .fixedSize(horizontal: !softWrap, vertical: false)

package/ios/Typography/Typography.swift

@@ -10,12 +10,12 @@ public extension View {
 }
 
 public extension Font {
-    /// Non-reactive: resolves against the current `DesignSystemKits` font scale at each access. The
+    /// Non-reactive: resolves against the current `FontScaleStore` snapshot at each access. The
     /// styles below are computed properties for that reason — as stored `static let`s they would
     /// freeze the scale at first access and never pick up a Dynamic Type change.
     /// Inside a view, `@Environment(\.momoFontScale)` + `fontScale.font(size:weight:)` also re-renders.
     static func appFont(size: CGFloat) -> Font {
-        DesignSystemKits.shared.fontScale.font(size: size)
+        FontScaleStore.shared.snapshot.font(size: size)
     }
 
     // New supported typography styles

package/ios/native-kits.podspec

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