InlineFormatter - Prevent picking previous Mark styles if the format …

…is no longer active
wordpress-mobile · Feb 29, 2024 · ffdddf3 · ffdddf3
1 parent bdfb20f
commit ffdddf3
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/formatting/InlineFormatter.kt b/aztec/src/main/kotlin/org/wordpress/aztec/formatting/InlineFormatter.kt
@@ -133,6 +133,14 @@ class InlineFormatter(editor: AztecText, val codeStyle: CodeStyle, private val h
             return
         }
 
+        // Remove leading Mark formatting styles if the format is not active
+        if (!editor.selectedStyles.contains(AztecTextFormat.FORMAT_MARK) && newStart >=1 && end > 1) {
+            val markSpan = editableText.getSpans(newStart - 1, newStart, MarkSpan::class.java);
+            if (markSpan.isNotEmpty()) {
+                removeInlineCssStyle(newStart, end)
+            }
+        }
+
         editableText.getSpans(newStart, end, IAztecInlineSpan::class.java).forEach {
             if (!editor.selectedStyles.contains(spanToTextFormat(it)) || ignoreSelectedStyles || (newStart == 0 && end == 0) ||
                     (newStart > end && editableText.length > end && editableText[end] == '\n')) {