library: Add HoverInteraction to SuperDropdown & SuperSpinner

YuKongA · YuKongA · commit 0bd00da269e8 · 2024-11-21T11:13:41.000+08:00
diff --git a/miuix/src/androidMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.android.kt b/miuix/src/androidMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.android.kt
@@ -0,0 +1,11 @@
+package top.yukonga.miuix.kmp.extra
+
+import android.annotation.SuppressLint
+import androidx.compose.runtime.MutableState
+import androidx.compose.ui.Modifier
+
+/**
+ * Returns modifier to be used for the current platform.
+ */
+@SuppressLint("ModifierFactoryExtensionFunction")
+actual fun modifierPlatform(modifier: Modifier, isHovered: MutableState<Boolean>, isEnable: Boolean): Modifier = modifier
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectTapGestures
 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
@@ -128,6 +129,7 @@ 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) }
@@ -152,10 +154,23 @@ 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 = modifier
+        modifier = modifierPlatform(
+            modifier = modifier,
+            isHovered = isHovered,
+            isEnable = enabled
+        )
             .indication(
                 interactionSource = interactionSource,
                 indication = LocalIndication.current
@@ -510,3 +525,8 @@ 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
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperSpinner.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperSpinner.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.gestures.detectTapGestures
 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
@@ -132,6 +133,7 @@ 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) }
@@ -156,10 +158,23 @@ 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 = modifier
+        modifier = modifierPlatform(
+            modifier = modifier,
+            isHovered = isHovered,
+            isEnable = enabled
+        )
             .indication(
                 interactionSource = interactionSource,
                 indication = LocalIndication.current
diff --git a/miuix/src/desktopMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.desktop.kt b/miuix/src/desktopMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.desktop.kt
@@ -0,0 +1,22 @@
+package top.yukonga.miuix.kmp.extra
+
+import androidx.compose.runtime.MutableState
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.onPointerEvent
+
+/**
+ * Returns modifier to be used for the current platform.
+ */
+@OptIn(ExperimentalComposeUiApi::class)
+actual fun modifierPlatform(modifier: Modifier, isHovered: MutableState<Boolean>, isEnable: Boolean): Modifier = modifier
+    .onPointerEvent(PointerEventType.Enter) {
+        if (isEnable) isHovered.value = true
+    }
+    .onPointerEvent(PointerEventType.Exit) {
+        isHovered.value = false
+    }
+    .onPointerEvent(PointerEventType.Release) {
+        isHovered.value = false
+    }
diff --git a/miuix/src/iosMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.ios.kt b/miuix/src/iosMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.ios.kt
@@ -0,0 +1,22 @@
+package top.yukonga.miuix.kmp.extra
+
+import androidx.compose.runtime.MutableState
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.onPointerEvent
+
+/**
+ * Returns modifier to be used for the current platform.
+ */
+@OptIn(ExperimentalComposeUiApi::class)
+actual fun modifierPlatform(modifier: Modifier, isHovered: MutableState<Boolean>, isEnable: Boolean): Modifier = modifier
+    .onPointerEvent(PointerEventType.Enter) {
+        if (isEnable) isHovered.value = true
+    }
+    .onPointerEvent(PointerEventType.Exit) {
+        isHovered.value = false
+    }
+    .onPointerEvent(PointerEventType.Release) {
+        isHovered.value = false
+    }
diff --git a/miuix/src/jsMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.js.kt b/miuix/src/jsMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.js.kt
@@ -0,0 +1,22 @@
+package top.yukonga.miuix.kmp.extra
+
+import androidx.compose.runtime.MutableState
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.onPointerEvent
+
+/**
+ * Returns modifier to be used for the current platform.
+ */
+@OptIn(ExperimentalComposeUiApi::class)
+actual fun modifierPlatform(modifier: Modifier, isHovered: MutableState<Boolean>, isEnable: Boolean): Modifier = modifier
+    .onPointerEvent(PointerEventType.Enter) {
+        if (isEnable) isHovered.value = true
+    }
+    .onPointerEvent(PointerEventType.Exit) {
+        isHovered.value = false
+    }
+    .onPointerEvent(PointerEventType.Release) {
+        isHovered.value = false
+    }
diff --git a/miuix/src/macosMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.macos.kt b/miuix/src/macosMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.macos.kt
@@ -0,0 +1,22 @@
+package top.yukonga.miuix.kmp.extra
+
+import androidx.compose.runtime.MutableState
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.onPointerEvent
+
+/**
+ * Returns modifier to be used for the current platform.
+ */
+@OptIn(ExperimentalComposeUiApi::class)
+actual fun modifierPlatform(modifier: Modifier, isHovered: MutableState<Boolean>, isEnable: Boolean): Modifier = modifier
+    .onPointerEvent(PointerEventType.Enter) {
+        if (isEnable) isHovered.value = true
+    }
+    .onPointerEvent(PointerEventType.Exit) {
+        isHovered.value = false
+    }
+    .onPointerEvent(PointerEventType.Release) {
+        isHovered.value = false
+    }
diff --git a/miuix/src/wasmJsMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.wasmJs.kt b/miuix/src/wasmJsMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDropdown.wasmJs.kt
@@ -0,0 +1,22 @@
+package top.yukonga.miuix.kmp.extra
+
+import androidx.compose.runtime.MutableState
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.pointer.PointerEventType
+import androidx.compose.ui.input.pointer.onPointerEvent
+
+/**
+ * Returns modifier to be used for the current platform.
+ */
+@OptIn(ExperimentalComposeUiApi::class)
+actual fun modifierPlatform(modifier: Modifier, isHovered: MutableState<Boolean>, isEnable: Boolean): Modifier = modifier
+    .onPointerEvent(PointerEventType.Enter) {
+        if (isEnable) isHovered.value = true
+    }
+    .onPointerEvent(PointerEventType.Exit) {
+        isHovered.value = false
+    }
+    .onPointerEvent(PointerEventType.Release) {
+        isHovered.value = false
+    }
