react-native-enriched-markdown 0.1.1 → 0.2.0

package/android/src/main/java/com/swmansion/enriched/markdown/renderer/StrikethroughRenderer.kt

@@ -0,0 +1,27 @@
+package com.swmansion.enriched.markdown.renderer
+
+import android.text.SpannableStringBuilder
+import com.swmansion.enriched.markdown.parser.MarkdownASTNode
+import com.swmansion.enriched.markdown.spans.StrikethroughSpan
+import com.swmansion.enriched.markdown.utils.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
+
+class StrikethroughRenderer(
+  private val config: RendererConfig,
+) : NodeRenderer {
+  override fun render(
+    node: MarkdownASTNode,
+    builder: SpannableStringBuilder,
+    onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
+    factory: RendererFactory,
+  ) {
+    factory.renderWithSpan(builder, { factory.renderChildren(node, builder, onLinkPress, onLinkLongPress) }) { start, end, blockStyle ->
+      builder.setSpan(
+        StrikethroughSpan(factory.styleCache.strikethroughColor),
+        start,
+        end,
+        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+      )
+    }
+  }
+}

package/android/src/main/java/com/swmansion/enriched/markdown/renderer/StrongRenderer.kt

@@ -12,9 +12,10 @@ class StrongRenderer(
     node: MarkdownASTNode,
     builder: SpannableStringBuilder,
     onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
     factory: RendererFactory,
   ) {
-    factory.renderWithSpan(builder, { factory.renderChildren(node, builder, onLinkPress) }) { start, end, blockStyle ->
+    factory.renderWithSpan(builder, { factory.renderChildren(node, builder, onLinkPress, onLinkLongPress) }) { start, end, blockStyle ->
       builder.setSpan(
         StrongSpan(factory.styleCache, blockStyle),
         start,

package/android/src/main/java/com/swmansion/enriched/markdown/renderer/TextRenderer.kt

@@ -10,6 +10,7 @@ class TextRenderer : NodeRenderer {
     node: MarkdownASTNode,
     builder: SpannableStringBuilder,
     onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
     factory: RendererFactory,
   ) {
     val content = node.content

package/android/src/main/java/com/swmansion/enriched/markdown/renderer/ThematicBreakRenderer.kt

@@ -12,6 +12,7 @@ class ThematicBreakRenderer(
     node: MarkdownASTNode,
     builder: SpannableStringBuilder,
     onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
     factory: RendererFactory,
   ) {
     builder.ensureNewline()

package/android/src/main/java/com/swmansion/enriched/markdown/renderer/UnderlineRenderer.kt

@@ -0,0 +1,27 @@
+package com.swmansion.enriched.markdown.renderer
+
+import android.text.SpannableStringBuilder
+import android.text.style.UnderlineSpan
+import com.swmansion.enriched.markdown.parser.MarkdownASTNode
+import com.swmansion.enriched.markdown.utils.SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE
+
+class UnderlineRenderer(
+  private val config: RendererConfig,
+) : NodeRenderer {
+  override fun render(
+    node: MarkdownASTNode,
+    builder: SpannableStringBuilder,
+    onLinkPress: ((String) -> Unit)?,
+    onLinkLongPress: ((String) -> Unit)?,
+    factory: RendererFactory,
+  ) {
+    factory.renderWithSpan(builder, { factory.renderChildren(node, builder, onLinkPress, onLinkLongPress) }) { start, end, _ ->
+      builder.setSpan(
+        UnderlineSpan(),
+        start,
+        end,
+        SPAN_FLAGS_EXCLUSIVE_EXCLUSIVE,
+      )
+    }
+  }
+}

package/android/src/main/java/com/swmansion/enriched/markdown/spans/ImageSpan.kt

@@ -28,6 +28,7 @@ class ImageSpan(
   val imageUrl: String,
   styleConfig: StyleConfig,
   val isInline: Boolean = false,
+  val altText: String = "",
 ) : AndroidImageSpan(
     createInitialDrawable(styleConfig, imageUrl, isInline),
     imageUrl,

package/android/src/main/java/com/swmansion/enriched/markdown/spans/LineHeightSpan.kt

@@ -2,35 +2,26 @@ package com.swmansion.enriched.markdown.spans
 
 import android.graphics.Paint
 import kotlin.math.ceil
-import kotlin.math.roundToInt
+import kotlin.math.floor
 import android.text.style.LineHeightSpan as AndroidLineHeightSpan
 
-/**
- * Custom LineHeightSpan for Android API levels below 29.
- * Matches LineHeightSpan.Standard behavior for consistent rendering across all API levels.
- */
 class LineHeightSpan(
-  private val lineHeight: Float,
+  height: Float,
 ) : AndroidLineHeightSpan {
+  private val lineHeight: Int = ceil(height.toDouble()).toInt()
+
   override fun chooseHeight(
     text: CharSequence?,
     start: Int,
     end: Int,
     spanstartv: Int,
-    lineHeight: Int,
+    v: Int,
     fm: Paint.FontMetricsInt?,
   ) {
     if (fm == null) return
 
-    val targetHeight = ceil(this.lineHeight.toDouble()).toInt()
-    val originHeight = fm.descent - fm.ascent
-
-    if (originHeight <= 0) {
-      return
-    }
-
-    val ratio = targetHeight.toFloat() / originHeight
-    fm.descent = (fm.descent * ratio).roundToInt()
-    fm.ascent = fm.descent - targetHeight
+    val leading = lineHeight - ((-fm.ascent) + fm.descent)
+    fm.ascent -= ceil(leading / 2.0f).toInt()
+    fm.descent += floor(leading / 2.0f).toInt()
   }
 }

package/android/src/main/java/com/swmansion/enriched/markdown/spans/LinkSpan.kt

@@ -12,17 +12,31 @@ import com.swmansion.enriched.markdown.utils.applyBlockStyleFont
 class LinkSpan(
   val url: String,
   private val onLinkPress: ((String) -> Unit)?,
+  private val onLinkLongPress: ((String) -> Unit)?,
   private val styleCache: SpanStyleCache,
   private val blockStyle: BlockStyle,
   private val context: Context,
 ) : ClickableSpan() {
+  @Volatile
+  private var longPressTriggered = false
+
   override fun onClick(widget: View) {
-    if (onLinkPress != null) {
-      onLinkPress(url)
-    } else if (widget is EnrichedMarkdownText) {
-      // Emit event directly from view (enriched pattern)
-      widget.emitOnLinkPress(url)
+    if (longPressTriggered) {
+      longPressTriggered = false
+      return
     }
+
+    onLinkPress?.invoke(url) ?: (widget as? EnrichedMarkdownText)?.emitOnLinkPress(url)
+  }
+
+  fun onLongClick(widget: View): Boolean {
+    longPressTriggered = true
+
+    (widget as? EnrichedMarkdownText)?.emitOnLinkLongPress(url)
+
+    onLinkLongPress?.invoke(url)
+
+    return true
   }
 
   override fun updateDrawState(textPaint: TextPaint) {

package/android/src/main/java/com/swmansion/enriched/markdown/spans/MarginBottomSpan.kt

@@ -9,7 +9,7 @@ import android.text.style.LineHeightSpan
  * For spacer lines (single newline), sets the line height to exactly marginBottom.
  * For regular lines, adds marginBottom only at paragraph boundaries to preserve lineHeight.
  *
- * @param marginBottom The margin in pixels to add below the block (must be > 0)
+ * @param marginBottom The margin in pixels to add below the block (0 = no margin)
  */
 class MarginBottomSpan(
   val marginBottom: Float,

package/android/src/main/java/com/swmansion/enriched/markdown/spans/StrikethroughSpan.kt

@@ -0,0 +1,12 @@
+package com.swmansion.enriched.markdown.spans
+
+import android.text.TextPaint
+import android.text.style.CharacterStyle
+
+class StrikethroughSpan(
+  private val strikethroughColor: Int,
+) : CharacterStyle() {
+  override fun updateDrawState(tp: TextPaint) {
+    tp.isStrikeThruText = true
+  }
+}

package/android/src/main/java/com/swmansion/enriched/markdown/styles/BaseBlockStyle.kt

@@ -5,6 +5,7 @@ interface BaseBlockStyle {
   val fontFamily: String
   val fontWeight: String
   val color: Int
+  val marginTop: Float
   val marginBottom: Float
   val lineHeight: Float
 }

package/android/src/main/java/com/swmansion/enriched/markdown/styles/BlockquoteStyle.kt

@@ -7,6 +7,7 @@ data class BlockquoteStyle(
   override val fontFamily: String,
   override val fontWeight: String,
   override val color: Int,
+  override val marginTop: Float,
   override val marginBottom: Float,
   override val lineHeight: Float,
   val borderColor: Int,
@@ -23,6 +24,7 @@ data class BlockquoteStyle(
       val fontFamily = parser.parseString(map, "fontFamily")
       val fontWeight = parser.parseString(map, "fontWeight", "normal")
       val color = parser.parseColor(map, "color")
+      val marginTop = parser.toPixelFromDIP(map.getDouble("marginTop").toFloat())
       val marginBottom = parser.toPixelFromDIP(map.getDouble("marginBottom").toFloat())
       val lineHeightRaw = map.getDouble("lineHeight").toFloat()
       val lineHeight = parser.toPixelFromSP(lineHeightRaw)
@@ -36,6 +38,7 @@ data class BlockquoteStyle(
         fontFamily,
         fontWeight,
         color,
+        marginTop,
         marginBottom,
         lineHeight,
         borderColor,

package/android/src/main/java/com/swmansion/enriched/markdown/styles/CodeBlockStyle.kt

@@ -7,6 +7,7 @@ data class CodeBlockStyle(
   override val fontFamily: String,
   override val fontWeight: String,
   override val color: Int,
+  override val marginTop: Float,
   override val marginBottom: Float,
   override val lineHeight: Float,
   val backgroundColor: Int,
@@ -24,6 +25,7 @@ data class CodeBlockStyle(
       val fontFamily = parser.parseString(map, "fontFamily")
       val fontWeight = parser.parseString(map, "fontWeight", "normal")
       val color = parser.parseColor(map, "color")
+      val marginTop = parser.toPixelFromDIP(map.getDouble("marginTop").toFloat())
       val marginBottom = parser.toPixelFromDIP(map.getDouble("marginBottom").toFloat())
       val lineHeightRaw = map.getDouble("lineHeight").toFloat()
       val lineHeight = parser.toPixelFromSP(lineHeightRaw)
@@ -38,6 +40,7 @@ data class CodeBlockStyle(
         fontFamily,
         fontWeight,
         color,
+        marginTop,
         marginBottom,
         lineHeight,
         backgroundColor,

package/android/src/main/java/com/swmansion/enriched/markdown/styles/HeadingStyle.kt

@@ -7,8 +7,10 @@ data class HeadingStyle(
   override val fontFamily: String,
   override val fontWeight: String,
   override val color: Int,
+  override val marginTop: Float,
   override val marginBottom: Float,
   override val lineHeight: Float,
+  val textAlign: TextAlignment,
 ) : BaseBlockStyle {
   companion object {
     fun fromReadableMap(
@@ -19,11 +21,13 @@ data class HeadingStyle(
       val fontFamily = parser.parseString(map, "fontFamily")
       val fontWeight = parser.parseString(map, "fontWeight", "normal")
       val color = parser.parseColor(map, "color")
+      val marginTop = parser.toPixelFromDIP(map.getDouble("marginTop").toFloat())
       val marginBottom = parser.toPixelFromDIP(map.getDouble("marginBottom").toFloat())
       val lineHeightRaw = map.getDouble("lineHeight").toFloat()
       val lineHeight = parser.toPixelFromSP(lineHeightRaw)
+      val textAlign = parser.parseTextAlign(map, "textAlign")
 
-      return HeadingStyle(fontSize, fontFamily, fontWeight, color, marginBottom, lineHeight)
+      return HeadingStyle(fontSize, fontFamily, fontWeight, color, marginTop, marginBottom, lineHeight, textAlign)
     }
   }
 }

package/android/src/main/java/com/swmansion/enriched/markdown/styles/ImageStyle.kt

@@ -5,6 +5,7 @@ import com.facebook.react.bridge.ReadableMap
 data class ImageStyle(
   val height: Float,
   val borderRadius: Float,
+  val marginTop: Float,
   val marginBottom: Float,
 ) {
   companion object {
@@ -14,8 +15,9 @@ data class ImageStyle(
     ): ImageStyle {
       val height = parser.toPixelFromDIP(map.getDouble("height").toFloat())
       val borderRadius = parser.toPixelFromDIP(map.getDouble("borderRadius").toFloat())
+      val marginTop = parser.toPixelFromDIP(map.getDouble("marginTop").toFloat())
       val marginBottom = parser.toPixelFromDIP(map.getDouble("marginBottom").toFloat())
-      return ImageStyle(height, borderRadius, marginBottom)
+      return ImageStyle(height, borderRadius, marginTop, marginBottom)
     }
   }
 }

package/android/src/main/java/com/swmansion/enriched/markdown/styles/ListStyle.kt

@@ -7,6 +7,7 @@ data class ListStyle(
   override val fontFamily: String,
   override val fontWeight: String,
   override val color: Int,
+  override val marginTop: Float,
   override val marginBottom: Float,
   override val lineHeight: Float,
   val bulletColor: Int,
@@ -25,6 +26,7 @@ data class ListStyle(
       val fontFamily = parser.parseString(map, "fontFamily")
       val fontWeight = parser.parseString(map, "fontWeight", "normal")
       val color = parser.parseColor(map, "color")
+      val marginTop = parser.toPixelFromDIP(map.getDouble("marginTop").toFloat())
       val marginBottom = parser.toPixelFromDIP(map.getDouble("marginBottom").toFloat())
       val lineHeightRaw = map.getDouble("lineHeight").toFloat()
       val lineHeight = parser.toPixelFromSP(lineHeightRaw)
@@ -40,6 +42,7 @@ data class ListStyle(
         fontFamily,
         fontWeight,
         color,
+        marginTop,
         marginBottom,
         lineHeight,
         bulletColor,

package/android/src/main/java/com/swmansion/enriched/markdown/styles/ParagraphStyle.kt

@@ -7,8 +7,10 @@ data class ParagraphStyle(
   override val fontFamily: String,
   override val fontWeight: String,
   override val color: Int,
+  override val marginTop: Float,
   override val marginBottom: Float,
   override val lineHeight: Float,
+  val textAlign: TextAlignment,
 ) : BaseBlockStyle {
   companion object {
     fun fromReadableMap(
@@ -19,11 +21,13 @@ data class ParagraphStyle(
       val fontFamily = parser.parseString(map, "fontFamily")
       val fontWeight = parser.parseString(map, "fontWeight", "normal")
       val color = parser.parseColor(map, "color")
+      val marginTop = parser.toPixelFromDIP(map.getDouble("marginTop").toFloat())
       val marginBottom = parser.toPixelFromDIP(map.getDouble("marginBottom").toFloat())
       val lineHeightRaw = map.getDouble("lineHeight").toFloat()
       val lineHeight = parser.toPixelFromSP(lineHeightRaw)
+      val textAlign = parser.parseTextAlign(map, "textAlign")
 
-      return ParagraphStyle(fontSize, fontFamily, fontWeight, color, marginBottom, lineHeight)
+      return ParagraphStyle(fontSize, fontFamily, fontWeight, color, marginTop, marginBottom, lineHeight, textAlign)
     }
   }
 }

package/android/src/main/java/com/swmansion/enriched/markdown/styles/StrikethroughStyle.kt

@@ -0,0 +1,17 @@
+package com.swmansion.enriched.markdown.styles
+
+import com.facebook.react.bridge.ReadableMap
+
+data class StrikethroughStyle(
+  val color: Int,
+) {
+  companion object {
+    fun fromReadableMap(
+      map: ReadableMap,
+      parser: StyleParser,
+    ): StrikethroughStyle {
+      val color = parser.parseColor(map, "color")
+      return StrikethroughStyle(color)
+    }
+  }
+}

package/android/src/main/java/com/swmansion/enriched/markdown/styles/StyleConfig.kt

@@ -16,8 +16,10 @@ import com.facebook.react.views.text.ReactTypefaceUtils.parseFontWeight
 class StyleConfig(
   private val style: ReadableMap,
   context: Context,
+  allowFontScaling: Boolean,
+  maxFontSizeMultiplier: Float,
 ) {
-  private val styleParser = StyleParser(context)
+  private val styleParser = StyleParser(context, allowFontScaling, maxFontSizeMultiplier)
   private val assets: AssetManager = context.assets
 
   val paragraphStyle: ParagraphStyle by lazy {
@@ -88,6 +90,22 @@ class StyleConfig(
     EmphasisStyle.fromReadableMap(map, styleParser)
   }
 
+  val strikethroughStyle: StrikethroughStyle by lazy {
+    val map =
+      requireNotNull(style.getMap("strikethrough")) {
+        "Strikethrough style not found. JS should always provide defaults."
+      }
+    StrikethroughStyle.fromReadableMap(map, styleParser)
+  }
+
+  val underlineStyle: UnderlineStyle by lazy {
+    val map =
+      requireNotNull(style.getMap("underline")) {
+        "Underline style not found. JS should always provide defaults."
+      }
+    UnderlineStyle.fromReadableMap(map, styleParser)
+  }
+
   val codeStyle: CodeStyle by lazy {
     val map =
       requireNotNull(style.getMap("code")) {
@@ -144,6 +162,15 @@ class StyleConfig(
     ThematicBreakStyle.fromReadableMap(map, styleParser)
   }
 
+  /**
+   * Returns true if any paragraph or heading style uses justify alignment.
+   * Used to enable justification mode on the TextView (API 26+).
+   */
+  val needsJustify: Boolean by lazy {
+    paragraphStyle.textAlign.needsJustify ||
+      headingStyles.filterNotNull().any { it.textAlign.needsJustify }
+  }
+
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
     if (other !is StyleConfig) return false
@@ -153,6 +180,8 @@ class StyleConfig(
       linkStyle == other.linkStyle &&
       strongStyle == other.strongStyle &&
       emphasisStyle == other.emphasisStyle &&
+      strikethroughStyle == other.strikethroughStyle &&
+      underlineStyle == other.underlineStyle &&
       codeStyle == other.codeStyle &&
       imageStyle == other.imageStyle &&
       inlineImageStyle == other.inlineImageStyle &&
@@ -168,6 +197,8 @@ class StyleConfig(
     result = 31 * result + linkStyle.hashCode()
     result = 31 * result + strongStyle.hashCode()
     result = 31 * result + emphasisStyle.hashCode()
+    result = 31 * result + strikethroughStyle.hashCode()
+    result = 31 * result + underlineStyle.hashCode()
     result = 31 * result + codeStyle.hashCode()
     result = 31 * result + imageStyle.hashCode()
     result = 31 * result + inlineImageStyle.hashCode()

package/android/src/main/java/com/swmansion/enriched/markdown/styles/StyleParser.kt

@@ -5,12 +5,10 @@ import com.facebook.react.bridge.ColorPropConverter
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.uimanager.PixelUtil
 
-/**
- * Helper class for parsing style values from ReadableMap.
- * Provides common parsing utilities used by all style factory functions.
- */
 class StyleParser(
   private val context: Context,
+  private val allowFontScaling: Boolean,
+  private val maxFontSizeMultiplier: Float,
 ) {
   fun parseOptionalColor(
     map: ReadableMap,
@@ -69,7 +67,26 @@ class StyleParser(
       default
     }
 
-  fun toPixelFromSP(value: Float): Float = PixelUtil.toPixelFromSP(value)
+  fun toPixelFromSP(value: Float): Float {
+    val metrics = context.resources.displayMetrics
+    val baseDensity = metrics.density
+
+    if (!allowFontScaling) {
+      return value * baseDensity
+    }
+
+    var fontScale = metrics.scaledDensity / baseDensity
+    if (maxFontSizeMultiplier >= 1.0f && fontScale > maxFontSizeMultiplier) {
+      fontScale = maxFontSizeMultiplier
+    }
+
+    return value * baseDensity * fontScale
+  }
 
   fun toPixelFromDIP(value: Float): Float = PixelUtil.toPixelFromDIP(value)
+
+  fun parseTextAlign(
+    map: ReadableMap,
+    key: String,
+  ): TextAlignment = TextAlignment.fromString(parseString(map, key, "left"))
 }

package/android/src/main/java/com/swmansion/enriched/markdown/styles/TextAlignment.kt

@@ -0,0 +1,32 @@
+package com.swmansion.enriched.markdown.styles
+
+import android.text.Layout
+
+enum class TextAlignment(
+  val layoutAlignment: Layout.Alignment,
+  val needsJustify: Boolean,
+) {
+  LEFT(Layout.Alignment.ALIGN_NORMAL, false),
+  CENTER(Layout.Alignment.ALIGN_CENTER, false),
+  RIGHT(Layout.Alignment.ALIGN_OPPOSITE, false),
+  JUSTIFY(Layout.Alignment.ALIGN_NORMAL, true),
+  AUTO(Layout.Alignment.ALIGN_NORMAL, false),
+  ;
+
+  /**
+   * Whether an AlignmentSpan is needed.
+   * Only CENTER and RIGHT need explicit spans; LEFT/AUTO use default, JUSTIFY is handled at TextView level.
+   */
+  val needsAlignmentSpan: Boolean get() = this == CENTER || this == RIGHT
+
+  companion object {
+    fun fromString(value: String): TextAlignment =
+      when (value.lowercase()) {
+        "center" -> CENTER
+        "right" -> RIGHT
+        "justify" -> JUSTIFY
+        "auto" -> AUTO
+        else -> LEFT
+      }
+  }
+}

package/android/src/main/java/com/swmansion/enriched/markdown/styles/UnderlineStyle.kt

@@ -0,0 +1,17 @@
+package com.swmansion.enriched.markdown.styles
+
+import com.facebook.react.bridge.ReadableMap
+
+data class UnderlineStyle(
+  val color: Int,
+) {
+  companion object {
+    fun fromReadableMap(
+      map: ReadableMap,
+      parser: StyleParser,
+    ): UnderlineStyle {
+      val color = parser.parseColor(map, "color")
+      return UnderlineStyle(color)
+    }
+  }
+}

package/android/src/main/java/com/swmansion/enriched/markdown/utils/HTMLGenerator.kt

@@ -2,7 +2,6 @@ package com.swmansion.enriched.markdown.utils
 
 import android.graphics.Typeface
 import android.text.Spannable
-import android.text.style.StrikethroughSpan
 import android.text.style.StyleSpan
 import android.text.style.UnderlineSpan
 import com.swmansion.enriched.markdown.spans.BlockquoteSpan
@@ -13,6 +12,7 @@ import com.swmansion.enriched.markdown.spans.HeadingSpan
 import com.swmansion.enriched.markdown.spans.ImageSpan
 import com.swmansion.enriched.markdown.spans.LinkSpan
 import com.swmansion.enriched.markdown.spans.OrderedListSpan
+import com.swmansion.enriched.markdown.spans.StrikethroughSpan
 import com.swmansion.enriched.markdown.spans.StrongSpan
 import com.swmansion.enriched.markdown.spans.UnorderedListSpan
 import com.swmansion.enriched.markdown.styles.StyleConfig
@@ -68,9 +68,11 @@ object HTMLGenerator {
     val linkColor: String
     val linkUnderline: Boolean
 
-    // Strong/Emphasis
+    // Strong/Emphasis/Strikethrough/Underline
     val strongColor: String?
     val emphasisColor: String?
+    val strikethroughColor: String?
+    val underlineColor: String?
 
     // Image
     val imageMarginBottom: Int
@@ -135,11 +137,15 @@ object HTMLGenerator {
       linkColor = colorToCSS(style.linkStyle.color)
       linkUnderline = style.linkStyle.underline
 
-      // Strong/Emphasis (nullable for inherit)
+      // Strong/Emphasis/Strikethrough/Underline (nullable for inherit)
       val sc = style.strongStyle.color
       strongColor = if (sc != null && sc != 0) colorToCSS(sc) else null
       val ec = style.emphasisStyle.color
       emphasisColor = if (ec != null && ec != 0) colorToCSS(ec) else null
+      val strikeColor = style.strikethroughStyle.color
+      strikethroughColor = if (strikeColor != 0) colorToCSS(strikeColor) else null
+      val underline = style.underlineStyle.color
+      underlineColor = if (underline != 0) colorToCSS(underline) else null
 
       // Image
       val imgStyle = style.imageStyle
@@ -710,8 +716,20 @@ object HTMLGenerator {
       }
     }
 
-    if (isStrikethrough) html.append("<s>")
-    if (isUnderline && link == null) html.append("<u>")
+    if (isStrikethrough) {
+      if (styles.strikethroughColor != null) {
+        html.append("<s style=\"text-decoration-color: ").append(styles.strikethroughColor).append(";\">")
+      } else {
+        html.append("<s>")
+      }
+    }
+    if (isUnderline && link == null) {
+      if (styles.underlineColor != null) {
+        html.append("<u style=\"text-decoration-color: ").append(styles.underlineColor).append(";\">")
+      } else {
+        html.append("<u>")
+      }
+    }
 
     escapeHTMLTo(html, content.trimEnd('\n'))