react-native-enriched 0.1.6 → 0.2.0

package/ios/config/InputConfig.mm

@@ -36,6 +36,11 @@
   UIColor *_linkColor;
   TextDecorationLineEnum _linkDecorationLine;
   NSDictionary *_mentionProperties;
+  UIColor *_codeBlockFgColor;
+  CGFloat _codeBlockBorderRadius;
+  UIColor *_codeBlockBgColor;
+  CGFloat _imageWidth;
+  CGFloat _imageHeight;
 }
 
 - (instancetype) init {
@@ -79,6 +84,9 @@
   copy->_linkColor = [_linkColor copy];
   copy->_linkDecorationLine = [_linkDecorationLine copy];
   copy->_mentionProperties = [_mentionProperties mutableCopy];
+  copy->_codeBlockFgColor = [_codeBlockFgColor copy];
+  copy->_codeBlockBgColor = [_codeBlockBgColor copy];
+  copy->_codeBlockBorderRadius = _codeBlockBorderRadius;
   return copy;
 }
 
@@ -379,4 +387,28 @@
   return fallbackProps;
 }
 
+- (UIColor *)codeBlockFgColor {
+  return _codeBlockFgColor;
+}
+
+- (void)setCodeBlockFgColor:(UIColor *)newValue {
+  _codeBlockFgColor = newValue;
+}
+
+- (UIColor *)codeBlockBgColor {
+  return _codeBlockBgColor;
+}
+
+- (void)setCodeBlockBgColor:(UIColor *)newValue {
+  _codeBlockBgColor = newValue;
+}
+
+- (CGFloat)codeBlockBorderRadius {
+  return _codeBlockBorderRadius;
+}
+
+- (void)setCodeBlockBorderRadius:(CGFloat)newValue {
+  _codeBlockBorderRadius = newValue;
+}
+
 @end

package/ios/generated/RNEnrichedTextInputViewSpec/Props.h

@@ -309,45 +309,6 @@ static inline folly::dynamic toDynamic(const EnrichedTextInputViewHtmlStyleAStru
 }
 #endif
 
-struct EnrichedTextInputViewHtmlStyleImgStruct {
-  Float width{0.0};
-  Float height{0.0};
-
-#ifdef RN_SERIALIZABLE_STATE
-  bool operator==(const EnrichedTextInputViewHtmlStyleImgStruct&) const = default;
-
-  folly::dynamic toDynamic() const {
-    folly::dynamic result = folly::dynamic::object();
-    result["width"] = width;
-    result["height"] = height;
-    return result;
-  }
-#endif
-};
-
-static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, EnrichedTextInputViewHtmlStyleImgStruct &result) {
-  auto map = (std::unordered_map<std::string, RawValue>)value;
-
-  auto tmp_width = map.find("width");
-  if (tmp_width != map.end()) {
-    fromRawValue(context, tmp_width->second, result.width);
-  }
-  auto tmp_height = map.find("height");
-  if (tmp_height != map.end()) {
-    fromRawValue(context, tmp_height->second, result.height);
-  }
-}
-
-static inline std::string toString(const EnrichedTextInputViewHtmlStyleImgStruct &value) {
-  return "[Object EnrichedTextInputViewHtmlStyleImgStruct]";
-}
-
-#ifdef RN_SERIALIZABLE_STATE
-static inline folly::dynamic toDynamic(const EnrichedTextInputViewHtmlStyleImgStruct &value) {
-  return value.toDynamic();
-}
-#endif
-
 struct EnrichedTextInputViewHtmlStyleOlStruct {
   Float gapWidth{0.0};
   Float marginLeft{0.0};
@@ -459,7 +420,6 @@ struct EnrichedTextInputViewHtmlStyleStruct {
   EnrichedTextInputViewHtmlStyleCodeStruct code{};
   EnrichedTextInputViewHtmlStyleAStruct a{};
   folly::dynamic mention{};
-  EnrichedTextInputViewHtmlStyleImgStruct img{};
   EnrichedTextInputViewHtmlStyleOlStruct ol{};
   EnrichedTextInputViewHtmlStyleUlStruct ul{};
 
@@ -476,7 +436,6 @@ struct EnrichedTextInputViewHtmlStyleStruct {
     result["code"] = ::facebook::react::toDynamic(code);
     result["a"] = ::facebook::react::toDynamic(a);
     result["mention"] = mention;
-    result["img"] = ::facebook::react::toDynamic(img);
     result["ol"] = ::facebook::react::toDynamic(ol);
     result["ul"] = ::facebook::react::toDynamic(ul);
     return result;
@@ -519,10 +478,6 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_mention != map.end()) {
     fromRawValue(context, tmp_mention->second, result.mention);
   }
-  auto tmp_img = map.find("img");
-  if (tmp_img != map.end()) {
-    fromRawValue(context, tmp_img->second, result.img);
-  }
   auto tmp_ol = map.find("ol");
   if (tmp_ol != map.end()) {
     fromRawValue(context, tmp_ol->second, result.ol);

package/ios/generated/RNEnrichedTextInputViewSpec/RCTComponentViewHelpers.h

@@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)toggleOrderedList;
 - (void)toggleUnorderedList;
 - (void)addLink:(NSInteger)start end:(NSInteger)end text:(NSString *)text url:(NSString *)url;
-- (void)addImage:(NSString *)uri;
+- (void)addImage:(NSString *)uri width:(float)width height:(float)height;
 - (void)startMention:(NSString *)indicator;
 - (void)addMention:(NSString *)indicator text:(NSString *)text payload:(NSString *)payload;
 @end
@@ -302,8 +302,8 @@ NSObject *arg3 = args[3];
 
 if ([commandName isEqualToString:@"addImage"]) {
 #if RCT_DEBUG
-  if ([args count] != 1) {
-    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 1);
+  if ([args count] != 3) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 3);
     return;
   }
 #endif
@@ -316,7 +316,23 @@ if ([commandName isEqualToString:@"addImage"]) {
 #endif
   NSString * uri = (NSString *)arg0;
 
-  [componentView addImage:uri];
+NSObject *arg1 = args[1];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg1, [NSNumber class], @"float", @"EnrichedTextInputView", commandName, @"2nd")) {
+    return;
+  }
+#endif
+  float width = [(NSNumber *)arg1 floatValue];
+
+NSObject *arg2 = args[2];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg2, [NSNumber class], @"float", @"EnrichedTextInputView", commandName, @"3rd")) {
+    return;
+  }
+#endif
+  float height = [(NSNumber *)arg2 floatValue];
+
+  [componentView addImage:uri width:width height:height];
   return;
 }
 

