Improve behaviour of history when updating placeholders

Author: planarvoid

aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt

@@ -2161,18 +2161,15 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         lineBlockFormatter.insertVideo(shouldAddMediaInline, drawable, attributes, onVideoTappedListener, onMediaDeletedListener)
     }
 
-    fun removeMedia(notifyContentChange: Boolean = true, predicate: (Attributes) -> Boolean) {
+    fun removeMedia(predicate: (Attributes) -> Boolean) {
         removeMedia(object : AttributePredicate {
             override fun matches(attrs: Attributes): Boolean {
                 return predicate(attrs)
             }
-        }, notifyContentChange)
+        })
     }
 
-    fun removeMedia(attributePredicate: AttributePredicate, notifyContentChange: Boolean = true) {
-        if (!notifyContentChange) {
-            disableTextChangedListener()
-        }
+    fun removeMedia(attributePredicate: AttributePredicate) {
         text.getSpans(0, text.length, AztecMediaSpan::class.java)
                 .filter {
                     attributePredicate.matches(it.attributes)
@@ -2220,8 +2217,33 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                     }
                     mediaSpan.onMediaDeleted()
                 }
-        if (!notifyContentChange) {
-            enableTextChangedListener()
+    }
+
+    fun replaceMediaSpan(aztecMediaSpan: AztecMediaSpan, predicate: (Attributes) -> Boolean) {
+        replaceMediaSpan(object : AttributePredicate {
+            override fun matches(attrs: Attributes): Boolean {
+                return predicate(attrs)
+            }
+        }, aztecMediaSpan)
+    }
+
+    fun replaceMediaSpan(attributePredicate: AttributePredicate, aztecMediaSpan: AztecMediaSpan) {
+        history.beforeTextChanged(this@AztecText)
+        text.getSpans(0, text.length, AztecMediaSpan::class.java).firstOrNull {
+            attributePredicate.matches(it.attributes)
+        }?.let { mediaSpan ->
+            mediaSpan.beforeMediaDeleted()
+            val start = text.getSpanStart(mediaSpan)
+            val end = text.getSpanEnd(mediaSpan)
+
+            val clickableSpan = text.getSpans(start, end, AztecMediaClickableSpan::class.java).firstOrNull()
+
+            text.removeSpan(clickableSpan)
+            text.removeSpan(mediaSpan)
+            mediaSpan.onMediaDeleted()
+            aztecMediaSpan.onMediaDeletedListener = onMediaDeletedListener
+            lineBlockFormatter.insertMediaSpanOverCurrentChar(aztecMediaSpan, start)
+            contentChangeWatcher.notifyContentChanged()
         }
     }
 

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

@@ -150,6 +150,24 @@ class LineBlockFormatter(editor: AztecText) : AztecFormatter(editor) {
         }
     }
 
+    fun insertMediaSpanOverCurrentChar(span: AztecMediaSpan, position: Int) {
+        editor.removeInlineStylesFromRange(selectionStart, selectionEnd)
+
+        editor.editableText.setSpan(
+                span,
+                position,
+                position + 1,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+
+        editor.editableText.setSpan(
+                AztecMediaClickableSpan(span),
+                position,
+                position + 1,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+    }
+
     private fun insertMediaInline(span: AztecMediaSpan) {
         editor.removeInlineStylesFromRange(selectionStart, selectionEnd)
 

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

@@ -137,9 +137,6 @@ class PlaceholderManager(
                 currentAttributes[name] = value
             }
             val updatedAttributes = updateItem(currentAttributes, currentType)
-            removeItem(false) { aztecAttributes ->
-                aztecAttributes.getValue(UUID_ATTRIBUTE) == uuid
-            }
             val attrs = AztecAttributes().apply {
                 updatedAttributes.forEach { (key, value) ->
                     setValue(key, value)
@@ -148,8 +145,11 @@ class PlaceholderManager(
             attrs.setValue(UUID_ATTRIBUTE, uuid)
             attrs.setValue(TYPE_ATTRIBUTE, type)
             val drawable = buildPlaceholderDrawable(adapter, attrs)
-            aztecText.insertMediaSpan(AztecPlaceholderSpan(aztecText.context, drawable, 0, attrs,
-                    this, aztecText, WeakReference(adapter), TAG = htmlTag))
+            val span = AztecPlaceholderSpan(aztecText.context, drawable, 0, attrs,
+                    this, aztecText, WeakReference(adapter), TAG = htmlTag)
+            aztecText.replaceMediaSpan(span) { attributes ->
+                attributes.getValue(UUID_ATTRIBUTE) == uuid
+            }
             insertContentOverSpanWithId(uuid)
         } else {
             insertItem(type, *updateItem(null, null).toList().toTypedArray())
@@ -160,8 +160,8 @@ class PlaceholderManager(
      * 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
      */
-    fun removeItem(notifyContentChange: Boolean = true, predicate: (Attributes) -> Boolean) {
-        aztecText.removeMedia(notifyContentChange) { predicate(it) }
+    fun removeItem(predicate: (Attributes) -> Boolean) {
+        aztecText.removeMedia { predicate(it) }
     }
 
     private suspend fun buildPlaceholderDrawable(adapter: PlaceholderAdapter, attrs: AztecAttributes): Drawable {
@@ -342,6 +342,12 @@ class PlaceholderManager(
     override fun handleTag(opening: Boolean, tag: String, output: Editable, attributes: Attributes, nestingLevel: Int): Boolean {
         if (opening) {
             val type = attributes.getValue(TYPE_ATTRIBUTE)
+            attributes.getValue(UUID_ATTRIBUTE)?.also { uuid ->
+                container.findViewWithTag<View>(uuid)?.let {
+                    it.visibility = View.GONE
+                    container.removeView(it)
+                }
+            }
             val adapter = adapters[type] ?: return false
             val aztecAttributes = AztecAttributes(attributes)
             aztecAttributes.setValue(UUID_ATTRIBUTE, generateUuid())