android - fix html output, setting up paragraph spans, parser (#68)

exploIF · web-flow · commit 9156513f24f8 · 2025-06-09T17:03:50.000+02:00
diff --git a/android/src/main/java/com/swmansion/reactnativerichtexteditor/ReactNativeRichTextEditorView.kt b/android/src/main/java/com/swmansion/reactnativerichtexteditor/ReactNativeRichTextEditorView.kt
@@ -163,9 +163,7 @@ class ReactNativeRichTextEditorView : AppCompatEditText {
     if (value == null) return
     isSettingValue = true
 
-    val isHtmlTagRecognized = value.startsWith("<html>") && value.endsWith("</html>")
-    val isPTagRecognized = value.startsWith("<p>") && value.endsWith("</p>")
-    val isHtml = isHtmlTagRecognized || isPTagRecognized
+    val isHtml = value.startsWith("<html>") && value.endsWith("</html>")
     if (isHtml) {
       val parsed = EditorParser.fromHtml(value, EditorParser.FROM_HTML_MODE_COMPACT, richTextStyle, null, null)
       val withoutLastNewLine = parsed.trimEnd('\n')
diff --git a/android/src/main/java/com/swmansion/reactnativerichtexteditor/utils/EditorParser.java b/android/src/main/java/com/swmansion/reactnativerichtexteditor/utils/EditorParser.java
@@ -869,9 +869,9 @@ private static void endLi(Editable text, RichTextStyle style) {
     List l = getLast(text, List.class);
     if (l != null) {
       if (l.mType.equals("ol")) {
-        setListSpanFromMark(text, l, new EditorOrderedListSpan(l.mIndex, style));
+        setParagraphSpanFromMark(text, l, new EditorOrderedListSpan(l.mIndex, style));
       } else {
-        setListSpanFromMark(text, l, new EditorUnorderedListSpan(style));
+        setParagraphSpanFromMark(text, l, new EditorUnorderedListSpan(style));
       }
     }
 
@@ -885,18 +885,19 @@ private void startBlockquote(Editable text, Attributes attributes) {
 
   private static void endBlockquote(Editable text, RichTextStyle style) {
     endBlockElement(text);
-    end(text, Blockquote.class, new EditorBlockQuoteSpan(style));
+    Blockquote last = getLast(text, Blockquote.class);
+    setParagraphSpanFromMark(text, last, new EditorBlockQuoteSpan(style));
   }
 
   private void startCodeBlock(Editable text, Attributes attributes) {
     startBlockElement(text, attributes, getMarginBlockquote());
     start(text, new CodeBlock());
-    ;
   }
 
   private static void endCodeBlock(Editable text, RichTextStyle style) {
     endBlockElement(text);
-    end(text, CodeBlock.class, new EditorCodeBlockSpan(style));
+    CodeBlock last = getLast(text, CodeBlock.class);
+    setParagraphSpanFromMark(text, last, new EditorCodeBlockSpan(style));
   }
 
   private void startHeading(Editable text, Attributes attributes, int level) {
@@ -939,7 +940,7 @@ private static void setSpanFromMark(Spannable text, Object mark, Object... spans
     }
   }
 
-  private static void setListSpanFromMark(Spannable text, Object mark, Object... spans) {
+  private static void setParagraphSpanFromMark(Spannable text, Object mark, Object... spans) {
     int where = text.getSpanStart(mark);
     text.removeSpan(mark);
     int len = text.length();
diff --git a/android/src/main/java/com/swmansion/reactnativerichtexteditor/utils/EditorSelection.kt b/android/src/main/java/com/swmansion/reactnativerichtexteditor/utils/EditorSelection.kt
@@ -104,6 +104,11 @@ class EditorSelection(private val editorView: ReactNativeRichTextEditorView) {
       endPosition++
     }
 
+    if (startPosition >= endPosition) {
+      // If the start position is equal or greater than the end position, return the same position
+      startPosition = endPosition
+    }
+
     return Pair(startPosition, endPosition)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -869,9 +869,9 @@ private static void endLi(Editable text, RichTextStyle style) {`
`869`	`869`	`List l = getLast(text, List.class);`
`870`	`870`	`if (l != null) {`
`871`	`871`	`if (l.mType.equals("ol")) {`
`872`		`- setListSpanFromMark(text, l, new EditorOrderedListSpan(l.mIndex, style));`
	`872`	`+ setParagraphSpanFromMark(text, l, new EditorOrderedListSpan(l.mIndex, style));`
`873`	`873`	`} else {`
`874`		`- setListSpanFromMark(text, l, new EditorUnorderedListSpan(style));`
	`874`	`+ setParagraphSpanFromMark(text, l, new EditorUnorderedListSpan(style));`
`875`	`875`	`}`
`876`	`876`	`}`
`877`	`877`
`@@ -885,18 +885,19 @@ private void startBlockquote(Editable text, Attributes attributes) {`
`885`	`885`
`886`	`886`	`private static void endBlockquote(Editable text, RichTextStyle style) {`
`887`	`887`	`endBlockElement(text);`
`888`		`- end(text, Blockquote.class, new EditorBlockQuoteSpan(style));`
	`888`	`+ Blockquote last = getLast(text, Blockquote.class);`
	`889`	`+ setParagraphSpanFromMark(text, last, new EditorBlockQuoteSpan(style));`
`889`	`890`	`}`
`890`	`891`
`891`	`892`	`private void startCodeBlock(Editable text, Attributes attributes) {`
`892`	`893`	`startBlockElement(text, attributes, getMarginBlockquote());`
`893`	`894`	`start(text, new CodeBlock());`
`894`		`- ;`
`895`	`895`	`}`
`896`	`896`
`897`	`897`	`private static void endCodeBlock(Editable text, RichTextStyle style) {`
`898`	`898`	`endBlockElement(text);`
`899`		`- end(text, CodeBlock.class, new EditorCodeBlockSpan(style));`
	`899`	`+ CodeBlock last = getLast(text, CodeBlock.class);`
	`900`	`+ setParagraphSpanFromMark(text, last, new EditorCodeBlockSpan(style));`
`900`	`901`	`}`
`901`	`902`
`902`	`903`	`private void startHeading(Editable text, Attributes attributes, int level) {`
`@@ -939,7 +940,7 @@ private static void setSpanFromMark(Spannable text, Object mark, Object... spans`
`939`	`940`	`}`
`940`	`941`	`}`
`941`	`942`
`942`		`- private static void setListSpanFromMark(Spannable text, Object mark, Object... spans) {`
	`943`	`+ private static void setParagraphSpanFromMark(Spannable text, Object mark, Object... spans) {`
`943`	`944`	`int where = text.getSpanStart(mark);`
`944`	`945`	`text.removeSpan(mark);`
`945`	`946`	`int len = text.length();`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,11 @@ class EditorSelection(private val editorView: ReactNativeRichTextEditorView) {`
`104`	`104`	`endPosition++`
`105`	`105`	`}`
`106`	`106`
	`107`	`+ if (startPosition >= endPosition) {`
	`108`	`+ // If the start position is equal or greater than the end position, return the same position`
	`109`	`+ startPosition = endPosition`
	`110`	`+ }`
	`111`	`+`
`107`	`112`	`return Pair(startPosition, endPosition)`
`108`	`113`	`}`
`109`	`114`