library: Call onDismissRequest when Dialog closed via BackHandler

Author: YuKongA

composeApp/src/commonMain/kotlin/component/TextComponent.kt

@@ -16,6 +16,7 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Person
+import androidx.compose.material.icons.filled.Star
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.getValue
@@ -50,6 +51,7 @@ import top.yukonga.miuix.kmp.utils.squircleshape.SquircleShape
 @Composable
 fun TextComponent() {
     val showDialog = remember { mutableStateOf(false) }
+    val showDialog2 = remember { mutableStateOf(false) }
     var checkbox by remember { mutableStateOf(false) }
     var checkboxTrue by remember { mutableStateOf(true) }
     var switch by remember { mutableStateOf(false) }
@@ -96,14 +98,16 @@ fun TextComponent() {
             ) {
                 Image(
                     colorFilter = ColorFilter.tint(MiuixTheme.colorScheme.onBackground),
-                    imageVector = Icons.Default.Person,
+                    imageVector = Icons.Default.Star,
                     contentDescription = "Person",
                 )
             }
         },
-        title = "Person",
-        summary = "An introduction",
-        onClick = {}
+        title = "Title",
+        summary = "Click to show Dialog 1",
+        onClick = {
+            showDialog.value = true
+        }
     )
 
     Row(
@@ -234,9 +238,9 @@ fun TextComponent() {
 
         SuperArrow(
             title = "Dialog",
-            summary = "Click to show a Dialog",
+            summary = "Click to show Dialog 2",
             onClick = {
-                showDialog.value = true
+                showDialog2.value = true
             }
         )
 
@@ -260,16 +264,58 @@ fun TextComponent() {
     }
 
     dialog(showDialog)
+    dialog2(showDialog2)
 }
 
+
 @Composable
 fun dialog(showDialog: MutableState<Boolean>) {
+    if (!showDialog.value) return
+    showDialog(
+        content = {
+            SuperDialog(
+                title = "Dialog 1",
+                summary = "Summary",
+                show = showDialog,
+                onDismissRequest = {
+                    showDialog.value = false
+                },
+            ) {
+                Row(
+                    horizontalArrangement = Arrangement.SpaceBetween
+                ) {
+                    Button(
+                        modifier = Modifier.weight(1f),
+                        text = "Cancel",
+                        onClick = {
+                            dismissDialog()
+                            showDialog.value = false
+                        }
+                    )
+                    Spacer(Modifier.width(20.dp))
+                    Button(
+                        modifier = Modifier.weight(1f),
+                        text = "Confirm",
+                        submit = true,
+                        onClick = {
+                            dismissDialog()
+                            showDialog.value = false
+                        }
+                    )
+                }
+            }
+        }
+    )
+}
+
+@Composable
+fun dialog2(showDialog: MutableState<Boolean>) {
+    if (!showDialog.value) return
     val value = remember { mutableStateOf("") }
     showDialog(
-        show = showDialog.value,
         content = {
             SuperDialog(
-                title = "Title",
+                title = "Dialog 2",
                 summary = "Summary",
                 show = showDialog,
                 onDismissRequest = {
@@ -308,4 +354,4 @@ fun dialog(showDialog: MutableState<Boolean>) {
             }
         }
     )
-}
+}

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

@@ -39,6 +39,7 @@ import top.yukonga.miuix.kmp.utils.squircleshape.SquircleShape
  * @param title The title of the [SuperDialog].
  * @param titleColor The color of the title.
  * @param summary The summary of the [SuperDialog].
+ * @param show The state of the [SuperDialog].
  * @param onDismissRequest The callback when the [SuperDialog] is dismissed.
  * @param insideMargin The margin inside the [SuperDialog].
  * @param content The [Composable] content of the [SuperDialog].
@@ -65,7 +66,7 @@ fun SuperDialog(
 
     BackHandler(enabled = show.value) {
         dismissDialog()
-        show.value = false
+        onDismissRequest()
     }
 
     Box(

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/utils/MiuixPopupUtil.kt

@@ -38,10 +38,9 @@ class MiuixPopupUtil {
          */
         @Composable
         fun showDialog(
-            show: Boolean,
             content: (@Composable () -> Unit)? = null,
         ) {
-            isDialogShowing.value = show
+            isDialogShowing.value = true
             dialogContext.value = content
         }