fix: conflicts in styles

Author: kacperzolkiewski

ios/EnrichedTextInputView.h

@@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
   @public InputParser *parser;
   @public NSMutableDictionary<NSAttributedStringKey, id> *defaultTypingAttributes;
   @public NSDictionary<NSNumber *, id<BaseStyleProtocol>> *stylesDict;
+  NSDictionary<NSNumber *, NSArray<NSNumber *> *> *conflictingStyles;
+  NSDictionary<NSNumber *, NSArray<NSNumber *> *> *blockingStyles;
   @public BOOL blockEmitting;
   @public BOOL emitHtml;
 }
@@ -26,6 +28,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)emitOnMentionEvent:(NSString *)indicator text:(nullable NSString *)text;
 - (void)anyTextMayHaveBeenModified;
 - (BOOL)handleStyleBlocksAndConflicts:(StyleType)type range:(NSRange)range;
+- (NSArray<NSNumber *> *)getPresentStyleTypesFrom:(NSArray<NSNumber *> *)types range:(NSRange)range;
 @end
 
 NS_ASSUME_NONNULL_END

ios/EnrichedTextInputView.mm

@@ -26,8 +26,6 @@ @implementation EnrichedTextInputView {
   EnrichedTextInputViewShadowNode::ConcreteState::Shared _state;
   int _componentViewHeightUpdateCounter;
   NSMutableSet<NSNumber *> *_activeStyles;
-  NSDictionary<NSNumber *, NSArray<NSNumber *> *> *_conflictingStyles;
-  NSDictionary<NSNumber *, NSArray<NSNumber *> *> *_blockingStyles;
   LinkData *_recentlyActiveLinkData;
   NSRange _recentlyActiveLinkRange;
   NSString *_recentlyEmittedString;
@@ -98,7 +96,7 @@ - (void)setDefaults {
     @([CodeBlockStyle getStyleType]): [[CodeBlockStyle alloc] initWithInput:self]
   };
 
-  _conflictingStyles = @{
+  conflictingStyles = @{
     @([BoldStyle getStyleType]) : @[],
     @([ItalicStyle getStyleType]) : @[],
     @([UnderlineStyle getStyleType]) : @[],
@@ -116,7 +114,7 @@ - (void)setDefaults {
         @([BoldStyle getStyleType]), @([ItalicStyle getStyleType]), @([UnderlineStyle getStyleType]), @([StrikethroughStyle getStyleType]), @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]), @([InlineCodeStyle getStyleType]), @([MentionStyle getStyleType]), @([LinkStyle getStyleType])]
   };
 
