react-native-enriched 0.1.6 → 0.2.1

package/ios/styles/OrderedListStyle.mm

@@ -1,20 +1,27 @@
-#import "StyleHeaders.h"
 #import "EnrichedTextInputView.h"
 #import "FontExtension.h"
 #import "OccurenceUtils.h"
 #import "ParagraphsUtils.h"
+#import "StyleHeaders.h"
 #import "TextInsertionUtils.h"
 
 @implementation OrderedListStyle {
   EnrichedTextInputView *_input;
 }
 
-+ (StyleType)getStyleType { return OrderedList; }
++ (StyleType)getStyleType {
+  return OrderedList;
+}
+
++ (BOOL)isParagraphStyle {
+  return YES;
+}
 
 - (CGFloat)getHeadIndent {
   // lists are drawn manually
   // margin before marker + gap between marker and paragraph
-  return [_input->config orderedListMarginLeft] + [_input->config orderedListGapWidth];
+  return [_input->config orderedListMarginLeft] +
+         [_input->config orderedListGapWidth];
 }
 
 - (instancetype)initWithInput:(id)input {
@@ -25,99 +32,136 @@
 
 - (void)applyStyle:(NSRange)range {
   BOOL isStylePresent = [self detectStyle:range];
-  if(range.length >= 1) {
-    isStylePresent ? [self removeAttributes:range] : [self addAttributes:range];
+  if (range.length >= 1) {
+    isStylePresent ? [self removeAttributes:range]
+                   : [self addAttributes:range withTypingAttr:YES];
   } else {
     isStylePresent ? [self removeTypingAttributes] : [self addTypingAttributes];
   }
 }
 
 // we assume correct paragraph range is already given
-- (void)addAttributes:(NSRange)range {
-  NSTextList *numberBullet = [[NSTextList alloc] initWithMarkerFormat:NSTextListMarkerDecimal options:0];
-  NSArray *paragraphs = [ParagraphsUtils getSeparateParagraphsRangesIn:_input->textView range:range];
-  // if we fill empty lines with zero width spaces, we need to offset later ranges
+- (void)addAttributes:(NSRange)range withTypingAttr:(BOOL)withTypingAttr {
+  NSTextList *numberBullet =
+      [[NSTextList alloc] initWithMarkerFormat:NSTextListMarkerDecimal
+                                       options:0];
+  NSArray *paragraphs =
+      [ParagraphsUtils getSeparateParagraphsRangesIn:_input->textView
+                                               range:range];
+  // if we fill empty lines with zero width spaces, we need to offset later
+  // ranges
   NSInteger offset = 0;
   // needed for range adjustments
   NSRange preModificationRange = _input->textView.selectedRange;
-  
+
   // let's not emit some weird selection changes or text/html changes
   _input->blockEmitting = YES;
-  
-  for(NSValue *value in paragraphs) {
+
+  for (NSValue *value in paragraphs) {
     // take previous offsets into consideration
-    NSRange fixedRange = NSMakeRange([value rangeValue].location + offset, [value rangeValue].length);
-    
-    // length 0 with first line, length 1 and newline with some empty lines in the middle
-    if(fixedRange.length == 0 ||
-      (fixedRange.length == 1 &&
-      [[NSCharacterSet newlineCharacterSet] characterIsMember: [_input->textView.textStorage.string characterAtIndex:fixedRange.location]])
-    ) {
-      [TextInsertionUtils insertText:@"\u200B" at:fixedRange.location additionalAttributes:nullptr input:_input withSelection:NO];
+    NSRange fixedRange = NSMakeRange([value rangeValue].location + offset,
+                                     [value rangeValue].length);
+
+    // length 0 with first line, length 1 and newline with some empty lines in
+    // the middle
+    if (fixedRange.length == 0 ||
+        (fixedRange.length == 1 &&
+         [[NSCharacterSet newlineCharacterSet]
+             characterIsMember:[_input->textView.textStorage.string
+                                   characterAtIndex:fixedRange.location]])) {
+      [TextInsertionUtils insertText:@"\u200B"
+                                  at:fixedRange.location
+                additionalAttributes:nullptr
+                               input:_input
+                       withSelection:NO];
       fixedRange = NSMakeRange(fixedRange.location, fixedRange.length + 1);
       offset += 1;
     }
-    
-    [_input->textView.textStorage enumerateAttribute:NSParagraphStyleAttributeName inRange:fixedRange options:0
-      usingBlock:^(id  _Nullable value, NSRange range, BOOL * _Nonnull stop) {
-        NSMutableParagraphStyle *pStyle = [(NSParagraphStyle *)value mutableCopy];
-        pStyle.textLists = @[numberBullet];
-        pStyle.headIndent = [self getHeadIndent];
-        pStyle.firstLineHeadIndent = [self getHeadIndent];
-        [_input->textView.textStorage addAttribute:NSParagraphStyleAttributeName value:pStyle range:range];
-      }
-    ];
+
+    [_input->textView.textStorage
+        enumerateAttribute:NSParagraphStyleAttributeName
+                   inRange:fixedRange
+                   options:0
+                usingBlock:^(id _Nullable value, NSRange range,
+                             BOOL *_Nonnull stop) {
+                  NSMutableParagraphStyle *pStyle =
+                      [(NSParagraphStyle *)value mutableCopy];
+                  pStyle.textLists = @[ numberBullet ];
+                  pStyle.headIndent = [self getHeadIndent];
+                  pStyle.firstLineHeadIndent = [self getHeadIndent];
+                  [_input->textView.textStorage
+                      addAttribute:NSParagraphStyleAttributeName
+                             value:pStyle
+                             range:range];
+                }];
   }
-  
+
   // back to emitting
   _input->blockEmitting = NO;
-  
-  if(preModificationRange.length == 0) {
-    // fix selection if only one line was possibly made a list and filled with a space
+
+  if (preModificationRange.length == 0) {
+    // fix selection if only one line was possibly made a list and filled with a
+    // space
     _input->textView.selectedRange = preModificationRange;
   } else {
     // in other cases, fix the selection with newly made offsets
-    _input->textView.selectedRange = NSMakeRange(preModificationRange.location, preModificationRange.length + offset);
+    _input->textView.selectedRange = NSMakeRange(
+        preModificationRange.location, preModificationRange.length + offset);
   }
-  
+
   // also add typing attributes
-  NSMutableDictionary *typingAttrs = [_input->textView.typingAttributes mutableCopy];
-  NSMutableParagraphStyle *pStyle = [typingAttrs[NSParagraphStyleAttributeName] mutableCopy];
-  pStyle.textLists = @[numberBullet];
-  pStyle.headIndent = [self getHeadIndent];
-  pStyle.firstLineHeadIndent = [self getHeadIndent];
-  typingAttrs[NSParagraphStyleAttributeName] = pStyle;
-  _input->textView.typingAttributes = typingAttrs;
+  if (withTypingAttr) {
+    NSMutableDictionary *typingAttrs =
+        [_input->textView.typingAttributes mutableCopy];
+    NSMutableParagraphStyle *pStyle =
+        [typingAttrs[NSParagraphStyleAttributeName] mutableCopy];
+    pStyle.textLists = @[ numberBullet ];
+    pStyle.headIndent = [self getHeadIndent];
+    pStyle.firstLineHeadIndent = [self getHeadIndent];
+    typingAttrs[NSParagraphStyleAttributeName] = pStyle;
+    _input->textView.typingAttributes = typingAttrs;
+  }
 }
 
 // does pretty much the same as normal addAttributes, just need to get the range
 - (void)addTypingAttributes {
-  [self addAttributes:_input->textView.selectedRange];
+  [self addAttributes:_input->textView.selectedRange withTypingAttr:YES];
 }
 
 - (void)removeAttributes:(NSRange)range {
-  NSArray *paragraphs = [ParagraphsUtils getSeparateParagraphsRangesIn:_input->textView range:range];
-  
+  NSArray *paragraphs =
+      [ParagraphsUtils getSeparateParagraphsRangesIn:_input->textView
+                                               range:range];
+
   [_input->textView.textStorage beginEditing];
-  
-  for(NSValue *value in paragraphs) {
+
+  for (NSValue *value in paragraphs) {
     NSRange range = [value rangeValue];
-    [_input->textView.textStorage enumerateAttribute:NSParagraphStyleAttributeName inRange:range options:0
-      usingBlock:^(id  _Nullable value, NSRange range, BOOL * _Nonnull stop) {
-        NSMutableParagraphStyle *pStyle = [(NSParagraphStyle *)value mutableCopy];
-        pStyle.textLists = @[];
-        pStyle.headIndent = 0;
-        pStyle.firstLineHeadIndent = 0;
-        [_input->textView.textStorage addAttribute:NSParagraphStyleAttributeName value:pStyle range:range];
-      }
-    ];
+    [_input->textView.textStorage
+        enumerateAttribute:NSParagraphStyleAttributeName
+                   inRange:range
+                   options:0
+                usingBlock:^(id _Nullable value, NSRange range,
+                             BOOL *_Nonnull stop) {
+                  NSMutableParagraphStyle *pStyle =
+                      [(NSParagraphStyle *)value mutableCopy];
+                  pStyle.textLists = @[];
+                  pStyle.headIndent = 0;
+                  pStyle.firstLineHeadIndent = 0;
+                  [_input->textView.textStorage
+                      addAttribute:NSParagraphStyleAttributeName
+                             value:pStyle
+                             range:range];
+                }];
   }
-  
+
   [_input->textView.textStorage endEditing];
-    
+
   // also remove typing attributes
-  NSMutableDictionary *typingAttrs = [_input->textView.typingAttributes mutableCopy];
-  NSMutableParagraphStyle *pStyle = [typingAttrs[NSParagraphStyleAttributeName] mutableCopy];
+  NSMutableDictionary *typingAttrs =
+      [_input->textView.typingAttributes mutableCopy];
+  NSMutableParagraphStyle *pStyle =
+      [typingAttrs[NSParagraphStyleAttributeName] mutableCopy];
   pStyle.textLists = @[];
   pStyle.headIndent = 0;
   pStyle.firstLineHeadIndent = 0;
@@ -125,24 +169,28 @@
   _input->textView.typingAttributes = typingAttrs;
 }
 
-// needed for the sake of style conflicts, needs to do exactly the same as removeAttribtues
+// needed for the sake of style conflicts, needs to do exactly the same as
+// removeAttribtues
 - (void)removeTypingAttributes {
   [self removeAttributes:_input->textView.selectedRange];
 }
 
 - (BOOL)handleBackspaceInRange:(NSRange)range replacementText:(NSString *)text {
-  if([self detectStyle:_input->textView.selectedRange] && text.length == 0) {
+  if ([self detectStyle:_input->textView.selectedRange] && text.length == 0) {
     // backspace while the style is active
-    
-    NSRange paragraphRange = [_input->textView.textStorage.string paragraphRangeForRange:_input->textView.selectedRange];
-    
-    if(NSEqualRanges(_input->textView.selectedRange, NSMakeRange(0, 0))) {
+
+    NSRange paragraphRange = [_input->textView.textStorage.string
+        paragraphRangeForRange:_input->textView.selectedRange];
+
+    if (NSEqualRanges(_input->textView.selectedRange, NSMakeRange(0, 0))) {
       // a backspace on the very first input's line list point
-      // it doesn't run textVieDidChange so we need to manually remove attributes
+      // it doesn't run textVieDidChange so we need to manually remove
+      // attributes
       [self removeAttributes:paragraphRange];
       return YES;
-    } else if(range.location == paragraphRange.location - 1) {
-      // same case in other lines; here, the removed range location will be exactly 1 less than paragraph range location
+    } else if (range.location == paragraphRange.location - 1) {
+      // same case in other lines; here, the removed range location will be
+      // exactly 1 less than paragraph range location
       [self removeAttributes:paragraphRange];
       return YES;
     }
@@ -150,24 +198,36 @@
   return NO;
 }
 
-- (BOOL)tryHandlingListShorcutInRange:(NSRange)range replacementText:(NSString *)text {
-  NSRange paragraphRange = [_input->textView.textStorage.string paragraphRangeForRange:range];
-  // a dot was added - check if we are both at the paragraph beginning + 1 character (which we want to be a dash)
-  if([text isEqualToString:@"."] && range.location - 1 == paragraphRange.location) {
-    unichar charBefore = [_input->textView.textStorage.string characterAtIndex:range.location - 1];
-    if(charBefore == '1') {
+- (BOOL)tryHandlingListShorcutInRange:(NSRange)range
+                      replacementText:(NSString *)text {
+  NSRange paragraphRange =
+      [_input->textView.textStorage.string paragraphRangeForRange:range];
+  // a dot was added - check if we are both at the paragraph beginning + 1
+  // character (which we want to be a dash)
+  if ([text isEqualToString:@"."] &&
+      range.location - 1 == paragraphRange.location) {
+    unichar charBefore = [_input->textView.textStorage.string
+        characterAtIndex:range.location - 1];
+    if (charBefore == '1') {
       // we got a match - add a list if possible
-      if([_input handleStyleBlocksAndConflicts:[[self class] getStyleType] range:paragraphRange]) {
+      if ([_input handleStyleBlocksAndConflicts:[[self class] getStyleType]
+                                          range:paragraphRange]) {
         // don't emit during the replacing
         _input->blockEmitting = YES;
-        
+
         // remove the number
-        [TextInsertionUtils replaceText:@"" at:NSMakeRange(paragraphRange.location, 1) additionalAttributes:nullptr input:_input withSelection:YES];
-        
+        [TextInsertionUtils replaceText:@""
+                                     at:NSMakeRange(paragraphRange.location, 1)
+                   additionalAttributes:nullptr
+                                  input:_input
+                          withSelection:YES];
+
         _input->blockEmitting = NO;
-        
+
         // add attributes on the paragraph
-        [self addAttributes:NSMakeRange(paragraphRange.location, paragraphRange.length - 1)];
+        [self addAttributes:NSMakeRange(paragraphRange.location,
+                                        paragraphRange.length - 1)
+             withTypingAttr:YES];
         return YES;
       }
     }
@@ -175,41 +235,48 @@
   return NO;
 }
 
-- (BOOL)styleCondition:(id _Nullable)value :(NSRange)range {
+- (BOOL)styleCondition:(id _Nullable)value:(NSRange)range {
   NSParagraphStyle *paragraph = (NSParagraphStyle *)value;
-  return paragraph != nullptr && paragraph.textLists.count == 1 && paragraph.textLists.firstObject.markerFormat == NSTextListMarkerDecimal;
+  return paragraph != nullptr && paragraph.textLists.count == 1 &&
+         paragraph.textLists.firstObject.markerFormat ==
+             NSTextListMarkerDecimal;
 }
 
 - (BOOL)detectStyle:(NSRange)range {
-  if(range.length >= 1) {
-    return [OccurenceUtils detect:NSParagraphStyleAttributeName withInput:_input inRange:range
-      withCondition: ^BOOL(id  _Nullable value, NSRange range) {
-        return [self styleCondition:value :range];
-      }
-    ];
+  if (range.length >= 1) {
+    return [OccurenceUtils detect:NSParagraphStyleAttributeName
+                        withInput:_input
+                          inRange:range
+                    withCondition:^BOOL(id _Nullable value, NSRange range) {
+                      return [self styleCondition:value:range];
+                    }];
   } else {
-    return [OccurenceUtils detect:NSParagraphStyleAttributeName withInput:_input atIndex:range.location checkPrevious:YES
-      withCondition:^BOOL(id  _Nullable value, NSRange range) {
-        return [self styleCondition:value :range];
-      }
-    ];
+    return [OccurenceUtils detect:NSParagraphStyleAttributeName
+                        withInput:_input
+                          atIndex:range.location
+                    checkPrevious:YES
+                    withCondition:^BOOL(id _Nullable value, NSRange range) {
+                      return [self styleCondition:value:range];
+                    }];
   }
 }
 
 - (BOOL)anyOccurence:(NSRange)range {
-  return [OccurenceUtils any:NSParagraphStyleAttributeName withInput:_input inRange:range
-    withCondition:^BOOL(id  _Nullable value, NSRange range) {
-      return [self styleCondition:value :range];
-    }
-  ];
+  return [OccurenceUtils any:NSParagraphStyleAttributeName
+                   withInput:_input
+                     inRange:range
+               withCondition:^BOOL(id _Nullable value, NSRange range) {
+                 return [self styleCondition:value:range];
+               }];
 }
 
 - (NSArray<StylePair *> *_Nullable)findAllOccurences:(NSRange)range {
-  return [OccurenceUtils all:NSParagraphStyleAttributeName withInput:_input inRange:range
-    withCondition:^BOOL(id  _Nullable value, NSRange range) {
-      return [self styleCondition:value :range];
-    }
-  ];
+  return [OccurenceUtils all:NSParagraphStyleAttributeName
+                   withInput:_input
+                     inRange:range
+               withCondition:^BOOL(id _Nullable value, NSRange range) {
+                 return [self styleCondition:value:range];
+               }];
 }
 
 @end

package/ios/styles/StrikethroughStyle.mm

@@ -1,12 +1,18 @@
-#import "StyleHeaders.h"
 #import "EnrichedTextInputView.h"
 #import "OccurenceUtils.h"
+#import "StyleHeaders.h"
 
 @implementation StrikethroughStyle {
   EnrichedTextInputView *_input;
 }
 
-+ (StyleType)getStyleType { return Strikethrough; }
++ (StyleType)getStyleType {
+  return Strikethrough;
+}
+
++ (BOOL)isParagraphStyle {
+  return NO;
+}
 
 - (instancetype)initWithInput:(id)input {
   self = [super init];
@@ -15,69 +21,82 @@
 }
 
 - (void)applyStyle:(NSRange)range {
-  BOOL isStylePresent = [self detectStyle: range];
-  if(range.length >= 1) {
-    isStylePresent ? [self removeAttributes:range] : [self addAttributes:range];
+  BOOL isStylePresent = [self detectStyle:range];
+  if (range.length >= 1) {
+    isStylePresent ? [self removeAttributes:range]
+                   : [self addAttributes:range withTypingAttr:YES];
   } else {
     isStylePresent ? [self removeTypingAttributes] : [self addTypingAttributes];
   }
 }
 
-- (void)addAttributes:(NSRange)range {
-  [_input->textView.textStorage addAttribute:NSStrikethroughStyleAttributeName value:@(NSUnderlineStyleSingle) range:range];
+- (void)addAttributes:(NSRange)range withTypingAttr:(BOOL)withTypingAttr {
+  [_input->textView.textStorage addAttribute:NSStrikethroughStyleAttributeName
+                                       value:@(NSUnderlineStyleSingle)
+                                       range:range];
 }
 
 - (void)addTypingAttributes {
-  NSMutableDictionary *newTypingAttrs = [_input->textView.typingAttributes mutableCopy];
+  NSMutableDictionary *newTypingAttrs =
+      [_input->textView.typingAttributes mutableCopy];
   newTypingAttrs[NSStrikethroughStyleAttributeName] = @(NSUnderlineStyleSingle);
   _input->textView.typingAttributes = newTypingAttrs;
 }
 
 - (void)removeAttributes:(NSRange)range {
-  [_input->textView.textStorage removeAttribute:NSStrikethroughStyleAttributeName range:range];
+  [_input->textView.textStorage
+      removeAttribute:NSStrikethroughStyleAttributeName
+                range:range];
 }
 
 - (void)removeTypingAttributes {
-  NSMutableDictionary *newTypingAttrs = [_input->textView.typingAttributes mutableCopy];
-  [newTypingAttrs removeObjectForKey: NSStrikethroughStyleAttributeName];
+  NSMutableDictionary *newTypingAttrs =
+      [_input->textView.typingAttributes mutableCopy];
+  [newTypingAttrs removeObjectForKey:NSStrikethroughStyleAttributeName];
   _input->textView.typingAttributes = newTypingAttrs;
 }
 
-- (BOOL)styleCondition:(id _Nullable)value :(NSRange)range {
+- (BOOL)styleCondition:(id _Nullable)value:(NSRange)range {
   NSNumber *strikethroughStyle = (NSNumber *)value;
-  return strikethroughStyle != nullptr && [strikethroughStyle intValue] != NSUnderlineStyleNone;
+  return strikethroughStyle != nullptr &&
+         [strikethroughStyle intValue] != NSUnderlineStyleNone;
 }
 
 - (BOOL)detectStyle:(NSRange)range {
-  if(range.length >= 1) {
-    return [OccurenceUtils detect:NSStrikethroughStyleAttributeName withInput:_input inRange:range
-      withCondition: ^BOOL(id  _Nullable value, NSRange range) {
-        return [self styleCondition:value :range];
-      }
-    ];
+  if (range.length >= 1) {
+    return [OccurenceUtils detect:NSStrikethroughStyleAttributeName
+                        withInput:_input
+                          inRange:range
+                    withCondition:^BOOL(id _Nullable value, NSRange range) {
+                      return [self styleCondition:value:range];
+                    }];
   } else {
-    return [OccurenceUtils detect:NSStrikethroughStyleAttributeName withInput:_input atIndex:range.location checkPrevious:NO
-      withCondition:^BOOL(id  _Nullable value, NSRange range) {
-        return [self styleCondition:value :range];
-      }
-    ];
+    return [OccurenceUtils detect:NSStrikethroughStyleAttributeName
+                        withInput:_input
+                          atIndex:range.location
+                    checkPrevious:NO
+                    withCondition:^BOOL(id _Nullable value, NSRange range) {
+                      return [self styleCondition:value:range];
+                    }];
   }
 }
 
 - (BOOL)anyOccurence:(NSRange)range {
-  return [OccurenceUtils any:NSStrikethroughStyleAttributeName withInput:_input inRange:range
-    withCondition:^BOOL(id  _Nullable value, NSRange range) {
-      return [self styleCondition:value :range];
-    }
-  ];
+  return [OccurenceUtils any:NSStrikethroughStyleAttributeName
+                   withInput:_input
+                     inRange:range
+               withCondition:^BOOL(id _Nullable value, NSRange range) {
+                 return [self styleCondition:value:range];
+               }];
 }
 
 - (NSArray<StylePair *> *_Nullable)findAllOccurences:(NSRange)range {
-  return [OccurenceUtils all:NSStrikethroughStyleAttributeName withInput:_input inRange:range
-    withCondition:^BOOL(id  _Nullable value, NSRange range) {
-      return [self styleCondition:value :range];
-    }
-  ];
+  return [OccurenceUtils all:NSStrikethroughStyleAttributeName
+                   withInput:_input
+                     inRange:range
+               withCondition:^BOOL(id _Nullable value, NSRange range) {
+                 return [self styleCondition:value:range];
+               }];
 }
 
 @end