react-native-enriched 0.4.0 → 0.4.1

package/android/src/main/java/com/swmansion/enriched/textinput/styles/ParagraphStyles.kt

@@ -108,6 +108,9 @@ class ParagraphStyles(
     spannable.setSpan(span, safeStart, safeEnd, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
   }
 
+  // Removes spans of the given type in the specified range.
+  // If the removed span intersects with the range, it will be split and the remaining part will be re-applied after the removal
+  // Returns true if any spans were removed, false otherwise
   private fun <T> removeSpansForRange(
     spannable: Spannable,
     start: Int,
@@ -115,21 +118,24 @@ class ParagraphStyles(
     clazz: Class<T>,
   ): Boolean {
     val ssb = spannable as SpannableStringBuilder
-    var finalStart = start
-    var finalEnd = end
-
     val spans = ssb.getSpans(start, end, clazz)
     if (spans.isEmpty()) return false
 
     for (span in spans) {
-      finalStart = ssb.getSpanStart(span).coerceAtMost(finalStart)
-      finalEnd = ssb.getSpanEnd(span).coerceAtLeast(finalEnd)
-
+      val spanStart = ssb.getSpanStart(span)
+      val spanEnd = ssb.getSpanEnd(span)
       ssb.removeSpan(span)
-    }
 
-    ssb.removeZWS(finalStart, finalEnd)
+      if (spanStart < start) {
+        setSpan(ssb, clazz, spanStart, start - 1)
+      }
 
+      if (spanEnd > end) {
+        setSpan(ssb, clazz, end + 1, spanEnd)
+      }
+    }
+
+    ssb.removeZWS(start, end)
     return true
   }
 
@@ -215,11 +221,7 @@ class ParagraphStyles(
     }
 
     val currSpan = currParagraphSpans[0]
-    val nextSpan = getNextParagraphSpan(s, end, type)
-
-    if (nextSpan == null) {
-      return
-    }
+    val nextSpan = getNextParagraphSpan(s, end, type) ?: return
 
     val newStart = s.getSpanStart(currSpan)
     val newEnd = s.getSpanEnd(nextSpan)
@@ -341,9 +343,12 @@ class ParagraphStyles(
           continue
         }
 
+        // If removing text at the beginning of the line, we want to remove the span for the whole paragraph
         if (isBackspace) {
-          endCursorPosition -= 1
+          val currentParagraphBounds = s.getParagraphBounds(endCursorPosition)
+          removeSpansForRange(s, currentParagraphBounds.first, currentParagraphBounds.second, config.clazz)
           spanState.setStart(style, null)
+          continue
         } else {
           s.insert(endCursorPosition, EnrichedConstants.ZWS_STRING)
           endCursorPosition += 1

package/ios/EnrichedTextInputView.mm

@@ -1884,6 +1884,14 @@ Class<RCTComponentViewProtocol> EnrichedTextInputViewCls(void) {
     return NO;
   }
 
+  // Tapping near a link causes iOS to re-derive typingAttributes from
+  // character attributes after textViewDidChangeSelection returns, undoing
+  // the cleanup in manageSelectionBasedChanges. Strip them again here, right
+  // before insertion, so new text never inherits link styling.
+  if (linkStyle != nullptr) {
+    [linkStyle manageLinkTypingAttributes];
+  }
+
   return YES;
 }
 

package/ios/interfaces/ImageAttachment.mm

@@ -19,6 +19,35 @@
   return self;
 }
 
+- (CGRect)attachmentBoundsForTextContainer:(NSTextContainer *)textContainer
+                      proposedLineFragment:(CGRect)lineFrag
+                             glyphPosition:(CGPoint)position
+                            characterIndex:(NSUInteger)charIndex {
+  CGRect baseBounds = self.bounds;
+
+  if (!textContainer.layoutManager.textStorage ||
+      charIndex >= textContainer.layoutManager.textStorage.length) {
+    return baseBounds;
+  }
+
+  UIFont *font =
+      [textContainer.layoutManager.textStorage attribute:NSFontAttributeName
+                                                 atIndex:charIndex
+                                          effectiveRange:NULL];
+  if (!font) {
+    return baseBounds;
+  }
+
+  // Extend the layout bounds below the baseline by the font's descender.
+  // Without this, a line containing only the attachment has no descender space
+  // below the baseline, but adding a text character introduces it — causing
+  // the line height to jump.  By reserving descender space upfront the line
+  // height stays consistent regardless of whether text is present.
+  CGFloat descender = font.descender;
+  return CGRectMake(baseBounds.origin.x, descender, baseBounds.size.width,
+                    baseBounds.size.height - descender);
+}
+
 - (void)loadAsync {
   NSURL *url = [NSURL URLWithString:self.uri];
   if (!url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-enriched",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Rich Text Editor component for React Native",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",