fix: parsing html into native

Author: kacperzolkiewski

ios/inputParser/InputParser.mm

@@ -456,6 +456,9 @@ - (void)applyProcessedStyles:(NSArray *)processedStyles offsetFromBeginning:(NSI
       } else if([styleType isEqualToNumber: @([MentionStyle getStyleType])]) {
         MentionParams *params = (MentionParams *)stylePair.styleValue;
         [((MentionStyle *)baseStyle) addMentionAtRange:styleRange params:params];
+      } else if([styleType isEqualToNumber: @([ImageStyle getStyleType])]) {
+        ImageData *imgData = (ImageData *)stylePair.styleValue;
+        [((ImageStyle *)baseStyle) addImageAtRange:styleRange imageData:imgData];
       } else {
         [baseStyle addAttributes:styleRange];
       }
@@ -546,6 +549,24 @@ - (NSString *)stringByAddingNewlinesToTag:(NSString *)tag inString:(NSString *)h
   return str;
 }
 
+- (void)finalizeTagEntry:(NSMutableString *)tagName ongoingTags:(NSMutableDictionary *)ongoingTags initiallyProcessedTags:(NSMutableArray *)processedTags plainText:(NSMutableString *)plainText
+{
+  NSMutableArray *tagEntry = [[NSMutableArray alloc] init];
+  
+  NSArray *tagData = ongoingTags[tagName];
+  NSInteger tagLocation = [((NSNumber *)tagData[0]) intValue];
+  NSRange tagRange = NSMakeRange(tagLocation, plainText.length - tagLocation);
+  
+  [tagEntry addObject:[tagName copy]];
+  [tagEntry addObject:[NSValue valueWithRange:tagRange]];
+  if(tagData.count > 1) {
+      [tagEntry addObject:[(NSString *)tagData[1] copy]];
+  }
+  
+  [processedTags addObject:tagEntry];
+  [ongoingTags removeObjectForKey:tagName];
+}
+
 - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
   NSMutableString *plainText = [[NSMutableString alloc] initWithString: @""];
   NSMutableDictionary *ongoingTags = [[NSMutableDictionary alloc] init];
@@ -573,6 +594,14 @@ - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
       gettingTagName = NO;
       gettingTagParams = NO;
 
+      BOOL isSelfClosing = NO;
+        
+      // Check if params ended with '/' (e.g. <img src="" />)
+      if ([currentTagParams hasSuffix:@"/"]) {
+        [currentTagParams deleteCharactersInRange:NSMakeRange(currentTagParams.length - 1, 1)];
+        isSelfClosing = YES;
+      }
+      
       if([currentTagName isEqualToString:@"p"] || [currentTagName isEqualToString:@"br"] || [currentTagName isEqualToString:@"li"]) {
         // do nothing, we don't include these tags in styles
       } else if(!closingTag) {
@@ -588,6 +617,10 @@ - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
         if([currentTagName isEqualToString:@"ul"] || [currentTagName isEqualToString:@"ol"] || [currentTagName isEqualToString:@"blockquote"] || [currentTagName isEqualToString:@"codeblock"]) {
           i += 1;
         }
+        
+        if (isSelfClosing) {
+          [self finalizeTagEntry:currentTagName ongoingTags:ongoingTags initiallyProcessedTags:initiallyProcessedTags plainText:plainText];
+        }
       } else {
         // we finish closing tags - pack tag name, tag range and optionally tag params into an entry that goes inside initiallyProcessedTags
 
@@ -596,20 +629,7 @@ - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
           plainText = [[plainText substringWithRange: NSMakeRange(0, plainText.length - 1)] mutableCopy];
         }
 
