react-native-enriched 0.2.1 → 0.3.0

package/ios/EnrichedTextInputView.mm

@@ -16,6 +16,13 @@
 #import <folly/dynamic.h>
 #import <react/utils/ManagedObjectWrapper.h>
 
+#define GET_STYLE_STATE(TYPE_ENUM)                                             \
+  {                                                                            \
+    .isActive = [self isStyleActive:TYPE_ENUM],                                \
+    .isBlocking = [self isStyle:TYPE_ENUM activeInMap:blockingStyles],         \
+    .isConflicting = [self isStyle:TYPE_ENUM activeInMap:conflictingStyles]    \
+  }
+
 using namespace facebook::react;
 
 @interface EnrichedTextInputView () <RCTEnrichedTextInputViewViewProtocol,
@@ -27,6 +34,7 @@ using namespace facebook::react;
   EnrichedTextInputViewShadowNode::ConcreteState::Shared _state;
   int _componentViewHeightUpdateCounter;
   NSMutableSet<NSNumber *> *_activeStyles;
+  NSMutableSet<NSNumber *> *_blockedStyles;
   LinkData *_recentlyActiveLinkData;
   NSRange _recentlyActiveLinkRange;
   NSString *_recentInputString;
@@ -37,6 +45,7 @@ using namespace facebook::react;
   UILabel *_placeholderLabel;
   UIColor *_placeholderColor;
   BOOL _emitFocusBlur;
+  BOOL _emitTextChange;
 }
 
 // MARK: - Component utils
