react-native-enriched 0.2.1 → 0.4.0

package/ios/generated/{RNEnrichedTextInputViewSpec → ReactNativeEnrichedSpec}/RCTComponentViewHelpers.h

@@ -17,6 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)focus;
 - (void)blur;
 - (void)setValue:(NSString *)text;
+- (void)setSelection:(NSInteger)start end:(NSInteger)end;
 - (void)toggleBold;
 - (void)toggleItalic;
 - (void)toggleUnderline;
@@ -25,10 +26,14 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)toggleH1;
 - (void)toggleH2;
 - (void)toggleH3;
+- (void)toggleH4;
+- (void)toggleH5;
+- (void)toggleH6;
 - (void)toggleCodeBlock;
 - (void)toggleBlockQuote;
 - (void)toggleOrderedList;
 - (void)toggleUnorderedList;
+- (void)toggleCheckboxList:(BOOL)checked;
 - (void)addLink:(NSInteger)start end:(NSInteger)end text:(NSString *)text url:(NSString *)url;
 - (void)addImage:(NSString *)uri width:(float)width height:(float)height;
 - (void)startMention:(NSString *)indicator;
@@ -89,6 +94,34 @@ if ([commandName isEqualToString:@"setValue"]) {
   return;
 }
 
+if ([commandName isEqualToString:@"setSelection"]) {
+#if RCT_DEBUG
+  if ([args count] != 2) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 2);
+    return;
+  }
+#endif
+
+  NSObject *arg0 = args[0];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"number", @"EnrichedTextInputView", commandName, @"1st")) {
+    return;
+  }
+#endif
+  NSInteger start = [(NSNumber *)arg0 intValue];
+
+NSObject *arg1 = args[1];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg1, [NSNumber class], @"number", @"EnrichedTextInputView", commandName, @"2nd")) {
+    return;
+  }
+#endif
+  NSInteger end = [(NSNumber *)arg1 intValue];
+
+  [componentView setSelection:start end:end];
+  return;
+}
+
 if ([commandName isEqualToString:@"toggleBold"]) {
 #if RCT_DEBUG
   if ([args count] != 0) {
@@ -201,6 +234,48 @@ if ([commandName isEqualToString:@"toggleH3"]) {
   return;
 }
 
+if ([commandName isEqualToString:@"toggleH4"]) {
+#if RCT_DEBUG
+  if ([args count] != 0) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 0);
+    return;
+  }
+#endif
+
+  
+
+  [componentView toggleH4];
+  return;
+}
+
+if ([commandName isEqualToString:@"toggleH5"]) {
+#if RCT_DEBUG
+  if ([args count] != 0) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 0);
+    return;
+  }
+#endif
+
+  
+
+  [componentView toggleH5];
+  return;
+}
+
+if ([commandName isEqualToString:@"toggleH6"]) {
+#if RCT_DEBUG
+  if ([args count] != 0) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 0);
+    return;
+  }
+#endif
+
+  
+
+  [componentView toggleH6];
+  return;
+}
+
 if ([commandName isEqualToString:@"toggleCodeBlock"]) {
 #if RCT_DEBUG
   if ([args count] != 0) {
@@ -257,6 +332,26 @@ if ([commandName isEqualToString:@"toggleUnorderedList"]) {
   return;
 }
 
+if ([commandName isEqualToString:@"toggleCheckboxList"]) {
+#if RCT_DEBUG
+  if ([args count] != 1) {
+    RCTLogError(@"%@ command %@ received %d arguments, expected %d.", @"EnrichedTextInputView", commandName, (int)[args count], 1);
+    return;
+  }
+#endif
+
+  NSObject *arg0 = args[0];
+#if RCT_DEBUG
+  if (!RCTValidateTypeOfViewCommandArgument(arg0, [NSNumber class], @"boolean", @"EnrichedTextInputView", commandName, @"1st")) {
+    return;
+  }
+#endif
+  BOOL checked = [(NSNumber *)arg0 boolValue];
+
+  [componentView toggleCheckboxList:checked];
+  return;
+}
+
 if ([commandName isEqualToString:@"addLink"]) {
 #if RCT_DEBUG
   if ([args count] != 4) {

package/ios/inputParser/InputParser.mm

@@ -7,11 +7,13 @@
 
 @implementation InputParser {
   EnrichedTextInputView *_input;
+  NSInteger _precedingImageCount;
 }
 
 - (instancetype)initWithInput:(id)input {
   self = [super init];
   _input = (EnrichedTextInputView *)input;
+  _precedingImageCount = 0;
   return self;
 }
 
@@ -31,6 +33,7 @@
   BOOL inOrderedList = NO;
   BOOL inBlockQuote = NO;
   BOOL inCodeBlock = NO;
+  BOOL inCheckboxList = NO;
   unichar lastCharacter = 0;
 
   for (int i = 0; i < text.length; i++) {
@@ -105,6 +108,21 @@
             [result appendString:@"\n</codeblock>\n<br>"];
             inCodeBlock = NO;
           }
+        } else if (inCheckboxList) {
+          CheckboxListStyle *cbLStyle = _input->stylesDict[@(CheckboxList)];
+          BOOL detected =
+              [cbLStyle detectStyle:NSMakeRange(currentRange.location, 0)];
+          if (detected) {
+            BOOL checked = [cbLStyle getCheckboxStateAt:currentRange.location];
+            if (checked) {
+              [result appendString:@"\n<li checked></li>"];
+            } else {
+              [result appendString:@"\n<li></li>"];
+            }
+          } else {
+            [result appendString:@"\n</ul>\n<br>"];
+            inCheckboxList = NO;
+          }
         } else {
           [result appendString:@"\n<br>"];
         }
@@ -137,10 +155,15 @@
             [previousActiveStyles containsObject:@([H1Style getStyleType])] ||
             [previousActiveStyles containsObject:@([H2Style getStyleType])] ||
             [previousActiveStyles containsObject:@([H3Style getStyleType])] ||
+            [previousActiveStyles containsObject:@([H4Style getStyleType])] ||
+            [previousActiveStyles containsObject:@([H5Style getStyleType])] ||
+            [previousActiveStyles containsObject:@([H6Style getStyleType])] ||
             [previousActiveStyles
                 containsObject:@([BlockQuoteStyle getStyleType])] ||
             [previousActiveStyles
-                containsObject:@([CodeBlockStyle getStyleType])]) {
+                containsObject:@([CodeBlockStyle getStyleType])] ||
+            [previousActiveStyles
+                containsObject:@([CheckboxListStyle getStyleType])]) {
           // do nothing, proper closing paragraph tags have been already
           // appended
         } else {
@@ -186,6 +209,13 @@
           inCodeBlock = NO;
           [result appendString:@"\n</codeblock>"];
         }
+        // handle ending checkbox list
+        if (inCheckboxList &&
+            ![currentActiveStyles
+                containsObject:@([CheckboxListStyle getStyleType])]) {
+          inCheckboxList = NO;
+          [result appendString:@"\n</ul>"];
+        }
 
         // handle starting unordered list
         if (!inUnorderedList &&
@@ -215,6 +245,13 @@
           inCodeBlock = YES;
           [result appendString:@"\n<codeblock>"];
         }
+        // handle starting checkbox list
+        if (!inCheckboxList &&
+            [currentActiveStyles
+                containsObject:@([CheckboxListStyle getStyleType])]) {
+          inCheckboxList = YES;
+          [result appendString:@"\n<ul data-type=\"checkbox\">"];
+        }
 
         // don't add the <p> tag if some paragraph styles are present
         if ([currentActiveStyles
@@ -224,10 +261,15 @@
             [currentActiveStyles containsObject:@([H1Style getStyleType])] ||
             [currentActiveStyles containsObject:@([H2Style getStyleType])] ||
             [currentActiveStyles containsObject:@([H3Style getStyleType])] ||
+            [currentActiveStyles containsObject:@([H4Style getStyleType])] ||
+            [currentActiveStyles containsObject:@([H5Style getStyleType])] ||
+            [currentActiveStyles containsObject:@([H6Style getStyleType])] ||
             [currentActiveStyles
                 containsObject:@([BlockQuoteStyle getStyleType])] ||
             [currentActiveStyles
-                containsObject:@([CodeBlockStyle getStyleType])]) {
+                containsObject:@([CodeBlockStyle getStyleType])] ||
+            [currentActiveStyles
+                containsObject:@([CheckboxListStyle getStyleType])]) {
           [result appendString:@"\n"];
         } else {
           [result appendString:@"\n<p>"];
@@ -373,13 +415,22 @@
     } else if ([previousActiveStyles
                    containsObject:@([CodeBlockStyle getStyleType])]) {
       [result appendString:@"\n</codeblock>"];
+    } else if ([previousActiveStyles
+                   containsObject:@([CheckboxListStyle getStyleType])]) {
+      [result appendString:@"\n</ul>"];
     } else if ([previousActiveStyles
                    containsObject:@([H1Style getStyleType])] ||
                [previousActiveStyles
                    containsObject:@([H2Style getStyleType])] ||
                [previousActiveStyles
-                   containsObject:@([H3Style getStyleType])]) {
-      // do nothing, heading closing tag has already ben appended
+                   containsObject:@([H3Style getStyleType])] ||
+               [previousActiveStyles
+                   containsObject:@([H4Style getStyleType])] ||
+               [previousActiveStyles
+                   containsObject:@([H5Style getStyleType])] ||
+               [previousActiveStyles
+                   containsObject:@([H6Style getStyleType])]) {
+      // do nothing, heading closing tag has already been appended
     } else {
       [result appendString:@"</p>"];
     }
