react-native-enriched 0.2.1 → 0.4.0

package/ios/styles/HeadingStyleBase.mm

@@ -1,21 +1,28 @@
 #import "EnrichedTextInputView.h"
 #import "FontExtension.h"
 #import "OccurenceUtils.h"
+#import "ParagraphsUtils.h"
 #import "StyleHeaders.h"
 #import "TextInsertionUtils.h"
 
 @implementation HeadingStyleBase
 
-// mock values since H1/2/3Style classes anyway are used
+// mock values since H1/2/3/4/5/6Style classes anyway are used
 + (StyleType)getStyleType {
   return None;
 }
 - (CGFloat)getHeadingFontSize {
   return 0;
 }
+- (NSString *)getHeadingLevelString {
+  return @"";
+}
 - (BOOL)isHeadingBold {
   return false;
 }
++ (BOOL)isParagraphStyle {
+  return true;
+}
 
 - (EnrichedTextInputView *)typedInput {
   return (EnrichedTextInputView *)input;
@@ -39,17 +46,48 @@
   }
 }
 
+- (NSTextList *)getTextListObject {
+  return [[NSTextList alloc]
+      initWithMarkerFormat:[NSString
+                               stringWithFormat:@"{heading:%@}",
+                                                [self getHeadingLevelString]]
+                   options:0];
+}
+
 // the range will already be the proper full paragraph/s range
 - (void)addAttributes:(NSRange)range withTypingAttr:(BOOL)withTypingAttr {
-  [[self typedInput]->textView.textStorage beginEditing];
-  [[self typedInput]->textView.textStorage
-      enumerateAttribute:NSFontAttributeName
-                 inRange:range
-                 options:0
-              usingBlock:^(id _Nullable value, NSRange range,
-                           BOOL *_Nonnull stop) {
-                UIFont *font = (UIFont *)value;
-                if (font != nullptr) {
+  NSTextList *textListMarker = [self getTextListObject];
+  NSArray *paragraphs =
+      [ParagraphsUtils getSeparateParagraphsRangesIn:[self typedInput]->textView
+                                               range:range];
+  for (NSValue *value in paragraphs) {
+    NSRange paragraphRange = [value rangeValue];
+
+    [[self typedInput]->textView.textStorage
+        enumerateAttribute:NSParagraphStyleAttributeName
+                   inRange:paragraphRange
+                   options:0
+                usingBlock:^(id _Nullable value, NSRange range,
+                             BOOL *_Nonnull stop) {
+                  NSMutableParagraphStyle *pStyle =
+                      [(NSParagraphStyle *)value mutableCopy];
+                  pStyle.textLists = @[ textListMarker ];
+                  [[self typedInput]->textView.textStorage
+                      addAttribute:NSParagraphStyleAttributeName
+                             value:pStyle
+                             range:range];
+                }];
+
+    [[self typedInput]->textView.textStorage
+        enumerateAttribute:NSFontAttributeName
+                   inRange:paragraphRange
+                   options:0
+                usingBlock:^(id _Nullable value, NSRange range,
+                             BOOL *_Nonnull stop) {
+                  UIFont *font = (UIFont *)value;
+                  if (font == nullptr) {
+                    return;
+                  }
                   UIFont *newFont = [font setSize:[self getHeadingFontSize]];
                   if ([self isHeadingBold]) {
                     newFont = [newFont setBold];
@@ -58,9 +96,8 @@
                       addAttribute:NSFontAttributeName
                              value:newFont
                              range:range];
-                }
-              }];
-  [[self typedInput]->textView.textStorage endEditing];
+                }];
+  }
 
   // also toggle typing attributes
   if (withTypingAttr) {
@@ -71,36 +108,59 @@
 // will always be called on empty paragraphs so only typing attributes can be
 // changed
 - (void)addTypingAttributes {
-  UIFont *currentFontAttr =
-      (UIFont *)[self typedInput]
-          ->textView.typingAttributes[NSFontAttributeName];
+  NSMutableDictionary *newTypingAttrs =
+      [[self typedInput]->textView.typingAttributes mutableCopy];
+
+  NSMutableParagraphStyle *pStyle =
+      [newTypingAttrs[NSParagraphStyleAttributeName] mutableCopy];
+  if (pStyle != nullptr) {
+    pStyle.textLists = @[ [self getTextListObject] ];
+    newTypingAttrs[NSParagraphStyleAttributeName] = pStyle;
+  }
+
+  UIFont *currentFontAttr = (UIFont *)newTypingAttrs[NSFontAttributeName];
   if (currentFontAttr != nullptr) {
-    NSMutableDictionary *newTypingAttrs =
-        [[self typedInput]->textView.typingAttributes mutableCopy];
     UIFont *newFont = [currentFontAttr setSize:[self getHeadingFontSize]];
     if ([self isHeadingBold]) {
       newFont = [newFont setBold];
     }
     newTypingAttrs[NSFontAttributeName] = newFont;
-    [self typedInput]->textView.typingAttributes = newTypingAttrs;
   }
+
+  [self typedInput]->textView.typingAttributes = newTypingAttrs;
 }
 
 // we need to remove the style from the whole paragraph
 - (void)removeAttributes:(NSRange)range {
-  NSRange paragraphRange = [[self typedInput]->textView.textStorage.string
-      paragraphRangeForRange:range];
-
-  [[self typedInput]->textView.textStorage beginEditing];
-  [[self typedInput]->textView.textStorage
-      enumerateAttribute:NSFontAttributeName
-                 inRange:paragraphRange
-                 options:0
-              usingBlock:^(id _Nullable value, NSRange range,
-                           BOOL *_Nonnull stop) {
-                if ([self styleCondition:value:range]) {
+  NSArray *paragraphs =
+      [ParagraphsUtils getSeparateParagraphsRangesIn:[self typedInput]->textView
+                                               range:range];
+
+  for (NSValue *value in paragraphs) {
+    NSRange paragraphRange = [value rangeValue];
+    [[self typedInput]->textView.textStorage
+        enumerateAttribute:NSParagraphStyleAttributeName
+                   inRange:paragraphRange
+                   options:0
+                usingBlock:^(id _Nullable value, NSRange range,
+                             BOOL *_Nonnull stop) {
+                  NSMutableParagraphStyle *pStyle =
+                      [(NSParagraphStyle *)value mutableCopy];
+                  pStyle.textLists = @[];
+                  [[self typedInput]->textView.textStorage
+                      addAttribute:NSParagraphStyleAttributeName
+                             value:pStyle
+                             range:range];
+                }];
+
+    [[self typedInput]->textView.textStorage
+        enumerateAttribute:NSFontAttributeName
+                   inRange:paragraphRange
+                   options:0
+                usingBlock:^(id _Nullable value, NSRange range,
+                             BOOL *_Nonnull stop) {
                   UIFont *newFont = [(UIFont *)value
-                      setSize:[[[self typedInput]->config primaryFontSize]
+                      setSize:[[[self typedInput]->config scaledPrimaryFontSize]
                                   floatValue]];
                   if ([self isHeadingBold]) {
                     newFont = [newFont removeBold];
@@ -109,73 +169,81 @@
                       addAttribute:NSFontAttributeName
                              value:newFont
                              range:range];
-                }
-              }];
-  [[self typedInput]->textView.textStorage endEditing];
+                }];
+  }
 
   // typing attributes still need to be removed
-  UIFont *currentFontAttr =
-      (UIFont *)[self typedInput]
-          ->textView.typingAttributes[NSFontAttributeName];
+  NSMutableDictionary *newTypingAttrs =
+      [[self typedInput]->textView.typingAttributes mutableCopy];
+
+  NSMutableParagraphStyle *pStyle =
+      [newTypingAttrs[NSParagraphStyleAttributeName] mutableCopy];
+  if (pStyle != nullptr) {
+    pStyle.textLists = @[];
+    newTypingAttrs[NSParagraphStyleAttributeName] = pStyle;
+  }
+
+  UIFont *currentFontAttr = (UIFont *)newTypingAttrs[NSFontAttributeName];
   if (currentFontAttr != nullptr) {
-    NSMutableDictionary *newTypingAttrs =
-        [[self typedInput]->textView.typingAttributes mutableCopy];
     UIFont *newFont = [currentFontAttr
-        setSize:[[[self typedInput]->config primaryFontSize] floatValue]];
+        setSize:[[[self typedInput]->config scaledPrimaryFontSize] floatValue]];
     if ([self isHeadingBold]) {
       newFont = [newFont removeBold];
     }
     newTypingAttrs[NSFontAttributeName] = newFont;
-    [self typedInput]->textView.typingAttributes = newTypingAttrs;
   }
+
+  [self typedInput]->textView.typingAttributes = newTypingAttrs;
 }
 
 - (void)removeTypingAttributes {
-  // all the heading still needs to be removed because this function may be
-  // called in conflicting styles logic typing attributes already get removed in
-  // there as well
+  // All the heading still needs to be removed because this function may be
+  // called in conflicting styles logic. Typing attributes already get removed
+  // in there as well.
   [self removeAttributes:[self typedInput]->textView.selectedRange];
 }
 
-- (BOOL)styleCondition:(id _Nullable)value:(NSRange)range {
-  UIFont *font = (UIFont *)value;
-  return font != nullptr && font.pointSize == [self getHeadingFontSize];
+- (BOOL)styleCondition:(id _Nullable)value range:(NSRange)range {
+  NSParagraphStyle *paragraph = (NSParagraphStyle *)value;
+  return paragraph != nullptr && paragraph.textLists.count == 1 &&
+         [paragraph.textLists.firstObject.markerFormat
+             isEqualToString:[self getTextListObject].markerFormat];
 }
 
 - (BOOL)detectStyle:(NSRange)range {
   if (range.length >= 1) {
-    return [OccurenceUtils detect:NSFontAttributeName
+    return [OccurenceUtils detect:NSParagraphStyleAttributeName
                         withInput:[self typedInput]
                           inRange:range
                     withCondition:^BOOL(id _Nullable value, NSRange range) {
-                      return [self styleCondition:value:range];
+                      return [self styleCondition:value range:range];
                     }];
   } else {
-    return [OccurenceUtils detect:NSFontAttributeName
+    return [OccurenceUtils detect:NSParagraphStyleAttributeName
                         withInput:[self typedInput]
                           atIndex:range.location
                     checkPrevious:YES
                     withCondition:^BOOL(id _Nullable value, NSRange range) {
-                      return [self styleCondition:value:range];
+                      return [self styleCondition:value range:range];
                     }];
   }
 }
 
 - (BOOL)anyOccurence:(NSRange)range {
-  return [OccurenceUtils any:NSFontAttributeName
+  return [OccurenceUtils any:NSParagraphStyleAttributeName
                    withInput:[self typedInput]
                      inRange:range
                withCondition:^BOOL(id _Nullable value, NSRange range) {
-                 return [self styleCondition:value:range];
+                 return [self styleCondition:value range:range];
                }];
 }
 
 - (NSArray<StylePair *> *_Nullable)findAllOccurences:(NSRange)range {
-  return [OccurenceUtils all:NSFontAttributeName
+  return [OccurenceUtils all:NSParagraphStyleAttributeName
                    withInput:[self typedInput]
                      inRange:range
                withCondition:^BOOL(id _Nullable value, NSRange range) {
-                 return [self styleCondition:value:range];
+                 return [self styleCondition:value range:range];
                }];
 }
 
@@ -192,30 +260,51 @@
                additionalAttributes:nullptr
                               input:[self typedInput]
                       withSelection:YES];
-    // remove the attribtues at the new selection
+    // remove the attributes at the new selection
     [self removeAttributes:[self typedInput]->textView.selectedRange];
     return YES;
   }
   return NO;
 }
 
-// backspacing a line after a heading "into" a heading will not result in the
-// text attaining heading attributes so, we do it manually
-- (void)handleImproperHeadings {
-  NSArray *occurences = [self
-      findAllOccurences:NSMakeRange(0,
-                                    [self typedInput]
-                                        ->textView.textStorage.string.length)];
-  for (StylePair *pair in occurences) {
-    NSRange occurenceRange = [pair.rangeValue rangeValue];
-    NSRange paragraphRange = [[self typedInput]->textView.textStorage.string
-        paragraphRangeForRange:occurenceRange];
-    if (!NSEqualRanges(occurenceRange, paragraphRange)) {
-      // we have a heading but it does not span its whole paragraph - let's fix
-      // it
-      [self addAttributes:paragraphRange withTypingAttr:NO];
-    }
+// Backspacing a line after a heading "into" a heading will not result in the
+// text not receiving heading font attributes.
+// Hence, we fix these attributes then.
+- (BOOL)handleBackspaceInRange:(NSRange)range replacementText:(NSString *)text {
+  // Must be a backspace.
+  if (text.length != 0) {
+    return NO;
+  }
+
+  // Backspace must have removed a newline character.
+  NSString *removedString =
+      [[self typedInput]->textView.textStorage.string substringWithRange:range];
+  if ([removedString
+          rangeOfCharacterFromSet:[NSCharacterSet newlineCharacterSet]]
+          .location == NSNotFound) {
+    return NO;
   }
+
+  // Heading style must have been present in a paragraph before the backspaced
+  // range.
+  NSRange paragraphBeforeBackspaceRange =
+      [[self typedInput]->textView.textStorage.string
+          paragraphRangeForRange:NSMakeRange(range.location, 0)];
+  if (![self detectStyle:paragraphBeforeBackspaceRange]) {
+    return NO;
+  }
+
+  // Manually do the replacing.
+  [TextInsertionUtils replaceText:text
+                               at:range
+             additionalAttributes:nullptr
+                            input:[self typedInput]
+                    withSelection:YES];
+  // Reapply attributes at the beginning of the backspaced range (it will cover
+  // the whole paragraph properly).
+  [self addAttributes:NSMakeRange(range.location, 0) withTypingAttr:YES];
+
+  return YES;
 }
 
 @end

package/ios/styles/ImageStyle.mm

@@ -54,7 +54,7 @@ static NSString *const ImageAttributeName = @"ImageAttributeName";
   _input->textView.typingAttributes = currentAttributes;
 }
 
-- (BOOL)styleCondition:(id _Nullable)value:(NSRange)range {
+- (BOOL)styleCondition:(id _Nullable)value range:(NSRange)range {
   return [value isKindOfClass:[ImageData class]];
 }
 
@@ -63,7 +63,7 @@ static NSString *const ImageAttributeName = @"ImageAttributeName";
                    withInput:_input
                      inRange:range
                withCondition:^BOOL(id _Nullable value, NSRange range) {
-                 return [self styleCondition:value:range];
+                 return [self styleCondition:value range:range];
                }];
 }
 
@@ -73,7 +73,7 @@ static NSString *const ImageAttributeName = @"ImageAttributeName";
                         withInput:_input
                           inRange:range
                     withCondition:^BOOL(id _Nullable value, NSRange range) {
-                      return [self styleCondition:value:range];
+                      return [self styleCondition:value range:range];
                     }];
   } else {
     return [OccurenceUtils detect:ImageAttributeName
@@ -81,7 +81,7 @@ static NSString *const ImageAttributeName = @"ImageAttributeName";
                           atIndex:range.location
                     checkPrevious:YES
                     withCondition:^BOOL(id _Nullable value, NSRange range) {
-                      return [self styleCondition:value:range];
+                      return [self styleCondition:value range:range];
                     }];
   }
 }
@@ -91,7 +91,7 @@ static NSString *const ImageAttributeName = @"ImageAttributeName";
                    withInput:_input
                      inRange:range
                withCondition:^BOOL(id _Nullable value, NSRange range) {
-                 return [self styleCondition:value:range];
+                 return [self styleCondition:value range:range];
                }];
 }
 

