@momo-kits/native-kits 0.89.30-rc.4 → 0.89.30-rc.6

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

@@ -3,7 +3,6 @@ package vn.momo.kits.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
@@ -13,14 +12,15 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
@@ -221,9 +221,6 @@ fun getTypeStyle(
  * @param iconLeft [String] the icon at the left of title
  * @param title [String] title of button
  * @param loading [Boolean] used when you want to use loading animation
- * @param enabled controls the enabled state of this button. When `false`,
- *     this component will not respond to user input, and it will appear
- *     visually disabled and disabled to accessibility services.
  * @param useTintColor [Boolean] controls color of the icon.
  */
 @Composable
@@ -235,23 +232,23 @@ fun Button(
     iconLeft: String = "",
     title: String = "Button",
     loading: Boolean = false,
-    enabled: Boolean = true,
     useTintColor: Boolean = true,
     isFull: Boolean = true,
     modifier: Modifier = Modifier,
 ) {
+    val testId = "btn_${type.toString().lowercase()}_$title"
     val customModifier = if (isFull) {
         modifier
             .fillMaxWidth()
             .clip(RoundedCornerShape(size.value.radius)).clickable(
-                enabled = enabled,
+                enabled = type != ButtonType.DISABLED,
                 onClick = onClick
             )
 
     } else {
         modifier
             .clip(RoundedCornerShape(size.value.radius)).clickable(
-                enabled = enabled,
+                enabled = type != ButtonType.DISABLED,
                 onClick = onClick
             )
     }
@@ -261,7 +258,10 @@ fun Button(
             .padding(horizontal = size.value.padding)
             .defaultMinSize(
                 minWidth = size.value.width
-            ).height(size.value.height),
+            ).height(size.value.height)
+            .semantics {
+                contentDescription = testId; testTag = testId
+            },
         horizontalArrangement = Arrangement.Center,
         verticalAlignment = Alignment.CenterVertically,
     ) {

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

@@ -110,7 +110,7 @@ fun IconButton(
             .then(getIconStyle(type))
             .clip(RoundedCornerShape(size.value.radius))
             .clickable(
-                enabled = type == ButtonType.DISABLED,
+                enabled = type != ButtonType.DISABLED,
                 onClick = onClick
             ),
         contentAlignment = Alignment.Center

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

@@ -36,7 +36,6 @@ fun Image(
     options: Options? = null,
     loading: Boolean = true,
 ) {
-    modifier.semantics {contentDescription = "img|$source"; testTag = "img|$source"}
     var imageOptions = Options()
     var imageState by remember { mutableStateOf(ImageState.Loading) }
 
@@ -51,7 +50,7 @@ fun Image(
 
     Box(modifier = modifier) {
         AsyncImage(
-            modifier = modifier,
+            modifier = Modifier.matchParentSize().semantics {contentDescription = "img|$source"; testTag = "img|$source"},
             model = source,
             contentDescription = null,
             contentScale = imageOptions.contentScale,

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

@@ -29,6 +29,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
@@ -198,7 +201,11 @@ fun Input(
         iconTintColor = disabledColor
     }
 
-    Column {
+    val testId = if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
+
+    Column(modifier = Modifier.semantics {
+        contentDescription = testId; testTag = testId
+    }) {
         BasicTextField(
             enabled = !disabled,
             readOnly = readOnly,

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

@@ -21,6 +21,9 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -51,7 +54,7 @@ fun InputDropDown(
     loading: Boolean = false,
     required: Boolean = false,
 ) {
-    var isFocused by remember { mutableStateOf(false) }
+    val isFocused by remember { mutableStateOf(false) }
 
     val disabledColor = AppTheme.current.colors.text.disable
     var textColor = AppTheme.current.colors.text.default
@@ -72,8 +75,11 @@ fun InputDropDown(
         iconTintColor = disabledColor
     }
 
+    val testId = if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
 
-    Column(modifier = Modifier.clickable(enabled = !disabled, onClick = onPress)) {
+    Column(modifier = Modifier.clickable(enabled = !disabled, onClick = onPress).semantics {
+        contentDescription = testId; testTag = testId
+    }) {
         Box {
             if (floatingValue.isNotEmpty() || floatingIcon.isNotEmpty()) {
                 Box(

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

@@ -27,6 +27,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTag
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardType
@@ -104,8 +107,11 @@ fun InputMoney(
         iconTintColor = disabledColor
     }
 
+    val testId = if (disabled) "input_${floatingValue}_disabled" else "input_$floatingValue"
 
-    Column {
+    Column(modifier =  Modifier.semantics {
+        contentDescription = testId; testTag = testId
+    }) {
         BasicTextField(
             enabled = !disabled,
             singleLine = true,

package/package.json

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