Fixed Text Component order for color (#596)

Fixed Null Pointer in IDE sample on non INTUI themes Co-authored-by: Francisco Noriega <[email protected]>
JetBrains · Sep 17, 2024 · db7e053 · db7e053
1 parent b367950
commit db7e053
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Text.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Text.kt
@@ -79,7 +79,7 @@ public fun Text(
     onTextLayout: (TextLayoutResult) -> Unit = {},
     style: TextStyle = JewelTheme.defaultTextStyle,
 ) {
-    val textColor = color.takeOrElse { LocalContentColor.current.takeOrElse { style.color } }
+    val textColor = color.takeOrElse { style.color.takeOrElse { LocalContentColor.current } }
 
     val mergedStyle =
         style.merge(

diff --git a/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tooltip.kt b/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tooltip.kt
@@ -24,6 +24,7 @@ import androidx.compose.ui.window.PopupPositionProviderAtPosition
 import org.jetbrains.jewel.foundation.ExperimentalJewelApi
 import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.foundation.theme.LocalContentColor
+import org.jetbrains.jewel.foundation.theme.LocalTextStyle
 import org.jetbrains.jewel.foundation.theme.OverrideDarkMode
 import org.jetbrains.jewel.ui.component.styling.TooltipStyle
 import org.jetbrains.jewel.ui.theme.tooltipStyle
@@ -39,7 +40,10 @@ public fun Tooltip(
 ) {
     TooltipArea(
         tooltip = {
-            CompositionLocalProvider(LocalContentColor provides style.colors.content) {
+            CompositionLocalProvider(
+                LocalContentColor provides style.colors.content,
+                LocalTextStyle provides LocalTextStyle.current.copy(color = style.colors.content),
+            ) {
                 Box(
                     modifier =
                         Modifier.shadow(