package/ios/styles/InlineCodeStyle.mm

@@ -151,27 +151,38 @@
 
 // making sure no newlines get inline code style, it looks bad
 - (void)handleNewlines {
-  for (int i = 0; i < _input->textView.textStorage.string.length; i++) {
-    if ([[NSCharacterSet newlineCharacterSet]
-            characterIsMember:[_input->textView.textStorage.string
-                                  characterAtIndex:i]]) {
-      NSRange mockRange = NSMakeRange(0, 0);
-      // can't use detect style because it intentionally doesn't take newlines
-      // into consideration
-      UIColor *bgColor =
-          [_input->textView.textStorage attribute:NSBackgroundColorAttributeName
-                                          atIndex:i
-                                   effectiveRange:&mockRange];
-      if ([self styleCondition:bgColor:NSMakeRange(i, 1)]) {
-        [self removeAttributes:NSMakeRange(i, 1)];
-      }
+  NSTextStorage *storage = _input->textView.textStorage;
+  NSString *string = storage.string;
+  NSUInteger length = string.length;
+
+  if (length == 0)
+    return;
+
+  CFStringInlineBuffer buffer;
+  CFStringInitInlineBuffer((CFStringRef)string, &buffer,
+                           CFRangeMake(0, length));
+
+  for (NSUInteger index = 0; index < length; index++) {
+    unichar ch = CFStringGetCharacterFromInlineBuffer(&buffer, index);
+    // check new lines only
+    if (![[NSCharacterSet newlineCharacterSet] characterIsMember:ch])
+      continue;
+
+    NSRange newlineRange = NSMakeRange(index, 1);
+
+    UIColor *bgColor = [storage attribute:NSBackgroundColorAttributeName
+                                  atIndex:index
+                           effectiveRange:nil];
+
+    if (bgColor != nil && [self styleCondition:bgColor range:newlineRange]) {
+      [self removeAttributes:newlineRange];
     }
   }
 }
 
 // emojis don't retain monospace font attribute so we check for the background
 // color if there is no mention
-- (BOOL)styleCondition:(id _Nullable)value:(NSRange)range {
+- (BOOL)styleCondition:(id _Nullable)value range:(NSRange)range {
   UIColor *bgColor = (UIColor *)value;
   MentionStyle *mStyle = _input->stylesDict[@([MentionStyle getStyleType])];
   return bgColor != nullptr && mStyle != nullptr && ![mStyle detectStyle:range];
@@ -194,7 +205,7 @@
                        withInput:_input
                          inRange:currentRange
                    withCondition:^BOOL(id _Nullable value, NSRange range) {
-                     return [self styleCondition:value:range];
+                     return [self styleCondition:value range:range];
                    }];
       detected = detected && currentDetected;
     }
@@ -206,7 +217,7 @@
                           atIndex:range.location
                     checkPrevious:NO
                     withCondition:^BOOL(id _Nullable value, NSRange range) {
-                      return [self styleCondition:value:range];
+                      return [self styleCondition:value range:range];
                     }];
   }
 }
