Merge pull request #978 from wordpress-mobile/fix/add-block-when-no-blocks-present

Fix issue when adding image when no blocks are present

Author: AmandaRiu

aztec/src/main/kotlin/org/wordpress/aztec/formatting/LineBlockFormatter.kt

@@ -182,7 +182,6 @@ class LineBlockFormatter(editor: AztecText) : AztecFormatter(editor) {
             }
         } else {
             ssb.append("\n")
-
             val ssbLength = ssb.length
             editableText.getSpans(position, position + ssbLength, IAztecBlockSpan::class.java).filter {
                 it !is AztecMediaSpan && editableText.getSpanStart(it) == position
@@ -232,13 +231,20 @@ class LineBlockFormatter(editor: AztecText) : AztecFormatter(editor) {
     }
 
     private fun getEndOfBlock(): Int {
+        if (selectionStart == 0 && selectionEnd == 0) {
+            return 0
+        }
         var position = 0
         editableText.getSpans(selectionStart, selectionEnd, IAztecBlockSpan::class.java).forEach {
             val spanEnd = editableText.getSpanEnd(it)
             if (spanEnd > position) {
                 position = spanEnd
             }
         }
+        if (position <= 0 && selectionEnd != 0) {
+            // If the text contains "\n" return that as the position, else set the position to the end of the text
+            position = editableText.indexOf("\n", selectionEnd).takeIf { it >= 0 } ?: editableText.length
+        }
         return position
     }
 }

aztec/src/test/kotlin/org/wordpress/aztec/ImageBlockTest.kt

@@ -137,4 +137,30 @@ class ImageBlockTest {
 
         Assert.assertEquals("<h1>Headline 1</h1><hr /><h2>Headline 2</h2>", editText.toHtml())
     }
+
+    @Test
+    @Throws(Exception::class)
+    fun addImageAtTheEndWhenNoBlocksPresent() {
+        editText.fromHtml("Test 1<br>test 2<br>test 3")
+
+        editText.setSelection(editText.editableText.indexOf("3"))
+        val attributes = AztecAttributes()
+        attributes.setValue("id", "1234")
+        editText.insertImage(null, attributes)
+
+        Assert.assertEquals("Test 1<br>test 2<br>test 3<img id=\"1234\" />", editText.toHtml())
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun addImageInTheMiddleWhenNoBlocksPresent() {
+        editText.fromHtml("Test 1<br>test 2<br>test 3")
+
+        editText.setSelection(editText.editableText.indexOf("2"))
+        val attributes = AztecAttributes()
+        attributes.setValue("id", "1234")
+        editText.insertImage(null, attributes)
+
+        Assert.assertEquals("Test 1<br>test 2<img id=\"1234\" /><br>test 3", editText.toHtml())
+    }
 }