package/ios/inputParser/InputParser.mm

@@ -29,6 +29,7 @@
   BOOL inUnorderedList = NO;
   BOOL inOrderedList = NO;
   BOOL inBlockQuote = NO;
+  BOOL inCodeBlock = NO;
   unichar lastCharacter = 0;
   
   for(int i = 0; i < text.length; i++) {
@@ -85,6 +86,9 @@
         
         // append closing tags
         for(NSNumber *style in sortedEndedStyles) {
+          if ([style isEqualToNumber: @([ImageStyle getStyleType])]) {
+            continue;
+          }
           NSString *tagContent = [self tagContentForStyle:style openingTag:NO location:currentRange.location];
           [result appendString: [NSString stringWithFormat:@"</%@>", tagContent]];
         }
@@ -95,7 +99,8 @@
            [previousActiveStyles containsObject:@([H1Style getStyleType])] ||
            [previousActiveStyles containsObject:@([H2Style getStyleType])] ||
            [previousActiveStyles containsObject:@([H3Style getStyleType])] ||
-           [previousActiveStyles containsObject:@([BlockQuoteStyle getStyleType])]
+           [previousActiveStyles containsObject:@([BlockQuoteStyle getStyleType])] ||
+           [previousActiveStyles containsObject:@([CodeBlockStyle getStyleType])]
         ) {
           // do nothing, proper closing paragraph tags have been already appended
         } else {
@@ -128,6 +133,11 @@
           inBlockQuote = NO;
           [result appendString:@"\n</blockquote>"];
         }
+        // handle ending codeblock
+        if(inCodeBlock && ![currentActiveStyles containsObject:@([CodeBlockStyle getStyleType])]) {
+          inCodeBlock = NO;
+          [result appendString:@"\n</codeblock>"];
+        }
         
         // handle starting unordered list
         if(!inUnorderedList && [currentActiveStyles containsObject:@([UnorderedListStyle getStyleType])]) {
@@ -144,6 +154,11 @@
           inBlockQuote = YES;
           [result appendString:@"\n<blockquote>"];
         }
