react-native-enriched 0.2.0 → 0.3.0

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

@@ -6,7 +6,12 @@ import android.text.style.MetricAffectingSpan
 import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
-class EnrichedInlineCodeSpan(private val htmlStyle: HtmlStyle) : MetricAffectingSpan(), EnrichedInlineSpan {
+class EnrichedInlineCodeSpan(
+  private val htmlStyle: HtmlStyle,
+) : MetricAffectingSpan(),
+  EnrichedInlineSpan {
+  override val dependsOnHtmlStyle: Boolean = true
+
   override fun updateDrawState(textPaint: TextPaint) {
     val typeface = Typeface.create(Typeface.MONOSPACE, Typeface.NORMAL)
     textPaint.typeface = typeface
@@ -18,4 +23,6 @@ class EnrichedInlineCodeSpan(private val htmlStyle: HtmlStyle) : MetricAffecting
     val typeface = Typeface.create(Typeface.MONOSPACE, Typeface.NORMAL)
     textPaint.typeface = typeface
   }
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedInlineCodeSpan = EnrichedInlineCodeSpan(htmlStyle)
 }

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

@@ -6,5 +6,11 @@ import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
 @Suppress("UNUSED_PARAMETER")
-class EnrichedItalicSpan(private val htmlStyle: HtmlStyle) : StyleSpan(Typeface.ITALIC), EnrichedInlineSpan {
+class EnrichedItalicSpan(
+  private val htmlStyle: HtmlStyle,
+) : StyleSpan(Typeface.ITALIC),
+  EnrichedInlineSpan {
+  override val dependsOnHtmlStyle: Boolean = false
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedItalicSpan = EnrichedItalicSpan(htmlStyle)
 }

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

@@ -6,7 +6,13 @@ import android.view.View
 import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
-class EnrichedLinkSpan(private val url: String, private val htmlStyle: HtmlStyle) : ClickableSpan(), EnrichedInlineSpan {
+class EnrichedLinkSpan(
+  private val url: String,
+  private val htmlStyle: HtmlStyle,
+) : ClickableSpan(),
+  EnrichedInlineSpan {
+  override val dependsOnHtmlStyle: Boolean = true
+
   override fun onClick(view: View) {
     // Do nothing, links inside the input are not clickable.
     // We are using `ClickableSpan` to allow the text to be styled as a link.
@@ -18,7 +24,7 @@ class EnrichedLinkSpan(private val url: String, private val htmlStyle: HtmlStyle
     textPaint.isUnderlineText = htmlStyle.aUnderline
   }
 
-  fun getUrl(): String {
-    return url
-  }
+  fun getUrl(): String = url
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedLinkSpan = EnrichedLinkSpan(url, htmlStyle)
 }

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

@@ -6,8 +6,15 @@ import android.view.View
 import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
-class EnrichedMentionSpan(private val text: String, private val indicator: String, private val attributes: Map<String, String>, private val htmlStyle: HtmlStyle) :
-  ClickableSpan(), EnrichedInlineSpan {
+class EnrichedMentionSpan(
+  private val text: String,
+  private val indicator: String,
+  private val attributes: Map<String, String>,
+  private val htmlStyle: HtmlStyle,
+) : ClickableSpan(),
+  EnrichedInlineSpan {
+  override val dependsOnHtmlStyle: Boolean = true
+
   override fun onClick(view: View) {
     // Do nothing. Mentions inside the input are not clickable.
     // We are using `ClickableSpan` to allow the text to be styled as a clickable element.
@@ -22,15 +29,11 @@ class EnrichedMentionSpan(private val text: String, private val indicator: Strin
     textPaint.isUnderlineText = mentionsStyle.underline
   }
 
-  fun getAttributes(): Map<String, String> {
-    return attributes
-  }
+  fun getAttributes(): Map<String, String> = attributes
 
-  fun getText(): String {
-    return text
-  }
+  fun getText(): String = text
 
-  fun getIndicator(): String {
-    return indicator
-  }
+  fun getIndicator(): String = indicator
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedMentionSpan = EnrichedMentionSpan(text, indicator, attributes, htmlStyle)
 }

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

@@ -10,7 +10,14 @@ import android.text.style.MetricAffectingSpan
 import com.swmansion.enriched.spans.interfaces.EnrichedParagraphSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
-class EnrichedOrderedListSpan(private var index: Int, private val htmlStyle: HtmlStyle) : MetricAffectingSpan(), LeadingMarginSpan, EnrichedParagraphSpan {
+class EnrichedOrderedListSpan(
+  private var index: Int,
+  private val htmlStyle: HtmlStyle,
+) : MetricAffectingSpan(),
+  LeadingMarginSpan,
+  EnrichedParagraphSpan {
+  override val dependsOnHtmlStyle: Boolean = true
+
   override fun updateMeasureState(p0: TextPaint) {
     // Do nothing, but inform layout that this span affects text metrics
   }
@@ -19,9 +26,7 @@ class EnrichedOrderedListSpan(private var index: Int, private val htmlStyle: Htm
     // Do nothing, but inform layout that this span affects text metrics
   }
 
-  override fun getLeadingMargin(first: Boolean): Int {
-    return htmlStyle.olMarginLeft + htmlStyle.olGapWidth
-  }
+  override fun getLeadingMargin(first: Boolean): Int = htmlStyle.olMarginLeft + htmlStyle.olGapWidth
 
   override fun drawLeadingMargin(
     canvas: Canvas,
@@ -35,7 +40,7 @@ class EnrichedOrderedListSpan(private var index: Int, private val htmlStyle: Htm
     start: Int,
     end: Int,
     first: Boolean,
-    layout: Layout?
+    layout: Layout?,
   ) {
     if (first) {
       val text = "$index."
@@ -56,8 +61,11 @@ class EnrichedOrderedListSpan(private var index: Int, private val htmlStyle: Htm
     }
   }
 
-  private fun getTypeface(fontWeight: Int?, originalTypeface: Typeface): Typeface {
-    return if (fontWeight == null) {
+  private fun getTypeface(
+    fontWeight: Int?,
+    originalTypeface: Typeface,
+  ): Typeface =
+    if (fontWeight == null) {
       originalTypeface
     } else if (android.os.Build.VERSION.SDK_INT >= 28) {
       Typeface.create(originalTypeface, fontWeight, false)
@@ -69,13 +77,12 @@ class EnrichedOrderedListSpan(private var index: Int, private val htmlStyle: Htm
         Typeface.create(originalTypeface, Typeface.NORMAL)
       }
     }
-  }
 
-  fun getIndex(): Int {
-    return index
-  }
+  fun getIndex(): Int = index
 
   fun setIndex(i: Int) {
     index = i
   }
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedOrderedListSpan = EnrichedOrderedListSpan(index, htmlStyle)
 }

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

@@ -2,9 +2,23 @@ package com.swmansion.enriched.spans
 
 import com.swmansion.enriched.styles.HtmlStyle
 
-data class BaseSpanConfig(val clazz: Class<*>)
-data class ParagraphSpanConfig(val clazz: Class<*>, val isContinuous: Boolean)
-data class ListSpanConfig(val clazz: Class<*>, val shortcut: String)
+interface ISpanConfig {
+  val clazz: Class<*>
+}
+
+data class BaseSpanConfig(
+  override val clazz: Class<*>,
+) : ISpanConfig
+
+data class ParagraphSpanConfig(
+  override val clazz: Class<*>,
+  val isContinuous: Boolean,
+) : ISpanConfig
+
+data class ListSpanConfig(
+  override val clazz: Class<*>,
+  val shortcut: String,
+) : ISpanConfig
 
 data class StylesMergingConfig(
   // styles that should be removed when we apply specific style
@@ -25,6 +39,9 @@ object EnrichedSpans {
   const val H1 = "h1"
   const val H2 = "h2"
   const val H3 = "h3"
+  const val H4 = "h4"
+  const val H5 = "h5"
+  const val H6 = "h6"
   const val BLOCK_QUOTE = "block_quote"
   const val CODE_BLOCK = "code_block"
 
@@ -37,94 +54,179 @@ object EnrichedSpans {
   const val IMAGE = "image"
   const val MENTION = "mention"
 
-  val inlineSpans: Map<String, BaseSpanConfig> = mapOf(
-    BOLD to BaseSpanConfig(EnrichedBoldSpan::class.java),
-    ITALIC to BaseSpanConfig(EnrichedItalicSpan::class.java),
-    UNDERLINE to BaseSpanConfig(EnrichedUnderlineSpan::class.java),
-    STRIKETHROUGH to BaseSpanConfig(EnrichedStrikeThroughSpan::class.java),
-    INLINE_CODE to BaseSpanConfig(EnrichedInlineCodeSpan::class.java),
-  )
-
-  val paragraphSpans: Map<String, ParagraphSpanConfig> = mapOf(
-    H1 to ParagraphSpanConfig(EnrichedH1Span::class.java, false),
-    H2 to ParagraphSpanConfig(EnrichedH2Span::class.java, false),
-    H3 to ParagraphSpanConfig(EnrichedH3Span::class.java, false),
-    BLOCK_QUOTE to ParagraphSpanConfig(EnrichedBlockQuoteSpan::class.java, true),
-    CODE_BLOCK to ParagraphSpanConfig(EnrichedCodeBlockSpan::class.java, true),
-  )
-
-  val listSpans: Map<String, ListSpanConfig> = mapOf(
-    UNORDERED_LIST to ListSpanConfig(EnrichedUnorderedListSpan::class.java, "- "),
-    ORDERED_LIST to ListSpanConfig(EnrichedOrderedListSpan::class.java, "1. "),
-  )
-
-  val parametrizedStyles: Map<String, BaseSpanConfig> = mapOf(
-    LINK to BaseSpanConfig(EnrichedLinkSpan::class.java),
-    IMAGE to BaseSpanConfig(EnrichedImageSpan::class.java),
-    MENTION to BaseSpanConfig(EnrichedMentionSpan::class.java),
-  )
-
-  fun getMergingConfigForStyle(style: String, htmlStyle: HtmlStyle): StylesMergingConfig? {
-    return when (style) {
+  val inlineSpans: Map<String, BaseSpanConfig> =
+    mapOf(
+      BOLD to BaseSpanConfig(EnrichedBoldSpan::class.java),
+      ITALIC to BaseSpanConfig(EnrichedItalicSpan::class.java),
+      UNDERLINE to BaseSpanConfig(EnrichedUnderlineSpan::class.java),
+      STRIKETHROUGH to BaseSpanConfig(EnrichedStrikeThroughSpan::class.java),
+      INLINE_CODE to BaseSpanConfig(EnrichedInlineCodeSpan::class.java),
+    )
+
+  val paragraphSpans: Map<String, ParagraphSpanConfig> =
+    mapOf(
+      H1 to ParagraphSpanConfig(EnrichedH1Span::class.java, false),
+      H2 to ParagraphSpanConfig(EnrichedH2Span::class.java, false),
+      H3 to ParagraphSpanConfig(EnrichedH3Span::class.java, false),
+      H4 to ParagraphSpanConfig(EnrichedH4Span::class.java, false),
+      H5 to ParagraphSpanConfig(EnrichedH5Span::class.java, false),
+      H6 to ParagraphSpanConfig(EnrichedH6Span::class.java, false),
+      BLOCK_QUOTE to ParagraphSpanConfig(EnrichedBlockQuoteSpan::class.java, true),
+      CODE_BLOCK to ParagraphSpanConfig(EnrichedCodeBlockSpan::class.java, true),
+    )
+
+  val listSpans: Map<String, ListSpanConfig> =
+    mapOf(
+      UNORDERED_LIST to ListSpanConfig(EnrichedUnorderedListSpan::class.java, "- "),
+      ORDERED_LIST to ListSpanConfig(EnrichedOrderedListSpan::class.java, "1. "),
+    )
+
+  val parametrizedStyles: Map<String, BaseSpanConfig> =
+    mapOf(
+      LINK to BaseSpanConfig(EnrichedLinkSpan::class.java),
+      IMAGE to BaseSpanConfig(EnrichedImageSpan::class.java),
+      MENTION to BaseSpanConfig(EnrichedMentionSpan::class.java),
+    )
+
+  val allSpans: Map<String, ISpanConfig> = inlineSpans + paragraphSpans + listSpans + parametrizedStyles
+
+  fun getMergingConfigForStyle(
+    style: String,
+    htmlStyle: HtmlStyle,
+  ): StylesMergingConfig? =
+    when (style) {
       BOLD -> {
         val blockingStyles = mutableListOf(CODE_BLOCK)
         if (htmlStyle.h1Bold) blockingStyles.add(H1)
         if (htmlStyle.h2Bold) blockingStyles.add(H2)
         if (htmlStyle.h3Bold) blockingStyles.add(H3)
+        if (htmlStyle.h4Bold) blockingStyles.add(H4)
+        if (htmlStyle.h5Bold) blockingStyles.add(H5)
+        if (htmlStyle.h6Bold) blockingStyles.add(H6)
         StylesMergingConfig(blockingStyles = blockingStyles.toTypedArray())
       }
-      ITALIC -> StylesMergingConfig(
-        blockingStyles = arrayOf(CODE_BLOCK)
-      )
-      UNDERLINE -> StylesMergingConfig(
-        blockingStyles = arrayOf(CODE_BLOCK)
-      )
-      STRIKETHROUGH -> StylesMergingConfig(
-        blockingStyles = arrayOf(CODE_BLOCK)
-      )
-      INLINE_CODE -> StylesMergingConfig(
-        conflictingStyles = arrayOf(MENTION, LINK),
-        blockingStyles = arrayOf(CODE_BLOCK)
-      )
+
+      ITALIC -> {
+        StylesMergingConfig(
+          blockingStyles = arrayOf(CODE_BLOCK),
+        )
+      }
+
+      UNDERLINE -> {
+        StylesMergingConfig(
+          blockingStyles = arrayOf(CODE_BLOCK),
+        )
+      }
+
+      STRIKETHROUGH -> {
+        StylesMergingConfig(
+          blockingStyles = arrayOf(CODE_BLOCK),
+        )
+      }
+
+      INLINE_CODE -> {
+        StylesMergingConfig(
+          conflictingStyles = arrayOf(MENTION, LINK),
+          blockingStyles = arrayOf(CODE_BLOCK),
+        )
+      }
+
       H1 -> {
-        val conflictingStyles = mutableListOf(H2, H3, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK)
+        val conflictingStyles = mutableListOf(H2, H3, H4, H5, H6, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK)
         if (htmlStyle.h1Bold) conflictingStyles.add(BOLD)
         StylesMergingConfig(conflictingStyles = conflictingStyles.toTypedArray())
       }
+
       H2 -> {
-        val conflictingStyles = mutableListOf(H1, H3, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK)
+        val conflictingStyles = mutableListOf(H1, H3, H4, H5, H6, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK)
         if (htmlStyle.h2Bold) conflictingStyles.add(BOLD)
         StylesMergingConfig(conflictingStyles = conflictingStyles.toTypedArray())
       }
+
       H3 -> {
-        val conflictingStyles = mutableListOf(H1, H2, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK)
+        val conflictingStyles = mutableListOf(H1, H2, H4, H5, H6, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK)
         if (htmlStyle.h3Bold) conflictingStyles.add(BOLD)
         StylesMergingConfig(conflictingStyles = conflictingStyles.toTypedArray())
       }
-      BLOCK_QUOTE -> StylesMergingConfig(
-        conflictingStyles = arrayOf(H1, H2, H3, CODE_BLOCK, ORDERED_LIST, UNORDERED_LIST)
-      )
-      CODE_BLOCK -> StylesMergingConfig(
-        conflictingStyles = arrayOf(H1, H2, H3, BOLD, ITALIC, UNDERLINE, STRIKETHROUGH, UNORDERED_LIST, ORDERED_LIST, BLOCK_QUOTE, INLINE_CODE)
-      )
-      UNORDERED_LIST -> StylesMergingConfig(
-        conflictingStyles = arrayOf(H1, H2, H3, ORDERED_LIST, CODE_BLOCK, BLOCK_QUOTE)
-      )
-      ORDERED_LIST -> StylesMergingConfig(
-        conflictingStyles = arrayOf(H1, H2, H3, UNORDERED_LIST, CODE_BLOCK, BLOCK_QUOTE),
-      )
-      LINK -> StylesMergingConfig(
-        blockingStyles = arrayOf(INLINE_CODE, CODE_BLOCK, MENTION)
-      )
-      IMAGE -> StylesMergingConfig()
-      MENTION -> StylesMergingConfig(
-        blockingStyles = arrayOf(INLINE_CODE, CODE_BLOCK, LINK)
-      )
-      else -> null
+
+      H4 -> {
+        val conflictingStyles = mutableListOf(H1, H2, H3, H5, H6, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK)
+        if (htmlStyle.h4Bold) conflictingStyles.add(BOLD)
+        StylesMergingConfig(conflictingStyles = conflictingStyles.toTypedArray())
+      }
+
+      H5 -> {
+        val conflictingStyles = mutableListOf(H1, H2, H3, H4, H6, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK)
+        if (htmlStyle.h5Bold) conflictingStyles.add(BOLD)
+        StylesMergingConfig(conflictingStyles = conflictingStyles.toTypedArray())
+      }
+
+      H6 -> {
+        val conflictingStyles = mutableListOf(H1, H2, H3, H4, H5, ORDERED_LIST, UNORDERED_LIST, BLOCK_QUOTE, CODE_BLOCK)
+        if (htmlStyle.h6Bold) conflictingStyles.add(BOLD)
+        StylesMergingConfig(conflictingStyles = conflictingStyles.toTypedArray())
+      }
+
+      BLOCK_QUOTE -> {
+        StylesMergingConfig(
+          conflictingStyles = arrayOf(H1, H2, H3, H4, H5, H6, CODE_BLOCK, ORDERED_LIST, UNORDERED_LIST),
+        )
+      }
+
+      CODE_BLOCK -> {
+        StylesMergingConfig(
+          conflictingStyles =
+            arrayOf(
+              H1,
+              H2,
+              H3,
+              H4,
+              H5,
+              H6,
+              BOLD,
+              ITALIC,
+              UNDERLINE,
+              STRIKETHROUGH,
+              UNORDERED_LIST,
+              ORDERED_LIST,
+              BLOCK_QUOTE,
+              INLINE_CODE,
+            ),
+        )
+      }
+
+      UNORDERED_LIST -> {
+        StylesMergingConfig(
+          conflictingStyles = arrayOf(H1, H2, H3, H4, H5, H6, ORDERED_LIST, CODE_BLOCK, BLOCK_QUOTE),
+        )
+      }
+
+      ORDERED_LIST -> {
+        StylesMergingConfig(
+          conflictingStyles = arrayOf(H1, H2, H3, H4, H5, H6, UNORDERED_LIST, CODE_BLOCK, BLOCK_QUOTE),
+        )
+      }
+
+      LINK -> {
+        StylesMergingConfig(
+          blockingStyles = arrayOf(INLINE_CODE, CODE_BLOCK, MENTION),
+        )
+      }
+
+      IMAGE -> {
+        StylesMergingConfig()
+      }
+
+      MENTION -> {
+        StylesMergingConfig(
+          blockingStyles = arrayOf(INLINE_CODE, CODE_BLOCK, LINK),
+        )
+      }
+
+      else -> {
+        null
+      }
     }
-  }
 
-  fun isTypeContinuous(type: Class<*>): Boolean {
-    return paragraphSpans.values.find { it.clazz == type }?.isContinuous == true
-  }
+  fun isTypeContinuous(type: Class<*>): Boolean = paragraphSpans.values.find { it.clazz == type }?.isContinuous == true
 }

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

@@ -5,5 +5,11 @@ import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
 @Suppress("UNUSED_PARAMETER")
-class EnrichedStrikeThroughSpan(private val htmlStyle: HtmlStyle) : StrikethroughSpan(), EnrichedInlineSpan {
+class EnrichedStrikeThroughSpan(
+  private val htmlStyle: HtmlStyle,
+) : StrikethroughSpan(),
+  EnrichedInlineSpan {
+  override val dependsOnHtmlStyle: Boolean = false
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedStrikeThroughSpan = EnrichedStrikeThroughSpan(htmlStyle)
 }

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

@@ -5,5 +5,11 @@ import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
 @Suppress("UNUSED_PARAMETER")
-class EnrichedUnderlineSpan(private val htmlStyle: HtmlStyle) : UnderlineSpan(), EnrichedInlineSpan {
+class EnrichedUnderlineSpan(
+  private val htmlStyle: HtmlStyle,
+) : UnderlineSpan(),
+  EnrichedInlineSpan {
+  override val dependsOnHtmlStyle: Boolean = false
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedUnderlineSpan = EnrichedUnderlineSpan(htmlStyle)
 }

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

@@ -11,7 +11,13 @@ import com.swmansion.enriched.spans.interfaces.EnrichedParagraphSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
 // https://android.googlesource.com/platform/frameworks/base/+/refs/heads/main/core/java/android/text/style/BulletSpan.java
-class EnrichedUnorderedListSpan(private val htmlStyle: HtmlStyle) : MetricAffectingSpan(), LeadingMarginSpan, EnrichedParagraphSpan {
+class EnrichedUnorderedListSpan(
+  private val htmlStyle: HtmlStyle,
+) : MetricAffectingSpan(),
+  LeadingMarginSpan,
+  EnrichedParagraphSpan {
+  override val dependsOnHtmlStyle: Boolean = true
+
   override fun updateMeasureState(p0: TextPaint) {
     // Do nothing, but inform layout that this span affects text metrics
   }
@@ -20,9 +26,7 @@ class EnrichedUnorderedListSpan(private val htmlStyle: HtmlStyle) : MetricAffect
     // Do nothing, but inform layout that this span affects text metrics
   }
 
-  override fun getLeadingMargin(p0: Boolean): Int {
-    return htmlStyle.ulBulletSize + htmlStyle.ulGapWidth + htmlStyle.ulMarginLeft
-  }
+  override fun getLeadingMargin(p0: Boolean): Int = htmlStyle.ulBulletSize + htmlStyle.ulGapWidth + htmlStyle.ulMarginLeft
 
   override fun drawLeadingMargin(
     canvas: Canvas,
@@ -36,7 +40,7 @@ class EnrichedUnorderedListSpan(private val htmlStyle: HtmlStyle) : MetricAffect
     start: Int,
     end: Int,
     first: Boolean,
-    layout: Layout?
+    layout: Layout?,
   ) {
     val spannedText = text as Spanned
 
@@ -56,4 +60,6 @@ class EnrichedUnorderedListSpan(private val htmlStyle: HtmlStyle) : MetricAffect
       paint.style = style
     }
   }
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedUnorderedListSpan = EnrichedUnorderedListSpan(htmlStyle)
 }

package/android/src/main/java/com/swmansion/enriched/spans/interfaces/EnrichedBlockSpan.kt

@@ -1,4 +1,5 @@
 package com.swmansion.enriched.spans.interfaces
 
-interface EnrichedBlockSpan : EnrichedSpan, EnrichedZeroWidthSpaceSpan {
-}
+interface EnrichedBlockSpan :
+  EnrichedSpan,
+  EnrichedZeroWidthSpaceSpan

package/android/src/main/java/com/swmansion/enriched/spans/interfaces/EnrichedHeadingSpan.kt

@@ -1,4 +1,3 @@
 package com.swmansion.enriched.spans.interfaces
 
-interface EnrichedHeadingSpan : EnrichedParagraphSpan {
-}
+interface EnrichedHeadingSpan : EnrichedParagraphSpan

package/android/src/main/java/com/swmansion/enriched/spans/interfaces/EnrichedInlineSpan.kt

@@ -1,4 +1,3 @@
 package com.swmansion.enriched.spans.interfaces
 
-interface EnrichedInlineSpan : EnrichedSpan {
-}
+interface EnrichedInlineSpan : EnrichedSpan

package/android/src/main/java/com/swmansion/enriched/spans/interfaces/EnrichedParagraphSpan.kt

@@ -1,4 +1,5 @@
 package com.swmansion.enriched.spans.interfaces
 
-interface EnrichedParagraphSpan : EnrichedSpan, EnrichedZeroWidthSpaceSpan {
-}
+interface EnrichedParagraphSpan :
+  EnrichedSpan,
+  EnrichedZeroWidthSpaceSpan

package/android/src/main/java/com/swmansion/enriched/spans/interfaces/EnrichedSpan.kt

@@ -1,4 +1,9 @@
 package com.swmansion.enriched.spans.interfaces
 
+import com.swmansion.enriched.styles.HtmlStyle
+
 interface EnrichedSpan {
+  val dependsOnHtmlStyle: Boolean
+
+  fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedSpan
 }

package/android/src/main/java/com/swmansion/enriched/spans/interfaces/EnrichedZeroWidthSpaceSpan.kt

@@ -1,5 +1,4 @@
 package com.swmansion.enriched.spans.interfaces
 
 // Spans that are prefixed with zero-width space (\u200B) to ensure that they are visible even when empty.
-interface EnrichedZeroWidthSpaceSpan {
-}
+interface EnrichedZeroWidthSpaceSpan

package/android/src/main/java/com/swmansion/enriched/spans/utils/ForceRedrawSpan.kt

@@ -3,10 +3,11 @@ package com.swmansion.enriched.spans.utils
 import android.text.TextPaint
 import android.text.style.MetricAffectingSpan
 
-class ForceRedrawSpan:  MetricAffectingSpan() {
+class ForceRedrawSpan : MetricAffectingSpan() {
   override fun updateMeasureState(tp: TextPaint) {
     // Do nothing, we don't actually want to change how it looks
   }
+
   override fun updateDrawState(tp: TextPaint?) {
     // Do nothing
   }