library: fix wrong hsv param order

Author: YuKongA

iosApp/iosApp/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.4</string>
 	<key>CFBundleVersion</key>
-	<string>546</string>
+	<string>548</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>

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

@@ -43,7 +43,8 @@ import kotlin.math.abs
 import kotlin.math.min
 import kotlin.math.roundToInt
 
-/** * A color palette component that allows users to select colors from a grid of HSV values.
+/**
+ * A color palette component that allows users to select colors from a grid of HSV values.
  *
  * @param initialColor The initial color to display in the palette.
  * @param onColorChanged Callback invoked when the selected color changes.
@@ -77,10 +78,7 @@ fun ColorPalette(
     var alpha by remember { mutableStateOf(initialColor.alpha.coerceIn(0f, 1f)) }
     var lastEmittedColor by remember { mutableStateOf<Color?>(null) }
     var lastAcceptedHSV by remember { mutableStateOf<Triple<Float, Float, Float>?>(null) }
-
     LaunchedEffect(initialColor, rows, hueColumns, includeGrayColumn) {
-        if (lastEmittedColor?.let { colorsEqualApprox(it, initialColor) } == true) return@LaunchedEffect
-
         val hsvInit = initialColor.toHsv()
         val h = hsvInit.h.toFloat()
         val s = (hsvInit.s / 100.0).toFloat()
@@ -179,6 +177,7 @@ private fun PaletteCanvas(
     selectedCol: Int,
     onSelect: (row: Int, col: Int) -> Unit,
 ) {
+    val onSelectState = rememberUpdatedState(onSelect)
     val totalColumns = hueColumns + if (includeGrayColumn) 1 else 0
     val rowSV = remember(rows) { buildRowSV(rows) }
     val grayV = remember(rows) { buildGrayV(rows) }
@@ -194,14 +193,14 @@ private fun PaletteCanvas(
                 detectTapGestures { pos ->
                     if (sizePx.width == 0 || sizePx.height == 0) return@detectTapGestures
                     val (r, c) = pointToCell(pos, sizePx, rows, totalColumns)
-                    onSelect(r, c)
+                    onSelectState.value(r, c)
                 }
             }
             .pointerInput(rows, hueColumns, includeGrayColumn) {
                 detectDragGestures { change, _ ->
                     if (sizePx.width == 0 || sizePx.height == 0) return@detectDragGestures
                     val (r, c) = pointToCell(change.position, sizePx, rows, totalColumns)
-                    onSelect(r, c)
+                    onSelectState.value(r, c)
                 }
             }
             .fillMaxWidth()
@@ -299,11 +298,11 @@ private fun cellColor(
     val totalColumns = hueColumns + if (includeGrayColumn) 1 else 0
     val (s, v) = rowSV[row]
     return if (includeGrayColumn && col == totalColumns - 1) {
-        Hsv(0.0, (grayV[row] * 100.0), 0.0).toColor()
+        Hsv(0.0, 0.0, (grayV[row] * 100.0)).toColor()
     } else {
         val step = 360f / hueColumns
         val h = (col * step) % 360f
-        Hsv(h.toDouble(), (v * 100.0), (s * 100.0)).toColor()
+        Hsv(h.toDouble(), (s * 100.0), (v * 100.0)).toColor()
     }
 }
 
@@ -315,13 +314,6 @@ private fun pointToCell(pos: Offset, size: IntSize, rows: Int, totalColumns: Int
     return row to col
 }
 
-private fun colorsEqualApprox(a: Color, b: Color, eps: Float = 0.002f): Boolean {
-    return abs(a.red - b.red) < eps &&
-            abs(a.green - b.green) < eps &&
-            abs(a.blue - b.blue) < eps &&
-            abs(a.alpha - b.alpha) < eps
-}
-
 private fun hsvEqualApprox(
     a: Triple<Float, Float, Float>,
     b: Triple<Float, Float, Float>,
@@ -346,4 +338,3 @@ private fun <T> List<T>.indexOfMinBy(selector: (T) -> Float): Int {
 }
 
 private fun sq(v: Float) = v * v
-

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

@@ -18,6 +18,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -122,8 +123,8 @@ fun HsvColorPicker(
 
     val selectedColor = Hsv(
         h = currentHue.toDouble(),
-        v = (currentValue * 100.0),
-        s = (currentSaturation * 100.0)
+        s = (currentSaturation * 100.0),
+        v = (currentValue * 100.0)
     ).toColor(currentAlpha)
 
     LaunchedEffect(initialColor) {
@@ -237,7 +238,7 @@ fun HsvSaturationSlider(
 ) {
     val saturationColors = remember(currentHue) {
         listOf(
-            Hsv(currentHue.toDouble(), 100.0, 0.0).toColor(1f),
+            Hsv(currentHue.toDouble(), 0.0, 100.0).toColor(1f),
             Hsv(currentHue.toDouble(), 100.0, 100.0).toColor(1f)
         )
     }
@@ -268,7 +269,7 @@ fun HsvValueSlider(
     hapticEffect: SliderDefaults.SliderHapticEffect = SliderDefaults.DefaultHapticEffect
 ) {
     val valueColors = remember(currentHue, currentSaturation) {
-        listOf(Color.Black, Hsv(currentHue.toDouble(), 100.0, (currentSaturation * 100.0)).toColor())
+        listOf(Color.Black, Hsv(currentHue.toDouble(), (currentSaturation * 100.0), 100.0).toColor())
     }
     ColorSlider(
         value = currentValue,
@@ -299,7 +300,7 @@ fun HsvAlphaSlider(
     hapticEffect: SliderDefaults.SliderHapticEffect = SliderDefaults.DefaultHapticEffect
 ) {
     val alphaColors = remember(currentHue, currentSaturation, currentValue) {
-        val baseColor = Hsv(currentHue.toDouble(), (currentValue * 100.0), (currentSaturation * 100.0)).toColor()
+        val baseColor = Hsv(currentHue.toDouble(), (currentSaturation * 100.0), (currentValue * 100.0)).toColor()
         listOf(baseColor.copy(alpha = 0f), baseColor.copy(alpha = 1f))
     }
 
@@ -817,6 +818,7 @@ private fun ColorSlider(
     modifier: Modifier = Modifier,
     hapticEffect: SliderDefaults.SliderHapticEffect = SliderDefaults.DefaultHapticEffect,
 ) {
+    val onValueChangedState = rememberUpdatedState(onValueChanged)
     val density = LocalDensity.current
     var sliderWidth by remember { mutableStateOf(0.dp) }
     val indicatorSizeDp = 20.dp
@@ -856,7 +858,7 @@ private fun ColorSlider(
                     onDragStart = { offset ->
                         val newValue =
                             handleSliderInteraction(offset.x, size.width.toFloat(), with(density) { sliderHeightDp.toPx() })
-                        onValueChanged(newValue)
+                        onValueChangedState.value(newValue)
                         hapticState.reset(newValue)
                     },
                     onHorizontalDrag = { change, _ ->
@@ -865,7 +867,7 @@ private fun ColorSlider(
                             change.position.x,
                             size.width.toFloat(),
                             with(density) { sliderHeightDp.toPx() }).coerceIn(0f, 1f)
-                        onValueChanged(newValue)
+                        onValueChangedState.value(newValue)
                         hapticState.handleHapticFeedback(newValue, hapticEffect, hapticFeedback)
                     }
                 )

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

@@ -30,14 +30,14 @@ data class OkLab(val l: Double, val a: Double, val b: Double) {
 /**
  * User-friendly HSV-like representation.
  * - h: hue in degrees [0, 360)
- * - v: value/brightness in percent [0.0, 100.0]
  * - s: saturation in percent [0.0, 100.0]
+ * - v: value/brightness in percent [0.0, 100.0]
  */
-data class Hsv(val h: Double, val v: Double, val s: Double) {
+data class Hsv(val h: Double, val s: Double, val v: Double) {
     fun toColor(alpha: Float = 1f): Color {
         val hue = (((h % 360.0) + 360.0) % 360.0).toFloat()
-        val vN = (v / 100.0).coerceIn(0.0, 1.0).toFloat()
         val sN = (s / 100.0).coerceIn(0.0, 1.0).toFloat()
+        val vN = (v / 100.0).coerceIn(0.0, 1.0).toFloat()
         return hsv(hue, sN, vN, alpha)
     }
 }
@@ -57,7 +57,7 @@ fun Color.toHsv(): Hsv {
     val h = hsvArr[0].toDouble()
     val s = (hsvArr[1] * 100.0).coerceIn(0.0, 100.0)
     val v = (hsvArr[2] * 100.0).coerceIn(0.0, 100.0)
-    return Hsv(h, v, s)
+    return Hsv(h, s, v)
 }
 
 object ColorUtils {