library: improve SuperDialog&SuperBottomSheet

YuKongA · YuKongA · commit f05e9ee0b39d · 2025-11-06T18:34:01.000+08:00
diff --git a/iosApp/iosApp/Info.plist b/iosApp/iosApp/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.5</string>
 	<key>CFBundleVersion</key>
-	<string>597</string>
+	<string>598</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperBottomSheet.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperBottomSheet.kt
@@ -3,8 +3,12 @@
 
 package top.yukonga.miuix.kmp.extra
 
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.tween
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.gestures.detectVerticalDragGestures
@@ -56,6 +60,7 @@ import com.mocharealm.gaze.capsule.ContinuousRoundedRectangle
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.launch
+import top.yukonga.miuix.kmp.anim.DecelerateEasing
 import top.yukonga.miuix.kmp.basic.Text
 import top.yukonga.miuix.kmp.theme.MiuixTheme
 import top.yukonga.miuix.kmp.utils.MiuixPopupUtils.Companion.DialogLayout
@@ -117,8 +122,30 @@ fun SuperBottomSheet(
         }
     }
 
+    @Composable
+    fun rememberDefaultSheetEnterTransition(): EnterTransition {
+        return remember {
+            slideInVertically(
+                initialOffsetY = { fullHeight -> fullHeight },
+                animationSpec = tween(450, easing = DecelerateEasing(1.5f))
+            )
+        }
+    }
+
+    @Composable
+    fun rememberDefaultSheetExitTransition(): ExitTransition {
+        return remember {
+            slideOutVertically(
+                targetOffsetY = { fullHeight -> fullHeight },
+                animationSpec = tween(450, easing = DecelerateEasing(0.8f))
+            )
+        }
+    }
+
     DialogLayout(
         visible = show,
+        enterTransition = rememberDefaultSheetEnterTransition(),
+        exitTransition = rememberDefaultSheetExitTransition(),
         enableWindowDim = enableWindowDim,
         enableAutoLargeScreen = false,
         dimAlpha = dimAlpha
@@ -389,6 +416,44 @@ private fun DragHandleArea(
         modifier = Modifier
             .fillMaxWidth()
             .height(24.dp)
+            .pointerInput(Unit) {
+                detectTapGestures(
+                    onPress = {
+                        // Provide immediate press feedback even before dragging
+                        isPressing.floatValue = 1f
+                        coroutineScope.launch {
+                            pressScale.animateTo(
+                                targetValue = 1.15f,
+                                animationSpec = tween(durationMillis = 100)
+                            )
+                        }
+                        coroutineScope.launch {
+                            pressWidth.animateTo(
+                                targetValue = 55f,
+                                animationSpec = tween(durationMillis = 100)
+                            )
+                        }
+
+                        // Wait for release; if released without drag, reset here.
+                        val released = tryAwaitRelease()
+                        if (released) {
+                            isPressing.floatValue = 0f
+                            coroutineScope.launch {
+                                pressScale.animateTo(
+                                    targetValue = 1f,
+                                    animationSpec = tween(durationMillis = 150)
+                                )
+                            }
+                            coroutineScope.launch {
+                                pressWidth.animateTo(
+                                    targetValue = 45f,
+                                    animationSpec = tween(durationMillis = 150)
+                                )
+                            }
+                        }
+                    }
+                )
+            }
             .pointerInput(allowDismiss) {
                 detectVerticalDragGestures(
                     onDragStart = {
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDialog.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDialog.kt
@@ -10,6 +10,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.captionBarPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
@@ -34,6 +35,7 @@ import androidx.compose.ui.layout.onGloballyPositioned
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import com.mocharealm.gaze.capsule.ContinuousRoundedRectangle
@@ -193,6 +195,7 @@ private fun SuperDialogContent(
 
     val columnModifier = modifier
         .widthIn(max = 420.dp)
+        .heightIn(max = if (isLargeScreen) windowHeight * (2f / 3f) else Dp.Unspecified)
         .onGloballyPositioned { coordinates ->
             dialogHeightPx.value = coordinates.size.height
         }
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/utils/MiuixPopupUtils.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/utils/MiuixPopupUtils.kt
@@ -95,15 +95,15 @@ class MiuixPopupUtils {
             return remember(largeScreen) {
                 if (largeScreen) {
                     fadeIn(
-                        animationSpec = spring(dampingRatio = 0.9f, stiffness = 900f)
+                        animationSpec = spring(dampingRatio = 0.82f, stiffness = 800f)
                     ) + scaleIn(
                         initialScale = 0.8f,
-                        animationSpec = spring(0.73f, 900f)
+                        animationSpec = spring(dampingRatio = 0.73f, stiffness = 800f)
                     )
                 } else {
                     slideInVertically(
                         initialOffsetY = { fullHeight -> fullHeight },
-                        animationSpec = spring(dampingRatio = 0.92f, stiffness = 400f)
+                        animationSpec = spring(dampingRatio = 0.88f, stiffness = 450f)
                     )
                 }
             }
@@ -122,7 +122,7 @@ class MiuixPopupUtils {
                 } else {
                     slideOutVertically(
                         targetOffsetY = { fullHeight -> fullHeight },
-                        animationSpec = tween(200, easing = DecelerateEasing(1.5f))
+                        animationSpec = tween(300, easing = DecelerateEasing(0.8f))
                     )
                 }
             }
@@ -223,7 +223,7 @@ class MiuixPopupUtils {
                 }
                 onDispose {
                     if (state.showState.value) {
-                        dialogStates.removeAll { it.showState === state.showState }
+                        state.showState.value = false
                     }
                 }
             }
@@ -288,7 +288,7 @@ class MiuixPopupUtils {
                 }
                 onDispose {
                     if (state.showState.value) {
-                        popupStates.removeAll { it.showState === state.showState }
+                        state.showState.value = false
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -95,15 +95,15 @@ class MiuixPopupUtils {`
`95`	`95`	`return remember(largeScreen) {`
`96`	`96`	`if (largeScreen) {`
`97`	`97`	`fadeIn(`
`98`		`- animationSpec = spring(dampingRatio = 0.9f, stiffness = 900f)`
	`98`	`+ animationSpec = spring(dampingRatio = 0.82f, stiffness = 800f)`
`99`	`99`	`) + scaleIn(`
`100`	`100`	`initialScale = 0.8f,`
`101`		`- animationSpec = spring(0.73f, 900f)`
	`101`	`+ animationSpec = spring(dampingRatio = 0.73f, stiffness = 800f)`
`102`	`102`	`)`
`103`	`103`	`} else {`
`104`	`104`	`slideInVertically(`
`105`	`105`	`initialOffsetY = { fullHeight -> fullHeight },`
`106`		`- animationSpec = spring(dampingRatio = 0.92f, stiffness = 400f)`
	`106`	`+ animationSpec = spring(dampingRatio = 0.88f, stiffness = 450f)`
`107`	`107`	`)`
`108`	`108`	`}`
`109`	`109`	`}`
`@@ -122,7 +122,7 @@ class MiuixPopupUtils {`
`122`	`122`	`} else {`
`123`	`123`	`slideOutVertically(`
`124`	`124`	`targetOffsetY = { fullHeight -> fullHeight },`
`125`		`- animationSpec = tween(200, easing = DecelerateEasing(1.5f))`
	`125`	`+ animationSpec = tween(300, easing = DecelerateEasing(0.8f))`
`126`	`126`	`)`
`127`	`127`	`}`
`128`	`128`	`}`
`@@ -223,7 +223,7 @@ class MiuixPopupUtils {`
`223`	`223`	`}`
`224`	`224`	`onDispose {`
`225`	`225`	`if (state.showState.value) {`
`226`		`- dialogStates.removeAll { it.showState === state.showState }`
	`226`	`+ state.showState.value = false`
`227`	`227`	`}`
`228`	`228`	`}`
`229`	`229`	`}`
`@@ -288,7 +288,7 @@ class MiuixPopupUtils {`
`288`	`288`	`}`
`289`	`289`	`onDispose {`
`290`	`290`	`if (state.showState.value) {`
`291`		`- popupStates.removeAll { it.showState === state.showState }`
	`291`	`+ state.showState.value = false`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`	`}`