+        // handle starting codeblock
+        if(!inCodeBlock && [currentActiveStyles containsObject:@([CodeBlockStyle getStyleType])]) {
+          inCodeBlock = YES;
+          [result appendString:@"\n<codeblock>"];
+        }
         
         // don't add the <p> tag if some paragraph styles are present
         if([currentActiveStyles containsObject:@([UnorderedListStyle getStyleType])] ||
@@ -151,7 +166,8 @@
            [currentActiveStyles containsObject:@([H1Style getStyleType])] ||
            [currentActiveStyles containsObject:@([H2Style getStyleType])] ||
            [currentActiveStyles containsObject:@([H3Style getStyleType])] ||
-           [currentActiveStyles containsObject:@([BlockQuoteStyle getStyleType])]
+           [currentActiveStyles containsObject:@([BlockQuoteStyle getStyleType])] ||
+           [currentActiveStyles containsObject:@([CodeBlockStyle getStyleType])]
         ) {
           [result appendString:@"\n"];
         } else {
@@ -184,25 +200,51 @@
         }
       }
       
+      // if a style begins but there is a style inner to it that is (and was previously) active, it also should be closed and readded
+      
+      // newly added styles
+      NSMutableSet *newStyles = [currentActiveStyles mutableCopy];
+      [newStyles minusSet: previousActiveStyles];
+      // styles that were and still are active
+      NSMutableSet *stillActiveStyles = [previousActiveStyles mutableCopy];
+      [stillActiveStyles intersectSet:currentActiveStyles];
+      
+      for(NSNumber *style in newStyles) {
+        for(NSNumber *ongoingStyle in stillActiveStyles) {
+          if([ongoingStyle integerValue] > [style integerValue]) {
+            // the prev style is inner; needs to be closed and re-added later
+            [fixedEndedStyles addObject:ongoingStyle];
+            [stylesToBeReAdded addObject:ongoingStyle];
+          }
+        }
+      }
+      
       // they are sorted in a descending order
       NSArray<NSNumber*> *sortedEndedStyles = [fixedEndedStyles sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"intValue" ascending:NO]]];
       
       // append closing tags
       for(NSNumber *style in sortedEndedStyles) {
+        if ([style isEqualToNumber: @([ImageStyle getStyleType])]) {
+          continue;
+        }
         NSString *tagContent = [self tagContentForStyle:style openingTag:NO location:currentRange.location];
         [result appendString: [NSString stringWithFormat:@"</%@>", tagContent]];
       }
       
-      // get styles that have begun: they are sorted in a ascending manner to properly keep tags' FILO order
-      NSMutableSet<NSNumber *> *newStyles = [currentActiveStyles mutableCopy];
-      [newStyles minusSet: previousActiveStyles];
+      // all styles that have begun: new styles + the ones that need to be re-added
+      // they are sorted in a ascending manner to properly keep tags' FILO order
       [newStyles unionSet: stylesToBeReAdded];
       NSArray<NSNumber*> *sortedNewStyles = [newStyles sortedArrayUsingDescriptors:@[[NSSortDescriptor sortDescriptorWithKey:@"intValue" ascending:YES]]];
       
       // append opening tags
       for(NSNumber *style in sortedNewStyles) {
         NSString *tagContent = [self tagContentForStyle:style openingTag:YES location:currentRange.location];
-        [result appendString: [NSString stringWithFormat:@"<%@>", tagContent]];
+        if ([style isEqualToNumber: @([ImageStyle getStyleType])]) {
+          [result appendString: [NSString stringWithFormat:@"<%@/>", tagContent]];
+          [currentActiveStyles removeObject:@([ImageStyle getStyleType])];
+        } else {
+          [result appendString: [NSString stringWithFormat:@"<%@>", tagContent]];
+        }
       }
       
       // append the letter and escape it if needed
@@ -223,6 +265,9 @@
       
     // append closing tags
     for(NSNumber *style in sortedEndedStyles) {
+      if ([style isEqualToNumber: @([ImageStyle getStyleType])]) {
+        continue;
+      }
       NSString *tagContent = [self tagContentForStyle:style openingTag:NO location:_input->textView.textStorage.string.length - 1];
       [result appendString: [NSString stringWithFormat:@"</%@>", tagContent]];
     }