@@ -72,6 +81,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
 - (void)setDefaults {
   _componentViewHeightUpdateCounter = 0;
   _activeStyles = [[NSMutableSet alloc] init];
+  _blockedStyles = [[NSMutableSet alloc] init];
   _recentlyActiveLinkRange = NSMakeRange(0, 0);
   _recentlyActiveMentionRange = NSMakeRange(0, 0);
   recentlyChangedRange = NSMakeRange(0, 0);
@@ -80,6 +90,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   _emitHtml = NO;
   blockEmitting = NO;
   _emitFocusBlur = YES;
+  _emitTextChange = NO;
 
   defaultTypingAttributes =
       [[NSMutableDictionary<NSAttributedStringKey, id> alloc] init];
@@ -98,6 +109,9 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     @([H1Style getStyleType]) : [[H1Style alloc] initWithInput:self],
     @([H2Style getStyleType]) : [[H2Style alloc] initWithInput:self],
     @([H3Style getStyleType]) : [[H3Style alloc] initWithInput:self],
+    @([H4Style getStyleType]) : [[H4Style alloc] initWithInput:self],
+    @([H5Style getStyleType]) : [[H5Style alloc] initWithInput:self],
+    @([H6Style getStyleType]) : [[H6Style alloc] initWithInput:self],
     @([UnorderedListStyle getStyleType]) :
         [[UnorderedListStyle alloc] initWithInput:self],
     @([OrderedListStyle getStyleType]) :
@@ -124,39 +138,73 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
         @[ @([InlineCodeStyle getStyleType]), @([LinkStyle getStyleType]) ],
     @([H1Style getStyleType]) : @[
       @([H2Style getStyleType]), @([H3Style getStyleType]),
-      @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]),
-      @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])
+      @([H4Style getStyleType]), @([H5Style getStyleType]),
+      @([H6Style getStyleType]), @([UnorderedListStyle getStyleType]),
+      @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
+      @([CodeBlockStyle getStyleType])
     ],
     @([H2Style getStyleType]) : @[
       @([H1Style getStyleType]), @([H3Style getStyleType]),
-      @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]),
-      @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])
+      @([H4Style getStyleType]), @([H5Style getStyleType]),
+      @([H6Style getStyleType]), @([UnorderedListStyle getStyleType]),
+      @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
+      @([CodeBlockStyle getStyleType])
     ],
     @([H3Style getStyleType]) : @[
       @([H1Style getStyleType]), @([H2Style getStyleType]),
-      @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]),
-      @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])
+      @([H4Style getStyleType]), @([H5Style getStyleType]),
+      @([H6Style getStyleType]), @([UnorderedListStyle getStyleType]),
+      @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
+      @([CodeBlockStyle getStyleType])
+    ],
+    @([H4Style getStyleType]) : @[
+      @([H1Style getStyleType]), @([H2Style getStyleType]),
+      @([H3Style getStyleType]), @([H5Style getStyleType]),
+      @([H6Style getStyleType]), @([UnorderedListStyle getStyleType]),
+      @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
+      @([CodeBlockStyle getStyleType])
+    ],
+    @([H5Style getStyleType]) : @[
+      @([H1Style getStyleType]), @([H2Style getStyleType]),
+      @([H3Style getStyleType]), @([H4Style getStyleType]),
+      @([H6Style getStyleType]), @([UnorderedListStyle getStyleType]),
+      @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
+      @([CodeBlockStyle getStyleType])
+    ],
+    @([H6Style getStyleType]) : @[
+      @([H1Style getStyleType]), @([H2Style getStyleType]),
+      @([H3Style getStyleType]), @([H4Style getStyleType]),
+      @([H5Style getStyleType]), @([UnorderedListStyle getStyleType]),
+      @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
+      @([CodeBlockStyle getStyleType])
     ],
     @([UnorderedListStyle getStyleType]) : @[
       @([H1Style getStyleType]), @([H2Style getStyleType]),
-      @([H3Style getStyleType]), @([OrderedListStyle getStyleType]),
-      @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])
+      @([H3Style getStyleType]), @([H4Style getStyleType]),
+      @([H5Style getStyleType]), @([H6Style getStyleType]),
+      @([OrderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
+      @([CodeBlockStyle getStyleType])
     ],
     @([OrderedListStyle getStyleType]) : @[
       @([H1Style getStyleType]), @([H2Style getStyleType]),
-      @([H3Style getStyleType]), @([UnorderedListStyle getStyleType]),
-      @([BlockQuoteStyle getStyleType]), @([CodeBlockStyle getStyleType])
+      @([H3Style getStyleType]), @([H4Style getStyleType]),
+      @([H5Style getStyleType]), @([H6Style getStyleType]),
+      @([UnorderedListStyle getStyleType]), @([BlockQuoteStyle getStyleType]),
+      @([CodeBlockStyle getStyleType])
     ],
     @([BlockQuoteStyle getStyleType]) : @[
       @([H1Style getStyleType]), @([H2Style getStyleType]),
-      @([H3Style getStyleType]), @([UnorderedListStyle getStyleType]),
-      @([OrderedListStyle getStyleType]), @([CodeBlockStyle getStyleType])
+      @([H3Style getStyleType]), @([H4Style getStyleType]),
+      @([H5Style getStyleType]), @([H6Style getStyleType]),
+      @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]),
+      @([CodeBlockStyle getStyleType])
     ],
     @([CodeBlockStyle getStyleType]) : @[
       @([H1Style getStyleType]), @([H2Style getStyleType]),
-      @([H3Style getStyleType]), @([BoldStyle getStyleType]),
-      @([ItalicStyle getStyleType]), @([UnderlineStyle getStyleType]),
-      @([StrikethroughStyle getStyleType]),
+      @([H3Style getStyleType]), @([H4Style getStyleType]),
+      @([H5Style getStyleType]), @([H6Style getStyleType]),
+      @([BoldStyle getStyleType]), @([ItalicStyle getStyleType]),
+      @([UnderlineStyle getStyleType]), @([StrikethroughStyle getStyleType]),
       @([UnorderedListStyle getStyleType]), @([OrderedListStyle getStyleType]),
       @([BlockQuoteStyle getStyleType]), @([InlineCodeStyle getStyleType]),
       @([MentionStyle getStyleType]), @([LinkStyle getStyleType])
@@ -165,7 +213,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
         @[ @([LinkStyle getStyleType]), @([MentionStyle getStyleType]) ]
   };
 
