react-native-enriched 0.2.0 → 0.2.1

package/ios/styles/HeadingStyleBase.mm

@@ -1,15 +1,21 @@
-#import "StyleHeaders.h"
 #import "EnrichedTextInputView.h"
 #import "FontExtension.h"
 #import "OccurenceUtils.h"
+#import "StyleHeaders.h"
 #import "TextInsertionUtils.h"
 
 @implementation HeadingStyleBase
 
 // mock values since H1/2/3Style classes anyway are used
-+ (StyleType)getStyleType { return None; }
-- (CGFloat)getHeadingFontSize { return 0; }
-- (BOOL)isHeadingBold { return false; }
++ (StyleType)getStyleType {
+  return None;
+}
+- (CGFloat)getHeadingFontSize {
+  return 0;
+}
+- (BOOL)isHeadingBold {
+  return false;
+}
 
 - (EnrichedTextInputView *)typedInput {
   return (EnrichedTextInputView *)input;
@@ -25,41 +31,54 @@
 // but if the paragraph is empty it still is of length 0
 - (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];
   }
 }
 
 // the range will already be the proper full paragraph/s range
-- (void)addAttributes:(NSRange)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) {
-        UIFont *newFont = [font setSize:[self getHeadingFontSize]];
-        if([self isHeadingBold]) {
-          newFont = [newFont setBold];
-        }
-        [[self typedInput]->textView.textStorage addAttribute:NSFontAttributeName value:newFont range:range];
-      }
-    }
-  ];
+  [[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) {
+                  UIFont *newFont = [font setSize:[self getHeadingFontSize]];
+                  if ([self isHeadingBold]) {
+                    newFont = [newFont setBold];
+                  }
+                  [[self typedInput]->textView.textStorage
+                      addAttribute:NSFontAttributeName
+                             value:newFont
+                             range:range];
+                }
+              }];
   [[self typedInput]->textView.textStorage endEditing];
-  
+
   // also toggle typing attributes
-  [self addTypingAttributes];
+  if (withTypingAttr) {
+    [self addTypingAttributes];
+  }
 }
 
