@momo-kits/native-kits 0.89.33-beta.27 → 0.89.33-beta.30

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

@@ -17,6 +17,10 @@ val AppNavigator = staticCompositionLocalOf<Navigator> {
     error("no navigator provided!")
 }
 
+val PlatformApi = staticCompositionLocalOf<ComposeApi> {
+    error("no api provided!")
+}
+
 class Navigator {
     fun push(content: @Composable () -> Unit) {
     }
@@ -49,14 +53,23 @@ class Navigator {
     }
 }
 
+interface ComposeApi {
+    fun request(funcName: String, params: String?): String
+    fun request(funcName: String, params: String?, onResponse: ((String) -> Unit)?): String
+    fun requestCallback(funcName: String, params: String?, onResponse: ((String) -> Unit)?)
+    fun removeCallback(id: String)
+}
+
 @Composable
 fun ApplicationContainer(
     theme: Theme = defaultTheme,
+    composeApi: ComposeApi,
     content: @Composable () -> Unit,
 ) {
     disableOverscroll()
     CompositionLocalProvider(
         AppTheme provides theme,
+        PlatformApi provides composeApi,
         AppNavigator provides Navigator(),
         AppStatusBar provides getStatusBarHeight(),
     ) {

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

@@ -70,6 +70,7 @@ fun Screen(
     content: @Composable () -> Unit,
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
+    val platformApi = PlatformApi.current
     val keyboardController = LocalSoftwareKeyboardController.current
     val keyboardHeight = WindowInsets.ime.asPaddingValues().calculateBottomPadding()
     val keyboardSize = when {

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

@@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
@@ -30,7 +29,6 @@ import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import vn.momo.kits.const.AppTheme
@@ -46,7 +44,6 @@ fun RenderRightIconSearch(
     icon: String,
     color: Color,
     onClick: () -> Unit,
-    iconModifier: Modifier = Modifier
 ) {
     if (loading) {
         Box(Modifier.padding(horizontal = Spacing.S)) {
@@ -67,7 +64,7 @@ fun RenderRightIconSearch(
             source = icon,
             color = color,
             size = 24.dp,
-            modifier = iconModifier.padding(start = Spacing.S, end = 0.dp).clickable(
+            modifier = Modifier.padding(start = Spacing.S, end = 0.dp).clickable(
                 onClick = onClick,
                 interactionSource = remember { MutableInteractionSource() },
                 indication = null
@@ -93,12 +90,6 @@ data class InputSearchProps(
     val fontWeight: InputFontWeight = InputFontWeight.REGULAR,
     val keyboardType: KeyboardType = KeyboardType.Text,
     val backgroundColor: Color = Colors.black_01,
-    val clearCondition: (() -> Boolean)? = null,
-    val keyboardOptions: KeyboardOptions = KeyboardOptions.Default,
-    val keyboardActions: KeyboardActions = KeyboardActions.Default,
-    val modifier: Modifier = Modifier,
-    val iconModifier: Modifier = Modifier,
-    val onClearPress: () -> Unit = {}
 )
 
 @Composable
@@ -107,6 +98,7 @@ fun InputSearch(
         text = remember { mutableStateOf("") },
         iconColor = AppTheme.current.colors.text.default
     ),
+
 ) {
     var isFocused by remember { mutableStateOf(false) }
     var isBlurred = false
@@ -132,9 +124,8 @@ fun InputSearch(
                 lineHeight = 20.sp,
                 fontWeight = inputSearchProps.fontWeight.value
             ),
-            keyboardOptions = inputSearchProps.keyboardOptions.copy(keyboardType = inputSearchProps.keyboardType),
-            keyboardActions = inputSearchProps.keyboardActions,
-            modifier = inputSearchProps.modifier.height(36.dp).onFocusChanged {
+            keyboardOptions = KeyboardOptions.Default.copy(keyboardType = inputSearchProps.keyboardType),
+            modifier = Modifier.height(36.dp).onFocusChanged {
                 isFocused = it.isFocused
                 if (it.isFocused) {
                     inputSearchProps.onFocus()
@@ -146,12 +137,7 @@ fun InputSearch(
             decorationBox = { innerTextField ->
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     Row(
-                        modifier = Modifier.weight(
-                            inputSearchProps.showButtonText.ifTrue(
-                                8f,
-                                1f
-                            )
-                        )
+                        modifier = Modifier.weight(inputSearchProps.showButtonText.ifTrue(8f, 1f))
                             .background(
                                 inputSearchProps.backgroundColor,
                                 RoundedCornerShape(Radius.XL)
@@ -166,6 +152,7 @@ fun InputSearch(
                             ),
                             verticalAlignment = Alignment.CenterVertically
                         ) {
+                            //leading icon
                             Icon(
                                 source = "navigation_search",
                                 modifier = Modifier.padding(end = Spacing.XS),
@@ -181,14 +168,12 @@ fun InputSearch(
                                             lineHeight = 24.sp,
                                             fontWeight = inputSearchProps.fontWeight.value
                                         ),
-                                        maxLines = 1,
-                                        color = placeholderColor,
-                                        overflow = TextOverflow.Ellipsis
+                                        color = placeholderColor
                                     )
                                 }
                                 innerTextField()
                             }
-                            if (inputSearchProps.clearCondition?.invoke() == true || (isFocused && inputSearchProps.text.value.isNotEmpty())) {
+                            if (isFocused && inputSearchProps.text.value.isNotEmpty()) {
                                 Row {
                                     Spacer(Modifier.width(Spacing.XS))
                                     Icon(
@@ -196,10 +181,7 @@ fun InputSearch(
                                         size = 16.dp,
                                         color = AppTheme.current.colors.text.hint,
                                         modifier = Modifier.clickable(
-                                            onClick = {
-                                                inputSearchProps.text.value = ""
-                                                inputSearchProps.onClearPress.invoke()
-                                            },
+                                            onClick = { inputSearchProps.text.value = "" },
                                             interactionSource = remember { MutableInteractionSource() },
                                             indication = null
                                         )
@@ -210,8 +192,7 @@ fun InputSearch(
                                 inputSearchProps.loading,
                                 inputSearchProps.icon,
                                 iconTintColor,
-                                inputSearchProps.onRightIconPressed,
-                                iconModifier = inputSearchProps.iconModifier
+                                inputSearchProps.onRightIconPressed
                             )
                         }
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.89.33-beta.27",
+  "version": "0.89.33-beta.30",
   "private": false,
   "dependencies": {},
   "devDependencies": {},