@momo-kits/native-kits 0.114.1-beta.1 → 0.114.2-beta.1

package/compose/build.gradle.kts

@@ -41,7 +41,6 @@ kotlin {
                 implementation(libs.coil.multiplatform.core)
                 implementation(libs.coil.multiplatform.network.ktor)
                 implementation(libs.jetbrains.serialization.json)
-                implementation(libs.kotlinx.datetime)
             }
         }
         val androidMain by getting {

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

@@ -88,32 +88,8 @@ fun HeaderRight(
     }
 }
 
-private fun getNavigationButtonConfig(
-    headerRight: HeaderRightData? = null,
-    isFavorite: Boolean = false,
-    onPressShortcut: () -> Unit,
-    onPressMore: () -> Unit
-): NavigationButtonConfig {
-    val totalTools = headerRight?.tools?.sumOf { it.items.size } ?: 0
-    var icon = if (isFavorite) "pin_star_checked" else "pin_star"
-    var onClickHandler = onPressShortcut
-    if (totalTools > 1 || headerRight?.useMore == true) {
-        icon = "navigation_more_icon"
-        onClickHandler = onPressMore
-    } else if (totalTools == 1 && !headerRight?.tools.isNullOrEmpty()) {
-        val singleTool = headerRight?.tools?.first()?.items?.firstOrNull()
-        if (singleTool != null) {
-            icon = singleTool.icon
-            onClickHandler = {
-                headerRight.toolCallback?.invoke(singleTool.key)
-            }
-        }
-    }
-    return NavigationButtonConfig(icon, onClickHandler)
-}
-
 @Composable
-private fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
+fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
     var isFavorite by remember { mutableStateOf(false) }
     val isLoading by remember { mutableStateOf(false) }
     val api = PlatformApi.current as? ComposeApi
@@ -172,8 +148,34 @@ private fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
         }
     }
 
