react-native-enriched 0.2.1 → 0.3.0

package/ios/styles/BlockQuoteStyle.mm

@@ -186,7 +186,7 @@
   return NO;
 }
 
-- (BOOL)styleCondition:(id _Nullable)value:(NSRange)range {
+- (BOOL)styleCondition:(id _Nullable)value range:(NSRange)range {
   NSParagraphStyle *pStyle = (NSParagraphStyle *)value;
   return pStyle != nullptr && pStyle.headIndent == [self getHeadIndent] &&
          pStyle.firstLineHeadIndent == [self getHeadIndent] &&
@@ -199,7 +199,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:NSParagraphStyleAttributeName
@@ -207,7 +207,7 @@
                           atIndex:range.location
                     checkPrevious:YES
                     withCondition:^BOOL(id _Nullable value, NSRange range) {
-                      return [self styleCondition:value:range];
+                      return [self styleCondition:value range:range];
                     }];
   }
 }
@@ -217,7 +217,7 @@
                    withInput:_input
                      inRange:range
                withCondition:^BOOL(id _Nullable value, NSRange range) {
-                 return [self styleCondition:value:range];
+                 return [self styleCondition:value range:range];
                }];
 }
 
@@ -226,7 +226,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/BoldStyle.mm

@@ -104,6 +104,18 @@
     if (![_input->config h3Bold]) {
       return NO;
     }
+  } else if (type == H4) {
+    if (![_input->config h4Bold]) {
+      return NO;
+    }
+  } else if (type == H5) {
+    if (![_input->config h5Bold]) {
+      return NO;
+    }
+  } else if (type == H6) {
+    if (![_input->config h6Bold]) {
+      return NO;
+    }
   }
 
   id<BaseStyleProtocol> headingStyle = _input->stylesDict[@(type)];
@@ -111,12 +123,15 @@
                           : [headingStyle detectStyle:range];
 }
 
-- (BOOL)styleCondition:(id _Nullable)value:(NSRange)range {
+- (BOOL)styleCondition:(id _Nullable)value range:(NSRange)range {
   UIFont *font = (UIFont *)value;
   return font != nullptr && [font isBold] &&
          ![self boldHeadingConflictsInRange:range type:H1] &&
          ![self boldHeadingConflictsInRange:range type:H2] &&
-         ![self boldHeadingConflictsInRange:range type:H3];
+         ![self boldHeadingConflictsInRange:range type:H3] &&
+         ![self boldHeadingConflictsInRange:range type:H4] &&
+         ![self boldHeadingConflictsInRange:range type:H5] &&
+         ![self boldHeadingConflictsInRange:range type:H6];
 }
 
 - (BOOL)detectStyle:(NSRange)range {
@@ -125,7 +140,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
@@ -133,7 +148,7 @@
                           atIndex:range.location
                     checkPrevious:NO
                     withCondition:^BOOL(id _Nullable value, NSRange range) {
-                      return [self styleCondition:value:range];
+                      return [self styleCondition:value range:range];
                     }];
   }
 }
@@ -143,7 +158,7 @@
                    withInput:_input
                      inRange:range
                withCondition:^BOOL(id _Nullable value, NSRange range) {
-                 return [self styleCondition:value:range];
+                 return [self styleCondition:value range:range];
                }];
 }
 
@@ -152,7 +167,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/CodeBlockStyle.mm

@@ -177,7 +177,7 @@
   return NO;
 }
 
-- (BOOL)styleCondition:(id _Nullable)value:(NSRange)range {
+- (BOOL)styleCondition:(id _Nullable)value range:(NSRange)range {
   NSParagraphStyle *paragraph = (NSParagraphStyle *)value;
   return paragraph != nullptr && paragraph.textLists.count == 1 &&
          [paragraph.textLists.firstObject.markerFormat
@@ -190,7 +190,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:NSParagraphStyleAttributeName
@@ -198,7 +198,7 @@
                           atIndex:range.location
                     checkPrevious:YES
                     withCondition:^BOOL(id _Nullable value, NSRange range) {
-                      return [self styleCondition:value:range];
+                      return [self styleCondition:value range:range];
                     }];
   }
 }
@@ -208,7 +208,7 @@
                    withInput:_input
                      inRange:range
                withCondition:^BOOL(id _Nullable value, NSRange range) {
-                 return [self styleCondition:value:range];
+                 return [self styleCondition:value range:range];
                }];
 }
 
@@ -217,7 +217,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/H4Style.mm

@@ -0,0 +1,17 @@
+#import "EnrichedTextInputView.h"
+#import "StyleHeaders.h"
+
+@implementation H4Style
++ (StyleType)getStyleType {
+  return H4;
+}
++ (BOOL)isParagraphStyle {
+  return YES;
+}
+- (CGFloat)getHeadingFontSize {
+  return [((EnrichedTextInputView *)input)->config h4FontSize];
+}
+- (BOOL)isHeadingBold {
+  return [((EnrichedTextInputView *)input)->config h4Bold];
+}
+@end

