@momo-kits/native-kits 0.112.1-beta.5 → 0.112.1-beta.7

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

@@ -22,8 +22,6 @@ import vn.momo.kits.const.defaultTheme
 import vn.momo.kits.platform.disableOverscroll
 import vn.momo.kits.platform.getStatusBarHeight
 
-val PlatformApi = staticCompositionLocalOf<Any?> { null }
-
 interface ComposeApi {
     fun request(funcName: String, params: String?): String
     fun request(funcName: String, params: String?, onResponse: ((String) -> Unit)?): String
@@ -31,10 +29,6 @@ interface ComposeApi {
     fun removeCallback(id: String)
 }
 
-val AppNavigator = staticCompositionLocalOf<Navigator> {
-    error("no navigator provided!")
-}
-
 class Navigator {
     fun push(content: @Composable () -> Unit) {
     }
@@ -67,11 +61,30 @@ class Navigator {
     }
 }
 
+data class MiniAppContext(
+    val icon: String = "",
+    val name: String = "",
+    val appId: String = "",
+    val code: String = "",
+    val description: String? = "",
+)
+
+val PlatformApi = staticCompositionLocalOf<Any?> { null }
+
+val AppNavigator = staticCompositionLocalOf<Navigator> {
+    error("no navigator provided!")
+}
+
+val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
+    error("no context provided!")
+}
+
 @Composable
 fun ApplicationContainer(
     theme: Theme = defaultTheme,
     composeApi: ComposeApi? = null,
     statusBarHeight: Dp? = AppStatusBar.current ?: getStatusBarHeight(),
+    applicationContext: MiniAppContext? = null,
     content: @Composable () -> Unit
 ) {
     var appTheme by remember { mutableStateOf(theme) }
@@ -97,8 +110,7 @@ fun ApplicationContainer(
                     }
                 }
             }
-        }
-        catch (e: Exception) {
+        } catch (e: Exception) {
             print("@@ == NavigationContainer fetch config error $e")
         }
     }
@@ -109,6 +121,7 @@ fun ApplicationContainer(
         PlatformApi provides composeApi,
         AppNavigator provides Navigator(),
         AppStatusBar provides statusBarHeight,
+        ApplicationContext provides applicationContext
     ) {
         content()
     }

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

@@ -23,6 +23,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.dp
+import vn.momo.kits.application.ApplicationContext
 import vn.momo.kits.application.ComposeApi
 import vn.momo.kits.application.PlatformApi
 import vn.momo.kits.const.Colors
@@ -78,19 +79,22 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
     var isFavorite by remember { mutableStateOf(false) }
     val isLoading by remember { mutableStateOf(false) }
     val api = PlatformApi.current as? ComposeApi
+    val context = ApplicationContext.current
 
     fun onPressShortcut() {
         isFavorite = !isFavorite
     }
 
     fun onPressHelpCenter() {
-        val params = ModelConvertUtils.encodeToJsonFromAny(
-            arrayOf<Any>(
-                mapOf("title" to "title"),
-                mapOf("title" to "title")
-            )
-        ).toString()
-        api?.request("showHelpCenter", params, {})
+        val paramMap: Map<String, Any?> = mapOf(
+            "appId" to context?.appId,
+            "code" to context?.code,
+            "name" to context?.name,
+            "icon" to context?.icon,
+            "description" to context?.description
+        )
+        val params = ModelConvertUtils.encodeToJsonFromAny(paramMap).toString()
+        api?.request("showHelpCenter", params, { _ -> })
     }
 
     fun onPressClose() {
@@ -98,13 +102,19 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
     }
 
     fun onPressMore() {
-        val params = ModelConvertUtils.encodeToJsonFromAny(
-            arrayOf(
-                headerRight?.tools,
-                emptyMap<Any, Any>()
+        val param = listOf(
+            headerRight?.tools ?: emptyList<ToolGroup>(),
+            mapOf(
+                "appId" to context?.appId,
+                "code" to context?.code,
+                "name" to context?.name,
+                "icon" to context?.icon,
+                "description" to context?.description
             )
-        ).toString()
-        api?.request("showTools", params, {})
+        )
+
+        val params = ModelConvertUtils.encodeToJsonFromAny(param).toString()
+        api?.request("showTools", params, { _ -> })
     }
 
     fun getNavigationButtonConfig(

package/package.json

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