library: Use staticCompositionLocalOf to reduce read overhead

YuKongA · YuKongA · commit dd000d0625b9 · 2025-08-20T22:01:28.000+08:00
diff --git a/example/src/commonMain/kotlin/UITest.kt b/example/src/commonMain/kotlin/UITest.kt
@@ -53,7 +53,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.platform.LocalUriHandler
@@ -237,17 +236,10 @@ private fun WideScreenLayout(
     windowSize: WindowSize,
     colorMode: MutableState<Int>
 ) {
-    val density = LocalDensity.current
     val layoutDirection = LocalLayoutDirection.current
 
     val windowWidth = getWindowSize().width
-    val defaultWeight = remember(windowWidth, density) {
-        val minPx = with(density) { UIConstants.WIDE_SCREEN_THRESHOLD.toPx() }
-        val maxPx = with(density) { 1920.dp.toPx() }
-        val t = (windowWidth - minPx) / 2500
-        0.3f - 0.2f * t
-    }
-    var weight by remember(windowWidth) { mutableStateOf(defaultWeight) }
+    var weight by remember(windowWidth) { mutableStateOf(0.4f) }
     var potentialWeight by remember { mutableFloatStateOf(weight) }
     val dragState = rememberDraggableState { delta ->
         val nextPotentialWeight = potentialWeight + delta / windowWidth
diff --git a/iosApp/iosApp/Info.plist b/iosApp/iosApp/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0.4</string>
 	<key>CFBundleVersion</key>
-	<string>533</string>
+	<string>534</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>CADisableMinimumFrameDurationOnPhone</key>
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Component.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Component.kt
@@ -87,6 +87,31 @@ fun BasicComponent(
         } else Modifier
     }
 
+    val titleContent: (@Composable () -> Unit)? = remember(title, enabled, titleColor) {
+        title?.let { text ->
+            {
+                Text(
+                    text = text,
+                    fontSize = MiuixTheme.textStyles.headline1.fontSize,
+                    fontWeight = FontWeight.Medium,
+                    color = titleColor.color(enabled)
+                )
+            }
+        }
+    }
+
+    val summaryContent: (@Composable () -> Unit)? = remember(summary, enabled, summaryColor) {
+        summary?.let { text ->
+            {
+                Text(
+                    text = text,
+                    fontSize = MiuixTheme.textStyles.body2.fontSize,
+                    color = summaryColor.color(enabled)
+                )
+            }
+        }
+    }
+
     SubcomposeLayout(
         modifier = modifier
             .heightIn(min = 56.dp)
@@ -113,25 +138,12 @@ fun BasicComponent(
         val rightHeight = rightPlaceables.maxOfOrNull { it.height } ?: 0
         // 3. content
         val contentMaxWidth = maxOf(0, constraints.maxWidth - leftWidth - rightWidth - 16.dp.roundToPx())
-        val titlePlaceable = title?.let {
-            subcompose("title") {
-                Text(
-                    text = it,
-                    fontSize = MiuixTheme.textStyles.headline1.fontSize,
-                    fontWeight = FontWeight.Medium,
-                    color = titleColor.color(enabled)
-                )
-            }.first().measure(looseConstraints.copy(maxWidth = contentMaxWidth))
-        }
-        val summaryPlaceable = summary?.let {
-            subcompose("summary") {
-                Text(
-                    text = it,
-                    fontSize = MiuixTheme.textStyles.body2.fontSize,
-                    color = summaryColor.color(enabled)
-                )
-            }.first().measure(looseConstraints.copy(maxWidth = contentMaxWidth))
-        }
+        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) {
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/ListPopup.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/ListPopup.kt
@@ -41,8 +41,8 @@ import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import top.yukonga.miuix.kmp.theme.MiuixTheme
 import top.yukonga.miuix.kmp.utils.BackHandler
-import top.yukonga.miuix.kmp.utils.MiuixPopupUtils.Companion.PopupLayout
 import top.yukonga.miuix.kmp.utils.G2RoundedCornerShape
+import top.yukonga.miuix.kmp.utils.MiuixPopupUtils.Companion.PopupLayout
 import top.yukonga.miuix.kmp.utils.getWindowSize
 import kotlin.math.min
 
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/NavigationBar.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/NavigationBar.kt
@@ -48,8 +48,8 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import top.yukonga.miuix.kmp.theme.MiuixTheme
-import top.yukonga.miuix.kmp.utils.Platform
 import top.yukonga.miuix.kmp.utils.G2RoundedCornerShape
+import top.yukonga.miuix.kmp.utils.Platform
 import top.yukonga.miuix.kmp.utils.platform
 
 /**
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Switch.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/basic/Switch.kt
@@ -21,7 +21,7 @@ import androidx.compose.foundation.interaction.collectIsDraggedAsState
 import androidx.compose.foundation.interaction.collectIsHoveredAsState
 import androidx.compose.foundation.interaction.collectIsPressedAsState
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentSize
@@ -123,7 +123,6 @@ fun Switch(
         Modifier
     }
 
-
     Box(
         modifier = modifier
             .wrapContentSize(Alignment.Center)
@@ -141,13 +140,13 @@ fun Switch(
     ) {
         Box(
             modifier = Modifier
-                .padding(start = thumbOffset)
                 .align(Alignment.CenterStart)
+                .offset(x = thumbOffset)
                 .size(thumbSize)
                 .drawBehind {
                     drawCircle(color = thumbColor)
                 }
-                .pointerInput(checked) {
+                .pointerInput(checked, enabled) {
                     if (!enabled) return@pointerInput
                     awaitEachGesture {
                         val pressInteraction: PressInteraction.Press
@@ -163,7 +162,7 @@ fun Switch(
                         }
                     }
                 }
-                .pointerInput(checked) {
+                .pointerInput(checked, enabled) {
                     if (!enabled) return@pointerInput
                     val dragInteraction: DragInteraction.Start = DragInteraction.Start()
                     detectHorizontalDragGestures(
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperArrow.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperArrow.kt
@@ -5,12 +5,14 @@ package top.yukonga.miuix.kmp.extra
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.RowScope
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
@@ -56,6 +58,16 @@ fun SuperArrow(
     holdDownState: Boolean = false,
     enabled: Boolean = true
 ) {
+    val rightActionsContent: @Composable (RowScope.() -> Unit) =
+        remember(rightText, rightActionColor, enabled) {
+            {
+                SuperArrowRightActions(
+                    rightText = rightText,
+                    tintColor = rightActionColor.color(enabled)
+                )
+            }
+        }
+
     BasicComponent(
         modifier = modifier,
         insideMargin = insideMargin,
@@ -64,13 +76,7 @@ fun SuperArrow(
         summary = summary,
         summaryColor = summaryColor,
         leftAction = leftAction,
-        rightActions = {
-            SuperArrowRightActions(
-                rightText = rightText,
-                rightActionColor = rightActionColor,
-                enabled = enabled
-            )
-        },
+        rightActions = rightActionsContent,
         onClick = onClick?.takeIf { enabled },
         holdDownState = holdDownState,
         enabled = enabled
@@ -80,17 +86,16 @@ fun SuperArrow(
 @Composable
 private fun SuperArrowRightActions(
     rightText: String?,
-    rightActionColor: RightActionColors,
-    enabled: Boolean
+    tintColor: Color
 ) {
-    val currentRightActionColor = rightActionColor.color(enabled)
+    val tintFilter = remember(tintColor) { ColorFilter.tint(tintColor) }
 
     if (rightText != null) {
         Text(
             modifier = Modifier.widthIn(max = 130.dp),
             text = rightText,
             fontSize = MiuixTheme.textStyles.body2.fontSize,
-            color = currentRightActionColor,
+            color = tintColor,
             textAlign = TextAlign.End,
             overflow = TextOverflow.Ellipsis,
             maxLines = 2
@@ -102,7 +107,7 @@ private fun SuperArrowRightActions(
             .size(width = 10.dp, height = 16.dp),
         imageVector = MiuixIcons.Basic.ArrowRight,
         contentDescription = null,
-        colorFilter = ColorFilter.tint(currentRightActionColor),
+        colorFilter = tintFilter,
     )
 }
 
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDialog.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/extra/SuperDialog.kt
@@ -32,8 +32,8 @@ import androidx.compose.ui.unit.dp
 import top.yukonga.miuix.kmp.basic.Text
 import top.yukonga.miuix.kmp.theme.MiuixTheme
 import top.yukonga.miuix.kmp.utils.BackHandler
-import top.yukonga.miuix.kmp.utils.MiuixPopupUtils.Companion.DialogLayout
 import top.yukonga.miuix.kmp.utils.G2RoundedCornerShape
+import top.yukonga.miuix.kmp.utils.MiuixPopupUtils.Companion.DialogLayout
 import top.yukonga.miuix.kmp.utils.getRoundedCorner
 import top.yukonga.miuix.kmp.utils.getWindowSize
 
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/theme/ContentColor.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/theme/ContentColor.kt
@@ -8,7 +8,7 @@ import androidx.compose.ui.graphics.Color
 
 /**
  * CompositionLocal containing the preferred content color for a given position in the hierarchy.
- * This typically represents the `on` color for a color in [ColorScheme]. For example, if the
+ * This typically represents the `on` color for a color in [Colors]. For example, if the
  * background color is [Colors.surface], this color is typically set to
  * [Colors.onSurface].
  *
diff --git a/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/utils/MiuixPopupUtils.kt b/miuix/src/commonMain/kotlin/top/yukonga/miuix/kmp/utils/MiuixPopupUtils.kt

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import androidx.compose.ui.graphics.Color`
`8`	`8`
`9`	`9`	`/**`
`10`	`10`	`* CompositionLocal containing the preferred content color for a given position in the hierarchy.`
`11`		- * This typically represents the `on` color for a color in [ColorScheme]. For example, if the
	`11`	+ * This typically represents the `on` color for a color in [Colors]. For example, if the
`12`	`12`	`* background color is [Colors.surface], this color is typically set to`
`13`	`13`	`* [Colors.onSurface].`
`14`	`14`	`*`