@@ -401,10 +452,20 @@
       inCodeBlock = NO;
       [result appendString:@"\n</codeblock>"];
     }
+    if (inCheckboxList) {
+      inCheckboxList = NO;
+      [result appendString:@"\n</ul>"];
+    }
   }
 
   [result appendString:@"\n</html>"];
 
+  // remove Object Replacement Characters in the very end
+  [result replaceOccurrencesOfString:@"\uFFFC"
+                          withString:@""
+                             options:0
+                               range:NSMakeRange(0, result.length)];
+
   // remove zero width spaces in the very end
   [result replaceOccurrencesOfString:@"\u200B"
                           withString:@""
@@ -507,9 +568,29 @@
     return @"h2";
   } else if ([style isEqualToNumber:@([H3Style getStyleType])]) {
     return @"h3";
+  } else if ([style isEqualToNumber:@([H4Style getStyleType])]) {
+    return @"h4";
+  } else if ([style isEqualToNumber:@([H5Style getStyleType])]) {
+    return @"h5";
+  } else if ([style isEqualToNumber:@([H6Style getStyleType])]) {
+    return @"h6";
   } else if ([style isEqualToNumber:@([UnorderedListStyle getStyleType])] ||
              [style isEqualToNumber:@([OrderedListStyle getStyleType])]) {
     return @"li";
+  } else if ([style isEqualToNumber:@([CheckboxListStyle getStyleType])]) {
+    if (openingTag) {
+      CheckboxListStyle *checkboxListStyleClass =
+          (CheckboxListStyle *)
+              _input->stylesDict[@([CheckboxListStyle getStyleType])];
+      BOOL checked = [checkboxListStyleClass getCheckboxStateAt:location];
+
+      if (checked) {
+        return @"li checked";
+      }
+      return @"li";
+    } else {
+      return @"li";
+    }
   } else if ([style isEqualToNumber:@([BlockQuoteStyle getStyleType])] ||
              [style isEqualToNumber:@([CodeBlockStyle getStyleType])]) {
     // blockquotes and codeblock use <p> tags the same way lists use <li>
@@ -608,6 +689,28 @@
         [((ImageStyle *)baseStyle) addImageAtRange:styleRange
                                          imageData:imgData
                                      withSelection:NO];
+      } else if ([styleType
+                     isEqualToNumber:@([CheckboxListStyle getStyleType])]) {
+        NSDictionary *checkboxStates = (NSDictionary *)stylePair.styleValue;
+        CheckboxListStyle *cbLStyle = (CheckboxListStyle *)baseStyle;
+
+        // First apply the checkbox list style to the entire range with
+        // unchecked value
+        BOOL shouldAddTypingAttr =
+            styleRange.location + styleRange.length == plainTextLength;
+        [cbLStyle addAttributes:styleRange withTypingAttr:shouldAddTypingAttr];
+
+        if (!checkboxStates && checkboxStates.count == 0) {
+          continue;
+        }
+        // Then toggle checked checkboxes
+        for (NSNumber *key in checkboxStates) {
+          NSUInteger checkboxPosition = offset + [key unsignedIntegerValue];
+          BOOL isChecked = [checkboxStates[key] boolValue];
+          if (isChecked) {
+            [cbLStyle toggleCheckedAt:checkboxPosition];
+          }
+        }
       } else {
         BOOL shouldAddTypingAttr =
             styleRange.location + styleRange.length == plainTextLength;
@@ -726,6 +829,10 @@
                                          inString:fixedHtml
                                           leading:YES
                                          trailing:NO];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"<li checked>"