@@ -235,6 +280,8 @@
       [result appendString:@"\n</ol>"];
     } else if([previousActiveStyles containsObject:@([BlockQuoteStyle getStyleType])]) {
       [result appendString:@"\n</blockquote>"];
+    } else if([previousActiveStyles containsObject:@([CodeBlockStyle getStyleType])]) {
+      [result appendString:@"\n</codeblock>"];
     } else if(
       [previousActiveStyles containsObject:@([H1Style getStyleType])] ||
       [previousActiveStyles containsObject:@([H2Style getStyleType])] ||
@@ -258,6 +305,10 @@
       inBlockQuote = NO;
       [result appendString:@"\n</blockquote>"];
     }
+    if(inCodeBlock) {
+      inCodeBlock = NO;
+      [result appendString:@"\n</codeblock>"];
+    }
   }
   
   [result appendString: @"\n</html>"];
@@ -273,6 +324,19 @@
     return @"b";
   } else if([style isEqualToNumber: @([ItalicStyle getStyleType])]) {
     return @"i";
+  } else if ([style isEqualToNumber: @([ImageStyle getStyleType])]) {
+    if(openingTag) {
+      ImageStyle *imageStyle = (ImageStyle *)_input->stylesDict[@([ImageStyle getStyleType])];
+      if(imageStyle != nullptr) {
+        ImageData *data = [imageStyle getImageDataAt:location];
+        if(data != nullptr && data.uri != nullptr) {
+          return [NSString stringWithFormat:@"img src=\"%@\" width=\"%f\" height=\"%f\"", data.uri, data.width, data.height];
+        }
+      }
+      return @"img";
+    } else {
+      return @"";
+    }
   } else if([style isEqualToNumber: @([UnderlineStyle getStyleType])]) {
     return @"u";
   } else if([style isEqualToNumber: @([StrikethroughStyle getStyleType])]) {
@@ -328,8 +392,8 @@
     return @"h3";
   } else if([style isEqualToNumber:@([UnorderedListStyle getStyleType])] || [style isEqualToNumber:@([OrderedListStyle getStyleType])]) {
     return @"li";
-  } else if([style isEqualToNumber:@([BlockQuoteStyle getStyleType])]) {
-    // blockquotes use <p> tags the same way lists use <li>
+  } else if([style isEqualToNumber:@([BlockQuoteStyle getStyleType])] || [style isEqualToNumber:@([CodeBlockStyle getStyleType])]) {
+    // blockquotes and codeblock use <p> tags the same way lists use <li>
     return @"p";
   }
   return @"";
@@ -393,6 +457,9 @@
       } 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 withSelection:NO];
       } else {
         [baseStyle addAttributes:styleRange];
       }
@@ -447,6 +514,8 @@
     fixedHtml = [self stringByAddingNewlinesToTag:@"</ol>" inString:fixedHtml leading:YES trailing:YES];
     fixedHtml = [self stringByAddingNewlinesToTag:@"<blockquote>" inString:fixedHtml leading:YES trailing:YES];
     fixedHtml = [self stringByAddingNewlinesToTag:@"</blockquote>" inString:fixedHtml leading:YES trailing:YES];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"<codeblock>" inString:fixedHtml leading:YES trailing:YES];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"</codeblock>" inString:fixedHtml leading:YES trailing:YES];
     
     // line opening tags
     fixedHtml = [self stringByAddingNewlinesToTag:@"<p>" inString:fixedHtml leading:YES trailing:NO];
@@ -481,6 +550,24 @@
   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];
