@momo-kits/native-kits 0.112.1-beta.10 → 0.112.1-beta.11

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

@@ -112,7 +112,7 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
     }
 
     fun onPressClose() {
-        api?.request("dismiss", "")
+        api?.request("dismiss", "", {_ -> })
     }
 
     fun onPressMore() {

package/ios/Application/ApplicationContext.swift

@@ -0,0 +1,13 @@
+import Foundation
+
+public class ApplicationContext {
+    public static let shared = ApplicationContext()
+    
+    public var appId: String = ""
+    public var appCode: String = ""
+    public var appName: Any? = nil
+    public var appIcon: String = ""
+    public var description: Any? = nil
+    
+    private init() {}
+} 

package/ios/Application/ApplicationEnvironment.swift

@@ -0,0 +1,17 @@
+import SwiftUI
+
+public class ApplicationEnvironment: ObservableObject {
+    @Published public var theme: Theme
+    @Published public var applicationContext: ApplicationContext
+    @Published public var composeAPI: ComposeApi
+    
+    public init(
+        theme: Theme,
+        applicationContext: ApplicationContext,
+        composeAPI: ComposeApi
+    ) {
+        self.theme = theme
+        self.applicationContext = applicationContext
+        self.composeAPI = composeAPI
+    }
+} 

package/ios/Application/ComposeApi.swift

@@ -0,0 +1,22 @@
+import Foundation
+
+public protocol ComposeApi {
+    func request(funcName: String, params: Any, _ completion: ((String) -> Void)?)
+    func request(funcName: String, params: Any) -> String
+}
+
+// Default implementation
+public class ComposeApiImpl: ComposeApi {
+    public static let shared = ComposeApiImpl()
+    
+    private init() {}
+    
+    public func request(funcName: String, params: Any, _ completion: ((String) -> Void)?) {
+        // Implement your API request logic here
+    }
+    
+    public func request(funcName: String, params: Any) -> String {
+        // Implement your API request logic here
+        return ""
+    }
+} 

package/ios/Application/HeaderRight.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import Foundation
 
 public struct HeaderRightData {
     var useShortcut: Bool
@@ -87,10 +88,11 @@ struct ToolkitHeaderRight: View {
     var headerRight: HeaderRightData?
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
+    @EnvironmentObject private var environment: ApplicationEnvironment
     
     // MARK: - Actions
     private func onPressShortcut() {
-        ComposeApi.shared.request(
+        environment.composeAPI.request(
             funcName: "onToolAction",
             params: ["item": ["key": "onFavorite"]]
         ) { _ in
@@ -99,7 +101,7 @@ struct ToolkitHeaderRight: View {
     }
     
     private func onPressHelpCenter() {
-        let context = ApplicationContext.shared
+        let context = environment.applicationContext
         let paramMap: [String: Any] = [
             "appId": context.appId,
             "code": context.appCode,
@@ -107,18 +109,21 @@ struct ToolkitHeaderRight: View {
             "icon": context.appIcon,
             "description": context.description
         ]
-        ComposeApi.shared.request(
+        environment.composeAPI.request(
             funcName: "showHelpCenter",
             params: paramMap
         ) { _ in }
     }
     
     private func onPressClose() {
-        ComposeApi.shared.request(funcName: "dismiss", params: "")
+        environment.composeAPI.request(
+            funcName: "dismiss",
+            params: ""
+        ) { _ in }
     }
     
     private func onPressMore() {
-        let context = ApplicationContext.shared
+        let context = environment.applicationContext
         let params: [String: Any] = [
             "tools": headerRight?.tools.map { $0.toMap() } ?? [],
             "context": [
@@ -129,7 +134,7 @@ struct ToolkitHeaderRight: View {
                 "description": context.description
             ]
         ]
-        ComposeApi.shared.request(
+        environment.composeAPI.request(
             funcName: "showTools",
             params: params
         ) { _ in }

package/ios/Application/Screen.swift

@@ -209,19 +209,53 @@ public struct Header: View {
     }
     
     public var body: some View {
-        HStack {
-            if let goBack = goBack {
-                Button(action: goBack) {
-                    Text("Back")
+        if headerType != .none {
+            VStack(spacing: 0) {
+                ZStack {
+                    HStack {
+                        if let goBack = goBack {
+                            Button(action: goBack) {
+                                Text("Back")
+                            }
+                        }
+                        
+                        Spacer()
+                        
+                        if headerRight != nil {
+                            HeaderRight(headerRight: headerRight)
+                                .opacity(animatedHeader != nil ? opacity ?? 1 : 1)
+                        }
+                    }
+                    
+                    if animatedHeader == nil {
+                        HeaderBackground(headerType: headerType, scrollState: scrollState)
+                    } else {
+                        Color.white.opacity(Double(min(scrollState / 114, 1)))
+                            .overlay(HeaderBackground(headerType: headerType, scrollState: scrollState))
+                    }
+                    
+                    HStack {
+                        if goBack != nil && titlePosition == .left {
+                            Spacer().frame(width: 40)
+                        }
+                        
+                        if let inputProps = inputSearchProps {
+                        } else {
+                            Text(title)
+                                .font(.headline)
+                                .foregroundColor(Colors.black17)
+                                .frame(maxWidth: titlePosition == .center ? .infinity : nil, 
+                                     alignment: titlePosition == .center ? .center : .leading)
+                        }
+                        
+                        if titlePosition == .left {
+                            Spacer()
+                        }
+                    }
+                    .frame(height: 52)
+                    .padding(.horizontal)
                 }
             }
-            
-            Spacer()
-            
-            if headerRight != nil {
-                HeaderRight(headerRight: headerRight)
-                    .opacity(animatedHeader != nil ? opacity ?? 1 : 1)
-            }
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.112.1-beta.10",
+  "version": "0.112.1-beta.11",
   "private": false,
   "dependencies": {},
   "devDependencies": {},