+                                         inString:fixedHtml
+                                          leading:YES
+                                         trailing:NO];
     fixedHtml = [self stringByAddingNewlinesToTag:@"<h1>"
                                          inString:fixedHtml
                                           leading:YES
@@ -738,6 +845,18 @@
                                          inString:fixedHtml
                                           leading:YES
                                          trailing:NO];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"<h4>"
+                                         inString:fixedHtml
+                                          leading:YES
+                                         trailing:NO];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"<h5>"
+                                         inString:fixedHtml
+                                          leading:YES
+                                         trailing:NO];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"<h6>"
+                                         inString:fixedHtml
+                                          leading:YES
+                                         trailing:NO];
 
     // line closing tags
     fixedHtml = [self stringByAddingNewlinesToTag:@"</p>"
@@ -760,6 +879,18 @@
                                          inString:fixedHtml
                                           leading:NO
                                          trailing:YES];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"</h4>"
+                                         inString:fixedHtml
+                                          leading:NO
+                                         trailing:YES];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"</h5>"
+                                         inString:fixedHtml
+                                          leading:NO
+                                         trailing:YES];
+    fixedHtml = [self stringByAddingNewlinesToTag:@"</h6>"
+                                         inString:fixedHtml
+                                          leading:NO
+                                         trailing:YES];
 
     // this is more like a hack but for some reason the last <br> in
     // <blockquote> and <codeblock> are not properly changed into zero width