@@ -508,6 +595,14 @@
       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) {
@@ -520,31 +615,22 @@
         ongoingTags[currentTagName] = tagArr;
         
         // skip one newline after opening tags that are in separate lines intentionally
-        if([currentTagName isEqualToString:@"ul"] || [currentTagName isEqualToString:@"ol"] || [currentTagName isEqualToString:@"blockquote"]) {
+        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
         
         // skip one newline that was added before some closing tags that are in separate lines
-        if([currentTagName isEqualToString:@"ul"] || [currentTagName isEqualToString:@"ol"] || [currentTagName isEqualToString:@"blockquote"]) {
+        if([currentTagName isEqualToString:@"ul"] || [currentTagName isEqualToString:@"ol"] || [currentTagName isEqualToString:@"blockquote"] || [currentTagName isEqualToString:@"codeblock"]) {
           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;
@@ -603,6 +689,41 @@
       [styleArr addObject:@([BoldStyle getStyleType])];
     } else if([tagName isEqualToString:@"i"]) {
       [styleArr addObject:@([ItalicStyle getStyleType])];
+    } else if([tagName isEqualToString:@"img"]) {
+      NSRegularExpression *srcRegex = [NSRegularExpression regularExpressionWithPattern:@"src=\"([^\"]+)\""
+        options:0
+        error:nullptr
+      ];
+      NSTextCheckingResult* match = [srcRegex firstMatchInString:params options:0 range: NSMakeRange(0, params.length)];
+      
+      if(match == nullptr) {
+        continue;
+      }
+      
+      NSRange srcRange = match.range;
+      [styleArr addObject:@([ImageStyle getStyleType])];
+      // cut only the uri from the src="..." string
+      NSString *uri = [params substringWithRange:NSMakeRange(srcRange.location + 5, srcRange.length - 6)];
+      ImageData *imageData = [[ImageData alloc] init];
+      imageData.uri = uri;
+      
+      NSRegularExpression *widthRegex = [NSRegularExpression regularExpressionWithPattern:@"width=\"([0-9.]+)\"" options:0 error:nil];
+      NSTextCheckingResult *widthMatch = [widthRegex firstMatchInString:params options:0 range:NSMakeRange(0, params.length)];
+
+      if (widthMatch) {
+        NSString *widthString = [params substringWithRange:[widthMatch rangeAtIndex:1]];
+        imageData.width = [widthString floatValue];
+      }
+
+      NSRegularExpression *heightRegex = [NSRegularExpression regularExpressionWithPattern:@"height=\"([0-9.]+)\"" options:0 error:nil];
+      NSTextCheckingResult *heightMatch = [heightRegex firstMatchInString:params options:0 range:NSMakeRange(0, params.length)];
+
+      if (heightMatch) {
+        NSString *heightString = [params substringWithRange:[heightMatch rangeAtIndex:1]];
+        imageData.height = [heightString floatValue];
+      }
+      
+      stylePair.styleValue = imageData;
     } else if([tagName isEqualToString:@"u"]) {
       [styleArr addObject:@([UnderlineStyle getStyleType])];
     } else if([tagName isEqualToString:@"s"]) {
@@ -668,6 +789,8 @@
       [styleArr addObject:@([OrderedListStyle getStyleType])];
     } else if([tagName isEqualToString:@"blockquote"]) {
       [styleArr addObject:@([BlockQuoteStyle getStyleType])];
+    } else if([tagName isEqualToString:@"codeblock"]) {
+      [styleArr addObject:@([CodeBlockStyle getStyleType])];
     } else {
       // some other external tags like span just don't get put into the processed styles
       continue;

package/ios/internals/EnrichedTextInputViewShadowNode.h

@@ -35,6 +35,7 @@ class EnrichedTextInputViewShadowNode : public ConcreteViewShadowNode<
     
     private:
     int localForceHeightRecalculationCounter_;
+    id setupMockTextInputView_() const;
 };
 
 } // namespace facebook::react

package/ios/internals/EnrichedTextInputViewShadowNode.mm

@@ -17,6 +17,18 @@ EnrichedTextInputViewShadowNode::EnrichedTextInputViewShadowNode(
   localForceHeightRecalculationCounter_ = 0;
 }
 
+// mock input is used for the first measure calls that need to be done when the real input isn't defined yet
+id EnrichedTextInputViewShadowNode::setupMockTextInputView_() const {
+  // it's rendered far away from the viewport
+  const int veryFarAway = 20000;
+  const int mockSize = 1000;
+  EnrichedTextInputView *mockTextInputView_ = [[EnrichedTextInputView alloc] initWithFrame:(CGRectMake(veryFarAway, veryFarAway, mockSize, mockSize))];
+  const auto props = this->getProps();
+  mockTextInputView_->blockEmitting = YES;
+  [mockTextInputView_ updateProps:props oldProps:nullptr];
+  return mockTextInputView_;
+}
+
 EnrichedTextInputViewShadowNode::EnrichedTextInputViewShadowNode(
   const ShadowNode& sourceShadowNode,
   const ShadowNodeFragment& fragment
@@ -61,23 +73,23 @@ Size EnrichedTextInputViewShadowNode::measureContent(const LayoutContext& layout
       };
     }
   } else {
-    // on the very first call there is no componentView that we can query for the component height
-    // thus, a little heuristic: just put a height that is exactly height of letter "I" with default apple font and size from props
-    // in a lot of cases it will be the desired height
-    // in others, the jump on the second call will at least be smaller
-    const auto props = this->getProps();
-    const auto &typedProps = *std::static_pointer_cast<EnrichedTextInputViewProps const>(props);
-    NSAttributedString *attrStr = [[NSAttributedString alloc] initWithString:@"I" attributes:@{NSFontAttributeName: [UIFont systemFontOfSize:typedProps.fontSize]}];
-    CTFramesetterRef framesetter = CTFramesetterCreateWithAttributedString((CFAttributedStringRef)attrStr);
-    const CGSize &suggestedSize = CTFramesetterSuggestFrameSizeWithConstraints(
-      framesetter,
-      CFRangeMake(0, 1),
-      nullptr,
-      CGSizeMake(layoutConstraints.maximumSize.width, DBL_MAX),
-      nullptr
-    );
-    
-    return {suggestedSize.width, suggestedSize.height};
+    __block CGSize estimatedSize;
+      
+    // synchronously dispatch to main thread if needed
+    if([NSThread isMainThread]) {
+      EnrichedTextInputView *mockTextInputView = setupMockTextInputView_();
+      estimatedSize = [mockTextInputView measureSize:layoutConstraints.maximumSize.width];
+    } else {
+      dispatch_sync(dispatch_get_main_queue(), ^{
+        EnrichedTextInputView *mockTextInputView = setupMockTextInputView_();
+        estimatedSize = [mockTextInputView measureSize:layoutConstraints.maximumSize.width];
+      });
+    }
+
+    return {
+      estimatedSize.width,
+      MIN(estimatedSize.height, layoutConstraints.maximumSize.height)
+    };
   }
   
   return Size();

package/ios/styles/BlockQuoteStyle.mm

@@ -7,13 +7,17 @@
 
 @implementation BlockQuoteStyle {
   EnrichedTextInputView *_input;
+  NSArray *_stylesToExclude;
 }
 
 + (StyleType)getStyleType { return BlockQuote; }
 
++ (BOOL)isParagraphStyle { return YES; }
+
 - (instancetype)initWithInput:(id)input {
   self = [super init];
   _input = (EnrichedTextInputView *)input;
+  _stylesToExclude = @[ @(InlineCode), @(Mention), @(Link) ];
   return self;
 }
 
@@ -175,31 +179,6 @@
   ];
 }
 