@@ -216,7 +227,7 @@
                    withInput:_input
                      inRange:range
                withCondition:^BOOL(id _Nullable value, NSRange range) {
-                 return [self styleCondition:value:range];
+                 return [self styleCondition:value range:range];
                }];
 }
 
@@ -225,7 +236,7 @@
                    withInput:_input
                      inRange:range
                withCondition:^BOOL(id _Nullable value, NSRange range) {
-                 return [self styleCondition:value:range];
+                 return [self styleCondition:value range:range];
                }];
 }
 

package/ios/styles/ItalicStyle.mm

@@ -91,7 +91,7 @@
   }
 }
 
-- (BOOL)styleCondition:(id _Nullable)value:(NSRange)range {
+- (BOOL)styleCondition:(id _Nullable)value range:(NSRange)range {
   UIFont *font = (UIFont *)value;
   return font != nullptr && [font isItalic];
 }
@@ -102,7 +102,7 @@
                         withInput:_input
                           inRange:range
                     withCondition:^BOOL(id _Nullable value, NSRange range) {
-                      return [self styleCondition:value:range];
+                      return [self styleCondition:value range:range];
                     }];
   } else {
     return [OccurenceUtils detect:NSFontAttributeName
@@ -110,7 +110,7 @@
                           atIndex:range.location
                     checkPrevious:NO
                     withCondition:^BOOL(id _Nullable value, NSRange range) {
-                      return [self styleCondition:value:range];
+                      return [self styleCondition:value range:range];
                     }];
   }
 }
@@ -120,7 +120,7 @@
                    withInput:_input
                      inRange:range
                withCondition:^BOOL(id _Nullable value, NSRange range) {
-                 return [self styleCondition:value:range];
+                 return [self styleCondition:value range:range];
                }];
 }
 
@@ -129,7 +129,7 @@
                    withInput:_input
                      inRange:range
                withCondition:^BOOL(id _Nullable value, NSRange range) {
-                 return [self styleCondition:value:range];
+                 return [self styleCondition:value range:range];
                }];
 }