@momo-kits/native-kits 0.157.1-debug → 0.157.1-skill.1-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.157.1-debug"
+        version = "0.157.1-skill.1-debug"
         summary = "IOS Shared module"
         homepage = "https://momo.vn"
         ios.deploymentTarget = "15.0"

package/compose/compose.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'compose'
-    spec.version                  = '0.156.6-beta.16'
+    spec.version                  = '0.157.1-beta.3'
     spec.homepage                 = 'https://momo.vn'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''

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

@@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -284,7 +285,6 @@ fun Button(
     val clickableModifier =
         if (isEnabled && !loading) {
             modifier
-                .then(if (isFull) Modifier.fillMaxWidth() else Modifier)
                 .clip(RoundedCornerShape(radius))
                 .clickable(
                     enabled = isEnabled && !loading,
@@ -295,45 +295,63 @@ fun Button(
                 .alpha(alpha)
         } else {
             modifier
-                .then(if (isFull) Modifier.fillMaxWidth() else Modifier)
                 .clip(RoundedCornerShape(radius))
         }
 
     val bgColor = getButtonBackgroundColor(loading, type)
     val textColor = getTextColor(loading, type)
 
-    Row(
-        modifier = clickableModifier
-            .padding(horizontal = animatedPadding)
-            .clip(RoundedCornerShape(radius))
-            .then(getTypeStyle(type, size = size, bgColor = bgColor))
-            .conditional(IsShowBaseLineDebug) {
-                border(1.dp, Colors.blue_03)
-            }
-            .padding(horizontal = sizeSpecs.padding)
-            .height(sizeSpecs.height),
-        horizontalArrangement = Arrangement.Center,
-        verticalAlignment = Alignment.CenterVertically,
+    val rootModifier = if (isFull) {
+        Modifier
+            .fillMaxWidth()
+            .wrapContentHeight()
+    } else {
+        Modifier
+    }
+
+    Box(
+        modifier = rootModifier.then(clickableModifier),
+        contentAlignment = Alignment.Center
     ) {
-        RenderIcon(
-            size = size,
-            isIconLeft = true,
-            useTintColor = useTintColor,
-            icon = iconLeft,
-            forceLoading = loading && loadingOnLeft,
-            bgColor = bgColor,
-            textColor = textColor
-        )
-        RenderTitle(size, title, textColor = textColor)
-        RenderIcon(
-            size = size,
-            isIconLeft = false,
-            useTintColor = useTintColor,
-            icon = iconRight,
-            forceLoading = loading && !loadingOnLeft,
-            bgColor = bgColor,
-            textColor = textColor
+        // Visual background (shrinks on press)
+        Box(
+            modifier = Modifier
+                .matchParentSize()
+                .padding(horizontal = animatedPadding)
+                .clip(RoundedCornerShape(radius))
+                .then(getTypeStyle(type, size = size, bgColor = bgColor))
+                .conditional(IsShowBaseLineDebug) {
+                    border(1.dp, Colors.blue_03)
+                }
         )
+
+        // Content
+        Row(
+            modifier = Modifier
+                .padding(horizontal = sizeSpecs.padding)
+                .height(sizeSpecs.height),
+            horizontalArrangement = Arrangement.Center,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            RenderIcon(
+                size = size,
+                isIconLeft = true,
+                useTintColor = useTintColor,
+                icon = iconLeft,
+                forceLoading = loading && loadingOnLeft,
+                bgColor = bgColor,
+                textColor = textColor
+            )
+            RenderTitle(size, title, textColor = textColor)
+            RenderIcon(
+                size = size,
+                isIconLeft = false,
+                useTintColor = useTintColor,
+                icon = iconRight,
+                forceLoading = loading && !loadingOnLeft,
+                bgColor = bgColor,
+                textColor = textColor
+            )
+        }
     }
 }
-

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

@@ -8,8 +8,11 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+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.size
@@ -221,7 +224,7 @@ private class TooltipPositionProvider(
 fun Tooltip(
     state: TooltipState,
     title: String? = null,
-    description: String? = null,
+    description: String,
     buttons: List<TooltipButton> = emptyList(),
     placement: TooltipPlacement = TooltipPlacement.TOP,
     align: TooltipAlign = TooltipAlign.CENTER,
@@ -260,7 +263,7 @@ fun Tooltip(
                     buttons = buttons,
                     placement = placement,
                     align = align,
-                    onPressClose = onPressClose ?: { state.hide() },
+                    onPressClose = onPressClose,
                 )
             }
         }
@@ -273,7 +276,7 @@ private fun TooltipPopupContent(
     buttons: List<TooltipButton>,
     placement: TooltipPlacement,
     align: TooltipAlign,
-    onPressClose: () -> Unit,
+    onPressClose: (() -> Unit)? = null,
 ) {
     val tooltipMaxWidth = 300.dp
     val tooltipShape = remember { RoundedCornerShape(Radius.S) }
@@ -282,6 +285,7 @@ private fun TooltipPopupContent(
         Column(
             modifier = Modifier
                 .widthIn(max = tooltipMaxWidth)
+                .width(IntrinsicSize.Max)
                 .background(Colors.black_17, tooltipShape)
                 .clip(tooltipShape)
                 .conditional(IsShowBaseLineDebug) {
@@ -289,8 +293,8 @@ private fun TooltipPopupContent(
                 }
                 .padding(Spacing.M)
         ) {
-            Row {
-                Column(modifier = Modifier.weight(1f, fill = false)) {
+            Row(Modifier.fillMaxWidth()) {
+                Column(modifier = Modifier.weight(1f)) {
                     if (!title.isNullOrEmpty()) {
                         Text(
                             text = title,
@@ -307,27 +311,29 @@ private fun TooltipPopupContent(
                             style = Typography.descriptionDefaultRegular,
                             color = Colors.black_01,
                             maxLines = 2,
-                            modifier = Modifier.padding(bottom = Spacing.M),
                             overflow = TextOverflow.Ellipsis,
                         )
                     }
                 }
-                Spacer(Modifier.width(Spacing.M))
-                Box(
-                    modifier = Modifier
-                        .size(20.dp)
-                        .activeOpacityClickable {
-                            onPressClose.invoke()
-                        }
-                ) {
-                    Icon(
-                        source = "navigation_close",
-                        size = 20.dp,
-                        color = Colors.black_01,
-                    )
+                if (onPressClose != null) {
+                    Spacer(Modifier.width(Spacing.M))
+                    Box(
+                        modifier = Modifier
+                            .size(20.dp)
+                            .activeOpacityClickable {
+                                onPressClose.invoke()
+                            }
+                    ) {
+                        Icon(
+                            source = "navigation_close",
+                            size = 20.dp,
+                            color = Colors.black_01,
+                        )
+                    }
                 }
             }
             if (buttons.isNotEmpty()) {
+                Spacer(Modifier.height(Spacing.M))
                 TooltipButtons(
                     buttons = buttons,
                     modifier = Modifier.align(Alignment.End),
@@ -486,6 +492,7 @@ private fun TooltipButtons(buttons: List<TooltipButton>, modifier: Modifier = Mo
                 TooltipSecondaryButton(
                     title = secondary.title ?: "",
                     onPress = secondary.onPress ?: {},
+                    modifier = Modifier.weight(1f, fill = false),
                 )
                 Spacer(modifier = Modifier.width(Spacing.S))
                 TooltipPrimaryButton(
@@ -518,6 +525,12 @@ private fun TooltipSingleButton(btn: TooltipButton) {
         )
     }
 }
+
+private const val MAX_BUTTON_LENGTH = 16
+
+private fun String.limitWithEllipsis(max: Int = 16): String {
+    return if (length > max) take(max) + "…" else this
+}
 @Composable
 private fun TooltipPrimaryButton(
     title: String,
@@ -525,7 +538,7 @@ private fun TooltipPrimaryButton(
 ) {
     Button(
         onClick = onPress,
-        title = title,
+        title = title.limitWithEllipsis(),
         type = ButtonType.SECONDARY,
         size = Size.MEDIUM,
         isFull = false,
@@ -535,20 +548,21 @@ private fun TooltipPrimaryButton(
 private fun TooltipSecondaryButton(
     title: String,
     onPress: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     Box(
-        modifier = Modifier
-            .clickable(
-                interactionSource = remember { MutableInteractionSource() },
-                indication = null,
-                onClick = onPress,
-            )
+        modifier = modifier
+            .activeOpacityClickable {
+                onPress()
+            }
             .padding(horizontal = Spacing.M, vertical = Spacing.S),
     ) {
         Text(
-            text = title,
+            text = title.limitWithEllipsis(),
             color = Colors.black_01,
             style = Typography.actionSBold,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
         )
     }
 }

package/gradle.properties

@@ -18,7 +18,7 @@ kotlin.apple.xcodeCompatibility.nowarn=true
 name="ComposeKits"
 group=vn.momo.kits
 artifact.id=kits
-version=0.157.1
+version=0.157.1-skill.1
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/ios/Input/InputPhoneNumber.swift

@@ -89,7 +89,7 @@ public struct InputPhoneNumber: View {
                         MomoText(placeholder, typography: size == .small ? .headerSSemibold : .headerMBold, color: Colors.black12)
                     }
                     
-                    TextField(placeholder, text: textBinding, onEditingChanged: { focused in
+                    TextField("", text: textBinding, onEditingChanged: { focused in
                         handleFocusChange(focused)
                     })
                     .keyboardType(.numberPad)
@@ -98,6 +98,7 @@ public struct InputPhoneNumber: View {
                     .applyPrimaryCursorColor()
                     .lineLimit(1)
                     .accessibility(identifier: accessibilityLabel ?? "")
+                    .accessibilityValue(textBinding.wrappedValue.isEmpty ? placeholder : textBinding.wrappedValue)
                 }
                 
                 // Clear button

package/local.properties

@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Dec 22 10:07:29 ICT 2025
+sdk.dir=/Users/phuc/Library/Android/sdk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/native-kits",
-  "version": "0.157.1-debug",
+  "version": "0.157.1-skill.1-debug",
   "private": false,
   "dependencies": {},
   "devDependencies": {},