react-native-enriched 0.2.1 → 0.3.0

package/ios/generated/RNEnrichedTextInputViewSpec/Props.h

@@ -135,6 +135,123 @@ static inline folly::dynamic toDynamic(const EnrichedTextInputViewHtmlStyleH3Str
 }
 #endif
 
+struct EnrichedTextInputViewHtmlStyleH4Struct {
+  Float fontSize{0.0};
+  bool bold{false};
+
+#ifdef RN_SERIALIZABLE_STATE
+  bool operator==(const EnrichedTextInputViewHtmlStyleH4Struct&) const = default;
+
+  folly::dynamic toDynamic() const {
+    folly::dynamic result = folly::dynamic::object();
+    result["fontSize"] = fontSize;
+    result["bold"] = bold;
+    return result;
+  }
+#endif
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, EnrichedTextInputViewHtmlStyleH4Struct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_fontSize = map.find("fontSize");
+  if (tmp_fontSize != map.end()) {
+    fromRawValue(context, tmp_fontSize->second, result.fontSize);
+  }
+  auto tmp_bold = map.find("bold");
+  if (tmp_bold != map.end()) {
+    fromRawValue(context, tmp_bold->second, result.bold);
+  }
+}
+
+static inline std::string toString(const EnrichedTextInputViewHtmlStyleH4Struct &value) {
+  return "[Object EnrichedTextInputViewHtmlStyleH4Struct]";
+}
+
+#ifdef RN_SERIALIZABLE_STATE
+static inline folly::dynamic toDynamic(const EnrichedTextInputViewHtmlStyleH4Struct &value) {
+  return value.toDynamic();
+}
+#endif
+
+struct EnrichedTextInputViewHtmlStyleH5Struct {
+  Float fontSize{0.0};
+  bool bold{false};
+
+#ifdef RN_SERIALIZABLE_STATE
+  bool operator==(const EnrichedTextInputViewHtmlStyleH5Struct&) const = default;
+
+  folly::dynamic toDynamic() const {
+    folly::dynamic result = folly::dynamic::object();
+    result["fontSize"] = fontSize;
+    result["bold"] = bold;
+    return result;
+  }
+#endif
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, EnrichedTextInputViewHtmlStyleH5Struct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_fontSize = map.find("fontSize");
+  if (tmp_fontSize != map.end()) {
+    fromRawValue(context, tmp_fontSize->second, result.fontSize);
+  }
+  auto tmp_bold = map.find("bold");
+  if (tmp_bold != map.end()) {
+    fromRawValue(context, tmp_bold->second, result.bold);
+  }
+}
+
+static inline std::string toString(const EnrichedTextInputViewHtmlStyleH5Struct &value) {
+  return "[Object EnrichedTextInputViewHtmlStyleH5Struct]";
+}
+
+#ifdef RN_SERIALIZABLE_STATE
+static inline folly::dynamic toDynamic(const EnrichedTextInputViewHtmlStyleH5Struct &value) {
+  return value.toDynamic();
+}
+#endif
+
+struct EnrichedTextInputViewHtmlStyleH6Struct {
+  Float fontSize{0.0};
+  bool bold{false};
+
+#ifdef RN_SERIALIZABLE_STATE
+  bool operator==(const EnrichedTextInputViewHtmlStyleH6Struct&) const = default;
+
+  folly::dynamic toDynamic() const {
+    folly::dynamic result = folly::dynamic::object();
+    result["fontSize"] = fontSize;
+    result["bold"] = bold;
+    return result;
+  }
+#endif
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, EnrichedTextInputViewHtmlStyleH6Struct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_fontSize = map.find("fontSize");
+  if (tmp_fontSize != map.end()) {
+    fromRawValue(context, tmp_fontSize->second, result.fontSize);
+  }
+  auto tmp_bold = map.find("bold");
+  if (tmp_bold != map.end()) {
+    fromRawValue(context, tmp_bold->second, result.bold);
+  }
+}
+
+static inline std::string toString(const EnrichedTextInputViewHtmlStyleH6Struct &value) {
+  return "[Object EnrichedTextInputViewHtmlStyleH6Struct]";
+}
+
+#ifdef RN_SERIALIZABLE_STATE
+static inline folly::dynamic toDynamic(const EnrichedTextInputViewHtmlStyleH6Struct &value) {
+  return value.toDynamic();
+}
+#endif
+
 struct EnrichedTextInputViewHtmlStyleBlockquoteStruct {
   SharedColor borderColor{};
   Float borderWidth{0.0};
@@ -415,6 +532,9 @@ struct EnrichedTextInputViewHtmlStyleStruct {
   EnrichedTextInputViewHtmlStyleH1Struct h1{};
   EnrichedTextInputViewHtmlStyleH2Struct h2{};
   EnrichedTextInputViewHtmlStyleH3Struct h3{};
+  EnrichedTextInputViewHtmlStyleH4Struct h4{};
+  EnrichedTextInputViewHtmlStyleH5Struct h5{};
+  EnrichedTextInputViewHtmlStyleH6Struct h6{};
   EnrichedTextInputViewHtmlStyleBlockquoteStruct blockquote{};
   EnrichedTextInputViewHtmlStyleCodeblockStruct codeblock{};
   EnrichedTextInputViewHtmlStyleCodeStruct code{};
@@ -431,6 +551,9 @@ struct EnrichedTextInputViewHtmlStyleStruct {
     result["h1"] = ::facebook::react::toDynamic(h1);
     result["h2"] = ::facebook::react::toDynamic(h2);
     result["h3"] = ::facebook::react::toDynamic(h3);
+    result["h4"] = ::facebook::react::toDynamic(h4);
+    result["h5"] = ::facebook::react::toDynamic(h5);
+    result["h6"] = ::facebook::react::toDynamic(h6);
     result["blockquote"] = ::facebook::react::toDynamic(blockquote);
     result["codeblock"] = ::facebook::react::toDynamic(codeblock);
     result["code"] = ::facebook::react::toDynamic(code);
@@ -458,6 +581,18 @@ static inline void fromRawValue(const PropsParserContext& context, const RawValu
   if (tmp_h3 != map.end()) {
     fromRawValue(context, tmp_h3->second, result.h3);
   }
+  auto tmp_h4 = map.find("h4");
+  if (tmp_h4 != map.end()) {
+    fromRawValue(context, tmp_h4->second, result.h4);
+  }
+  auto tmp_h5 = map.find("h5");
+  if (tmp_h5 != map.end()) {
+    fromRawValue(context, tmp_h5->second, result.h5);
+  }
+  auto tmp_h6 = map.find("h6");
+  if (tmp_h6 != map.end()) {
+    fromRawValue(context, tmp_h6->second, result.h6);
+  }
   auto tmp_blockquote = map.find("blockquote");
   if (tmp_blockquote != map.end()) {
     fromRawValue(context, tmp_blockquote->second, result.blockquote);
@@ -497,6 +632,63 @@ static inline folly::dynamic toDynamic(const EnrichedTextInputViewHtmlStyleStruc
   return value.toDynamic();
 }
 #endif
+
+struct EnrichedTextInputViewLinkRegexStruct {
+  std::string pattern{};
+  bool caseInsensitive{false};
+  bool dotAll{false};
+  bool isDisabled{false};
+  bool isDefault{false};
+
+#ifdef RN_SERIALIZABLE_STATE
+  bool operator==(const EnrichedTextInputViewLinkRegexStruct&) const = default;
+
+  folly::dynamic toDynamic() const {
+    folly::dynamic result = folly::dynamic::object();
+    result["pattern"] = pattern;
+    result["caseInsensitive"] = caseInsensitive;
+    result["dotAll"] = dotAll;
+    result["isDisabled"] = isDisabled;
+    result["isDefault"] = isDefault;
+    return result;
+  }
+#endif
+};
+
+static inline void fromRawValue(const PropsParserContext& context, const RawValue &value, EnrichedTextInputViewLinkRegexStruct &result) {
+  auto map = (std::unordered_map<std::string, RawValue>)value;
+
+  auto tmp_pattern = map.find("pattern");
+  if (tmp_pattern != map.end()) {
+    fromRawValue(context, tmp_pattern->second, result.pattern);
+  }
+  auto tmp_caseInsensitive = map.find("caseInsensitive");
+  if (tmp_caseInsensitive != map.end()) {
+    fromRawValue(context, tmp_caseInsensitive->second, result.caseInsensitive);
+  }
+  auto tmp_dotAll = map.find("dotAll");
+  if (tmp_dotAll != map.end()) {
+    fromRawValue(context, tmp_dotAll->second, result.dotAll);
+  }
+  auto tmp_isDisabled = map.find("isDisabled");
+  if (tmp_isDisabled != map.end()) {
+    fromRawValue(context, tmp_isDisabled->second, result.isDisabled);
+  }
+  auto tmp_isDefault = map.find("isDefault");
+  if (tmp_isDefault != map.end()) {
+    fromRawValue(context, tmp_isDefault->second, result.isDefault);
+  }
+}
+
+static inline std::string toString(const EnrichedTextInputViewLinkRegexStruct &value) {
+  return "[Object EnrichedTextInputViewLinkRegexStruct]";
+}
+
+#ifdef RN_SERIALIZABLE_STATE
+static inline folly::dynamic toDynamic(const EnrichedTextInputViewLinkRegexStruct &value) {
+  return value.toDynamic();
+}
+#endif
 class EnrichedTextInputViewProps final : public ViewProps {
  public:
   EnrichedTextInputViewProps() = default;
@@ -515,12 +707,14 @@ class EnrichedTextInputViewProps final : public ViewProps {
   std::string autoCapitalize{};
   EnrichedTextInputViewHtmlStyleStruct htmlStyle{};
   bool scrollEnabled{false};
+  EnrichedTextInputViewLinkRegexStruct linkRegex{};
   SharedColor color{};
   Float fontSize{0.0};
   std::string fontFamily{};
   std::string fontWeight{};
   std::string fontStyle{};
   bool isOnChangeHtmlSet{false};
+  bool isOnChangeTextSet{false};
   bool androidExperimentalSynchronousEvents{false};
 
   #ifdef RN_SERIALIZABLE_STATE

package/ios/generated/RNEnrichedTextInputViewSpec/RCTComponentViewHelpers.h

@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)focus;
 - (void)blur;
 - (void)setValue:(NSString *)text;
+- (void)setSelection:(NSInteger)start end:(NSInteger)end;
 - (void)toggleBold;
 - (void)toggleItalic;
 - (void)toggleUnderline;
@@ -25,6 +26,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)toggleH1;
 - (void)toggleH2;
 - (void)toggleH3;
+- (void)toggleH4;
+- (void)toggleH5;
+- (void)toggleH6;
 - (void)toggleCodeBlock;
 - (void)toggleBlockQuote;
 - (void)toggleOrderedList;
@@ -89,6 +93,34 @@ if ([commandName isEqualToString:@"setValue"]) {
   return;
 }
 
+if ([commandName isEqualToString:@"setSelection"]) {
+#if RCT_DEBUG
+  if ([args count] != 2) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 2);
+    return;
+  }
+#endif
+
+  NSObject *arg0 = args[0];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"number", @"EnrichedTextInputView", commandName, @"1st")) {
+    return;
+  }
+#endif
+  NSInteger start = [(NSNumber *)arg0 intValue];
+
+NSObject *arg1 = args[1];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg1, [NSNumber class], @"number", @"EnrichedTextInputView", commandName, @"2nd")) {
+    return;
+  }
+#endif
+  NSInteger end = [(NSNumber *)arg1 intValue];
+
+  [componentView setSelection:start end:end];
+  return;
+}
+
 if ([commandName isEqualToString:@"toggleBold"]) {
 #if RCT_DEBUG
   if ([args count] != 0) {
@@ -201,6 +233,48 @@ if ([commandName isEqualToString:@"toggleH3"]) {
   return;
 }
 
+if ([commandName isEqualToString:@"toggleH4"]) {
+#if RCT_DEBUG
+  if ([args count] != 0) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 0);
+    return;
+  }
+#endif
+
+  
+
+  [componentView toggleH4];
+  return;
+}
+
+if ([commandName isEqualToString:@"toggleH5"]) {
+#if RCT_DEBUG
+  if ([args count] != 0) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 0);
+    return;
+  }
+#endif
+
+  
+
+  [componentView toggleH5];
+  return;
+}
+
+if ([commandName isEqualToString:@"toggleH6"]) {
+#if RCT_DEBUG
+  if ([args count] != 0) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 0);
+    return;
+  }
+#endif
+
+  
+
+  [componentView toggleH6];
+  return;
+}
+
 if ([commandName isEqualToString:@"toggleCodeBlock"]) {
 #if RCT_DEBUG
   if ([args count] != 0) {

package/ios/inputParser/InputParser.mm

@@ -7,11 +7,13 @@
 
 @implementation InputParser {
   EnrichedTextInputView *_input;
+  NSInteger _precedingImageCount;
 }
 
 - (instancetype)initWithInput:(id)input {
   self = [super init];
   _input = (EnrichedTextInputView *)input;
+  _precedingImageCount = 0;
   return self;
 }
 
@@ -137,6 +139,9 @@
             [previousActiveStyles containsObject:@([H1Style getStyleType])] ||
             [previousActiveStyles containsObject:@([H2Style getStyleType])] ||
             [previousActiveStyles containsObject:@([H3Style getStyleType])] ||
+            [previousActiveStyles containsObject:@([H4Style getStyleType])] ||
+            [previousActiveStyles containsObject:@([H5Style getStyleType])] ||
+            [previousActiveStyles containsObject:@([H6Style getStyleType])] ||
             [previousActiveStyles
                 containsObject:@([BlockQuoteStyle getStyleType])] ||
             [previousActiveStyles
@@ -224,6 +229,9 @@
             [currentActiveStyles containsObject:@([H1Style getStyleType])] ||
             [currentActiveStyles containsObject:@([H2Style getStyleType])] ||
             [currentActiveStyles containsObject:@([H3Style getStyleType])] ||
+            [currentActiveStyles containsObject:@([H4Style getStyleType])] ||
+            [currentActiveStyles containsObject:@([H5Style getStyleType])] ||
+            [currentActiveStyles containsObject:@([H6Style getStyleType])] ||
             [currentActiveStyles
                 containsObject:@([BlockQuoteStyle getStyleType])] ||
             [currentActiveStyles
@@ -378,8 +386,14 @@
                [previousActiveStyles
                    containsObject:@([H2Style getStyleType])] ||
                [previousActiveStyles
-                   containsObject:@([H3Style getStyleType])]) {
-      // do nothing, heading closing tag has already ben appended
+                   containsObject:@([H3Style getStyleType])] ||
+               [previousActiveStyles
+                   containsObject:@([H4Style getStyleType])] ||
+               [previousActiveStyles
+                   containsObject:@([H5Style getStyleType])] ||
+               [previousActiveStyles
+                   containsObject:@([H6Style getStyleType])]) {
+      // do nothing, heading closing tag has already been appended
     } else {
       [result appendString:@"</p>"];
     }
@@ -405,6 +419,12 @@
 
   [result appendString:@"\n</html>"];
 
+  // remove Object Replacement Characters in the very end
+  [result replaceOccurrencesOfString:@"\uFFFC"
+                          withString:@""
+                             options:0
+                               range:NSMakeRange(0, result.length)];
+
   // remove zero width spaces in the very end
   [result replaceOccurrencesOfString:@"\u200B"
                           withString:@""
@@ -507,6 +527,12 @@
     return @"h2";
   } else if ([style isEqualToNumber:@([H3Style getStyleType])]) {
     return @"h3";
+  } else if ([style isEqualToNumber:@([H4Style getStyleType])]) {
+    return @"h4";
+  } else if ([style isEqualToNumber:@([H5Style getStyleType])]) {
+    return @"h5";
+  } else if ([style isEqualToNumber:@([H6Style getStyleType])]) {
+    return @"h6";
   } else if ([style isEqualToNumber:@([UnorderedListStyle getStyleType])] ||
              [style isEqualToNumber:@([OrderedListStyle getStyleType])]) {
     return @"li";
@@ -738,6 +764,18 @@
                                          inString:fixedHtml
                                           leading:YES
                                          trailing:NO];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"<h4>"
+                                         inString:fixedHtml
+                                          leading:YES
+                                         trailing:NO];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"<h5>"
+                                         inString:fixedHtml
+                                          leading:YES
+                                         trailing:NO];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"<h6>"
+                                         inString:fixedHtml
+                                          leading:YES
+                                         trailing:NO];
 
     // line closing tags
     fixedHtml = [self stringByAddingNewlinesToTag:@"</p>"
@@ -760,6 +798,18 @@
                                          inString:fixedHtml
                                           leading:NO
                                          trailing:YES];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"</h4>"