-  blockingStyles = @{
+  blockingStyles = [@{
     @([BoldStyle getStyleType]) : @[ @([CodeBlockStyle getStyleType]) ],
     @([ItalicStyle getStyleType]) : @[ @([CodeBlockStyle getStyleType]) ],
     @([UnderlineStyle getStyleType]) : @[ @([CodeBlockStyle getStyleType]) ],
@@ -180,12 +228,15 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     @([H1Style getStyleType]) : @[],
     @([H2Style getStyleType]) : @[],
     @([H3Style getStyleType]) : @[],
+    @([H4Style getStyleType]) : @[],
+    @([H5Style getStyleType]) : @[],
+    @([H6Style getStyleType]) : @[],
     @([UnorderedListStyle getStyleType]) : @[],
     @([OrderedListStyle getStyleType]) : @[],
     @([BlockQuoteStyle getStyleType]) : @[],
     @([CodeBlockStyle getStyleType]) : @[],
     @([ImageStyle getStyleType]) : @[ @([InlineCodeStyle getStyleType]) ]
-  };
+  } mutableCopy];
 
   parser = [[InputParser alloc] initWithInput:self];
 }
@@ -198,6 +249,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   textView.delegate = self;
   textView.input = self;
   textView.layoutManager.input = self;
+  textView.adjustsFontForContentSizeCategory = YES;
 }
 
 - (void)setupPlaceholderLabel {
@@ -216,6 +268,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   _placeholderLabel.lineBreakMode = NSLineBreakByTruncatingTail;
   _placeholderLabel.text = @"";
   _placeholderLabel.hidden = YES;
+  _placeholderLabel.adjustsFontForContentSizeCategory = YES;
 }
 
 // MARK: - Props
@@ -292,6 +345,11 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
 
   if (newViewProps.htmlStyle.h1.bold != oldViewProps.htmlStyle.h1.bold) {
     [newConfig setH1Bold:newViewProps.htmlStyle.h1.bold];
+
+    // Update style blocks for bold
+    newViewProps.htmlStyle.h1.bold ? [self addStyleBlock:H1 to:Bold]
+                                   : [self removeStyleBlock:H1 from:Bold];
+
     stylePropChanged = YES;
   }
 
@@ -303,6 +361,11 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
 
   if (newViewProps.htmlStyle.h2.bold != oldViewProps.htmlStyle.h2.bold) {
     [newConfig setH2Bold:newViewProps.htmlStyle.h2.bold];
+
+    // Update style blocks for bold
+    newViewProps.htmlStyle.h2.bold ? [self addStyleBlock:H2 to:Bold]
+                                   : [self removeStyleBlock:H2 from:Bold];
+
     stylePropChanged = YES;
   }
 
@@ -314,6 +377,59 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
 
   if (newViewProps.htmlStyle.h3.bold != oldViewProps.htmlStyle.h3.bold) {
     [newConfig setH3Bold:newViewProps.htmlStyle.h3.bold];
+
+    // Update style blocks for bold
+    newViewProps.htmlStyle.h3.bold ? [self addStyleBlock:H3 to:Bold]
+                                   : [self removeStyleBlock:H3 from:Bold];
+
+    stylePropChanged = YES;
+  }
+
+  if (newViewProps.htmlStyle.h4.fontSize !=
+      oldViewProps.htmlStyle.h4.fontSize) {
+    [newConfig setH4FontSize:newViewProps.htmlStyle.h4.fontSize];
+    stylePropChanged = YES;
+  }
+
+  if (newViewProps.htmlStyle.h4.bold != oldViewProps.htmlStyle.h4.bold) {
+    [newConfig setH4Bold:newViewProps.htmlStyle.h4.bold];
+
+    // Update style blocks for bold
+    newViewProps.htmlStyle.h4.bold ? [self addStyleBlock:H4 to:Bold]
+                                   : [self removeStyleBlock:H4 from:Bold];
+
+    stylePropChanged = YES;
+  }
+
+  if (newViewProps.htmlStyle.h5.fontSize !=
+      oldViewProps.htmlStyle.h5.fontSize) {
+    [newConfig setH5FontSize:newViewProps.htmlStyle.h5.fontSize];
+    stylePropChanged = YES;
+  }
+
+  if (newViewProps.htmlStyle.h5.bold != oldViewProps.htmlStyle.h5.bold) {
+    [newConfig setH5Bold:newViewProps.htmlStyle.h5.bold];
+
+    // Update style blocks for bold
+    newViewProps.htmlStyle.h5.bold ? [self addStyleBlock:H5 to:Bold]
+                                   : [self removeStyleBlock:H5 from:Bold];
+
+    stylePropChanged = YES;
+  }
+
+  if (newViewProps.htmlStyle.h6.fontSize !=
+      oldViewProps.htmlStyle.h6.fontSize) {
+    [newConfig setH6FontSize:newViewProps.htmlStyle.h6.fontSize];
+    stylePropChanged = YES;
+  }
+
+  if (newViewProps.htmlStyle.h6.bold != oldViewProps.htmlStyle.h6.bold) {
+    [newConfig setH6Bold:newViewProps.htmlStyle.h6.bold];
+
+    // Update style blocks for bold
+    newViewProps.htmlStyle.h6.bold ? [self addStyleBlock:H6 to:Bold]
+                                   : [self removeStyleBlock:H6 from:Bold];
+
     stylePropChanged = YES;
   }
 
