@momo-kits/native-kits 0.157.2-debug → 0.157.3-debug

package/compose/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
     }
 
     cocoapods {
-        version = "0.157.2-debug"
+        version = "0.157.3-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/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,
@@ -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,7 +311,6 @@ private fun TooltipPopupContent(
                             style = Typography.descriptionDefaultRegular,
                             color = Colors.black_01,
                             maxLines = 2,
-                            modifier = Modifier.padding(bottom = Spacing.M),
                             overflow = TextOverflow.Ellipsis,
                         )
                     }
@@ -330,6 +333,7 @@ private fun TooltipPopupContent(
                 }
             }
             if (buttons.isNotEmpty()) {
+                Spacer(Modifier.height(Spacing.M))
                 TooltipButtons(
                     buttons = buttons,
                     modifier = Modifier.align(Alignment.End),
@@ -488,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(
@@ -520,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,
@@ -527,7 +538,7 @@ private fun TooltipPrimaryButton(
 ) {
     Button(
         onClick = onPress,
-        title = title,
+        title = title.limitWithEllipsis(),
         type = ButtonType.SECONDARY,
         size = Size.MEDIUM,
         isFull = false,
@@ -537,18 +548,21 @@ private fun TooltipPrimaryButton(
 private fun TooltipSecondaryButton(
     title: String,
     onPress: () -> Unit,
+    modifier: Modifier = Modifier,
 ) {
     Box(
-        modifier = Modifier
+        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.2
+version=0.157.3
 
 repo=GitLab
 url=https://gitlab.mservice.com.vn/api/v4/projects/5400/packages/maven

package/package.json

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