library: Optimize SuperDropdown & Cleanup code

Author: YuKongA

miuix/src/androidMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.android.kt

@@ -1,15 +1,11 @@
 package top.yukonga.miuix.kmp.basic
 
-import androidx.compose.foundation.Indication
-import androidx.compose.foundation.LocalIndication
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -28,28 +24,22 @@ import top.yukonga.miuix.kmp.utils.squircleshape.SquircleShape
 /**
  * A button component with Miuix style.
  *
+ * @param modifier The modifier to be applied to the [Button].
  * @param text The text of the [Button].
  * @param onClick The callback when the [Button] is clicked.
- * @param modifier The modifier to be applied to the [Button].
  * @param enabled Whether the [Button] is enabled.
  * @param submit Whether the [Button] is a submit button.
  * @param cornerRadius The corner radius of the [Button].
- * @param interactionSource The interaction source to be applied to the [Button].
- * @param indication The indication to be applied to the [Button].
  */
 @Composable
 fun Button(
+    modifier: Modifier = Modifier,
     text: String,
     onClick: () -> Unit,
-    modifier: Modifier = Modifier,
     enabled: Boolean = true,
     submit: Boolean = false,
-    cornerRadius: Dp = 18.dp,
-    interactionSource: MutableInteractionSource? = null,
-    indication: Indication? = LocalIndication.current,
+    cornerRadius: Dp = 18.dp
 ) {
-    @Suppress("NAME_SHADOWING")
-    val interactionSource = interactionSource ?: remember { MutableInteractionSource() }
     val hapticFeedback = LocalHapticFeedback.current
     val color by rememberUpdatedState(getButtonColor(enabled, submit))
     val textColor by rememberUpdatedState(getTextColor(enabled, submit))
@@ -62,9 +52,7 @@ fun Button(
         enabled = enabled,
         modifier = modifier.semantics { role = Role.Button },
         shape = SquircleShape(cornerRadius),
-        color = color,
-        interactionSource = interactionSource,
-        indication = indication
+        color = color
     ) {
         Row(
             Modifier

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Button.kt

@@ -7,7 +7,6 @@ import androidx.compose.animation.core.tween
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentSize
@@ -36,22 +35,18 @@ import top.yukonga.miuix.kmp.utils.squircleshape.SquircleShape
 /**
  * A checkbox component with Miuix style.
  *
+ * @param modifier The modifier to be applied to the [Checkbox].
  * @param checked The current state of the [Checkbox].
  * @param onCheckedChange The callback to be called when the state of the [Checkbox] changes.
- * @param modifier The modifier to be applied to the [Checkbox].
  * @param enabled Whether the [Checkbox] is enabled.
- * @param interactionSource The interaction source to be applied to the [Checkbox].
  */
 @Composable
 fun Checkbox(
+    modifier: Modifier = Modifier,
     checked: Boolean,
     onCheckedChange: ((Boolean) -> Unit)?,
-    modifier: Modifier = Modifier,
     enabled: Boolean = true,
-    interactionSource: MutableInteractionSource? = null,
 ) {
-    @Suppress("NAME_SHADOWING")
-    val interactionSource = interactionSource ?: remember { MutableInteractionSource() }
     val isChecked by rememberUpdatedState(checked)
     var isPressed by remember { mutableStateOf(false) }
     val backgroundColor by animateColorAsState(if (isChecked) MiuixTheme.colorScheme.primary else MiuixTheme.colorScheme.secondary)
@@ -74,8 +69,8 @@ fun Checkbox(
                 onValueChange = { onCheckedChange(it) },
                 enabled = enabled,
                 role = Role.Checkbox,
-                interactionSource = interactionSource,
-                indication = null
+                indication = null,
+                interactionSource = null
             )
         } else {
             Modifier

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Checkbox.kt

@@ -1,9 +1,6 @@
 package top.yukonga.miuix.kmp.basic
 
-import androidx.compose.foundation.Indication
-import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -32,8 +29,6 @@ import top.yukonga.miuix.kmp.theme.MiuixTheme
  * @param leftAction The [Composable] content that on the left side of the [BasicComponent].
  * @param rightActions The [Composable] content on the right side of the [BasicComponent].
  * @param onClick The callback when the [BasicComponent] is clicked.
- * @param interactionSource The interaction source to be applied to the [BasicComponent].
- * @param indication The indication to be applied to the [BasicComponent].
  * @param enabled Whether the [BasicComponent] is enabled.
  */
 @Composable
@@ -48,11 +43,8 @@ fun BasicComponent(
     leftAction: @Composable (() -> Unit?)? = null,
     rightActions: @Composable RowScope.() -> Unit = {},
     onClick: (() -> Unit)? = null,
-    interactionSource: MutableInteractionSource? = null,
-    indication: Indication? = LocalIndication.current,
     enabled: Boolean = true
 ) {
-    val interactionSource = interactionSource ?: remember { MutableInteractionSource() }
     val insideMargin = remember { insideMargin } ?: remember { DpSize(16.dp, 16.dp) }
     val paddingModifier = remember(insideMargin) {
         Modifier.padding(horizontal = insideMargin.width, vertical = insideMargin.height)
@@ -62,12 +54,7 @@ fun BasicComponent(
     Row(
         modifier = if (onClick != null && enabled) {
             modifier
-                .clickable(
-                    interactionSource = interactionSource,
-                    indication = indication,
-                ) {
-                    onClick.invoke()
-                }
+                .clickable { onClick.invoke() }
         } else {
             modifier
         }

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Component.kt

@@ -21,36 +21,28 @@ import top.yukonga.miuix.kmp.theme.MiuixTheme
 /**
  * A floating action button component with Miuix style.
  *
- * @param onClick The callback when the [FloatingActionButton] is clicked.
  * @param modifier The modifier to be applied to the [FloatingActionButton].
+ * @param onClick The callback when the [FloatingActionButton] is clicked.
  * @param shape The shape of the [FloatingActionButton].
  * @param containerColor The color of the [FloatingActionButton].
  * @param shadowElevation The shadow elevation of the [FloatingActionButton].
- * @param interactionSource The interaction source to be applied to the [FloatingActionButton].
- * @param indication The indication to be applied to the [FloatingActionButton].
  * @param content The [Composable] content of the [FloatingActionButton].
  */
 @Composable
 fun FloatingActionButton(
-    onClick: () -> Unit,
     modifier: Modifier = Modifier,
+    onClick: () -> Unit,
     shape: Shape = RoundedCornerShape(50.dp),
     containerColor: Color = MiuixTheme.colorScheme.primary,
     shadowElevation: Float = 18f,
-    interactionSource: MutableInteractionSource? = null,
-    indication: Indication? = LocalIndication.current,
     content: @Composable () -> Unit,
 ) {
-    @Suppress("NAME_SHADOWING")
-    val interactionSource = interactionSource ?: remember { MutableInteractionSource() }
     Surface(
         onClick = onClick,
         modifier = modifier.semantics { role = Role.Button },
         shape = shape,
         color = containerColor,
-        shadowElevation = shadowElevation,
-        interactionSource = interactionSource,
-        indication = indication,
+        shadowElevation = shadowElevation
     ) {
         Box(
             modifier =

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/FloatingActionButton.kt

@@ -44,18 +44,18 @@ import top.yukonga.miuix.kmp.utils.platform
 /**
  * A navigation bar that with 2 to 5 items.
  *
+ * @param modifier The modifier to be applied to the [NavigationBar].
  * @param items The items of the [NavigationBar].
  * @param selected The selected index of the [NavigationBar].
- * @param modifier The modifier to be applied to the [NavigationBar].
  * @param color The color of the [NavigationBar].
  * @param onClick The callback when the item of the [NavigationBar] is clicked.
  * @param defaultWindowInsetsPadding whether to apply default window insets padding to the [NavigationBar].
  */
 @Composable
 fun NavigationBar(
+    modifier: Modifier = Modifier,
     items: List<NavigationItem>,
     selected: Int,
-    modifier: Modifier = Modifier,
     color: Color = MiuixTheme.colorScheme.surfaceContainer,
     onClick: (Int) -> Unit,
     defaultWindowInsetsPadding: Boolean = true

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/NavigationBar.kt

@@ -37,22 +37,22 @@ import top.yukonga.miuix.kmp.utils.squircleshape.SquircleShape
 /**
  * A search bar with Miuix style.
  *
- * @param inputField the input field to input a query in the search bar.
- * @param expanded whether the search bar is expanded and showing search results.
- * @param onExpandedChange the callback to be invoked when the search bar's expanded state is
+ * @param modifier the [Modifier] to be applied to the [SearchBar].
+ * @param inputField the input field to input a query in the [SearchBar].
+ * @param expanded whether the [SearchBar] is expanded and showing search results.
+ * @param onExpandedChange the callback to be invoked when the [SearchBar]'s expanded state is
  *   changed.
- * @param outsideRightAction the action to be shown at the right side of the search bar when it is
+ * @param outsideRightAction the action to be shown at the right side of the [SearchBar] when it is
  *   expanded.
- * @param modifier the [Modifier] to be applied to this search bar.
- * @param content the content to be shown when the search bar is expanded.
+ * @param content the content to be shown when the [SearchBar] is expanded.
  */
 @Composable
 fun SearchBar(
+    modifier: Modifier = Modifier,
     inputField: @Composable () -> Unit,
     expanded: Boolean = false,
     onExpandedChange: (Boolean) -> Unit,
     outsideRightAction: @Composable (() -> Unit)? = null,
-    modifier: Modifier = Modifier,
     content: @Composable ColumnScope.() -> Unit
 ) {
     Surface(

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/SearchBar.kt

@@ -14,16 +14,16 @@ import top.yukonga.miuix.kmp.theme.MiuixTheme
 /**
  * A title component with Miuix style.
  *
+ * @param modifier The modifier to be applied to the [SmallTitle].
  * @param text The text to be displayed in the title.
  * @param textColor The color of the [SmallTitle].
- * @param modifier The modifier to be applied to the [SmallTitle].
  * @param insideMargin The margin inside the [SmallTitle].
  */
 @Composable
 fun SmallTitle(
+    modifier: Modifier = Modifier,
     text: String,
     textColor: Color = MiuixTheme.colorScheme.onBackgroundVariant,
-    modifier: Modifier = Modifier,
     insideMargin: DpSize = DpSize(28.dp, 8.dp),
 ) {
     val paddingModifier = remember(insideMargin) {

miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/SmallTitle.kt

@@ -1,17 +1,13 @@
 package top.yukonga.miuix.kmp.basic
 
 import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.Indication
-import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.material3.minimumInteractiveComponentSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.NonRestartableComposable
 import androidx.compose.runtime.Stable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@@ -57,34 +53,27 @@ fun Surface(
 /**
  * A surface component with Miuix style.
  *
- * @param onClick The callback when the [Surface] is clicked.
  * @param modifier The modifier to be applied to the [Surface].
+ * @param onClick The callback when the [Surface] is clicked.
  * @param enabled Whether the [Surface] is enabled.
  * @param shape The shape of the [Surface].
  * @param color The color of the [Surface].
  * @param border The border of the [Surface].
  * @param shadowElevation The shadow elevation of the [Surface].
- * @param interactionSource The interaction source to be applied to the [Surface].
- * @param indication The indication to be applied to the [Surface].
  * @param content The [Composable] content of the [Surface].
  */
 @Composable
 @NonRestartableComposable
 fun Surface(
-    onClick: () -> Unit,
     modifier: Modifier = Modifier,
+    onClick: () -> Unit,
     enabled: Boolean = true,
     shape: Shape = RectangleShape,
     color: Color = MiuixTheme.colorScheme.background,
     border: BorderStroke? = null,
     shadowElevation: Float = 0f,
-    interactionSource: MutableInteractionSource? = null,
-    indication: Indication? = LocalIndication.current,
     content: @Composable () -> Unit
 ) {
-    @Suppress("NAME_SHADOWING")
-    val interactionSource = interactionSource ?: remember { MutableInteractionSource() }
-
     Box(
         modifier = modifier
             .surface(
@@ -95,8 +84,6 @@ fun Surface(
             )
             .minimumInteractiveComponentSize()
             .clickable(
-                interactionSource = interactionSource,
-                indication = indication,
                 enabled = enabled,
                 onClick = onClick
             ),