@momo-kits/native-kits 0.112.1-beta.12 → 0.112.1-beta.14

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

@@ -68,7 +68,7 @@ val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
 fun ApplicationContainer(
     theme: Theme = defaultTheme,
     composeApi: ComposeApi? = null,
-    statusBarHeight: Dp? = AppStatusBar.current ?: getStatusBarHeight(),
+    statusBarHeight: Dp?,
     applicationContext: MiniAppContext? = null,
     content: @Composable () -> Unit,
 ) {
@@ -100,12 +100,14 @@ fun ApplicationContainer(
         }
     }
 
+    val appStatusBarHeight = statusBarHeight ?: getStatusBarHeight()
+
     disableOverscroll()
     CompositionLocalProvider(
         AppTheme provides appTheme,
         PlatformApi provides composeApi,
         AppNavigator provides Navigator(),
-        AppStatusBar provides statusBarHeight,
+        AppStatusBar provides appStatusBarHeight,
         ApplicationContext provides applicationContext,
     ) {
         content()

package/ios/Application/ApplicationEnvironment.swift

@@ -1,17 +1,34 @@
 import SwiftUI
 
+public protocol KitComposeApi {
+    func request(funcName: String, params: Any?) -> String
+    func request(funcName: String, params: Any?, onResponse: ((String) -> Void)?) -> String
+    func requestCallback(funcName: String, params: Any?, onResponse: ((String) -> Void)?)
+    func removeCallback(id: String)
+}
+
+public class MiniAppContext {
+    public var appId: String = ""
+    public var appCode: String = ""
+    public var appName: Any? = nil
+    public var appIcon: String = ""
+    public var description: Any? = nil
+    
+    public init(appId: String, appCode: String, appName: Any? = nil, appIcon: String, description: Any? = nil) {
+        self.appId = appId
+        self.appCode = appCode
+        self.appName = appName
+        self.appIcon = appIcon
+        self.description = description
+    }
+}
+
 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
-//    }
-} 
+    let applicationContext: MiniAppContext?
+    let composeApi: KitComposeApi
+    
+    public init(applicationContext: MiniAppContext?, composeApi: KitComposeApi) {
+        self.applicationContext = applicationContext
+        self.composeApi = composeApi
+    }
+}

package/ios/Application/Components.swift

@@ -105,7 +105,7 @@ public struct Header: View {
     var headerType: HeaderType = .default
     var titlePosition: TitlePosition
     var title: String
-    var headerRight: (() -> AnyView)?
+    var headerRight:  (()->any View)? = {HeaderRight()}
     var goBack: (() -> Void)?
     var opacity: CGFloat? = nil
     var animatedHeader: AnimatedHeader? = nil
@@ -118,7 +118,7 @@ public struct Header: View {
         headerType: HeaderType = .default,
         titlePosition: TitlePosition,
         title: String,
-        headerRight: (() -> AnyView)? = nil,
+        headerRight:  (()->any View)? = {HeaderRight()},
         goBack: (() -> Void)? = nil,
         opacity: CGFloat? = nil,
         animatedHeader: AnimatedHeader? = nil,
@@ -162,9 +162,10 @@ public struct Header: View {
                             
                             Spacer()
                             
-                            if let headerRight = headerRight {
-                                HeaderRight()
+                            if (headerRight != nil) {
+                                AnyView(headerRight!())
                             }
+                        
                         }
                         .frame(height: 52)
                         .padding(.horizontal)

package/ios/Application/HeaderRight.swift

@@ -95,54 +95,52 @@ struct ToolkitHeaderRight: View {
     
     // MARK: - Actions
     private func onPressShortcut() {
-//        environment.composeAPI.request(
-//            funcName: "onToolAction",
-//            params: ["item": ["key": "onFavorite"]]
-//        ) { _ in
-//            isFavorite.toggle()
-//        }
+        environment.composeApi.request(
+            funcName: "onToolAction",
+            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: paramMap
-//        ) { _ in }
-        
-        print("Press help center")
+        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
+        ) { _ in }
     }
     
     private func onPressClose() {
-//        environment.composeAPI.request(
-//            funcName: "dismiss",
-//            params: ""
-//        ) { _ in }
+        environment.composeApi.request(
+            funcName: "dismiss",
+            params: ""
+        ) { _ in }
     }
     
     private func onPressMore() {
-//        let context = environment.applicationContext
-//        let params: [String: Any] = [
-//            "tools": headerRight?.tools.map { $0.toMap() } ?? [],
-//            "context": [
-//                "appId": context.appId,
-//                "code": context.appCode,
-//                "name": context.appName,
-//                "icon": context.appIcon,
-//                "description": context.description
-//            ]
-//        ]
-//        environment.composeAPI.request(
-//            funcName: "showTools",
-//            params: params
-//        ) { _ in }
+        let context = environment.applicationContext
+        let params: [String: Any] = [
+            "tools": headerRight?.tools.map { $0.toMap() } ?? [],
+            "context": [
+                "appId": context?.appId,
+                "code": context?.appCode,
+                "name": context?.appName,
+                "icon": context?.appIcon,
+                "description": context?.description
+            ]
+        ]
+        environment.composeApi.request(
+            funcName: "showTools",
+            params: params
+        ) { _ in }
     }
     
     private func getNavigationButtonConfig() -> NavigationButtonConfig {
@@ -238,4 +236,4 @@ struct NavigationButton: View {
             }
         }
     }
-} 
+}

package/ios/Application/Screen.swift

@@ -20,7 +20,7 @@ public struct Screen<Content: View>: View {
     var onContentLayout: ((CGRect) -> Void)?
     var useAvoidKeyboard: Bool
     var footer: (() -> AnyView)?
-    var headerRight: (any View)?
+    var headerRight: (()->any View)? = {HeaderRight()}
     var animatedHeader: AnimatedHeader? = nil
     var layoutOffset: CGFloat
     var inputSearchProps: InputSearchProps? = nil
@@ -40,7 +40,7 @@ public struct Screen<Content: View>: View {
         onContentLayout: ((CGRect) -> Void)? = nil,
         useAvoidKeyboard: Bool = true,
         footer: (() -> AnyView)? = nil,
-        headerRight: (any View)? = HeaderRight(),
+        headerRight:  (()->any View)? = {HeaderRight()},
         animatedHeader: AnimatedHeader? = nil,
         layoutOffset: CGFloat = 56,
         inputSearchProps: InputSearchProps? = nil,
@@ -93,7 +93,7 @@ public struct Screen<Content: View>: View {
                             headerType: headerType,
                             titlePosition: titlePosition,
                             title: title,
-//                            headerRight: headerRight,
+                            headerRight: headerRight,
                             goBack: goBack,
                             opacity: min(scrollOffset / 114, 1),
                             animatedHeader: animatedHeader,

package/ios/Icon/Icon.swift

@@ -43,11 +43,11 @@ public struct Icon: View {
         }
 
     public var body: some View {
-//        if let uri = iconSources[source]?.uri {
-            ImageView(source)
+        if let uri = iconSources[source]?.uri {
+            ImageView(uri)
                 .frame(width: size, height: size)
                 .foregroundColor(color)
-//        }
+        }
     }
 }
 

package/package.json

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

package/ios/Application/ApplicationContext.swift

@@ -1,13 +0,0 @@
-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() {}
-}