@momo-kits/native-kits 0.120.0-navigation.4 → 0.120.0-navigation.6

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

@@ -35,6 +35,7 @@ import vn.momo.kits.const.AppTheme
 data class HeaderRightData(
     val useShortcut: Boolean = false,
     val useMore: Boolean = false,
+    val useSystemTools: Boolean = true,
     val tools: List<ToolGroup> = emptyList(),
     val toolCallback: ((String) -> Unit)? = { _ -> }
 )
@@ -43,14 +44,16 @@ data class Tool(
     val key: String,
     val icon: String,
     val showBadge: Boolean = false,
-    val name: Map<String, String> = emptyMap()
+    val name: Map<String, String> = emptyMap(),
+    val showRightIcon: Boolean = true,
 ) {
     fun toMap(): Map<String, Any> {
         return mapOf(
             "key" to key,
             "icon" to icon,
             "showBadge" to showBadge,
-            "name" to name
+            "name" to name,
+            "showRightIcon" to showRightIcon
         )
     }
 }
@@ -160,6 +163,7 @@ private fun ToolkitHeaderRight(
         api?.request(
             "showTools",
             mapOf(
+                "useSystemTools" to headerRight?.useSystemTools,
                 "tools" to headerRight?.tools?.map { it.toMap() },
                 "context" to mapOf(
                     "appId" to context?.appId,

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

@@ -202,12 +202,10 @@ fun Footer(footer: @Composable (() -> Unit)? = null, keyboardSize: Dp = 0.dp, bo
         Modifier
             .offset(y = -keyboardSize)
             .shadow(
-                Colors.black_20.copy(alpha = 0.2f),
-                borderRadius = 0.dp,
-                10f,
+                color = Colors.black_20.copy(alpha = 0.05f),
+                blurRadius = 24f,
                 offsetX = 0.dp,
-                offsetY = (-2).dp,
-                spread = 1.dp
+                offsetY = (-4).dp
             )
             .background(AppTheme.current.colors.background.surface)
     ) {

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

@@ -144,11 +144,7 @@ fun InputSearch(
                 if (!it.isFocused && isBlurred) inputSearchProps.onBlur()
                 if (it.isFocused && !isBlurred) isBlurred = true
             },
-            onValueChange = {
-                val data = it.replace("\n", " ")
-                inputSearchProps.text.value = data
-                inputSearchProps.onChangeText(data)
-            },
+            onValueChange = inputSearchProps.onChangeText,
             decorationBox = { innerTextField ->
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Row(

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

@@ -18,11 +18,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.unit.dp
 import vn.momo.kits.const.AppTheme
-import vn.momo.kits.const.Colors
 import vn.momo.kits.const.Radius
 import vn.momo.kits.const.Spacing
 import vn.momo.kits.modifier.setAutomationId
@@ -34,7 +31,7 @@ fun PopupPromotion(
     onPress: (() -> Unit) = {},
     onClose: (() -> Unit) = {},
 ) {
-    Column(Modifier.semantics { testTag = "popup_notify" }) {
+    Column(Modifier.padding(horizontal = Spacing.M).setAutomationId("popup_notify")) {
         source.ifNotNull(
             Image(
                 source = source,

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

@@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -22,6 +21,8 @@ import androidx.compose.ui.unit.sp
 import vn.momo.kits.application.AppConfig
 import vn.momo.kits.application.AppLanguage
 import vn.momo.kits.modifier.noFeedbackClickable
+import vn.momo.kits.components.Text
+import vn.momo.kits.const.Typography
 
 val defaultBanner = TrustBannerData(
     content = mapOf(
@@ -120,9 +121,8 @@ fun TrustBanner(
             Text(
                 text = trustBanner.content[language] ?: "",
                 modifier = Modifier.padding(bottom = 8.dp),
-                lineHeight = 16.sp,
-                fontSize = 12.sp,
                 color = Color(contentColor),
+                style = Typography.descriptionDefaultRegular,
                 maxLines = 2
             )
             Row(
@@ -134,9 +134,8 @@ fun TrustBanner(
                 ) {
                     Text(
                         text = trustBanner.subContent[language] ?: "",
-                        lineHeight = 16.sp,
-                        fontSize = 12.sp,
                         color = Color(subContentColor),
+                        style = Typography.actionXsBold,
                         maxLines = 2
                     )
                     Icon(

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

@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.DialogProperties
@@ -122,4 +123,10 @@ fun NavigationContainer(initialScreen: @Composable () -> Unit, initialScreenTitl
             }
         }
     }
+
+    DisposableEffect(Unit) {
+        onDispose {
+            navigator.dispose()
+        }
+    }
 }

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/Navigator.kt

@@ -3,11 +3,20 @@ package vn.momo.kits.navigation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.navigation.NavController
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.IO
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 
 class Navigator(
     private val navController: NavController
 ) {
+    private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
+
     fun push(content: @Composable () -> Unit, title : String? = null, options: NavigationOptions? = null) {
         val route = DynamicScreenRegistry.register(content, title, options)
         navController.navigate(DynamicScreenRoute(route.id, route.title))
@@ -21,8 +30,11 @@ class Navigator(
     fun pop(count: Int = 1) {
         repeat(count) {
             if (navController.previousBackStackEntry != null){
-                DynamicScreenRegistry.unregister()
                 navController.popBackStack()
+                scope.launch {
+                    delay(350)
+                    DynamicScreenRegistry.unregisterLatestScreen()
+                }
             }
         }
     }
@@ -50,6 +62,10 @@ class Navigator(
         val route = DynamicScreenRegistry.registerModal(content, title, onDismiss)
         navController.navigate(DynamicModalRoute(route.id, route.title, isBottomSheet = true))
     }
+
+    fun dispose(){
+        scope.cancel()
+    }
 }
 
 val LocalNavigator = staticCompositionLocalOf<Navigator> {
@@ -74,22 +90,18 @@ data class DynamicScreen(
 )
 
 object DynamicScreenRegistry {
-    private val screens = arrayListOf<DynamicScreen>()
-    private val pendingUnregisterLists = arrayListOf<Int>()
+    private val screens = mutableMapOf<Int, DynamicScreen>()
     private var idCounter = 1
 
     fun register(content: @Composable () -> Unit, title: String?, options: NavigationOptions?): DynamicScreenRoute {
         val id = idCounter++
         val screenTitle = title ?: "StackScreen$id"
-        screens.add(
-            DynamicScreen(
-                id = id,
-                title = screenTitle,
-                content = content,
-                options = options
-            )
+        screens[id] = DynamicScreen(
+            id = id,
+            title = screenTitle,
+            content = content,
+            options = options
         )
-
         return DynamicScreenRoute(id, screenTitle)
     }
 
@@ -100,46 +112,31 @@ object DynamicScreenRegistry {
     ): DynamicModalRoute {
         val id = idCounter++
         val modalTitle = title ?: "ModalScreen$id"
-        screens.add(DynamicScreen(
+        screens[id] = DynamicScreen(
             id = id,
             title = modalTitle,
             content = content,
             onDismiss = onDismiss
-        ))
+        )
         return DynamicModalRoute(id, modalTitle)
     }
 
-    fun unregister() {
-        val last = screens.lastOrNull() ?: return
-        screens.removeLast()
-        screens.add(0, last)
-        if (!pendingUnregisterLists.contains(last.id)) {
-            pendingUnregisterLists.add(last.id)
-        }
+    fun unregisterLatestScreen() {
+        val lastEntry = screens.entries.lastOrNull() ?: return
+        val last = lastEntry.value
+        screens.remove(last.id)
     }
 
     fun unregisterAll(){
-        repeat(screens.size) {
-            unregister()
-        }
-    }
-
-    fun clearUnregisterListsIfNeeded(){
-        if(pendingUnregisterLists.isEmpty()) return
-
-        val toRemove = pendingUnregisterLists.toList()
-        for (id in toRemove) {
-            val index = screens.indexOfFirst { it.id == id }
-            if (index != -1) {
-                screens.removeAt(index)
-                pendingUnregisterLists.remove(id)
-            }
+        val ids = screens.keys.toList()
+        for (id in ids) {
+            unregisterLatestScreen()
         }
     }
 
-    fun getScreen(id: Int): DynamicScreen? = screens.find { it.id == id }
+    fun getScreen(id: Int): DynamicScreen? = screens[id]
 
     fun setOptions(id: Int, options: NavigationOptions){
-        screens.find { it.id == id }?.options = options
+        screens[id]?.options = options
     }
 }

package/compose/src/commonMain/kotlin/vn/momo/kits/navigation/StackScreen.kt

@@ -88,11 +88,6 @@ fun StackScreen(
         navigator.pop()
     }
 
-    LaunchedEffect(Unit){
-        delay(500)
-        DynamicScreenRegistry.clearUnregisterListsIfNeeded()
-    }
-
     CompositionLocalProvider(LocalNavigation provides navigation) {
         Box(Modifier.fillMaxSize().background(backgroundColor)) {
             Box(Modifier.zIndex(1f)) {
@@ -199,7 +194,7 @@ fun renderSearchAnimated(scrollState: ScrollState, inputSearchType: InputSearchT
     val minTopPadding = AppStatusBar.current
     val maxTopPadding = AppStatusBar.current + HEADER_HEIGHT.dp
     val minStartPadding = Spacing.M
-    val maxStartPadding = 52.dp
+    val maxStartPadding = if (options.hiddenBack) Spacing.M else 52.dp
     val minEndPadding = Spacing.M
     val maxEndPadding = when (val headerRight = options.headerRight) {
         is HeaderRight.Toolkit -> if (headerRight.useShortcut) 114.dp else 78.dp

package/ios/Application/HeaderRight.swift

@@ -6,17 +6,20 @@ public struct HeaderRightData {
     var useMore: Bool
     var tools: [ToolGroup]
     var toolCallback: ((String) -> Void)?
+    var useSystemTools: Bool
     
     public init(
         useShortcut: Bool = false,
         useMore: Bool = false,
         tools: [ToolGroup] = [],
-        toolCallback: ((String) -> Void)? = nil
+        toolCallback: ((String) -> Void)? = nil,
+        useSystemTools: Bool = true
     ) {
         self.useShortcut = useShortcut
         self.useMore = useMore
         self.tools = tools
         self.toolCallback = toolCallback
+        self.useSystemTools = useSystemTools
     }
 }
 
@@ -25,17 +28,20 @@ public struct Tool {
     var icon: String
     var showBadge: Bool
     var name: [String: String]
+    var showRightIcon: Bool
     
     public init(
         key: String,
         icon: String,
         name: [String: String] = [:],
-        showBadge: Bool = false
+        showBadge: Bool = false,
+        showRightIcon: Bool = true
     ) {
         self.key = key
         self.icon = icon
         self.showBadge = showBadge
         self.name = name
+        self.showRightIcon = showRightIcon
     }
     
     func toMap() -> [String: Any] {
@@ -43,7 +49,8 @@ public struct Tool {
             "key": key,
             "icon": icon,
             "showBadge": showBadge,
-            "name": name
+            "name": name,
+            "showRightIcon": showRightIcon
         ]
     }
 }
@@ -131,6 +138,7 @@ struct ToolkitHeaderRight: View {
     private func onPressMore() {
         let context = environment.applicationContext
         let params: [String: Any] = [
+            "useSystemTools": headerRight?.useSystemTools,
             "tools": headerRight?.tools.map { $0.toMap() } ?? [],
             "context": [
                 "appId": context?.appId,

package/ios/Popup/PopupDisplay.swift

@@ -72,7 +72,7 @@ public struct PopupDisplay: View {
                                     .fill(Color.gray.opacity(0.3))
                                     .frame(maxWidth: .infinity, maxHeight: 184)
                             }
-                            .aspectRatio(2, contentMode: .fit)
+                            .aspectRatio(1.777, contentMode: .fit)
                             .frame(maxWidth: .infinity, alignment: .center)
                             .clipShape(RoundedCorner(radius: 15, corners: [.topLeft, .topRight]))
                             .clipped()
@@ -100,7 +100,7 @@ public struct PopupDisplay: View {
                                                 }
                                         })
                                 }
-                                .frame(height: 60)
+                                .frame(height: 80)
                             } else {
                                 Text(description)
                                     .font(.paragraph)
@@ -110,7 +110,7 @@ public struct PopupDisplay: View {
                                         Color.clear
                                             .onAppear {
                                                 textHeight = geo.size.height
-                                                isScrollable = textHeight > 60 // adjust threshold to ~3 lines
+                                                isScrollable = textHeight > 70 // adjust threshold to ~3 lines
                                             }
                                     })
                             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.120.0-navigation.4",
+  "version": "0.120.0-navigation.6",
   "private": false,
   "dependencies": {},
   "devDependencies": {},