From 0e38bfbc798e8737e6d123945413b8ea55a6eab0 Mon Sep 17 00:00:00 2001
From: Ivan Matkov <ivan.matkov@jetbrains.com>
Date: Mon, 3 Apr 2023 10:01:33 +0200
Subject: [PATCH] Fix merging styles

---
 .../androidx/compose/ui/text/platform/SkiaParagraph.skiko.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/SkiaParagraph.skiko.kt b/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/SkiaParagraph.skiko.kt
index d637a654859c1..09ab19b36203a 100644
--- a/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/SkiaParagraph.skiko.kt
+++ b/compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/SkiaParagraph.skiko.kt
@@ -243,7 +243,7 @@ internal data class ComputedStyle(
 
     fun merge(density: Density, other: SpanStyle) {
         val fontSize = fontSizeInHierarchy(density, fontSize, other.fontSize)
-        textForegroundStyle.merge(other.textForegroundStyle)
+        textForegroundStyle = textForegroundStyle.merge(other.textForegroundStyle)
         other.fontFamily?.let { fontFamily = it }
         this.fontSize = fontSize
         other.fontWeight?.let { fontWeight = it }