library: Fixed crash caused by SmoothRoundedCornerShape

Author: YuKongA

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

@@ -14,8 +14,10 @@ actual fun Path.Companion.smoothRoundedRectangle(
     topRight: Float,
     bottomLeft: Float,
     bottomRight: Float
-): Path =
-    RoundedPolygon(
+): Path {
+    if (size.width <= 0f || size.height <= 0f) return Path()
+
+    return RoundedPolygon(
         vertices = floatArrayOf(
             0f, 0f,
             size.width, 0f,
@@ -28,4 +30,5 @@ actual fun Path.Companion.smoothRoundedRectangle(
             CornerRounding(radius = bottomRight, smoothing = smoothing),
             CornerRounding(radius = bottomLeft, smoothing = smoothing),
         )
-    ).toPath().asComposePath()
+    ).toPath().asComposePath()
+}

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

@@ -9,6 +9,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -45,13 +47,14 @@ fun Button(
     insideMargin: PaddingValues = ButtonDefaults.InsideMargin,
     content: @Composable RowScope.() -> Unit
 ) {
+    val shape = remember { derivedStateOf { SmoothRoundedCornerShape(cornerRadius) } }
     Surface(
         onClick = {
             onClick()
         },
         enabled = enabled,
         modifier = modifier.semantics { role = Role.Button },
-        shape = SmoothRoundedCornerShape(cornerRadius),
+        shape = shape.value,
         color = colors.color(enabled)
     ) {
         Row(

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

@@ -8,6 +8,8 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@@ -39,9 +41,10 @@ fun Card(
     color: Color = CardDefaults.DefaultColor(),
     content: @Composable ColumnScope.() -> Unit
 ) {
+    val shape = remember { derivedStateOf { SmoothRoundedCornerShape(cornerRadius) } }
     Box(
         modifier = modifier
-            .background(color = color, shape = SmoothRoundedCornerShape(cornerRadius))
+            .background(color = color, shape = shape.value)
             .clip(RoundedCornerShape(cornerRadius)) // For touch feedback, because there is a problem when using Smooth RoundedCornerShape.
             .semantics(mergeDescendants = false) {
                 isTraversalGroup = true

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

@@ -5,6 +5,8 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -40,10 +42,11 @@ fun IconButton(
     minWidth: Dp = IconButtonDefaults.MinWidth,
     content: @Composable () -> Unit
 ) {
+    val shape = remember { derivedStateOf { SmoothRoundedCornerShape(cornerRadius) } }
     Box(
         modifier = modifier
             .defaultMinSize(minWidth = minWidth, minHeight = minHeight)
-            .clip(SmoothRoundedCornerShape(cornerRadius))
+            .clip(shape.value)
             .background(color = backgroundColor)
             .clickable(
                 onClick = onClick,

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

@@ -161,7 +161,7 @@ fun ListPopup(
                             constraints.copy(
                                 minWidth = 200.dp.roundToPx(),
                                 minHeight = 50.dp.roundToPx(),
-                                maxHeight = if (maxHeight != null) maxHeight.roundToPx() else windowBounds.height - popupMargin.top - popupMargin.bottom
+                                maxHeight = maxHeight?.roundToPx() ?: (windowBounds.height - popupMargin.top - popupMargin.bottom)
                             )
                         )
                         popupContentSize = IntSize(placeable.width, placeable.height)
@@ -245,15 +245,11 @@ fun ListPopupColumn(
         modifier = Modifier.verticalScroll(rememberScrollState())
     ) { constraints ->
         var listHeight = 0
-        val tempConstraints = constraints.copy(
-            minWidth = 200.dp.roundToPx(), maxWidth = 288.dp.roundToPx()
-        )
+        val tempConstraints = constraints.copy(minWidth = 200.dp.roundToPx(), maxWidth = 288.dp.roundToPx(), minHeight = 0)
         val listWidth = subcompose("miuixPopupListFake", content).map {
             it.measure(tempConstraints)
         }.maxOf { it.width }.coerceIn(200.dp.roundToPx(), 288.dp.roundToPx())
-        val childConstraints = constraints.copy(
-            minWidth = listWidth, maxWidth = listWidth
-        )
+        val childConstraints = constraints.copy(minWidth = listWidth, maxWidth = listWidth, minHeight = 0)
         val placeables = subcompose("miuixPopupListReal", content).map {
             val placeable = it.measure(childConstraints)
             listHeight += placeable.height

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

@@ -16,6 +16,7 @@ import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -161,11 +162,12 @@ fun InputField(
         interactionSource = interactionSource,
         decorationBox =
             @Composable { innerTextField ->
+                val shape = remember { derivedStateOf { SmoothRoundedCornerShape(50.dp) } }
                 Box(
                     modifier = Modifier
                         .background(
                             color = MiuixTheme.colorScheme.surfaceContainerHigh,
-                            shape = SmoothRoundedCornerShape(50.dp)
+                            shape = shape.value
                         )
                 ) {
                     Row(

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

@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -142,10 +143,10 @@ fun SliderBackground(
         targetValue = if (isDragging) 0.044f else 0f,
         animationSpec = tween(150)
     ).value
-
+    val shape = remember { derivedStateOf { SmoothRoundedCornerShape(height) } }
     Canvas(
         modifier = modifier
-            .clip(SmoothRoundedCornerShape(height))
+            .clip(shape.value)
             .background(backgroundColor)
             .drawBehind { drawRect(Color.Black.copy(alpha = backgroundAlpha)) }
     ) {

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

@@ -11,6 +11,7 @@ import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -61,7 +62,7 @@ fun TabRow(
             ((windowSize.width.toDp() - (tabs.size - 1) * 9.dp) / tabs.size).coerceAtLeast(62.dp)
     }
 
-    val shape = remember { SmoothRoundedCornerShape(cornerRadius) }
+    val shape = remember { derivedStateOf { SmoothRoundedCornerShape(cornerRadius) } }
 
     LazyRow(
         state = listState,
@@ -72,7 +73,7 @@ fun TabRow(
     ) {
         itemsIndexed(tabs) { index, tabText ->
             Surface(
-                shape = shape,
+                shape = shape.value,
                 onClick = {
                     onSelect?.invoke(index)
                 },

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

@@ -16,6 +16,7 @@ import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -121,12 +122,13 @@ fun TextField(
         interactionSource = interactionSource,
         cursorBrush = SolidColor(MiuixTheme.colorScheme.primary),
         decorationBox = { innerTextField ->
+            val shape = remember { derivedStateOf { SmoothRoundedCornerShape(cornerRadius) } }
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
                     .background(
                         color = backgroundColor,
-                        shape = SmoothRoundedCornerShape(cornerRadius)
+                        shape = shape.value
                     )
                     .then(border)
             ) {

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

@@ -593,12 +593,12 @@ private fun TopAppBarLayout(
         val navigationIconPlaceable =
             measurables
                 .fastFirst { it.layoutId == "navigationIcon" }
-                .measure(constraints.copy(minWidth = 0))
+                .measure(constraints.copy(minWidth = 0, minHeight = 0))
 
         val actionIconsPlaceable =
             measurables
                 .fastFirst { it.layoutId == "actionIcons" }
-                .measure(constraints.copy(minWidth = 0))
+                .measure(constraints.copy(minWidth = 0, minHeight = 0))
 
         val maxTitleWidth =
             if (constraints.maxWidth == Constraints.Infinity) {
@@ -611,12 +611,12 @@ private fun TopAppBarLayout(
         val titlePlaceable =
             measurables
                 .fastFirst { it.layoutId == "title" }
-                .measure(constraints.copy(minWidth = 0, maxWidth = maxTitleWidth))
+                .measure(constraints.copy(minWidth = 0, maxWidth = maxTitleWidth, minHeight = 0))
 
         val largeTitlePlaceable =
             measurables
                 .fastFirst { it.layoutId == "largeTitle" }
-                .measure(constraints.copy(minWidth = 0))
+                .measure(constraints.copy(minWidth = 0, minHeight = 0))
 
         // Subtract the scrolledOffset from the maxHeight. The scrolledOffset is expected to be
         // equal or smaller than zero.
@@ -720,12 +720,12 @@ private fun SmallTopAppBarLayout(
         val navigationIconPlaceable =
             measurables
                 .fastFirst { it.layoutId == "navigationIcon" }
-                .measure(constraints.copy(minWidth = 0))
+                .measure(constraints.copy(minWidth = 0, minHeight = 0))
 
         val actionIconsPlaceable =
             measurables
                 .fastFirst { it.layoutId == "actionIcons" }
-                .measure(constraints.copy(minWidth = 0))
+                .measure(constraints.copy(minWidth = 0, minHeight = 0))
 
         val maxTitleWidth =
             if (constraints.maxWidth == Constraints.Infinity) {
@@ -738,7 +738,7 @@ private fun SmallTopAppBarLayout(
         val titlePlaceable =
             measurables
                 .fastFirst { it.layoutId == "title" }
-                .measure(constraints.copy(minWidth = 0, maxWidth = maxTitleWidth))
+                .measure(constraints.copy(minWidth = 0, maxWidth = maxTitleWidth, minHeight = 0))
 
 
         val layoutHeight =