@momo-kits/native-kits 0.163.1-beta.3 → 0.163.1-beta.5

package/CLAUDE.md

@@ -40,7 +40,7 @@ Publishing is automated (`publish.sh` + GitLab CI on `[ci build]` / `main`). Do
 ## Architecture essentials
 
 - **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`, `ScaleSizeMaxRate` (`application/`); `LocalNavigator`, `LocalMaxApi` (`navigation/`). Read with `X.current`.
+- **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`.
 - **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`.

package/ios/Application/ApplicationEnvironment.swift

@@ -46,6 +46,16 @@ public class ApplicationEnvironment: ObservableObject {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
         self.config = config
-        FontScaleStore.shared.bind(composeApi)
+    }
+}
+
+private struct ApplicationEnvironmentKey: EnvironmentKey {
+    static let defaultValue = ApplicationEnvironment()
+}
+
+public extension EnvironmentValues {
+    var applicationEnvironment: ApplicationEnvironment {
+        get { self[ApplicationEnvironmentKey.self] }
+        set { self[ApplicationEnvironmentKey.self] = newValue }
     }
 }

package/ios/Application/Components.swift

@@ -83,9 +83,8 @@ public struct HeaderBackground: View {
         self.headerTransparent = headerTransparent
         self.fullScreenContent = fullScreenContent
     }
-    
+
     public var body: some View {
-        
         let statusBarHeight = safeAreaTopInset()
         let opacity = max(0, 1 - scrollState / 200)
         let height = fullScreenContent ? 0 :  statusBarHeight + 52
@@ -101,21 +100,6 @@ public struct HeaderBackground: View {
                         .frame(height: height)
                         .shadow(color: Colors.black20.opacity(0.2), radius: 10, x: 0, y: -2)
                         .background(backgroundColor)
-                        .overlay(
-                            headerTransparent ? AnyView(EmptyView()) :
-                            AnyView(
-                                Rectangle()
-                                    .fill(LinearGradient(
-                                        gradient: Gradient(colors: [
-                                            Color(red: 1, green: 0.8, blue: 0.87),
-                                            Color(red: 1, green: 0.8, blue: 0.87).opacity(0.5)
-                                        ]),
-                                        startPoint: .top,
-                                        endPoint: .bottom))
-                                    .opacity(opacity)
-                                    .frame(height: height))
-                        )
-
                     if !headerTransparent {
                         Rectangle()
                             .fill(Color.black.opacity(0.1))
@@ -148,12 +132,26 @@ public struct HeaderBackground: View {
     }
 }
 
+// MARK: - Header right width preference
+
+/// Reports the measured width of the header-right area so the animated search
+/// header can compute its trailing inset (mirrors Compose's headerRightWidthPx).
+public struct HeaderRightWidthKey: PreferenceKey {
+    public static var defaultValue: CGFloat = 0
+    public static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
+        value = max(value, nextValue())
+    }
+}
+
 // MARK: - Header View
 
 public struct Header: View {
     var headerType: HeaderType = .default
     var titlePosition: TitlePosition
     var title: String
+    /// Optional rich title (mirrors Compose's `HeaderTitle`); `.user` renders an
+    /// avatar group instead of `title`. Defaults to nil → plain `title` text.
+    var headerTitle: HeaderTitle?
     var headerRight:  (()->any View)? = {HeaderRight()}
     var goBack: (() -> Void)?
     var opacity: CGFloat = 1
@@ -161,22 +159,27 @@ public struct Header: View {
     var scrollState: CGFloat = 0
     var inputSearchProps: InputSearchProps?
     var tintColor: Color?
+    /// Title opacity; used by the animated search header to fade the title out on scroll.
+    var titleOpacity: CGFloat = 1
 
     public init(
         headerType: HeaderType = .default,
         titlePosition: TitlePosition,
         title: String,
+        headerTitle: HeaderTitle? = nil,
         headerRight:  (()->any View)? = {HeaderRight()},
         goBack: (() -> Void)? = nil,
         opacity: CGFloat = 1,
         animatedHeader: AnimatedHeader? = nil,
         scrollState: CGFloat = 0,
         inputSearchProps: InputSearchProps? = nil,
-        tintColor: Color? = nil
+        tintColor: Color? = nil,
+        titleOpacity: CGFloat = 1
     ) {
         self.headerType = headerType
         self.titlePosition = titlePosition
         self.title = title
+        self.headerTitle = headerTitle
         self.headerRight = headerRight
         self.goBack = goBack
         self.opacity = opacity
@@ -184,10 +187,11 @@ public struct Header: View {
         self.scrollState = scrollState
         self.inputSearchProps = inputSearchProps
         self.tintColor = tintColor
+        self.titleOpacity = titleOpacity
     }
-    
+
     public var body: some View {
-        
+
         let backgroundButtonColor: Color = tintColor == Colors.black01 ? Colors.black20.opacity(0.6) : Colors.black01.opacity(0.6)
         let borderColor: Color = tintColor == Colors.black01 ? Colors.black01.opacity(0.2) : Colors.black20.opacity(0.2)
 
@@ -212,6 +216,9 @@ public struct Header: View {
 
                         if let headerRight = headerRight {
                             AnyView(headerRight())
+                                .background(GeometryReader { geo in
+                                    Color.clear.preference(key: HeaderRightWidthKey.self, value: geo.size.width)
+                                })
                         }
                     }
                     .padding(.horizontal, 12)
@@ -223,33 +230,16 @@ public struct Header: View {
                         }
 
                         if let inputProps = inputSearchProps {
-                            InputSearch(
-                                text: inputProps.$text,
-                                buttonText: inputProps.buttonText,
-                                showButtonText: inputProps.showButtonText,
-                                showBorder: inputProps.showBorder,
-                                placeholder: inputProps.placeholder,
-                                onChangeText: inputProps.onChangeText,
-                                onPressButtonText: inputProps.onPressButtonText,
-                                error: inputProps.error,
-                                disabled: inputProps.disabled,
-                                icon: inputProps.icon,
-                                iconColor: inputProps.iconColor,
-                                onRightIconPressed: inputProps.onRightIconPressed,
-                                onFocus: inputProps.onFocus,
-                                onBlur: inputProps.onBlur,
-                                loading: inputProps.loading,
-                                fontWeight: inputProps.fontWeight,
-                                keyboardType: inputProps.keyboardType
-                            )
+                            InputSearch(props: inputProps)
+                        } else if case let .user(userData)? = headerTitle {
+                            if #available(iOS 16.0, *) {
+                                HeaderUserView(userData)
+                            }
                         } else {
-                            Text(title)
-                                .font(.system(size: 17, weight: .bold))
-                                .ignoreBoldTextSetting()
-                                .foregroundColor(tintColor ?? Colors.black17)
+                            MomoText(headerTitle?.defaultTitle ?? title, typography: .headerDefaultBold, color: tintColor ?? Colors.black17, maxLines: 1)
+                                .opacity(titleOpacity)
                                 .frame(maxWidth: titlePosition == .center ? UIScreen.main.bounds.width - 252 : nil)
                                 .frame(maxWidth: titlePosition == .center ? .infinity : UIScreen.main.bounds.width - 172, alignment: titlePosition == .center ? .center : .leading)
-                                .lineLimit(1)
                         }
 
                         Spacer()

package/ios/Application/FloatingButton.swift

@@ -3,11 +3,16 @@ import Combine
 
 public enum FABSize {
     case small
+    case `default`
+    /// Backward-compatible alias for older iOS call sites. Compose names this
+    /// size `DEFAULT`.
     case large
-    
 }
 
 public enum FABPosition {
+    case end
+    /// Backward-compatible alias for older iOS call sites. Compose names this
+    /// position `END`.
     case right
     case center
 }
@@ -31,10 +36,10 @@ public struct FabProps {
         label: String? = nil,
         onClick: (() -> Void)? = nil,
         containerColor: Color? = Colors.primary,
-        size: FABSize? = .small,
+        size: FABSize? = .default,
         iconSize: CGFloat? = nil,
         scrollOffset: CGFloat? = nil,
-        position: FABPosition? = .right,
+        position: FABPosition? = .end,
         bottomPadding: CGFloat? = nil,
         renderComponent: (() -> AnyView)? = nil
     ) {
@@ -65,7 +70,7 @@ public struct FloatingButton: View {
     private var keyboardOffset: CGFloat
     private var scrollOffset: CGFloat
     private var bottomPadding: CGFloat { props.bottomPadding ?? 12 + keyboardOffset}
-    private var position: FABPosition? { props.position ?? .right }
+    private var position: FABPosition? { props.position ?? .end }
     private var containerColor: Color? { props.containerColor ?? Colors.primary }
     private var iconColor: Color? { props.iconColor ?? .white }
     private var label: String? { props.label }
@@ -152,11 +157,7 @@ public struct FloatingButton: View {
             if let label = label {
                 if showText {
                     Spacer().frame(width: 8)
-                    Text(label)
-                        .foregroundColor(.white)
-                        .font(.system(size: scaleSize(16), weight: .bold))
-                        .ignoreBoldTextSetting()
-                        .lineLimit(1)
+                    MomoText(label, typography: .actionDefaultBold, color: .white, maxLines: 1)
                         .background(
                             GeometryReader { geo in
                                 Color.clear.onAppear {

package/ios/Application/HeaderRight.swift

@@ -101,69 +101,98 @@ struct ToolkitHeaderRight: View {
     var tintColor: Color?
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
-    @EnvironmentObject private var environment: ApplicationEnvironment
+    @Environment(\.applicationEnvironment) private var environment
+
+    private func apiValue(_ value: Any?) -> Any {
+        value ?? NSNull()
+    }
+
+    private var contextMap: [String: Any] {
+        let context = environment.applicationContext
+        return [
+            "appId": apiValue(context?.appId),
+            "code": apiValue(context?.appCode),
+            "name": apiValue(context?.appName),
+            "icon": apiValue(context?.appIcon),
+            "description": apiValue(context?.description),
+            "support": apiValue(context?.support),
+            "toolkitConfig": apiValue(context?.toolkitConfig),
+            "providerId": apiValue(context?.providerId),
+            "permissions": apiValue(context?.permissions)
+        ]
+    }
+
+    private var shouldShowShortcut: Bool {
+        headerRight?.useShortcut == true && !(headerRight?.useMore == true && environment.applicationContext == nil)
+    }
+
+    private func parseResponse(_ response: String) -> Any? {
+        guard let jsonData = response.data(using: .utf8),
+              let json = try? JSONSerialization.jsonObject(with: jsonData) as? [String: Any] else {
+            return nil
+        }
+        return json["response"]
+    }
     
     // MARK: - Actions
+    private func loadFavoriteState() {
+        environment.composeApi?.request(
+            funcName: "isFavoriteApp",
+            params: ["code": apiValue(environment.applicationContext?.appCode)]
+        ) { response in
+            if let isFavorite = parseResponse(response) as? Bool {
+                self.isFavorite = isFavorite
+            }
+        }
+    }
+
     private func onPressShortcut() {
         environment.composeApi?.request(
             funcName: "onToolAction",
-            params: ["item": ["key": "onFavorite"]]
-        ) { _ in
-            isFavorite.toggle()
+            params: [
+                "item": ["key": "onFavorite"],
+                "context": contextMap
+            ]
+        ) { response in
+            if let result = parseResponse(response) as? [String: Any],
+               result["success"] as? Bool == true {
+                isFavorite.toggle()
+            }
         }
     }
     
     private func onPressHelpCenter() {
-        let context = environment.applicationContext
-        let paramMap: [String: Any] = [
-            "appId": context?.appId,
-            "code": context?.appCode,
-            "name": context?.appName,
-            "icon": context?.appIcon,
-            "description": context?.description
-        ]
         environment.composeApi?.request(
             funcName: "showHelpCenter",
-            params: paramMap
+            params: [
+                "appId": apiValue(environment.applicationContext?.appId),
+                "code": apiValue(environment.applicationContext?.appCode),
+                "name": apiValue(environment.applicationContext?.appName),
+                "icon": apiValue(environment.applicationContext?.appIcon),
+                "description": apiValue(environment.applicationContext?.description)
+            ]
         ) { _ in }
     }
     
     private func onPressClose() {
         environment.composeApi?.request(
             funcName: "dismissAll",
-            params: ""
+            params: nil
         ) { _ in }
     }
     
     private func onPressMore() {
-        let context = environment.applicationContext
         let params: [String: Any] = [
-            "useSystemTools": headerRight?.useSystemTools,
+            "useSystemTools": headerRight?.useSystemTools ?? true,
             "tools": headerRight?.tools.map { $0.toMap() } ?? [],
-            "context": [
-                "appId": context?.appId,
-                "code": context?.appCode,
-                "name": context?.appName,
-                "icon": context?.appIcon,
-                "description": context?.description,
-                "support": context?.support,
-                "toolkitConfig": context?.toolkitConfig,
-                "providerId": context?.providerId,
-                "permissions": context?.permissions
-            ]
+            "context": contextMap
         ]
         environment.composeApi?.request(
             funcName: "showTools",
             params: params
         ) { response in
-            do {
-                if let jsonData = response.data(using: .utf8),
-                   let json = try JSONSerialization.jsonObject(with: jsonData) as? [String: Any],
-                   let toolResponse = json["response"] as? String {
-                    headerRight?.toolCallback?(toolResponse)
-                }
-            } catch {
-                print("Error parsing response:", error)
+            if let toolResponse = parseResponse(response) as? String {
+                headerRight?.toolCallback?(toolResponse)
             }
         }
     }
@@ -195,7 +224,7 @@ struct ToolkitHeaderRight: View {
         } ?? false
         
         HStack(alignment: .center, spacing: 0) {
-            if headerRight?.useShortcut == true {
+            if shouldShowShortcut {
                 NavigationButton(
                     disabled: isLoading,
                     icon: navButtonConfig.icon,
@@ -206,15 +235,17 @@ struct ToolkitHeaderRight: View {
             }
             
             HStack(alignment: .center, spacing: 0) {
-                Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
-                    .padding(4)
-                    .onTapGesture {
-                        onPressHelpCenter()
-                    }
-                
-                Rectangle()
-                    .fill(tintColor ?? Colors.black20)
-                    .frame(width: 0.5, height: 12)
+                if environment.applicationContext != nil {
+                    Icon(source: "help_center", size: 20, color: tintColor ?? Colors.black17)
+                        .padding(4)
+                        .onTapGesture {
+                            onPressHelpCenter()
+                        }
+                    
+                    Rectangle()
+                        .fill(tintColor ?? Colors.black20)
+                        .frame(width: 0.5, height: 12)
+                }
                 
                 Icon(source: "16_basic_home", size: 20, color: tintColor ?? Colors.black17)
                     .padding(4)
@@ -231,6 +262,9 @@ struct ToolkitHeaderRight: View {
             )
             .padding(.leading, Spacing.S)
         }
+        .onAppear {
+            loadFavoriteState()
+        }
     }
 }
 

package/ios/Application/Navigation/BottomTab/BottomTab.swift

@@ -0,0 +1,103 @@
+//
+//  BottomTab.swift
+//  MoMoUIKits
+//
+//  SwiftUI mirror of Compose's `BottomTab` (navigation/bottomtab/BottomTab.kt).
+//  Hosts a set of tabbed screens, each wrapped in `StackScreen` chrome built
+//  from that tab's `NavigationOptions`, with a `BottomTabBar` pinned to the
+//  bottom. Switching tabs cross-fades + scales the content (parity with Compose).
+//
+
+import SwiftUI
+
+@available(iOS 16.0, *)
+public struct BottomTab: View {
+    private let items: [BottomTabItem]
+    private let floatingButton: BottomTabFloatingButton?
+
+    @EnvironmentObject private var navigator: Navigator
+    @State private var selectedIndex: Int = 0
+
+    public init(items: [BottomTabItem], floatingButton: BottomTabFloatingButton? = nil) {
+        self.items = items
+        self.floatingButton = floatingButton
+    }
+
+    private var bottomInset: CGFloat { safeAreaBottomInset() }
+    private var reservedBottom: CGFloat { BOTTOM_TAB_BAR_HEIGHT + bottomInset + Spacing.S }
+
+    public var body: some View {
+        ZStack(alignment: .bottom) {
+            // Tab content area, inset above the bar.
+            ZStack {
+                ForEach(items.indices, id: \.self) { index in
+                    if index == selectedIndex {
+                        tabScreen(for: index)
+                            .transition(.scale(scale: 0.97).combined(with: .opacity))
+                    }
+                }
+            }
+            .padding(.bottom, reservedBottom)
+            .animation(.easeInOut(duration: 0.2), value: selectedIndex)
+
+            // Tab bar + home-indicator filler.
+            VStack(spacing: 0) {
+                BottomTabBar(
+                    items: items,
+                    floatingButton: floatingButton,
+                    selectedIndex: selectedIndex,
+                    onTabSelected: { index in
+                        if index != selectedIndex { selectedIndex = index }
+                    }
+                )
+                Colors.black01
+                    .frame(height: bottomInset + Spacing.S)
+            }
+        }
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .ignoresSafeArea(edges: .bottom)
+    }
+
+    @ViewBuilder
+    private func tabScreen(for index: Int) -> some View {
+        let item = items[index]
+        let options = item.options ?? NavigationOptions()
+        StackScreen(
+            backgroundColor: options.backgroundColor,
+            headerTransparent: options.headerTransparent,
+            fullScreenContent: options.fullScreenContent,
+            tintColor: options.tintColor ?? Colors.black17,
+            isBack: !options.hiddenBack,
+            headerType: options.headerType,
+            useAnimated: options.useAnimated,
+            title: options.title,
+            headerTitle: options.headerTitle,
+            titlePosition: options.titlePosition,
+            // Tab back: non-first tab returns to the first tab, first tab
+            // delegates to the navigator (mirrors Compose's onBackHandler).
+            goBack: options.hiddenBack ? nil : {
+                if index != 0 { selectedIndex = 0 } else { navigator.onBackSafe() }
+            },
+            scrollable: options.scrollable,
+            scrollToTopCallback: options.scrollToTopCallback,
+            useAvoidKeyboard: options.useAvoidKeyboard,
+            keyboardShouldPersistTaps: options.keyboardShouldPersistTaps,
+            footer: options.footer,
+            headerRight: options.resolvedHeaderRight,
+            animatedHeader: options.animatedHeader,
+            layoutOffset: options.layoutOffset,
+            inputSearchProps: options.inputSearchProps,
+            fabProps: options.fabProps,
+            content: { item.screen() }
+        )
+    }
+}
+
+/// Bottom safe-area inset (home indicator).
+@available(iOS 16.0, *)
+private func safeAreaBottomInset() -> CGFloat {
+    let bottomInset = UIApplication.shared.connectedScenes
+        .compactMap { ($0 as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom }
+        .first ?? 0
+    return min(bottomInset, 21)
+}