feat: add iOSExperimentalHTMLSerializer prop

IvanIhnatsiuk · IvanIhnatsiuk · commit 3ad7f30888b8 · 2026-01-06T23:05:14.000+01:00
diff --git a/android/src/main/java/com/swmansion/enriched/EnrichedTextInputViewManager.kt b/android/src/main/java/com/swmansion/enriched/EnrichedTextInputViewManager.kt
@@ -239,6 +239,13 @@ class EnrichedTextInputViewManager :
     view?.experimentalSynchronousEvents = value
   }
 
+  override fun setIOSExperimentalHTMLSerializer(
+    view: EnrichedTextInputView?,
+    value: Boolean,
+  ) {
+    // iOS only prop
+  }
+
   override fun focus(view: EnrichedTextInputView?) {
     view?.requestFocusProgrammatically()
   }
diff --git a/apps/example/src/App.tsx b/apps/example/src/App.tsx
@@ -302,6 +302,7 @@ export default function App() {
             onChangeText={(e) => handleChangeText(e.nativeEvent)}
             onChangeHtml={(e) => handleChangeHtml(e.nativeEvent)}
             onChangeState={(e) => handleChangeState(e.nativeEvent)}
+            iOSExperimentalHTMLSerializer={true}
             onLinkDetected={handleLinkDetected}
             onMentionDetected={console.log}
             onStartMention={handleStartMention}
diff --git a/ios/EnrichedTextInputView.h b/ios/EnrichedTextInputView.h
@@ -30,6 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
   NSDictionary<NSNumber *, NSArray<NSNumber *> *> *blockingStyles;
 @public
   BOOL blockEmitting;
+  BOOL useExperimentalHTMLParser;
 }
 - (CGSize)measureSize:(CGFloat)maxWidth;
 - (void)emitOnLinkDetectedEvent:(NSString *)text
