react-native-enriched 0.2.0 → 0.3.0

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

@@ -28,6 +28,15 @@ class HtmlStyle {
   var h3FontSize: Int = 56
   var h3Bold: Boolean = false
 
+  var h4FontSize: Int = 48
+  var h4Bold: Boolean = false
+
+  var h5FontSize: Int = 40
+  var h5Bold: Boolean = false
+
+  var h6FontSize: Int = 32
+  var h6Bold: Boolean = false
+
   var blockquoteColor: Int? = null
   var blockquoteBorderColor: Int = Color.BLACK
   var blockquoteStripeWidth: Int = 2
@@ -77,6 +86,18 @@ class HtmlStyle {
     h3FontSize = parseFloat(h3Style, "fontSize").toInt()
     h3Bold = h3Style?.getBoolean("bold") == true
 
+    val h4Style = style.getMap("h4")
+    h4FontSize = parseFloat(h4Style, "fontSize").toInt()
+    h4Bold = h4Style?.getBoolean("bold") == true
+
+    val h5Style = style.getMap("h5")
+    h5FontSize = parseFloat(h5Style, "fontSize").toInt()
+    h5Bold = h5Style?.getBoolean("bold") == true
+
+    val h6Style = style.getMap("h6")
+    h6FontSize = parseFloat(h6Style, "fontSize").toInt()
+    h6Bold = h6Style?.getBoolean("bold") == true
+
     val blockquoteStyle = style.getMap("blockquote")
     blockquoteColor = parseOptionalColor(blockquoteStyle, "color")
     blockquoteBorderColor = parseColor(blockquoteStyle, "borderColor")
@@ -114,19 +135,29 @@ class HtmlStyle {
     mentionsStyle = parseMentionsStyle(mentionStyle)
   }
 
-  private fun parseFloat(map: ReadableMap?, key: String): Float {
+  private fun parseFloat(
+    map: ReadableMap?,
+    key: String,
+  ): Float {
     val safeMap = ensureValueIsSet(map, key)
 
     val value = safeMap.getDouble(key)
     return ceil(PixelUtil.toPixelFromSP(value))
   }
 
-  private fun parseColorWithOpacity(map: ReadableMap?, key: String, opacity: Int): Int {
+  private fun parseColorWithOpacity(
+    map: ReadableMap?,
+    key: String,
+    opacity: Int,
+  ): Int {
     val color = parseColor(map, key)
     return withOpacity(color, opacity)
   }
 
-  private fun parseOptionalColor(map: ReadableMap?, key: String): Int? {
+  private fun parseOptionalColor(
+    map: ReadableMap?,
+    key: String,
+  ): Int? {
     if (map == null) return null
     if (!map.hasKey(key)) return null
     if (map.isNull(key)) return null
@@ -134,7 +165,10 @@ class HtmlStyle {
     return parseColor(map, key)
   }
 
-  private fun parseColor(map: ReadableMap?, key: String): Int {
+  private fun parseColor(
+    map: ReadableMap?,
+    key: String,
+  ): Int {
     val safeMap = ensureValueIsSet(map, key)
 
     val color = safeMap.getDouble(key)
@@ -146,7 +180,10 @@ class HtmlStyle {
     return parsedColor
   }
 
-  private fun withOpacity(color: Int, alpha: Int): Int {
+  private fun withOpacity(
+    color: Int,
+    alpha: Int,
+  ): Int {
     // Do not apply opacity to transparent color
     if (Color.alpha(color) == 0) return color
     val a = alpha.coerceIn(0, 255)
@@ -164,14 +201,20 @@ class HtmlStyle {
     throw Error("Specified textDecorationLine value is not supported: $underline. Supported values are 'underline' and 'none'.")
   }
 
-  private fun calculateOlMarginLeft(view: EnrichedTextInputView?, userMargin: Int): Int {
+  private fun calculateOlMarginLeft(
+    view: EnrichedTextInputView?,
+    userMargin: Int,
+  ): Int {
     val fontSize = view?.fontSize?.toInt() ?: 0
     val leadMargin = fontSize / 2
 
     return leadMargin + userMargin
   }
 
-  private fun ensureValueIsSet(map: ReadableMap?, key: String): ReadableMap {
+  private fun ensureValueIsSet(
+    map: ReadableMap?,
+    key: String,
+  ): ReadableMap {
     if (map == null) throw Error("Style map cannot be null")
 
     if (!map.hasKey(key)) throw Error("Style map must contain key: $key")
@@ -186,24 +229,27 @@ class HtmlStyle {
 
     val parsedMentionsStyle: MutableMap<String, MentionStyle> = mutableMapOf()
 
-     val iterator = mentionsStyle.keySetIterator()
-        while (iterator.hasNextKey()) {
-          val key = iterator.nextKey()
-          val value = mentionsStyle.getMap(key)
+    val iterator = mentionsStyle.keySetIterator()
+    while (iterator.hasNextKey()) {
+      val key = iterator.nextKey()
+      val value = mentionsStyle.getMap(key)
 
-          if (value == null) throw Error("Mention style for key '$key' cannot be null")
+      if (value == null) throw Error("Mention style for key '$key' cannot be null")
 
-          val color = parseColor(value, "color")
-          val backgroundColor = parseColorWithOpacity(value, "backgroundColor", 80)
-          val isUnderline = parseIsUnderline(value)
-          val parsedStyle = MentionStyle(color, backgroundColor, isUnderline)
-          parsedMentionsStyle.put(key, parsedStyle)
-        }
+      val color = parseColor(value, "color")
+      val backgroundColor = parseColorWithOpacity(value, "backgroundColor", 80)
+      val isUnderline = parseIsUnderline(value)
+      val parsedStyle = MentionStyle(color, backgroundColor, isUnderline)
+      parsedMentionsStyle.put(key, parsedStyle)
+    }
 
     return parsedMentionsStyle
   }
 
-  private fun parseOptionalFontWeight(map: ReadableMap?, key: String): Int? {
+  private fun parseOptionalFontWeight(
+    map: ReadableMap?,
+    key: String,
+  ): Int? {
     if (map == null) return null
     if (!map.hasKey(key)) return null
     if (map.isNull(key)) return null
@@ -212,11 +258,100 @@ class HtmlStyle {
     return parseFontWeight(fontWeight)
   }
 
+  override fun equals(other: Any?): Boolean {
+    if (this === other) return true
+    if (other !is HtmlStyle) return false
+
+    return h1FontSize == other.h1FontSize &&
+      h1Bold == other.h1Bold &&
+      h2FontSize == other.h2FontSize &&
+      h2Bold == other.h2Bold &&
+      h3FontSize == other.h3FontSize &&
+      h3Bold == other.h3Bold &&
+      h4FontSize == other.h4FontSize &&
+      h4Bold == other.h4Bold &&
+      h5FontSize == other.h5FontSize &&
+      h5Bold == other.h5Bold &&
+      h6FontSize == other.h6FontSize &&
+      h6Bold == other.h6Bold &&
+
+      blockquoteColor == other.blockquoteColor &&
+      blockquoteBorderColor == other.blockquoteBorderColor &&
+      blockquoteStripeWidth == other.blockquoteStripeWidth &&
+      blockquoteGapWidth == other.blockquoteGapWidth &&
+
+      olGapWidth == other.olGapWidth &&
+      olMarginLeft == other.olMarginLeft &&
+      olMarkerFontWeight == other.olMarkerFontWeight &&
+      olMarkerColor == other.olMarkerColor &&
+
+      ulGapWidth == other.ulGapWidth &&
+      ulMarginLeft == other.ulMarginLeft &&
+      ulBulletSize == other.ulBulletSize &&
+      ulBulletColor == other.ulBulletColor &&
+
+      aColor == other.aColor &&
+      aUnderline == other.aUnderline &&
+
+      codeBlockColor == other.codeBlockColor &&
+      codeBlockBackgroundColor == other.codeBlockBackgroundColor &&
+      codeBlockRadius == other.codeBlockRadius &&
+
+      inlineCodeColor == other.inlineCodeColor &&
+      inlineCodeBackgroundColor == other.inlineCodeBackgroundColor &&
+
+      mentionsStyle == other.mentionsStyle
+  }
+
+  override fun hashCode(): Int {
+    var result = h1FontSize.hashCode()
+    result = 31 * result + h1Bold.hashCode()
+    result = 31 * result + h2FontSize.hashCode()
+    result = 31 * result + h2Bold.hashCode()
+    result = 31 * result + h3FontSize.hashCode()
+    result = 31 * result + h3Bold.hashCode()
+    result = 31 * result + h4FontSize.hashCode()
+    result = 31 * result + h4Bold.hashCode()
+    result = 31 * result + h5FontSize.hashCode()
+    result = 31 * result + h5Bold.hashCode()
+    result = 31 * result + h6FontSize.hashCode()
+    result = 31 * result + h6Bold.hashCode()
+
+    result = 31 * result + (blockquoteColor ?: 0)
+    result = 31 * result + blockquoteBorderColor.hashCode()
+    result = 31 * result + blockquoteStripeWidth.hashCode()
+    result = 31 * result + blockquoteGapWidth.hashCode()
+
+    result = 31 * result + olGapWidth.hashCode()
+    result = 31 * result + olMarginLeft.hashCode()
+    result = 31 * result + (olMarkerFontWeight?.hashCode() ?: 0)
+    result = 31 * result + (olMarkerColor ?: 0)
+
+    result = 31 * result + ulGapWidth.hashCode()
+    result = 31 * result + ulMarginLeft.hashCode()
+    result = 31 * result + ulBulletSize.hashCode()
+    result = 31 * result + ulBulletColor.hashCode()
+
+    result = 31 * result + aColor.hashCode()
+    result = 31 * result + aUnderline.hashCode()
+
+    result = 31 * result + codeBlockColor.hashCode()
+    result = 31 * result + codeBlockBackgroundColor.hashCode()
+    result = 31 * result + codeBlockRadius.hashCode()
+
+    result = 31 * result + inlineCodeColor.hashCode()
+    result = 31 * result + inlineCodeBackgroundColor.hashCode()
+
+    result = 31 * result + mentionsStyle.hashCode()
+
+    return result
+  }
+
   companion object {
     data class MentionStyle(
       val color: Int,
       val backgroundColor: Int,
-      val underline: Boolean
+      val underline: Boolean,
     )
   }
 }

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

@@ -6,8 +6,15 @@ import com.swmansion.enriched.EnrichedTextInputView
 import com.swmansion.enriched.spans.EnrichedSpans
 import com.swmansion.enriched.utils.getSafeSpanBoundaries
 
-class InlineStyles(private val view: EnrichedTextInputView) {
-  private fun <T>setSpan(spannable: Spannable, type: Class<T>, start: Int, end: Int) {
+class InlineStyles(
+  private val view: EnrichedTextInputView,
+) {
+  private fun <T> setSpan(
+    spannable: Spannable,
+    type: Class<T>,
+    start: Int,
+    end: Int,
+  ) {
     val previousSpanStart = (start - 1).coerceAtLeast(0)
     val previousSpanEnd = previousSpanStart + 1
     val nextSpanStart = (end + 1).coerceAtMost(spannable.length)
@@ -37,7 +44,12 @@ class InlineStyles(private val view: EnrichedTextInputView) {
     spannable.setSpan(span, safeStart, safeEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
   }
 
-  private fun <T>setAndMergeSpans(spannable: Spannable, type: Class<T>, start: Int, end: Int) {
+  private fun <T> setAndMergeSpans(
+    spannable: Spannable,
+    type: Class<T>,
+    start: Int,
+    end: Int,
+  ) {
     val spans = spannable.getSpans(start, end, type)
 
     // No spans setup for current selection, means we just need to assign new span
@@ -89,7 +101,10 @@ class InlineStyles(private val view: EnrichedTextInputView) {
     }
   }
 
-  fun afterTextChanged(s: Editable, endCursorPosition: Int) {
+  fun afterTextChanged(
+    s: Editable,
+    endCursorPosition: Int,
+  ) {
     for ((style, config) in EnrichedSpans.inlineSpans) {
       val start = view.spanState?.getStart(style) ?: continue
       var end = endCursorPosition
@@ -128,7 +143,11 @@ class InlineStyles(private val view: EnrichedTextInputView) {
     view.selection.validateStyles()
   }
 
-  fun removeStyle(name: String, start: Int, end: Int): Boolean {
+  fun removeStyle(
+    name: String,
+    start: Int,
+    end: Int,
+  ): Boolean {
     val config = EnrichedSpans.inlineSpans[name] ?: return false
     val spannable = view.text as Spannable
     val spans = spannable.getSpans(start, end, config.clazz)
@@ -141,7 +160,5 @@ class InlineStyles(private val view: EnrichedTextInputView) {
     return true
   }
 
-  fun getStyleRange(): Pair<Int, Int> {
-    return view.selection?.getInlineSelection() ?: Pair(0, 0)
-  }
+  fun getStyleRange(): Pair<Int, Int> = view.selection?.getInlineSelection() ?: Pair(0, 0)
 }

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

@@ -8,11 +8,19 @@ import com.swmansion.enriched.EnrichedTextInputView
 import com.swmansion.enriched.spans.EnrichedOrderedListSpan
 import com.swmansion.enriched.spans.EnrichedSpans
 import com.swmansion.enriched.spans.EnrichedUnorderedListSpan
+import com.swmansion.enriched.utils.EnrichedConstants
 import com.swmansion.enriched.utils.getParagraphBounds
 import com.swmansion.enriched.utils.getSafeSpanBoundaries
-
-class ListStyles(private val view: EnrichedTextInputView) {
-  private fun <T>getPreviousParagraphSpan(spannable: Spannable, s: Int, type: Class<T>): T? {
+import com.swmansion.enriched.utils.removeZWS
+
+class ListStyles(
+  private val view: EnrichedTextInputView,
+) {
+  private fun <T> getPreviousParagraphSpan(
+    spannable: Spannable,
+    s: Int,
+    type: Class<T>,
+  ): T? {
     if (s <= 0) return null
 
     val (previousParagraphStart, previousParagraphEnd) = spannable.getParagraphBounds(s - 1)
@@ -25,19 +33,31 @@ class ListStyles(private val view: EnrichedTextInputView) {
     return null
   }
 
-  private fun <T>isPreviousParagraphList(spannable: Spannable, s: Int, type: Class<T>): Boolean {
+  private fun <T> isPreviousParagraphList(
+    spannable: Spannable,
+    s: Int,
+    type: Class<T>,
+  ): Boolean {
     val previousSpan = getPreviousParagraphSpan(spannable, s, type)
 
     return previousSpan != null
   }
 
-  private fun getOrderedListIndex(spannable: Spannable, s: Int): Int {
+  private fun getOrderedListIndex(
+    spannable: Spannable,
+    s: Int,
+  ): Int {
     val span = getPreviousParagraphSpan(spannable, s, EnrichedOrderedListSpan::class.java)
     val index = span?.getIndex() ?: 0
     return index + 1
   }
 
-  private fun setSpan(spannable: Spannable, name: String, start: Int, end: Int) {
+  private fun setSpan(
+    spannable: Spannable,
+    name: String,
+    start: Int,
+    end: Int,
+  ) {
     val (safeStart, safeEnd) = spannable.getSafeSpanBoundaries(start, end)
 
     if (name == EnrichedSpans.UNORDERED_LIST) {
@@ -53,7 +73,12 @@ class ListStyles(private val view: EnrichedTextInputView) {
     }
   }
 
-  private fun <T>removeSpansForRange(spannable: Spannable, start: Int, end: Int, clazz: Class<T>): Boolean {
+  private fun <T> removeSpansForRange(
+    spannable: Spannable,
+    start: Int,
+    end: Int,
+    clazz: Class<T>,
+  ): Boolean {
     val ssb = spannable as SpannableStringBuilder
     val spans = ssb.getSpans(start, end, clazz)
     if (spans.isEmpty()) return false
@@ -62,13 +87,17 @@ class ListStyles(private val view: EnrichedTextInputView) {
       ssb.removeSpan(span)
     }
 
-    ssb.replace(start, end, ssb.substring(start, end).replace("\u200B", ""))
+    ssb.removeZWS(start, end)
     return true
   }
 
-  fun updateOrderedListIndexes(text: Spannable, position: Int) {
+  fun updateOrderedListIndexes(
+    text: Spannable,
+    position: Int,
+  ) {
     val spans = text.getSpans(position + 1, text.length, EnrichedOrderedListSpan::class.java)
-    for (span in spans) {
+    val sortedSpans = spans.sortedBy { text.getSpanStart(it) }
+    for (span in sortedSpans) {
       val spanStart = text.getSpanStart(span)
       val index = getOrderedListIndex(text, spanStart)
       span.setIndex(index)
@@ -91,7 +120,7 @@ class ListStyles(private val view: EnrichedTextInputView) {
     }
 
     if (start == end) {
-      spannable.insert(start, "\u200B")
+      spannable.insert(start, EnrichedConstants.ZWS_STRING)
       view.spanState?.setStart(name, start + 1)
       removeSpansForRange(spannable, start, end, config.clazz)
       setSpan(spannable, name, start, end + 1)
@@ -104,7 +133,7 @@ class ListStyles(private val view: EnrichedTextInputView) {
     removeSpansForRange(spannable, start, end, config.clazz)
 
     for (paragraph in paragraphs) {
-      spannable.insert(currentStart, "\u200B")
+      spannable.insert(currentStart, EnrichedConstants.ZWS_STRING)
       val currentEnd = currentStart + paragraph.length + 1
       setSpan(spannable, name, currentStart, currentEnd)
 
@@ -114,7 +143,12 @@ class ListStyles(private val view: EnrichedTextInputView) {
     view.spanState?.setStart(name, currentStart)
   }
 
-  private fun handleAfterTextChanged(s: Editable, name: String, endCursorPosition: Int, previousTextLength: Int) {
+  private fun handleAfterTextChanged(
+    s: Editable,
+    name: String,
+    endCursorPosition: Int,
+    previousTextLength: Int,
+  ) {
     val config = EnrichedSpans.listSpans[name] ?: return
     val cursorPosition = endCursorPosition.coerceAtMost(s.length)
     val (start, end) = s.getParagraphBounds(cursorPosition)
@@ -131,7 +165,7 @@ class ListStyles(private val view: EnrichedTextInputView) {
     }
 
     if (!isBackspace && isShortcut) {
-      s.replace(start, cursorPosition, "\u200B")
+      s.replace(start, cursorPosition, EnrichedConstants.ZWS_STRING)
       setSpan(s, name, start, start + 1)
       // Inform that new span has been added
       view.selection?.validateStyles()
@@ -139,7 +173,7 @@ class ListStyles(private val view: EnrichedTextInputView) {
     }
 
     if (!isBackspace && isNewLine && isPreviousParagraphList(s, start, config.clazz)) {
-      s.insert(cursorPosition, "\u200B")
+      s.insert(cursorPosition, EnrichedConstants.ZWS_STRING)
       setSpan(s, name, start, end + 1)
       // Inform that new span has been added
       view.selection?.validateStyles()
@@ -155,16 +189,22 @@ class ListStyles(private val view: EnrichedTextInputView) {
     }
   }
 
-  fun afterTextChanged(s: Editable, endCursorPosition: Int, previousTextLength: Int) {
+  fun afterTextChanged(
+    s: Editable,
+    endCursorPosition: Int,
+    previousTextLength: Int,
+  ) {
     handleAfterTextChanged(s, EnrichedSpans.ORDERED_LIST, endCursorPosition, previousTextLength)
     handleAfterTextChanged(s, EnrichedSpans.UNORDERED_LIST, endCursorPosition, previousTextLength)
   }
 
-  fun getStyleRange(): Pair<Int, Int> {
-    return view.selection?.getParagraphSelection() ?: Pair(0, 0)
-  }
+  fun getStyleRange(): Pair<Int, Int> = view.selection?.getParagraphSelection() ?: Pair(0, 0)
 
-  fun removeStyle(name: String, start: Int, end: Int): Boolean {
+  fun removeStyle(
+    name: String,
+    start: Int,
+    end: Int,
+  ): Boolean {
     val config = EnrichedSpans.listSpans[name] ?: return false
     val spannable = view.text as Spannable
     return removeSpansForRange(spannable, start, end, config.clazz)