Do not remove and reapply spans that start before the removed media

wordpress-mobile · Sep 15, 2023 · c84ea78 · c84ea78
1 parent c4572f2
commit c84ea78
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt
@@ -2254,16 +2254,15 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                                     text.getSpanEnd(blockSpan),
                                     text.getSpanFlags(blockSpan)
                             )
-                        }
+                        }.filter { it.start >= start }
                         spans.forEach { temporarySpan ->
                             text.removeSpan(temporarySpan)
                         }
                         text.delete(start, endPlus1)
                         spans.forEach { temporarySpan ->
-                            val newStart = if (temporarySpan.start >= start) temporarySpan.start - 2 else temporarySpan.start
                             text.setSpan(
                                     temporarySpan.span,
-                                    newStart.coerceAtLeast(0),
+                                    (temporarySpan.start - 2).coerceAtLeast(0),
                                     (temporarySpan.end - 2).coerceAtMost(text.length),
                                     temporarySpan.flags
                             )