@@ -539,6 +655,8 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     NSString *currentHtml = [parser
         parseToHtmlFromRange:NSMakeRange(0,
                                          textView.textStorage.string.length)];
+    // we want to preserve the selection between props changes
+    NSRange prevSelectedRange = textView.selectedRange;
 
     // now set the new config
     config = newConfig;
@@ -566,6 +684,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     defaultTypingAttributes[NSParagraphStyleAttributeName] =
         [[NSParagraphStyle alloc] init];
     textView.typingAttributes = defaultTypingAttributes;
+    textView.selectedRange = prevSelectedRange;
 
     // update the placeholder as well
     [self refreshPlaceholderLabelStyles];
@@ -591,6 +710,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
       // we've got some seemingly proper html
       [parser replaceWholeFromHtml:initiallyProcessedHtml];
     }
+    textView.selectedRange = NSRange(textView.textStorage.string.length, 0);
   }
 
   // placeholderTextColor
@@ -631,6 +751,15 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     [config setMentionIndicators:newIndicators];
   }
 
+  // linkRegex
+  LinkRegexConfig *oldRegexConfig =
+      [[LinkRegexConfig alloc] initWithLinkRegexProp:oldViewProps.linkRegex];
+  LinkRegexConfig *newRegexConfig =
+      [[LinkRegexConfig alloc] initWithLinkRegexProp:newViewProps.linkRegex];
+  if (![newRegexConfig isEqualToConfig:oldRegexConfig]) {
+    [config setLinkRegexConfig:newRegexConfig];
+  }
+
   // selection color sets both selection and cursor on iOS (just as in RN)
   if (newViewProps.selectionColor != oldViewProps.selectionColor) {
     if (isColorMeaningful(newViewProps.selectionColor)) {
@@ -668,6 +797,9 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   // isOnChangeHtmlSet
   _emitHtml = newViewProps.isOnChangeHtmlSet;
 
+  // isOnChangeTextSet
+  _emitTextChange = newViewProps.isOnChangeTextSet;
+
   [super updateProps:props oldProps:oldProps];
   // run the changes callback
   [self anyTextMayHaveBeenModified];
@@ -782,6 +914,11 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   // emitted
   NSMutableSet *newActiveStyles = [_activeStyles mutableCopy];
 
+  // currently blocked styles are subject to change (e.g. bold being blocked by
+  // headings might change in reaction to prop change) so they also are kept
+  // separately
+  NSMutableSet *newBlockedStyles = [_blockedStyles mutableCopy];
+
   // data for onLinkDetected event
   LinkData *detectedLinkData;
   NSRange detectedLinkRange = NSMakeRange(0, 0);
@@ -792,8 +929,14 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
 
   for (NSNumber *type in stylesDict) {
     id<BaseStyleProtocol> style = stylesDict[type];
+
     BOOL wasActive = [newActiveStyles containsObject:type];
     BOOL isActive = [style detectStyle:textView.selectedRange];
+
+    BOOL wasBlocked = [newBlockedStyles containsObject:type];
+    BOOL isBlocked = [self isStyle:(StyleType)[type integerValue]
+                       activeInMap:blockingStyles];
+
     if (wasActive != isActive) {
       updateNeeded = YES;
       if (isActive) {
@@ -803,6 +946,16 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
       }
     }
 
+    // blocked state change for a style also needs an update
+    if (wasBlocked != isBlocked) {
+      updateNeeded = YES;
+      if (isBlocked) {
+        [newBlockedStyles addObject:type];
+      } else {
+        [newBlockedStyles removeObject:type];
+      }
+    }
+
     // onLinkDetected event
     if (isActive && [type intValue] == [LinkStyle getStyleType]) {
       // get the link data
@@ -867,35 +1020,51 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   if (updateNeeded) {
     auto emitter = [self getEventEmitter];
     if (emitter != nullptr) {
-      // update activeStyles only if emitter is available
+      // update activeStyles and blockedStyles only if emitter is available
       _activeStyles = newActiveStyles;
-
-      emitter->onChangeState({
-        .isBold = [_activeStyles containsObject:@([BoldStyle getStyleType])],
-        .isItalic =
-            [_activeStyles containsObject:@([ItalicStyle getStyleType])],
-        .isUnderline =
-            [_activeStyles containsObject:@([UnderlineStyle getStyleType])],
-        .isStrikeThrough =
-            [_activeStyles containsObject:@([StrikethroughStyle getStyleType])],
-        .isInlineCode =
-            [_activeStyles containsObject:@([InlineCodeStyle getStyleType])],
-        .isLink = [_activeStyles containsObject:@([LinkStyle getStyleType])],
-        .isMention =
-            [_activeStyles containsObject:@([MentionStyle getStyleType])],
-        .isH1 = [_activeStyles containsObject:@([H1Style getStyleType])],
-        .isH2 = [_activeStyles containsObject:@([H2Style getStyleType])],
-        .isH3 = [_activeStyles containsObject:@([H3Style getStyleType])],
-        .isUnorderedList =
-            [_activeStyles containsObject:@([UnorderedListStyle getStyleType])],
-        .isOrderedList =
-            [_activeStyles containsObject:@([OrderedListStyle getStyleType])],
-        .isBlockQuote =
-            [_activeStyles containsObject:@([BlockQuoteStyle getStyleType])],
-        .isCodeBlock =
-            [_activeStyles containsObject:@([CodeBlockStyle getStyleType])],
-        .isImage = [_activeStyles containsObject:@([ImageStyle getStyleType])],
+      _blockedStyles = newBlockedStyles;
+
+      emitter->onChangeStateDeprecated({
+          .isBold = [self isStyleActive:[BoldStyle getStyleType]],
+          .isItalic = [self isStyleActive:[ItalicStyle getStyleType]],
+          .isUnderline = [self isStyleActive:[UnderlineStyle getStyleType]],
+          .isStrikeThrough =
+              [self isStyleActive:[StrikethroughStyle getStyleType]],
+          .isInlineCode = [self isStyleActive:[InlineCodeStyle getStyleType]],
+          .isLink = [self isStyleActive:[LinkStyle getStyleType]],
+          .isMention = [self isStyleActive:[MentionStyle getStyleType]],
+          .isH1 = [self isStyleActive:[H1Style getStyleType]],
+          .isH2 = [self isStyleActive:[H2Style getStyleType]],
+          .isH3 = [self isStyleActive:[H3Style getStyleType]],
+          .isH4 = [self isStyleActive:[H4Style getStyleType]],
+          .isH5 = [self isStyleActive:[H5Style getStyleType]],
+          .isH6 = [self isStyleActive:[H6Style getStyleType]],
+          .isUnorderedList =
+              [self isStyleActive:[UnorderedListStyle getStyleType]],
+          .isOrderedList = [self isStyleActive:[OrderedListStyle getStyleType]],
+          .isBlockQuote = [self isStyleActive:[BlockQuoteStyle getStyleType]],
+          .isCodeBlock = [self isStyleActive:[CodeBlockStyle getStyleType]],
+          .isImage = [self isStyleActive:[ImageStyle getStyleType]],
       });
+      emitter->onChangeState(
+          {.bold = GET_STYLE_STATE([BoldStyle getStyleType]),
+           .italic = GET_STYLE_STATE([ItalicStyle getStyleType]),
+           .underline = GET_STYLE_STATE([UnderlineStyle getStyleType]),
+           .strikeThrough = GET_STYLE_STATE([StrikethroughStyle getStyleType]),
+           .inlineCode = GET_STYLE_STATE([InlineCodeStyle getStyleType]),
+           .link = GET_STYLE_STATE([LinkStyle getStyleType]),
+           .mention = GET_STYLE_STATE([MentionStyle getStyleType]),
+           .h1 = GET_STYLE_STATE([H1Style getStyleType]),
+           .h2 = GET_STYLE_STATE([H2Style getStyleType]),
+           .h3 = GET_STYLE_STATE([H3Style getStyleType]),
+           .h4 = GET_STYLE_STATE([H4Style getStyleType]),
+           .h5 = GET_STYLE_STATE([H5Style getStyleType]),
+           .h6 = GET_STYLE_STATE([H6Style getStyleType]),
+           .unorderedList = GET_STYLE_STATE([UnorderedListStyle getStyleType]),
+           .orderedList = GET_STYLE_STATE([OrderedListStyle getStyleType]),
+           .blockQuote = GET_STYLE_STATE([BlockQuoteStyle getStyleType]),
+           .codeBlock = GET_STYLE_STATE([CodeBlockStyle getStyleType]),
+           .image = GET_STYLE_STATE([ImageStyle getStyleType])});
     }
   }
 
@@ -920,6 +1089,42 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   [self tryEmittingOnChangeHtmlEvent];
 }
 
+- (bool)isStyleActive:(StyleType)type {
+  return [_activeStyles containsObject:@(type)];
+}
+
+- (bool)isStyle:(StyleType)type activeInMap:(NSDictionary *)styleMap {
+  NSArray *relatedStyles = styleMap[@(type)];
+
+  if (!relatedStyles) {
+    return false;
+  }
+
+  for (NSNumber *style in relatedStyles) {
+    if ([_activeStyles containsObject:style]) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+- (void)addStyleBlock:(StyleType)blocking to:(StyleType)blocked {
+  NSMutableArray *blocksArr = [blockingStyles[@(blocked)] mutableCopy];
+  if (![blocksArr containsObject:@(blocking)]) {
+    [blocksArr addObject:@(blocking)];
+    blockingStyles[@(blocked)] = blocksArr;
+  }
+}
+
+- (void)removeStyleBlock:(StyleType)blocking from:(StyleType)blocked {
+  NSMutableArray *blocksArr = [blockingStyles[@(blocked)] mutableCopy];
+  if ([blocksArr containsObject:@(blocking)]) {
+    [blocksArr removeObject:@(blocking)];
+    blockingStyles[@(blocked)] = blocksArr;
+  }
+}
+
 // MARK: - Native commands and events
 
 - (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args {
@@ -960,6 +1165,12 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     [self toggleParagraphStyle:[H2Style getStyleType]];
   } else if ([commandName isEqualToString:@"toggleH3"]) {
     [self toggleParagraphStyle:[H3Style getStyleType]];
+  } else if ([commandName isEqualToString:@"toggleH4"]) {
+    [self toggleParagraphStyle:[H4Style getStyleType]];
+  } else if ([commandName isEqualToString:@"toggleH5"]) {
+    [self toggleParagraphStyle:[H5Style getStyleType]];
+  } else if ([commandName isEqualToString:@"toggleH6"]) {
+    [self toggleParagraphStyle:[H6Style getStyleType]];
   } else if ([commandName isEqualToString:@"toggleUnorderedList"]) {
     [self toggleParagraphStyle:[UnorderedListStyle getStyleType]];
   } else if ([commandName isEqualToString:@"toggleOrderedList"]) {
@@ -974,6 +1185,10 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     CGFloat imgHeight = [(NSNumber *)args[2] floatValue];
 
     [self addImage:uri width:imgWidth height:imgHeight];
+  } else if ([commandName isEqualToString:@"setSelection"]) {
+    NSInteger start = [((NSNumber *)args[0]) integerValue];
+    NSInteger end = [((NSNumber *)args[1]) integerValue];
+    [self setCustomSelection:start end:end];
   } else if ([commandName isEqualToString:@"requestHTML"]) {
     NSInteger requestId = [((NSNumber *)args[0]) integerValue];
     [self requestHTML:requestId];
@@ -1010,9 +1225,42 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
 
   // set recentlyChangedRange and check for changes
   recentlyChangedRange = NSMakeRange(0, textView.textStorage.string.length);
+  textView.selectedRange = NSRange(textView.textStorage.string.length, 0);
   [self anyTextMayHaveBeenModified];
 }
 
+- (void)setCustomSelection:(NSInteger)visibleStart end:(NSInteger)visibleEnd {
+  NSString *text = textView.textStorage.string;
+
+  NSUInteger actualStart = [self getActualIndex:visibleStart text:text];
+  NSUInteger actualEnd = [self getActualIndex:visibleEnd text:text];
+
+  textView.selectedRange = NSMakeRange(actualStart, actualEnd - actualStart);
+}
+
+// Helper: Walks through the string skipping ZWSPs to find the Nth visible
+// character
+- (NSUInteger)getActualIndex:(NSInteger)visibleIndex text:(NSString *)text {
+  NSUInteger currentVisibleCount = 0;
+  NSUInteger actualIndex = 0;
+
+  while (actualIndex < text.length) {
+    if (currentVisibleCount == visibleIndex) {
+      return actualIndex;
+    }
+
+    // If the current char is not a hidden space, it counts towards our visible
+    // index.
+    if ([text characterAtIndex:actualIndex] != 0x200B) {
+      currentVisibleCount++;
+    }
+
+    actualIndex++;
+  }
+
+  return actualIndex;
+}
+
 - (void)emitOnLinkDetectedEvent:(NSString *)text
                             url:(NSString *)url
                           range:(NSRange)range {
@@ -1091,6 +1339,13 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   }
 }
 
+- (void)emitOnKeyPressEvent:(NSString *)key {
+  auto emitter = [self getEventEmitter];
+  if (emitter != nullptr) {
+    emitter->onInputKeyPress({.key = [key toCppString]});
+  }
+}
+
 // MARK: - Styles manipulation
 
 - (void)toggleRegularStyle:(StyleType)type {
@@ -1247,6 +1502,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   if (linkStyleClass != nullptr) {
     [linkStyleClass manageLinkTypingAttributes];
   }
+  NSString *currentString = [textView.textStorage.string copy];
 
   // mention typing attribtues fix and active editing
   MentionStyle *mentionStyleClass =
@@ -1257,14 +1513,12 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     // mention editing runs if only a selection was done (no text change)
     // otherwise we would double-emit with a second call in the
     // anyTextMayHaveBeenModified method
-    if ([_recentInputString
-            isEqualToString:[textView.textStorage.string copy]]) {
+    if ([_recentInputString isEqualToString:currentString]) {
       [mentionStyleClass manageMentionEditing];
     }
   }
 
   // typing attributes for empty lines selection reset
-  NSString *currentString = [textView.textStorage.string copy];
   if (textView.selectedRange.length == 0 &&
       [_recentInputString isEqualToString:currentString]) {
     // no string change means only a selection changed with no character changes
@@ -1337,10 +1591,21 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   H1Style *h1Style = stylesDict[@([H1Style getStyleType])];
   H2Style *h2Style = stylesDict[@([H2Style getStyleType])];
   H3Style *h3Style = stylesDict[@([H3Style getStyleType])];
-  if (h1Style != nullptr && h2Style != nullptr && h3Style != nullptr) {
+  H4Style *h4Style = stylesDict[@([H4Style getStyleType])];
+  H5Style *h5Style = stylesDict[@([H5Style getStyleType])];
+  H6Style *h6Style = stylesDict[@([H6Style getStyleType])];
+
+  bool headingStylesDefined = h1Style != nullptr && h2Style != nullptr &&
+                              h3Style != nullptr && h4Style != nullptr &&
+                              h5Style != nullptr && h6Style != nullptr;
+
+  if (headingStylesDefined) {
     [h1Style handleImproperHeadings];
     [h2Style handleImproperHeadings];
     [h3Style handleImproperHeadings];
+    [h4Style handleImproperHeadings];
+    [h5Style handleImproperHeadings];
+    [h6Style handleImproperHeadings];
   }
 
   // mentions management: removal and editing
@@ -1380,7 +1645,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
 
     // emit onChangeText event
     auto emitter = [self getEventEmitter];
-    if (emitter != nullptr) {
+    if (emitter != nullptr && _emitTextChange) {
       // set the recent input string only if the emitter is defined
       _recentInputString = [textView.textStorage.string copy];
 
@@ -1477,10 +1742,29 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   }
 }
 
+- (void)handleKeyPressInRange:(NSString *)text range:(NSRange)range {
+  NSString *key = nil;
+
+  if (text.length == 0 && range.length > 0) {
+    key = @"Backspace";
+  } else if ([text isEqualToString:@"\n"]) {
+    key = @"Enter";
+  } else if ([text isEqualToString:@"\t"]) {
+    key = @"Tab";
+  } else if (text.length == 1) {
+    key = text;
+  }
+
+  if (key != nil) {
+    [self emitOnKeyPressEvent:key];
+  }
+}
+
 - (bool)textView:(UITextView *)textView
     shouldChangeTextInRange:(NSRange)range
             replacementText:(NSString *)text {
   recentlyChangedRange = NSMakeRange(range.location, text.length);
+  [self handleKeyPressInRange:text range:range];
 
   UnorderedListStyle *uStyle = stylesDict[@([UnorderedListStyle getStyleType])];
   OrderedListStyle *oStyle = stylesDict[@([OrderedListStyle getStyleType])];
@@ -1491,6 +1775,9 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   H1Style *h1Style = stylesDict[@([H1Style getStyleType])];
   H2Style *h2Style = stylesDict[@([H2Style getStyleType])];
   H3Style *h3Style = stylesDict[@([H3Style getStyleType])];
+  H4Style *h4Style = stylesDict[@([H4Style getStyleType])];
+  H5Style *h5Style = stylesDict[@([H5Style getStyleType])];
+  H6Style *h6Style = stylesDict[@([H6Style getStyleType])];
 
   // some of the changes these checks do could interfere with later checks and
   // cause a crash so here I rely on short circuiting evaluation of the logical
@@ -1508,12 +1795,18 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
       [h1Style handleNewlinesInRange:range replacementText:text] ||
       [h2Style handleNewlinesInRange:range replacementText:text] ||
       [h3Style handleNewlinesInRange:range replacementText:text] ||
+      [h4Style handleNewlinesInRange:range replacementText:text] ||
+      [h5Style handleNewlinesInRange:range replacementText:text] ||
+      [h6Style handleNewlinesInRange:range replacementText:text] ||
       [ZeroWidthSpaceUtils handleBackspaceInRange:range
                                   replacementText:text
                                             input:self] ||
       [ParagraphAttributesUtils handleBackspaceInRange:range
                                        replacementText:text
                                                  input:self] ||
+      [ParagraphAttributesUtils handleResetTypingAttributesOnBackspace:range
+                                                       replacementText:text
+                                                                 input:self] ||
       // CRITICAL: This callback HAS TO be always evaluated last.
       //
       // This function is the "Generic Fallback": if no specific style claims
@@ -1558,6 +1851,45 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   [self anyTextMayHaveBeenModified];
 }
 
+/**
+ * Handles iOS Dynamic Type changes (User changing font size in System
+ * Settings).
+ *
+ * Unlike Android, iOS Views do not automatically rescale existing
+ * NSAttributedStrings when the system font size changes. The text attributes
+ * are static once drawn.
+ *
+ * This method detects the change and performs a "Hard Refresh" of the content.
+ */
+- (void)traitCollectionDidChange:(UITraitCollection *)previousTraitCollection {
+  [super traitCollectionDidChange:previousTraitCollection];
+
+  if (previousTraitCollection.preferredContentSizeCategory !=
+      self.traitCollection.preferredContentSizeCategory) {
+    [config invalidateFonts];
+
+    NSMutableDictionary *newTypingAttrs = [defaultTypingAttributes mutableCopy];
+    newTypingAttrs[NSFontAttributeName] = [config primaryFont];
+
+    defaultTypingAttributes = newTypingAttrs;
+    textView.typingAttributes = defaultTypingAttributes;
+
+    [self refreshPlaceholderLabelStyles];
+
+    NSRange prevSelectedRange = textView.selectedRange;
+
+    NSString *currentHtml = [parser
+        parseToHtmlFromRange:NSMakeRange(0,
+                                         textView.textStorage.string.length)];
+    NSString *initiallyProcessedHtml =
+        [parser initiallyProcessHtml:currentHtml];
+    [parser replaceWholeFromHtml:initiallyProcessedHtml];
+
+    textView.selectedRange = prevSelectedRange;
+    [self anyTextMayHaveBeenModified];
+  }
+}
+
 // MARK: - Media attachments delegate
 
 - (void)mediaAttachmentDidUpdate:(NSTextAttachment *)attachment {