From dd1ade2f998b5241b1320dc76bf2448d651b401c Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Wed, 25 Oct 2023 16:07:58 -0400 Subject: [PATCH] Avoids recompositions --- .../amethyst/ui/components/RichTextViewer.kt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt index 9f37f2507..30b8d40db 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt @@ -149,13 +149,16 @@ private fun RenderRegular( } val currentTextStyle = LocalTextStyle.current + val currentTextColor = LocalContentColor.current - val textStyle = currentTextStyle.copy( - lineHeight = 1.4.em, - color = currentTextStyle.color.takeOrElse { - LocalContentColor.current - } - ) + val textStyle = remember(currentTextStyle, currentTextColor) { + currentTextStyle.copy( + lineHeight = 1.4.em, + color = currentTextStyle.color.takeOrElse { + currentTextColor + } + ) + } MeasureSpaceWidth() { spaceWidth -> Column() {