react-native-enriched 0.1.5 → 0.1.6

package/android/src/main/java/com/swmansion/enriched/utils/EnrichedParser.java

@@ -350,6 +350,7 @@ class HtmlToSpannedConverter implements ContentHandler {
   private final EnrichedParser.ImageGetter mImageGetter;
   private static Integer currentOrderedListItemIndex = 0;
   private static Boolean isInOrderedList = false;
+  private static Boolean isEmptyTag = false;
 
   public HtmlToSpannedConverter(String source, HtmlStyle style, EnrichedParser.ImageGetter imageGetter, Parser parser) {
     mStyle = style;
@@ -396,19 +397,27 @@ class HtmlToSpannedConverter implements ContentHandler {
     for (EnrichedZeroWidthSpaceSpan zeroWidthSpaceSpan : zeroWidthSpaceSpans) {
       int start = mSpannableStringBuilder.getSpanStart(zeroWidthSpaceSpan);
       int end = mSpannableStringBuilder.getSpanEnd(zeroWidthSpaceSpan);
-      mSpannableStringBuilder.insert(start, "\u200B");
+
+      if (mSpannableStringBuilder.charAt(start) != '\u200B') {
+        // Insert zero-width space character at the start if it's not already present.
+        mSpannableStringBuilder.insert(start, "\u200B");
+        end++; // Adjust end position due to insertion.
+      }
+
       mSpannableStringBuilder.removeSpan(zeroWidthSpaceSpan);
-      mSpannableStringBuilder.setSpan(zeroWidthSpaceSpan, start, end + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+      mSpannableStringBuilder.setSpan(zeroWidthSpaceSpan, start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
     }
 
     return mSpannableStringBuilder;
   }
 
   private void handleStartTag(String tag, Attributes attributes) {
+    isEmptyTag = false;
     if (tag.equalsIgnoreCase("br")) {
       // We don't need to handle this. TagSoup will ensure that there's a </br> for each <br>
       // so we can safely emit the linebreaks when we handle the close tag.
     } else if (tag.equalsIgnoreCase("p")) {
+      isEmptyTag = true;
       startBlockElement(mSpannableStringBuilder);
     } else if (tag.equalsIgnoreCase("ul")) {
       isInOrderedList = false;
@@ -418,14 +427,17 @@ class HtmlToSpannedConverter implements ContentHandler {
       currentOrderedListItemIndex = 0;
       startBlockElement(mSpannableStringBuilder);
     } else if (tag.equalsIgnoreCase("li")) {
+      isEmptyTag = true;
       startLi(mSpannableStringBuilder);
     } else if (tag.equalsIgnoreCase("b")) {
       start(mSpannableStringBuilder, new Bold());
     } else if (tag.equalsIgnoreCase("i")) {
       start(mSpannableStringBuilder, new Italic());
     } else if (tag.equalsIgnoreCase("blockquote")) {
+      isEmptyTag = true;
       startBlockquote(mSpannableStringBuilder);
     } else if (tag.equalsIgnoreCase("codeblock")) {
+      isEmptyTag = true;
       startCodeBlock(mSpannableStringBuilder);
     } else if (tag.equalsIgnoreCase("a")) {
       startA(mSpannableStringBuilder, attributes);
@@ -632,11 +644,17 @@ class HtmlToSpannedConverter implements ContentHandler {
     }
   }
 
-  private static void setParagraphSpanFromMark(Spannable text, Object mark, Object... spans) {
+  private static void setParagraphSpanFromMark(Editable text, Object mark, Object... spans) {
     int where = text.getSpanStart(mark);
     text.removeSpan(mark);
     int len = text.length();
 
+    // Block spans require at least one character to be applied.
+    if (isEmptyTag) {
+      text.append("\u200B");
+      len++;
+    }
+
     // Adjust the end position to exclude the newline character, if present
     if (len > 0 && text.charAt(len - 1) == '\n') {
       len--;
@@ -741,6 +759,8 @@ class HtmlToSpannedConverter implements ContentHandler {
 
   public void characters(char[] ch, int start, int length) {
     StringBuilder sb = new StringBuilder();
+    if (length > 0) isEmptyTag = false;
+
     /*
      * Ignore whitespace that immediately follows other whitespace;
      * newlines count as spaces.

package/android/src/main/java/com/swmansion/enriched/watchers/EnrichedSpanWatcher.kt

@@ -59,7 +59,6 @@ class EnrichedSpanWatcher(private val view: EnrichedTextInputView) : SpanWatcher
     if (html == previousHtml) return
 
     previousHtml = html
-    view.layoutManager.invalidateLayout(view.text)
     val context = view.context as ReactContext
     val surfaceId = UIManagerHelper.getSurfaceId(context)
     val dispatcher = UIManagerHelper.getEventDispatcherForReactTag(context, view.id)

package/android/src/main/java/com/swmansion/enriched/watchers/EnrichedTextWatcher.kt

@@ -17,7 +17,7 @@ class EnrichedTextWatcher(private val view: EnrichedTextInputView) : TextWatcher
 
   override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
     endCursorPosition = start + count
-    view.layoutManager.measureSize(s ?: "")
+    view.layoutManager.invalidateLayout()
     view.isRemovingMany = !view.isDuringTransaction && before > count + 1
   }
 

package/android/src/main/new_arch/react/renderer/components/RNEnrichedTextInputViewSpec/EnrichedTextInputMeasurementManager.cpp

@@ -1,4 +1,5 @@
 #include "EnrichedTextInputMeasurementManager.h"
+#include "conversions.h"
 
 #include <fbjni/fbjni.h>
 #include <react/jni/ReadableNativeMap.h>
@@ -10,6 +11,7 @@ namespace facebook::react {
 
     Size EnrichedTextInputMeasurementManager::measure(
             SurfaceId surfaceId,
+            int viewTag,
             const EnrichedTextInputViewProps& props,
             LayoutConstraints layoutConstraints) const {
         const jni::global_ref<jobject>& fabricUIManager =
@@ -33,12 +35,23 @@ namespace facebook::react {
 
         local_ref<JString> componentName = make_jstring("EnrichedTextInputView");
 
+        // Prepare extraData map with viewTag
+        folly::dynamic extraData = folly::dynamic::object();
+        extraData["viewTag"] = viewTag;
+        local_ref<ReadableNativeMap::javaobject> extraDataRNM = ReadableNativeMap::newObjectCxxArgs(extraData);
+        local_ref<ReadableMap::javaobject> extraDataRM = make_local(reinterpret_cast<ReadableMap::javaobject>(extraDataRNM.get()));
+
+        // Prepare layout metrics affecting props
+        auto serializedProps = toDynamic(props);
+        local_ref<ReadableNativeMap::javaobject> propsRNM = ReadableNativeMap::newObjectCxxArgs(serializedProps);
+        local_ref<ReadableMap::javaobject> propsRM = make_local(reinterpret_cast<ReadableMap::javaobject>(propsRNM.get()));
+
         auto measurement = yogaMeassureToSize(measure(
                 fabricUIManager,
                 surfaceId,
                 componentName.get(),
-                nullptr,
-                nullptr,
+                extraDataRM.get(),
+                propsRM.get(),
                 nullptr,
                 minimumSize.width,
                 maximumSize.width,

package/android/src/main/new_arch/react/renderer/components/RNEnrichedTextInputViewSpec/EnrichedTextInputMeasurementManager.h

@@ -16,6 +16,7 @@ namespace facebook::react {
 
         Size measure(
                 SurfaceId surfaceId,
+                int viewTag,
                 const EnrichedTextInputViewProps& props,
                 LayoutConstraints layoutConstraints) const;
 

package/android/src/main/new_arch/react/renderer/components/RNEnrichedTextInputViewSpec/EnrichedTextInputShadowNode.cpp

@@ -27,8 +27,7 @@ extern const char EnrichedTextInputComponentName[] = "EnrichedTextInputView";
     Size EnrichedTextInputShadowNode::measureContent(
             const LayoutContext &layoutContext,
             const LayoutConstraints &layoutConstraints) const {
-
-        return measurementsManager_->measure(getSurfaceId(), getConcreteProps(), layoutConstraints);
+        return measurementsManager_->measure(getSurfaceId(), getTag(), getConcreteProps(), layoutConstraints);
     }
 
 } // namespace facebook::react

package/android/src/main/new_arch/react/renderer/components/RNEnrichedTextInputViewSpec/conversions.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <folly/dynamic.h>
+#include <react/renderer/components/FBReactNativeSpec/Props.h>
+#include <react/renderer/core/propsConversions.h>
+#include <react/renderer/components/RNEnrichedTextInputViewSpec/Props.h>
+
+namespace facebook::react {
+
+#ifdef RN_SERIALIZABLE_STATE
+inline folly::dynamic toDynamic(const EnrichedTextInputViewProps &props)
+{
+    // Serialize only metrics affecting props
+    folly::dynamic serializedProps = folly::dynamic::object();
+    serializedProps["defaultValue"] = props.defaultValue;
+    serializedProps["placeholder"] = props.placeholder;
+    serializedProps["fontSize"] = props.fontSize;
+    serializedProps["fontWeight"] = props.fontWeight;
+    serializedProps["fontStyle"] = props.fontStyle;
+    serializedProps["fontFamily"] = props.fontFamily;
+    serializedProps["htmlStyle"] = toDynamic(props.htmlStyle);
+
+    return serializedProps;
+}
+#endif
+
+} // namespace facebook::react

package/ios/EnrichedTextInputView.h

@@ -19,7 +19,6 @@ NS_ASSUME_NONNULL_BEGIN
   @public NSMutableDictionary<NSAttributedStringKey, id> *defaultTypingAttributes;
   @public NSDictionary<NSNumber *, id<BaseStyleProtocol>> *stylesDict;
   @public BOOL blockEmitting;
-  @public BOOL emitHtml;
 }
 - (CGSize)measureSize:(CGFloat)maxWidth;
 - (void)emitOnLinkDetectedEvent:(NSString *)text url:(NSString *)url range:(NSRange)range;

package/ios/EnrichedTextInputView.mm

@@ -34,6 +34,7 @@ using namespace facebook::react;
   MentionParams *_recentlyActiveMentionParams;
   NSRange _recentlyActiveMentionRange;
   NSString *_recentlyEmittedHtml;
+  BOOL _emitHtml;
   UILabel *_placeholderLabel;
   UIColor *_placeholderColor;
   BOOL _emitFocusBlur;
@@ -74,8 +75,8 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   _recentlyActiveMentionRange = NSMakeRange(0, 0);
   recentlyChangedRange = NSMakeRange(0, 0);
   _recentlyEmittedString = @"";
-  _recentlyEmittedHtml = @"";
-  emitHtml = NO;
+  _recentlyEmittedHtml = @"<html>\n<p></p>\n</html>";
+  _emitHtml = NO;
   blockEmitting = NO;
   _emitFocusBlur = YES;
   
@@ -357,6 +358,10 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     stylePropChanged = YES;
   }
   
+  if(newViewProps.scrollEnabled != oldViewProps.scrollEnabled || textView.scrollEnabled != newViewProps.scrollEnabled) {
+    [textView setScrollEnabled:newViewProps.scrollEnabled];
+  }
+  
   folly::dynamic oldMentionStyle = oldViewProps.htmlStyle.mention;
   folly::dynamic newMentionStyle = newViewProps.htmlStyle.mention;
   if(oldMentionStyle != newMentionStyle) {
@@ -393,22 +398,17 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     
     // now set the new config
     config = newConfig;
-    
-    // we don't want to emit these html changes in here
-    BOOL prevEmitHtml = emitHtml;
-    if(prevEmitHtml) {
-      emitHtml = NO;
-    }
-    
+        
+    // no emitting during styles reload
+    blockEmitting = YES;
+        
     // make sure everything is sound in the html
     NSString *initiallyProcessedHtml = [parser initiallyProcessHtml:currentHtml];
     if(initiallyProcessedHtml != nullptr) {
       [parser replaceWholeFromHtml:initiallyProcessedHtml];
     }
     
-    if(prevEmitHtml) {
-      emitHtml = YES;
-    }
+    blockEmitting = NO;
     
     // fill the typing attributes with style props
     defaultTypingAttributes[NSForegroundColorAttributeName] = [config primaryColor];
@@ -509,7 +509,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   }
   
   // isOnChangeHtmlSet
-  emitHtml = newViewProps.isOnChangeHtmlSet;
+  _emitHtml = newViewProps.isOnChangeHtmlSet;
   
   [super updateProps:props oldProps:oldProps];
   // mandatory text and height checks
@@ -605,6 +605,9 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   // style updates are emitted only if something differs from the previously active styles
   BOOL updateNeeded = NO;
   
+  // active styles are kept in a separate set until we're sure they can be emitted
+  NSMutableSet *newActiveStyles = [_activeStyles mutableCopy];
+  
   // data for onLinkDetected event
   LinkData *detectedLinkData;
   NSRange detectedLinkRange = NSMakeRange(0, 0);
@@ -615,14 +618,14 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
 
   for (NSNumber* type in stylesDict) {
     id<BaseStyleProtocol> style = stylesDict[type];
-    BOOL wasActive = [_activeStyles containsObject: type];
+    BOOL wasActive = [newActiveStyles containsObject: type];
     BOOL isActive = [style detectStyle:textView.selectedRange];
     if(wasActive != isActive) {
       updateNeeded = YES;
       if(isActive) {
-        [_activeStyles addObject:type];
+        [newActiveStyles addObject:type];
       } else {
-        [_activeStyles removeObject:type];
+        [newActiveStyles removeObject:type];
       }
     }
     
@@ -682,6 +685,9 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   if(updateNeeded) {
     auto emitter = [self getEventEmitter];
     if(emitter != nullptr) {
+      // update activeStyles only if emitter is available
+      _activeStyles = newActiveStyles;
+      
       emitter->onChangeState({
         .isBold = [_activeStyles containsObject: @([BoldStyle getStyleType])],
         .isItalic = [_activeStyles containsObject: @([ItalicStyle getStyleType])],
@@ -705,9 +711,6 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   if(detectedLinkData != nullptr) {
     // emit onLinkeDetected event
     [self emitOnLinkDetectedEvent:detectedLinkData.text url:detectedLinkData.url range:detectedLinkRange];
-    
-    _recentlyActiveLinkData = detectedLinkData;
-    _recentlyActiveLinkRange = detectedLinkRange;
   }
   
   if(detectedMentionParams != nullptr) {
@@ -806,6 +809,13 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
 - (void)emitOnLinkDetectedEvent:(NSString *)text url:(NSString *)url range:(NSRange)range {
   auto emitter = [self getEventEmitter];
   if(emitter != nullptr) {
+    // update recently active link info
+    LinkData *newLinkData = [[LinkData alloc] init];
+    newLinkData.text = text;
+    newLinkData.url = url;
+    _recentlyActiveLinkData = newLinkData;
+    _recentlyActiveLinkRange = range;
+  
     emitter->onLinkDetected({
       .text = [text toCppString],
       .url = [url toCppString],
@@ -846,7 +856,7 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
 }
 
 - (void)tryEmittingOnChangeHtmlEvent {
-  if(!emitHtml || textView.markedTextRange != nullptr) {
+  if(!_emitHtml || textView.markedTextRange != nullptr) {
     return;
   }
   auto emitter = [self getEventEmitter];
@@ -994,6 +1004,9 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
       textView.typingAttributes = defaultTypingAttributes;
     }
   }
+  
+  // update active styles as well
+  [self tryUpdatingActiveStyles];
 }
 
 - (void)handleWordModificationBasedChanges:(NSString*)word inRange:(NSRange)range {
@@ -1043,6 +1056,12 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     [h3Style handleImproperHeadings];
   }
   
+  // mentions removal management
+  MentionStyle *mentionStyleClass = (MentionStyle *)stylesDict[@([MentionStyle getStyleType])];
+  if(mentionStyleClass != nullptr) {
+    [mentionStyleClass handleExistingMentions];
+  }
+  
   // placholder management
   if(!_placeholderLabel.hidden && textView.textStorage.string.length > 0) {
     [self setPlaceholderLabelShown:NO];
@@ -1051,12 +1070,6 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   }
   
   if(![textView.textStorage.string isEqualToString:_recentlyEmittedString]) {
-    // mentions removal management
-    MentionStyle *mentionStyleClass = (MentionStyle *)stylesDict[@([MentionStyle getStyleType])];
-    if(mentionStyleClass != nullptr) {
-      [mentionStyleClass handleExistingMentions];
-    }
-    
     // modified words handling
     NSArray *modifiedWords = [WordsUtils getAffectedWordsFromText:textView.textStorage.string modificationRange:recentlyChangedRange];
     if(modifiedWords != nullptr) {
@@ -1078,28 +1091,49 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     // emit onChangeText event
     auto emitter = [self getEventEmitter];
     if(emitter != nullptr) {
+      // set the recently emitted string only if the emitter is defined
+      _recentlyEmittedString = stringToBeEmitted;
+      
       emitter->onChangeText({
         .value = [stringToBeEmitted toCppString]
       });
     }
-    
-    // set the recently emitted string
-    _recentlyEmittedString = stringToBeEmitted;
   }
   
   // update height on each character change
   [self tryUpdatingHeight];
   // update active styles as well
   [self tryUpdatingActiveStyles];
+  // update drawing - schedule debounced relayout
+  [self scheduleRelayoutIfNeeded];
+}
 
-  // update drawing
-   dispatch_async(dispatch_get_main_queue(), ^{
-     NSRange wholeRange = NSMakeRange(0, textView.textStorage.string.length);
-     NSRange actualRange = NSMakeRange(0, 0);
-     [textView.layoutManager invalidateLayoutForCharacterRange:wholeRange actualCharacterRange:&actualRange];
-     [textView.layoutManager ensureLayoutForCharacterRange:actualRange];
-     [textView.layoutManager invalidateDisplayForCharacterRange:wholeRange];
-   });
+// Debounced relayout helper - coalesces multiple requests into one per runloop tick
+- (void)scheduleRelayoutIfNeeded
+{
+  // Cancel any previously scheduled invocation to debounce
+  [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(_performRelayout) object:nil];
+  // Schedule on next runloop cycle
+  [self performSelector:@selector(_performRelayout) withObject:nil afterDelay:0];
+}
+
+- (void)_performRelayout
+{
+  if (!textView) { return; }
+
+  dispatch_async(dispatch_get_main_queue(), ^{
+    NSRange wholeRange = NSMakeRange(0, self->textView.textStorage.string.length);
+    NSRange actualRange = NSMakeRange(0, 0);
+    [self->textView.layoutManager invalidateLayoutForCharacterRange:wholeRange actualCharacterRange:&actualRange];
+    [self->textView.layoutManager ensureLayoutForCharacterRange:actualRange];
+    [self->textView.layoutManager invalidateDisplayForCharacterRange:wholeRange];
+  });
+}
+
+- (void)didMoveToWindow {
+  [super didMoveToWindow];
+  // used to run all lifecycle callbacks
+  [self anyTextMayHaveBeenModified];
 }
 
 // MARK: - UITextView delegate methods
@@ -1184,9 +1218,6 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
   
   // manage selection changes
   [self manageSelectionBasedChanges];
-  
-  // update active styles
-  [self tryUpdatingActiveStyles];
 }
 
 // this function isn't called always when some text changes (for example setting link or starting mention with indicator doesn't fire it)

package/ios/generated/RNEnrichedTextInputViewSpec/Props.cpp

@@ -30,6 +30,7 @@ EnrichedTextInputViewProps::EnrichedTextInputViewProps(
     selectionColor(convertRawProp(context, rawProps, "selectionColor", sourceProps.selectionColor, {})),
     autoCapitalize(convertRawProp(context, rawProps, "autoCapitalize", sourceProps.autoCapitalize, {})),
     htmlStyle(convertRawProp(context, rawProps, "htmlStyle", sourceProps.htmlStyle, {})),
+    scrollEnabled(convertRawProp(context, rawProps, "scrollEnabled", sourceProps.scrollEnabled, {false})),
     color(convertRawProp(context, rawProps, "color", sourceProps.color, {})),
     fontSize(convertRawProp(context, rawProps, "fontSize", sourceProps.fontSize, {0.0})),
     fontFamily(convertRawProp(context, rawProps, "fontFamily", sourceProps.fontFamily, {})),
@@ -94,6 +95,10 @@ folly::dynamic EnrichedTextInputViewProps::getDiffProps(
     result["htmlStyle"] = toDynamic(htmlStyle);
   }
     
+  if (scrollEnabled != oldProps->scrollEnabled) {
+    result["scrollEnabled"] = scrollEnabled;
+  }
+    
   if (color != oldProps->color) {
     result["color"] = *color;
   }

package/ios/generated/RNEnrichedTextInputViewSpec/Props.h

@@ -559,6 +559,7 @@ class EnrichedTextInputViewProps final : public ViewProps {
   SharedColor selectionColor{};
   std::string autoCapitalize{};
   EnrichedTextInputViewHtmlStyleStruct htmlStyle{};
+  bool scrollEnabled{false};
   SharedColor color{};
   Float fontSize{0.0};
   std::string fontFamily{};

package/ios/inputParser/InputParser.mm

@@ -3,6 +3,7 @@
 #import "StyleHeaders.h"
 #import "UIView+React.h"
 #import "TextInsertionUtils.h"
+#import "StringExtension.h"
 
 @implementation InputParser {
   EnrichedTextInputView *_input;
@@ -204,8 +205,8 @@
         [result appendString: [NSString stringWithFormat:@"<%@>", tagContent]];
       }
       
-      // append the letter
-      [result appendString:currentCharacterStr];
+      // append the letter and escape it if needed
+      [result appendString: [NSString stringByEscapingHtml:currentCharacterStr]];
       
       // save current styles for next character's checks
       previousActiveStyles = currentActiveStyles;
@@ -490,6 +491,7 @@
   BOOL closingTag = NO;
   NSMutableString *currentTagName = [[NSMutableString alloc] initWithString:@""];
   NSMutableString *currentTagParams = [[NSMutableString alloc] initWithString:@""];
+  NSDictionary *htmlEntitiesDict = [NSString getEscapedCharactersInfoFrom:fixedHtml];
   
   // firstly, extract text and initially processed tags
   for(int i = 0; i < fixedHtml.length; i++) {
@@ -511,7 +513,7 @@
       } else if(!closingTag) {
         // we finish opening tag - get its location and optionally params and put them under tag name key in ongoingTags
         NSMutableArray *tagArr = [[NSMutableArray alloc] init];
-        [tagArr addObject:[NSNumber numberWithInt:plainText.length]];
+        [tagArr addObject:[NSNumber numberWithInteger:plainText.length]];
         if(currentTagParams.length > 0) {
           [tagArr addObject:[currentTagParams copy]];
         }
@@ -550,8 +552,19 @@
       currentTagParams = [[NSMutableString alloc] initWithString:@""];
     } else {
       if(!insideTag) {
-        // no tags logic - just append text
-        [plainText appendString:currentCharacterStr];
+        // no tags logic - just append the right text
+        
+        // html entity on the index; use unescaped character and forward iterator accordingly
+        NSArray *entityInfo = htmlEntitiesDict[@(i)];
+        if(entityInfo != nullptr) {
+          NSString *escaped = entityInfo[0];
+          NSString *unescaped = entityInfo[1];
+          [plainText appendString:unescaped];
+          // the iterator will forward by 1 itself
+          i += escaped.length - 1;
+        } else {
+          [plainText appendString:currentCharacterStr];
+        }
       } else {
         if(gettingTagName) {
           if(currentCharacterChar == ' ') {
@@ -597,9 +610,21 @@
     } else if([tagName isEqualToString:@"code"]) {
       [styleArr addObject:@([InlineCodeStyle getStyleType])];
     } else if([tagName isEqualToString:@"a"]) {
+      NSRegularExpression *hrefRegex = [NSRegularExpression regularExpressionWithPattern:@"href=\".+\""
+        options:0
+        error:nullptr
+      ];
+      NSTextCheckingResult* match = [hrefRegex firstMatchInString:params options:0 range: NSMakeRange(0, params.length)];
+      
+      if(match == nullptr) {
+        // same as on Android, no href (or empty href) equals no link style
+        continue;
+      }
+      
+      NSRange hrefRange = match.range;
       [styleArr addObject:@([LinkStyle getStyleType])];
       // cut only the url from the href="..." string
-      NSString *url = [params substringWithRange:NSMakeRange(6, params.length - 7)];
+      NSString *url = [params substringWithRange:NSMakeRange(hrefRange.location + 6, hrefRange.length - 7)];
       stylePair.styleValue = url;
     } else if([tagName isEqualToString:@"mention"]) {
       [styleArr addObject:@([MentionStyle getStyleType])];
@@ -644,7 +669,7 @@
     } else if([tagName isEqualToString:@"blockquote"]) {
       [styleArr addObject:@([BlockQuoteStyle getStyleType])];
     } else {
-    // some other external tags like span just don't get put into the processed styles
+      // some other external tags like span just don't get put into the processed styles
       continue;
     }
     

package/ios/inputTextView/InputTextView.mm

@@ -14,7 +14,7 @@
   NSString *plainText = [typedInput->textView.textStorage.string substringWithRange:typedInput->textView.selectedRange];
   NSString *fixedPlainText = [plainText stringByReplacingOccurrencesOfString:@"\u200B" withString:@""];
   
-  NSString *escapedHtml = [NSString stringByEscapingHtml:[typedInput->parser parseToHtmlFromRange:typedInput->textView.selectedRange]];
+  NSString *parsedHtml = [typedInput->parser parseToHtmlFromRange:typedInput->textView.selectedRange];
   
   NSMutableAttributedString *attrStr = [[typedInput->textView.textStorage attributedSubstringFromRange:typedInput->textView.selectedRange] mutableCopy];
   NSRange fullAttrStrRange = NSMakeRange(0, attrStr.length);
@@ -28,7 +28,7 @@
   UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
   [pasteboard setItems:@[@{
     UTTypeUTF8PlainText.identifier : fixedPlainText,
-    UTTypeHTML.identifier : escapedHtml,
+    UTTypeHTML.identifier : parsedHtml,
     UTTypeRTF.identifier : rtfData
   }]];
 }
@@ -53,9 +53,7 @@
       htmlString = htmlValue;
     }
     
-    // unescape the html
-    htmlString = [NSString stringByUnescapingHtml:htmlString];
-    // validate it
+    // validate the html
     NSString *initiallyProcessedHtml = [typedInput->parser initiallyProcessHtml:htmlString];
     
     if(initiallyProcessedHtml != nullptr) {

package/ios/styles/LinkStyle.mm

@@ -167,7 +167,6 @@ static NSString *const AutomaticLinkAttributeName = @"AutomaticLinkAttributeName
   }
   
   [self manageLinkTypingAttributes];
-  [_input anyTextMayHaveBeenModified];
 }
 
 // get exact link data at the given location if it exists
@@ -224,20 +223,22 @@ static NSString *const AutomaticLinkAttributeName = @"AutomaticLinkAttributeName
     }
   }
   
-  [_input->textView.textStorage
+  NSString *manualLink = [_input->textView.textStorage
     attribute:ManualLinkAttributeName
     atIndex:searchLocation
     longestEffectiveRange: &manualLinkRange
     inRange:inputRange
   ];
-  [_input->textView.textStorage
+  NSString *automaticLink = [_input->textView.textStorage
     attribute:AutomaticLinkAttributeName
     atIndex:searchLocation
     longestEffectiveRange: &automaticLinkRange
     inRange:inputRange
   ];
   
-  return manualLinkRange.length == 0 ? automaticLinkRange : manualLinkRange;
+  return manualLink == nullptr
+    ? automaticLink == nullptr ? NSMakeRange(0, 0) : automaticLinkRange
+    : manualLinkRange;
 }
 
 - (void)manageLinkTypingAttributes {
@@ -349,10 +350,9 @@ static NSString *const AutomaticLinkAttributeName = @"AutomaticLinkAttributeName
     }
     if(addStyle) {
       [self addLink:word url:regexPassedUrl range:wordRange manual:NO];
+      // emit onLinkDetected if style was added
+      [_input emitOnLinkDetectedEvent:word url:regexPassedUrl range:wordRange];
     }
-  
-    // emit onLinkDetected
-    [_input emitOnLinkDetectedEvent:word url:regexPassedUrl range:wordRange];
   }
 }
 

package/ios/styles/OrderedListStyle.mm

@@ -158,18 +158,13 @@
     if(charBefore == '1') {
       // we got a match - add a list if possible
       if([_input handleStyleBlocksAndConflicts:[[self class] getStyleType] range:paragraphRange]) {
-        // don't emit some html updates during the replacing
-        BOOL prevEmitHtml = _input->emitHtml;
-        if(prevEmitHtml) {
-          _input->emitHtml = NO;
-        }
+        // don't emit during the replacing
+        _input->blockEmitting = YES;
         
         // remove the number
         [TextInsertionUtils replaceText:@"" at:NSMakeRange(paragraphRange.location, 1) additionalAttributes:nullptr input:_input withSelection:YES];
         
-        if(prevEmitHtml) {
-          _input->emitHtml = YES;
-        }
+        _input->blockEmitting = NO;
         
         // add attributes on the paragraph
         [self addAttributes:NSMakeRange(paragraphRange.location, paragraphRange.length - 1)];