fix: properly handle new colours in parser

Author: IvanIhnatsiuk

ios/EnrichedTextInputView.mm

@@ -970,7 +970,7 @@ - (void)setColor:(NSString *)colorText {
 
 - (void)removeColor {
   ColorStyle *colorStyle = stylesDict[@(Colored)];
-  [colorStyle removeAttributes: textView.selectedRange];
+  [colorStyle removeColorInSelectedRange];
   [self anyTextMayHaveBeenModified];
 }
 

ios/inputParser/InputParser.mm

@@ -55,19 +55,30 @@ - (NSString *)parseToHtmlFromRange:(NSRange)range {
       }
     }
 
-    // Handle valued styles changes
     UIColor *currentColor = nil;
-    
+        
     if([currentActiveStyles containsObject:@(Colored)]) {
       ColorStyle *colorStyle = _input->stylesDict[@(Colored)];
       currentColor = [colorStyle getColorAt:currentRange.location];
-      if(previousColor && ![currentColor isEqual:previousColor]) {
-        // Treat as end of previous color and start of new
-        [currentActiveStyles removeObject:@(Colored)];
-        currentActiveStylesBeginning[@(Colored)] = [NSNumber numberWithInt:i];
+       // If the end of one color overlaps exactly with the start of the next
+       // the previous font tag should be closed and a new one opened using the new color.
+      if (previousColor && ![currentColor isEqual:previousColor]) {
+          NSString *closeTag = [self tagContentForStyle:@(Colored)
+                                             openingTag:NO
+                                               location:currentRange.location];
+          [result appendFormat:@"</%@>", closeTag];
+          NSString *openTag = [self tagContentForStyle:@(Colored)
+                                            openingTag:YES
+                                              location:currentRange.location];
+          [result appendFormat:@"<%@>", openTag];
+          NSString *currentCharacterStr = [_input->textView.textStorage.string substringWithRange:currentRange];
+          [result appendString: currentCharacterStr];
+          previousColor = currentColor;
+          [currentActiveStyles addObject:@(Colored)];
+          continue;
       }
     }
-    
+
     NSString *currentCharacterStr = [_input->textView.textStorage.string substringWithRange:currentRange];
     unichar currentCharacterChar = [_input->textView.textStorage.string characterAtIndex:currentRange.location];
 

ios/styles/ColorStyle.mm

@@ -303,4 +303,14 @@ - (UIColor *)baseColorForLocation:(NSUInteger)location {
     return baseColor;
 }
 
+- (void)removeColorInSelectedRange {
+  NSRange selectedRange = _input->textView.selectedRange;
+  
+  if(selectedRange.length > 0) {
+    [self removeAttributes: selectedRange];
+  } else {
+    [self removeTypingAttributes];
+  }
+}
+
 @end

ios/utils/StyleHeaders.h

@@ -25,6 +25,7 @@
 - (UIColor *)getColorAt:(NSUInteger)location;
 - (void)applyStyle:(NSRange)range color:(UIColor *)color;
 - (BOOL)detectExcludingColor:(UIColor *)excludedColor inRange:(NSRange)range;
+- (void)removeColorInSelectedRange;
 @end
 
 @interface LinkStyle : NSObject <BaseStyleProtocol>