@@ -788,11 +919,11 @@
  * APPROACH:
  * This function treats the HTML as having two distinct states:
  * 1. Structure Mode (Depth == 0): We are inside or between container tags (like
- * <blockquote>, <ul>, <codeblock>). In this mode whitespace and newlines are
+ * blockquote, ul, codeblock). In this mode whitespace and newlines are
  * considered layout artifacts and are REMOVED to prevent the parser from
  * creating unwanted spaces.
- * 2. Content Mode (Depth > 0): We are inside a text-containing tag (like <p>,
- * <b>, <li>). In this mode, all whitespace is PRESERVED exactly as is, ensuring
+ * 2. Content Mode (Depth > 0): We are inside a text-containing tag (like p,
+ * b, li). In this mode, all whitespace is PRESERVED exactly as is, ensuring
  * that sentences and inline formatting remain readable.
  *
  * The function iterates character-by-character, using a depth counter to track
@@ -800,13 +931,13 @@
  *
  * IMPORTANT:
  * The `textTags` set acts as a whitelist for "Content Mode". If you add support
- * for a new HTML tag that contains visible text (e.g., <h4>, <h5>, <h6>),
+ * for a new HTML tag that contains visible text (e.g., h4, h5, h6),
  * you MUST add it to the `textTags` set below.
  */
 - (NSString *)stripExtraWhiteSpacesAndNewlines:(NSString *)html {
-  NSSet *textTags =
-      [NSSet setWithObjects:@"p", @"h1", @"h2", @"h3", @"li", @"b", @"a", @"s",
-                            @"mention", @"code", @"u", @"i", nil];
+  NSSet *textTags = [NSSet setWithObjects:@"p", @"h1", @"h2", @"h3", @"h4",
+                                          @"h5", @"h6", @"li", @"b", @"a", @"s",
+                                          @"mention", @"code", @"u", @"i", nil];
 
   NSMutableString *output = [NSMutableString stringWithCapacity:html.length];
   NSMutableString *currentTagBuffer = [NSMutableString string];
@@ -901,7 +1032,19 @@
 
   NSArray *tagData = ongoingTags[tagName];
   NSInteger tagLocation = [((NSNumber *)tagData[0]) intValue];
-  NSRange tagRange = NSMakeRange(tagLocation, plainText.length - tagLocation);
+
+  // 'tagLocation' is an index based on 'plainText' which currently only holds
+  // raw text.
+  //
+  // Since 'plainText' does not yet contain the special placeholders for images,
+  // the indices for any text following an image are lower than they will be
+  // in the final NSTextStorage.
+  //
+  // We add '_precedingImageCount' to shift the start index forward, aligning
+  // this style's range with the actual position in the final text (where each
+  // image adds 1 character).
+  NSRange tagRange = NSMakeRange(tagLocation + _precedingImageCount,
+                                 plainText.length - tagLocation);
 
   [tagEntry addObject:[tagName copy]];
   [tagEntry addObject:[NSValue valueWithRange:tagRange]];
@@ -911,12 +1054,19 @@
 
   [processedTags addObject:tagEntry];
   [ongoingTags removeObjectForKey:tagName];
+
+  if ([tagName isEqualToString:@"img"]) {
+    _precedingImageCount++;
+  }
 }
 
 - (NSArray *)getTextAndStylesFromHtml:(NSString *)fixedHtml {
   NSMutableString *plainText = [[NSMutableString alloc] initWithString:@""];
   NSMutableDictionary *ongoingTags = [[NSMutableDictionary alloc] init];
   NSMutableArray *initiallyProcessedTags = [[NSMutableArray alloc] init];
+  NSMutableDictionary *checkboxStates = [[NSMutableDictionary alloc] init];
+  BOOL insideCheckboxList = NO;
+  _precedingImageCount = 0;
   BOOL insideTag = NO;
   BOOL gettingTagName = NO;
   BOOL gettingTagParams = NO;
@@ -956,9 +1106,14 @@
       }
 
       if ([currentTagName isEqualToString:@"p"] ||
-          [currentTagName isEqualToString:@"br"] ||
-          [currentTagName isEqualToString:@"li"]) {
+          [currentTagName isEqualToString:@"br"]) {
         // do nothing, we don't include these tags in styles
+      } else if ([currentTagName isEqualToString:@"li"]) {
+        // Only track checkbox state if we're inside a checkbox list
+        if (insideCheckboxList && !closingTag) {
+          BOOL isChecked = [currentTagParams containsString:@"checked"];
+          checkboxStates[@(plainText.length)] = @(isChecked);
+        }
       } else if (!closingTag) {
         // we finish opening tag - get its location and optionally params and
         // put them under tag name key in ongoingTags
@@ -969,6 +1124,12 @@
         }
         ongoingTags[currentTagName] = tagArr;
 
