@momo-kits/native-kits 0.113.3-beta.6 → 0.113.3-pu.1

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

@@ -0,0 +1,58 @@
+package vn.momo.kits.application
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
+import vn.momo.kits.components.InputSearch
+import vn.momo.kits.components.InputSearchProps
+import vn.momo.kits.const.Radius
+import vn.momo.kits.const.Spacing
+
+@Composable
+fun AnimationSearchInput(
+    animations: HeaderAnimations,
+    inputSearchProps: InputSearchProps
+) {
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .offset(
+                x = animations.translateX.dp,
+                y = animations.translateY.dp
+            )
+    ) {
+        Box(
+            modifier = Modifier
+                .height(HEADER_HEIGHT.dp)
+                .padding(vertical = Spacing.S)
+                .zIndex(1f)
+        ) {
+            Box(
+                modifier = Modifier
+                    .width(animations.width.dp)
+                    .background(
+                        color = animations.backgroundSearch,
+                        shape = RoundedCornerShape(Radius.XL)
+                    )
+            ) {
+                InputSearch(
+                    inputSearchProps = inputSearchProps.copy(
+                        showButtonText = false,
+                        backgroundColor = Color.Transparent
+                    )
+                )
+            }
+        }
+    }
+
+}

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

@@ -26,6 +26,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTag
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -47,10 +48,11 @@ fun Header(
     title: String,
     headerRight: @Composable (() -> Unit)? = null,
     goBack: (() -> Unit)? = null,
-    opacity: Float? = null,
+    opacity: Float = 1f,
     animatedHeader: AnimatedHeader? = null,
     scrollState: Int = 0,
     inputSearchProps: InputSearchProps? = null,
+    headerRightWidth: Dp = 0.dp,
     useAnimationSearch: Boolean = false
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
@@ -65,6 +67,12 @@ fun Header(
             .distinctUntilChanged()
             .collect { fraction -> colorFraction = fraction }
     }
+    val animations = useHeaderSearchAnimation(
+        opacityAni = opacity,
+        scrollState = scrollState,
+        headerRightWidth = headerRightWidth,
+        isBack = goBack != null
+    )
 
     val backgroundSearch = animateColor(
         Colors.black_01,
@@ -72,15 +80,18 @@ fun Header(
         colorFraction
     )
 
+    val searchAnimationEnable =
+        inputSearchProps != null && useAnimationSearch && headerType == HeaderType.EXTENDED
+
     if (headerType != HeaderType.NONE) {
         BoxWithConstraints(
-            Modifier.height(statusBarHeight + 52.dp)
+            Modifier.height(statusBarHeight + HEADER_HEIGHT.dp)
                 .fillMaxWidth()
                 .zIndex(10f),
             contentAlignment = Alignment.BottomCenter
         ) {
             Row(
-                modifier = Modifier.height(52.dp)
+                modifier = Modifier.height(HEADER_HEIGHT.dp)
                     .fillMaxWidth()
                     .padding(horizontal = Spacing.M),
                 verticalAlignment = Alignment.CenterVertically,
@@ -120,7 +131,7 @@ fun Header(
 
                 if (useAnimationSearch || inputSearchProps == null) {
                     Box(Modifier.graphicsLayer {
-                        alpha = if (animatedHeader !== null) opacity ?: 1f else 1f
+                        alpha = if (animatedHeader !== null) opacity else 1f
                     }) {
                         headerRight?.invoke()
                     }
@@ -129,7 +140,7 @@ fun Header(
 
             // Title
             Row(
-                modifier = Modifier.height(52.dp)
+                modifier = Modifier.height(HEADER_HEIGHT.dp)
                     .fillMaxWidth()
                     .padding(horizontal = Spacing.M),
                 verticalAlignment = Alignment.CenterVertically,
@@ -143,9 +154,9 @@ fun Header(
                     Box(
                         Modifier.weight(1f).graphicsLayer {
                             alpha = if (useAnimationSearch) {
-                                1f - (opacity ?: 1f)
+                                1f - (opacity)
                             } else {
-                                if (animatedHeader !== null) opacity ?: 1f else 1f
+                                if (animatedHeader !== null) opacity else 1f
                             }
                         },
                         contentAlignment = if (titlePosition == TitlePosition.LEFT) Alignment.TopStart else Alignment.Center
@@ -161,6 +172,13 @@ fun Header(
                     }
                 }
             }
+
+            if (searchAnimationEnable) {
+                AnimationSearchInput(
+                    animations = animations,
+                    inputSearchProps = inputSearchProps!!
+                )
+            }
         }
     }
 }

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

@@ -8,9 +8,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
-import vn.momo.kits.components.InputSearchProps
 import vn.momo.kits.const.AppStatusBar
 import vn.momo.kits.const.AppTheme
 import vn.momo.kits.platform.getStatusBarHeight
@@ -35,17 +32,13 @@ fun animateColor(start: Color, stop: Color, fraction: Float): Color {
 
 @Composable
 fun HeaderBackground(
-    isBack: Boolean = true,
     headerType: HeaderType = HeaderType.DEFAULT,
     scrollState: Int,
-    inputSearchProps: InputSearchProps? = null,
-    headerRightWidth: Dp = 0.dp,
-    useAnimationSearch: Boolean = false
 ) {
     val statusBarHeight = AppStatusBar.current ?: getStatusBarHeight()
 
     val opacityAni by animateFloatAsState(
-        targetValue = (1 - (scrollState / 52f)).coerceIn(0f, 1f),
+        targetValue = (1 - (scrollState / HEADER_HEIGHT*1f)).coerceIn(0f, 1f),
     )
 
     val backgroundColor by animateColorAsState(
@@ -66,12 +59,7 @@ fun HeaderBackground(
 
         HeaderType.EXTENDED -> {
             HeaderExtended(
-                scrollState = scrollState,
-                inputSearchProps = inputSearchProps,
-                headerRightWidth = headerRightWidth,
-                useAnimationSearch = useAnimationSearch,
                 opacityAni = opacityAni,
-                isBack = isBack,
                 statusBarHeight = statusBarHeight,
                 backgroundColor = backgroundColor,
             )

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

@@ -24,7 +24,7 @@ fun HeaderDefault(
     opacityAni: Float,
     statusBarHeight: Dp,
 ) {
-    val height = statusBarHeight + 52.dp
+    val height = statusBarHeight + HEADER_HEIGHT.dp
     Box(
         modifier = Modifier.fillMaxWidth().height(height)
             .background(AppTheme.current.colors.background.surface)

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

@@ -1,18 +1,10 @@
 package vn.momo.kits.application
 
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.geometry.Offset
@@ -22,115 +14,62 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.zIndex
 import vn.momo.kits.components.Image
-import vn.momo.kits.components.InputSearch
-import vn.momo.kits.components.InputSearchProps
 import vn.momo.kits.components.Options
 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.platform.getScreenDimensions
 import vn.momo.kits.utils.bottomBorder
 
 @Composable
 fun HeaderExtended(
     opacityAni: Float,
-    inputSearchProps: InputSearchProps?,
-    useAnimationSearch: Boolean = true,
-    scrollState: Int,
-    headerRightWidth: Dp,
-    isBack: Boolean,
     statusBarHeight: Dp,
     backgroundColor: Color
 ) {
-    val animations = useHeaderSearchAnimation(
-        opacityAni = opacityAni,
-        scrollState = scrollState,
-        headerRightWidth = headerRightWidth,
-        statusBarHeight = statusBarHeight,
-        isBack = isBack
-    )
-
     Box(
-        modifier = Modifier.fillMaxWidth()
-            .height(animations.height.dp)
-    ) {
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .height(154.dp)
-                .alpha(opacityAni)
-                .background(
-                    Brush.linearGradient(
-                        colors = listOf(
-                            Color(0xFFFDCADE),
-                            Color(0x00FDCADE)
-                        ),
-                        start = Offset(0f, 0f),
-                        end = Offset(0f, with(LocalDensity.current) { 154.dp.toPx() })
-                    )
-                )
-        ) {
-            if (AppTheme.current.assets.headerBackground != null) {
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .background(backgroundColor)
-                ) {
-                    Image(
-                        loading = false,
-                        source = AppTheme.current.assets.headerBackground!!,
-                        modifier = Modifier.fillMaxWidth().height(154.dp),
-                        options = Options(
-                            contentScale = ContentScale.FillWidth
-                        )
-                    )
-                }
-            }
-        }
-
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .alpha(1f - opacityAni)
-                .height(statusBarHeight + 52.dp)
-                .background(
-                    AppTheme.current.colors.background.surface
-                )
-                .bottomBorder(
-                    strokeWidth = 1.dp,
-                    color = AppTheme.current.colors.border.default
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(154.dp)
+            .alpha(opacityAni)
+            .background(
+                Brush.linearGradient(
+                    colors = listOf(
+                        Color(0xFFFDCADE),
+                        Color(0x00FDCADE)
+                    ),
+                    start = Offset(0f, 0f),
+                    end = Offset(0f, with(LocalDensity.current) { 154.dp.toPx() })
                 )
-        )
-        if (inputSearchProps != null && useAnimationSearch) {
+            )
+    ) {
+        if (AppTheme.current.assets.headerBackground != null) {
             Box(
                 modifier = Modifier
-                    .height(52.dp)
-                    .offset(
-                        x = animations.translateX.dp
-                    )
-                    .padding(vertical = Spacing.S)
-                    .align(Alignment.BottomStart)
-                    .zIndex(1f)
+                    .fillMaxWidth()
+                    .background(backgroundColor)
             ) {
-                Box(
-                    modifier = Modifier
-                        .width(animations.width.dp)
-                        .background(
-                            color = animations.backgroundSearch,
-                            shape = RoundedCornerShape(Radius.XL)
-                        )
-                ) {
-                    InputSearch(
-                        inputSearchProps = inputSearchProps.copy(
-                            showButtonText = false,
-                            backgroundColor = Color.Transparent
-                        )
+                Image(
+                    loading = false,
+                    source = AppTheme.current.assets.headerBackground!!,
+                    modifier = Modifier.fillMaxWidth().height(154.dp),
+                    options = Options(
+                        contentScale = ContentScale.FillWidth
                     )
-                }
+                )
             }
         }
     }
+
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .alpha(1f - opacityAni)
+            .height(statusBarHeight + HEADER_HEIGHT.dp)
+            .background(
+                AppTheme.current.colors.background.surface
+            )
+            .bottomBorder(
+                strokeWidth = 1.dp,
+                color = AppTheme.current.colors.border.default
+            )
+    )
 }

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

@@ -115,11 +115,12 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
     }
 
     fun onPressClose() {
-        api?.request("dismiss", "", {_ -> })
+        api?.request("dismiss", "", { _ -> })
     }
 
     fun onPressMore() {
-        api?.request("showTools",
+        api?.request(
+            "showTools",
             mapOf(
                 "tools" to headerRight?.tools?.map { it.toMap() },
                 "context" to mapOf(
@@ -127,7 +128,11 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
                     "code" to context?.appCode,
                     "name" to context?.appName,
                     "icon" to context?.appIcon,
-                    "description" to context?.description
+                    "description" to context?.description,
+                    "support" to context?.support,
+                    "toolkitConfig" to context?.toolkitConfig,
+                    "providerId" to context?.providerId,
+                    "permissions" to context?.permissions
                 )
             )
         ) { response ->
@@ -180,10 +185,18 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
         group.items.any { it.showBadge }
     }
 
+    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
+    }
+
     Row(
         verticalAlignment = Alignment.CenterVertically
     ) {
-        if (headerRight?.useShortcut == true) {
+        if (isShowShortcut) {
             NavigationButton(
                 disabled = isLoading,
                 icon = navButtonConfig.icon,
@@ -197,20 +210,26 @@ fun ToolkitHeaderRight(headerRight: HeaderRightData? = null) {
             modifier = Modifier
                 .padding(start = Spacing.S)
                 .border(0.2.dp, Color(0x33000000), shape = RoundedCornerShape(14.dp))
-                .width(65.dp)
+                .width(toolkitWidth)
                 .height(28.dp)
                 .clip(shape = RoundedCornerShape(14.dp))
                 .background(Color(0x99FFFFFF))
         ) {
-            Icon(source = "help_center", size = 20.dp, modifier = Modifier.padding(4.dp).clickable {
-                onPressHelpCenter()
-            })
-            Box(
-                modifier = Modifier
-                    .width(0.5.dp)
-                    .height(12.dp)
-                    .background(Colors.black_20)
-            )
+            if (context != null) {
+                Icon(
+                    source = "help_center",
+                    size = 20.dp,
+                    modifier = Modifier.padding(4.dp).clickable {
+                        onPressHelpCenter()
+                    })
+                Box(
+                    modifier = Modifier
+                        .width(0.5.dp)
+                        .height(12.dp)
+                        .background(Colors.black_20)
+                )
+            }
+
             Icon(
                 source = "16_navigation_close_circle",
                 size = 20.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
@@ -48,12 +49,16 @@ data class MiniAppContext(
     val appId: String = "",
     val appCode: String = "",
     val description: Any? = null,
+    val support: Map<String, Any?> = emptyMap(),
+    val toolkitConfig: Map<String, Any?> = emptyMap(),
+    val providerId: String = "",
+    val permissions: List<Map<String, Any>>? = emptyList()
 )
 
 val PlatformApi = staticCompositionLocalOf<Any?> { null }
 
-val AppNavigator = staticCompositionLocalOf<Navigator> {
-    error("no navigator provided!")
+val AppNavigator = staticCompositionLocalOf<Navigator?> {
+    null
 }
 
 val ApplicationContext = staticCompositionLocalOf<MiniAppContext?> {

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

@@ -47,6 +47,8 @@ enum class HeaderType {
     NONE
 }
 
+const val HEADER_HEIGHT = 52
+
 @Composable
 fun Screen(
     backgroundColor: Color? = null,
@@ -85,7 +87,7 @@ fun Screen(
     val bottomPadding = min(indicator, 21.dp)
 
     val opacity by animateFloatAsState(
-        targetValue = ((scrollState.value / 52f)).coerceIn(0f, 1f),
+        targetValue = ((scrollState.value / HEADER_HEIGHT*1f)).coerceIn(0f, 1f),
     )
 
     val headerAnimated =
@@ -101,10 +103,7 @@ fun Screen(
         if (animatedHeader === null) {
             HeaderBackground(
                 headerType = headerType,
-                scrollState = scrollState.value,
-                inputSearchProps= inputSearchProps,
-                useAnimationSearch = useAnimationSearch,
-                headerRightWidth = headerRightWidth
+                scrollState = scrollState.value
             )
         } else {
             Box(
@@ -113,21 +112,17 @@ fun Screen(
                     .graphicsLayer { alpha = opacity }
             ) {
                 HeaderBackground(
-                    isBack = isBack,
                     headerType = headerType,
-                    scrollState = scrollState.value,
-                    inputSearchProps= inputSearchProps,
-                    useAnimationSearch = useAnimationSearch,
-                    headerRightWidth = headerRightWidth
+                    scrollState = scrollState.value
                 )
             }
         }
-
         Header(
             headerType = headerType,
             title = title,
             titlePosition = titlePosition,
             headerRight = headerRight,
+            headerRightWidth = headerRightWidth,
             goBack = goBack,
             opacity = opacity,
             animatedHeader = animatedHeader,
@@ -138,7 +133,7 @@ fun Screen(
 
         Column(
             modifier = Modifier.fillMaxSize()
-                .padding(top = if (animatedHeader === null && headerType !== HeaderType.NONE) statusBarHeight + 52.dp else 0.dp)
+                .padding(top = if (animatedHeader === null && headerType !== HeaderType.NONE) statusBarHeight + HEADER_HEIGHT.dp else 0.dp)
                 .pointerInput(Unit) {
                     detectTapGestures(onTap = {
                         keyboardController?.hide()
@@ -162,11 +157,11 @@ fun Screen(
                     headerAnimated()
                     Column {
                         if (animatedHeader !== null) {
-                            Spacer(modifier = Modifier.padding(top = statusBarHeight + 52.dp + layoutOffset))
+                            Spacer(modifier = Modifier.padding(top = statusBarHeight + HEADER_HEIGHT.dp + layoutOffset))
                         }
 
                         if (useAnimationSearch && inputSearchProps != null && headerType == HeaderType.EXTENDED) {
-                            Spacer(modifier = Modifier.padding(top = statusBarHeight))
+                            Spacer(modifier = Modifier.padding(top = (HEADER_HEIGHT.dp + Spacing.S)))
                         }
                         content()
                     }

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

@@ -16,7 +16,7 @@ data class HeaderAnimations(
     val backgroundSearch: Color,
     val translateX: Float,
     val width: Float,
-    val height: Float
+    val translateY: Float
 )
 
 private const val SCREEN_PADDING = 12
@@ -27,43 +27,39 @@ fun useHeaderSearchAnimation(
     opacityAni: Float,
     scrollState: Int,
     headerRightWidth: Dp,
-    statusBarHeight: Dp,
     isBack: Boolean
 ): HeaderAnimations {
     val screenWidth = getScreenDimensions().width
-    val leftPosition = if (isBack) (BACK_WIDTH + 20).dp else 20.dp
+    val leftPosition = if (isBack) (BACK_WIDTH + 20).dp else 12.dp
     val searchWidth = screenWidth - (SCREEN_PADDING * 2)
 
     val backgroundSearch by animateColorAsState(
         targetValue = animateColor(
-            AppTheme.current.colors.background.default,
             Colors.black_01,
+            AppTheme.current.colors.background.default,
             opacityAni
         ),
     )
 
     val animatedTranslateX by animateFloatAsState(
-        targetValue = (scrollState / 52f).coerceIn(0f, 1f) * (leftPosition.value - 12) + 12,
+        targetValue = (scrollState / HEADER_HEIGHT*1f).coerceIn(0f, 1f) * (leftPosition.value - 12) + 12,
     )
 
     val animatedWidth by animateFloatAsState(
-        targetValue = (scrollState / 52f).coerceIn(
+        targetValue = (scrollState / HEADER_HEIGHT*1f).coerceIn(
             0f,
             1f
         ) * ((searchWidth - leftPosition.value - headerRightWidth.value + 12) - searchWidth) + searchWidth,
     )
 
-    val animatedHeight by animateFloatAsState(
-        targetValue = (1 - (scrollState / 52f).coerceIn(
-            0f,
-            1f
-        )) * (statusBarHeight.value + 94 - (statusBarHeight.value + 52)) + (statusBarHeight.value + 52),
+    val animatedTranslateY by animateFloatAsState(
+        targetValue = (1 - (scrollState / HEADER_HEIGHT* 1f).coerceIn(0f, 1f)) * HEADER_HEIGHT
     )
     return HeaderAnimations(
         opacity = opacityAni,
         backgroundSearch = backgroundSearch,
         translateX = animatedTranslateX,
         width = animatedWidth,
-        height = animatedHeight
+        translateY = animatedTranslateY
     )
 }

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/PopupNotify.kt

@@ -143,7 +143,7 @@ fun PopupNotify(
             Modifier
                 .width(22.dp)
                 .height(22.dp)
-                .offset(x = Spacing.M / 2, y = -Spacing.M)
+                .offset(x = -(1).dp, y = (-11).dp)
                 .background(
                     color = AppTheme.current.colors.text.default,
                     shape = RoundedCornerShape(Radius.M)

package/ios/Application/ApplicationEnvironment.swift

@@ -13,20 +13,28 @@ public class MiniAppContext {
     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) {
+    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
         self.appIcon = appIcon
         self.description = description
+        self.support = support
+        self.toolkitConfig = toolkitConfig
+        self.providerId = providerId
+        self.permissions = permissions
     }
 }
 
 public class ApplicationEnvironment: ObservableObject {
     let applicationContext: MiniAppContext?
     let composeApi: KitComposeApi
-    
+
     public init(applicationContext: MiniAppContext?, composeApi: KitComposeApi) {
         self.applicationContext = applicationContext
         self.composeApi = composeApi

package/ios/Application/Components.swift

@@ -203,9 +203,7 @@ public struct Header: View {
                                 Text(title)
                                     .font(.headline)
                                     .foregroundColor(tintIconColor)
-                                    .frame(maxWidth: titlePosition == .center ? UIScreen.main.bounds.width - 252 : nil)
-                                    .frame(maxWidth: titlePosition == .center ? .infinity : UIScreen.main.bounds.width - 172, alignment: titlePosition == .center ? .center : .leading)
-                                    .lineLimit(1)
+                                    .frame(maxWidth: titlePosition == .center ? .infinity : nil, alignment: titlePosition == .center ? .center : .leading)
                             }
                             Spacer()
                         }

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,7 +92,7 @@ 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(
@@ -102,7 +102,7 @@ struct ToolkitHeaderRight: View {
             isFavorite.toggle()
         }
     }
-    
+
     private func onPressHelpCenter() {
         let context = environment.applicationContext
         let paramMap: [String: Any] = [
@@ -117,14 +117,15 @@ struct ToolkitHeaderRight: View {
             params: paramMap
         ) { _ in }
     }
-    
+
     private func onPressClose() {
         environment.composeApi.request(
             funcName: "dismiss",
             params: ""
         ) { _ in }
     }
-    
+
+
     private func onPressMore() {
         let context = environment.applicationContext
         let params: [String: Any] = [
@@ -134,7 +135,11 @@ struct ToolkitHeaderRight: View {
                 "code": context?.appCode,
                 "name": context?.appName,
                 "icon": context?.appIcon,
-                "description": context?.description
+                "description": context?.description,
+                 "support": context?.support,
+                 "toolkitConfig": context?.toolkitConfig,
+                 "providerId": context?.providerId,
+                 "permissions": context?.permissions
             ]
         ]
         environment.composeApi.request(
@@ -152,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
@@ -167,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(
@@ -186,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 {
@@ -221,7 +226,7 @@ struct NavigationButton: View {
     var icon: String
     var showBadge: Bool
     var onClick: () -> Void
-    
+
     var body: some View {
         ZStack {
             Circle()
@@ -230,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)

package/ios/Application/Screen.swift

@@ -34,7 +34,7 @@ public struct Screen<Content: View>: View {
         verticalAlignment: VerticalAlignment = .top,
         horizontalAlignment: HorizontalAlignment = .leading,
         title: String = "Stack",
-        titlePosition: TitlePosition = .left,
+        titlePosition: TitlePosition = .center,
         goBack: (() -> Void)? = nil,
         scrollable: Bool = true,
         onContentLayout: ((CGRect) -> Void)? = nil,

package/ios/Popup/PopupDisplay.swift

@@ -46,8 +46,8 @@ public struct PopupDisplay: View {
                         .overlay(RoundedRectangle(cornerRadius: Radius.L).stroke(Colors.black01, lineWidth: 1))
                 }.foregroundColor(Colors.black20)
                     .background(Colors.black01.cornerRadius(15))
-                    .padding(.trailing, -Spacing.M )
-                    .padding(.top, -Spacing.M)
+                    .padding(.trailing, -11)
+                    .padding(.top, -11)
                     .zIndex(1)
                     .accessibility(identifier: "ic_popup_close")
 

package/ios/Swipeable/SwipeCell.swift

@@ -10,9 +10,9 @@ public struct SwipeCellModifier: ViewModifier {
     var trailingSideGroup: [SwipeCellActionItem] = []
     @Binding var currentUserInteractionCellID: String?
     var settings: SwipeCellSettings = .init()
-    
+
     @State private var offsetX: CGFloat = 0
-    
+
     let generator = UINotificationFeedbackGenerator()
     @State private var hapticFeedbackOccurred: Bool = false
     @State private var openSideLock: SwipeGroupSide?
@@ -22,15 +22,23 @@ public struct SwipeCellModifier: ViewModifier {
             if self.leadingSideGroup.isEmpty == false && self.offsetX != 0 {
                 self.swipeToRevealArea(swipeItemGroup: self.leadingSideGroup, side: .leading)
             }
-                
+
             if self.trailingSideGroup.isEmpty == false && self.offsetX != 0 {
                 self.swipeToRevealArea(swipeItemGroup: self.trailingSideGroup, side: .trailing)
             }
-                
+
             content
                 .offset(x: self.offsetX)
-                .gesture(DragGesture(minimumDistance: 30, coordinateSpace: .local).onChanged(self.dragOnChanged(value:)).onEnded(dragOnEnded(value:)))
-                    
+                .simultaneousGesture(
+                    DragGesture(minimumDistance: 30, coordinateSpace: .local)
+                        .onChanged { value in
+                            self.dragOnChanged(value: value)
+                        }
+                        .onEnded { value in
+                            self.dragOnEnded(value: value)
+                        }
+                )
+
         }.frame(width: cellWidth)
             .edgesIgnoringSafeArea(.horizontal)
             .clipped()
@@ -43,7 +51,7 @@ public struct SwipeCellModifier: ViewModifier {
                 }
             }
     }
-    
+
     internal func swipeToRevealArea(swipeItemGroup: [SwipeCellActionItem], side: SwipeGroupSide)->some View {
         HStack {
             if side == .trailing {
@@ -63,17 +71,17 @@ public struct SwipeCellModifier: ViewModifier {
                     }
                 }
             }.opacity(self.swipeRevealAreaOpacity(side: side))
-    
+
             if side == .leading {
                 Spacer()
             }
         }
     }
-    
+
     internal func buttonContentView(item: SwipeCellActionItem, group: [SwipeCellActionItem], side: SwipeGroupSide)->some View {
         ZStack {
             item.backgroundColor
-                
+
             HStack {
                 if self.warnSwipeOutCondition(side: side, hasSwipeOut: item.swipeOutAction) && item.swipeOutButtonView != nil {
                     item.swipeOutButtonView!()
@@ -81,28 +89,28 @@ public struct SwipeCellModifier: ViewModifier {
                     item.buttonView()
                 }
             }
-        
+
         }.frame(width: self.itemButtonWidth(item: item, itemGroup: group, side: side))
     }
-    
+
     internal func menuWidth(side: SwipeGroupSide)->CGFloat {
         switch side {
         case .leading:
             return self.leadingSideGroup.map { $0.buttonWidth }.reduce(0, +)
-          
+
         case .trailing:
             return self.trailingSideGroup.map { $0.buttonWidth }.reduce(0, +)
         }
     }
-    
+
     // MARK: drag gesture
-    
+
     internal func dragOnChanged(value: DragGesture.Value) {
         let horizontalTranslation = value.translation.width
         if self.nonDraggableCondition(horizontalTranslation: horizontalTranslation) {
             return
         }
-        
+
         if self.openSideLock != nil {
             // if one side is open, we need to add the menu width!
             let menuWidth = self.openSideLock == .leading ? self.menuWidth(side: .leading) : self.menuWidth(side: .trailing)
@@ -110,9 +118,9 @@ public struct SwipeCellModifier: ViewModifier {
             self.triggerHapticFeedbackIfNeeded(horizontalTranslation: horizontalTranslation)
             return
         }
-        
+
         self.triggerHapticFeedbackIfNeeded(horizontalTranslation: horizontalTranslation)
-        
+
         if horizontalTranslation > 8 || horizontalTranslation < -8 { // makes sure the swipe cell doesn't open too easily
             self.currentUserInteractionCellID = self.id
             self.offsetX = horizontalTranslation
@@ -120,11 +128,11 @@ public struct SwipeCellModifier: ViewModifier {
             self.offsetX = 0
         }
     }
-    
+
     internal func nonDraggableCondition(horizontalTranslation: CGFloat)->Bool {
         return self.offsetX == 0 && (self.leadingSideGroup.isEmpty && horizontalTranslation > 0 || self.trailingSideGroup.isEmpty && horizontalTranslation < 0)
     }
-    
+
     internal func dragOnEnded(value: DragGesture.Value) {
         let swipeOutTriggerValue = self.cellWidth * self.settings.swipeOutTriggerRatio
 
@@ -139,7 +147,7 @@ public struct SwipeCellModifier: ViewModifier {
                 } else {
                     self.lockSideMenu(side: .leading)
                 }
-                
+
             } else {
                 // leading group emtpy
                 self.setOffsetX(value: 0)
@@ -160,7 +168,7 @@ public struct SwipeCellModifier: ViewModifier {
             }
         }
     }
-    
+
     internal func triggerHapticFeedbackIfNeeded(horizontalTranslation: CGFloat) {
         let side: SwipeGroupSide = horizontalTranslation > 0 ? .leading : .trailing
         let group = side == .leading ? self.leadingSideGroup : self.trailingSideGroup
@@ -170,7 +178,7 @@ public struct SwipeCellModifier: ViewModifier {
             self.hapticFeedbackOccurred = true
         }
     }
-    
+
     internal func swipeOutItemWithHapticFeedback(group: [SwipeCellActionItem])->SwipeCellActionItem? {
         if let item = group.filter({ $0.swipeOutAction == true }).first {
             if item.swipeOutHapticFeedbackType != nil {
@@ -179,7 +187,7 @@ public struct SwipeCellModifier: ViewModifier {
         }
         return nil
     }
-    
+
     internal func swipeOutAction(item: SwipeCellActionItem, sideFactor: CGFloat) {
         if item.swipeOutIsDestructive {
             let swipeOutWidth = cellWidth + 10
@@ -188,12 +196,12 @@ public struct SwipeCellModifier: ViewModifier {
         } else {
             self.setOffsetX(value: 0) // open side lock set in function!
         }
-      
+
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
             item.actionCallback()
         }
     }
-    
+
     internal func lockSideMenu(side: SwipeGroupSide) {
         self.setOffsetX(value: side.sideFactor * self.menuWidth(side: side))
         self.openSideLock = side
@@ -214,7 +222,7 @@ public struct SwipeCellModifier: ViewModifier {
         let dynamicButtonWidth = self.dynamicButtonWidth(item: item, itemCount: itemGroup.count, side: side)
         let triggerValue = self.cellWidth * settings.swipeOutTriggerRatio
         let swipeOutActionCondition = side == .leading ? self.offsetX > triggerValue : self.offsetX < -triggerValue
-        
+
         if item.swipeOutAction && swipeOutActionCondition {
             return self.offsetX.magnitude + settings.addWidthMargin
         } else if swipeOutActionCondition && item.swipeOutAction == false && itemGroup.contains(where: { $0.swipeOutAction == true }) {
@@ -223,12 +231,12 @@ public struct SwipeCellModifier: ViewModifier {
             return dynamicButtonWidth
         }
     }
-    
+
     internal func dynamicButtonWidth(item: SwipeCellActionItem, itemCount: Int, side: SwipeGroupSide)->CGFloat {
         let menuWidth = self.menuWidth(side: side)
         return (self.offsetX.magnitude + settings.addWidthMargin) * (item.buttonWidth / menuWidth)
     }
-    
+
     internal func warnSwipeOutCondition(side: SwipeGroupSide, hasSwipeOut: Bool)->Bool {
         if hasSwipeOut == false {
             return false
@@ -236,11 +244,11 @@ public struct SwipeCellModifier: ViewModifier {
         let triggerValue = self.cellWidth * settings.swipeOutTriggerRatio
         return (side == .trailing && self.offsetX < -triggerValue) || (side == .leading && self.offsetX > triggerValue)
     }
-    
+
     internal func swipeRevealAreaOpacity(side: SwipeGroupSide)->Double {
         switch side {
         case .leading:
-        
+
             return self.offsetX > 5 ? 1 : 0
         case .trailing:
             return self.offsetX < -5 ? 1 : 0

package/package.json

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