Merge pull request wikimedia#4712 from wikimedia/merge-bug-fix

Native Editor - Fix shared method keys in bold italic formatter
codemagic-ci-cd · Jan 9, 2024 · 2cce0df · 2cce0df
2 parents 9ba2a3d + d0ce9ed
commit 2cce0df
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/Components/Sources/ComponentsObjC/WKSourceEditorFormatterBoldItalics.m b/Components/Sources/ComponentsObjC/WKSourceEditorFormatterBoldItalics.m
@@ -280,7 +280,6 @@ - (void)updateFonts:(WKSourceEditorFonts *)fonts inAttributedString:(NSMutableAt
 - (BOOL)attributedString:(NSMutableAttributedString *)attributedString isBoldInRange:(NSRange)range {
     return [self attributedString:attributedString isFormattedInRange:range formattingKey:WKSourceEditorCustomKeyFontBold];
 }
-
 - (BOOL)attributedString:(NSMutableAttributedString *)attributedString isItalicsInRange:(NSRange)range {
     return [self attributedString:attributedString isFormattedInRange:range formattingKey:WKSourceEditorCustomKeyFontItalics];
 }
@@ -294,14 +293,13 @@ - (BOOL)attributedString:(NSMutableAttributedString *)attributedString isFormatt
 
         if (attributedString.length > range.location) {
             NSDictionary<NSAttributedStringKey,id> *attrs = [attributedString attributesAtIndex:range.location effectiveRange:nil];
-
-            if (attrs[WKSourceEditorCustomKeyFontBoldItalics] != nil || attrs[WKSourceEditorCustomKeyFontItalics] != nil) {
+            if (attrs[WKSourceEditorCustomKeyFontBoldItalics] != nil || attrs[formattingKey] != nil) {
                 isFormatted = YES;
             } else {
                 // Edge case, check previous character if we are up against a closing bold or italic
                 if (attrs[WKSourceEditorCustomKeyColorOrange]) {
                     attrs = [attributedString attributesAtIndex:range.location - 1 effectiveRange:nil];
-                    if (attrs[WKSourceEditorCustomKeyFontBold] != nil || attrs[WKSourceEditorCustomKeyFontItalics] != nil) {
+                    if (attrs[WKSourceEditorCustomKeyFontBoldItalics] != nil || attrs[formattingKey] != nil) {
                         isFormatted = YES;
                     }
                 }