-        NSMutableArray *tagEntry = [[NSMutableArray alloc] init];
-      
-        NSArray *tagData = ongoingTags[currentTagName];
-        NSInteger tagLocation = [((NSNumber *)tagData[0]) intValue];
-        NSRange tagRange = NSMakeRange(tagLocation, plainText.length - tagLocation);
-        
-        [tagEntry addObject:[currentTagName copy]];
-        [tagEntry addObject:[NSValue valueWithRange:tagRange]];
-        if(tagData.count > 1) {
-          [tagEntry addObject:[(NSString *)tagData[1] copy]];
-        }
-        
-        [initiallyProcessedTags addObject:tagEntry];
-        [ongoingTags removeObjectForKey:currentTagName];
+        [self finalizeTagEntry:currentTagName ongoingTags:ongoingTags initiallyProcessedTags:initiallyProcessedTags plainText:plainText];
       }
       // post-tag cleanup
       closingTag = NO;
@@ -669,7 +689,7 @@ - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
     } else if([tagName isEqualToString:@"i"]) {
       [styleArr addObject:@([ItalicStyle getStyleType])];
     } else if([tagName isEqualToString:@"img"]) {
-      NSRegularExpression *srcRegex = [NSRegularExpression regularExpressionWithPattern:@"src=\".+\""
+      NSRegularExpression *srcRegex = [NSRegularExpression regularExpressionWithPattern:@"src=\"([^\"]+)\""
         options:0
         error:nullptr
       ];

ios/styles/ImageStyle.mm

@@ -103,37 +103,35 @@ - (ImageData *)getImageDataAt:(NSUInteger)location
   return imageData;
 }
 
-- (void)addImage:(NSString *)uri width:(CGFloat)width height:(CGFloat)height {
-  ImageData *data = [[ImageData alloc] init];
-  data.uri = uri;
-  data.width = width;
-  data.height = height;
-  
+- (void)addImageAtRange:(NSRange)range imageData:(ImageData *)imageData
+{
   NSMutableDictionary *attributes = [@{
-    NSAttachmentAttributeName: [self prepareImageAttachement:uri width:width height:height],
-    ImageAttributeName: data,
+    NSAttachmentAttributeName: [self prepareImageAttachement:imageData.uri width:imageData.width height:imageData.height],
+    ImageAttributeName: imageData,
   } mutableCopy];
 
   // Use the Object Replacement Character for Image.
   // This tells TextKit "something non-text goes here".
   NSString *imagePlaceholder = @"\uFFFC";
 
-  if (_input->textView.selectedRange.length == 0) {
-    [TextInsertionUtils insertText:imagePlaceholder at:_input->textView.selectedRange.location additionalAttributes:nullptr input:_input withSelection:YES];
+  if (range.length == 0) {
+    [TextInsertionUtils insertText:imagePlaceholder at:range.location additionalAttributes:attributes input:_input withSelection:YES];
   } else {
     [TextInsertionUtils replaceText:imagePlaceholder
-                                 at:_input->textView.selectedRange
-               additionalAttributes:nullptr
+                                 at:range
+               additionalAttributes:attributes
                               input:_input
                       withSelection:YES];
   }
+}
+
+- (void)addImage:(NSString *)uri width:(CGFloat)width height:(CGFloat)height {
+  ImageData *data = [[ImageData alloc] init];
+  data.uri = uri;
+  data.width = width;
+  data.height = height;
 
-  NSRange newSelection = _input->textView.selectedRange;
-  NSRange imageRange = NSMakeRange(newSelection.location - 1, 1);
-  
-  [_input->textView.textStorage beginEditing];
-  [_input->textView.textStorage addAttributes:attributes range:imageRange];
-  [_input->textView.textStorage endEditing];
+  [self addImageAtRange:_input->textView.selectedRange imageData:data];
 }
 
 -(NSTextAttachment *)prepareImageAttachement:(NSString *)uri width:(CGFloat)width height:(CGFloat)height

ios/utils/StyleHeaders.h

@@ -83,5 +83,6 @@
 
 @interface ImageStyle : NSObject<BaseStyleProtocol>
 - (void)addImage:(NSString *)uri width:(CGFloat)width height:(CGFloat)height;
+- (void)addImageAtRange:(NSRange)range imageData:(ImageData *)imageData;
 - (ImageData *)getImageDataAt:(NSUInteger)location;
 @end