+                                         inString:fixedHtml
+                                          leading:NO
+                                         trailing:YES];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"</h5>"
+                                         inString:fixedHtml
+                                          leading:NO
+                                         trailing:YES];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"</h6>"
+                                         inString:fixedHtml
+                                          leading:NO
+                                         trailing:YES];
 
     // this is more like a hack but for some reason the last <br> in
     // <blockquote> and <codeblock> are not properly changed into zero width
@@ -788,11 +838,11 @@
  * APPROACH:
  * This function treats the HTML as having two distinct states:
  * 1. Structure Mode (Depth == 0): We are inside or between container tags (like
- * <blockquote>, <ul>, <codeblock>). In this mode whitespace and newlines are
+ * blockquote, ul, codeblock). In this mode whitespace and newlines are
  * considered layout artifacts and are REMOVED to prevent the parser from
  * creating unwanted spaces.
- * 2. Content Mode (Depth > 0): We are inside a text-containing tag (like <p>,
- * <b>, <li>). In this mode, all whitespace is PRESERVED exactly as is, ensuring
+ * 2. Content Mode (Depth > 0): We are inside a text-containing tag (like p,
+ * b, li). In this mode, all whitespace is PRESERVED exactly as is, ensuring
  * that sentences and inline formatting remain readable.
  *
  * The function iterates character-by-character, using a depth counter to track
