Merge pull request #1038 from wordpress-mobile/fix/undo-when-deleting-placeholder

khaykov · web-flow · commit 9cd1615406af · 2023-03-17T11:55:30.000-05:00
Make sure to save remove action to history
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt
@@ -2205,6 +2205,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
     }
 
     fun removeMedia(attributePredicate: AttributePredicate) {
+        history.beforeTextChanged(this@AztecText)
         text.getSpans(0, text.length, AztecMediaSpan::class.java)
                 .filter {
                     attributePredicate.matches(it.attributes)
@@ -2252,6 +2253,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                     }
                     mediaSpan.onMediaDeleted()
                 }
+        contentChangeWatcher.notifyContentChanged()
     }
 
     fun replaceMediaSpan(aztecMediaSpan: AztecMediaSpan, predicate: (Attributes) -> Boolean) {

Original file line number	Diff line number	Diff line change
`@@ -2205,6 +2205,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown`
`2205`	`2205`	`}`
`2206`	`2206`
`2207`	`2207`	`fun removeMedia(attributePredicate: AttributePredicate) {`
	`2208`	`+ history.beforeTextChanged(this@AztecText)`
`2208`	`2209`	`text.getSpans(0, text.length, AztecMediaSpan::class.java)`
`2209`	`2210`	`.filter {`
`2210`	`2211`	`attributePredicate.matches(it.attributes)`
`@@ -2252,6 +2253,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown`
`2252`	`2253`	`}`
`2253`	`2254`	`mediaSpan.onMediaDeleted()`
`2254`	`2255`	`}`
	`2256`	`+ contentChangeWatcher.notifyContentChanged()`
`2255`	`2257`	`}`
`2256`	`2258`
`2257`	`2259`	`fun replaceMediaSpan(aztecMediaSpan: AztecMediaSpan, predicate: (Attributes) -> Boolean) {`