From c5cc3a56384187b84a569ec2d1b571b691132aef Mon Sep 17 00:00:00 2001 From: Karan Sharma <55722391+ksharma-xyz@users.noreply.github.com> Date: Wed, 12 Feb 2025 23:14:14 +1100 Subject: [PATCH] Prefer param color and then LocalComposition Color --- .../kotlin/xyz/ksharma/krail/taj/components/Text.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/taj/src/commonMain/kotlin/xyz/ksharma/krail/taj/components/Text.kt b/taj/src/commonMain/kotlin/xyz/ksharma/krail/taj/components/Text.kt index 2a6b99ad..563f7824 100644 --- a/taj/src/commonMain/kotlin/xyz/ksharma/krail/taj/components/Text.kt +++ b/taj/src/commonMain/kotlin/xyz/ksharma/krail/taj/components/Text.kt @@ -54,8 +54,8 @@ fun Text( ) { val contentAlpha = LocalContentAlpha.current val textStyle = style.merge(LocalTextStyle.current) - val textColor: Color = LocalTextColor.current - .takeIf { it != Color.Unspecified } ?: color ?: KrailTheme.colors.onSurface + val textColor: Color = color ?: LocalTextColor.current + .takeIf { it != Color.Unspecified } ?: KrailTheme.colors.onSurface BasicText( text = text,