-  _blockingStyles = @{
+  blockingStyles = @{
     @([BoldStyle getStyleType]) : @[@([CodeBlockStyle getStyleType])],
     @([ItalicStyle getStyleType]) : @[@([CodeBlockStyle getStyleType])],
     @([UnderlineStyle getStyleType]) : @[@([CodeBlockStyle getStyleType])],
@@ -945,13 +943,13 @@ - (void)startMentionWithIndicator:(NSString *)indicator {
 // returns false when style shouldn't be applied and true when it can be
 - (BOOL)handleStyleBlocksAndConflicts:(StyleType)type range:(NSRange)range {
   // handle blocking styles: if any is present we do not apply the toggled style
-  NSArray<NSNumber *> *blocking = [self getPresentStyleTypesFrom: _blockingStyles[@(type)] range:range];
+  NSArray<NSNumber *> *blocking = [self getPresentStyleTypesFrom: blockingStyles[@(type)] range:range];
   if(blocking.count != 0) {
     return NO;
   }
 
   // handle conflicting styles: all of their occurences have to be removed
-  NSArray<NSNumber *> *conflicting = [self getPresentStyleTypesFrom: _conflictingStyles[@(type)] range:range];
+  NSArray<NSNumber *> *conflicting = [self getPresentStyleTypesFrom: conflictingStyles[@(type)] range:range];
   if(conflicting.count != 0) {
     for(NSNumber *style in conflicting) {
       id<BaseStyleProtocol> styleClass = stylesDict[style];
@@ -1212,7 +1210,9 @@ - (bool)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range r
     [h2Style handleNewlinesInRange:range replacementText:text] ||
     [h3Style handleNewlinesInRange:range replacementText:text] ||
     [ZeroWidthSpaceUtils handleBackspaceInRange:range replacementText:text input:self] ||
-    [ParagraphAttributesUtils handleBackspaceInRange:range replacementText:text input:self]
+    [ParagraphAttributesUtils handleBackspaceInRange:range replacementText:text input:self] ||
+    // this callback HAS TO be always evaluated last
+    [ParagraphAttributesUtils handleNewlineBackspaceInRange:range replacementText:text input:self]
   ) {
     [self anyTextMayHaveBeenModified];
     return NO;

ios/styles/BlockQuoteStyle.mm

@@ -11,6 +11,8 @@ @implementation BlockQuoteStyle {
 
 + (StyleType)getStyleType { return BlockQuote; }
 
++ (BOOL)isParagraphStyle { return YES; }
+
 - (instancetype)initWithInput:(id)input {
   self = [super init];
   _input = (EnrichedTextInputView *)input;

ios/styles/BoldStyle.mm

@@ -9,6 +9,8 @@ @implementation BoldStyle {
 
 + (StyleType)getStyleType { return Bold; }
 
++ (BOOL)isParagraphStyle { return NO; }
+
 - (instancetype)initWithInput:(id)input {
   self = [super init];
   _input = (EnrichedTextInputView *)input;

ios/styles/CodeBlockStyle.mm

@@ -12,6 +12,8 @@ @implementation CodeBlockStyle {
 
 + (StyleType)getStyleType { return CodeBlock; }
 
++ (BOOL)isParagraphStyle { return YES; }
+
 - (instancetype)initWithInput:(id)input {
   self = [super init];
   _input = (EnrichedTextInputView *)input;

ios/styles/H1Style.mm

@@ -3,6 +3,7 @@
 
 @implementation H1Style
 + (StyleType)getStyleType { return H1; }
++ (BOOL)isParagraphStyle { return NO; }
 - (CGFloat)getHeadingFontSize { return [((EnrichedTextInputView *)input)->config h1FontSize]; }
 - (BOOL)isHeadingBold {
   return [((EnrichedTextInputView *)input)->config h1Bold];

ios/styles/H2Style.mm

@@ -3,6 +3,7 @@
 
 @implementation H2Style
 + (StyleType)getStyleType { return H2; }
++ (BOOL)isParagraphStyle { return NO; }
 - (CGFloat)getHeadingFontSize { return [((EnrichedTextInputView *)input)->config h2FontSize]; }
 - (BOOL)isHeadingBold {
   return [((EnrichedTextInputView *)input)->config h2Bold];

ios/styles/H3Style.mm

@@ -3,6 +3,7 @@
 
 @implementation H3Style
 + (StyleType)getStyleType { return H3; }
++ (BOOL)isParagraphStyle { return NO; }
 - (CGFloat)getHeadingFontSize { return [((EnrichedTextInputView *)input)->config h3FontSize]; }
 - (BOOL)isHeadingBold {
   return [((EnrichedTextInputView *)input)->config h3Bold];

ios/styles/InlineCodeStyle.mm

@@ -11,6 +11,8 @@ @implementation InlineCodeStyle {
 
 + (StyleType)getStyleType { return InlineCode; }
 
++ (BOOL)isParagraphStyle { return NO; }
+
 - (instancetype)initWithInput:(id)input {
   self = [super init];
   _input = (EnrichedTextInputView *)input;

ios/styles/ItalicStyle.mm

@@ -9,6 +9,8 @@ @implementation ItalicStyle {
 
 + (StyleType)getStyleType { return Italic; }
 
++ (BOOL)isParagraphStyle { return NO; }
+
 - (instancetype)initWithInput:(id)input {
   self = [super init];
   _input = (EnrichedTextInputView *)input;