android - fix conflicting styles logic (#87)

Author: exploIF

android/src/main/java/com/swmansion/reactnativerichtexteditor/ReactNativeRichTextEditorView.kt

@@ -361,7 +361,21 @@ class ReactNativeRichTextEditorView : AppCompatEditText {
 
     for (style in conflictingStyles) {
       if (spanState?.getStart(style) != null) {
+        val start = selection?.start ?: 0
+        val end = selection?.end ?: 0
+        val lengthBefore = text?.length ?: 0
+
         toggleStyle(style)
+
+        val lengthAfter = text?.length ?: 0
+        val charactersRemoved = lengthBefore - lengthAfter
+        val finalEnd = if (charactersRemoved > 0 && end > start) {
+          end - charactersRemoved
+        } else {
+          end
+        }
+
+        selection?.onSelection(start, finalEnd)
       }
     }
 

android/src/main/java/com/swmansion/reactnativerichtexteditor/spans/EditorSpans.kt

@@ -95,10 +95,10 @@ object EditorSpans {
       conflictingStyles = arrayOf(H1, H2, H3, BOLD, ITALIC, UNDERLINE, STRIKETHROUGH, UNORDERED_LIST, ORDERED_LIST, BLOCK_QUOTE),
     ),
     UNORDERED_LIST to StylesMergingConfig(
-      conflictingStyles = arrayOf(H1, H2, H3, ORDERED_LIST, CODE_BLOCK),
+      conflictingStyles = arrayOf(H1, H2, H3, ORDERED_LIST, CODE_BLOCK, BLOCK_QUOTE),
     ),
     ORDERED_LIST to StylesMergingConfig(
-      conflictingStyles = arrayOf(H1, H2, H3, UNORDERED_LIST, CODE_BLOCK),
+      conflictingStyles = arrayOf(H1, H2, H3, UNORDERED_LIST, CODE_BLOCK, BLOCK_QUOTE),
     ),
     LINK to StylesMergingConfig(
       blockingStyles = arrayOf(INLINE_CODE, CODE_BLOCK, MENTION)

android/src/main/java/com/swmansion/reactnativerichtexteditor/styles/ParagraphStyles.kt

@@ -166,7 +166,7 @@ class ParagraphStyles(private val editorView: ReactNativeRichTextEditorView) {
       currentStart = currentEnd + 1
     }
 
-    editorView.spanState?.setStart(name, currentStart - 1)
+    editorView.spanState?.setStart(name, start)
     setAndMergeSpans(spannable, type, start, currentEnd)
   }
 }