library: some improvements

Author: YuKongA

iosApp/iosApp/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.5</string>
 	<key>CFBundleVersion</key>
-	<string>592</string>
+	<string>593</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>

miuix/src/androidMain/kotlin/top/yukonga/miuix/kmp/utils/Utils.android.kt

@@ -16,6 +16,7 @@ import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
@@ -100,15 +101,14 @@ actual fun PredictiveBackHandler(
     onBack: () -> Unit
 ) {
     val backDispatcher = LocalOnBackPressedDispatcherOwner.current?.onBackPressedDispatcher
-    
+
     val currentOnBackStarted by rememberUpdatedState(onBackStarted)
     val currentOnBackProgressed by rememberUpdatedState(onBackProgressed)
     val currentOnBackCancelled by rememberUpdatedState(onBackCancelled)
     val currentOnBack by rememberUpdatedState(onBack)
-    val currentEnabled by rememberUpdatedState(enabled)
-    
-    DisposableEffect(backDispatcher) {
-        val callback = object : OnBackPressedCallback(currentEnabled) {
+
+    val callback = remember {
+        object : OnBackPressedCallback(false) {
             override fun handleOnBackStarted(backEvent: AndroidBackEventCompat) {
                 currentOnBackStarted?.invoke(
                     BackEventCompat(
@@ -119,7 +119,7 @@ actual fun PredictiveBackHandler(
                     )
                 )
             }
-            
+
             override fun handleOnBackProgressed(backEvent: AndroidBackEventCompat) {
                 currentOnBackProgressed?.invoke(
                     BackEventCompat(
@@ -130,25 +130,25 @@ actual fun PredictiveBackHandler(
                     )
                 )
             }
-            
+
             override fun handleOnBackCancelled() {
                 currentOnBackCancelled?.invoke()
             }
-            
+
             override fun handleOnBackPressed() {
                 currentOnBack()
             }
         }
-        
+    }
+
+    SideEffect {
+        callback.isEnabled = enabled
+    }
+
+    DisposableEffect(backDispatcher) {
         backDispatcher?.addCallback(callback)
-        
         onDispose {
             callback.remove()
         }
     }
-    
-    // Update enabled state when it changes
-    DisposableEffect(enabled) {
-        onDispose { }
-    }
 }

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

@@ -182,7 +182,7 @@ private fun PaletteCanvas(
     val totalColumns = hueColumns + if (includeGrayColumn) 1 else 0
     val rowSV = remember(rows) { buildRowSV(rows) }
     val grayV = remember(rows) { buildGrayV(rows) }
-    val shape = ContinuousRoundedRectangle(cornerRadius)
+    val shape = remember(cornerRadius) { ContinuousRoundedRectangle(cornerRadius) }
 
     var sizePx by remember { mutableStateOf(IntSize.Zero) }
 

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

@@ -7,6 +7,7 @@ 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.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
@@ -22,7 +23,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.layout.SubcomposeLayout
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import top.yukonga.miuix.kmp.interfaces.HoldDownInteraction
@@ -50,7 +50,7 @@ fun BasicComponent(
     titleColor: BasicComponentColors = BasicComponentDefaults.titleColor(),
     summary: String? = null,
     summaryColor: BasicComponentColors = BasicComponentDefaults.summaryColor(),
-    leftAction: @Composable (() -> Unit?)? = null,
+    leftAction: @Composable (() -> Unit)? = null,
     rightActions: @Composable RowScope.() -> Unit = {},
     modifier: Modifier = Modifier,
     insideMargin: PaddingValues = BasicComponentDefaults.InsideMargin,
@@ -77,7 +77,7 @@ fun BasicComponent(
         }
     }
 
-    val clickableModifier = remember(onClick, enabled, interactionSource) {
+    val clickableModifier = remember(onClick, enabled, interactionSource, indication) {
         if (onClick != null && enabled) {
             Modifier.clickable(
                 indication = indication,
@@ -87,85 +87,41 @@ fun BasicComponent(
         } else Modifier
     }
 
-    val titleContent: (@Composable () -> Unit)? = remember(title, enabled, titleColor) {
-        title?.let { text ->
-            {
+    Row(
+        modifier = modifier
+            .heightIn(min = 56.dp)
+            .fillMaxWidth()
+            .then(clickableModifier)
+            .padding(insideMargin),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        // Left action (optional)
+        leftAction?.let { it() }
+
+        // Content
+        Column(
+            modifier = Modifier.weight(1f),
+            verticalArrangement = Arrangement.Center
+        ) {
+            if (title != null) {
                 Text(
-                    text = text,
+                    text = title,
                     fontSize = MiuixTheme.textStyles.headline1.fontSize,
                     fontWeight = FontWeight.Medium,
                     color = titleColor.color(enabled)
                 )
             }
-        }
-    }
-
-    val summaryContent: (@Composable () -> Unit)? = remember(summary, enabled, summaryColor) {
-        summary?.let { text ->
-            {
+            if (summary != null) {
                 Text(
-                    text = text,
+                    text = summary,
                     fontSize = MiuixTheme.textStyles.body2.fontSize,
                     color = summaryColor.color(enabled)
                 )
             }
         }
-    }
 
-    SubcomposeLayout(
-        modifier = modifier
-            .heightIn(min = 56.dp)
-            .fillMaxWidth()
-            .then(clickableModifier)
-            .padding(insideMargin)
-    ) { constraints ->
-        val looseConstraints = constraints.copy(minWidth = 0, minHeight = 0)
-        // 1. leftAction
-        val leftPlaceables = leftAction?.let {
-            subcompose("leftAction") { it() }.map { it -> it.measure(looseConstraints) }
-        } ?: emptyList()
-        val leftWidth = leftPlaceables.maxOfOrNull { it.width } ?: 0
-        val leftHeight = leftPlaceables.maxOfOrNull { it.height } ?: 0
-        // 2. rightActions
-        val rightPlaceables = subcompose("rightActions") {
-            Row(
-                horizontalArrangement = Arrangement.End,
-                verticalAlignment = Alignment.CenterVertically,
-                content = rightActions
-            )
-        }.map { it.measure(looseConstraints) }
-        val rightWidth = rightPlaceables.maxOfOrNull { it.width } ?: 0
-        val rightHeight = rightPlaceables.maxOfOrNull { it.height } ?: 0
-        // 3. content
-        val contentMaxWidth = maxOf(0, constraints.maxWidth - leftWidth - rightWidth - 16.dp.roundToPx())
-        val titlePlaceable = titleContent
-            ?.let { subcompose("title", it).first() }
-            ?.measure(looseConstraints.copy(maxWidth = contentMaxWidth))
-        val summaryPlaceable = summaryContent
-            ?.let { subcompose("summary", it).first() }
-            ?.measure(looseConstraints.copy(maxWidth = contentMaxWidth))
-        val contentHeight = (titlePlaceable?.height ?: 0) + (summaryPlaceable?.height ?: 0)
-        val layoutHeight = maxOf(leftHeight, rightHeight, contentHeight)
-        layout(constraints.maxWidth, layoutHeight) {
-            var x = 0
-            // leftAction
-            leftPlaceables.forEach {
-                it.placeRelative(x, (layoutHeight - it.height) / 2)
-                x += it.width
-            }
-            // content
-            var contentY = (layoutHeight - contentHeight) / 2
-            titlePlaceable?.let {
-                it.placeRelative(x, contentY)
-                contentY += it.height
-            }
-            summaryPlaceable?.placeRelative(x, contentY)
-            // rightActions
-            val rightX = constraints.maxWidth - rightWidth
-            rightPlaceables.forEach {
-                it.placeRelative(rightX, (layoutHeight - it.height) / 2)
-            }
-        }
+        // Right actions (optional)
+        rightActions()
     }
 }