Merge branch 'main' into feat/add-scrollEnabled-prop

Author: exploIF

android/src/main/java/com/swmansion/enriched/EnrichedTextInputView.kt

@@ -71,6 +71,8 @@ class EnrichedTextInputView : AppCompatEditText {
   private var fontFamily: String? = null
   private var fontStyle: Int = ReactConstants.UNSET
   private var fontWeight: Int = ReactConstants.UNSET
+  private var defaultValue: CharSequence? = null
+  private var defaultValueDirty: Boolean = false
 
   private var inputMethodManager: InputMethodManager? = null
 
@@ -369,7 +371,24 @@ class EnrichedTextInputView : AppCompatEditText {
     return false
   }
 
-  fun updateTypeface() {
+  fun afterUpdateTransaction() {
+    updateTypeface()
+    updateDefaultValue()
+  }
+
+  fun setDefaultValue(value: CharSequence?) {
+    defaultValue = value
+    defaultValueDirty = true
+  }
+
+  private fun updateDefaultValue() {
+    if (!defaultValueDirty) return
+
+    defaultValueDirty = false
+    setValue(defaultValue ?: "")
+  }
+
+  private fun updateTypeface() {
     if (!typefaceDirty) return
     typefaceDirty = false
 

android/src/main/java/com/swmansion/enriched/EnrichedTextInputViewManager.kt

@@ -77,7 +77,7 @@ class EnrichedTextInputViewManager : SimpleViewManager<EnrichedTextInputView>(),
 
   @ReactProp(name = "defaultValue")
   override fun setDefaultValue(view: EnrichedTextInputView?, value: String?) {
-    view?.setValue(value)
+    view?.setDefaultValue(value)
   }
 
   @ReactProp(name = "placeholder")
@@ -161,7 +161,7 @@ class EnrichedTextInputViewManager : SimpleViewManager<EnrichedTextInputView>(),
 
   override fun onAfterUpdateTransaction(view: EnrichedTextInputView) {
     super.onAfterUpdateTransaction(view)
-    view.updateTypeface()
+    view.afterUpdateTransaction()
   }
 
   override fun setPadding(

android/src/main/java/com/swmansion/enriched/styles/ParametrizedStyles.kt

@@ -104,15 +104,31 @@ class ParametrizedStyles(private val view: EnrichedTextInputView) {
     return Triple(result, start, end)
   }
 
+  private fun canLinkBeApplied(): Boolean {
+    val mergingConfig = EnrichedSpans.getMergingConfigForStyle(EnrichedSpans.LINK, view.htmlStyle)?: return true
+    val conflictingStyles = mergingConfig.conflictingStyles
+    val blockingStyles = mergingConfig.blockingStyles
+
+    for (style in blockingStyles) {
+      if (view.spanState?.getStart(style) != null) return false
+    }
+
+    for (style in conflictingStyles) {
+      if (view.spanState?.getStart(style) != null) return false
+    }
+
+    return true
+  }
+
   private fun afterTextChangedLinks(result: Triple<String, Int, Int>) {
     // Do not detect link if it's applied manually
-    if (isSettingLinkSpan) return
+    if (isSettingLinkSpan || !canLinkBeApplied()) return
+
     val spannable = view.text as Spannable
     val (word, start, end) = result
 
     // TODO: Consider using more reliable regex, this one matches almost anything
     val urlPattern = android.util.Patterns.WEB_URL.matcher(word)
-
     val spans = spannable.getSpans(start, end, EnrichedLinkSpan::class.java)
     for (span in spans) {
       spannable.removeSpan(span)

ios/EnrichedTextInputView.mm

@@ -605,6 +605,9 @@ - (void)tryUpdatingActiveStyles {
   // 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 @@ - (void)tryUpdatingActiveStyles {
 
   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 @@ - (void)tryUpdatingActiveStyles {
   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])],
@@ -994,6 +1000,9 @@ - (void)manageSelectionBasedChanges {
       textView.typingAttributes = defaultTypingAttributes;
     }
   }
+  
+  // update active styles as well
+  [self tryUpdatingActiveStyles];
 }
 
 - (void)handleWordModificationBasedChanges:(NSString*)word inRange:(NSRange)range {
@@ -1109,17 +1118,18 @@ - (void)_performRelayout
   if (!textView) { return; }
 
   dispatch_async(dispatch_get_main_queue(), ^{
-    NSRange wholeRange = NSMakeRange(0, textView.textStorage.string.length);
+    NSRange wholeRange = NSMakeRange(0, self->textView.textStorage.string.length);
     NSRange actualRange = NSMakeRange(0, 0);
-    [textView.layoutManager invalidateLayoutForCharacterRange:wholeRange actualCharacterRange:&actualRange];
-    [textView.layoutManager ensureLayoutForCharacterRange:actualRange];
-    [textView.layoutManager invalidateDisplayForCharacterRange:wholeRange];
+    [self->textView.layoutManager invalidateLayoutForCharacterRange:wholeRange actualCharacterRange:&actualRange];
+    [self->textView.layoutManager ensureLayoutForCharacterRange:actualRange];
+    [self->textView.layoutManager invalidateDisplayForCharacterRange:wholeRange];
   });
 }
 
 - (void)didMoveToWindow {
   [super didMoveToWindow];
-  [self scheduleRelayoutIfNeeded];
+  // used to run all lifecycle callbacks
+  [self anyTextMayHaveBeenModified];
 }
 
 // MARK: - UITextView delegate methods
@@ -1204,9 +1214,6 @@ - (void)textViewDidChangeSelection:(UITextView *)textView {
 
   // 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)

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 @@ - (NSString *)parseToHtmlFromRange:(NSRange)range {
         [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 @@ - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
   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 @@ - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
       } 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 @@ - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
       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 == ' ') {

ios/inputTextView/InputTextView.mm

@@ -14,7 +14,7 @@ - (void)copy:(id)sender {
   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 @@ - (void)copy:(id)sender {
   UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
   [pasteboard setItems:@[@{
     UTTypeUTF8PlainText.identifier : fixedPlainText,
-    UTTypeHTML.identifier : escapedHtml,
+    UTTypeHTML.identifier : parsedHtml,
     UTTypeRTF.identifier : rtfData
   }]];
 }
@@ -53,9 +53,7 @@ - (void)paste:(id)sender {
       htmlString = htmlValue;
     }
 
-    // unescape the html
-    htmlString = [NSString stringByUnescapingHtml:htmlString];
-    // validate it
+    // validate the html
     NSString *initiallyProcessedHtml = [typedInput->parser initiallyProcessHtml:htmlString];
 
     if(initiallyProcessedHtml != nullptr) {

ios/utils/StringExtension.h

@@ -6,7 +6,7 @@
 - (std::string)toCppString;
 + (NSString *)fromCppString:(std::string)string;
 + (NSString *)stringByEscapingHtml:(NSString *)html;
-+ (NSString *)stringByUnescapingHtml:(NSString *)html;
++ (NSDictionary *)getEscapedCharactersInfoFrom:(NSString *)text;
 @end
 
 @interface NSMutableString (StringExtension)

ios/utils/StringExtension.mm

@@ -16,8 +16,6 @@ + (NSString *)stringByEscapingHtml:(NSString *)html {
     @"&": @"&",
     @"<": @"&lt;",
     @">": @"&gt;",
-    @"\"": @"&quot;",
-    @"'": @"&apos;"
   };
 
   for(NSString *key in escapeMap) {
@@ -26,20 +24,31 @@ + (NSString *)stringByEscapingHtml:(NSString *)html {
   return escaped;
 }
 
-+ (NSString *)stringByUnescapingHtml:(NSString *)html {
-  NSMutableString *unescaped = [html mutableCopy];
++ (NSDictionary *)getEscapedCharactersInfoFrom:(NSString *)text {
   NSDictionary *unescapeMap = @{
     @"&amp;": @"&",
     @"&lt;": @"<",
     @"&gt;": @">",
-    @"&quot;": @"\"",
-    @"&apos;": @"'",
   };
 
+  NSMutableDictionary *results = [[NSMutableDictionary alloc] init];
+  
   for(NSString *key in unescapeMap) {
-    [unescaped replaceOccurrencesOfString:key withString:unescapeMap[key] options:NSLiteralSearch range:NSMakeRange(0, unescaped.length)];
+    NSRange searchRange = NSMakeRange(0, text.length);
+    NSRange foundRange;
+
+    while(searchRange.location < text.length) {
+      foundRange = [text rangeOfString:key options:0 range:searchRange];
+      if(foundRange.location == NSNotFound) {
+        break;
+      }
+      results[@(foundRange.location)] = @[key, unescapeMap[key]];
+      searchRange.location = foundRange.location + foundRange.length;
+      searchRange.length = text.length - searchRange.location;
+    }
   }
-  return unescaped;
+  
+  return results;
 }
 
 @end