Merge pull request #125 from lcazalbasu/improvement/update-ontap-event-linechart

Improvement/Replace the onTap gesture from the LineChart with onPress

Author: ehsannarmani

compose-charts/build.gradle.kts

@@ -15,7 +15,7 @@ mavenPublishing{
     coordinates(
         groupId = "io.github.ehsannarmani",
         artifactId = "compose-charts",
-        version = "0.1.8"
+        version = "0.1.9"
     )
     pom{
         name.set("Compose Charts")

compose-charts/src/commonMain/kotlin/ir/ehsannarmani/compose_charts/LineChart.kt

@@ -246,29 +246,17 @@ fun LineChart(
         linesPathData.clear()
     }
 
-    var tapJob: Job? = null
-    var isDisplayingPopup = false
-    suspend fun hidePopup(
-        withAnimation: Boolean = true
-    ) {
-        val duration = if (withAnimation) {
-            300
-        } else {
-            0
-        }
-
-        popupAnimation.animateTo(0f, animationSpec = tween(duration))
+    suspend fun hidePopup() {
+        popupAnimation.animateTo(0f, animationSpec = tween(300))
         popups.clear()
         popupsOffsetAnimators.clear()
-        isDisplayingPopup = false
     }
 
     fun PointerInputScope.showPopup(
         data: List<Line>,
         size: IntSize,
         position: Offset
     ) {
-        isDisplayingPopup = true
         popups.clear()
 
         data.forEachIndexed { dataIndex, line ->
@@ -336,11 +324,13 @@ fun LineChart(
 
         scope.launch {
             if (popupAnimation.value != 1f && !popupAnimation.isRunning) {
-                popupAnimation.animateTo(1f, animationSpec = tween(500))
+                popupAnimation.animateTo(1f, animationSpec = popupProperties.animationSpec)
             }
         }
     }
 
+    var onPressJob: Job? = null
+
     Column(modifier = modifier) {
         if (labelHelperProperties.enabled) {
             LabelHelper(
@@ -389,27 +379,23 @@ fun LineChart(
                                 return@pointerInput
 
                             detectTapGestures(
-                                onTap = {
-                                    if (tapJob != null && tapJob?.isActive == true) {
-                                        tapJob?.cancel()
-                                        tapJob = null
+                                onPress = {
+                                    if (onPressJob?.isActive == true) {
+                                        onPressJob?.cancel()
+                                        onPressJob = null
                                     }
 
-                                    tapJob = scope.launch {
-                                        if (isDisplayingPopup) {
-                                            hidePopup(withAnimation = false)
-                                        }
-
+                                    onPressJob = scope.launch {
                                         showPopup(
                                             data = data,
                                             size = size,
                                             position = it
                                         )
 
-                                        delay(500)
-                                        if (isDisplayingPopup) {
-                                            hidePopup(withAnimation = true)
-                                        }
+                                        tryAwaitRelease()
+                                        delay(timeMillis = popupProperties.duration)
+
+                                        hidePopup()
                                     }
                                 },
                             )