3

Author: YuKongA

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

@@ -49,7 +49,6 @@ import top.yukonga.miuix.kmp.extra.SuperCheckbox
 import top.yukonga.miuix.kmp.extra.SuperDialog
 import top.yukonga.miuix.kmp.extra.SuperDropdown
 import top.yukonga.miuix.kmp.extra.SuperSpinner
-import top.yukonga.miuix.kmp.extra.SuperSpinnerAsDialog
 import top.yukonga.miuix.kmp.extra.SuperSwitch
 import top.yukonga.miuix.kmp.theme.MiuixTheme
 import top.yukonga.miuix.kmp.utils.MiuixPopupUtil.Companion.dismissDialog
@@ -369,7 +368,7 @@ fun TextComponent() {
             mode = SpinnerMode.AlwaysOnRight,
         )
 
-        SuperSpinnerAsDialog(
+        SuperSpinner(
             title = "Spinner",
             summary = "Spinner as Dialog",
             dialogButtonString = "Cancel",

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

@@ -86,7 +86,6 @@ import kotlin.math.roundToInt
  * @param title The title of the [SuperDropdown].
  * @param items The options of the [SuperDropdown].
  * @param selectedIndex The index of the selected option.
- * @param onSelectedIndexChange The callback when the index is selected.
  * @param modifier The modifier to be applied to the [SuperDropdown].
  * @param popupModifier The modifier to be applied to the popup of the [SuperDropdown].
  * @param titleColor The color of the title.
@@ -97,13 +96,14 @@ import kotlin.math.roundToInt
  * @param insideMargin The margin inside the [SuperDropdown].
  * @param defaultWindowInsetsPadding Whether to apply default window insets padding to the [SuperDropdown].
  * @param enabled Whether the [SuperDropdown] is enabled.
+ * @param showValue Whether to show the selected value of the [SuperDropdown].
+ * @param onSelectedIndexChange The callback when the selected index of the [SuperDropdown] is changed.
  */
 @Composable
 fun SuperDropdown(
     title: String,
     items: List<String>,
     selectedIndex: Int,
-    onSelectedIndexChange: (Int) -> Unit,
     modifier: Modifier = Modifier,
     popupModifier: Modifier = Modifier,
     titleColor: BasicComponentColors = BasicComponentDefaults.titleColor(),
@@ -113,7 +113,9 @@ fun SuperDropdown(
     horizontalPadding: Dp = 0.dp,
     insideMargin: PaddingValues = BasicComponentDefaults.InsideMargin,
     defaultWindowInsetsPadding: Boolean = true,
-    enabled: Boolean = true
+    enabled: Boolean = true,
+    showValue: Boolean = true,
+    onSelectedIndexChange: ((Int) -> Unit)?,
 ) {
     val interactionSource = remember { MutableInteractionSource() }
     val isDropdownExpanded = remember { mutableStateOf(false) }
@@ -171,13 +173,15 @@ fun SuperDropdown(
         summary = summary,
         summaryColor = summaryColor,
         rightActions = {
-            Text(
-                modifier = Modifier.widthIn(max = 130.dp),
-                text = items[selectedIndex],
-                fontSize = MiuixTheme.textStyles.body2.fontSize,
-                color = actionColor,
-                textAlign = TextAlign.End,
-            )
+            if (showValue) {
+                Text(
+                    modifier = Modifier.widthIn(max = 130.dp),
+                    text = items[selectedIndex],
+                    fontSize = MiuixTheme.textStyles.body2.fontSize,
+                    color = actionColor,
+                    textAlign = TextAlign.End,
+                )
+            }
             Image(
                 modifier = Modifier
                     .padding(start = 8.dp)
@@ -310,7 +314,7 @@ fun SuperDropdown(
                                 isSelected = selectedIndex == index,
                                 onSelectedIndexChange = {
                                     hapticFeedback.performHapticFeedback(HapticFeedbackType.LongPress)
-                                    onSelectedIndexChange(it)
+                                    onSelectedIndexChange?.let { it1 -> it1(it) }
                                     dismissPopup(isDropdownExpanded)
                                 },
                                 textWidthDp = textWidthDp,

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

@@ -342,7 +342,7 @@ fun SuperSpinner(
 }
 
 /**
- * A [SuperSpinnerAsDialog] component with Miuix style.
+ * A [SuperSpinner] component with Miuix style, show Spinner as dialog.
  *
  * @param title the title of the [SuperSpinner].
  * @param items the list of [SpinnerEntry] to be shown in the [SuperSpinner].
@@ -362,7 +362,7 @@ fun SuperSpinner(
  * @param onSelectedIndexChange the callback to be invoked when the selected index of the [SuperSpinner] is changed.
  */
 @Composable
-fun SuperSpinnerAsDialog(
+fun SuperSpinner(
     title: String,
     items: List<SpinnerEntry>,
     selectedIndex: Int,