@@ -800,13 +850,13 @@
  *
  * IMPORTANT:
  * The `textTags` set acts as a whitelist for "Content Mode". If you add support
- * for a new HTML tag that contains visible text (e.g., <h4>, <h5>, <h6>),
+ * for a new HTML tag that contains visible text (e.g., h4, h5, h6),
  * you MUST add it to the `textTags` set below.
  */
 - (NSString *)stripExtraWhiteSpacesAndNewlines:(NSString *)html {
-  NSSet *textTags =
-      [NSSet setWithObjects:@"p", @"h1", @"h2", @"h3", @"li", @"b", @"a", @"s",
-                            @"mention", @"code", @"u", @"i", nil];
+  NSSet *textTags = [NSSet setWithObjects:@"p", @"h1", @"h2", @"h3", @"h4",
+                                          @"h5", @"h6", @"li", @"b", @"a", @"s",
+                                          @"mention", @"code", @"u", @"i", nil];
 
   NSMutableString *output = [NSMutableString stringWithCapacity:html.length];
   NSMutableString *currentTagBuffer = [NSMutableString string];
@@ -901,7 +951,19 @@
 
   NSArray *tagData = ongoingTags[tagName];
   NSInteger tagLocation = [((NSNumber *)tagData[0]) intValue];
-  NSRange tagRange = NSMakeRange(tagLocation, plainText.length - tagLocation);
+
+  // 'tagLocation' is an index based on 'plainText' which currently only holds
+  // raw text.
+  //
+  // Since 'plainText' does not yet contain the special placeholders for images,
+  // the indices for any text following an image are lower than they will be
+  // in the final NSTextStorage.
+  //
+  // We add '_precedingImageCount' to shift the start index forward, aligning
+  // this style's range with the actual position in the final text (where each
+  // image adds 1 character).
+  NSRange tagRange = NSMakeRange(tagLocation + _precedingImageCount,
+                                 plainText.length - tagLocation);
 
   [tagEntry addObject:[tagName copy]];
   [tagEntry addObject:[NSValue valueWithRange:tagRange]];
@@ -911,12 +973,17 @@
 
   [processedTags addObject:tagEntry];
   [ongoingTags removeObjectForKey:tagName];
+
+  if ([tagName isEqualToString:@"img"]) {
+    _precedingImageCount++;
+  }
 }
 
 - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
   NSMutableString *plainText = [[NSMutableString alloc] initWithString:@""];
   NSMutableDictionary *ongoingTags = [[NSMutableDictionary alloc] init];
   NSMutableArray *initiallyProcessedTags = [[NSMutableArray alloc] init];