package/ios/styles/H5Style.mm

@@ -0,0 +1,17 @@
+#import "EnrichedTextInputView.h"
+#import "StyleHeaders.h"
+
+@implementation H5Style
++ (StyleType)getStyleType {
+  return H5;
+}
++ (BOOL)isParagraphStyle {
+  return YES;
+}
+- (CGFloat)getHeadingFontSize {
+  return [((EnrichedTextInputView *)input)->config h5FontSize];
+}
+- (BOOL)isHeadingBold {
+  return [((EnrichedTextInputView *)input)->config h5Bold];
+}
+@end

package/ios/styles/H6Style.mm

@@ -0,0 +1,17 @@
+#import "EnrichedTextInputView.h"
+#import "StyleHeaders.h"
+
+@implementation H6Style
++ (StyleType)getStyleType {
+  return H6;
+}
++ (BOOL)isParagraphStyle {
+  return YES;
+}
+- (CGFloat)getHeadingFontSize {
+  return [((EnrichedTextInputView *)input)->config h6FontSize];
+}
+- (BOOL)isHeadingBold {
+  return [((EnrichedTextInputView *)input)->config h6Bold];
+}
+@end

package/ios/styles/HeadingStyleBase.mm

@@ -6,7 +6,7 @@
 
 @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;
 }
@@ -16,6 +16,9 @@
 - (BOOL)isHeadingBold {
   return false;
 }
++ (BOOL)isParagraphStyle {
+  return true;
+}
 
 - (EnrichedTextInputView *)typedInput {
   return (EnrichedTextInputView *)input;
@@ -24,6 +27,7 @@
 - (instancetype)initWithInput:(id)input {
   self = [super init];
   self->input = input;
+  _lastAppliedFontSize = 0.0;
   return self;
 }
 
@@ -37,6 +41,7 @@
   } else {
     isStylePresent ? [self removeTypingAttributes] : [self addTypingAttributes];
   }
+  _lastAppliedFontSize = [self getHeadingFontSize];
 }
 
 // the range will already be the proper full paragraph/s range
@@ -98,9 +103,9 @@
                  options:0
               usingBlock:^(id _Nullable value, NSRange range,
                            BOOL *_Nonnull stop) {
-                if ([self styleCondition:value:range]) {
+                if ([self styleCondition:value range:range]) {
                   UIFont *newFont = [(UIFont *)value
-                      setSize:[[[self typedInput]->config primaryFontSize]
+                      setSize:[[[self typedInput]->config scaledPrimaryFontSize]
                                   floatValue]];
                   if ([self isHeadingBold]) {
                     newFont = [newFont removeBold];
@@ -121,7 +126,7 @@
     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];
     }
@@ -137,9 +142,20 @@
   [self removeAttributes:[self typedInput]->textView.selectedRange];
 }
 
-- (BOOL)styleCondition:(id _Nullable)value:(NSRange)range {
+// when the traits already change, the getHeadginFontSize will return the new
+// font size and no headings would be properly detected, so that's why we have
+// to use the latest applied font size rather than that value.
+- (BOOL)styleCondition:(id _Nullable)value range:(NSRange)range {
   UIFont *font = (UIFont *)value;
-  return font != nullptr && font.pointSize == [self getHeadingFontSize];
+  if (font == nullptr) {
+    return NO;
+  }
+
+  if (self.lastAppliedFontSize > 0.0) {
+    return font.pointSize == self.lastAppliedFontSize;
+  }
+
+  return font.pointSize == [self getHeadingFontSize];
 }
 
 - (BOOL)detectStyle:(NSRange)range {
@@ -148,7 +164,7 @@
                         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
@@ -156,7 +172,7 @@
                           atIndex:range.location
                     checkPrevious:YES
                     withCondition:^BOOL(id _Nullable value, NSRange range) {
-                      return [self styleCondition:value:range];
+                      return [self styleCondition:value range:range];
                     }];
   }
 }
@@ -166,7 +182,7 @@
                    withInput:[self typedInput]
                      inRange:range
                withCondition:^BOOL(id _Nullable value, NSRange range) {
-                 return [self styleCondition:value:range];
+                 return [self styleCondition:value range:range];
                }];
 }
 
@@ -175,7 +191,7 @@
                    withInput:[self typedInput]
                      inRange:range
                withCondition:^BOOL(id _Nullable value, NSRange range) {
-                 return [self styleCondition:value:range];
+                 return [self styleCondition:value range:range];
                }];
 }
 
@@ -216,6 +232,7 @@
       [self addAttributes:paragraphRange withTypingAttr:NO];
     }
   }
+  _lastAppliedFontSize = [self getHeadingFontSize];
 }
 
 @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];
                }];
 }