Merge pull request #211 from tarkalabs/mahi/enhance/TUITextRow

Code Optimised in TUITextRow
tarkalabs · Mar 5, 2024 · 6426e1e · 6426e1e
2 parents aca4c2e + 7e2742e
commit 6426e1e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/tarka-ui/build.gradle.kts b/tarka-ui/build.gradle.kts
@@ -66,7 +66,7 @@ publishing {
       run {
         groupId = "com.tarkalabs"
         artifactId = getLibraryArtifactId()
-        version = "1.1.5"
+        version = "1.1.6"
         artifact("$buildDir/outputs/aar/tarka-ui-release.aar")
       }
     }

diff --git a/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/TUITextRow.kt b/tarka-ui/src/main/java/com/tarkalabs/tarkaui/components/TUITextRow.kt
@@ -161,13 +161,16 @@ import com.tarkalabs.tarkaui.theme.TUITheme
             contentDescription = infoIcon.contentDescription,
             tint = TUITheme.colors.utilityOutline,
             modifier = Modifier
-              .then(if (onInfoIconClick == null) Modifier else Modifier.clickable(onClick = {
-                if (menuItemList.isNullOrEmpty()) {
-                  onInfoIconClick()
-                } else {
-                  expanded = expanded.not()
-                }
-              }))
+              .then(
+                if (onInfoIconClick == null && menuItemList.isNullOrEmpty()) Modifier else Modifier.clickable(
+                  onClick = {
+                    if (!menuItemList.isNullOrEmpty()) {
+                      expanded = !expanded
+                    } else {
+                      onInfoIconClick?.invoke()
+                    }
+                  })
+              )
               .height(40.dp)
               .width(24.dp)
               .testTag(tags.infoIconTag)