+  _precedingImageCount = 0;
   BOOL insideTag = NO;
   BOOL gettingTagName = NO;
   BOOL gettingTagParams = NO;
@@ -1192,6 +1259,12 @@
         [styleArr addObject:@([H2Style getStyleType])];
       } else if ([tagName isEqualToString:@"h3"]) {
         [styleArr addObject:@([H3Style getStyleType])];
+      } else if ([tagName isEqualToString:@"h4"]) {
+        [styleArr addObject:@([H4Style getStyleType])];
+      } else if ([tagName isEqualToString:@"h5"]) {
+        [styleArr addObject:@([H5Style getStyleType])];
+      } else if ([tagName isEqualToString:@"h6"]) {
+        [styleArr addObject:@([H6Style getStyleType])];
       }
     } else if ([tagName isEqualToString:@"ul"]) {
       [styleArr addObject:@([UnorderedListStyle getStyleType])];

package/ios/{attachments → interfaces}/ImageAttachment.mm

@@ -16,8 +16,10 @@
 
 - (void)loadAsync {
   NSURL *url = [NSURL URLWithString:self.uri];
-  if (!url)
+  if (!url) {
+    self.image = [UIImage systemImageNamed:@"file"];
     return;
+  }
 
   dispatch_async(dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0), ^{
     NSData *bytes = [NSData dataWithContentsOfURL:url];

package/ios/interfaces/LinkRegexConfig.h

@@ -0,0 +1,19 @@
+#pragma once
+#import <ReactNativeEnriched/Props.h>
+#import <UIKit/UIKit.h>
+
+using namespace facebook::react;
+
+@interface LinkRegexConfig : NSObject
+
+@property NSString *pattern;
+@property BOOL caseInsensitive;
+@property BOOL dotAll;
+@property BOOL isDisabled;
+@property BOOL isDefault;
+
+- (instancetype)initWithLinkRegexProp:
+    (EnrichedTextInputViewLinkRegexStruct)prop;
+- (BOOL)isEqualToConfig:(LinkRegexConfig *)otherObj;
+
+@end

package/ios/interfaces/LinkRegexConfig.mm

@@ -0,0 +1,37 @@
+#import "LinkRegexConfig.h"
+#import "StringExtension.h"
+
+@implementation LinkRegexConfig
+
+- (instancetype)initWithLinkRegexProp:
+    (EnrichedTextInputViewLinkRegexStruct)prop {
+  if (!self)
+    return nil;
+
+  _pattern = [NSString fromCppString:prop.pattern];
+  _caseInsensitive = prop.caseInsensitive;
+  _dotAll = prop.dotAll;
+  _isDefault = prop.isDefault;
+  _isDisabled = prop.isDisabled;
+
+  return self;
+}
+
+- (id)copyWithZone:(NSZone *)zone {
+  LinkRegexConfig *copy = [[[self class] allocWithZone:zone] init];
+  copy->_pattern = [_pattern copy];
+  copy->_caseInsensitive = _caseInsensitive;
+  copy->_dotAll = _dotAll;
+  copy->_isDefault = _isDefault;
+  copy->_isDisabled = _isDisabled;
+  return copy;
+}
+
+- (BOOL)isEqualToConfig:(LinkRegexConfig *)otherObj {
+  return [_pattern isEqualToString:otherObj.pattern] &&
+         _caseInsensitive == otherObj.caseInsensitive &&
+         _dotAll == otherObj.dotAll && _isDefault == otherObj.isDefault &&
+         _isDisabled == otherObj.isDisabled;
+}
+
+@end

package/ios/{utils → interfaces}/MentionStyleProps.mm

@@ -10,7 +10,7 @@
 
   if (folly["color"].isNumber()) {
     facebook::react::SharedColor color = facebook::react::SharedColor(
-        facebook::react::Color(folly["color"].asInt()));
+        facebook::react::Color(int32_t(folly["color"].asInt())));
     nativeProps.color = RCTUIColorFromSharedColor(color);
   } else {
     nativeProps.color = [UIColor blueColor];
@@ -18,7 +18,7 @@
 
   if (folly["backgroundColor"].isNumber()) {
     facebook::react::SharedColor bgColor = facebook::react::SharedColor(
-        facebook::react::Color(folly["backgroundColor"].asInt()));
+        facebook::react::Color(int32_t(folly["backgroundColor"].asInt())));
     nativeProps.backgroundColor = RCTUIColorFromSharedColor(bgColor);
   } else {
     nativeProps.backgroundColor = [UIColor yellowColor];

package/ios/{utils → interfaces}/StyleHeaders.h

@@ -58,6 +58,7 @@
 - (BOOL)isHeadingBold;
 - (BOOL)handleNewlinesInRange:(NSRange)range replacementText:(NSString *)text;
 - (void)handleImproperHeadings;
+@property(nonatomic, assign) CGFloat lastAppliedFontSize;
 @end
 
 @interface H1Style : HeadingStyleBase
@@ -69,6 +70,15 @@
 @interface H3Style : HeadingStyleBase
 @end
 
+@interface H4Style : HeadingStyleBase
+@end
+
+@interface H5Style : HeadingStyleBase
+@end
+
+@interface H6Style : HeadingStyleBase
+@end
+
 @interface UnorderedListStyle : NSObject <BaseStyleProtocol>
 - (BOOL)handleBackspaceInRange:(NSRange)range replacementText:(NSString *)text;
 - (BOOL)tryHandlingListShorcutInRange:(NSRange)range

package/ios/{utils → interfaces}/StyleTypeEnum.h

@@ -10,6 +10,9 @@ typedef NS_ENUM(NSInteger, StyleType) {
   H1,
   H2,
   H3,
+  H4,
+  H5,
+  H6,
   Link,
   Mention,
   Image,