library: Used Modifier.hoverable

Author: YuKongA

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

@@ -5,8 +5,8 @@ import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.hoverable
 import androidx.compose.foundation.indication
-import androidx.compose.foundation.interaction.HoverInteraction
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.PressInteraction
 import androidx.compose.foundation.layout.Arrangement
@@ -129,7 +129,6 @@ fun SuperDropdown(
     val hapticFeedback = LocalHapticFeedback.current
     val actionColor = if (enabled) MiuixTheme.colorScheme.onSurfaceVariantActions else MiuixTheme.colorScheme.disabledOnSecondaryVariant
     var alignLeft by rememberSaveable { mutableStateOf(true) }
-    val isHovered = remember { mutableStateOf(false) }
     var componentInnerOffsetXPx by remember { mutableIntStateOf(0) }
     var componentInnerOffsetYPx by remember { mutableIntStateOf(0) }
     var componentInnerHeightPx by remember { mutableIntStateOf(0) }
@@ -154,27 +153,17 @@ fun SuperDropdown(
             }
             held.value = null
         }
-        if (isHovered.value) {
-            coroutineScope.launch {
-                interactionSource.emit(HoverInteraction.Enter())
-            }
-        } else {
-            coroutineScope.launch {
-                interactionSource.emit(HoverInteraction.Exit(HoverInteraction.Enter()))
-            }
-        }
     }
 
     BasicComponent(
-        modifier = modifierPlatform(
-            modifier = modifier,
-            isHovered = isHovered,
-            isEnable = enabled
-        )
+        modifier = modifier
             .indication(
                 interactionSource = interactionSource,
                 indication = LocalIndication.current
             )
+            .hoverable(
+                interactionSource = interactionSource
+            )
             .pointerInput(Unit) {
                 detectTapGestures(
                     onPress = { position ->
@@ -524,9 +513,4 @@ val dropdownStates = mutableStateListOf<MutableState<Boolean>>()
 enum class DropDownMode {
     Normal,
     AlwaysOnRight
-}
-
-/**
- * Returns modifier to be used for the current platform.
- */
-expect fun modifierPlatform(modifier: Modifier, isHovered: MutableState<Boolean>, isEnable: Boolean): Modifier
+}

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

@@ -5,8 +5,8 @@ import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.hoverable
 import androidx.compose.foundation.indication
-import androidx.compose.foundation.interaction.HoverInteraction
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.interaction.PressInteraction
 import androidx.compose.foundation.layout.Arrangement
@@ -133,7 +133,6 @@ fun SuperSpinner(
     val hapticFeedback = LocalHapticFeedback.current
     val actionColor = if (enabled) MiuixTheme.colorScheme.onSurfaceVariantActions else MiuixTheme.colorScheme.disabledOnSecondaryVariant
     var alignLeft by rememberSaveable { mutableStateOf(true) }
-    val isHovered = remember { mutableStateOf(false) }
     var componentInnerOffsetXPx by remember { mutableIntStateOf(0) }
     var componentInnerOffsetYPx by remember { mutableIntStateOf(0) }
     var componentInnerHeightPx by remember { mutableIntStateOf(0) }
@@ -158,27 +157,17 @@ fun SuperSpinner(
             }
             held.value = null
         }
-        if (isHovered.value) {
-            coroutineScope.launch {
-                interactionSource.emit(HoverInteraction.Enter())
-            }
-        } else {
-            coroutineScope.launch {
-                interactionSource.emit(HoverInteraction.Exit(HoverInteraction.Enter()))
-            }
-        }
     }
 
     BasicComponent(
-        modifier = modifierPlatform(
-            modifier = modifier,
-            isHovered = isHovered,
-            isEnable = enabled
-        )
+        modifier = modifier
             .indication(
                 interactionSource = interactionSource,
                 indication = LocalIndication.current
             )
+            .hoverable(
+                interactionSource = interactionSource
+            )
             .pointerInput(Unit) {
                 detectTapGestures(
                     onPress = { position ->