+        // Check if this is a checkbox list
+        if ([currentTagName isEqualToString:@"ul"] &&
+            [self isUlCheckboxList:currentTagParams]) {
+          insideCheckboxList = YES;
+        }
+
         // skip one newline after opening tags that are in separate lines
         // intentionally
         if ([currentTagName isEqualToString:@"ul"] ||
@@ -988,6 +1149,12 @@
         // we finish closing tags - pack tag name, tag range and optionally tag
         // params into an entry that goes inside initiallyProcessedTags
 
+        // Check if we're closing a checkbox list by looking at the params
+        if ([currentTagName isEqualToString:@"ul"] &&
+            [self isUlCheckboxList:currentTagParams]) {
+          insideCheckboxList = NO;
+        }
+
         // skip one newline that was added before some closing tags that are in
         // separate lines
         if ([currentTagName isEqualToString:@"ul"] ||
@@ -1148,7 +1315,7 @@
       [styleArr addObject:@([MentionStyle getStyleType])];
       // extract html expression into dict using some regex
       NSMutableDictionary *paramsDict = [[NSMutableDictionary alloc] init];
-      NSString *pattern = @"(\\w+)=\"([^\"]*)\"";
+      NSString *pattern = @"(\\w+)=(['\"])(.*?)\\2";
       NSRegularExpression *regex =
           [NSRegularExpression regularExpressionWithPattern:pattern
                                                     options:0
@@ -1160,11 +1327,11 @@
                            usingBlock:^(NSTextCheckingResult *_Nullable result,
                                         NSMatchingFlags flags,
                                         BOOL *_Nonnull stop) {
-                             if (result.numberOfRanges == 3) {
+                             if (result.numberOfRanges == 4) {
                                NSString *key = [params
                                    substringWithRange:[result rangeAtIndex:1]];
                                NSString *value = [params
-                                   substringWithRange:[result rangeAtIndex:2]];
+                                   substringWithRange:[result rangeAtIndex:3]];
                                paramsDict[key] = value;
                              }
                            }];
@@ -1192,9 +1359,22 @@
         [styleArr addObject:@([H2Style getStyleType])];
       } else if ([tagName isEqualToString:@"h3"]) {
         [styleArr addObject:@([H3Style getStyleType])];
+      } else if ([tagName isEqualToString:@"h4"]) {
+        [styleArr addObject:@([H4Style getStyleType])];
+      } else if ([tagName isEqualToString:@"h5"]) {
+        [styleArr addObject:@([H5Style getStyleType])];
+      } else if ([tagName isEqualToString:@"h6"]) {
+        [styleArr addObject:@([H6Style getStyleType])];
       }
     } else if ([tagName isEqualToString:@"ul"]) {
-      [styleArr addObject:@([UnorderedListStyle getStyleType])];
+      if ([self isUlCheckboxList:params]) {
+        [styleArr addObject:@([CheckboxListStyle getStyleType])];
+        stylePair.styleValue =
+            [self prepareCheckboxListStyleValue:tagRangeValue
+                                 checkboxStates:checkboxStates];
+      } else {
+        [styleArr addObject:@([UnorderedListStyle getStyleType])];
+      }
     } else if ([tagName isEqualToString:@"ol"]) {
       [styleArr addObject:@([OrderedListStyle getStyleType])];
     } else if ([tagName isEqualToString:@"blockquote"]) {
@@ -1215,4 +1395,24 @@
   return @[ plainText, processedStyles ];
 }
 
+- (BOOL)isUlCheckboxList:(NSString *)params {
+  return ([params containsString:@"data-type=\"checkbox\""] ||
+          [params containsString:@"data-type='checkbox'"]);
+}
+
+- (NSDictionary *)prepareCheckboxListStyleValue:(NSValue *)rangeValue
+                                 checkboxStates:(NSDictionary *)checkboxStates {
+  NSRange range = [rangeValue rangeValue];
+  NSMutableDictionary *statesInRange = [[NSMutableDictionary alloc] init];
+
+  for (NSNumber *key in checkboxStates) {
+    NSUInteger pos = [key unsignedIntegerValue];
+    if (pos >= range.location && pos < range.location + range.length) {
+      [statesInRange setObject:checkboxStates[key] forKey:key];
+    }
+  }
+
+  return statesInRange;
+}
+
 @end