+    fun getNavigationButtonConfig(
+        tools: List<ToolGroup>? = emptyList(),
+        useMore: Boolean? = false,
+        isFavorite: Boolean = false,
+        onPressShortcut: () -> Unit,
+        onPressMore: () -> Unit
+    ): NavigationButtonConfig {
+        val totalTools = tools?.sumOf { it.items.size } ?: 0
+        var icon = if (isFavorite) "pin_star_checked" else "pin_star"
+        var onClickHandler = onPressShortcut
+        if (totalTools > 1 || useMore == true) {
+            icon = "navigation_more_icon"
+            onClickHandler = onPressMore
+        } else if (totalTools == 1 && !tools.isNullOrEmpty()) {
+            val singleTool = tools.first().items.firstOrNull()
+            if (singleTool != null) {
+                icon = singleTool.icon
+                onClickHandler = {
+                    headerRight?.toolCallback?.invoke(singleTool.key)
+                }
+            }
+        }
+        return NavigationButtonConfig(icon, onClickHandler)
+    }
+
     val navButtonConfig = getNavigationButtonConfig(
-        headerRight,
+        headerRight?.tools,
+        headerRight?.useMore,
         isFavorite,
         ::onPressShortcut,
         ::onPressMore
@@ -186,7 +188,7 @@ private fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
     val toolkitWidth = if (context !== null) 65.dp else 28.dp
 
     var isShowShortcut = headerRight?.useShortcut == true
-
+    //backup case context null of more icon
     if (headerRight?.useMore == true && context == null) {
         isShowShortcut = false
     }
@@ -262,7 +264,7 @@ fun NavigationButton(
         ) {
             Icon(
                 source = icon,
-                size = 20.dp
+                size = 16.dp
             )
         }
 

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

@@ -9,6 +9,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.unit.Dp
+import kotlinx.serialization.Serializable
 import vn.momo.kits.components.TrustBannerData
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
@@ -26,35 +27,20 @@ interface ComposeApi {
 }
 
 class Navigator {
-    fun push(content: @Composable () -> Unit) {
-        //implement
-    }
-    fun present(content: @Composable () -> Unit) {
-        //implement
-    }
-    fun reset(content: @Composable () -> Unit) {
-        //implement
-    }
-    fun pop() {
-        //implement
-    }
-    fun replace(content: @Composable () -> Unit) {
-        //implement
-    }
-    fun popToTop() {
-        //implement
-    }
+    fun push(content: @Composable () -> Unit) {}
+    fun present(content: @Composable () -> Unit) {}
+    fun reset(content: @Composable () -> Unit) {}
+    fun pop() {}
+    fun replace(content: @Composable () -> Unit) {}
+    fun popToTop() {}
     fun showModal(
         onClose: () -> Unit = {},
         canBackgroundClose: Boolean = true,
         content: @Composable () -> Unit,
     ) {
-        //implement
     }
 
-    fun showBottomSheet(content: @Composable () -> Unit) {
-        //implement
-    }
+    fun showBottomSheet(content: @Composable () -> Unit) {}
 }
 
 data class MiniAppContext(
@@ -71,8 +57,8 @@ data class MiniAppContext(
 
 val PlatformApi = staticCompositionLocalOf<Any?> { null }
 
-val AppNavigator = staticCompositionLocalOf<Navigator> {
-    error("no navigator provided!")
+val AppNavigator = staticCompositionLocalOf<Navigator?> {
+    null
 }
 
 val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {
@@ -83,10 +69,6 @@ val AppConfig = staticCompositionLocalOf<KitConfig?> {
     null
 }
 
-val AppLanguage = staticCompositionLocalOf<String?> {
-    null
-}
-
 data class KitConfig(
     val trustBanner: TrustBannerData? = null,
     val headerBar: String? = null,
@@ -100,7 +82,6 @@ fun ApplicationContainer(
     statusBarHeight: Dp? = AppStatusBar.current,
     applicationContext: MiniAppContext? = null,
     config: KitConfig? = null,
-    language: String? = null,
     content: @Composable () -> Unit,
 ) {
     var appTheme by remember { mutableStateOf(theme) }
@@ -129,8 +110,7 @@ fun ApplicationContainer(
         AppNavigator provides Navigator(),
         AppStatusBar provides appStatusBarHeight,
         ApplicationContext provides applicationContext,
-        AppConfig provides config,
-        AppLanguage provides language
+        AppConfig provides config
     ) {
         content()
     }

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

@@ -64,7 +64,7 @@ fun Screen(
     onContentLayout: ((LayoutCoordinates) -> Unit)? = null,
     useAvoidKeyboard: Boolean = true,
     footer: @Composable (() -> Unit)? = null,
-    headerRight: @Composable (() -> Unit)? = null,
+    headerRight: @Composable (() -> Unit)? = { HeaderRight() },
     fabProps: FabProps? = null,
     animatedHeader: AnimatedHeader? = null,
     layoutOffset: Dp = 56.dp,

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

@@ -21,6 +21,7 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -36,6 +37,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -154,7 +156,7 @@ fun ErrorView(errorMessage: String, errorSpacing: Boolean, hintText: String) {
 
 @Composable
 fun Input(
-    text: MutableState<String> = remember { mutableStateOf("") },
+    text: String = "",
     floatingValue: String = "",
     floatingValueColor: Color = AppTheme.current.colors.text.hint,
     floatingIcon: String = "",
@@ -181,6 +183,11 @@ fun Input(
     keyboardType: KeyboardType = KeyboardType.Text,
     modifier: Modifier = Modifier,
 ) {
+    // Handling state based on the `BasicTextField` concept
+    var textFieldValueState by remember { mutableStateOf(TextFieldValue(text = text)) }
+    val textFieldValue = textFieldValueState.copy(text = text)
+    var lastTextValue by remember(text) { mutableStateOf(text) }
+
     var isFocused by remember { mutableStateOf(false) }
     var passHidden by remember { mutableStateOf(false) }
     var isBlurred = false
@@ -209,10 +216,10 @@ fun Input(
     setAutomationId(testId)
     ) {
         BasicTextField(
+            value = text,
             enabled = !disabled,
             readOnly = readOnly,
             singleLine = true,
-            value = text.value,
             textStyle = TextStyle(
                 color = textColor,
                 fontSize = 16.sp,
@@ -229,7 +236,15 @@ fun Input(
                 if (!it.isFocused && isBlurred) onBlur()
                 if (it.isFocused && !isBlurred) isBlurred = true
             },
-            onValueChange = onChangeText,
+            onValueChange = { newValue ->
+                textFieldValueState.copy(text = newValue)
+                val stringChangedSinceLastInvocation = lastTextValue != newValue
+                lastTextValue = newValue
+
+                if (stringChangedSinceLastInvocation) {
+                    onChangeText(newValue)
+                }
+            },
             decorationBox = { innerTextField ->
                 // Floating Icon
                 if (floatingValue.isNotEmpty() || floatingIcon.isNotEmpty()) {
@@ -291,7 +306,7 @@ fun Input(
                             )
                         }
                         Box(Modifier.weight(1f)) {
-                            if (text.value.isEmpty()) {
+                            if (textFieldValue.text.isEmpty()) {
                                 Text(
                                     text = placeholder,
                                     style = TextStyle(
@@ -304,7 +319,7 @@ fun Input(
                             }
                             innerTextField()
                         }
-                        if (isFocused && text.value.isNotEmpty()) {
+                        if (isFocused && textFieldValue.text.isNotEmpty()) {
                             Row {
                                 Spacer(Modifier.width(Spacing.XS))
                                 Icon(
@@ -312,7 +327,10 @@ fun Input(
                                     size = 16.dp,
                                     color = AppTheme.current.colors.text.hint,
                                     modifier = Modifier.clickable(
-                                        onClick = { text.value = "" },
+                                        onClick = {
+                                            onChangeText("")
+                                            textFieldValueState = TextFieldValue(text = "")
+                                        },
                                         interactionSource = remember { MutableInteractionSource() },
                                         indication = null
                                     )

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

@@ -20,7 +20,6 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import vn.momo.kits.application.AppConfig
-import vn.momo.kits.application.AppLanguage
 import vn.momo.kits.modifier.noFeedbackClickable
 
 val defaultBanner = TrustBannerData(
@@ -63,10 +62,10 @@ fun TrustBanner(
     serviceName: String = "",
     screenName: String = "",
     onPress: ((Map<String, String>) -> Unit)? = null,
-    trackEvent: ((String, Map<String, String>) -> Unit)? = null
+    trackEvent: ((String, Map<String, String>) -> Unit)? = null,
+    language: String = "vi"
 ) {
     val appConfig = AppConfig.current
-    val language = AppLanguage.current ?: "vi"
     val trustBanner = appConfig?.trustBanner ?: defaultBanner
     val trackParams = mapOf(
         "service_name" to serviceName,

package/ios/Application/ApplicationEnvironment.swift

@@ -13,12 +13,12 @@ public class MiniAppContext {
     public var appName: Any? = nil
     public var appIcon: String = ""
     public var description: Any? = nil
-    public var support: [String: Any] = [:]
-    public var toolkitConfig: [String: Any] = [:]
-    public var providerId: String = "momo"
-    public var permissions: [[String: Any]] = []
-    
-    public init(appId: String, appCode: String, appName: Any? = nil, appIcon: String, description: Any? = nil, support: [String: Any] = [:], toolkitConfig: [String: Any] = [:], providerId: String = "momo", permissions: [[String: Any]] = []) {
+    public var support: Any? = nil
+    public var toolkitConfig: Any? = nil
+    public var providerId: String = ""
+    public var permissions: Any? = nil
+
+    public init(appId: String, appCode: String, appName: Any? = nil, appIcon: String, description: Any? = nil, support: Any? = nil, toolkitConfig: Any? = nil, providerId: String, permissions: Any? = nil) {
         self.appId = appId
         self.appCode = appCode
         self.appName = appName
@@ -31,20 +31,12 @@ public class MiniAppContext {
     }
 }
 
-public class KitConfig {
-    public var trustBanner: TrustBannerData? = nil
-    public var headerBar: String? = nil
-    public var headerGradient: String? = nil
-}
-
 public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
-    let composeApi: KitComposeApi?
-    let config: KitConfig?
-    
-    public init(applicationContext: MiniAppContext? = nil, composeApi: KitComposeApi? = nil, config: KitConfig? = nil) {
+    let composeApi: KitComposeApi
+
+    public init(applicationContext: MiniAppContext?, composeApi: KitComposeApi) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi
-        self.config = config
     }
 }

package/ios/Application/HeaderRight.swift

@@ -6,7 +6,7 @@ public struct HeaderRightData {
     var useMore: Bool
     var tools: [ToolGroup]
     var toolCallback: ((String) -> Void)?
-    
+
     public init(
         useShortcut: Bool = false,
         useMore: Bool = false,
@@ -25,7 +25,7 @@ public struct Tool {
     var icon: String
     var showBadge: Bool
     var name: [String: String]
-    
+
     public init(
         key: String,
         icon: String,
@@ -37,7 +37,7 @@ public struct Tool {
         self.showBadge = showBadge
         self.name = name
     }
-    
+
     func toMap() -> [String: Any] {
         return [
             "key": key,
@@ -51,7 +51,7 @@ public struct Tool {
 public struct ToolGroup {
     var title: [String: String]
     var items: [Tool]
-    
+
     public init(
         title: [String: String] = [:],
         items: [Tool]
@@ -59,7 +59,7 @@ public struct ToolGroup {
         self.title = title
         self.items = items
     }
-    
+
     func toMap() -> [String: Any] {
         return [
             "title": title,
@@ -79,7 +79,7 @@ public struct HeaderRight: View {
         self.headerRight = headerRight
     }
     var headerRight: HeaderRightData?
-    
+
     public var body: some View {
         HStack(alignment: .center) {
             ToolkitHeaderRight(headerRight: headerRight)
@@ -92,17 +92,17 @@ struct ToolkitHeaderRight: View {
     @State private var isFavorite: Bool = false
     @State private var isLoading: Bool = false
     @EnvironmentObject private var environment: ApplicationEnvironment
-    
+
     // MARK: - Actions
     private func onPressShortcut() {
-        environment.composeApi?.request(
+        environment.composeApi.request(
             funcName: "onToolAction",
             params: ["item": ["key": "onFavorite"]]
         ) { _ in
             isFavorite.toggle()
         }
     }
-    
+
     private func onPressHelpCenter() {
         let context = environment.applicationContext
         let paramMap: [String: Any] = [
@@ -112,19 +112,20 @@ struct ToolkitHeaderRight: View {
             "icon": context?.appIcon,
             "description": context?.description
         ]
-        environment.composeApi?.request(
+        environment.composeApi.request(
             funcName: "showHelpCenter",
             params: paramMap
         ) { _ in }
     }
-    
+
     private func onPressClose() {
-        environment.composeApi?.request(
+        environment.composeApi.request(
             funcName: "dismiss",
             params: ""
         ) { _ in }
     }
-    
+
+
     private func onPressMore() {
         let context = environment.applicationContext
         let params: [String: Any] = [
@@ -135,13 +136,13 @@ struct ToolkitHeaderRight: View {
                 "name": context?.appName,
                 "icon": context?.appIcon,
                 "description": context?.description,
-                "support": context?.support,
-                "toolkitConfig": context?.toolkitConfig,
-                "providerId": context?.providerId,
-                "permissions": context?.permissions
+                 "support": context?.support,
+                 "toolkitConfig": context?.toolkitConfig,
+                 "providerId": context?.providerId,
+                 "permissions": context?.permissions
             ]
         ]
-        environment.composeApi?.request(
+        environment.composeApi.request(
             funcName: "showTools",
             params: params
         ) { response in
@@ -156,12 +157,12 @@ struct ToolkitHeaderRight: View {
             }
         }
     }
-    
+
     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
@@ -171,16 +172,16 @@ struct ToolkitHeaderRight: View {
                 headerRight?.toolCallback?(singleTool.key)
             }
         }
-        
+
         return NavigationButtonConfig(icon: icon, onPress: onClickHandler)
     }
-    
+
     var body: some View {
         let navButtonConfig = getNavigationButtonConfig()
         let showBadge = headerRight?.tools.contains { group in
             group.items.contains { $0.showBadge }
         } ?? false
-        
+
         HStack(alignment: .center) {
             if headerRight?.useShortcut == true {
                 NavigationButton(
@@ -190,18 +191,18 @@ struct ToolkitHeaderRight: View {
                     onClick: navButtonConfig.onPress
                 )
             }
-            
+
             HStack(alignment: .center, spacing: 0) {
                 Icon(source: "help_center", size: 20)
                     .padding(4)
                     .onTapGesture {
                         onPressHelpCenter()
                     }
-                
+
                 Rectangle()
                     .fill(Colors.black20)
                     .frame(width: 0.5, height: 12)
-                
+
                 Icon(source: "16_navigation_close_circle", size: 20, color: Colors.black17)
                     .padding(4)
                     .onTapGesture {
@@ -225,7 +226,7 @@ struct NavigationButton: View {
     var icon: String
     var showBadge: Bool
     var onClick: () -> Void
-    
+
     var body: some View {
         ZStack {
             Circle()
@@ -234,9 +235,9 @@ struct NavigationButton: View {
                     Circle()
                         .stroke(Color.black.opacity(0.2), lineWidth: 0.2)
                 )
-            
+
             Icon(source: icon, size: 16)
-            
+
             if showBadge {
                 BadgeDot(size: .small)
                     .offset(x: -2, y: -2)