@momo-kits/native-kits 0.162.26-debug → 0.162.27-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.162.26-debug"
+        version = "0.162.27-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.163.1-sp.3-debug'
+    spec.version                  = '0.163.1-beta.16-debug'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

package/gradle.properties

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

package/ios/Application/Components.swift

@@ -100,6 +100,20 @@ 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))
@@ -132,17 +146,6 @@ 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: - Bottom-tab root preference
 
 /// Set by `BottomTab` on appear so its enclosing `StackScreen` can detect that
@@ -232,9 +235,6 @@ 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)

package/ios/Application/HeaderRight.swift

@@ -101,98 +101,69 @@ struct ToolkitHeaderRight: View {
     var tintColor: Color?
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
-    @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"]
-    }
+    @EnvironmentObject private var environment: ApplicationEnvironment
     
     // 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"],
-                "context": contextMap
-            ]
-        ) { response in
-            if let result = parseResponse(response) as? [String: Any],
-               result["success"] as? Bool == true {
-                isFavorite.toggle()
-            }
+            params: ["item": ["key": "onFavorite"]]
+        ) { _ in
+            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: [
-                "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)
-            ]
+            params: paramMap
         ) { _ in }
     }
     
     private func onPressClose() {
         environment.composeApi?.request(
             funcName: "dismissAll",
-            params: nil
+            params: ""
         ) { _ in }
     }
     
     private func onPressMore() {
+        let context = environment.applicationContext
         let params: [String: Any] = [
-            "useSystemTools": headerRight?.useSystemTools ?? true,
+            "useSystemTools": headerRight?.useSystemTools,
             "tools": headerRight?.tools.map { $0.toMap() } ?? [],
-            "context": contextMap
+            "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
+            ]
         ]
         environment.composeApi?.request(
             funcName: "showTools",
             params: params
         ) { response in
-            if let toolResponse = parseResponse(response) as? String {
-                headerRight?.toolCallback?(toolResponse)
+            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)
             }
         }
     }
