library: Cancel transition on quick click

miuix-kotlin-multiplatform · Oct 20, 2024 · a85b179 · a85b179
1 parent 9a0b5e9
commit a85b179
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,11 +9,13 @@ androidx-window = "1.3.0"
 compose-plugin = "1.7.0"
 dokka = "1.9.20"
 kotlin = "2.0.21"
+kotlinx-datetime = "0.6.0"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
 androidx-window = { group = "androidx.window", name = "window", version.ref = "androidx-window" }
 jetbrains-compose-window-size = { module = "org.jetbrains.compose.material3:material3-window-size-class", version.ref = "compose-plugin" }
+jetbrains-kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }

diff --git a/miuix/build.gradle.kts b/miuix/build.gradle.kts
@@ -47,6 +47,7 @@ kotlin {
             implementation(compose.ui)
             implementation(compose.components.resources)
             implementation(libs.jetbrains.compose.window.size)
+            implementation(libs.jetbrains.kotlinx.datetime)
         }
     }
 }

diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/utils/Indication.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/utils/Indication.kt
@@ -15,6 +15,7 @@ import androidx.compose.ui.node.DelegatableNode
 import androidx.compose.ui.node.DrawModifierNode
 import androidx.compose.ui.node.invalidateDraw
 import kotlinx.coroutines.launch
+import kotlinx.datetime.Clock
 
 /**
  * Miuix default [Indication] that draws a rectangular overlay when pressed.
@@ -37,6 +38,8 @@ class MiuixIndication(
         private var isHovered = false
         private var isFocused = false
         private var isPopupExpanded = false
+        private var lastClickTime = 0L
+        private val clickThreshold = 300L
         private val animatedAlpha = Animatable(0f)
 
         override fun onAttach() {
@@ -62,6 +65,11 @@ class MiuixIndication(
 
                         is PressInteraction.Cancel, is PressInteraction.Release -> {
                             isPressed = false
+                            val currentTime = Clock.System.now().toEpochMilliseconds()
+                            if (currentTime - lastClickTime < clickThreshold) {
+                                animatedAlpha.snapTo(0f)
+                            }
+                            lastClickTime = currentTime
                             if (!isHovered && !isFocused && !isPopupExpanded) {
                                 animatedAlpha.animateTo(0f)
                             } else if (isPopupExpanded) {