library: SuperBottomSheet: improve drag logic

Author: YuKongA

iosApp/iosApp/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.5</string>
 	<key>CFBundleVersion</key>
-	<string>568</string>
+	<string>569</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperBottomSheet.kt

@@ -39,6 +39,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.input.pointer.util.VelocityTracker
 import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.font.FontWeight
@@ -54,6 +55,7 @@ import top.yukonga.miuix.kmp.utils.G2RoundedCornerShape
 import top.yukonga.miuix.kmp.utils.MiuixPopupUtils.Companion.DialogLayout
 import top.yukonga.miuix.kmp.utils.PredictiveBackHandler
 import top.yukonga.miuix.kmp.utils.getWindowSize
+import kotlin.math.abs
 
 /**
  * A bottom sheet that slides up from the bottom of the screen.
@@ -338,6 +340,7 @@ private fun DragHandleArea(
     val isPressing = remember { mutableFloatStateOf(0f) }
     val pressScale = remember { Animatable(1f) }
     val pressWidth = remember { Animatable(45f) }
+    val velocityTracker = remember { VelocityTracker() }
 
     Box(
         modifier = Modifier
@@ -349,6 +352,7 @@ private fun DragHandleArea(
                         coroutineScope.launch {
                             dragStartOffset.floatValue = dragOffsetY.value
                             dragOffsetY.snapTo(dragOffsetY.value)
+                            velocityTracker.resetTracking()
                             // Animate press effect
                             isPressing.floatValue = 1f
                             launch {
@@ -384,18 +388,30 @@ private fun DragHandleArea(
 
                             val currentOffset = dragOffsetY.value
                             val dragDelta = currentOffset - dragStartOffset.floatValue
+                            val velocity = velocityTracker.calculateVelocity().y
+                            val velocityThreshold = 500f
+
+                            println("Drag ended. Delta: $dragDelta, Velocity: $velocity")
 
                             when {
-                                // Dragged down significantly -> dismiss
-                                dragDelta > 150f -> {
+                                // Dragged down far enough or has strong downward velocity -> dismiss
+                                (abs(velocity) > velocityThreshold || dragDelta.dp >= 200.dp) && velocity <= 0 -> {
                                     onDismissRequest?.invoke()
                                     val windowHeightPx = windowHeight.value * density.density
                                     dragOffsetY.animateTo(
                                         targetValue = windowHeightPx,
                                         animationSpec = tween(durationMillis = 250)
                                     )
                                 }
-                                // Reset to original position (including overscroll bounce back)
+                                // Dragged up far enough or has strong upward velocity -> reset to original position
+                                abs(velocity) > velocityThreshold && velocity > 0 -> {
+                                    dragOffsetY.animateTo(
+                                        targetValue = 0f,
+                                        animationSpec = tween(durationMillis = 250)
+                                    )
+                                    dimAlpha.value = 1f
+                                }
+                                // Not dragged far enough -> reset to original position
                                 else -> {
                                     dragOffsetY.animateTo(
                                         targetValue = 0f,
@@ -406,8 +422,10 @@ private fun DragHandleArea(
                             }
                         }
                     },
-                    onVerticalDrag = { _, dragAmount ->
+                    onVerticalDrag = { change, dragAmount ->
                         coroutineScope.launch {
+                            velocityTracker.addPosition(change.uptimeMillis, change.position)
+
                             val newOffset = dragOffsetY.value + dragAmount
 
                             // Apply damping effect when dragging upward (negative offset)