diff --git a/ios/EnrichedTextInputView.mm b/ios/EnrichedTextInputView.mm
@@ -80,6 +80,7 @@ - (void)setDefaults {
   _emitHtml = NO;
   blockEmitting = NO;
   _emitFocusBlur = YES;
+  useExperimentalHTMLParser = NO;
 
   defaultTypingAttributes =
       [[NSMutableDictionary<NSAttributedStringKey, id> alloc] init];
@@ -229,6 +230,8 @@ - (void)updateProps:(Props::Shared const &)props
   BOOL isFirstMount = NO;
   BOOL stylePropChanged = NO;
 
+  useExperimentalHTMLParser = newViewProps.iOSExperimentalHTMLSerializer;
+
   // initial config
   if (config == nullptr) {
     isFirstMount = YES;
diff --git a/ios/inputParser/EnrichedAttributedStringHTMLSerializer.mm b/ios/inputParser/EnrichedAttributedStringHTMLSerializer.mm
@@ -45,7 +45,7 @@ - (NSString *)buildHtmlFromAttributedString:(NSAttributedString *)text
                                     pretify:(BOOL)pretify {
 
   if (text.length == 0)
-    return @"<html>\n<p></p>\n</html>";
+    return DefaultHtmlValue;
 
   HTMLElement *root = [self buildRootNodeFromAttributedString:text];
 
@@ -59,10 +59,10 @@ - (HTMLElement *)buildRootNodeFromAttributedString:(NSAttributedString *)text {
   NSString *plain = text.string;
 
   HTMLElement *root = [HTMLElement new];
-  root.tag = "html";
+  root.tag = HtmlTagHTML;
 
   HTMLElement *br = [HTMLElement new];
-  br.tag = "br";
+  br.tag = HtmlTagBR;
   br.selfClosing = YES;
 
   __block id<BaseStyleProtocol> previousParagraphStyle = nil;
@@ -161,7 +161,7 @@ - (HTMLElement *)currentParagraphType:(NSNumber *)currentParagraphType
                              rootNode:(HTMLElement *)rootNode {
   if (!currentParagraphType) {
     HTMLElement *outer = [HTMLElement new];
-    outer.tag = "p";
+    outer.tag = HtmlParagraphTag;
     [rootNode.children addObject:outer];
     return outer;
   }
@@ -190,7 +190,7 @@ - (HTMLElement *)currentParagraphType:(NSNumber *)currentParagraphType
                       rootNode:(HTMLElement *)rootNode {
   if (!currentStyle) {
     HTMLElement *outer = [HTMLElement new];
-    outer.tag = "p";
+    outer.tag = HtmlParagraphTag;
     [rootNode.children addObject:outer];
     return outer;
   }
@@ -273,7 +273,7 @@ - (void)createHtmlFromNode:(HTMLNode *)node
     [self createHtmlFromNode:child into:buffer pretify:pretify];
 
   if (addNewLineAfter)
-    appendC(buffer, "\n");
+    appendC(buffer, NewLine);
 
   appendCloseTag(buffer, element.tag);
 }
diff --git a/ios/inputParser/EnrichedAttributedStringHTMLSerializerTagUtils.h b/ios/inputParser/EnrichedAttributedStringHTMLSerializerTagUtils.h
@@ -14,6 +14,7 @@ static const unichar HtmlLessThanChar = '<';
 static const unichar HtmlGreaterThanChar = '>';
 static const unichar HtmlAmpersandChar = '&';
 
+static const char *NewLine = "\n";
 static const char *NewlineOpenTag = "\n<";
 
 static const char *OpenTagStart = "<";
@@ -35,6 +36,12 @@ static const char *HtmlTagBR = "br";
 static const char *HtmlTagHTML = "html";
 static const char *HtmlTagBlockquote = "blockquote";
 static const char *HtmlTagCodeblock = "codeblock";
+static const char *HtmlHRTag = "hr";
+static const char *HtmlChecklistTag = "checklist";
+static const char *HtmlContentTag = "content";
+static const char *HtmlParagraphTag = "p";
+
+static NSString *const DefaultHtmlValue = @"<html>\n<p></p>\n</html>";
 
 static inline void appendC(NSMutableData *buf, const char *c) {
   if (!c)
@@ -109,7 +116,9 @@ static inline BOOL isBlockTag(const char *t) {
   case 'p':
     return t[1] == '\0';
   case 'h':
-    return t[2] == '\0' && (t[1] == '1' || t[1] == '2' || t[1] == '3');
+    return t[2] == '\0' &&
+           (t[1] == '1' || t[1] == '2' || t[1] == '3' || t[1] == '4' ||
+            t[1] == '5' || t[1] == '6' || t[1] == 'r');
   case 'u':
     return strcmp(t, HtmlTagUL) == 0;
   case 'o':
@@ -119,7 +128,8 @@ static inline BOOL isBlockTag(const char *t) {
   case 'b':
     return strcmp(t, HtmlTagBR) == 0 || strcmp(t, HtmlTagBlockquote) == 0;
   case 'c':
-    return strcmp(t, HtmlTagCodeblock) == 0;
+    return strcmp(t, HtmlTagCodeblock) == 0 || strcmp(t, HtmlContentTag) ||
+           strcmp(t, HtmlChecklistTag);
   default:
     return NO;
   }
diff --git a/ios/inputParser/InputParser.mm b/ios/inputParser/InputParser.mm
@@ -21,8 +21,18 @@ - (instancetype)initWithInput:(id)input {
 }
 
 - (NSString *)parseToHtmlFromRange:(NSRange)range {
-  NSAttributedString *sub =
-      [_input->textView.textStorage attributedSubstringFromRange:range];
+
+  if (_input->useExperimentalHTMLParser) {
+    NSAttributedString *attributedString =
+        [_input->textView.textStorage attributedSubstringFromRange:range];
+    return [_attributedStringHTMLSerializer
+        buildHtmlFromAttributedString:attributedString
+                              pretify:YES];
+  }
+
+  NSInteger offset = range.location;
+  NSString *text =
+      [_input->textView.textStorage.string substringWithRange:range];
 
   if (text.length == 0) {
     return @"<html>\n<p></p>\n</html>";
@@ -526,9 +536,6 @@ - (NSString *)tagContentForStyle:(NSNumber *)style
     return @"p";
   }
   return @"";
-  return [_htmlParser buildHtmlFromAttributedString:sub pretify:YES];
-  return [_attributedStringHTMLSerializer buildHtmlFromAttributedString:sub
-                                                                pretify:YES];
 }
 
 - (void)replaceWholeFromHtml:(NSString *_Nonnull)html {
diff --git a/src/EnrichedTextInput.tsx b/src/EnrichedTextInput.tsx
@@ -150,6 +150,9 @@ export interface EnrichedTextInputProps extends Omit<ViewProps, 'children'> {
    * Disabled by default.
    */
   androidExperimentalSynchronousEvents?: boolean;
+  // new implementation of html serializer for iOS which fixes some edge cases and
+  // improves performance. Still experimental because we don't want to enable it by default yet.
+  iOSExperimentalHTMLSerializer?: boolean;
 }
 
 const nullthrows = <T,>(value: T | null | undefined): T => {
@@ -199,6 +202,7 @@ export const EnrichedTextInput = ({
   onChangeSelection,
   androidExperimentalSynchronousEvents = false,
   scrollEnabled = true,
+  iOSExperimentalHTMLSerializer = false,
   ...rest
 }: EnrichedTextInputProps) => {
   const nativeRef = useRef<ComponentType | null>(null);
@@ -399,6 +403,7 @@ export const EnrichedTextInput = ({
       androidExperimentalSynchronousEvents={
         androidExperimentalSynchronousEvents
       }
+      iOSExperimentalHTMLSerializer={iOSExperimentalHTMLSerializer}
       scrollEnabled={scrollEnabled}
       {...rest}
     />
diff --git a/src/EnrichedTextInputNativeComponent.ts b/src/EnrichedTextInputNativeComponent.ts
@@ -163,6 +163,7 @@ export interface NativeProps extends ViewProps {
 
   // Experimental
   androidExperimentalSynchronousEvents: boolean;
+  iOSExperimentalHTMLSerializer: boolean;
 }
 
 type ComponentType = HostComponent<NativeProps>;

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,13 @@ class EnrichedTextInputViewManager :`
`239`	`239`	`view?.experimentalSynchronousEvents = value`
`240`	`240`	`}`
`241`	`241`
	`242`	`+ override fun setIOSExperimentalHTMLSerializer(`
	`243`	`+ view: EnrichedTextInputView?,`
	`244`	`+ value: Boolean,`
	`245`	`+ ) {`
	`246`	`+ // iOS only prop`
	`247`	`+ }`
	`248`	`+`
`242`	`249`	`override fun focus(view: EnrichedTextInputView?) {`
`243`	`250`	`view?.requestFocusProgrammatically()`
`244`	`251`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ NS_ASSUME_NONNULL_BEGIN`
`30`	`30`	`NSDictionary<NSNumber , NSArray<NSNumber > > blockingStyles;`
`31`	`31`	`@public`
`32`	`32`	`BOOL blockEmitting;`
	`33`	`+ BOOL useExperimentalHTMLParser;`
`33`	`34`	`}`
`34`	`35`	`- (CGSize)measureSize:(CGFloat)maxWidth;`
`35`	`36`	`- (void)emitOnLinkDetectedEvent:(NSString *)text`
Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,7 @@ export interface NativeProps extends ViewProps {`
`163`	`163`
`164`	`164`	`// Experimental`
`165`	`165`	`androidExperimentalSynchronousEvents: boolean;`
	`166`	`+ iOSExperimentalHTMLSerializer: boolean;`
`166`	`167`	`}`
`167`	`168`
`168`	`169`	`type ComponentType = HostComponent<NativeProps>;`