@@ -224,7 +195,7 @@ struct ToolkitHeaderRight: View {
         } ?? false
         
         HStack(alignment: .center, spacing: 0) {
-            if shouldShowShortcut {
+            if headerRight?.useShortcut == true {
                 NavigationButton(
                     disabled: isLoading,
                     icon: navButtonConfig.icon,
@@ -235,17 +206,15 @@ struct ToolkitHeaderRight: View {
             }
             
             HStack(alignment: .center, spacing: 0) {
-                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: "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)
@@ -262,9 +231,6 @@ struct ToolkitHeaderRight: View {
             )
             .padding(.leading, Spacing.S)
         }
-        .onAppear {
-            loadFavoriteState()
-        }
     }
 }
 

package/ios/Application/Navigation/component/Header.swift

@@ -22,7 +22,7 @@ public struct NavigationHeader: View {
     /// Optional rich title (mirrors Compose's `HeaderTitle`); `.user` renders an
     /// avatar group, `.default`/nil renders plain `title`.
     var headerTitle: HeaderTitle?
-    var headerRight: (() -> any View)? = { HeaderRight() }
+    var headerRight: (() -> any View)? = { NavigationHeaderRight() }
     var goBack: (() -> Void)?
     var opacity: CGFloat = 1
     var animatedHeader: AnimatedHeader?

package/ios/Application/Navigation/component/HeaderRightWidthKey.swift

@@ -0,0 +1,11 @@
+import SwiftUI
+
+/// Reports the measured width of the header-right area so the animated search
+/// header can compute its trailing inset (mirrors Compose's headerRightWidthPx).
+/// Written by the header views (`NavigationHeader`) and read by `StackScreen`.
+public struct HeaderRightWidthKey: PreferenceKey {
+    public static var defaultValue: CGFloat = 0
+    public static func reduce(value: inout CGFloat, nextValue: () -> CGFloat) {
+        value = max(value, nextValue())
+    }
+}

package/ios/Application/Navigation/component/NavigationHeaderRight.swift

@@ -0,0 +1,196 @@
+import SwiftUI
+import Foundation
+
+/// Keyed (`@Environment(\.applicationEnvironment)`) variant of `HeaderRight`, for hosts
+/// wired through `NavigationContainer`/`KitContainer` (the injection style introduced by
+/// MR 227 / DS-637). Reuses the shared data types (`HeaderRightData`, `Tool`, `ToolGroup`)
+/// and `NavigationButton` from `HeaderRight.swift`. The legacy `HeaderRight` there stays on
+/// `@EnvironmentObject` for hosts that render `Screen` directly with
+/// `.environmentObject(ApplicationEnvironment(...))`. Opt in per screen with
+/// `headerRight: { NavigationHeaderRight() }`.
+public struct NavigationHeaderRight: View {
+    public init(headerRight: HeaderRightData? = nil, tintColor: Color? = nil) {
+        self.headerRight = headerRight
+        self.tintColor = tintColor
+    }
+    var headerRight: HeaderRightData?
+    var tintColor: Color? = nil
+
+    public var body: some View {
+        HStack(alignment: .center) {
+            ToolkitNavigationHeaderRight(headerRight: headerRight, tintColor: tintColor)
+        }
+    }
+}
+
+struct ToolkitNavigationHeaderRight: View {
+    var headerRight: HeaderRightData?
+    var tintColor: Color?
+    @State private var isFavorite: Bool = false
+    @State private var isLoading: Bool = false
+    @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"],
+                "context": contextMap
+            ]
+        ) { response in
+            if let result = parseResponse(response) as? [String: Any],
+               result["success"] as? Bool == true {
+                isFavorite.toggle()
+            }
+        }
+    }
+
+    private func onPressHelpCenter() {
+        environment.composeApi?.request(
+            funcName: "showHelpCenter",
+            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: nil
+        ) { _ in }
+    }
+
+    private func onPressMore() {
+        let params: [String: Any] = [
+            "useSystemTools": headerRight?.useSystemTools ?? true,
+            "tools": headerRight?.tools.map { $0.toMap() } ?? [],
+            "context": contextMap
+        ]
+        environment.composeApi?.request(
+            funcName: "showTools",
+            params: params
+        ) { response in
+            if let toolResponse = parseResponse(response) as? String {
+                headerRight?.toolCallback?(toolResponse)
+            }
+        }
+    }
+
+    private func getNavigationButtonConfig() -> NavigationButtonConfig {
+        let totalTools = headerRight?.tools.reduce(0) { $0 + $1.items.count } ?? 0
+        var icon = isFavorite ? "pin_star_checked" : "pin_star"
+        var onClickHandler: () -> Void = onPressShortcut
+
+        if totalTools > 1 || headerRight?.useMore == true {
+            icon = "navigation_more_icon"
+            onClickHandler = onPressMore
+        } else if totalTools == 1, let singleTool = headerRight?.tools.first?.items.first {
+            icon = singleTool.icon
+            onClickHandler = {
+                headerRight?.toolCallback?(singleTool.key)
+            }
+        }
+
+        return NavigationButtonConfig(icon: icon, onPress: onClickHandler)
+    }
+
+    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)
+        let navButtonConfig = getNavigationButtonConfig()
+        let showBadge = headerRight?.tools.contains { group in
+            group.items.contains { $0.showBadge }
+        } ?? false
+
+        HStack(alignment: .center, spacing: 0) {
+            if shouldShowShortcut {
+                NavigationButton(
+                    disabled: isLoading,
+                    icon: navButtonConfig.icon,
+                    showBadge: showBadge,
+                    onClick: navButtonConfig.onPress,
+                    tintColor: tintColor
+                )
+            }
+
+            HStack(alignment: .center, spacing: 0) {
+                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)
+                    .onTapGesture {
+                        onPressClose()
+                    }
+            }
+            .frame(width: 65, height: 28)
+            .background(backgroundButtonColor)
+            .cornerRadius(14)
+            .overlay(
+                RoundedRectangle(cornerRadius: 14)
+                    .stroke(borderColor, lineWidth: 0.2)
+            )
+            .padding(.leading, Spacing.S)
+        }
+        .onAppear {
+            loadFavoriteState()
+        }
+    }
+}

package/ios/Button/Button.swift

@@ -281,25 +281,19 @@ private struct ButtonPressFeedbackStyle: ButtonStyle {
     func makeBody(configuration: Configuration) -> some View {
         let pressed = configuration.isPressed && isEnabled
 
-        ZStack {
-            RoundedRectangle(cornerRadius: radius)
-                .fill(background)
-                .overlay(
-                    RoundedRectangle(cornerRadius: radius)
-                        .strokeBorder(border ?? .clear, lineWidth: border != nil ? borderWidth : 0)
-                )
-                .padding(.horizontal, pressed ? 2 : 0)
-
-            configuration.label
-                .opacity(pressed ? 0.5 : 1)
-        }
-        // Pin the whole button to its intended height explicitly: the bare
-        // RoundedRectangle background has no intrinsic size of its own, so left
-        // unconstrained in a ZStack inside a non-height-constraining container
-        // (e.g. a footer VStack) it can report an oversized ideal height and
-        // stretch the button — and its container — far taller than intended.
-        .frame(height: height)
-        .clipShape(RoundedRectangle(cornerRadius: radius))
-        .animation(.easeInOut(duration: 0.1), value: pressed)
+        configuration.label
+            .opacity(pressed ? 0.5 : 1)
+            .background(
+                RoundedRectangle(cornerRadius: radius)
+                    .fill(background)
+                    .overlay(
+                        RoundedRectangle(cornerRadius: radius)
+                            .strokeBorder(border ?? .clear, lineWidth: border != nil ? borderWidth : 0)
+                    )
+                    .padding(.horizontal, pressed ? 2 : 0)
+            )
+            .frame(height: height)
+            .clipShape(RoundedRectangle(cornerRadius: radius))
+            .animation(.easeInOut(duration: 0.1), value: pressed)
     }
 }

package/ios/native-kits.podspec

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.162.26-debug",
+  "version": "0.162.27-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},