library: Set @NonRestartableComposable

Author: YuKongA

iosApp/iosApp/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.7</string>
 	<key>CFBundleVersion</key>
-	<string>652</string>
+	<string>654</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>

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

@@ -11,7 +11,11 @@ import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.NonRestartableComposable
+import androidx.compose.runtime.derivedStateOf
+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
 import androidx.compose.ui.graphics.Color
@@ -37,6 +41,7 @@ import top.yukonga.miuix.kmp.theme.MiuixTheme
  * @param content The [Composable] content of the [Button].
  */
 @Composable
+@NonRestartableComposable
 fun Button(
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -48,10 +53,11 @@ fun Button(
     insideMargin: PaddingValues = ButtonDefaults.InsideMargin,
     content: @Composable RowScope.() -> Unit
 ) {
+    val currentOnClick by rememberUpdatedState(onClick)
     val shape = remember(cornerRadius) { ContinuousRoundedRectangle(cornerRadius) }
-    val color = if (enabled) colors.color else colors.disabledColor
+    val color by remember(enabled, colors) { derivedStateOf { if (enabled) colors.color else colors.disabledColor } }
     Surface(
-        onClick = onClick,
+        onClick = currentOnClick,
         enabled = enabled,
         modifier = modifier.semantics { role = Role.Button },
         shape = shape,
@@ -82,6 +88,7 @@ fun Button(
  * @param insideMargin The margin inside the [TextButton].
  */
 @Composable
+@NonRestartableComposable
 fun TextButton(
     text: String,
     onClick: () -> Unit,
@@ -93,11 +100,12 @@ fun TextButton(
     minHeight: Dp = ButtonDefaults.MinHeight,
     insideMargin: PaddingValues = ButtonDefaults.InsideMargin
 ) {
+    val currentOnClick by rememberUpdatedState(onClick)
     val shape = remember(cornerRadius) { ContinuousRoundedRectangle(cornerRadius) }
-    val color = if (enabled) colors.color else colors.disabledColor
-    val textColor = if (enabled) colors.textColor else colors.disabledTextColor
+    val color by remember(enabled, colors) { derivedStateOf { if (enabled) colors.color else colors.disabledColor } }
+    val textColor by remember(enabled, colors) { derivedStateOf { if (enabled) colors.textColor else colors.disabledTextColor } }
     Surface(
-        onClick = onClick,
+        onClick = currentOnClick,
         enabled = enabled,
         modifier = modifier.semantics { role = Role.Button },
         shape = shape,
@@ -227,4 +235,4 @@ class TextButtonColors(
         textColor = textColor,
         disabledTextColor = disabledTextColor
     )
-}
+}

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

@@ -15,7 +15,10 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@@ -94,6 +97,8 @@ fun Card(
     content: @Composable ColumnScope.() -> Unit,
 ) {
     val interactionSource = remember { MutableInteractionSource() }
+    val currentOnClick by rememberUpdatedState(onClick)
+    val currentOnLongPress by rememberUpdatedState(onLongPress)
 
     val pressFeedback = remember(pressFeedbackType) {
         when (pressFeedbackType) {
@@ -103,9 +108,17 @@ fun Card(
         }
     }
 
+    val usedInteractionSource by remember(pressFeedback) {
+        derivedStateOf { if (pressFeedback != null) interactionSource else null }
+    }
+    val indicationLocal = LocalIndication.current
+    val indicationToUse = remember(showIndication, indicationLocal) {
+        if (showIndication == true) indicationLocal else null
+    }
+
     BasicCard(
         modifier = modifier.pressable(
-            interactionSource = if (pressFeedback != null) interactionSource else null,
+            interactionSource = usedInteractionSource,
             indication = pressFeedback,
             delay = null
         ),
@@ -116,9 +129,9 @@ fun Card(
             modifier = Modifier
                 .combinedClickable(
                     interactionSource = interactionSource,
-                    indication = if (showIndication == true) LocalIndication.current else null,
-                    onClick = { onClick?.invoke() },
-                    onLongClick = onLongPress
+                    indication = indicationToUse,
+                    onClick = { currentOnClick?.invoke() },
+                    onLongClick = currentOnLongPress
                 )
                 .padding(insideMargin),
             content = content
@@ -200,4 +213,4 @@ class CardColors(
         color.takeOrElse { this.color },
         contentColor.takeOrElse { this.contentColor },
     )
-}
+}

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

@@ -18,8 +18,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.derivedStateOf
 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
 import androidx.compose.ui.draw.clip
@@ -57,25 +59,32 @@ fun Checkbox(
     colors: CheckboxColors = CheckboxDefaults.checkboxColors(),
     enabled: Boolean = true,
 ) {
+    val currentOnCheckedChange by rememberUpdatedState(onCheckedChange)
     val hapticFeedback = LocalHapticFeedback.current
 
+    val targetBackgroundColor by remember(checked, enabled, colors) {
+        derivedStateOf { if (checked) colors.checkedBackgroundColor(enabled) else colors.uncheckedBackgroundColor(enabled) }
+    }
     val backgroundColor by animateColorAsState(
-        targetValue = if (checked) colors.checkedBackgroundColor(enabled) else colors.uncheckedBackgroundColor(enabled),
+        targetValue = targetBackgroundColor,
         animationSpec = tween(durationMillis = 300, easing = FastOutSlowInEasing)
     )
 
+    val targetForegroundColor by remember(checked, enabled, colors) {
+        derivedStateOf { if (checked) colors.checkedForegroundColor(enabled) else colors.uncheckedForegroundColor(enabled) }
+    }
     val foregroundColor by animateColorAsState(
-        targetValue = if (checked) colors.checkedForegroundColor(enabled) else colors.uncheckedForegroundColor(enabled),
+        targetValue = targetForegroundColor,
         animationSpec = tween(durationMillis = 300, easing = FastOutSlowInEasing)
     )
 
     val checkmarkAnim = rememberCheckmarkAnimationState(checked)
 
-    val finalModifier = if (onCheckedChange != null) {
+    val finalModifier = if (currentOnCheckedChange != null) {
         Modifier.toggleable(
             value = checked,
             onValueChange = {
-                onCheckedChange(it)
+                currentOnCheckedChange!!(it)
                 hapticFeedback.performHapticFeedback(
                     if (it) HapticFeedbackType.ToggleOn else HapticFeedbackType.ToggleOff
                 )
@@ -325,4 +334,4 @@ class CheckboxColors(
     @Stable
     internal fun uncheckedBackgroundColor(enabled: Boolean): Color =
         if (enabled) uncheckedBackgroundColor else disabledUncheckedBackgroundColor
-}
+}

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

@@ -5,8 +5,8 @@ package top.yukonga.miuix.kmp.basic
 
 import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.detectDragGestures
-import androidx.compose.foundation.gestures.detectTapGestures
+import androidx.compose.foundation.gestures.awaitEachGesture
+import androidx.compose.foundation.gestures.awaitFirstDown
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -17,6 +17,7 @@ import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -127,6 +128,10 @@ fun ColorPalette(
             )
         }
 
+        val baseColor by remember(selectedRow, selectedCol, rows, hueColumns, includeGrayColumn) {
+            derivedStateOf { cellColor(selectedCol, selectedRow, rowSV, grayV, hueColumns, includeGrayColumn) }
+        }
+
         PaletteCanvas(
             rows = rows,
             hueColumns = hueColumns,
@@ -138,16 +143,14 @@ fun ColorPalette(
             onSelect = { r, c ->
                 selectedRow = r
                 selectedCol = c
-                val base = cellColor(c, r, rowSV, grayV, hueColumns, includeGrayColumn)
-                val newColor = base.copy(alpha = alpha)
-                lastAcceptedHSV = base.toHsv().let { Triple(it.h.toFloat(), (it.s / 100.0).toFloat(), (it.v / 100.0).toFloat()) }
+                val newColor = cellColor(c, r, rowSV, grayV, hueColumns, includeGrayColumn).copy(alpha = alpha)
+                lastAcceptedHSV = newColor.toHsv().let { Triple(it.h.toFloat(), (it.s / 100.0).toFloat(), (it.v / 100.0).toFloat()) }
                 lastEmittedColor = newColor
                 onColorChangedState.value(newColor)
             }
         )
 
-        val base = cellColor(selectedCol, selectedRow, rowSV, grayV, hueColumns, includeGrayColumn)
-        val hsvBase = base.toHsv()
+        val hsvBase = baseColor.toHsv()
         val h = hsvBase.h.toFloat()
         val s = (hsvBase.s / 100.0).toFloat()
         val v = (hsvBase.v / 100.0).toFloat()
@@ -159,9 +162,9 @@ fun ColorPalette(
             currentAlpha = alpha,
             onAlphaChanged = {
                 alpha = it
-                val newColor = base.copy(alpha = it)
+                val newColor = baseColor.copy(alpha = it)
                 lastAcceptedHSV =
-                    base.toHsv().let { Triple(it.h.toFloat(), (it.s / 100.0).toFloat(), (it.v / 100.0).toFloat()) }
+                    baseColor.toHsv().let { Triple(it.h.toFloat(), (it.s / 100.0).toFloat(), (it.v / 100.0).toFloat()) }
                 lastEmittedColor = newColor
                 onColorChangedState.value(newColor)
             }
@@ -193,17 +196,21 @@ private fun PaletteCanvas(
             .clip(shape)
             .onGloballyPositioned { sizePx = it.size }
             .pointerInput(rows, hueColumns, includeGrayColumn) {
-                detectTapGestures { pos ->
-                    if (sizePx.width == 0 || sizePx.height == 0) return@detectTapGestures
-                    val (r, c) = pointToCell(pos, sizePx, rows, totalColumns)
-                    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)
-                    onSelectState.value(r, c)
+                awaitEachGesture {
+                    val down = awaitFirstDown()
+                    if (sizePx.width == 0 || sizePx.height == 0) return@awaitEachGesture
+                    val (r0, c0) = pointToCell(down.position, sizePx, rows, totalColumns)
+                    onSelectState.value(r0, c0)
+
+                    val pointerId = down.id
+                    while (true) {
+                        val event = awaitPointerEvent()
+                        val change = event.changes.find { it.id == pointerId } ?: event.changes.firstOrNull() ?: break
+                        if (!change.pressed) break
+                        val (r, c) = pointToCell(change.position, sizePx, rows, totalColumns)
+                        onSelectState.value(r, c)
+                        change.consume()
+                    }
                 }
             }
             .fillMaxWidth()
@@ -368,4 +375,4 @@ private fun <T> List<T>.indexOfMinBy(selector: (T) -> Float): Int {
     return idx
 }
 
-private fun sq(v: Float) = v * v
+private fun sq(v: Float) = v * v