-// will always be called on empty paragraphs so only typing attributes can be changed
+// will always be called on empty paragraphs so only typing attributes can be
+// changed
 - (void)addTypingAttributes {
-  UIFont *currentFontAttr = (UIFont *)[self typedInput]->textView.typingAttributes[NSFontAttributeName];
-  if(currentFontAttr != nullptr) {
-    NSMutableDictionary *newTypingAttrs = [[self typedInput]->textView.typingAttributes mutableCopy];
+  UIFont *currentFontAttr =
+      (UIFont *)[self typedInput]
+          ->textView.typingAttributes[NSFontAttributeName];
+  if (currentFontAttr != nullptr) {
+    NSMutableDictionary *newTypingAttrs =
+        [[self typedInput]->textView.typingAttributes mutableCopy];
     UIFont *newFont = [currentFontAttr setSize:[self getHeadingFontSize]];
-    if([self isHeadingBold]) {
+    if ([self isHeadingBold]) {
       newFont = [newFont setBold];
     }
     newTypingAttrs[NSFontAttributeName] = newFont;
@@ -69,28 +88,41 @@
 
 // we need to remove the style from the whole paragraph
 - (void)removeAttributes:(NSRange)range {
-  NSRange paragraphRange = [[self typedInput]->textView.textStorage.string paragraphRangeForRange: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]) {
-        UIFont *newFont = [(UIFont *)value setSize:[[[self typedInput]->config primaryFontSize] floatValue]];
-        if([self isHeadingBold]) {
-          newFont = [newFont removeBold];
-        }
-        [[self typedInput]->textView.textStorage addAttribute:NSFontAttributeName value:newFont range:range];
-      }
-    }
-  ];
+  [[self typedInput]->textView.textStorage
+      enumerateAttribute:NSFontAttributeName
+                 inRange:paragraphRange
+                 options:0
+              usingBlock:^(id _Nullable value, NSRange range,
+                           BOOL *_Nonnull stop) {
+                if ([self styleCondition:value:range]) {
+                  UIFont *newFont = [(UIFont *)value
+                      setSize:[[[self typedInput]->config primaryFontSize]
+                                  floatValue]];
+                  if ([self isHeadingBold]) {
+                    newFont = [newFont removeBold];
+                  }
+                  [[self typedInput]->textView.textStorage
+                      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];
-  if(currentFontAttr != nullptr) {
-    NSMutableDictionary *newTypingAttrs = [[self typedInput]->textView.typingAttributes mutableCopy];
-    UIFont *newFont = [currentFontAttr setSize:[[[self typedInput]->config primaryFontSize] floatValue]];
-    if([self isHeadingBold]) {
+  UIFont *currentFontAttr =
+      (UIFont *)[self typedInput]
+          ->textView.typingAttributes[NSFontAttributeName];
+  if (currentFontAttr != nullptr) {
+    NSMutableDictionary *newTypingAttrs =
+        [[self typedInput]->textView.typingAttributes mutableCopy];
+    UIFont *newFont = [currentFontAttr
+        setSize:[[[self typedInput]->config primaryFontSize] floatValue]];
+    if ([self isHeadingBold]) {
       newFont = [newFont removeBold];
     }
     newTypingAttrs[NSFontAttributeName] = newFont;
@@ -99,58 +131,67 @@
 }
 
 - (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 {
+- (BOOL)styleCondition:(id _Nullable)value:(NSRange)range {
   UIFont *font = (UIFont *)value;
   return font != nullptr && font.pointSize == [self getHeadingFontSize];
 }
 
 - (BOOL)detectStyle:(NSRange)range {
-  if(range.length >= 1) {
-    return [OccurenceUtils detect:NSFontAttributeName withInput:[self typedInput] inRange:range
-      withCondition: ^BOOL(id  _Nullable value, NSRange range) {
-        return [self styleCondition:value :range];
-      }
-    ];
+  if (range.length >= 1) {
+    return [OccurenceUtils detect:NSFontAttributeName
+                        withInput:[self typedInput]
+                          inRange:range
+                    withCondition:^BOOL(id _Nullable value, NSRange range) {
+                      return [self styleCondition:value:range];
+                    }];
   } else {
-    return [OccurenceUtils detect:NSFontAttributeName withInput:[self typedInput] atIndex:range.location checkPrevious:YES
-      withCondition:^BOOL(id  _Nullable value, NSRange range) {
-        return [self styleCondition:value :range];
-      }
-    ];
+    return [OccurenceUtils detect:NSFontAttributeName
+                        withInput:[self typedInput]
+                          atIndex:range.location
+                    checkPrevious:YES
+                    withCondition:^BOOL(id _Nullable value, NSRange range) {
+                      return [self styleCondition:value:range];
+                    }];
   }
 }
 
 - (BOOL)anyOccurence:(NSRange)range {
-  return [OccurenceUtils any:NSFontAttributeName withInput:[self typedInput] inRange:range
-    withCondition:^BOOL(id  _Nullable value, NSRange range) {
-      return [self styleCondition:value :range];
-    }
-  ];
+  return [OccurenceUtils any:NSFontAttributeName
+                   withInput:[self typedInput]
+                     inRange:range
+               withCondition:^BOOL(id _Nullable value, NSRange range) {
+                 return [self styleCondition:value:range];
+               }];
 }
 
 - (NSArray<StylePair *> *_Nullable)findAllOccurences:(NSRange)range {
-  return [OccurenceUtils all:NSFontAttributeName withInput:[self typedInput] inRange:range
-    withCondition:^BOOL(id  _Nullable value, NSRange range) {
-      return [self styleCondition:value :range];
-    }
-  ];
+  return [OccurenceUtils all:NSFontAttributeName
+                   withInput:[self typedInput]
+                     inRange:range
+               withCondition:^BOOL(id _Nullable value, NSRange range) {
+                 return [self styleCondition:value:range];
+               }];
 }
 
 // used to make sure headings dont persist after a newline is placed
 - (BOOL)handleNewlinesInRange:(NSRange)range replacementText:(NSString *)text {
   // in a heading and a new text ends with a newline
-  if(
-    [self detectStyle:[self typedInput]->textView.selectedRange] &&
-    text.length > 0 &&
-    [[NSCharacterSet newlineCharacterSet] characterIsMember: [text characterAtIndex:text.length-1]]
-  ) {
+  if ([self detectStyle:[self typedInput]->textView.selectedRange] &&
+      text.length > 0 &&
+      [[NSCharacterSet newlineCharacterSet]
+          characterIsMember:[text characterAtIndex:text.length - 1]]) {
     // do the replacement manually
-    [TextInsertionUtils replaceText:text at:range additionalAttributes:nullptr input:[self typedInput] withSelection:YES];
+    [TextInsertionUtils replaceText:text
+                                 at:range
+               additionalAttributes:nullptr
+                              input:[self typedInput]
+                      withSelection:YES];
     // remove the attribtues at the new selection
     [self removeAttributes:[self typedInput]->textView.selectedRange];
     return YES;
@@ -158,19 +199,23 @@
   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
+// 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) {
+  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];
+    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];
     }
   }
 }
 
 @end
-

package/ios/styles/ImageStyle.mm

@@ -1,6 +1,8 @@
-#import "StyleHeaders.h"
 #import "EnrichedTextInputView.h"
+#import "ImageAttachment.h"
+#import "MediaAttachment.h"
 #import "OccurenceUtils.h"
+#import "StyleHeaders.h"
 #import "TextInsertionUtils.h"
 
 // custom NSAttributedStringKey to differentiate the image
@@ -10,9 +12,13 @@ static NSString *const ImageAttributeName = @"ImageAttributeName";
   EnrichedTextInputView *_input;
 }
 
-+ (StyleType)getStyleType { return Image; }
++ (StyleType)getStyleType {
+  return Image;
+}
 
-+ (BOOL)isParagraphStyle { return NO; }
++ (BOOL)isParagraphStyle {
+  return NO;
+}
 
 - (instancetype)initWithInput:(id)input {
   self = [super init];
@@ -24,7 +30,7 @@ static NSString *const ImageAttributeName = @"ImageAttributeName";
   // no-op for image
 }
 
-- (void)addAttributes:(NSRange)range {
+- (void)addAttributes:(NSRange)range withTypingAttr:(BOOL)withTypingAttr {
   // no-op for image
 }
 
@@ -35,91 +41,104 @@ static NSString *const ImageAttributeName = @"ImageAttributeName";
 - (void)removeAttributes:(NSRange)range {
   [_input->textView.textStorage beginEditing];
   [_input->textView.textStorage removeAttribute:ImageAttributeName range:range];
-  [_input->textView.textStorage removeAttribute:NSAttachmentAttributeName range:range];
+  [_input->textView.textStorage removeAttribute:NSAttachmentAttributeName
+                                          range:range];
   [_input->textView.textStorage endEditing];
 }
 
 - (void)removeTypingAttributes {
-  NSMutableDictionary *currentAttributes = [_input->textView.typingAttributes mutableCopy];
+  NSMutableDictionary *currentAttributes =
+      [_input->textView.typingAttributes mutableCopy];
   [currentAttributes removeObjectForKey:ImageAttributeName];
   [currentAttributes removeObjectForKey:NSAttachmentAttributeName];
   _input->textView.typingAttributes = currentAttributes;
 }
 
-- (BOOL)styleCondition:(id _Nullable)value :(NSRange)range {
+- (BOOL)styleCondition:(id _Nullable)value:(NSRange)range {
   return [value isKindOfClass:[ImageData class]];
 }
 
 - (BOOL)anyOccurence:(NSRange)range {
-  return [OccurenceUtils any:ImageAttributeName withInput:_input inRange:range
-      withCondition:^BOOL(id  _Nullable value, NSRange range) {
-          return [self styleCondition:value :range];
-      }
-  ];
+  return [OccurenceUtils any:ImageAttributeName
+                   withInput:_input
+                     inRange:range
+               withCondition:^BOOL(id _Nullable value, NSRange range) {
+                 return [self styleCondition:value:range];
+               }];
 }
 
 - (BOOL)detectStyle:(NSRange)range {
   if (range.length >= 1) {
-    return [OccurenceUtils detect:ImageAttributeName withInput:_input inRange:range
-        withCondition:^BOOL(id  _Nullable value, NSRange range) {
-            return [self styleCondition:value :range];
-        }
-    ];
+    return [OccurenceUtils detect:ImageAttributeName
+                        withInput:_input
+                          inRange:range
+                    withCondition:^BOOL(id _Nullable value, NSRange range) {
+                      return [self styleCondition:value:range];
+                    }];
   } else {
-    return [OccurenceUtils detect:ImageAttributeName withInput:_input atIndex:range.location checkPrevious:YES
-        withCondition:^BOOL(id  _Nullable value, NSRange range) {
-            return [self styleCondition:value :range];
-        }
-    ];
+    return [OccurenceUtils detect:ImageAttributeName
+                        withInput:_input
+                          atIndex:range.location
+                    checkPrevious:YES
+                    withCondition:^BOOL(id _Nullable value, NSRange range) {
+                      return [self styleCondition:value:range];
+                    }];
   }
 }
 
-- (NSArray<StylePair *> * _Nullable)findAllOccurences:(NSRange)range {
-  return [OccurenceUtils all:ImageAttributeName 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:ImageAttributeName
+                   withInput:_input
+                     inRange:range
+               withCondition:^BOOL(id _Nullable value, NSRange range) {
+                 return [self styleCondition:value:range];
+               }];
 }
 
-- (ImageData *)getImageDataAt:(NSUInteger)location
-{
+- (ImageData *)getImageDataAt:(NSUInteger)location {
   NSRange imageRange = NSMakeRange(0, 0);
   NSRange inputRange = NSMakeRange(0, _input->textView.textStorage.length);
-  
+
   // don't search at the very end of input
   NSUInteger searchLocation = location;
-  if(searchLocation == _input->textView.textStorage.length) {
+  if (searchLocation == _input->textView.textStorage.length) {
     return nullptr;
   }
-  
-  ImageData *imageData = [_input->textView.textStorage
-    attribute:ImageAttributeName
-    atIndex:searchLocation
-    longestEffectiveRange: &imageRange
-    inRange:inputRange
-  ];
-  
+
+  ImageData *imageData =
+      [_input->textView.textStorage attribute:ImageAttributeName
+                                      atIndex:searchLocation
+                        longestEffectiveRange:&imageRange
+                                      inRange:inputRange];
+
   return imageData;
 }
 
-- (void)addImageAtRange:(NSRange)range imageData:(ImageData *)imageData withSelection:(BOOL)withSelection
-{
-  UIImage *img = [self prepareImageFromUri:imageData.uri];
-    
-  NSDictionary *attributes = [@{
-    NSAttachmentAttributeName: [self prepareImageAttachement:img width:imageData.width height:imageData.height],
-    ImageAttributeName: imageData,
-  } mutableCopy];
-  
+- (void)addImageAtRange:(NSRange)range
+              imageData:(ImageData *)imageData
+          withSelection:(BOOL)withSelection {
+  if (!imageData)
+    return;
+
+  ImageAttachment *attachment =
+      [[ImageAttachment alloc] initWithImageData:imageData];
+  attachment.delegate = _input;
+
+  NSDictionary *attributes =
+      @{NSAttachmentAttributeName : attachment, ImageAttributeName : imageData};
+
   // Use the Object Replacement Character for Image.
   // This tells TextKit "something non-text goes here".
-  NSString *imagePlaceholder = @"\uFFFC";
-  
+  NSString *placeholderChar = @"\uFFFC";
+
   if (range.length == 0) {
-    [TextInsertionUtils insertText:imagePlaceholder at:range.location additionalAttributes:attributes input:_input withSelection:withSelection];
+    [TextInsertionUtils insertText:placeholderChar
+                                at:range.location
+              additionalAttributes:attributes
+                             input:_input
+                     withSelection:withSelection];
   } else {
-    [TextInsertionUtils replaceText:imagePlaceholder
+    [TextInsertionUtils replaceText:placeholderChar
                                  at:range
                additionalAttributes:attributes
                               input:_input
@@ -132,27 +151,10 @@ static NSString *const ImageAttributeName = @"ImageAttributeName";
   data.uri = uri;
   data.width = width;
   data.height = height;
-  
-  [self addImageAtRange:_input->textView.selectedRange imageData:data withSelection:YES];
-}
-
--(NSTextAttachment *)prepareImageAttachement:(UIImage *)image width:(CGFloat)width height:(CGFloat)height
-{
-  
-  NSTextAttachment *attachment = [[NSTextAttachment alloc] init];
-  attachment.image = image;
-  attachment.bounds = CGRectMake(0, 0, width, height);
-
-  return attachment;
-}
 
-- (UIImage *)prepareImageFromUri:(NSString *)uri
-{
-  NSURL *url = [NSURL URLWithString:uri];
-  NSData *imgData = [NSData dataWithContentsOfURL:url];
-  UIImage *image = [UIImage imageWithData:imgData];
-  
-  return image;
+  [self addImageAtRange:_input->textView.selectedRange
+              imageData:data
+          withSelection:YES];
 }
 
 @end