-// gets ranges that aren't link, mention or inline code
-- (NSArray *)getProperColorRangesIn:(NSRange)range {
-  LinkStyle *linkStyle = _input->stylesDict[@([LinkStyle getStyleType])];
-  MentionStyle *mentionStyle = _input->stylesDict[@([MentionStyle getStyleType])];
-  InlineCodeStyle *codeStyle = _input->stylesDict[@([InlineCodeStyle getStyleType])];
-  
-  NSMutableArray *newRanges = [[NSMutableArray alloc] init];
-  int lastRangeLocation = range.location;
-  
-  for(int i = range.location; i < range.location + range.length; i++) {
-    NSRange currentRange = NSMakeRange(i, 1);
-    if([linkStyle detectStyle:currentRange] || [mentionStyle detectStyle:currentRange] || [codeStyle detectStyle:currentRange]) {
-      if(i - lastRangeLocation > 0) {
-        [newRanges addObject:[NSValue valueWithRange:NSMakeRange(lastRangeLocation, i - lastRangeLocation)]];
-      }
-      lastRangeLocation = i+1;
-    }
-  }
-  if(lastRangeLocation < range.location + range.length) {
-    [newRanges addObject:[NSValue valueWithRange:NSMakeRange(lastRangeLocation, range.location + range.length - lastRangeLocation)]];
-  }
-  
-  return newRanges;
-}
-
 // general checkup correcting blockquote color
 // since links, mentions and inline code affects coloring, the checkup gets done only outside of them
 - (void)manageBlockquoteColor {
@@ -212,7 +191,7 @@
   NSArray *paragraphs = [ParagraphsUtils getSeparateParagraphsRangesIn:_input->textView range:wholeRange];
   for(NSValue *pValue in paragraphs) {
     NSRange paragraphRange = [pValue rangeValue];
-    NSArray *properRanges = [self getProperColorRangesIn:paragraphRange];
+    NSArray *properRanges = [OccurenceUtils getRangesWithout:_stylesToExclude withInput:_input inRange:paragraphRange];
     
     for(NSValue *value in properRanges) {
       NSRange currRange = [value rangeValue];

package/ios/styles/BoldStyle.mm

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