react-native-enriched 0.2.0 → 0.3.0

package/android/src/main/java/com/swmansion/enriched/events/OnChangeStateDeprecatedEvent.kt

@@ -0,0 +1,21 @@
+package com.swmansion.enriched.events
+
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+class OnChangeStateDeprecatedEvent(
+  surfaceId: Int,
+  viewId: Int,
+  private val state: WritableMap,
+  private val experimentalSynchronousEvents: Boolean,
+) : Event<OnChangeStateDeprecatedEvent>(surfaceId, viewId) {
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap = state
+
+  override fun experimental_isSynchronous(): Boolean = experimentalSynchronousEvents
+
+  companion object {
+    const val EVENT_NAME: String = "onChangeStateDeprecated"
+  }
+}

package/android/src/main/java/com/swmansion/enriched/events/OnChangeStateEvent.kt

@@ -3,20 +3,17 @@ package com.swmansion.enriched.events
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class OnChangeStateEvent(surfaceId: Int, viewId: Int, private val state: WritableMap, private val experimentalSynchronousEvents: Boolean) :
-  Event<OnChangeStateEvent>(surfaceId, viewId) {
+class OnChangeStateEvent(
+  surfaceId: Int,
+  viewId: Int,
+  private val state: WritableMap,
+  private val experimentalSynchronousEvents: Boolean,
+) : Event<OnChangeStateEvent>(surfaceId, viewId) {
+  override fun getEventName(): String = EVENT_NAME
 
-  override fun getEventName(): String {
-    return EVENT_NAME
-  }
-
-  override fun getEventData(): WritableMap {
-    return state
-  }
+  override fun getEventData(): WritableMap = state
 
-  override fun experimental_isSynchronous(): Boolean {
-    return experimentalSynchronousEvents
-  }
+  override fun experimental_isSynchronous(): Boolean = experimentalSynchronousEvents
 
   companion object {
     const val EVENT_NAME: String = "onChangeState"

package/android/src/main/java/com/swmansion/enriched/events/OnChangeTextEvent.kt

@@ -4,25 +4,25 @@ import android.text.Editable
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
+import com.swmansion.enriched.utils.EnrichedConstants
 
-class OnChangeTextEvent(surfaceId: Int, viewId: Int, private val editable: Editable, private val experimentalSynchronousEvents: Boolean) :
-  Event<OnChangeTextEvent>(surfaceId, viewId) {
-
-  override fun getEventName(): String {
-    return EVENT_NAME
-  }
+class OnChangeTextEvent(
+  surfaceId: Int,
+  viewId: Int,
+  private val editable: Editable,
+  private val experimentalSynchronousEvents: Boolean,
+) : Event<OnChangeTextEvent>(surfaceId, viewId) {
+  override fun getEventName(): String = EVENT_NAME
 
   override fun getEventData(): WritableMap {
     val eventData: WritableMap = Arguments.createMap()
     val text = editable.toString()
-    val normalizedText = text.replace(Regex("\\u200B"), "")
+    val normalizedText = text.replace(Regex(EnrichedConstants.ZWS_STRING), "")
     eventData.putString("value", normalizedText)
     return eventData
   }
 
-  override fun experimental_isSynchronous(): Boolean {
-    return experimentalSynchronousEvents
-  }
+  override fun experimental_isSynchronous(): Boolean = experimentalSynchronousEvents
 
   companion object {
     const val EVENT_NAME: String = "onChangeText"

package/android/src/main/java/com/swmansion/enriched/events/OnInputBlurEvent.kt

@@ -4,12 +4,12 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class OnInputBlurEvent(surfaceId: Int, viewId: Int, private val experimentalSynchronousEvents: Boolean) :
-  Event<OnInputBlurEvent>(surfaceId, viewId) {
-
-  override fun getEventName(): String {
-    return EVENT_NAME
-  }
+class OnInputBlurEvent(
+  surfaceId: Int,
+  viewId: Int,
+  private val experimentalSynchronousEvents: Boolean,
+) : Event<OnInputBlurEvent>(surfaceId, viewId) {
+  override fun getEventName(): String = EVENT_NAME
 
   override fun getEventData(): WritableMap {
     val eventData: WritableMap = Arguments.createMap()
@@ -17,9 +17,7 @@ class OnInputBlurEvent(surfaceId: Int, viewId: Int, private val experimentalSync
     return eventData
   }
 
-  override fun experimental_isSynchronous(): Boolean {
-    return experimentalSynchronousEvents
-  }
+  override fun experimental_isSynchronous(): Boolean = experimentalSynchronousEvents
 
   companion object {
     const val EVENT_NAME: String = "onInputBlur"

package/android/src/main/java/com/swmansion/enriched/events/OnInputFocusEvent.kt

@@ -4,12 +4,12 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class OnInputFocusEvent(surfaceId: Int, viewId: Int, private val experimentalSynchronousEvents: Boolean) :
-  Event<OnInputFocusEvent>(surfaceId, viewId) {
-
-  override fun getEventName(): String {
-    return EVENT_NAME
-  }
+class OnInputFocusEvent(
+  surfaceId: Int,
+  viewId: Int,
+  private val experimentalSynchronousEvents: Boolean,
+) : Event<OnInputFocusEvent>(surfaceId, viewId) {
+  override fun getEventName(): String = EVENT_NAME
 
   override fun getEventData(): WritableMap {
     val eventData: WritableMap = Arguments.createMap()
@@ -17,9 +17,7 @@ class OnInputFocusEvent(surfaceId: Int, viewId: Int, private val experimentalSyn
     return eventData
   }
 
-  override fun experimental_isSynchronous(): Boolean {
-    return experimentalSynchronousEvents
-  }
+  override fun experimental_isSynchronous(): Boolean = experimentalSynchronousEvents
 
   companion object {
     const val EVENT_NAME: String = "onInputFocus"

package/android/src/main/java/com/swmansion/enriched/events/OnInputKeyPressEvent.kt

@@ -0,0 +1,27 @@
+package com.swmansion.enriched.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+class OnInputKeyPressEvent(
+  surfaceId: Int,
+  viewId: Int,
+  private val key: String,
+  private val experimentalSynchronousEvents: Boolean,
+) : Event<OnInputKeyPressEvent>(surfaceId, viewId) {
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap {
+    val eventData: WritableMap = Arguments.createMap()
+    eventData.putString("key", key)
+
+    return eventData
+  }
+
+  override fun experimental_isSynchronous(): Boolean = experimentalSynchronousEvents
+
+  companion object {
+    const val EVENT_NAME: String = "onInputKeyPress"
+  }
+}

package/android/src/main/java/com/swmansion/enriched/events/OnLinkDetectedEvent.kt

@@ -4,25 +4,27 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class OnLinkDetectedEvent(surfaceId: Int, viewId: Int, private val text: String, private val url: String, private val start: Int, private val end: Int, private val experimentalSynchronousEvents: Boolean) :
-  Event<OnLinkDetectedEvent>(surfaceId, viewId) {
-
-  override fun getEventName(): String {
-    return EVENT_NAME
-  }
+class OnLinkDetectedEvent(
+  surfaceId: Int,
+  viewId: Int,
+  private val text: String,
+  private val url: String,
+  private val start: Int,
+  private val end: Int,
+  private val experimentalSynchronousEvents: Boolean,
+) : Event<OnLinkDetectedEvent>(surfaceId, viewId) {
+  override fun getEventName(): String = EVENT_NAME
 
   override fun getEventData(): WritableMap {
     val eventData: WritableMap = Arguments.createMap()
     eventData.putString("text", text)
     eventData.putString("url", url)
-    eventData.putInt("start", start);
-    eventData.putInt("end", end);
+    eventData.putInt("start", start)
+    eventData.putInt("end", end)
     return eventData
   }
 
-  override fun experimental_isSynchronous(): Boolean {
-    return experimentalSynchronousEvents
-  }
+  override fun experimental_isSynchronous(): Boolean = experimentalSynchronousEvents
 
   companion object {
     const val EVENT_NAME: String = "onLinkDetected"

package/android/src/main/java/com/swmansion/enriched/events/OnMentionDetectedEvent.kt

@@ -4,12 +4,15 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class OnMentionDetectedEvent(surfaceId: Int, viewId: Int, private val text: String, private val indicator: String, private val payload: String, private val experimentalSynchronousEvents: Boolean) :
-  Event<OnMentionDetectedEvent>(surfaceId, viewId) {
-
-  override fun getEventName(): String {
-    return EVENT_NAME
-  }
+class OnMentionDetectedEvent(
+  surfaceId: Int,
+  viewId: Int,
+  private val text: String,
+  private val indicator: String,
+  private val payload: String,
+  private val experimentalSynchronousEvents: Boolean,
+) : Event<OnMentionDetectedEvent>(surfaceId, viewId) {
+  override fun getEventName(): String = EVENT_NAME
 
   override fun getEventData(): WritableMap {
     val eventData: WritableMap = Arguments.createMap()
@@ -19,9 +22,7 @@ class OnMentionDetectedEvent(surfaceId: Int, viewId: Int, private val text: Stri
     return eventData
   }
 
-  override fun experimental_isSynchronous(): Boolean {
-    return experimentalSynchronousEvents
-  }
+  override fun experimental_isSynchronous(): Boolean = experimentalSynchronousEvents
 
   companion object {
     const val EVENT_NAME: String = "onMentionDetected"

package/android/src/main/java/com/swmansion/enriched/events/OnMentionEvent.kt

@@ -4,11 +4,14 @@ import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.events.Event
 
-class OnMentionEvent(surfaceId: Int, viewId: Int, private val indicator: String, private val text: String?, private val experimentalSynchronousEvents: Boolean) : Event<OnMentionEvent>(surfaceId, viewId) {
-
-  override fun getEventName(): String {
-    return EVENT_NAME
-  }
+class OnMentionEvent(
+  surfaceId: Int,
+  viewId: Int,
+  private val indicator: String,
+  private val text: String?,
+  private val experimentalSynchronousEvents: Boolean,
+) : Event<OnMentionEvent>(surfaceId, viewId) {
+  override fun getEventName(): String = EVENT_NAME
 
   override fun getEventData(): WritableMap? {
     val eventData: WritableMap = Arguments.createMap()
@@ -23,9 +26,7 @@ class OnMentionEvent(surfaceId: Int, viewId: Int, private val indicator: String,
     return eventData
   }
 
-  override fun experimental_isSynchronous(): Boolean {
-    return experimentalSynchronousEvents
-  }
+  override fun experimental_isSynchronous(): Boolean = experimentalSynchronousEvents
 
   companion object {
     const val EVENT_NAME: String = "onMention"

package/android/src/main/java/com/swmansion/enriched/events/OnRequestHtmlResultEvent.kt

@@ -0,0 +1,32 @@
+package com.swmansion.enriched.events
+
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+import com.facebook.react.uimanager.events.Event
+
+class OnRequestHtmlResultEvent(
+  surfaceId: Int,
+  viewId: Int,
+  private val requestId: Int,
+  private val html: String?,
+  private val experimentalSynchronousEvents: Boolean,
+) : Event<OnRequestHtmlResultEvent>(surfaceId, viewId) {
+  override fun getEventName(): String = EVENT_NAME
+
+  override fun getEventData(): WritableMap {
+    val eventData: WritableMap = Arguments.createMap()
+    eventData.putInt("requestId", requestId)
+    if (html != null) {
+      eventData.putString("html", html)
+    } else {
+      eventData.putNull("html")
+    }
+    return eventData
+  }
+
+  override fun experimental_isSynchronous(): Boolean = experimentalSynchronousEvents
+
+  companion object {
+    const val EVENT_NAME: String = "onRequestHtmlResult"
+  }
+}

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

@@ -10,16 +10,33 @@ import com.swmansion.enriched.spans.interfaces.EnrichedBlockSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
 // https://android.googlesource.com/platform/frameworks/base/+/refs/heads/main/core/java/android/text/style/QuoteSpan.java
-class EnrichedBlockQuoteSpan(private val htmlStyle: HtmlStyle) : MetricAffectingSpan(), LeadingMarginSpan, EnrichedBlockSpan {
+class EnrichedBlockQuoteSpan(
+  private val htmlStyle: HtmlStyle,
+) : MetricAffectingSpan(),
+  LeadingMarginSpan,
+  EnrichedBlockSpan {
+  override val dependsOnHtmlStyle: Boolean = true
+
   override fun updateMeasureState(p0: TextPaint) {
     // Do nothing, but inform layout that this span affects text metrics
   }
 
-  override fun getLeadingMargin(p0: Boolean): Int {
-    return htmlStyle.blockquoteStripeWidth + htmlStyle.blockquoteGapWidth
-  }
+  override fun getLeadingMargin(p0: Boolean): Int = htmlStyle.blockquoteStripeWidth + htmlStyle.blockquoteGapWidth
 
-  override fun drawLeadingMargin(c: Canvas, p: Paint, x: Int, dir: Int, top: Int, baseline: Int, bottom: Int, text: CharSequence?, start: Int, end: Int, first: Boolean, layout: Layout?) {
+  override fun drawLeadingMargin(
+    c: Canvas,
+    p: Paint,
+    x: Int,
+    dir: Int,
+    top: Int,
+    baseline: Int,
+    bottom: Int,
+    text: CharSequence?,
+    start: Int,
+    end: Int,
+    first: Boolean,
+    layout: Layout?,
+  ) {
     val style = p.style
     val color = p.color
     p.style = Paint.Style.FILL
@@ -35,4 +52,6 @@ class EnrichedBlockQuoteSpan(private val htmlStyle: HtmlStyle) : MetricAffecting
       textPaint?.color = color
     }
   }
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedBlockQuoteSpan = EnrichedBlockQuoteSpan(htmlStyle)
 }

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

@@ -2,9 +2,16 @@ package com.swmansion.enriched.spans
 
 import android.graphics.Typeface
 import android.text.style.StyleSpan
+import com.swmansion.enriched.spans.interfaces.EnrichedBlockSpan
 import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
 @Suppress("UNUSED_PARAMETER")
-class EnrichedBoldSpan(htmlStyle: HtmlStyle) : StyleSpan(Typeface.BOLD), EnrichedInlineSpan {
+class EnrichedBoldSpan(
+  htmlStyle: HtmlStyle,
+) : StyleSpan(Typeface.BOLD),
+  EnrichedInlineSpan {
+  override val dependsOnHtmlStyle: Boolean = false
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedBoldSpan = EnrichedBoldSpan(htmlStyle)
 }

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

@@ -12,7 +12,13 @@ import android.text.style.MetricAffectingSpan
 import com.swmansion.enriched.spans.interfaces.EnrichedBlockSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
-class EnrichedCodeBlockSpan(private val htmlStyle: HtmlStyle) : MetricAffectingSpan(), LineBackgroundSpan, EnrichedBlockSpan {
+class EnrichedCodeBlockSpan(
+  private val htmlStyle: HtmlStyle,
+) : MetricAffectingSpan(),
+  LineBackgroundSpan,
+  EnrichedBlockSpan {
+  override val dependsOnHtmlStyle: Boolean = true
+
   override fun updateDrawState(paint: TextPaint) {
     paint.typeface = Typeface.MONOSPACE
     paint.color = htmlStyle.codeBlockColor
@@ -33,7 +39,7 @@ class EnrichedCodeBlockSpan(private val htmlStyle: HtmlStyle) : MetricAffectingS
     text: CharSequence,
     start: Int,
     end: Int,
-    lineNum: Int
+    lineNum: Int,
   ) {
     if (text !is Spanned) {
       return
@@ -74,4 +80,6 @@ class EnrichedCodeBlockSpan(private val htmlStyle: HtmlStyle) : MetricAffectingS
     canvas.drawPath(path, p)
     p.color = previousColor
   }
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedCodeBlockSpan = EnrichedCodeBlockSpan(htmlStyle)
 }

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

@@ -6,7 +6,12 @@ import android.text.style.AbsoluteSizeSpan
 import com.swmansion.enriched.spans.interfaces.EnrichedHeadingSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
-class EnrichedH1Span(private val style: HtmlStyle) : AbsoluteSizeSpan(style.h1FontSize), EnrichedHeadingSpan {
+class EnrichedH1Span(
+  private val style: HtmlStyle,
+) : AbsoluteSizeSpan(style.h1FontSize),
+  EnrichedHeadingSpan {
+  override val dependsOnHtmlStyle: Boolean = true
+
   override fun updateDrawState(tp: TextPaint) {
     super.updateDrawState(tp)
     val bold = style.h1Bold
@@ -14,4 +19,6 @@ class EnrichedH1Span(private val style: HtmlStyle) : AbsoluteSizeSpan(style.h1Fo
       tp.typeface = Typeface.create(tp.typeface, Typeface.BOLD)
     }
   }
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedH1Span = EnrichedH1Span(htmlStyle)
 }

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

@@ -6,7 +6,12 @@ import android.text.style.AbsoluteSizeSpan
 import com.swmansion.enriched.spans.interfaces.EnrichedHeadingSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
-class EnrichedH2Span(private val htmlStyle: HtmlStyle) : AbsoluteSizeSpan(htmlStyle.h2FontSize), EnrichedHeadingSpan {
+class EnrichedH2Span(
+  private val htmlStyle: HtmlStyle,
+) : AbsoluteSizeSpan(htmlStyle.h2FontSize),
+  EnrichedHeadingSpan {
+  override val dependsOnHtmlStyle: Boolean = true
+
   override fun updateDrawState(tp: TextPaint) {
     super.updateDrawState(tp)
     val bold = htmlStyle.h2Bold
@@ -14,4 +19,6 @@ class EnrichedH2Span(private val htmlStyle: HtmlStyle) : AbsoluteSizeSpan(htmlSt
       tp.typeface = Typeface.create(tp.typeface, Typeface.BOLD)
     }
   }
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedH2Span = EnrichedH2Span(htmlStyle)
 }

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

@@ -6,7 +6,12 @@ import android.text.style.AbsoluteSizeSpan
 import com.swmansion.enriched.spans.interfaces.EnrichedHeadingSpan
 import com.swmansion.enriched.styles.HtmlStyle
 
-class EnrichedH3Span(private val htmlStyle: HtmlStyle) : AbsoluteSizeSpan(htmlStyle.h3FontSize), EnrichedHeadingSpan {
+class EnrichedH3Span(
+  private val htmlStyle: HtmlStyle,
+) : AbsoluteSizeSpan(htmlStyle.h3FontSize),
+  EnrichedHeadingSpan {
+  override val dependsOnHtmlStyle: Boolean = true
+
   override fun updateDrawState(tp: TextPaint) {
     super.updateDrawState(tp)
     val bold = htmlStyle.h3Bold
@@ -14,4 +19,6 @@ class EnrichedH3Span(private val htmlStyle: HtmlStyle) : AbsoluteSizeSpan(htmlSt
       tp.typeface = Typeface.create(tp.typeface, Typeface.BOLD)
     }
   }
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedH3Span = EnrichedH3Span(htmlStyle)
 }

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

@@ -0,0 +1,24 @@
+package com.swmansion.enriched.spans
+
+import android.graphics.Typeface
+import android.text.TextPaint
+import android.text.style.AbsoluteSizeSpan
+import com.swmansion.enriched.spans.interfaces.EnrichedHeadingSpan
+import com.swmansion.enriched.styles.HtmlStyle
+
+class EnrichedH4Span(
+  private val htmlStyle: HtmlStyle,
+) : AbsoluteSizeSpan(htmlStyle.h4FontSize),
+  EnrichedHeadingSpan {
+  override val dependsOnHtmlStyle: Boolean = true
+
+  override fun updateDrawState(tp: TextPaint) {
+    super.updateDrawState(tp)
+    val bold = htmlStyle.h4Bold
+    if (bold) {
+      tp.typeface = Typeface.create(tp.typeface, Typeface.BOLD)
+    }
+  }
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedH4Span = EnrichedH4Span(htmlStyle)
+}

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

@@ -0,0 +1,24 @@
+package com.swmansion.enriched.spans
+
+import android.graphics.Typeface
+import android.text.TextPaint
+import android.text.style.AbsoluteSizeSpan
+import com.swmansion.enriched.spans.interfaces.EnrichedHeadingSpan
+import com.swmansion.enriched.styles.HtmlStyle
+
+class EnrichedH5Span(
+  private val htmlStyle: HtmlStyle,
+) : AbsoluteSizeSpan(htmlStyle.h5FontSize),
+  EnrichedHeadingSpan {
+  override val dependsOnHtmlStyle: Boolean = true
+
+  override fun updateDrawState(tp: TextPaint) {
+    super.updateDrawState(tp)
+    val bold = htmlStyle.h5Bold
+    if (bold) {
+      tp.typeface = Typeface.create(tp.typeface, Typeface.BOLD)
+    }
+  }
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedH5Span = EnrichedH5Span(htmlStyle)
+}

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

@@ -0,0 +1,24 @@
+package com.swmansion.enriched.spans
+
+import android.graphics.Typeface
+import android.text.TextPaint
+import android.text.style.AbsoluteSizeSpan
+import com.swmansion.enriched.spans.interfaces.EnrichedHeadingSpan
+import com.swmansion.enriched.styles.HtmlStyle
+
+class EnrichedH6Span(
+  private val htmlStyle: HtmlStyle,
+) : AbsoluteSizeSpan(htmlStyle.h6FontSize),
+  EnrichedHeadingSpan {
+  override val dependsOnHtmlStyle: Boolean = true
+
+  override fun updateDrawState(tp: TextPaint) {
+    super.updateDrawState(tp)
+    val bold = htmlStyle.h6Bold
+    if (bold) {
+      tp.typeface = Typeface.create(tp.typeface, Typeface.BOLD)
+    }
+  }
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedH6Span = EnrichedH6Span(htmlStyle)
+}

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

@@ -12,15 +12,20 @@ import android.text.Spannable
 import android.text.style.ImageSpan
 import android.util.Log
 import androidx.core.graphics.drawable.DrawableCompat
-import androidx.core.graphics.withSave
-import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
-import com.swmansion.enriched.utils.AsyncDrawable
 import androidx.core.graphics.drawable.toDrawable
+import androidx.core.graphics.withSave
 import com.swmansion.enriched.R
+import com.swmansion.enriched.spans.interfaces.EnrichedInlineSpan
 import com.swmansion.enriched.spans.utils.ForceRedrawSpan
+import com.swmansion.enriched.styles.HtmlStyle
+import com.swmansion.enriched.utils.AsyncDrawable
 import com.swmansion.enriched.utils.ResourceManager
 
-class EnrichedImageSpan : ImageSpan, EnrichedInlineSpan {
+class EnrichedImageSpan :
+  ImageSpan,
+  EnrichedInlineSpan {
+  override val dependsOnHtmlStyle: Boolean = false
+
   private var width: Int = 0
   private var height: Int = 0
 
@@ -30,11 +35,18 @@ class EnrichedImageSpan : ImageSpan, EnrichedInlineSpan {
   }
 
   override fun draw(
-    canvas: Canvas, text: CharSequence?, start: Int, end: Int, x: Float,
-    top: Int, y: Int, bottom: Int, paint: Paint
+    canvas: Canvas,
+    text: CharSequence?,
+    start: Int,
+    end: Int,
+    x: Float,
+    top: Int,
+    y: Int,
+    bottom: Int,
+    paint: Paint,
   ) {
     val drawable = drawable
-    canvas.withSave() {
+    canvas.withSave {
       val transY = bottom - drawable.bounds.bottom - paint.fontMetricsInt.descent
       translate(x, transY.toFloat())
       drawable.draw(this)
@@ -45,7 +57,7 @@ class EnrichedImageSpan : ImageSpan, EnrichedInlineSpan {
     val drawable = super.getDrawable()
     val scale = Resources.getSystem().displayMetrics.density
 
-    drawable.setBounds(0, 0, (width * scale).toInt() , (height * scale).toInt())
+    drawable.setBounds(0, 0, (width * scale).toInt(), (height * scale).toInt())
     return drawable
   }
 
@@ -54,7 +66,7 @@ class EnrichedImageSpan : ImageSpan, EnrichedInlineSpan {
     text: CharSequence?,
     start: Int,
     end: Int,
-    fm: Paint.FontMetricsInt?
+    fm: Paint.FontMetricsInt?,
   ): Int {
     val d = drawable
     val rect = d.bounds
@@ -76,7 +88,10 @@ class EnrichedImageSpan : ImageSpan, EnrichedInlineSpan {
     return rect.right
   }
 
-  private fun registerDrawableLoadCallback (d: AsyncDrawable, text: Editable?) {
+  private fun registerDrawableLoadCallback(
+    d: AsyncDrawable,
+    text: Editable?,
+  ) {
     d.onLoaded = onLoaded@{
       val spannable = text as? Spannable
 
@@ -111,16 +126,18 @@ class EnrichedImageSpan : ImageSpan, EnrichedInlineSpan {
     }
   }
 
-  fun getWidth(): Int {
-    return width
-  }
+  fun getWidth(): Int = width
 
-  fun getHeight(): Int {
-    return height
-  }
+  fun getHeight(): Int = height
+
+  override fun rebuildWithStyle(htmlStyle: HtmlStyle): EnrichedImageSpan = this
 
   companion object {
-    fun createEnrichedImageSpan(src: String, width: Int, height: Int): EnrichedImageSpan {
+    fun createEnrichedImageSpan(
+      src: String,
+      width: Int,
+      height: Int,
+    ): EnrichedImageSpan {
       var imgDrawable = prepareDrawableForImage(src)
 
       if (imgDrawable == null) {