@momo-kits/native-kits 0.164.1-beta.9-debug → 0.164.1-headerconfig.1-debug

package/gradle.properties

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

package/ios/Application/Navigation/NavigatorManager.swift

@@ -1,19 +1,3 @@
-//
-//  NavigatorManager.swift
-//  MoMoUIKits
-//
-//  Host bridge for the native iOS edge-swipe back — the SwiftUI mirror of Compose's
-//  `ComposeNavigatorManager` (momo-app `vn.momo.compose.uikits.ComposeNavigatorManager`).
-//
-//  The kit does NOT own the swipe gesture. In the host app a kit screen lives inside a
-//  `UIHostingController` hosted by the mini-app container VC, and that VC owns the
-//  `UIScreenEdgePanGestureRecognizer`. When the swipe fires the host asks this manager
-//  whether a kit stack is mounted (`checkCanPop`) and, if so, routes the back into it
-//  (`pop` → `Navigator.onBackSafe`) instead of dismissing the whole mini-app. Standalone
-//  (no such host, e.g. the demo app) there is no edge swipe — same as Compose on iOS,
-//  whose `BackHandler` is a no-op and which relies entirely on the host.
-//
-
 import Foundation
 
 @available(iOS 16.0, *)
@@ -21,28 +5,17 @@ public final class NavigatorManager {
     public static let shared = NavigatorManager()
     private init() {}
 
-    /// Stack of mounted navigators; the last one is the visible top (nested mini-apps
-    /// push more than one). Held strongly, mirroring `ComposeNavigatorManager` — entries
-    /// are released by `NavigationContainer` on disappear, not by ARC.
     private var navigators: [Navigator] = []
 
-    /// Idempotent: SwiftUI can re-run a view's `onAppear`, and a double push would need a
-    /// matching double remove to unwind.
     public func push(_ navigator: Navigator) {
         guard !navigators.contains(where: { $0 === navigator }) else { return }
         navigators.append(navigator)
     }
 
-    /// Removes by identity rather than `removeLast` so a spurious disappear of a covered
-    /// (non-top) container can't drop the wrong navigator.
     public func remove(_ navigator: Navigator) {
         navigators.removeAll { $0 === navigator }
     }
 
-    /// True while any kit stack is mounted — tells the host to route the back into the kit
-    /// instead of dismissing the mini-app. Matches `ComposeNavigatorManager.checkCanPop`:
-    /// it does not inspect stack depth; `onBackSafe` handles the at-root case itself by
-    /// asking the host to dismiss (via `composeApi`).
     public func checkCanPop() -> Bool { !navigators.isEmpty }
 
     public func pop() { navigators.last?.onBackSafe() }

package/ios/Colors+Radius+Spacing/Theme.swift

@@ -221,7 +221,7 @@ public let defaultTheme = Theme(
             container: Colors.blue08
         )
     ),
-    font: "SFProText",
+    font: "MomoTrustSans",
     assets: ThemeAssets(headerBackground: nil)
 )
 
@@ -277,7 +277,7 @@ public let darkTheme = Theme(
             container: Colors.blue08
         )
     ),
-    font: "SFProText",
+    font: "MomoTrustSans",
     assets: ThemeAssets(headerBackground: nil)
 )
 

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

@@ -99,6 +99,30 @@ public extension TypographyStyle {
     }
 }
 
