Merge pull request #357 from MohamedRejeb/1.x

Fix RichTextState.toHtml() append an additional <br> when the last line is empty
MohamedRejeb · Sep 24, 2024 · d07edeb · d07edeb
2 parents 3990c22 + 4c5b32a
commit d07edeb
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/.../src/commonMain/kotlin/com/mohamedrejeb/richeditor/parser/html/RichTextStateHtmlParser.kt b/.../src/commonMain/kotlin/com/mohamedrejeb/richeditor/parser/html/RichTextStateHtmlParser.kt
@@ -251,8 +251,10 @@ internal object RichTextStateHtmlParser : RichTextStateParser<String> {
         val builder = StringBuilder()
 
         var lastParagraphGroupTagName: String? = null
+        var isLastParagraphEmpty = false
 
         richTextState.richParagraphList.fastForEachIndexed { index, richParagraph ->
+            val isParagraphEmpty = richParagraph.isEmpty()
             val paragraphGroupTagName = decodeHtmlElementFromRichParagraphType(richParagraph.type)
 
             // Close last paragraph group tag if needed
@@ -268,8 +270,15 @@ internal object RichTextStateHtmlParser : RichTextStateParser<String> {
             )
                 builder.append("<$paragraphGroupTagName>")
             // Add line break if the paragraph is empty
-            else if (richParagraph.isEmpty()) {
-                builder.append("<$BrElement>")
+            else if (isParagraphEmpty) {
+                val skipAddingBr =
+                    isLastParagraphEmpty && richParagraph.isEmpty() && index == richTextState.richParagraphList.lastIndex
+
+                if (!skipAddingBr)
+                    builder.append("<$BrElement>")
+
+                isLastParagraphEmpty = isParagraphEmpty
+
                 return@fastForEachIndexed
             }
 
@@ -304,6 +313,8 @@ internal object RichTextStateHtmlParser : RichTextStateParser<String> {
                 (lastParagraphGroupTagName == "ol" || lastParagraphGroupTagName == "ul") &&
                 index == richTextState.richParagraphList.lastIndex
             ) builder.append("</$lastParagraphGroupTagName>")
+
+            isLastParagraphEmpty = isParagraphEmpty
         }
 
         return builder.toString()

diff --git a/...r-compose/src/commonTest/kotlin/com.mohamedrejeb.richeditor/parser/html/CssDecoderTest.kt b/...r-compose/src/commonTest/kotlin/com.mohamedrejeb.richeditor/parser/html/CssDecoderTest.kt
@@ -16,7 +16,7 @@ import kotlin.test.Test
 import kotlin.test.assertContains
 import kotlin.test.assertEquals
 
-internal class CssDecoderTest {
+class CssDecoderTest {
     @Test
     fun testDecodeCssStyleMap() {
         val map = mapOf(

diff --git a/...r-compose/src/commonTest/kotlin/com.mohamedrejeb.richeditor/parser/html/CssEncoderTest.kt b/...r-compose/src/commonTest/kotlin/com.mohamedrejeb.richeditor/parser/html/CssEncoderTest.kt
@@ -13,7 +13,7 @@ import kotlin.math.roundToInt
 import kotlin.test.Test
 import kotlin.test.assertEquals
 
-internal class CssEncoderTest {
+class CssEncoderTest {
     @Test
     fun testParseCssStyle() {
         val style = "font-weight: bold; color: #ff0000; font-size: 12px;"

diff --git a/.../commonTest/kotlin/com.mohamedrejeb.richeditor/parser/html/RichTextStateHtmlParserTest.kt b/.../commonTest/kotlin/com.mohamedrejeb.richeditor/parser/html/RichTextStateHtmlParserTest.kt
@@ -8,7 +8,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertIs
 import kotlin.test.assertTrue
 
-internal class RichTextStateHtmlParserTest {
+class RichTextStateHtmlParserTest {
     @Test
     fun testRemoveHtmlTextExtraSpaces() {
         val html = """
@@ -150,6 +150,26 @@ internal class RichTextStateHtmlParserTest {
         assertEquals("second", richTextState.annotatedString.text)
     }
 
+    @Test
+    fun testBrEncodeDecode() {
+        val html = "<p>ABC</p><br><br><br>"
+
+        val state = RichTextStateHtmlParser.encode(html)
+
+        assertEquals(5, state.richParagraphList.size)
+        assertEquals(html, state.toHtml())
+    }
+
+    @Test
+    fun testBrEncodeDecode2() {
+        val html = "<br><p>ABC</p><br><br><p>ABC</p><br><br>"
+
+        val state = RichTextStateHtmlParser.encode(html)
+
+        assertEquals(8, state.richParagraphList.size)
+        assertEquals(html, state.toHtml())
+    }
+
     @Test
     fun testBrInMiddleOrParagraph() {
         val html = """