Implement adding to a gallery when inserting an item before

Author: planarvoid

media-placeholders/src/main/java/org/wordpress/aztec/placeholders/PlaceholderManager.kt

@@ -110,21 +110,7 @@ class PlaceholderManager(
      * @param updateItem function to update current parameters with new params
      */
     suspend fun insertOrUpdateItem(type: String, shouldMergeItem: (currentItemType: String) -> Boolean = { true }, updateItem: (currentAttributes: Map<String, String>?, currentType: String?) -> Map<String, String>) {
-        val previousIndex = (aztecText.selectionStart - 1).coerceAtLeast(0)
-        val indexBeforePrevious = (aztecText.selectionStart - 2).coerceAtLeast(0)
-        val from = if (aztecText.editableText.length > previousIndex && aztecText.editableText[previousIndex] == Constants.IMG_CHAR) {
-            previousIndex
-        } else if (aztecText.editableText.length > previousIndex && aztecText.editableText[previousIndex] == '\n') {
-            indexBeforePrevious
-        } else {
-            aztecText.selectionStart
-        }
-        val editableText = aztecText.editableText
-        val currentItem = editableText.getSpans(
-                from,
-                aztecText.selectionStart,
-                AztecPlaceholderSpan::class.java
-        ).lastOrNull()
+        val currentItem = getTargetItem()
         val currentType = currentItem?.attributes?.getValue(TYPE_ATTRIBUTE)
         if (currentType != null && shouldMergeItem(currentType)) {
             val adapter = adapters[type]
@@ -156,6 +142,35 @@ class PlaceholderManager(
         }
     }
 
+    private fun getTargetItem(): AztecPlaceholderSpan? {
+        if (aztecText.length() == 0) {
+            return null
+        }
+        val selectionStart = aztecText.selectionStart
+        val selectionStartMinusOne = (selectionStart - 1).coerceAtLeast(0)
+        val selectionStartMinusTwo = (selectionStart - 2).coerceAtLeast(0)
+        val selectionEnd = aztecText.selectionEnd
+        val selectionEndPlusOne = (selectionStart + 1).coerceAtMost(aztecText.length())
+        val selectionEndPlusTwo = (selectionStart + 2).coerceAtMost(aztecText.length())
+        val editableText = aztecText.editableText
+        val (from, to) = if (editableText[selectionStartMinusOne] == Constants.IMG_CHAR) {
+            selectionStartMinusOne to selectionStart
+        } else if (editableText[selectionStartMinusOne] == '\n' && editableText[selectionStartMinusTwo] == Constants.IMG_CHAR) {
+            selectionStartMinusTwo to selectionStart
+        } else if (editableText[selectionEndPlusOne] == Constants.IMG_CHAR){
+            selectionEndPlusOne to (selectionEndPlusOne + 1).coerceAtMost(aztecText.length())
+        } else if (editableText[selectionEndPlusOne] == '\n' && editableText[selectionEndPlusTwo] == Constants.IMG_CHAR) {
+            selectionEndPlusTwo to (selectionEndPlusTwo + 1).coerceAtMost(aztecText.length())
+        } else {
+            selectionStart to selectionEnd
+        }
+        return editableText.getSpans(
+                from,
+                to,
+                AztecPlaceholderSpan::class.java
+        ).lastOrNull()
+    }
+
     /**
      * Call this method to remove a placeholder from both the AztecText and the overlaying layer programatically.
      * @param predicate determines whether a span should be removed

media-placeholders/src/test/java/org/wordpress/aztec/placeholders/PlaceholderTest.kt

@@ -64,8 +64,6 @@ class PlaceholderTest {
             editText.fromHtml(initialHtml)
 
             editText.setSelection(0)
-            val attributes = AztecAttributes()
-            attributes.setValue("id", "1234")
             ImageWithCaptionAdapter.insertImageWithCaption(placeholderManager, "image.jpg", "Caption 123")
 
             Assert.assertEquals("<placeholder uuid=\"$uuid\" type=\"image_with_caption\" src=\"image.jpg\" caption=\"Caption 123\" /><p>Line 1</p>", editText.toHtml())
@@ -86,8 +84,6 @@ class PlaceholderTest {
             editText.fromHtml(initialHtml)
 
             editText.setSelection(editText.editableText.indexOf("1"))
-            val attributes = AztecAttributes()
-            attributes.setValue("id", "1234")
             ImageWithCaptionAdapter.insertImageWithCaption(placeholderManager, "image.jpg", "Caption 123")
 
             Assert.assertEquals("<p>Line 123<placeholder uuid=\"uuid123\" type=\"image_with_caption\" src=\"image.jpg\" caption=\"Caption 123\" /></p><p>Line 2</p>", editText.toHtml())
@@ -108,12 +104,10 @@ class PlaceholderTest {
             editText.fromHtml(initialHtml)
 
             editText.setSelection(0)
-            val attributes = AztecAttributes()
-            attributes.setValue("id", "1234")
             ImageWithCaptionAdapter.insertImageWithCaption(placeholderManager, "image.jpg", "Caption 1")
             ImageWithCaptionAdapter.insertImageWithCaption(placeholderManager, "image.jpg", "Caption 2")
 
-            Assert.assertEquals("<placeholder src=\"image.jpg\" caption=\"Caption 2 - Caption 1\" uuid=\"uuid123\" type=\"image_with_caption\" /><p>Line 1</p>", editText.toHtml())
+            Assert.assertEquals("${placeholderWithCaption("Caption 2 - Caption 1")}<p>Line 1</p>", editText.toHtml())
 
             placeholderManager.removeItem {
                 it.getValue("uuid") == uuid
@@ -122,4 +116,36 @@ class PlaceholderTest {
             Assert.assertEquals(initialHtml, editText.toHtml())
         }
     }
+
+    @Test
+    @Throws(Exception::class)
+    fun insertOrUpdateAPlaceholderWhenInsertingBeforeNewLine() {
+        runBlocking {
+            val initialHtml = "<p>Line 1</p>${placeholderWithCaption("First")}<p>Line 2</p>"
+            editText.fromHtml(initialHtml)
+
+            editText.setSelection(editText.editableText.indexOf("1"))
+            ImageWithCaptionAdapter.insertImageWithCaption(placeholderManager, "image.jpg", "Second")
+
+            Assert.assertEquals("<p>Line 1</p>${placeholderWithCaption("Second - First")}<p>Line 2</p>", editText.toHtml())
+        }
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun insertOrUpdateAPlaceholderWhenInsertingRightBefore() {
+        runBlocking {
+            val initialHtml = "<p>Line 1</p>${placeholderWithCaption("First")}<p>Line 2</p>"
+            editText.fromHtml(initialHtml)
+
+            editText.setSelection(editText.editableText.indexOf("1") + 1)
+            ImageWithCaptionAdapter.insertImageWithCaption(placeholderManager, "image.jpg", "Second")
+
+            Assert.assertEquals("<p>Line 1</p>${placeholderWithCaption("Second - First")}<p>Line 2</p>", editText.toHtml())
+        }
+    }
+
+    private fun placeholderWithCaption(caption: String): String {
+        return "<placeholder src=\"image.jpg\" caption=\"$caption\" uuid=\"uuid123\" type=\"image_with_caption\" />"
+    }
 }