+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 KitDesignSystem.shared.isWhiteList else { return nil }
+    guard family == "MomoTrustSans" else { return nil }
+    switch weight {
+    case .ultraLight, .thin: return "MomoTrustSans-ExtraLight"
+    case .light: return "MomoTrustSans-Light"
+    case .regular: return "MomoTrustSans-Regular"
+    case .medium: return "MomoTrustSans-Medium"
+    case .semibold: return "MomoTrustSans-SemiBold"
+    case .bold: return "MomoTrustSans-Bold"
+    case .heavy, .black: return "MomoTrustSans-ExtraBold"
+    default: return "MomoTrustSans-Regular"
+    }
+}
+
+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)
+}
+
 public struct MomoText: View {
     @Environment(\.appTheme) private var theme
     @Environment(\.momoFontScale) private var fontScale
@@ -159,7 +183,7 @@ public struct MomoText: View {
         let isStrikethrough = strikethrough || typography.isStrikethrough
 
         var text = SwiftUI.Text(content)
-            .font(fontScale.font(size: typography.fontSize, weight: typography.fontWeight))
+            .font(momoFont(size: fontScale(typography.fontSize), weight: typography.fontWeight, family: theme.font))
             .foregroundColor(textColor)
             .strikethrough(isStrikethrough, color: textColor)
             .underline(underline, color: textColor)

package/ios/native-kits.podspec

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

package/local.properties

@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Tue Jun 02 17:05:32 ICT 2026
-sdk.dir=/Users/sophia/Library/Android/sdk
+#Tue May 19 15:41:04 GMT+07:00 2026
+sdk.dir=/Users/phuc/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.164.1-beta.9-debug",
+  "version": "0.164.1-headerconfig.1-debug",
   "private": false,
   "dependeNavigationncies": {},
   "devDependencies": {},

package/publish.sh

@@ -372,10 +372,34 @@ phase_publish_npm() {
     # FIRST PUBLISH: DEBUG VERSION (with compose kits included)
     # ============================================================
     echo ""
+    # A bad token surfaces as a 404 on the PUT, after the working tree was already rewritten
+    # below — so verify auth first, before anything is touched.
+    if ! npm whoami --registry https://registry.npmjs.org >/dev/null 2>&1; then
+        echo "❌ Error: npm auth failed (npm whoami). Renew the token in .npmrc / ~/.npmrc and retry."
+        exit 1
+    fi
+
     echo "🔧 Preparing debug version with compose kits..."
 
     # Create debug version
     DEBUG_VERSION="${VERSION}-debug"
+
+    # set -e aborts mid-phase on any failure; put the tree back no matter where it stopped.
+    # Idempotent: the happy path already moved the backups away and reset the version.
+    restore_npm_workspace() {
+        [ -f .npmignore.backup ] && mv .npmignore.backup .npmignore
+        [ -f compose/build.gradle.kts.backup ] && mv compose/build.gradle.kts.backup compose/build.gradle.kts
+        local pkg_version
+        pkg_version=$(node -p "require('./package.json').version")
+        if [ "$pkg_version" != "$VERSION" ]; then
+            if [[ "$OSTYPE" == "darwin"* ]]; then
+                sed -i '' "s/\"version\": \"$pkg_version\"/\"version\": \"$VERSION\"/" package.json
+            else
+                sed -i "s/\"version\": \"$pkg_version\"/\"version\": \"$VERSION\"/" package.json
+            fi
+        fi
+    }
+    trap restore_npm_workspace EXIT
     echo "📦 Debug version: $DEBUG_VERSION"
 
     # Get current version from package.json (in case it's different from $VERSION)
@@ -482,6 +506,7 @@ EOF
     npm publish --tag $NPM_TAG --access=public
 
     echo "✅ Normal version published successfully!"
+    trap - EXIT
 
     echo ""
     echo "✅ PHASE 3 COMPLETED"

package/compose/src/iosMain/kotlin/vn/momo/kits/navigation/ComposeBackGesture.ios.kt

@@ -1,65 +0,0 @@
-package vn.momo.kits.navigation
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.remember
-import androidx.navigationevent.NavigationEventDispatcher
-import androidx.navigationevent.NavigationEventInput
-
-/**
- * Read-only answer to "will Compose consume this back?", for the iOS host.
- *
- * Compose owns the edge-pan gesture through its own `UIKitBackGestureRecognizer`; the host reads
- * this to decide whether to stand down or keep driving its own recogniser, instead of guessing.
- * Nothing here dispatches — [ObserveBackGestureOwnership] only listens.
- *
- * Pair it with [Navigator.canPop]: the mini-app root reports an enabled handler too (it swallows
- * back to reach `maxApi.dismiss`), yet there the host still owns the gesture.
- */
-object ComposeBackGesture {
-    private val observers = mutableListOf<BackHandlerObserver>()
-
-    /** State of the top-most mounted container; `false` when none is mounted. */
-    val hasEnabledHandlers: Boolean
-        get() = observers.lastOrNull()?.hasEnabledHandlers == true
-
-    internal fun attach(observer: BackHandlerObserver) {
-        observers += observer
-    }
-
-    internal fun detach(observer: BackHandlerObserver) {
-        observers -= observer
-    }
-}
-
-/**
- * Publishes one [NavigationContainer]'s back-handling state to [ComposeBackGesture] while composed.
- *
- * Only called for a container whose dispatcher is the scene's — a bare-`UIView` host gets the
- * detached fallback dispatcher, which can never receive an edge pan, so reporting its handlers
- * would tell the host to stand down in favour of a gesture that does not exist.
- */
-@Composable
-internal fun ObserveBackGestureOwnership(dispatcher: NavigationEventDispatcher) {
-    val observer = remember(dispatcher) { BackHandlerObserver() }
-
-    DisposableEffect(dispatcher, observer) {
-        dispatcher.addInput(observer)
-        ComposeBackGesture.attach(observer)
-        onDispose {
-            ComposeBackGesture.detach(observer)
-            dispatcher.removeInput(observer)
-        }
-    }
-}
-
-// A NavigationEventInput that never dispatches: adding an input is the only way to observe the
-// dispatcher's enabled-handler state without registering a handler, which would consume the gesture.
-internal class BackHandlerObserver : NavigationEventInput() {
-    var hasEnabledHandlers: Boolean = false
-        private set
-
-    override fun onHasEnabledHandlersChanged(hasEnabledHandlers: Boolean) {
-        this.hasEnabledHandlers = hasEnabledHandlers
-    }
-}